Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[ekohl] 26615: Fix indentation, no code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue May 1 17:55:11 2007 New Revision: 26615 URL: http://svn.reactos.org/svn/reactos?rev=26615&view=rev Log: Fix indentation, no code changes. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/access.h trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Tue May 1 17:55:11 2007 @@ -20,28 +20,23 @@ #define NUM_APPLETS (1) LONG CALLBACK SystemApplet(VOID); -INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); HINSTANCE hApplet = 0; /* Applets */ -APPLET Applets[NUM_APPLETS] = +APPLET Applets[NUM_APPLETS] = { - {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} + {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; -static void +static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; } @@ -50,86 +45,85 @@ LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[5]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; - - LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS)); - psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC) KeyboardPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC) SoundPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC) DisplayPageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC) MousePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); - - return (LONG)(PropertySheet(&psh) != -1); + PROPSHEETPAGE psp[5]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc); + + return (LONG)(PropertySheet(&psh) != -1); } /* Control Panel Callback */ LONG CALLBACK -CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl); + INT i = (INT)lParam1; - switch(uMsg) - { - case CPL_INIT: + UNREFERENCED_PARAMETER(hwndCPl); + + switch (uMsg) { - return TRUE; + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; } - case CPL_GETCOUNT: - { - return NUM_APPLETS; - } - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - } - case CPL_DBLCLK: - { - Applets[i].AppletProc(); - break; - } - } - return FALSE; + + return FALSE; } BOOL STDCALL -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; } Modified: trunk/reactos/dll/cpl/access/access.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.h?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.h (original) +++ trunk/reactos/dll/cpl/access/access.h Tue May 1 17:55:11 2007 @@ -3,18 +3,24 @@ typedef LONG (CALLBACK *APPLET_INITPROC)(VOID); -typedef struct +typedef struct _APPLET { - int idIcon; - int idName; - int idDescription; - APPLET_INITPROC AppletProc; + INT idIcon; + INT idName; + INT idDescription; + APPLET_INITPROC AppletProc; } APPLET, *PAPPLET; extern HINSTANCE hApplet; void ShowLastWin32Error(HWND hWndOwner); +INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_SYSDM_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Tue May 1 17:55:11 2007 @@ -15,35 +15,33 @@ /* Property page dialog callback */ INT_PTR CALLBACK -DisplayPageProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +DisplayPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - case WM_COMMAND: + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDC_CONTRAST_BOX: - { - break; - } - case IDC_CONTRAST_BUTTON: - { - break; - } - default: - break; - } + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_CONTRAST_BOX: + break; + + case IDC_CONTRAST_BUTTON: + break; + + default: + break; + } + break; } - } - return FALSE; + + return FALSE; } Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Tue May 1 17:55:11 2007 @@ -15,55 +15,48 @@ /* Property page dialog callback */ INT_PTR CALLBACK -GeneralPageProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +GeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - case WM_COMMAND: + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDC_RESET_BOX: - { - break; - } - case IDC_NOTIFICATION_MESSAGE: - { - break; - } - case IDC_NOTIFICATION_SOUND: - { - break; - } - case IDC_SERIAL_BOX: - { - break; - } - case IDC_SERIAL_BUTTON: - { - break; - } - case IDC_ADMIN_LOGON_BOX: - { - break; - } - case IDC_ADMIN_USERS_BOX: - { - break; - } - default: - break; - } + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_RESET_BOX: + break; + + case IDC_NOTIFICATION_MESSAGE: + break; + + case IDC_NOTIFICATION_SOUND: + break; + + case IDC_SERIAL_BOX: + break; + + case IDC_SERIAL_BUTTON: + break; + + case IDC_ADMIN_LOGON_BOX: + break; + + case IDC_ADMIN_USERS_BOX: + break; + + default: + break; + } + break; } - } - return FALSE; + + return FALSE; } Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Tue May 1 17:55:11 2007 @@ -25,37 +25,34 @@ /* Property page dialog callback */ INT_PTR CALLBACK -StickyKeysDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +StickyKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - case WM_COMMAND: + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDOK: - EndDialog(hwndDlg, TRUE); - break; + case WM_INITDIALOG: + break; - case IDCANCEL: - EndDialog(hwndDlg, FALSE); - break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, TRUE); + break; - default: - break; - } + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; } - } - return FALSE; + + return FALSE; } Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Tue May 1 17:55:11 2007 @@ -15,35 +15,32 @@ /* Property page dialog callback */ INT_PTR CALLBACK -MousePageProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +MousePageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - case WM_COMMAND: + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDC_MOUSE_BOX: - { - break; - } - case IDC_MOUSE_BUTTON: - { - break; - } - default: - break; - } + case WM_INITDIALOG: + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_MOUSE_BOX: + break; + + case IDC_MOUSE_BUTTON: + break; + + default: + break; + } + break; } - } - return FALSE; + + return FALSE; } Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Tue May 1 17:55:11 2007 @@ -15,39 +15,35 @@ /* Property page dialog callback */ INT_PTR CALLBACK -SoundPageProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +SoundPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - case WM_COMMAND: + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDC_SENTRY_BOX: - { - break; - } - case IDC_SENTRY_BUTTON: - { - break; - } - case IDC_SSHOW_BOX: - { - break; - } - default: - break; - } + case WM_INITDIALOG: + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SENTRY_BOX: + break; + + case IDC_SENTRY_BUTTON: + break; + + case IDC_SSHOW_BOX: + break; + + default: + break; + } + break; } - } - return FALSE; + + return FALSE; }

17 years, 5 months

[ion] 26614: - OMG I wanna be awesome too!

by ion＠svn.reactos.org

Author: ion Date: Tue May 1 17:54:29 2007 New Revision: 26614 URL: http://svn.reactos.org/svn/reactos?rev=26614&view=rev Log: - OMG I wanna be awesome too! Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=26614&r1=26613… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Tue May 1 17:54:29 2007 @@ -1,7 +1,7 @@ ReactOS is available thanks to the work of: Aleksey Bragin <aleksey at reactos org> -Alex Ionescu <ionucu(a)videotron.ca> +Alex Ionescu <alex.ionescu(a)reactos.org> Andrew Greenwood <lists(a)silverblade.co.uk> Andrew Munger <waxdragon(a)gmail.com> Arindam Das

17 years, 5 months

[gedmurphy] 26613: FireBall, trend setter

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue May 1 17:49:10 2007 New Revision: 26613 URL: http://svn.reactos.org/svn/reactos?rev=26613&view=rev Log: FireBall, trend setter Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=26613&r1=26612… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Tue May 1 17:49:10 2007 @@ -18,7 +18,7 @@ Filip Navara <xnavara(a)volny.cz> Frederik Leemans Ge van Geldorp <ge(a)gse.nl> -Ged Murphy <gedmurphy(a)gmail.com> +Ged Murphy <gedmurphy(a)reactos.org> Guido de Jong Gunnar Andre' Dalsnes <hardon(a)online.no> Hans Kremer

17 years, 5 months

[fireball] 26612: Fix my email address.

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 1 17:44:55 2007 New Revision: 26612 URL: http://svn.reactos.org/svn/reactos?rev=26612&view=rev Log: Fix my email address. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=26612&r1=26611… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Tue May 1 17:44:55 2007 @@ -1,6 +1,6 @@ ReactOS is available thanks to the work of: -Aleksey Bragin <aleksey(a)studiocerebral.com> +Aleksey Bragin <aleksey at reactos org> Alex Ionescu <ionucu(a)videotron.ca> Andrew Greenwood <lists(a)silverblade.co.uk> Andrew Munger <waxdragon(a)gmail.com>

17 years, 5 months

[tkreuzer] 26611: remove from build, won't compile

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 17:01:10 2007 New Revision: 26611 URL: http://svn.reactos.org/svn/reactos?rev=26611&view=rev Log: remove from build, won't compile Modified: trunk/rosapps/avtest/avtest.rbuild Modified: trunk/rosapps/avtest/avtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/avtest/avtest.rbuild?rev=2… ============================================================================== --- trunk/rosapps/avtest/avtest.rbuild (original) +++ trunk/rosapps/avtest/avtest.rbuild Tue May 1 17:01:10 2007 @@ -4,5 +4,4 @@ <define name="__USE_W32API" /> <library>ks</library> <library>ntoskrnl</library> - <file>entry.c</file> </module>

17 years, 5 months

[sgasiorek] 26610: change default font to DeJavu Sans (patch by preston) fixes bug #2183

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Tue May 1 14:07:52 2007 New Revision: 26610 URL: http://svn.reactos.org/svn/reactos?rev=26610&view=rev Log: change default font to DeJavu Sans (patch by preston) fixes bug #2183 Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Tue May 1 14:07:52 2007 @@ -92,28 +92,28 @@ ; GUI Setup HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,\ -00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ +00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MenuFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MessageFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,\ -00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ +00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000001,f5,ff,ff,ff,00,00,\ -00,00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,\ -74,00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,\ +00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,\ +56,00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 ; EOF

17 years, 5 months

[sgasiorek] 26609: implement polish keyboard layout

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Tue May 1 13:39:57 2007 New Revision: 26609 URL: http://svn.reactos.org/svn/reactos?rev=26609&view=rev Log: implement polish keyboard layout Added: trunk/reactos/dll/keyboard/kbdpl1/ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild 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 (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue May 1 13:39:57 2007 @@ -56,6 +56,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"French" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout File",0x00000000,"kbdit.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"Italian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout File",0x00000000,"kbdpl1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout Text",0x00000000,"Polish (programmer's)" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue May 1 13:39:57 2007 @@ -127,6 +127,7 @@ dll\keyboard\kbdhu\kbdhu.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.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 (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Tue May 1 13:39:57 2007 @@ -106,6 +106,7 @@ 0000040E = "Hungarian" 00000410 = "Italian" 00000411 = "Japanese" +00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" 00000419 = "Russian" 0000041B = "Slovak (QWERTZ)" @@ -123,6 +124,7 @@ 0000040C = kbdfr.dll 0000040E = kbdhu.dll 00000410 = kbdit.dll +00000415 = kbdpl1.dll 00000419 = kbdru.dll 0000041D = kbdsw.dll 0000041E = kbdth.dll Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c Tue May 1 13:39:57 2007 @@ -1,0 +1,368 @@ +/* + * ReactOS Polish Keyboard layout + * Copyright (C) 2007 ReactOS + * License: LGPL, see: LGPL.txt + * author: Sebastian Gasiorek + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + * + * missing ~ - Tylda deadkey - + */ + +#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, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, 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_EMPTY, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* 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_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 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, + 7, + { 0, 1, 3, SHFT_INVALID, SHFT_INVALID, SHFT_INVALID, 2, 4 } +}; + + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The numbers */ + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + /* Ctrl-6 generates RS */ + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates US */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + + + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + { 'A', CAPS, {'a', 'A', 0x0105, 0x01, 0x0104} }, + { 'C', CAPS, {'c', 'C', 0x0107, 0x03, 0x0106} }, + { 'E', CAPS, {'e', 'E', 0x0119, 0x05, 0x0118} }, + { 'L', CAPS, {'l', 'L', 0x0142, 0x0C, 0x0141} }, + { 'N', CAPS, {'n', 'N', 0x0144, 0x0E, 0x0143} }, + { 'O', CAPS, {'o', 'O', 0xF3, 0x0F, 0xD3} }, + { 'S', CAPS, {'s', 'S', 0x015B, 0x13, 0x015A} }, + { 'X', CAPS, {'x', 'X', 0x017A, 0x18, 0x0179} }, + { 'Z', CAPS, {'z', 'Z', 0x017C, 0x1A, 0x017B} }, + { 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'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 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(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 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 Ctrl" }, + { 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" }, + { 0x4a, 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>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 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 -- currently implemented by wine code */ + 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(1,1), /* Version 1.0 */ + + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def Tue May 1 13:39:57 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdpl1.dll + +EXPORTS +KbdLayerDescriptor +;EOF Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild Tue May 1 13:39:57 2007 @@ -1,0 +1,9 @@ +<module name="kbdpl1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true"> + <importlibrary definition="kbdpl1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdpl1.c</file> + <file>kbdpl1.rc</file> +</module> Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc Tue May 1 13:39:57 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Polish Programmer's Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdpl1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdpl1.dll\0" +#include <reactos/version.rc> 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 (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Tue May 1 13:39:57 2007 @@ -59,4 +59,7 @@ <directory name="kbdja"> <xi:include href="kbdja/kbdja.rbuild" /> </directory> + <directory name="kbdpl1"> + <xi:include href="kbdpl1/kbdpl1.rbuild" /> + </directory> </group>

17 years, 5 months

[dgorbachev] 26608: - Fix infinite loop. - Add debug msg.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue May 1 12:52:59 2007 New Revision: 26608 URL: http://svn.reactos.org/svn/reactos?rev=26608&view=rev Log: - Fix infinite loop. - Add debug msg. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Tue May 1 12:52:59 2007 @@ -980,7 +980,9 @@ /* Set EIP to the User-mode Dispatcher */ TrapFrame->Eip = (ULONG)KeUserExceptionDispatcher; - _SEH_LEAVE; + + /* Dispatch exception to user-mode */ + return; } _SEH_EXCEPT(KiCopyInformation) { @@ -1000,9 +1002,6 @@ } } _SEH_END; - - /* Dispatch exception to user-mode */ - return; } /* Try second chance */ @@ -1018,6 +1017,7 @@ } /* 3rd strike, kill the process */ + DPRINT1("Kill the process\n"); ZwTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode,

17 years, 5 months

[arty] 26607: Properly filter sections that aren't in memory.

by arty＠svn.reactos.org

Author: arty Date: Tue May 1 12:52:58 2007 New Revision: 26607 URL: http://svn.reactos.org/svn/reactos?rev=26607&view=rev Log: Properly filter sections that aren't in memory. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Tue May 1 12:52:58 2007 @@ -454,6 +454,7 @@ for( i = 0; i < shnum; i++ ) { shdr = ELF_SECTION(i); + shdr->sh_addr = 0; /* Find the PE Header */ if (shdr->sh_type == TYPE_PEHEADER) @@ -534,8 +535,10 @@ relstart = shdr->sh_offset; relsize = shdr->sh_type == SHT_RELA ? 12 : 8; numreloc = shdr->sh_size / relsize; - targetSection = shdr->sh_info; - + targetSection = shdr->sh_info - 1; + + if (!ELF_SECTION(targetSection)->sh_addr) continue; + printf("Found reloc section %d (symbols %d target %d) with %d relocs\n", i, shdr->sh_link, shdr->sh_info, numreloc); @@ -554,8 +557,6 @@ { ULONG S,A,P; - if((j%0x1000)==0) printf("."); - /* Get the reloc */ memcpy(&reloc, RelocSection + (j * relsize), sizeof(reloc)); @@ -609,8 +610,6 @@ MmFreeMemory(SymbolSection); MmFreeMemory(RelocSection); - - printf("\n"); } MmFreeMemory(sptr);

17 years, 5 months

[arty] 26606: Filter out dbg sections, handle relocs and symbols more efficiently.

by arty＠svn.reactos.org

Author: arty Date: Tue May 1 12:19:01 2007 New Revision: 26606 URL: http://svn.reactos.org/svn/reactos?rev=26606&view=rev Log: Filter out dbg sections, handle relocs and symbols more efficiently. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Tue May 1 12:19:01 2007 @@ -486,20 +486,6 @@ SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); printf("Section headers at %x\n", ((PCHAR)Section) - ((PCHAR)KernelAddr)); - - printf("-- Dumping ntoskrnl memory --\n"); - for (i = 0; i < 0x1000; i++) { - if(!(i & 0xf)) { - if(i) printf("\n"); - for (j = 0; j < 8; j++) - printf("%x", (((KernelAddr + i) << (j * 4)) >> 28) & 0xf); - printf(": "); - } - printf("%x%x ", - (*(((PCHAR)KernelMemory)+i)>>4)&0xf, - *(((PCHAR)KernelMemory)+i)&0xf); - } - printf("-- Dump done --\n"); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) @@ -532,14 +518,13 @@ printf("Total image size is %x\n", ImageSize); /* Handle relocation sections */ - for (Section = COFF_FIRST_SECTION(NtHeader), i = 0; - i < SectionCount; - i++, Section++) { + for (i = 0; i < shnum; i++) { Elf32_Rela reloc = { }; ULONG *Target32; USHORT *Target16; int numreloc, relstart, targetSection; Elf32_Sym symbol; + PCHAR RelocSection, SymbolSection; shdr = ELF_SECTION(i); /* Only relocs here */ @@ -551,25 +536,32 @@ numreloc = shdr->sh_size / relsize; targetSection = shdr->sh_info; - printf("Found reloc section %d (symbols %d target %d)\n", - i, shdr->sh_link, shdr->sh_info); + printf("Found reloc section %d (symbols %d target %d) with %d relocs\n", + i, shdr->sh_link, shdr->sh_info, numreloc); + RelocSection = MmAllocateMemory(shdr->sh_size); + FsSetFilePointer(KernelImage, relstart); + FsReadFile(KernelImage, shdr->sh_size, NULL, RelocSection); + /* Get the symbol section */ shdr = ELF_SECTION(shdr->sh_link); - + + SymbolSection = MmAllocateMemory(shdr->sh_size); + FsSetFilePointer(KernelImage, shdr->sh_offset); + FsReadFile(KernelImage, shdr->sh_size, NULL, SymbolSection); + for(j = 0; j < numreloc; j++) { ULONG S,A,P; + if((j%0x1000)==0) printf("."); /* Get the reloc */ - FsSetFilePointer(KernelImage, relstart + (numreloc * relsize)); - FsReadFile(KernelImage, sizeof(reloc), NULL, &reloc); - + memcpy(&reloc, RelocSection + (j * relsize), sizeof(reloc)); + /* Get the symbol */ - FsSetFilePointer(KernelImage, shdr->sh_offset + ELF32_R_SYM(reloc.r_info) * sizeof(Elf32_Sym)); - FsReadFile(KernelImage, sizeof(symbol), NULL, &symbol); - + memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); + /* Compute addends */ S = symbol.st_value + KernelAddr + ELF_SECTION(symbol.st_shndx)->sh_addr; A = reloc.r_addend; @@ -586,6 +578,9 @@ case R_PPC_ADDR32: *Target32 = S + A; break; + case R_PPC_REL32: + *Target32 = S + A - P; + break; case R_PPC_UADDR32: /* Special: Treat as RVA */ *Target32 = S + A - KernelAddr; break; @@ -602,11 +597,23 @@ *Target16 = (S + A + 0x8000) >> 16; break; default: - printf("Unknown elf reloc type %x\n", ELF32_R_TYPE(reloc.r_info)); + printf("reloc[%d]: (type %x sym %d val %d) off %x add %x\n", + j, + ELF32_R_TYPE(reloc.r_info), + ELF32_R_SYM(reloc.r_info), + symbol.st_value, + reloc.r_offset, reloc.r_addend); break; } } - } + + MmFreeMemory(SymbolSection); + MmFreeMemory(RelocSection); + + printf("\n"); + } + + MmFreeMemory(sptr); ModuleData = &reactos_modules[LoaderBlock.ModsCount]; ModuleData->ModStart = (ULONG)KernelMemory; Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Tue May 1 12:19:01 2007 @@ -135,7 +135,8 @@ for(int i = 0; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section &sect = eof->getSection(i); - if(sect.getType() == SHT_PROGBITS) { + if((sect.getType() == SHT_PROGBITS) && + (sect.getFlags() & SHF_ALLOC)) { limit = roundup(start + sect.logicalSize(), sectionalign); fprintf(stderr, "rva[%02d:%s] = (%x %x %d)\n", rvas.size(), sect.getName().c_str(), &sect, start, i); Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Tue May 1 12:19:01 2007 @@ -52,6 +52,10 @@ int getInfo() const { return e32shdr->sh_info; + } + + int getFlags() const { + return e32shdr->sh_flags; } int logicalSize() const {

17 years, 5 months

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 May 2007