Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 18 13:22:43 2008 New Revision: 33025 URL: http://svn.reactos.org/svn/reactos?rev=33025&view=rev Log: - Fix build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Apr 18 13:22:43 2008 @@ -160,7 +160,7 @@ dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.dll 1 -dll\keyboard\kbdru\kbdru1.dll 1 +dll\keyboard\kbdru1\kbdru1.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1

16 years, 5 months

[dchapyshev] 33024: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 18 12:00:07 2008 New Revision: 33024 URL: http://svn.reactos.org/svn/reactos?rev=33024&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Fri Apr 18 12:00:07 2008 @@ -9,8 +9,8 @@ BEGIN CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 PUSHBUTTON "&Ñïðàâêà", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 137, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 201, 201, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 101, 201, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 199, 201, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -18,20 +18,20 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 343, 17 - LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 343, 25 - GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT - LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT - LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT - LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT - LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT - LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "Äàííàÿ ïðîãðàììà ïîçâîëÿåò ïîëó÷èòü ïîäðîáíûå ñâåäåíèÿ îá óñòàíîâëåííûõ êîìïîíåíòàõ è äðàéâåðàõ ReactX.", -1, 10, 10, 343, 17 + LTEXT "Åñëè èçâåñòíà âîçìîæíàÿ ïðè÷èíà íåïîëàäêè, ìîæíî ñðàçó âûáðàòü ñîîòâåòñòâóþùóþ âêëàäêó. Â ïðîòèâíîì ñëó÷àå èñïîëüçóéòå êíîïêó ""Ñëåäóþùàÿ ñòðàíèöà"" äëÿ ïîñëåäîâàòåëüíîãî ïðîñìîòðà ñòðàíèö.", -1, 10, 30, 343, 25 + GROUPBOX "Ñâåäåíèÿ î ñèñòåìå", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Òåêóùèå âðåìÿ è äàòà:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Èìÿ êîìïüþòåðà:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "ßçûê:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Èçãîòîâèòåëü êîìïüþòåðà:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Ìîäåëü êîìïüþòåðà:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT - LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT - LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT - LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT - LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "Ïðîöåññîð:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Ïàìÿòü:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Ôàéë ïîäêà÷êè:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Âåðñèÿ ReactX:", -1, 70, 170, 80, 10, SS_RIGHT LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT @@ -93,9 +93,9 @@ IDS_INPUT_DIALOG "Ââîä" IDS_NETWORK_DIALOG "Ñåòü" IDS_HELP_DIALOG "Ñïðàâêà" - IDS_FORMAT_MB "%I64uMB RAM" - IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" - IDS_FORMAT_UNIPROC "%s (%u CPU)" - IDS_FORMAT_MPPROC "%s (%u CPUs)" - IDS_VERSION_UNKNOWN "Unknown Version" + IDS_FORMAT_MB "%I64uÌÁ ÎÇÓ" + IDS_FORMAT_SWAP "%I64u ÌÁ èñïîëüçîâàíî, %I64u ÌÁ äîñòóïíî" + IDS_FORMAT_UNIPROC "%s (%u ÖÏ)" + IDS_FORMAT_MPPROC "%s (%u ÖÏ)" + IDS_VERSION_UNKNOWN "Íåèçâåñòíàÿ âåðñèÿ" END

16 years, 5 months

[janderwald] 33023: - implement system page

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Apr 18 10:36:29 2008 New Revision: 33023 URL: http://svn.reactos.org/svn/reactos?rev=33023&view=rev Log: - implement system page Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/dxdiag.rbuild trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/resource.h trunk/reactos/base/applications/dxdiag/system.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -44,7 +44,7 @@ item.mask = TCIF_TEXT; item.pszText = szName; - (void)TabCtrl_InsertItemW(hDlgCtrl, Position, &item); + SendMessageW(hDlgCtrl, TCM_INSERTITEM, Position, (LPARAM)&item); } VOID Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -5,12 +5,13 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINNT">0x600</define> <library>kernel32</library> <library>user32</library> <library>advapi32</library> <library>comctl32</library> <library>shell32</library> + <library>version</library> <file>system.c</file> <file>display.c</file> <file>sound.c</file> Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -1,58 +1,83 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 260 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "ReactX-Diagnoseprogramm" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 - PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 137, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 200, 201, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,230 + PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 241, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 137, 241, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 200, 241, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 323, 241, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Dieses Hilfsprogramm gibt detailierte Informationen über die ReactX-Komponenten und -Treiber dieses Computers an.", -1, 10, 10, 343, 17 + LTEXT "Wählen Sie die entsprechende Registerkarte oben, wenn Sie den Bereich des Problems bereits kennen. Klicken Sie andernfalls auf ""Nächste Seite"", um alle Seiten nacheinander zu durchsuchen.", -1, 10, 30, 343, 25 + GROUPBOX "Systeminformationen", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Aktuelles Datum/Zeit:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Computername:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Betriebssystem:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Sprache:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Systemhersteller:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Systemmodell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Prozessor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Speicher:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Auslagerungsdatei:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT END -IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -68,4 +93,9 @@ IDS_INPUT_DIALOG "Eingabe" IDS_NETWORK_DIALOG "Netzwerk" IDS_HELP_DIALOG "Hilfe" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB verwendet, %I64u MB verfügbar" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Unbekannte Version" END Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 260 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -14,45 +14,70 @@ PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 343, 17 + LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 343, 25 + GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT END -IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -68,4 +93,9 @@ IDS_INPUT_DIALOG "Input" IDS_NETWORK_DIALOG "Network" IDS_HELP_DIALOG "Help" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Unknown Version" END Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -14,45 +14,70 @@ PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 343, 17 + LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 343, 25 + GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT END -IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -68,4 +93,9 @@ IDS_INPUT_DIALOG "Entrée" IDS_NETWORK_DIALOG "Réseau" IDS_HELP_DIALOG "Aide" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Unknown Version" END Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -21,45 +21,70 @@ PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 343, 17 + LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 343, 25 + GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT END -IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -75,4 +100,9 @@ IDS_INPUT_DIALOG "Peryferia" IDS_NETWORK_DIALOG "Sieæ" IDS_HELP_DIALOG "Pomoc" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Unknown Version" END Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -14,45 +14,70 @@ PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 343, 17 + LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 343, 25 + GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT + LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT END -IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN END -IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 175 +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -68,4 +93,9 @@ IDS_INPUT_DIALOG "Ââîä" IDS_NETWORK_DIALOG "Ñåòü" IDS_HELP_DIALOG "Ñïðàâêà" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Unknown Version" END Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -1,6 +1,7 @@ #ifndef PRECOMP_H__ #define PRECOMP_H__ +#include <stdio.h> #include <windows.h> #include <commctrl.h> @@ -11,6 +12,8 @@ HWND hDialogs[7]; }DXDIAG_CONTEXT, *PDXDIAG_CONTEXT; + + /* globals */ Modified: trunk/reactos/base/applications/dxdiag/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -19,18 +19,33 @@ #define IDC_BUTTON_SAVE_INFO 1003 #define IDC_BUTTON_EXIT 1004 - +#define IDC_STATIC_TIME 2000 +#define IDC_STATIC_COMPUTER 2001 +#define IDC_STATIC_OS 2002 +#define IDC_STATIC_LANG 2003 +#define IDC_STATIC_MANU 2004 +#define IDC_STATIC_MODEL 2005 +#define IDC_STATIC_BIOS 2006 +#define IDC_STATIC_PROC 2007 +#define IDC_STATIC_MEM 2008 +#define IDC_STATIC_SWAP 2009 +#define IDC_STATIC_VERSION 2010 /* string resource constants */ -#define IDS_MAIN_DIALOG 10000 -#define IDS_SYSTEM_DIALOG 10001 -#define IDS_DISPLAY_DIALOG 10002 -#define IDS_SOUND_DIALOG 10003 -#define IDS_MUSIC_DIALOG 10004 -#define IDS_INPUT_DIALOG 10005 -#define IDS_NETWORK_DIALOG 10006 -#define IDS_HELP_DIALOG 10007 +#define IDS_MAIN_DIALOG 10000 +#define IDS_SYSTEM_DIALOG 10001 +#define IDS_DISPLAY_DIALOG 10002 +#define IDS_SOUND_DIALOG 10003 +#define IDS_MUSIC_DIALOG 10004 +#define IDS_INPUT_DIALOG 10005 +#define IDS_NETWORK_DIALOG 10006 +#define IDS_HELP_DIALOG 10007 +#define IDS_FORMAT_MB 10008 +#define IDS_FORMAT_SWAP 10009 +#define IDS_FORMAT_UNIPROC 10010 +#define IDS_FORMAT_MPPROC 10011 +#define IDS_VERSION_UNKNOWN 10012 /* icon resource constants */ #define IDI_APPICON 20000 Modified: trunk/reactos/base/applications/dxdiag/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] Fri Apr 18 10:36:29 2008 @@ -9,15 +9,321 @@ #include "precomp.h" +static +BOOL +GetDirectXVersion(WCHAR * szBuffer) +{ + WCHAR szVer[20]; + DWORD dwVer = sizeof(szVer); + + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectX", L"Version", RRF_RT_REG_SZ, NULL, szVer, &dwVer) != ERROR_SUCCESS) + return FALSE; + + if(!wcscmp(szVer, L"4.02.0095")) + wcscpy(szBuffer, L"1.0"); + else if (!wcscmp(szVer, L"4.03.00.1096")) + wcscpy(szBuffer, L"2.0"); + else if (!wcscmp(szVer, L"4.04.0068")) + wcscpy(szBuffer, L"3.0"); + else if (!wcscmp(szVer, L"4.04.0069")) + wcscpy(szBuffer, L"3.0"); + else if (!wcscmp(szVer, L"4.05.00.0155")) + wcscpy(szBuffer, L"5.0"); + else if (!wcscmp(szVer, L"4.05.01.1721")) + wcscpy(szBuffer, L"5.0"); + else if (!wcscmp(szVer, L"4.05.01.1998")) + wcscpy(szBuffer, L"5.0"); + else if (!wcscmp(szVer, L"4.06.02.0436")) + wcscpy(szBuffer, L"6.0"); + else if (!wcscmp(szVer, L"4.07.00.0700")) + wcscpy(szBuffer, L"7.0"); + else if (!wcscmp(szVer, L"4.07.00.0716")) + wcscpy(szBuffer, L"7.0a"); + else if (!wcscmp(szVer, L"4.08.00.0400")) + wcscpy(szBuffer, L"8.0"); + else if (!wcscmp(szVer, L"4.08.01.0881")) + wcscpy(szBuffer, L"8.1"); + else if (!wcscmp(szVer, L"4.08.01.0810")) + wcscpy(szBuffer, L"8.1"); + else if (!wcscmp(szVer, L"4.09.0000.0900")) + wcscpy(szBuffer, L"9.0"); + else if (!wcscmp(szVer, L"4.09.00.0900")) + wcscpy(szBuffer, L"9.0"); + else if (!wcscmp(szVer, L"4.09.0000.0901")) + wcscpy(szBuffer, L"9.0a"); + else if (!wcscmp(szVer, L"4.09.00.0901")) + wcscpy(szBuffer, L"9.0a"); + else if (!wcscmp(szVer, L"4.09.0000.0902")) + wcscpy(szBuffer, L"9.0b"); + else if (!wcscmp(szVer, L"4.09.00.0902")) + wcscpy(szBuffer, L"9.0b"); + else if (!wcscmp(szVer, L"4.09.00.0904")) + wcscpy(szBuffer, L"9.0c"); + else if (!wcscmp(szVer, L"4.09.0000.0904")) + wcscpy(szBuffer, L"9.0c"); + else + return FALSE; + + return TRUE; +} + +#if 0 +static +BOOL +GetVistaVersion(WCHAR * szBuffer) +{ + DWORD Length; + + if (GetProductInfo(6, 0, 0, 0, &Length)) + { + switch(Length) + { + case PRODUCT_ULTIMATE: + swprintf(szBuffer, L"Windows Vista Ultimate (6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_HOME_BASIC: + swprintf(szBuffer, L"Windows Vista Home Basic (6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_HOME_PREMIUM: + swprintf(szBuffer, L"Windows Vista Home Premimum (6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_ENTERPRISE: + swprintf(szBuffer, L"Windows Vista Enterprise (6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_HOME_BASIC_N: + swprintf(szBuffer, L"Windows Vista Home Basic N(6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_BUSINESS: + swprintf(szBuffer, L"Windows Vista Business(6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_STARTER: + swprintf(szBuffer, L"Windows Vista Starter(6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + case PRODUCT_BUSINESS_N: + swprintf(szBuffer, L"Windows Vista Business N(6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + default: + return FALSE; + } + } +} + +#endif + + +static +BOOL +GetOSVersion(WCHAR * szBuffer) +{ + OSVERSIONINFOEXW info; + + ZeroMemory(&info, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + if (GetVersionExW((LPOSVERSIONINFO)&info)) + { + /* FIXME retrieve ReactOS version*/ + if (info.dwMajorVersion == 4) + { + wcscpy(szBuffer, L"Windows NT 4.0"); + if (info.szCSDVersion[0]) + { + wcscat(szBuffer, L" "); + wcscat(szBuffer, info.szCSDVersion); + } + return TRUE; + } + + if (info.dwMajorVersion == 5 && info.dwMinorVersion == 0) + { + wcscpy(szBuffer, L"Windows 2000"); + if (info.szCSDVersion[0]) + { + wcscat(szBuffer, L" "); + wcscat(szBuffer, info.szCSDVersion); + } + return TRUE; + } + + if (info.dwMajorVersion == 5 && info.dwMinorVersion == 1) + { + wcscpy(szBuffer, L"Windows XP"); + if (info.szCSDVersion[0]) + { + wcscat(szBuffer, L" "); + wcscat(szBuffer, info.szCSDVersion); + } + return TRUE; + } + + if (info.dwMajorVersion == 6 && info.dwMinorVersion == 0) + { +// if (GetVistaVersion(szBuffer)) +// return TRUE; + + swprintf(szBuffer, L"Windows Vista (6.0, Build %04u)", info.dwBuildNumber); + return TRUE; + } + } + + return FALSE; +} + +static +VOID +InitializeSystemPage(HWND hwndDlg) +{ + WCHAR szTime[200]; + DWORD Length; + DWORDLONG AvailableBytes, UsedBytes; + MEMORYSTATUSEX mem; + WCHAR szFormat[40]; + WCHAR szDesc[50]; + SYSTEM_INFO SysInfo; + + /* set date/time */ + szTime[0] = L'\0'; + Length = GetDateFormat(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, NULL, szTime, sizeof(szTime) / sizeof(WCHAR)); + if (Length) + { + szTime[Length-1] = L','; + szTime[Length++] = L' '; + } + Length = GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, TIME_FORCE24HOURFORMAT|LOCALE_NOUSEROVERRIDE, NULL, NULL, &szTime[Length], (sizeof(szTime) / sizeof(WCHAR))); + szTime[199] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_TIME, WM_SETTEXT, 0, (LPARAM)szTime); + + /* set computer name */ + szTime[0] = L'\0'; + Length = sizeof(szTime) / sizeof(WCHAR); + if (GetComputerNameW(szTime, &Length)) + SendDlgItemMessageW(hwndDlg, IDC_STATIC_COMPUTER, WM_SETTEXT, 0, (LPARAM)szTime); + + /* set product name */ + if (GetOSVersion(szTime)) + { + SendDlgItemMessage(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime); + } + else + { + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + { + szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); + } + } + + /* FIXME set product language/local language */ + if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT,LOCALE_SLANGUAGE , szTime, sizeof(szTime) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, IDC_STATIC_LANG, WM_SETTEXT, 0, (LPARAM)szTime); + + /* set system manufacturer */ + szTime[0] = L'\0'; + Length = sizeof(szTime) / sizeof(WCHAR); + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemManufacturer", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) + { + szTime[199] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_MANU, WM_SETTEXT, 0, (LPARAM)szTime); + } + + /* set motherboard model */ + szTime[0] = L'\0'; + Length = sizeof(szTime) / sizeof(WCHAR); + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemProductName", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) + { + szTime[199] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_MODEL, WM_SETTEXT, 0, (LPARAM)szTime); + } + + /* set bios model */ + szTime[0] = L'\0'; + Length = sizeof(szTime) / sizeof(WCHAR); + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSVendor", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) + { + DWORD Index; + DWORD StrLength = (sizeof(szTime) / sizeof(WCHAR)) - (Length/sizeof(WCHAR)); + + Index = (Length/sizeof(WCHAR)); + szTime[Index-1] = L' '; + + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSReleaseDate", RRF_RT_REG_SZ, NULL, &szTime[Index], &StrLength) == ERROR_SUCCESS) + { + StrLength = (StrLength/sizeof(WCHAR)); + } + szTime[Index+StrLength] = L' '; + wcscpy(&szTime[Index+StrLength], L"Ver: "); //FIXME NON-NLS + szTime[199] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); + //FIXME retrieve BiosMajorRelease, BiosMinorRelease + } + /* set processor string */ + Length = sizeof(szDesc); + if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", RRF_RT_REG_SZ, NULL, szDesc, &Length) == ERROR_SUCCESS) + { + /* FIXME retrieve current speed */ + szFormat[0] = L'\0'; + GetSystemInfo(&SysInfo); + if (SysInfo.dwNumberOfProcessors > 1) + LoadStringW(hInst, IDS_FORMAT_MPPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + else + LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + + szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; + swprintf(szTime, szFormat, szDesc, SysInfo.dwNumberOfProcessors); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_PROC, WM_SETTEXT, 0, (LPARAM)szTime); + } + + /* retrieve available memory */ + ZeroMemory(&mem, sizeof(mem)); + mem.dwLength = sizeof(mem); + if (GlobalMemoryStatusEx(&mem)) + { + if (LoadStringW(hInst, IDS_FORMAT_MB, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + { + /* set total mem string */ + szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + swprintf(szTime, szFormat, (mem.ullTotalPhys/1048576)); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_MEM, WM_SETTEXT, 0, (LPARAM)szTime); + } + + if (LoadStringW(hInst, IDS_FORMAT_SWAP, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + { + /* set swap string */ + AvailableBytes = (mem.ullTotalPageFile-mem.ullTotalPhys)/1048576; + UsedBytes = (mem.ullTotalPageFile-mem.ullAvailPageFile)/1048576; + + szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + swprintf(szTime, szFormat, (UsedBytes), (AvailableBytes)); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_SWAP, WM_SETTEXT, 0, (LPARAM)szTime); + } + } + /* set directx version string */ + wcscpy(szTime, L"ReactX "); + if (GetDirectXVersion(&szTime[7])) + { + SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); + } + else + { + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + { + szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); + } + } +} + + INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - switch (message) { + switch (message) + { case WM_INITDIALOG: { SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + InitializeSystemPage(hDlg); return TRUE; } }

16 years, 5 months

[dchapyshev] 33022: Add new keyboard layouts to txtsetup.sif, reactos.dff and hivesys.inf

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 18 09:28:38 2008 New Revision: 33022 URL: http://svn.reactos.org/svn/reactos?rev=33022&view=rev Log: Add new keyboard layouts to txtsetup.sif, reactos.dff and hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri Apr 18 09:28:38 2008 @@ -71,6 +71,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Text",0x00000000,"Italian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdja.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,"Japanese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout File",0x00000000,"kbdal.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout Text",0x00000000,"Albanian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout File",0x00000000,"kbdbe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout Text",0x00000000,"Belgian French" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout File",0x00000000,"kbdbe.dll" @@ -81,6 +83,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text",0x00000000,"Portuguese" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Text",0x00000000,"Russian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout File",0x00000000,"kbdru1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Text",0x00000000,"Russian (Typewriter)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,"Slovak" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",0x00000000,"kbdsw.dll" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Apr 18 09:28:38 2008 @@ -137,6 +137,7 @@ dll\directx\wine\wined3d\wined3d.dll 1 dll\directx\wine\d3d9\d3d9.dll 1 +dll\keyboard\kbdal\kbdal.dll 1 dll\keyboard\kbdbgm\kbdbgm.dll 1 dll\keyboard\kbdbgt\kbdbgt.dll 1 dll\keyboard\kbdbga\kbdbga.dll 1 @@ -159,6 +160,7 @@ dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.dll 1 +dll\keyboard\kbdru\kbdru1.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Apr 18 09:28:38 2008 @@ -131,6 +131,7 @@ [KeyboardLayout] +0000041c = "Albanian" 00040402 = "Bulgarian BDS 5237-1978" 00020402 = "Bulgarian phonetic classic" 00030402 = "Bulgarian phonetic BDS 5237-2006" @@ -157,6 +158,7 @@ 00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" 00000419 = "Russian" +00010419 = "Russian (Typewriter)" 0000041B = "Slovak (QWERTZ)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" @@ -183,11 +185,13 @@ 0000040E = kbdhu.dll 00000410 = kbdit.dll 00000411 = kbdja.dll +0000041c = kbdal.dll 00000427 = kbdlt.dll 00000414 = kbdno.dll 00000415 = kbdpl1.dll 00000816 = kbdpo.dll 00000419 = kbdru.dll +00010419 = kbdru1.dll 00000807 = kbdsg.dll 0000041B = kbdsk.dll 0000041D = kbdsw.dll

16 years, 5 months

[dchapyshev] 33021: Add keyboard layouts: - Russian (Typewriter) - Albanian

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 18 09:27:09 2008 New Revision: 33021 URL: http://svn.reactos.org/svn/reactos?rev=33021&view=rev Log: Add keyboard layouts: - Russian (Typewriter) - Albanian Added: trunk/reactos/dll/keyboard/kbdal/ trunk/reactos/dll/keyboard/kbdal/kbdal.c (with props) trunk/reactos/dll/keyboard/kbdal/kbdal.def (with props) trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild (with props) trunk/reactos/dll/keyboard/kbdal/kbdal.rc (with props) trunk/reactos/dll/keyboard/kbdru1/ trunk/reactos/dll/keyboard/kbdru1/kbdru1.c (with props) trunk/reactos/dll/keyboard/kbdru1/kbdru1.def (with props) trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild (with props) trunk/reactos/dll/keyboard/kbdru1/kbdru1.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdal/kbdal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.c (added) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,415 @@ +/* + * ReactOS Russian Albanian Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {'\\', '|'} }, + { 'E', CAPS, {'e', 'E'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, + { 'A', CAPS, {'a', 'A'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { VK_OEM_2, NOCAPS, {'/', '?'} }, + { VK_DECIMAL, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {'\t', '\t'}}, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { '1', NOCAPS, {'1', '!', '~' } }, + { '2', NOCAPS, {'2', '\"', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02c7 } }, + { '3', NOCAPS, {'3', '#', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '^' } }, + { '4', NOCAPS, {'4', '$', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02d8 } }, + { '5', NOCAPS, {'5', '%', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b0 } }, + { '7', NOCAPS, {'7', '&', '`' } }, + { '8', NOCAPS, {'8', '*', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02d9 } }, + { '9', NOCAPS, {'9', '(', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b4 } }, + { '0', NOCAPS, {'0', ')', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02dd } }, + { VK_OEM_PLUS, NOCAPS, {'=', '+', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b8 } }, + { 'Q', CAPS, {'q', 'Q', '\\' } }, + { 'W', CAPS, {'w', 'W', '|' } }, + { VK_OEM_4, CAPS, {0x00e7, 0x00c7, 0x00f7 } }, + { 'S', CAPS, {'s', 'S', 0x0111 } }, + { 'D', CAPS, {'d', 'D', 0x0110 } }, + { 'F', CAPS, {'f', 'F', '[' } }, + { 'G', CAPS, {'g', 'G', ']' } }, + { 'K', CAPS, {'k', 'K', 0x0142 } }, + { 'L', CAPS, {'l', 'L', 0x0141 } }, + { VK_OEM_7, NOCAPS, {'[', '{', 0x00df } }, + { 'V', CAPS, {'v', 'V', '@' } }, + { 'B', CAPS, {'b', 'B', '{' } }, + { 'N', CAPS, {'n', 'N', '}' } }, + { 'M', CAPS, {'m', 'M', 0x00a7 } }, + { VK_OEM_COMMA, NOCAPS, {',', ';', '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', '>' } }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl-Alt, Ctrl */ + /* Legacy Ascii generators */ + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_DEAD, 0x001f } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE} }, + { VK_OEM_6, NOCAPS, {'@', '\'', 0x00d7, 0x001b } }, + { VK_OEM_5, NOCAPS, {']', '}', 0x00a4, 0x001c } }, + { VK_OEM_1, CAPS, {0x00eb, 0x00cb, '$', 0x001d } }, + { VK_OEM_102, NOCAPS, {'<', '>', WCH_NONE, 0x001c } }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, 0x001b } }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, 0x0003 } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl-Alt, Ctrl, S+Ctrl */ + /* Legacy Ascii generators */ + { '6', NOCAPS, {'6', '^', WCH_DEAD, WCH_NONE, 0x001e } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02db, WCH_NONE, WCH_NONE} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdal/kbdal.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdal/kbdal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.def (added) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.def [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdal.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdal/kbdal.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdal" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true"> + <importlibrary definition="kbdal.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdal.c</file> + <file>kbdal.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdal/kbdal.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.rc (added) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.rc [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Albanian Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdal\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdal.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdal/kbdal.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdru1/kbdru1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.c (added) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.c [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,406 @@ +/* + * ReactOS Russian (Typewriter) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, NOCAPS, {'|', '+' } }, + { '1', NOCAPS, {0x2116, '1' } }, + { '2', NOCAPS, {'-', '2' } }, + { '3', NOCAPS, {'/', '3' } }, + { '4', NOCAPS, {'\"', '4' } }, + { '5', NOCAPS, {':', '5' } }, + { '7', NOCAPS, {'.', '7' } }, + { '8', NOCAPS, {'_', '8' } }, + { '9', NOCAPS, {'?', '9' } }, + { '0', NOCAPS, {'%', '0' } }, + { VK_OEM_PLUS, NOCAPS, {';', '\\'} }, + + /* First letter row */ + { 'Q', CAPS, {0x439, 0x419} }, + { 'W', CAPS, {0x446, 0x426} }, + { 'E', CAPS, {0x443, 0x423} }, + { 'R', CAPS, {0x43a, 0x41a} }, + { 'T', CAPS, {0x435, 0x415} }, + { 'Y', CAPS, {0x43d, 0x41d} }, + { 'U', CAPS, {0x433, 0x413} }, + { 'I', CAPS, {0x448, 0x428} }, + { 'O', CAPS, {0x449, 0x429} }, + { 'P', CAPS, {0x437, 0x417} }, + { VK_OEM_4, CAPS, {0x445, 0x425} }, + + /* Second letter row */ + { 'A', CAPS, {0x444, 0x424} }, + { 'S', CAPS, {0x44b, 0x42b} }, + { 'D', CAPS, {0x432, 0x412} }, + { 'F', CAPS, {0x430, 0x410} }, + { 'G', CAPS, {0x43f, 0x41f} }, + { 'H', CAPS, {0x440, 0x420} }, + { 'J', CAPS, {0x43e, 0x41e} }, + { 'K', CAPS, {0x43b, 0x41b} }, + { 'L', CAPS, {0x434, 0x414} }, + { VK_OEM_7, CAPS, {0x44d, 0x42d} }, + + /* Third letter row */ + { 'Z', CAPS, {0x44f, 0x42f} }, + { 'X', CAPS, {0x447, 0x427} }, + { 'C', CAPS, {0x441, 0x421} }, + { 'V', CAPS, {0x43c, 0x41c} }, + { 'B', CAPS, {0x438, 0x418} }, + { 'N', CAPS, {0x442, 0x422} }, + { 'M', CAPS, {0x44c, 0x42c} }, + { VK_OEM_COMMA, CAPS, {0x431, 0x411} }, + { VK_OEM_PERIOD, CAPS, {0x44e, 0x42e} }, + { VK_OEM_2, CAPS, {0x451, 0x401} }, + + /* Specials */ + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9 } }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_MINUS, NOCAPS, {'!', '=', 0x1f} }, + { VK_OEM_6, CAPS, {0x44a, 0x42a, 0x1b} }, + { VK_OEM_5, NOCAPS, {')', '(', 0x1c} }, + { VK_OEM_1, CAPS, {0x436, 0x416, 0x1d} }, + { VK_OEM_102, NOCAPS, {')', '(', 0x1c} }, + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' ' } }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + { '6', NOCAPS, {',', '6', WCH_NONE, 0x001e} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdru1/kbdru1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdru1/kbdru1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.def (added) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.def [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdru1.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdru1/kbdru1.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdru1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true"> + <importlibrary definition="kbdru1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdru1.c</file> + <file>kbdru1.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdru1/kbdru1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.rc (added) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.rc [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RU (Typewriter) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdru1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdru1.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdru1/kbdru1.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Fri Apr 18 09:27:09 2008 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="kbdal"> + <xi:include href="kbdal/kbdal.rbuild" /> + </directory> <directory name="kbdbe"> <xi:include href="kbdbe/kbdbe.rbuild" /> </directory> @@ -67,6 +70,9 @@ <directory name="kbdru"> <xi:include href="kbdru/kbdru.rbuild" /> </directory> + <directory name="kbdru1"> + <xi:include href="kbdru1/kbdru1.rbuild" /> + </directory> <directory name="kbdsg"> <xi:include href="kbdsg/kbdsg.rbuild" /> </directory>

16 years, 5 months

[gedmurphy] 33020: - the shell should load from 'Windows NT' key, not 'Windows' - this should fix loading cmd instead of explorer from the key.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 18 05:57:12 2008 New Revision: 33020 URL: http://svn.reactos.org/svn/reactos?rev=33020&view=rev Log: - the shell should load from 'Windows NT' key, not 'Windows' - this should fix loading cmd instead of explorer from the key. Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Fri Apr 18 05:57:12 2008 @@ -133,6 +133,7 @@ if (ControlKey != NULL) RegCloseKey(ControlKey); HeapFree(GetProcessHeap(), 0, SystemStartOptions); + TRACE("IsConsoleShell() returning %d\n", ret); return ret; } @@ -150,17 +151,17 @@ TRACE("(%p, %p)\n", CommandLine, hRootKey); - rc = RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON, - 0, KEY_QUERY_VALUE, &hKey); + rc = RegOpenKeyExW(hRootKey, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, KEY_QUERY_VALUE, &hKey); if (rc == ERROR_SUCCESS) { Size = MAX_PATH * sizeof(WCHAR); - rc = RegQueryValueEx(hKey, - ConsoleShell ? L"ConsoleShell" : L"Shell", - NULL, - &Type, - (LPBYTE)Shell, - &Size); + rc = RegQueryValueExW(hKey, + ConsoleShell ? L"ConsoleShell" : L"Shell", + NULL, + &Type, + (LPBYTE)Shell, + &Size); if (rc == ERROR_SUCCESS) { if ((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) @@ -279,14 +280,14 @@ /* Try to run shell in user key */ if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) { - TRACE("Failed to start a shell from HKEY_CURRENT_USER\n"); + TRACE("Started shell from HKEY_CURRENT_USER\n"); return; } /* Try to run shell in local machine key */ if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) { - TRACE("Failed to start a shell from HKEY_LOCAL_MACHINE\n"); + TRACE("Started shell from HKEY_LOCAL_MACHINE\n"); return; }

16 years, 5 months

[pschweitzer] 33019: Fixed a bug with file version informations

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Apr 18 03:44:33 2008 New Revision: 33019 URL: http://svn.reactos.org/svn/reactos?rev=33019&view=rev Log: Fixed a bug with file version informations Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Fri Apr 18 03:44:33 2008 @@ -435,10 +435,10 @@ if(VerQueryValueW(pBuf, wSlash, &info, &infolen)) { VS_FIXEDFILEINFO * inf = (VS_FIXEDFILEINFO *)info; - sprintfW(buff, wVersionFormat,inf->dwFileVersionMS & 0xFFFF0000, - inf->dwFileVersionMS & 0x0000FFFF, - inf->dwFileVersionLS & 0xFFFF0000, - inf->dwFileVersionLS & 0x0000FFFF); + sprintfW(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), + LOWORD(inf->dwFileVersionMS), + HIWORD(inf->dwFileVersionLS), + LOWORD(inf->dwFileVersionLS)); hDlgCtrl = GetDlgItem(hwndDlg, 14001); TRACE("MS %x LS %x res %s \n",inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff));

16 years, 5 months

[gedmurphy] 33018: Fix regkey path

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 18 01:49:33 2008 New Revision: 33018 URL: http://svn.reactos.org/svn/reactos?rev=33018&view=rev Log: Fix regkey path Modified: trunk/tools/Message Translator/GUI/MainForm.cs Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Fri Apr 18 01:49:33 2008 @@ -12,7 +12,7 @@ { MessageTranslator msgTrans; private Panel[] panels; - private static string regPath = @"Software\AppSense Technologies\MsgTrans"; + private static string regPath = @"Software\ReactOS\MsgTrans"; private string[] msgTypes = { "error", "wm", "bug" };

16 years, 5 months

[pschweitzer] 33017: Fixed a typo spotted by Seungju Kim

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Apr 18 01:46:33 2008 New Revision: 33017 URL: http://svn.reactos.org/svn/reactos?rev=33017&view=rev Log: Fixed a typo spotted by Seungju Kim Modified: trunk/reactos/base/shell/explorer/explorer-ko.rc Modified: trunk/reactos/base/shell/explorer/explorer-ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] Fri Apr 18 01:46:33 2008 @@ -15,7 +15,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32

16 years, 5 months

[jimtabor] 33016: Implement Win32k-Gdi32: GetAspectRatioFilter and SetMapperFlags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 17 23:11:13 2008 New Revision: 33016 URL: http://svn.reactos.org/svn/reactos?rev=33016&view=rev Log: Implement Win32k-Gdi32: GetAspectRatioFilter and SetMapperFlags. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Thu Apr 17 23:11:13 2008 @@ -252,22 +252,6 @@ { /* FIXME add check for vaildate the flags */ return NtGdiSetBoundsRect(hdc, (LPRECT)prc, flags); -} - - -/* - * @unimplemented - */ -DWORD -STDCALL -SetMapperFlags( - HDC a0, - DWORD a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Thu Apr 17 23:11:13 2008 @@ -1678,6 +1678,60 @@ /* + * @implemented + */ +DWORD +STDCALL +SetMapperFlags( + HDC hDC, + DWORD flags + ) +{ + DWORD Ret = GDI_ERROR; + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetMapperFlags( hDC, flags); + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetMapperFlags( hDC, flags); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hDC) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + if ( flags & ~1 ) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + Ret = Dc_Attr->flFontMapper; + Dc_Attr->flFontMapper = flags; + } + return Ret; +} + + +/* * @unimplemented */ int Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Apr 17 23:11:13 2008 @@ -1168,8 +1168,24 @@ IntGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio) { - UNIMPLEMENTED; - return FALSE; + PDC_ATTR pDc_Attr; + + pDc_Attr = pDC->pDc_Attr; + if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; + + if ( pDc_Attr->flFontMapper & 1 ) // TRUE assume 1. + { + // "This specifies that Windows should only match fonts that have the + // same aspect ratio as the display.", Programming Windows, Fifth Ed. + AspectRatio->cx = ((PGDIDEVICE)pDC->pPDev)->GDIInfo.ulLogPixelsX; + AspectRatio->cy = ((PGDIDEVICE)pDC->pPDev)->GDIInfo.ulLogPixelsY; + } + else + { + AspectRatio->cx = 0; + AspectRatio->cy = 0; + } + return TRUE; } BOOL STDCALL @@ -2262,6 +2278,14 @@ case GdiGetSetSelectFont: break; case GdiGetSetMapperFlagsInternal: + if (dwIn & ~1) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + break; + } + SafeResult = Dc_Attr->flFontMapper; + Dc_Attr->flFontMapper = dwIn; break; case GdiGetSetMapMode: SafeResult = IntGdiSetMapMode( dc, dwIn);

16 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
40
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 April 2008