Ros-diffs February 2013

ros-diffs@reactos.org

11 participants
125 discussions

[ekohl] 58342: [MSGINA] - Display logon information in the security dialog. - Fix font in japanese dialogs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 18 23:16:39 2013 New Revision: 58342 URL: http://svn.reactos.org/svn/reactos?rev=58342&view=rev Log: [MSGINA] - Display logon information in the security dialog. - Fix font in japanese dialogs. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -217,6 +217,35 @@ return TRUE; } +static VOID +OnInitSecurityDlg(HWND hwnd, + PGINA_CONTEXT pgContext) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + WCHAR Buffer3[256]; + WCHAR Buffer4[512]; + + LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, 256); + + wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer4, Buffer1, Buffer2); + + SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4); + + LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, 256); + + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer2, 256); + + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer3, 256); + + wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); + + SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); +} + static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, @@ -224,10 +253,15 @@ IN WPARAM wParam, IN LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) { + case WM_INITDIALOG: + { + OnInitSecurityDlg(hwndDlg, (PGINA_CONTEXT)lParam); + SetFocus(GetDlgItem(hwndDlg, IDNO)); + return TRUE; + } + case WM_COMMAND: { switch (LOWORD(wParam)) @@ -249,11 +283,6 @@ return TRUE; } break; - } - case WM_INITDIALOG: - { - SetFocus(GetDlgItem(hwndDlg, IDNO)); - return TRUE; } case WM_CLOSE: { @@ -416,8 +445,7 @@ static VOID OnInitLockedDlg(HWND hwnd, - PGINA_CONTEXT pgContext, - UINT id) + PGINA_CONTEXT pgContext) { WCHAR Buffer1[256]; WCHAR Buffer2[256]; @@ -428,7 +456,7 @@ wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); wsprintfW(Buffer3, Buffer1, Buffer2); - SetWindowTextW(GetDlgItem(hwnd, id), Buffer3); + SetDlgItemTextW(hwnd, IDC_LOCKMSG, Buffer3); } @@ -451,7 +479,7 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - OnInitLockedDlg(hwndDlg, pgContext, IDC_LOCKMSG); + OnInitLockedDlg(hwndDlg, pgContext); return TRUE; } case WM_PAINT: Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ÐÐ°ÐºÐ²Ð¾ Ð¶ÐµÐ»Ð°ÐµÑÐµ?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,95,99,14 - PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,76,75,14 - PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,170,76,75,14 - PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»",IDC_TASKMGR,10,76,75,14 - PUSHBUTTON "ÐÑÐºÐ°Ð·",IDCANCEL,130,95,99,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ÐÐ°ÐºÐ²Ð¾ Ð¶ÐµÐ»Ð°ÐµÑÐµ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,154,99,14 + PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,135,75,14 + PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,170,135,75,14 + PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»",IDC_TASKMGR,10,135,75,14 + PUSHBUTTON "ÐÑÐºÐ°Ð·",IDCANCEL,130,154,99,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ð°: " IDS_FORCELOGOFF "Ð¢Ð°ÐºÐ° ÑÐµÐºÑÑÐ¸ÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» ÑÐµ Ð¸Ð·Ð»ÐµÐ·Ðµ Ð¸ ÑÐµ Ð¸Ð·Ð³ÑÐ±Ð¸ Ð²ÑÐ¸ÑÐºÐ¸ Ð½ÐµÑÑÑÑÐ°Ð½ÐµÐ½Ð¸ Ð´Ð°Ð½Ð½Ð¸. ÐÐ° Ð¿ÑÐ¾Ð´ÑÐ»Ð¶Ð° Ð»Ð¸?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." -END + IDS_LOGONDATE "Logon date: %s %s" + END Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -39,18 +39,21 @@ PUSHBUTTON "Vypnout",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpeÄnost" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Co chcete udÄlat?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,76,70,14 - PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "SprÃ¡vce Ãºloh",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Storno",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Co chcete udÄlat?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,135,70,14 + PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "SprÃ¡vce Ãºloh",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Storno",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -91,4 +94,5 @@ IDS_ASKFORPASSWORD "Heslo: " IDS_FORCELOGOFF "SouÄasnÃ½ uÅ¾ivatel bude odhlÃ¡Å¡en a vÅ¡echna jeho neuloÅ¾enÃ¡ data ztracena. PokraÄovat?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicherheit" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Was wollen Sie tun?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Computer sperren",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Abmelden",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Taskmanager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Abbrechen",IDCANCEL,170,95,70,14 + GROUPBOX "Anmeldeinformation",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Was wollen Sie tun?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Computer sperren",IDC_LOCK,10,135,76,14 + PUSHBUTTON "Abmelden",IDC_LOGOFF,100,135,75,14 + PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Taskmanager",IDC_TASKMGR,100,154,75,14 + PUSHBUTTON "Abbrechen",IDCANCEL,189,154,76,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Passwort: " IDS_FORCELOGOFF "Dies wird den derzeitigen Benutzer abmelden. Alle ungespeicherten Daten gehen verloren. Fortsetzen?" IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren." + IDS_LOGONDATE "Anmeldedatum: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Security" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "What do you want to do?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Log off",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Shutdown",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Cancel",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "What do you want to do?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Lock computer",IDC_LOCK,10,135,76,14 + PUSHBUTTON "Log off",IDC_LOGOFF,100,135,75,14 + PUSHBUTTON "Shutdown",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,100,154,75,14 + PUSHBUTTON "Cancel",IDCANCEL,189,154,76,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,6 @@ IDS_ASKFORPASSWORD "Password: " IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONMSG "You are logged on as %s." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -38,18 +38,21 @@ PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Seguridad" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Â¿QuÃ© quieres hacer?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14 - PUSHBUTTON "Salir",IDC_LOGOFF, 92, 76, 88, 14 - PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186, 76, 70, 14 - PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92, 95, 88, 14 - PUSHBUTTON "Cancelar",IDCANCEL, 186, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Â¿QuÃ© quieres hacer?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4,135, 83, 14 + PUSHBUTTON "Salir",IDC_LOGOFF, 92,135, 88, 14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186,135, 70, 14 + PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92,154, 88, 14 + PUSHBUTTON "Cancelar",IDCANCEL, 186,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -90,4 +93,5 @@ IDS_ASKFORPASSWORD "ContraseÃ±a: " IDS_FORCELOGOFF "Esto cerrarÃ¡ al usuario actual y perderÃ¡ todos los datos no guardados. Â¿Desea Continuar?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "SÃ©curitÃ©" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Que voulez-vous faire ?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14 - PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93, 76, 85, 14 - PUSHBUTTON "Ãteindre",IDC_SHUTDOWN, 184, 76, 70, 14 - PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR, 93, 95, 85, 14 - PUSHBUTTON "Annuler",IDCANCEL, 184, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Que voulez-vous faire ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4,135, 82, 14 + PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93,135, 85, 14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN, 184,135, 70, 14 + PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR, 93,154, 85, 14 + PUSHBUTTON "Annuler",IDCANCEL, 184,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Mot de passe : " IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer ?" IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut dÃ©verrouiller cet ordinateur." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "×××××",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "×××××" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "×× ××¨×¦×× × ××¢×©××ª?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "×× ×¢×× ××ª ××××©×",IDC_LOCK,10,76,70,14 - PUSHBUTTON "×××ª× ×ª×§",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "×××××ª",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "×× ×× ×××©××××ª",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "×××××",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "×× ××¨×¦×× × ××¢×©××ª?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "×× ×¢×× ××ª ××××©×",IDC_LOCK,10,135,70,14 + PUSHBUTTON "×××ª× ×ª×§",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "×××××ª",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "×× ×× ×××©××××ª",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "×××××",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "×¡××¡××: " IDS_FORCELOGOFF "×× ×××¨×× ×××ª× ×ª×§××ª ×××©×ª××© ×× ×××× ××××× ××ª ×× ×××××¢ ×©××× × × ×©××¨. ××××©××?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Matikan",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Keamanan" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Kunci komputer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Keluar",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Batal",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Kunci komputer",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Keluar",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Batal",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Kata sandi: " IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan. Lanjutkan?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicurezza" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Cosa volete fare?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Annulla",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "Password: " IDS_FORCELOGOFF "VerrÃ terminata la sessione dell'utente attuale e tutti i dati non salvati verranno persi. Volete procedere?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,24 +33,27 @@ PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ã»ãã¥ãªãã£" FONT 9, "MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ä½ããã¾ãã?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,76,70,14 - PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ä½ããã¾ãã?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,135,70,14 + PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" -FONT 8,"MS Shell Dlg",400,0,1 +FONT 9,"MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 @@ -62,7 +65,7 @@ IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" -FONT 8,"MS Shell Dlg",400,0,1 +FONT 9,"MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "ãã¹ã¯ã¼ã: " IDS_FORCELOGOFF "ç¾å¨ã®ã¦ã¼ã¶ã¼ããã°ã¢ã¦ããã¾ããä¿åããã¦ããªããã¼ã¿ã¯ãã¹ã¦å¤±ããã¾ãã ç¶è¡ãã¾ãã?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Avslutt",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS-sikkerhet" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Hva vil du gjÃ¸re?",IDC_STATIC, 92, 60, 87, 8 - PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 76, 74, 14 - PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 76, 78, 14 - PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 76, 70, 14 - PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 95, 78, 14 - PUSHBUTTON "Avbryt",IDCANCEL, 170, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Hva vil du gjÃ¸re?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 135, 74, 14 + PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 135, 78, 14 + PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 135, 70, 14 + PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 154, 78, 14 + PUSHBUTTON "Avbryt",IDCANCEL, 170, 154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Passord: " IDS_FORCELOGOFF "Dette vil logge av gjeldende bruker, alle ulagrede data vil gÃ¥ tapt. Fortsette?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpieczeÅstwo" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Co chcesz teraz zrobiÄ?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Blokada komputera",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "MenedÅ¼er zadaÅ",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Anuluj",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Co chcesz teraz zrobiÄ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Blokada komputera",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "MenedÅ¼er zadaÅ",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Anuluj",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "HasÅo: " IDS_FORCELOGOFF "To wyloguje aktualnego uÅ¼ytkownika i straci on wszystkie niezapisane dane. KontynuowaÄ?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -34,18 +34,21 @@ PUSHBUTTON "&OpreÈte", IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Securitate" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Ce acÈiune preferaÈi?", IDC_STATIC,86,60,87,8 - PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,76,70,14 - PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Ãnchid&ere calculatorul", IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Gestionar de &activitÄÈi", IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Ce acÈiune preferaÈi?", IDC_STATIC,10,119,255,8 + PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,135,70,14 + PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Ãnchid&ere calculatorul", IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Gestionar de &activitÄÈi", IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -86,4 +89,5 @@ IDS_ASKFORPASSWORD "ParolÄ: " IDS_FORCELOGOFF "AceastÄ acÈiune va deautentifica utilizatorului curent cu posibile pierderi ale datelor nepÄstrate. ContinuaÈi?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -35,18 +35,21 @@ PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 171, 122, 58, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC, 7, 60, 123, 8 - PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7, 76, 86, 14 - PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102, 76, 86, 14 - PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ",IDC_SHUTDOWN, 198, 76, 70, 14 - PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ",IDC_TASKMGR, 102, 95, 86, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7,135, 86, 14 + PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102,135, 86, 14 + PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ",IDC_SHUTDOWN, 198,135, 70, 14 + PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ",IDC_TASKMGR, 102,154, 86, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -87,4 +90,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ñ: " IDS_FORCELOGOFF "ÐÑÐ¸ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð²ÑÐµ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð±ÑÐ´ÑÑ ÑÑÐµÑÑÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -38,18 +38,21 @@ PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpeÄnosÅ¥" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,76,70,14 - PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,135,70,14 + PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -90,4 +93,5 @@ IDS_ASKFORPASSWORD "Heslo: " IDS_FORCELOGOFF "Toto spÃ´sobÃ odhlÃ¡senie aktuÃ¡lneho pouÅ¾ÃvateÄ¾a a stratu vÅ¡etkÃ½ch neuloÅ¾enÃ½ch Ãºdajov. Chcete pokraÄovaÅ¥?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN,148, 122, 86, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¿ÐµÐºÐ°" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Ð©Ð¾ ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð·ÑÐ¾Ð±Ð¸ÑÐ¸?",IDC_STATIC, 86, 60, 87, 8 - PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6, 76, 70, 14 - PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80, 76, 80, 14 - PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN, 165, 76, 86, 14 - PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ",IDC_TASKMGR, 80, 95, 80, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL, 165, 95, 86, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Ð©Ð¾ ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð·ÑÐ¾Ð±Ð¸ÑÐ¸?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6,135, 70, 14 + PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80,135, 80, 14 + PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN, 165,135, 86, 14 + PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ",IDC_TASKMGR, 80,154, 80, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL, 165,154, 86, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ñ: " IDS_FORCELOGOFF "Ð¦Ðµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÐµÐ°Ð½Ñ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ñ Ð²ÑÑ Ð½ÐµÐ·Ð±ÐµÑÐµÐ¶ÐµÐ½Ñ Ð´Ð°Ð½Ñ Ð±ÑÐ´ÑÑÑ Ð·Ð°Ð³ÑÐ±Ð»ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -428,6 +428,9 @@ goto cleanup; } + /* Store the logon time in the context */ + GetLocalTime(&pgContext->LogonTime); + /* Store user and domain in the context */ wcscpy(pgContext->UserName, UserName); if (Domain == NULL || wcslen(Domain) == 0) Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -6,6 +6,7 @@ #include <wincon.h> #include <winreg.h> #include <wingdi.h> +#include <winnls.h> #include <winsvc.h> #include <winuser.h> #include <userenv.h> @@ -31,6 +32,7 @@ /* Informations to be filled during logon */ WCHAR UserName[256]; WCHAR Domain[256]; + SYSTEMTIME LogonTime; HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions; Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -17,6 +17,8 @@ #define IDC_ROSLOGO 1007 #define IDC_TASKMGR 1008 #define IDC_LOCKMSG 1009 +#define IDC_LOGONMSG 1010 +#define IDC_LOGONDATE 1011 #define IDI_ROSLOGO 20000 @@ -29,5 +31,7 @@ #define IDS_ASKFORPASSWORD 40004 #define IDS_FORCELOGOFF 40005 #define IDS_LOCKMSG 40006 +#define IDS_LOGONMSG 40007 +#define IDS_LOGONDATE 40008 /* EOF */

11 years, 8 months

[tkreuzer] 58341: [FREELDR] Implement HeapVerify(), fix a buffer overrun. CORE-6893 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 18 20:09:50 2013 New Revision: 58341 URL: http://svn.reactos.org/svn/reactos?rev=58341&view=rev Log: [FREELDR] Implement HeapVerify(), fix a buffer overrun. CORE-6893 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/mm/heap.c Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -133,6 +133,10 @@ PVOID HeapHandle); VOID +HeapVerify( + PVOID HeapHandle); + +VOID HeapCleanupAll(VOID); PVOID Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -190,7 +190,7 @@ RtlZeroMemory(Section, sizeof(INI_SECTION)); // Allocate the section name buffer - Section->SectionName = MmHeapAlloc(strlen(SectionName)); + Section->SectionName = MmHeapAlloc(strlen(SectionName) + sizeof(CHAR)); if (!Section->SectionName) { MmHeapFree(Section); Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -149,6 +149,32 @@ LoaderFirmwareTemporary); } +#ifdef FREELDR_HEAP_VERIFIER +VOID +HeapVerify( + PVOID HeapHandle) +{ + PHEAP Heap = HeapHandle; + PHEAP_BLOCK Block; + + /* Loop all heap chunks */ + for (Block = &Heap->Blocks; + Block->Size != 0; + Block = Block + 1 + Block->Size) + { + /* Continue, if its not free */ + if (Block->Tag != 0) + { + /* Verify size and redzones */ + ASSERT(*REDZONE_SIZE(Block) <= Block->Size * sizeof(HEAP_BLOCK)); + ASSERT(*REDZONE_LOW(Block) == REDZONE_MARK); + ASSERT(*REDZONE_HI(Block) == REDZONE_MARK); + continue; + } + } +} +#endif /* FREELDR_HEAP_VERIFIER */ + VOID HeapRelease( PVOID HeapHandle) @@ -296,6 +322,9 @@ ULONGLONG Time = __rdtsc(); #ifdef FREELDR_HEAP_VERIFIER + /* Verify the heap */ + HeapVerify(HeapHandle); + /* Add space for a size field and 2 redzones */ ByteSize += REDZONE_ALLOCATION; #endif @@ -408,6 +437,11 @@ TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); ASSERT(Tag != 'dnE#'); +#ifdef FREELDR_HEAP_VERIFIER + /* Verify the heap */ + HeapVerify(HeapHandle); +#endif + /* Check if the block is really inside this heap */ if ((Pointer < (PVOID)(Heap + 1)) || (Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize)))

11 years, 8 months

[tkreuzer] 58340: [WLANCONF] Fix a bug, I introduced.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 19:08:39 2013 New Revision: 58340 URL: http://svn.reactos.org/svn/reactos?rev=58340&view=rev Log: [WLANCONF] Fix a bug, I introduced. Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 19:08:39 2013 @@ -562,6 +562,7 @@ BOOL WlanConnect(HANDLE hAdapter) { + CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; BOOL bSuccess; DWORD dwBytesReturned, SetOidSize; PNDISUIO_SET_OID SetOid; @@ -706,8 +707,9 @@ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - RtlCopyMemory(Ssid->Ssid, sSsid, wcslen(sSsid)); - Ssid->SsidLength = wcslen(sSsid); + snprintf(SsidBuffer, sizeof(SsidBuffer), "%S", sSsid); + RtlCopyMemory(Ssid->Ssid, SsidBuffer, strlen(SsidBuffer)); + Ssid->SsidLength = strlen(SsidBuffer); bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE,

11 years, 8 months

[tkreuzer] 58339: [WLANCONF] - Convert to UNICODE - rewrite CharToHex()

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 18:48:59 2013 New Revision: 58339 URL: http://svn.reactos.org/svn/reactos?rev=58339&view=rev Log: [WLANCONF] - Convert to UNICODE - rewrite CharToHex() Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 18:48:59 2013 @@ -25,8 +25,8 @@ BOOL bScan = FALSE; BOOL bConnect = FALSE; -char *sSsid = NULL; -char *sWepKey = NULL; +WCHAR *sSsid = NULL; +WCHAR *sWepKey = NULL; BOOL bAdhoc = FALSE; BOOL bDisconnect = FALSE; @@ -35,12 +35,12 @@ the command prompt. */ VOID PrintResourceString(INT resID, ...) { - TCHAR szMsgBuf[MAX_BUFFER_SIZE]; + WCHAR szMsgBuf[MAX_BUFFER_SIZE]; va_list arg_ptr; va_start(arg_ptr, resID); - LoadString(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); - _vtprintf(szMsgBuf, arg_ptr); + LoadStringW(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); + vwprintf(szMsgBuf, arg_ptr); va_end(arg_ptr); } @@ -49,22 +49,22 @@ LPVOID lpMsgBuf; DWORD RetVal; - if ((RetVal = FormatMessage( + if ((RetVal = FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, + (LPWSTR) &lpMsgBuf, 0, NULL ))) { - _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + printf("%S", (LPWSTR)lpMsgBuf); LocalFree(lpMsgBuf); - /* return number of TCHAR's stored in output buffer + /* return number of WCHAR's stored in output buffer * excluding '\0' - as FormatMessage does*/ return RetVal; } @@ -285,47 +285,18 @@ static UCHAR -CharToHex(CHAR Char) -{ - Char = toupper(Char); - - switch (Char) - { - case '0': - return 0x0; - case '1': - return 0x1; - case '2': - return 0x2; - case '3': - return 0x3; - case '4': - return 0x4; - case '5': - return 0x5; - case '6': - return 0x6; - case '7': - return 0x7; - case '8': - return 0x8; - case '9': - return 0x9; - case 'A': - return 0xA; - case 'B': - return 0xB; - case 'C': - return 0xC; - case 'D': - return 0xD; - case 'E': - return 0xE; - case 'F': - return 0xF; - default: - return 0; - } +CharToHex(WCHAR Char) +{ + if ((Char >= L'0') && (Char <= L'9')) + return Char - L'0'; + + if ((Char >= L'a') && (Char <= L'f')) + return Char - L'a' + 10; + + if ((Char >= L'A') && (Char <= L'F')) + return Char - L'A' + 10; + + return 0; } BOOL @@ -338,7 +309,7 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; - TCHAR szMsgBuf[128]; + WCHAR szMsgBuf[128]; QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); @@ -393,19 +364,19 @@ PrintResourceString(IDS_MSG_CURRENT_WIRELESS); } - _tprintf(_T("SSID: %hs\n"), SsidBuffer); - - _tprintf(_T("BSSID: ")); + printf("SSID: %s\n", SsidBuffer); + + printf("BSSID: "); for (i = 0; i < sizeof(NDIS_802_11_MAC_ADDRESS); i++) { UINT BssidData = QueryOid->Data[i]; - _tprintf(_T("%.2x"), BssidData); + printf("%.2x", BssidData); if (i != sizeof(NDIS_802_11_MAC_ADDRESS) - 1) - _tprintf(_T(":")); - } - _tprintf(_T("\n")); + printf(":"); + } + printf("\n"); HeapFree(GetProcessHeap(), 0, QueryOid); QueryOidSize = sizeof(NDISUIO_QUERY_OID); @@ -429,10 +400,10 @@ return FALSE; } - LoadString(GetModuleHandle(NULL), - *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_NETWORK_MODE, szMsgBuf); QueryOid->Oid = OID_802_11_WEP_STATUS; @@ -451,13 +422,13 @@ return FALSE; } - LoadString(GetModuleHandle(NULL), - *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_WEP_ENABLED, szMsgBuf); - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_RSSI; bSuccess = DeviceIoControl(hAdapter, @@ -471,7 +442,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("RSSI: %i dBm\n"), *(PINT)QueryOid->Data); + printf("RSSI: %i dBm\n", *(PINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_TX_POWER_LEVEL; @@ -490,7 +461,7 @@ PrintResourceString(IDS_MSG_TRANSMISSION_POWER, *(PUINT)QueryOid->Data); } - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_NUMBER_OF_ANTENNAS; @@ -548,7 +519,7 @@ PrintResourceString(IDS_MSG_RECEIVE_ANTENNA_ANY); } - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_FRAGMENTATION_THRESHOLD; @@ -584,7 +555,7 @@ HeapFree(GetProcessHeap(), 0, QueryOid); - _tprintf(_T("\n")); + printf("\n"); return TRUE; } @@ -646,7 +617,7 @@ SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + - (strlen(sWepKey) >> 1); + (wcslen(sWepKey) >> 1); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; @@ -656,7 +627,7 @@ WepData = (PNDIS_802_11_WEP)SetOid->Data; WepData->KeyIndex = 0x80000000; - WepData->KeyLength = strlen(sWepKey) >> 1; + WepData->KeyLength = wcslen(sWepKey) >> 1; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; /* Assemble the hex key */ @@ -735,8 +706,8 @@ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); - Ssid->SsidLength = strlen(sSsid); + RtlCopyMemory(Ssid->Ssid, sSsid, wcslen(sSsid)); + Ssid->SsidLength = wcslen(sSsid); bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, @@ -766,7 +737,7 @@ DWORD QueryOidSize; PNDIS_802_11_BSSID_LIST BssidList; DWORD i, j; - TCHAR szMsgBuf[128]; + WCHAR szMsgBuf[128]; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; @@ -824,29 +795,29 @@ RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); SsidBuffer[Ssid->SsidLength] = 0; - _tprintf(_T("\nSSID: %hs\n"), SsidBuffer); - - _tprintf(_T("BSSID: ")); + printf("\nSSID: %s\n", SsidBuffer); + + printf("BSSID: "); for (j = 0; j < sizeof(NDIS_802_11_MAC_ADDRESS); j++) { UINT BssidData = BssidInfo->MacAddress[j]; - _tprintf(_T("%.2x"), BssidData); + printf("%.2x", BssidData); if (j != sizeof(NDIS_802_11_MAC_ADDRESS) - 1) - _tprintf(_T(":")); + printf(":"); } - _tprintf(_T("\n")); - - LoadString(GetModuleHandle(NULL), - BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, - szMsgBuf, - COUNT_OF(szMsgBuf)); + printf("\n"); + + LoadStringW(GetModuleHandle(NULL), + BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_ENCRYPTED, szMsgBuf); - LoadString(GetModuleHandle(NULL), - NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_NETWORK_TYPE, szMsgBuf); PrintResourceString(IDS_MSG_RSSI, (int)Rssi); PrintResourceString(IDS_MSG_SUPPORT_RATE); @@ -863,16 +834,16 @@ if (Rate & 0x01) { /* Bit 0 is set so we need to add 0.5 */ - _tprintf(_T("%u.5 "), (Rate >> 1)); + printf("%u.5 ", (Rate >> 1)); } else { /* Bit 0 is clear so just print the conversion */ - _tprintf(_T("%u "), (Rate >> 1)); + printf("%u ", (Rate >> 1)); } } } - _tprintf(_T("\n")); + printf("\n"); /* Move to the next entry */ BssidInfo = (PNDIS_WLAN_BSSID)((PUCHAR)BssidInfo + BssidInfo->Length); @@ -884,23 +855,23 @@ return bSuccess; } -BOOL ParseCmdline(int argc, char *argv[]) +BOOL ParseCmdline(int argc, WCHAR *argv[]) { INT i; for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') + if (argv[i][0] == L'-') { switch (argv[i][1]) { - case 's': + case L's': bScan = TRUE; break; - case 'd': + case L'd': bDisconnect = TRUE; break; - case 'c': + case L'c': if (i == argc - 1) { PrintResourceString(IDS_USAGE); @@ -909,7 +880,7 @@ bConnect = TRUE; sSsid = argv[++i]; break; - case 'w': + case L'w': if (i == argc - 1) { PrintResourceString(IDS_USAGE); @@ -917,7 +888,7 @@ } sWepKey = argv[++i]; break; - case 'a': + case L'a': bAdhoc = TRUE; break; default : @@ -936,7 +907,7 @@ return TRUE; } -int _tmain(int argc, char *argv[]) +int wmain(int argc, WCHAR *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo;

11 years, 8 months

[tkreuzer] 58338: [WLANCONF] Compile as UNICODE.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 18:11:16 2013 New Revision: 58338 URL: http://svn.reactos.org/svn/reactos?rev=58338&view=rev Log: [WLANCONF] Compile as UNICODE. Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Sun Feb 17 18:11:16 2013 @@ -4,12 +4,6 @@ ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(NOT MSVC) - #add_target_compile_flags(wlanconf "-Wno-format") - set_source_files_properties(wlanconf.c PROPERTIES COMPILE_FLAGS "-Wno-format") -endif() - -set_module_type(wlanconf win32cui) +set_module_type(wlanconf win32cui UNICODE) add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 18:11:16 2013 @@ -936,7 +936,7 @@ return TRUE; } -int main(int argc, char *argv[]) +int _tmain(int argc, char *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo;

11 years, 8 months

[janderwald] 58337: [HOTPLUG] - start on safely remove hardware applet - resources are not yet commited

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 17 15:51:07 2013 New Revision: 58337 URL: http://svn.reactos.org/svn/reactos?rev=58337&view=rev Log: [HOTPLUG] - start on safely remove hardware applet - resources are not yet commited Added: trunk/reactos/dll/cpl/hotplug/ (with props) trunk/reactos/dll/cpl/hotplug/CMakeLists.txt (with props) trunk/reactos/dll/cpl/hotplug/enum.c (with props) trunk/reactos/dll/cpl/hotplug/hotplug.c (with props) trunk/reactos/dll/cpl/hotplug/hotplug.h (with props) trunk/reactos/dll/cpl/hotplug/hotplug.rc (with props) trunk/reactos/dll/cpl/hotplug/hotplug.spec (with props) trunk/reactos/dll/cpl/hotplug/resource.h (with props) trunk/reactos/dll/cpl/hotplug/rsrc.rc (with props) Propchange: trunk/reactos/dll/cpl/hotplug/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Feb 17 15:51:07 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/hotplug/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/hotplug/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/hotplug/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/cpl/hotplug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/CMakeLists.txt (added) +++ trunk/reactos/dll/cpl/hotplug/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,26 @@ + + +spec2def(hotplug.dll hotplug.spec) + +list(APPEND SOURCE + hotplug.c + enum.c + hotplug.rc + ${CMAKE_CURRENT_BINARY_DIR}/hotplug.def) + +add_library(hotplug SHARED ${SOURCE}) + +set_module_type(hotplug win32dll UNICODE) + +add_importlibs(hotplug + msvcrt + user32 + gdi32 + advapi32 + ntdll + setupapi + comctl32 + kernel32) + +add_pch(hotplug hotplug.h) +add_cd_file(TARGET hotplug DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/cpl/hotplug/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/enum.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/enum.c (added) +++ trunk/reactos/dll/cpl/hotplug/enum.c [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,7 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/hotplug/hotplug.c + * PURPOSE: device enumeration + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ Propchange: trunk/reactos/dll/cpl/hotplug/enum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/hotplug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/hotplug.c?… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/hotplug.c (added) +++ trunk/reactos/dll/cpl/hotplug/hotplug.c [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,87 @@ +/* +* PROJECT: Safely Remove Hardware Applet +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/cpl/hotplug/hotplug.c +* PURPOSE: applet initialization +* PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) +*/ + +#include "hotplug.h" + +// globals +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, InitApplet} +}; + + +LONG +APIENTRY +InitApplet( + HWND hwnd, + UINT uMsg, + LPARAM wParam, + LPARAM lParam) +{ + // TODO + return FALSE; +} + + +LONG +CALLBACK +CPlApplet( + HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->idIcon = Applets[0].idIcon; + CPlInfo->idName = Applets[0].idName; + CPlInfo->idInfo = Applets[0].idDescription; + break; + } + case CPL_DBLCLK: + { + InitApplet(hwndCPl, uMsg, lParam1, lParam2); + break; + } + } + return FALSE; +} + + +INT +WINAPI +DllMain( + HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/cpl/hotplug/hotplug.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/hotplug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/hotplug.h?… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/hotplug.h (added) +++ trunk/reactos/dll/cpl/hotplug/hotplug.h [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,41 @@ +#pragma once + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <wincon.h> +#include <commctrl.h> +#include <cpl.h> +#include <tchar.h> +#include <limits.h> + +#include "resource.h" + +// Globals +extern HINSTANCE hApplet; + +// defines +#define NUM_APPLETS (1) + +// global structures +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +}APPLET, *PAPPLET; + + + +// hotplug.c +LONG +APIENTRY +InitApplet( + HWND hwnd, + UINT uMsg, + LPARAM wParam, + LPARAM lParam); Propchange: trunk/reactos/dll/cpl/hotplug/hotplug.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/hotplug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/hotplug.rc… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/hotplug.rc (added) +++ trunk/reactos/dll/cpl/hotplug/hotplug.rc [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Safely Remove Hardware Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/hotplug/hotplug.rc + * PURPOSE: main resource file + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hardware Safe Removal Support\0" +#define REACTOS_STR_INTERNAL_NAME "hotplug\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hotplug.dll\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/hotplug/hotplug.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/hotplug.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/hotplug.sp… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/hotplug.spec (added) +++ trunk/reactos/dll/cpl/hotplug/hotplug.spec [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,12 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +;@ stub HotPlugChildWithInvalidIdW +;@ stub HotPlugDriverBlockedW +;@ stub HotPlugEjectDevice +;@ stub HotPlugEjectDeviceEx +;@ stub HotPlugEjectVetoedW +;@ stub HotPlugHibernateVetoedW +;@ stub HotPlugRemovealVetoedW +;@ stub HotPlugSafeRemovalDriveNotificationW +;@ stub HotPlugSafeRemovalNotificationW +;@ stub HotPlugStandyVetoedW +;@ stub HotPlugWarmEjectVetoedW Propchange: trunk/reactos/dll/cpl/hotplug/hotplug.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/resource.h (added) +++ trunk/reactos/dll/cpl/hotplug/resource.h [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,11 @@ + +// dialog ids +#define IDD_SAFE_REMOVE_HARDWARE_DIALOG 100 +#define IDD_CONFIRM_STOP_HARDWARE_DIALOG 101 + +// resource strings ids +#define IDS_CPLNAME 1000 +#define IDS_CPLDESCRIPTION 1001 + +// control ids +#define IDC_CPLICON 10000 Propchange: trunk/reactos/dll/cpl/hotplug/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/hotplug/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/rsrc.rc?re… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/rsrc.rc (added) +++ trunk/reactos/dll/cpl/hotplug/rsrc.rc [iso-8859-1] Sun Feb 17 15:51:07 2013 @@ -1,0 +1,8 @@ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/dll/cpl/hotplug/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 8 months

[tkreuzer] 58336: Amendment to r58335

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 15:12:16 2013 New Revision: 58336 URL: http://svn.reactos.org/svn/reactos?rev=58336&view=rev Log: Amendment to r58335 Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/tests/README.txt trunk/rostests/tests/mmixer_test/CMakeLists.txt Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:12:16 2013 @@ -24,4 +24,4 @@ add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h) -add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all) Modified: trunk/rostests/tests/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/README.txt?rev=5833… ============================================================================== --- trunk/rostests/tests/README.txt [iso-8859-1] (original) +++ trunk/rostests/tests/README.txt [iso-8859-1] Sun Feb 17 15:12:16 2013 @@ -1,4 +1,4 @@ This folder contains tests that are not merged in to the new regression testing system. -Please DO NOT add new tests here. +Please DO NOT add new tests here. Modified: trunk/rostests/tests/mmixer_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/CMakeLi… ============================================================================== --- trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:12:16 2013 @@ -8,4 +8,4 @@ set_module_type(mmixer_test win32cui) target_link_libraries(mmixer_test mmixer) -add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32) +add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)

11 years, 8 months

[tkreuzer] 58335: Add a large number of missing newlines at the end of text files.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 15:06:22 2013 New Revision: 58335 URL: http://svn.reactos.org/svn/reactos?rev=58335&view=rev Log: Add a large number of missing newlines at the end of text files. Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/network/telnet/doc/ssh.txt trunk/reactos/base/services/tcpsvcs/CMakeLists.txt trunk/reactos/base/shell/cmd/todo.txt trunk/reactos/boot/bootdata/readme.txt trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/drivers/softpipe/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt trunk/reactos/dll/win32/nddeapi/CMakeLists.txt trunk/reactos/dll/win32/odbc32/README.txt trunk/reactos/dll/win32/setupapi/res/Icon_Licence/Tango.txt trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt trunk/reactos/dll/win32/smdll/readme.txt trunk/reactos/dll/win32/softpub/CMakeLists.txt trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt trunk/reactos/drivers/filesystems/mup/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/hid/hidparse/CMakeLists.txt trunk/reactos/drivers/hid/hidusb/CMakeLists.txt trunk/reactos/drivers/hid/mouhid/CMakeLists.txt trunk/reactos/drivers/ksfilter/CMakeLists.txt trunk/reactos/drivers/network/tcpip/notes.txt trunk/reactos/drivers/storage/ide/uniata/todo.txt trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt trunk/reactos/include/ndk/gpl.txt trunk/reactos/include/ndk/lgpl.txt trunk/reactos/include/ndk/ndk.txt trunk/reactos/include/reactos/wine/CMakeLists.txt trunk/reactos/lib/drivers/chew/CMakeLists.txt trunk/reactos/lib/drivers/csq/CMakeLists.txt trunk/reactos/lib/drivers/lwip/doc/contrib.txt trunk/reactos/lib/drivers/lwip/doc/savannah.txt trunk/reactos/lib/recyclebin/readme.txt trunk/reactos/lib/rtl/readme.txt trunk/reactos/lib/sdk/crt/README.txt trunk/reactos/lib/sdk/delayimp/CMakeLists.txt trunk/reactos/lib/sdk/nt/CMakeLists.txt trunk/reactos/media/CMakeLists.txt trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt trunk/reactos/media/doc/LPC.txt trunk/reactos/media/doc/locks.txt trunk/reactos/media/fonts/CMakeLists.txt trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/vgafonts/CMakeLists.txt trunk/reactos/tools/cabman/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt trunk/reactos/win32ss/reactx/dxapi/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -36,4 +36,4 @@ add_subdirectory(winhlp32) add_subdirectory(winver) add_subdirectory(wordpad) -add_subdirectory(write) +add_subdirectory(write) Modified: trunk/reactos/base/applications/network/telnet/doc/ssh.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/doc/ssh.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/doc/ssh.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -19,4 +19,4 @@ 3) Get Openssh from http://www.openssh.com 4) Modify Openssh so it will compile, and get rid of all the termios stuff -Obviously this is a lot of work. If you need a good ssh client, try PuTTY from http://www.chiark.greenend.org.uk/~sgtatham/putty/. It may be possible to integrate PuTTY and Telnet, and that would certainly be easier than the above option. PuTTY is licensed under the MIT license, which seems to be compatible with the GPL. The primary advantage of integrating the two projects is that PuTTY would gain the key mappings that telnet has, and telnet would gain encryption. +Obviously this is a lot of work. If you need a good ssh client, try PuTTY from http://www.chiark.greenend.org.uk/~sgtatham/putty/. It may be possible to integrate PuTTY and Telnet, and that would certainly be easier than the above option. PuTTY is licensed under the MIT license, which seems to be compatible with the GPL. The primary advantage of integrating the two projects is that PuTTY would gain the key mappings that telnet has, and telnet would gain encryption. Modified: trunk/reactos/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/CMak… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -19,4 +19,4 @@ add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc FOR all) Modified: trunk/reactos/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/todo.txt?re… ============================================================================== --- trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -21,4 +21,4 @@ Not sure where to put this code even *Reg Testing -We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. +We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -51,4 +51,4 @@ 6. Author --------- -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +This document was written by Jason Filby (jasonfilby(a)yahoo.com). Modified: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/Mesa_for_ReactO… ============================================================================== --- trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -39,4 +39,4 @@ ___________________ Those files were written using the Sconscript and source list files as reference. I think that diff-ing them between two -versions would permit to easily update the cmake configuration files. +versions would permit to easily update the cmake configuration files. Modified: trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -3,4 +3,4 @@ add_subdirectory(drivers/softpipe) add_subdirectory(state_trackers/wgl) add_subdirectory(targets/libgl-gdi) -add_subdirectory(winsys/sw/gdi) +add_subdirectory(winsys/sw/gdi) Modified: trunk/reactos/dll/opengl/mesa/src/gallium/drivers/softpipe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/drivers/softpipe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/drivers/softpipe/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -28,4 +28,4 @@ sp_tex_sample.c sp_tex_tile_cache.c sp_texture.c - sp_tile_cache.c) + sp_tile_cache.c) Modified: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,4 +1,4 @@ add_definitions(-DWIN32_LEAN_AND_MEAN) -add_library(gallium_ws_gdi STATIC EXCLUDE_FROM_ALL gdi_sw_winsys.c) +add_library(gallium_ws_gdi STATIC EXCLUDE_FROM_ALL gdi_sw_winsys.c) Modified: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -47,4 +47,4 @@ *) must be preserved across function calls Integer arguments from list: rdi,rsi,rdx,rcx,r8,r9,stack -Floating point arguments from list: xmm0-xmm7 +Floating point arguments from list: xmm0-xmm7 Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -15,4 +15,4 @@ add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) add_dependencies(msacm32.drv psdk) -add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -16,4 +16,4 @@ add_importlibs(nddeapi kernel32 ntdll) add_dependencies(nddeapi psdk) -add_cd_file(TARGET nddeapi DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET nddeapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/odbc32/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/README.tx… ============================================================================== --- trunk/reactos/dll/win32/odbc32/README.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/README.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,3 +1,3 @@ This stub odbc32.dll is based on the WINE odbc32 implementation except ours doesnt work. Someone will need to import Unix-ODBC in to ReactOS CVS and merge it with this implemenation. -I only created this because MFC depends on odbc32.dll +I only created this because MFC depends on odbc32.dll Modified: trunk/reactos/dll/win32/setupapi/res/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/Ico… ============================================================================== --- trunk/reactos/dll/win32/setupapi/res/Icon_Licence/Tango.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/res/Icon_Licence/Tango.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -44,4 +44,4 @@ Please see COPYING for details 20.ico -23.ico +23.ico Modified: trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -124,4 +124,4 @@ 16715.ico 16717.ico 16718.ico -16721.ico +16721.ico Modified: trunk/reactos/dll/win32/smdll/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/readme.txt… ============================================================================== --- trunk/reactos/dll/win32/smdll/readme.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/readme.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -40,4 +40,4 @@ - call SmCompleteSession (hSmApiPort, hSbApiPort, hApiPort) -- manage processes etc. +- manage processes etc. Modified: trunk/reactos/dll/win32/softpub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/softpub/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/softpub/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/softpub/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -13,4 +13,4 @@ add_importlibs(softpub wintrust) -add_cd_file(TARGET softpub DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET softpub DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/CM… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -14,4 +14,4 @@ add_pch(cmbatt cmbatt.h) -add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -12,4 +12,4 @@ add_pch(compbatt compbatt.h) -add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/CM… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -7,4 +7,4 @@ set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) add_pch(mup mup.h) -add_cd_file(TARGET mup DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET mup DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -18,4 +18,4 @@ add_importlibs(hidclass ntoskrnl hidparse hal) add_dependencies(hidclass bugcodes) -add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -14,4 +14,4 @@ target_link_libraries(hidparse hidparser) -add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/CMakeLi… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -8,4 +8,4 @@ set_module_type(hidusb kernelmodedriver) add_importlibs(hidusb hidclass ntoskrnl usbd hal) -add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/CMakeLi… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -8,4 +8,4 @@ set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) -add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/ksfilter/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/CMakeList… ============================================================================== --- trunk/reactos/drivers/ksfilter/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,3 +1,3 @@ add_subdirectory(ks) -add_subdirectory(swenum) +add_subdirectory(swenum) Modified: trunk/reactos/drivers/network/tcpip/notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/note… ============================================================================== --- trunk/reactos/drivers/network/tcpip/notes.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/notes.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -32,4 +32,4 @@ http://www.faqs.org/rfcs/rfc2525.html RFC 2581 - TCP Congestion Control -http://www.faqs.org/rfcs/rfc2581.html +http://www.faqs.org/rfcs/rfc2581.html Modified: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/todo.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/todo.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -254,4 +254,4 @@ 158.implement .INF generator 159.fix bug with invalid INF section under XP+ (43e2) 160.add INF handler for SCSI\NET\VEN_UNIATA&PROD_MANAGEMENT_PORT -161. +161. Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -4,4 +4,4 @@ add_subdirectory(usbhub) add_subdirectory(usbohci) add_subdirectory(usbstor) -add_subdirectory(usbuhci) +add_subdirectory(usbuhci) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -98,4 +98,4 @@ 0.9.3: - bug fixes for multi channel audio -- several other minor fixes +- several other minor fixes Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -22,4 +22,4 @@ add_pch(wdmaud wdmaud.h) add_importlibs(wdmaud ntoskrnl ks hal) -add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/include/ndk/gpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/gpl.txt?rev=58… ============================================================================== --- trunk/reactos/include/ndk/gpl.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/gpl.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -336,4 +336,4 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +Public License instead of this License. Modified: trunk/reactos/include/ndk/lgpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lgpl.txt?rev=5… ============================================================================== --- trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -499,4 +499,4 @@ <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice -That's all there is to it! +That's all there is to it! Modified: trunk/reactos/include/ndk/ndk.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ndk.txt?rev=58… ============================================================================== --- trunk/reactos/include/ndk/ndk.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ndk.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -26,4 +26,4 @@ The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Alex Ionescu or -the NDK Project Contributors. +the NDK Project Contributors. Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… ============================================================================== --- trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,4 +1,4 @@ add_idl_headers(wineheaders itss.idl) -add_iid_library(itss_guid itss.idl) +add_iid_library(itss_guid itss.idl) Modified: trunk/reactos/lib/drivers/chew/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/chew/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(chew workqueue.c) -add_dependencies(chew bugcodes) +add_dependencies(chew bugcodes) Modified: trunk/reactos/lib/drivers/csq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/CMakeLists… ============================================================================== --- trunk/reactos/lib/drivers/csq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(csq csq.c) -add_dependencies(csq bugcodes) +add_dependencies(csq bugcodes) Modified: trunk/reactos/lib/drivers/lwip/doc/contrib.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/contr… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/contrib.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/contrib.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -60,4 +60,3 @@ 1. If you have ported lwIP to a platform (an OS, a uC/processor or a combination of these) and you think it could benefit others[1] you might want discuss this on the mailing list. You can also ask for CVS access to submit and maintain your port in the contrib CVS module. - Modified: trunk/reactos/lib/drivers/lwip/doc/savannah.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/savan… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/savannah.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/savannah.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -132,4 +132,4 @@ http://savannah.nongnu.org/files/?group=lwip&highlight=0.6.3 You will have to submit this via the user News interface, then approve -this via the Administrator News interface. +this via the Administrator News interface. Modified: trunk/reactos/lib/recyclebin/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/readme.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -8,4 +8,4 @@ 3 levels - 1: recyclebin.c : Public C interface - 2: recyclebin_generic.c : 'System-wide' recycle bin, which knows no implementation detail -- 3: recyclebin_v5.c : Deals with recycle bins of Windows 2000/XP/2003 +- 3: recyclebin_v5.c : Deals with recycle bins of Windows 2000/XP/2003 Modified: trunk/reactos/lib/rtl/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/readme.txt?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/readme.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/readme.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -2,4 +2,4 @@ ExAllocatePool (and friends) must be used exclusively. RtlAllocateHeap (and friends) must NOT be used! ExAllocatePool (and friends) translate to RtlAllocateHeap (and friends) in ntdll\rtl\libsupp.c. -RtlEnterCriticalSection (and friends) must be used exclusively. ExAcquireFastMutex (and friends) must NOT be used! RtlEnterCriticalSection (and friends) translate to ExAcquireFastMutex (and friends) in ntoskrnl\rtl\libsupp.c. This means that RtlEnterCriticalSection (and friends) can NOT be used recursively in RTL. The reason for choosing RtlEnterCriticalSection (and friends) over ExAcquireFastMutex (and friends) is that the FAST_MUTEX struct is smaller than the RTL_CRITICAL_SECTION struct. +RtlEnterCriticalSection (and friends) must be used exclusively. ExAcquireFastMutex (and friends) must NOT be used! RtlEnterCriticalSection (and friends) translate to ExAcquireFastMutex (and friends) in ntoskrnl\rtl\libsupp.c. This means that RtlEnterCriticalSection (and friends) can NOT be used recursively in RTL. The reason for choosing RtlEnterCriticalSection (and friends) over ExAcquireFastMutex (and friends) is that the FAST_MUTEX struct is smaller than the RTL_CRITICAL_SECTION struct. Modified: trunk/reactos/lib/sdk/crt/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/README.txt?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/README.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/README.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -7,4 +7,4 @@ ReactOS has the only CRT, so no need to make distinct functions. 2. ReactOS compiles two versions of the CRT library, one for usermode (called just "crt"), and one version for kernelmode usage (called "libcntpr"). -In order to separate the code, you can use #ifdef _LIBCNT_ for libcntpr code. +In order to separate the code, you can use #ifdef _LIBCNT_ for libcntpr code. Modified: trunk/reactos/lib/sdk/delayimp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/CMakeList… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,4 +1,4 @@ add_definitions(-DUNICODE -D_UNICODE) add_library(delayimp delayimp.c) -add_dependencies(delayimp psdk) +add_dependencies(delayimp psdk) Modified: trunk/reactos/lib/sdk/nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/nt/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/sdk/nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/nt/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -1,3 +1,3 @@ add_library(nt entry_point.c) -add_dependencies(nt psdk) +add_dependencies(nt psdk) Modified: trunk/reactos/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/media/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -6,4 +6,4 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) Modified: trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/DdDeleteDirectDr… ============================================================================== --- trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -13,4 +13,4 @@ use NtGdiDdDeleteDirectDrawObject((HANDLE)DirectDrawGlobal->hDD); -to release a directdraw handler. +to release a directdraw handler. Modified: trunk/reactos/media/doc/LPC.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/LPC.txt?rev=5833… ============================================================================== --- trunk/reactos/media/doc/LPC.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/LPC.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -50,4 +50,4 @@ ========================== 2. Structures ========================== -SOON. TODO. +SOON. TODO. Modified: trunk/reactos/media/doc/locks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/locks.txt?rev=58… ============================================================================== --- trunk/reactos/media/doc/locks.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/locks.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -36,4 +36,4 @@ REPLACES: Executive Resources. ROS STATUS: Unimplemented. -TODO: Kernel Locks (Queued and In-Stack Spinlocks) +TODO: Kernel Locks (Queued and In-Stack Spinlocks) Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -54,4 +54,4 @@ foreach(item ${FONT_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts FOR all) -endforeach(item) +endforeach(item) Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -42,4 +42,4 @@ add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/inf FOR all) endforeach(item) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf DESTINATION reactos/inf FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf DESTINATION reactos/inf FOR all) Modified: trunk/reactos/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/CMakeLists.… ============================================================================== --- trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -18,4 +18,4 @@ add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB FOR all) -add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos FOR all) +add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos FOR all) Modified: trunk/reactos/tools/cabman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/cabman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -9,4 +9,4 @@ add_executable(cabman ${SOURCE}) -target_link_libraries(cabman zlibhost) +target_link_libraries(cabman zlibhost) Modified: trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -22,4 +22,4 @@ add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes) -add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/reactx/dxapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxapi/CMake… ============================================================================== --- trunk/reactos/win32ss/reactx/dxapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxapi/CMakeLists.txt [iso-8859-1] Sun Feb 17 15:06:22 2013 @@ -11,4 +11,4 @@ set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) -add_cd_file(TARGET dxapi DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET dxapi DESTINATION reactos/system32/drivers FOR all)

11 years, 8 months

[tkreuzer] 58334: [FREELDR] Split HwDetect() into 2 functions. InitializeBootDevices() and HwDetect(). This way we don't do the stuff twice.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 14:46:42 2013 New Revision: 58334 URL: http://svn.reactos.org/svn/reactos?rev=58334&view=rev Log: [FREELDR] Split HwDetect() into 2 functions. InitializeBootDevices() and HwDetect(). This way we don't do the stuff twice. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -28,7 +28,7 @@ ULONG SecondLevelDcacheFillSize; ULONG SecondLevelIcacheSize; ULONG SecondLevelIcacheFillSize; - + ARC_DISK_SIGNATURE reactos_arc_disk_info; ULONG reactos_disk_count; CHAR reactos_arc_hardware_data[256]; @@ -66,11 +66,11 @@ { /* Remember the pointer */ ArmBoardBlock = BootContext; - + /* Let's make sure we understand the LLB */ ASSERT(ArmBoardBlock->MajorVersion == ARM_BOARD_CONFIGURATION_MAJOR_VERSION); ASSERT(ArmBoardBlock->MinorVersion == ARM_BOARD_CONFIGURATION_MINOR_VERSION); - + /* This should probably go away once we support more boards */ ASSERT((ArmBoardBlock->BoardType == MACH_TYPE_FEROCEON) || (ArmBoardBlock->BoardType == MACH_TYPE_VERSATILE_PB) || @@ -92,33 +92,40 @@ IN unsigned Size) { PCCH Path = "ramdisk(0)"; - + /* Make sure enough space exists */ if (Size < sizeof(Path)) return FALSE; - + /* On ARM platforms, the loader is always in RAM */ strcpy(BootPath, Path); return TRUE; } +BOOLEAN +ArmInitializeBootDevices(VOID) +{ + /* Emulate old behavior */ + return ArmHwDetect != NULL; +} + PCONFIGURATION_COMPONENT_DATA ArmHwDetect(VOID) { ARM_CACHE_REGISTER CacheReg; - + /* Create the root node */ if (ArmHwDetectRan++) return RootNode; FldrCreateSystemKey(&RootNode); - + /* * TODO: * There's no such thing as "PnP" on embedded hardware. * The boot loader will send us a device tree, similar to ACPI * or OpenFirmware device trees, and we will convert it to ARC. */ - + /* Get cache information */ - CacheReg = KeArmCacheRegisterGet(); + CacheReg = KeArmCacheRegisterGet(); FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; FirstLevelDcacheFillSize <<= 2; @@ -129,16 +136,16 @@ SecondLevelDcacheFillSize = SecondLevelIcacheSize = SecondLevelIcacheFillSize = 0; - + /* Register RAMDISK Device */ RamDiskInitialize(); - + /* Fill out the ARC disk block */ reactos_arc_disk_info.Signature = 0xBADAB00F; reactos_arc_disk_info.CheckSum = 0xDEADBABE; reactos_arc_disk_info.ArcName = "ramdisk(0)"; reactos_disk_count = 1; - + /* Return the root node */ return RootNode; } @@ -182,7 +189,7 @@ MachVtbl.VideoGetDisplaySize = ArmBoardBlock->VideoGetDisplaySize; MachVtbl.VideoPutChar = ArmBoardBlock->VideoPutChar; MachVtbl.GetTime = ArmBoardBlock->GetTime; - + /* Setup board-specific ARM routines */ switch (ArmBoardBlock->BoardType) { @@ -194,33 +201,34 @@ /* Check for TI OMAP3 ZOOM-II MDK */ case MACH_TYPE_OMAP_ZOOM2: - + /* Setup the disk and file system buffers */ gDiskReadBuffer = 0x81094000; gFileSysBuffer = 0x81094000; break; - + /* Check for ARM Versatile PB boards */ case MACH_TYPE_VERSATILE_PB: - + /* Setup the disk and file system buffers */ gDiskReadBuffer = 0x00090000; gFileSysBuffer = 0x00090000; break; - + /* Check for TI OMAP3 Beagleboard */ case MACH_TYPE_OMAP3_BEAGLE: TuiPrintf("Not implemented\n"); while (TRUE); break; - + default: ASSERT(FALSE); } - + /* Setup generic ARM routines for all boards */ MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; + MachVtbl.InitializeBootDevices = ArmInitializeBootDevices; MachVtbl.HwDetect = ArmHwDetect; MachVtbl.DiskGetBootPath = ArmDiskGetBootPath; MachVtbl.HwIdle = ArmHwIdle; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -95,7 +95,7 @@ GetHarddiskIdentifier( UCHAR DriveNumber); -VOID +BOOLEAN HwInitializeBiosDisks(VOID); /* FUNCTIONS ****************************************************************/ @@ -1721,6 +1721,11 @@ /* FIXME: Detect more ISA devices */ } +BOOLEAN +PcInitializeBootDevices(VOID) +{ + return HwInitializeBiosDisks(); +} PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID) @@ -1729,8 +1734,6 @@ ULONG BusNumber = 0; TRACE("DetectHardware()\n"); - - HwInitializeBiosDisks(); /* Create the 'System' key */ SystemKey = DetectSystem(); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -269,7 +269,7 @@ } -VOID +BOOLEAN HwInitializeBiosDisks(VOID) { UCHAR DiskCount, DriveNumber; @@ -331,7 +331,7 @@ if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) { ERR("Reading MBR failed\n"); - return; + return FALSE; } Buffer = (ULONG*)DISKREADBUFFER; @@ -352,4 +352,5 @@ } PcBiosDiskCount = DiskCount; -} + return DiskCount != 0; +} Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -45,6 +45,7 @@ MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.GetTime = PcGetTime; + MachVtbl.InitializeBootDevices = PcInitializeBootDevices; MachVtbl.HwDetect = PcHwDetect; MachVtbl.HwIdle = PcHwIdle; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -51,6 +51,7 @@ MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; MachVtbl.GetTime = XboxGetTime; + MachVtbl.InitializeBootDevices = XboxInitializeBootDevices; MachVtbl.HwDetect = XboxHwDetect; MachVtbl.HwIdle = XboxHwIdle; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -509,6 +509,13 @@ return SystemKey; } +BOOLEAN +XboxInitializeBootDevices(VOID) +{ + // Emulate old behavior + return XboxHwDetect() != NULL; +} + VOID XboxHwIdle(VOID) { /* UNIMPLEMENTED */ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -197,8 +197,7 @@ ULONG SelectedOperatingSystem; ULONG i; - // FIXME: if possible, only detect and register ARC devices... - if (!MachHwDetect()) + if (!MachInitializeBootDevices()) { UiMessageBoxCritical("Error when detecting hardware"); return; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -57,6 +57,7 @@ TIMEINFO* XboxGetTime(VOID); +BOOLEAN XboxInitializeBootDevices(VOID); PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); VOID XboxHwIdle(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -57,6 +57,7 @@ TIMEINFO* PcGetTime(VOID); +BOOLEAN PcInitializeBootDevices(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); VOID PcHwIdle(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sun Feb 17 14:46:42 2013 @@ -1,4 +1,4 @@ -/* +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -68,6 +68,7 @@ TIMEINFO* (*GetTime)(VOID); ULONG (*GetRelativeTime)(VOID); + BOOLEAN (*InitializeBootDevices)(VOID); PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID); VOID (*HwIdle)(VOID); } MACHVTBL, *PMACHVTBL; @@ -122,6 +123,7 @@ #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) +#define MachInitializeBootDevices() MachVtbl.InitializeBootDevices() #define MachHwDetect() MachVtbl.HwDetect() #define MachHwIdle() MachVtbl.HwIdle()

11 years, 8 months

[tkreuzer] 58333: [HAL] Add missing asm dependency

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 14:36:30 2013 New Revision: 58333 URL: http://svn.reactos.org/svn/reactos?rev=58333&view=rev Log: [HAL] Add missing asm dependency Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sun Feb 17 14:36:30 2013 @@ -219,7 +219,7 @@ endif() target_link_libraries(halacpi libcntpr) add_importlibs(halacpi ntoskrnl) - add_dependencies(halacpi psdk bugcodes) + add_dependencies(halacpi psdk bugcodes asm) set_entrypoint(halacpi HalInitSystem@8) set_subsystem(halacpi native) set_image_base(halacpi 0x00010000) @@ -251,7 +251,7 @@ # hal add_library(hal SHARED ${HAL_SOURCE}) add_pch(hal include/hal.h) - add_dependencies(hal psdk bugcodes) + add_dependencies(hal psdk bugcodes asm) set_entrypoint(hal HalInitSystem) set_subsystem(hal native)

11 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2013