Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[gedmurphy] 25932: - call undocumented functions directly when building with MSVC and the MS PSDK - fixes building with MSVC note, this can be removed when bulding ROS with MSVC isn't reliant on the MS PSDK
by gedmurphy＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: gedmurphy Date: Thu Mar 1 02:43:12 2007 New Revision: 25932 URL: http://svn.reactos.org/svn/reactos?rev=25932&view=rev Log: - call undocumented functions directly when building with MSVC and the MS PSDK - fixes building with MSVC note, this can be removed when bulding ROS with MSVC isn't reliant on the MS PSDK Modified: trunk/reactos/dll/cpl/desk/preview.c Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Thu Mar 1 02:43:12 2007 @@ -312,6 +312,20 @@ CalculateItemSize(pPreviewData); } +#ifdef _MSC_VER + +#if _UNICODE +typedef BOOL (WINAPI * DCT_PROC)(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags); +#define DCT_ORD 178 +#else +typedef BOOL (WINAPI * DCT_PROC)(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCSTR str, UINT uFlags); +#define DCT_ORD 177 +#endif + +typedef DWORD (WINAPI * DMBT_PROC)(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont); +#define DMBT_ORD 186 + +#endif static VOID OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData) @@ -320,6 +334,19 @@ HFONT hOldFont; HDC hdc; RECT rc; + +#ifdef _MSC_VER + DCT_PROC DrawCaptionTemp; + DMBT_PROC DrawMenuBarTemp; + HMODULE hUser32; + + hUser32 = LoadLibrary(_T("user32.dll")); + if(hUser32 == NULL) + return FALSE; + + DrawCaptionTemp = (DCT_PROC)GetProcAddress(hUser32, (LPCSTR)DCT_ORD); + DrawMenuBarTemp = (DMBT_PROC)GetProcAddress(hUser32, (LPCSTR)DMBT_ORD); +#endif hdc = BeginPaint(hwnd, &ps);

1 0

[ekohl] 25931: Add code to support font size changes.
by ekohl＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ekohl Date: Thu Mar 1 01:49:34 2007 New Revision: 25931 URL: http://svn.reactos.org/svn/reactos?rev=25931&view=rev Log: Add code to support font size changes. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Thu Mar 1 01:49:34 2007 @@ -450,6 +450,24 @@ } +static INT +GetSelectedComboInt(HWND hwnd, INT id) +{ + TCHAR szBuffer[80]; + INT nCount; + + nCount = SendDlgItemMessage(hwnd, id, CB_GETCURSEL, 0, 0); + if (nCount == CB_ERR) + return 0; + + nCount = SendDlgItemMessage(hwnd, id, CB_GETLBTEXT, (WPARAM)nCount, (LPARAM)szBuffer); + if (nCount == CB_ERR) + return 0; + + return _ttoi(szBuffer); +} + + INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -556,8 +574,45 @@ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); break; - } + } + break; + + case IDC_ADVAPPEARANCE_FONTSIZE_E: + if (g && HIWORD(wParam) == CBN_SELCHANGE) + { + HDC hdcDlg = GetDC(hwndDlg); + INT i; + + switch (g->CurrentElement) + { + case IDX_INACTIVE_CAPTION: + case IDX_ACTIVE_CAPTION: + i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_MENU: + i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_DIALOG: + i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + } + + ReleaseDC(hwndDlg, hdcDlg); } break;

1 0

[ekohl] 25930: Use wsprintf() to convert an integer to a string instead of abusing a hidden edit control.
by ekohl＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ekohl Date: Wed Feb 28 23:44:47 2007 New Revision: 25930 URL: http://svn.reactos.org/svn/reactos?rev=25930&view=rev Log: Use wsprintf() to convert an integer to a string instead of abusing a hidden edit control. Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/id-ID.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/ru-RU.rc trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Wed Feb 28 23:44:47 2007 @@ -77,10 +77,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -105,8 +105,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Wed Feb 28 23:44:47 2007 @@ -82,10 +82,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -110,8 +110,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Wed Feb 28 23:44:47 2007 @@ -390,8 +390,7 @@ /* Fill font size combo */ for (i = 6; i <= 24; i++) { - SetDlgItemInt(hwndDlg, IDC_CONVERT, i, FALSE); - GetDlgItemText(hwndDlg, IDC_CONVERT, (LPTSTR)&Size, 3); + wsprintf(Size, TEXT("%d"), i); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, CB_ADDSTRING, 0, (LPARAM)&Size); } @@ -435,7 +434,6 @@ GetSelectedComboText(HWND hwnd, INT id, LPWSTR lpStr) { INT nCount; -// INT i; nCount = SendDlgItemMessage(hwnd, id, CB_GETCURSEL, 0, 0); if (nCount == CB_ERR) @@ -535,8 +533,6 @@ case IDC_ADVAPPEARANCE_FONT_C: if (g && HIWORD(wParam) == CBN_SELCHANGE) { -// MessageBeep(-1); - switch (g->CurrentElement) { case IDX_INACTIVE_CAPTION: Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Größe", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Wed Feb 28 23:44:47 2007 @@ -81,10 +81,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -109,8 +109,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Wed Feb 28 23:44:47 2007 @@ -75,10 +75,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -103,8 +103,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/id-ID.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/id-ID.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Elemen:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Ukuran", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Wed Feb 28 23:44:47 2007 @@ -75,10 +75,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -103,8 +103,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Wed Feb 28 23:44:47 2007 @@ -123,7 +123,6 @@ #define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 #define IDC_ADVAPPEARANCE_FONTBOLD 3116 #define IDC_ADVAPPEARANCE_FONTITALIC 3117 -#define IDC_CONVERT 3199 #define IDS_ELEMENT_0 3200 #define IDS_ELEMENT_1 3201 Modified: trunk/reactos/dll/cpl/desk/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/ru-RU.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/ru-RU.rc Wed Feb 28 23:44:47 2007 @@ -74,10 +74,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -102,8 +102,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Wed Feb 28 23:44:47 2007 @@ -77,10 +77,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - + LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -105,8 +105,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 - - EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188

1 0

[ion] 25929: - Make usetup ""work"" on systems with ~28MB+ RAM. Due to an unknown bug (in usetup or Mm, file copies during setup don't get flushed until memory reaches about 42-47% remaining. At this point, if enough memory is available, no more memory will be allocated, even though more files are being copied. On systems with < 48MB, the system will not usually flush pages fast enough to keep the memory at ~42-47%. We ""fix"" this by adding a delay to each file copy as long as free memory is be
by ion＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ion Date: Wed Feb 28 23:43:13 2007 New Revision: 25929 URL: http://svn.reactos.org/svn/reactos?rev=25929&view=rev Log: - Make usetup ""work"" on systems with ~28MB+ RAM. Due to an unknown bug (in usetup or Mm, file copies during setup don't get flushed until memory reaches about 42-47% remaining. At this point, if enough memory is available, no more memory will be allocated, even though more files are being copied. On systems with < 48MB, the system will not usually flush pages fast enough to keep the memory at ~42-47%. We ""fix"" this by adding a delay to each file copy as long as free memory is below 40%. - Also added 3 progress bars during memory transfers to show the status of the memory. Modified: trunk/reactos/base/setup/usetup/chkdsk.c trunk/reactos/base/setup/usetup/filequeue.h trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/progress.h Modified: trunk/reactos/base/setup/usetup/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/chkdsk.c… ============================================================================== --- trunk/reactos/base/setup/usetup/chkdsk.c (original) +++ trunk/reactos/base/setup/usetup/chkdsk.c Wed Feb 28 23:43:13 2007 @@ -64,6 +64,9 @@ yScreen - 14, xScreen - 7, yScreen - 10, + 10, + 24, + TRUE, "Setup is checking your disk"); ProgressSetStepCount(ChkdskProgressBar, 100); Modified: trunk/reactos/base/setup/usetup/filequeue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.h (original) +++ trunk/reactos/base/setup/usetup/filequeue.h Wed Feb 28 23:43:13 2007 @@ -65,6 +65,7 @@ ULONG TotalOperations; ULONG CompletedOperations; PPROGRESSBAR ProgressBar; + PPROGRESSBAR MemoryBars[4]; } COPYCONTEXT, *PCOPYCONTEXT; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… ============================================================================== --- trunk/reactos/base/setup/usetup/format.c (original) +++ trunk/reactos/base/setup/usetup/format.c Wed Feb 28 23:43:13 2007 @@ -96,6 +96,9 @@ yScreen - 14, xScreen - 7, yScreen - 10, + 10, + 24, + TRUE, "Setup is formatting your disk"); ProgressSetStepCount(FormatProgressBar, 100); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Feb 28 23:43:13 2007 @@ -2885,6 +2885,42 @@ return FILE_COPY_PAGE; } +VOID +NTAPI +SetupUpdateMemoryInfo(IN PCOPYCONTEXT CopyContext, + IN BOOLEAN First) +{ + SYSTEM_PERFORMANCE_INFORMATION PerfInfo; + + /* Get the memory information from the system */ + NtQuerySystemInformation(SystemPerformanceInformation, + &PerfInfo, + sizeof(PerfInfo), + NULL); + + /* Check if this is initial setup */ + if (First) + { + /* Set maximum limits to be total RAM pages */ + ProgressSetStepCount(CopyContext->MemoryBars[0], PerfInfo.CommitLimit); + ProgressSetStepCount(CopyContext->MemoryBars[1], PerfInfo.CommitLimit); + ProgressSetStepCount(CopyContext->MemoryBars[2], PerfInfo.CommitLimit); + } + + /* Set current values */ + ProgressSetStep(CopyContext->MemoryBars[0], PerfInfo.PagedPoolPages); + ProgressSetStep(CopyContext->MemoryBars[1], PerfInfo.NonPagedPoolPages); + ProgressSetStep(CopyContext->MemoryBars[2], PerfInfo.AvailablePages); + + /* Check if memory dropped below 40%! */ + if (CopyContext->MemoryBars[2]->Percent <= 40) + { + /* Wait a while until Mm does its thing */ + LARGE_INTEGER Interval; + Interval.QuadPart = -1 * 15 * 1000 * 100; + NtDelayExecution(FALSE, &Interval); + } +} static UINT CALLBACK FileCopyCallback(PVOID Context, @@ -2902,56 +2938,101 @@ CopyContext->TotalOperations = (ULONG)Param2; ProgressSetStepCount(CopyContext->ProgressBar, CopyContext->TotalOperations); + SetupUpdateMemoryInfo(CopyContext, TRUE); break; case SPFILENOTIFY_STARTCOPY: /* Display copy message */ CONSOLE_SetStatusText(" \xB3 Copying file: %S", (PWSTR)Param1); + SetupUpdateMemoryInfo(CopyContext, FALSE); break; case SPFILENOTIFY_ENDCOPY: CopyContext->CompletedOperations++; ProgressNextStep(CopyContext->ProgressBar); + SetupUpdateMemoryInfo(CopyContext, FALSE); break; } return 0; } - -static PAGE_NUMBER +static +PAGE_NUMBER FileCopyPage(PINPUT_RECORD Ir) { - COPYCONTEXT CopyContext; - - CONSOLE_SetStatusText(" \xB3 Please wait... "); - - CONSOLE_SetTextXY(11, 12, "Please wait while ReactOS Setup copies files to your ReactOS"); - CONSOLE_SetTextXY(30, 13, "installation folder."); - CONSOLE_SetTextXY(20, 14, "This may take several minutes to complete."); - - CopyContext.DestinationRootPath = DestinationRootPath.Buffer; - CopyContext.InstallPath = InstallPath.Buffer; - CopyContext.TotalOperations = 0; - CopyContext.CompletedOperations = 0; - CopyContext.ProgressBar = CreateProgressBar(13, - 26, - xScreen - 13, - yScreen - 20, - "Setup is copying files..."); - - SetupCommitFileQueueW(NULL, - SetupFileQueue, - FileCopyCallback, - &CopyContext); - - SetupCloseFileQueue(SetupFileQueue); - - DestroyProgressBar(CopyContext.ProgressBar); - - return REGISTRY_PAGE; -} - + COPYCONTEXT CopyContext; + + /* Display status text */ + CONSOLE_SetStatusText(" \xB3 Please wait... "); + + /* Displey information text */ + CONSOLE_SetTextXY(11, 12, "Please wait while ReactOS Setup copies files to your ReactOS"); + CONSOLE_SetTextXY(30, 13, "installation folder."); + CONSOLE_SetTextXY(20, 14, "This may take several minutes to complete."); + + /* Create context for the copy process */ + CopyContext.DestinationRootPath = DestinationRootPath.Buffer; + CopyContext.InstallPath = InstallPath.Buffer; + CopyContext.TotalOperations = 0; + CopyContext.CompletedOperations = 0; + + /* Create the progress bar as well */ + CopyContext.ProgressBar = CreateProgressBar(13, + 26, + xScreen - 13, + yScreen - 20, + 10, + 24, + TRUE, + "Setup is copying files..."); + + /* Create the paged pool progress bar */ + CopyContext.MemoryBars[0] = CreateProgressBar(13, + 40, + 18, + 43, + 10, + 44, + FALSE, + "Paged Memory"); + + /* Create the non paged pool progress bar */ + CopyContext.MemoryBars[1] = CreateProgressBar(28, + 40, + 33, + 43, + 24, + 44, + FALSE, + "Nonpaged Memory"); + + /* Create the global memory progress bar */ + CopyContext.MemoryBars[2] = CreateProgressBar(43, + 40, + 48, + 43, + 40, + 44, + FALSE, + "Free Memory"); + + /* Do the file copying */ + SetupCommitFileQueueW(NULL, + SetupFileQueue, + FileCopyCallback, + &CopyContext); + + /* If we get here, we're done, so cleanup the queue and progress bar */ + SetupCloseFileQueue(SetupFileQueue); + DestroyProgressBar(CopyContext.ProgressBar); + DestroyProgressBar(CopyContext.MemoryBars[0]); + DestroyProgressBar(CopyContext.MemoryBars[1]); + DestroyProgressBar(CopyContext.MemoryBars[2]); + + /* Go display the next page */ + return REGISTRY_PAGE; +} static PAGE_NUMBER RegistryPage(PINPUT_RECORD Ir) Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c (original) +++ trunk/reactos/base/setup/usetup/progress.c Wed Feb 28 23:43:13 2007 @@ -194,14 +194,17 @@ DrawBorder(Bar); /* Write Text Associated with Bar */ - CONSOLE_SetTextXY(10, 24, Bar->Text); + CONSOLE_SetTextXY(Bar->TextTop, Bar->TextRight, Bar->Text); /* Draw the progress bar "border" border */ - BarBorder.Top -= 5; - BarBorder.Bottom += 2; - BarBorder.Right += 5; - BarBorder.Left -= 5; - DrawThickBorder(&BarBorder); + if (Bar->Double) + { + BarBorder.Top -= 5; + BarBorder.Bottom += 2; + BarBorder.Right += 5; + BarBorder.Left -= 5; + DrawThickBorder(&BarBorder); + } /* Draw the bar */ coPos.X = Bar->Left + 1; @@ -229,6 +232,9 @@ SHORT Top, SHORT Right, SHORT Bottom, + SHORT TextTop, + SHORT TextRight, + IN BOOLEAN DoubleEdge, char* Text) { PPROGRESSBAR Bar; @@ -243,6 +249,9 @@ Bar->Top = Top; Bar->Right = Right; Bar->Bottom = Bottom; + Bar->TextTop = TextTop; + Bar->TextRight = TextRight; + Bar->Double = DoubleEdge; Bar->Text = Text; Bar->Width = Bar->Right - Bar->Left + 1; Modified: trunk/reactos/base/setup/usetup/progress.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.h (original) +++ trunk/reactos/base/setup/usetup/progress.h Wed Feb 28 23:43:13 2007 @@ -34,6 +34,8 @@ SHORT Top; SHORT Right; SHORT Bottom; + SHORT TextTop; + SHORT TextRight; SHORT Width; @@ -43,6 +45,7 @@ ULONG StepCount; ULONG CurrentStep; + BOOLEAN Double; CHAR *Text; } PROGRESSBAR, *PPROGRESSBAR; @@ -53,6 +56,9 @@ SHORT Top, SHORT Right, SHORT Bottom, + SHORT TextTop, + SHORT TextRight, + BOOLEAN DoubleEdge, char* Text); VOID

1 0

[ion] 25928: - More refactoring of FreeLDR/SetupLDR PE Loader Code to remove some hacks. - Don't double-free some entries when failing to load a boot driver. This would cause a crash when pciide couldn't load (since we don't yet import drivers in FreeLDR, and pciide needs pciidex). Thanks to encoded for reporting it. - We now free boot driver memory again since it's safe to do so again. This should reduce memory requirements even more.
by ion＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ion Date: Wed Feb 28 22:04:27 2007 New Revision: 25928 URL: http://svn.reactos.org/svn/reactos?rev=25928&view=rev Log: - More refactoring of FreeLDR/SetupLDR PE Loader Code to remove some hacks. - Don't double-free some entries when failing to load a boot driver. This would cause a crash when pciide couldn't load (since we don't yet import drivers in FreeLDR, and pciide needs pciidex). Thanks to encoded for reporting it. - We now free boot driver memory again since it's safe to do so again. This should reduce memory requirements even more. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Feb 28 22:04:27 2007 @@ -24,42 +24,6 @@ #include <debug.h> #undef DbgPrint -/* Base Addres of Kernel in Physical Memory */ -#define KERNEL_BASE_PHYS 0x200000 - -/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ -#define PFN_SHIFT 12 - -/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ -#define PDE_SHIFT 22 -#define PDE_SHIFT_PAE 18 - -/* Converts a Relative Address read from the Kernel into a Physical Address */ -#define RaToPa(p) \ - (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS) - -/* Converts a Physical Address Pointer into a Page Frame Number */ -#define PaPtrToPfn(p) \ - (((ULONG_PTR)&p) >> PFN_SHIFT) - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) \ - ((p) >> PFN_SHIFT) - -#define STARTUP_BASE 0xC0000000 -#define HYPERSPACE_BASE 0xC0400000 -#define HYPERSPACE_PAE_BASE 0xC0800000 -#define APIC_BASE 0xFEC00000 -#define KPCR_BASE 0xFF000000 - -#define LowMemPageTableIndex 0 -#define StartupPageTableIndex (STARTUP_BASE >> 22) -#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 22) -#define KpcrPageTableIndex (KPCR_BASE >> 22) -#define ApicPageTableIndex (APIC_BASE >> 22) - -#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase - /* Load Address of Next Module */ ULONG_PTR NextModuleBase = KERNEL_BASE_PHYS; @@ -71,61 +35,14 @@ /* Kernel Entrypoint in Physical Memory */ ULONG_PTR KernelEntry; - -typedef struct _HARDWARE_PTE_X64 { - ULONG Valid : 1; - ULONG Write : 1; - ULONG Owner : 1; - ULONG WriteThrough : 1; - ULONG CacheDisable : 1; - ULONG Accessed : 1; - ULONG Dirty : 1; - ULONG LargePage : 1; - ULONG Global : 1; - ULONG CopyOnWrite : 1; - ULONG Prototype : 1; - ULONG reserved : 1; - ULONG PageFrameNumber : 20; - ULONG reserved2 : 31; - ULONG NoExecute : 1; -} HARDWARE_PTE_X64, *PHARDWARE_PTE_X64; - -typedef struct _PAGE_DIRECTORY_X86 { - HARDWARE_PTE Pde[1024]; -} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; - -typedef struct _PAGE_DIRECTORY_X64 { - HARDWARE_PTE_X64 Pde[2048]; -} PAGE_DIRECTORY_X64, *PPAGE_DIRECTORY_X64; - -typedef struct _PAGE_DIRECTORY_TABLE_X64 { - HARDWARE_PTE_X64 Pde[4]; -} PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64; /* Page Directory and Tables for non-PAE Systems */ extern PAGE_DIRECTORY_X86 startup_pagedirectory; extern PAGE_DIRECTORY_X86 lowmem_pagetable; extern PAGE_DIRECTORY_X86 kernel_pagetable; extern ULONG_PTR hyperspace_pagetable; -extern ULONG_PTR _pae_pagedirtable; extern PAGE_DIRECTORY_X86 apic_pagetable; extern PAGE_DIRECTORY_X86 kpcr_pagetable; - -/* Page Directory and Tables for PAE Systems */ -extern PAGE_DIRECTORY_TABLE_X64 startup_pagedirectorytable_pae; -extern PAGE_DIRECTORY_X64 startup_pagedirectory_pae; -extern PAGE_DIRECTORY_X64 lowmem_pagetable_pae; -extern PAGE_DIRECTORY_X64 kernel_pagetable_pae; -extern ULONG_PTR hyperspace_pagetable_pae; -extern ULONG_PTR pagedirtable_pae; -extern PAGE_DIRECTORY_X64 apic_pagetable_pae; -extern PAGE_DIRECTORY_X64 kpcr_pagetable_pae; - -BOOLEAN -NTAPI -FrLdrLoadImage(IN PCHAR szFileName, - IN INT nPos, - IN BOOLEAN IsKernel); PVOID NTAPI @@ -269,8 +186,8 @@ /* Set up Low Memory PTEs */ PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; - for (i=0; i<1024; i++) { - + for (i=0; i<1024; i++) + { PageDir->Pde[i].Valid = 1; PageDir->Pde[i].Write = 1; PageDir->Pde[i].Owner = 1; @@ -279,8 +196,8 @@ /* Set up Kernel PTEs */ PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; - for (i=0; i<1536; i++) { - + for (i=0; i<1536; i++) + { PageDir->Pde[i].Valid = 1; PageDir->Pde[i].Write = 1; PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); @@ -658,7 +575,7 @@ return DriverSize; } -BOOLEAN +PVOID NTAPI FrLdrMapImage(IN FILE *Image, IN PCHAR Name, @@ -713,21 +630,13 @@ //DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); /* Load HAL if this is the kernel */ - if (ImageType == 1) - { - PIMAGE_NT_HEADERS NtHeader; - NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); - FrLdrLoadImage("hal.dll", 10, FALSE); - LoaderBlock.KernelBase = KernelBase; - } + if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); /* Perform import fixups */ if (ImageType != 2) LdrPEFixupImports(LoadBase, Name); - /* Return Success */ - return TRUE; + /* Return the final mapped address */ + return LoadBase; } ULONG_PTR Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild Wed Feb 28 22:04:27 2007 @@ -2,9 +2,6 @@ <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <define name="_NTHAL_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Wed Feb 28 22:04:27 2007 @@ -20,6 +20,46 @@ #ifndef __REACTOS_H #define __REACTOS_H +/* Base Addres of Kernel in Physical Memory */ +#define KERNEL_BASE_PHYS 0x200000 + +/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ +#define PFN_SHIFT 12 + +/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ +#define PDE_SHIFT 22 +#define PDE_SHIFT_PAE 18 + +/* Converts a Relative Address read from the Kernel into a Physical Address */ +#define RaToPa(p) \ + (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS) + +/* Converts a Physical Address Pointer into a Page Frame Number */ +#define PaPtrToPfn(p) \ + (((ULONG_PTR)&p) >> PFN_SHIFT) + +/* Converts a Physical Address into a Page Frame Number */ +#define PaToPfn(p) \ + ((p) >> PFN_SHIFT) + +#define STARTUP_BASE 0xC0000000 +#define HYPERSPACE_BASE 0xC0400000 +#define HYPERSPACE_PAE_BASE 0xC0800000 +#define APIC_BASE 0xFEC00000 +#define KPCR_BASE 0xFF000000 + +#define LowMemPageTableIndex 0 +#define StartupPageTableIndex (STARTUP_BASE >> 22) +#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 22) +#define KpcrPageTableIndex (KPCR_BASE >> 22) +#define ApicPageTableIndex (APIC_BASE >> 22) + +#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase + +typedef struct _PAGE_DIRECTORY_X86 +{ + HARDWARE_PTE Pde[1024]; +} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; /////////////////////////////////////////////////////////////////////////////////////// // @@ -66,4 +106,20 @@ VOID NTAPI FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); +PVOID +NTAPI +FrLdrMapImage( + IN FILE *Image, + IN PCHAR ShortName, + IN ULONG ImageType +); + +PVOID +NTAPI +FrLdrLoadImage( + IN PCHAR szFileName, + IN INT nPos, + IN ULONG ImageType +); + #endif // defined __REACTOS_H Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Feb 28 22:04:27 2007 @@ -37,16 +37,9 @@ CHAR szBootPath[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; - -BOOLEAN -NTAPI -FrLdrMapImage( - IN FILE *Image, - IN PCHAR ShortName, - IN ULONG ImageType -); - -BOOLEAN +extern ULONG_PTR KernelBase, KernelEntry; + +PVOID NTAPI FrLdrLoadImage(IN PCHAR szFileName, IN INT nPos, @@ -55,6 +48,7 @@ PFILE FilePointer; PCHAR szShortName; CHAR szBuffer[256], szFullPath[256]; + PVOID LoadBase; /* Check if this the HAL being loaded */ if (!_stricmp(szFileName, "hal.dll")) @@ -107,11 +101,11 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - FrLdrMapImage(FilePointer, szShortName, ImageType); + LoadBase = FrLdrMapImage(FilePointer, szShortName, ImageType); /* Update Processbar and return success */ if (!FrLdrBootType) UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); - return TRUE; + return LoadBase; } static BOOLEAN @@ -497,6 +491,8 @@ CHAR szFileName[255]; CHAR MsgBuffer[256]; ULONG SectionId; + PIMAGE_NT_HEADERS NtHeader; + PVOID LoadBase; ULONG_PTR Base; ULONG Size; @@ -682,7 +678,14 @@ } /* Load the kernel */ - if (!FrLdrLoadImage(szKernelName, 5, 1)) return; + LoadBase = FrLdrLoadImage(szKernelName, 5, 1); + if (!LoadBase) return; + + /* Get the NT header, kernel base and kernel entry */ + NtHeader = RtlImageNtHeader(LoadBase); + KernelBase = NtHeader->OptionalHeader.ImageBase; + KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); + LoaderBlock.KernelBase = KernelBase; /* * Load the System hive from disk Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Feb 28 22:04:27 2007 @@ -18,7 +18,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define _NTSYSTEM_ #include <freeldr.h> + +#define NDEBUG +#include <debug.h> ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel @@ -28,16 +32,10 @@ memory_map_t reactos_memory_map[32]; // Memory map char szBootPath[256]; char szHalName[256]; +extern ULONG_PTR KernelBase, KernelEntry; + #define USE_UI - -BOOLEAN -NTAPI -FrLdrMapImage( - IN FILE *Image, - IN PCHAR ShortName, - IN ULONG ImageType -); BOOLEAN NTAPI @@ -47,6 +45,8 @@ PFILE FilePointer; PCHAR szShortName; CHAR szBuffer[256]; + PVOID LoadBase; + PIMAGE_NT_HEADERS NtHeader; /* Extract Kernel filename without path */ szShortName = strrchr(szFileName, '\\'); @@ -78,7 +78,13 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - FrLdrMapImage(FilePointer, szShortName, 1); + LoadBase = FrLdrMapImage(FilePointer, szShortName, 1); + + /* Get the NT header, kernel base and kernel entry */ + NtHeader = RtlImageNtHeader(LoadBase); + KernelBase = NtHeader->OptionalHeader.ImageBase; + KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); + LoaderBlock.KernelBase = KernelBase; /* Update Processbar and return success */ return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Wed Feb 28 22:04:27 2007 @@ -2,7 +2,7 @@ <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> + <define name="_NTHAL_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Feb 28 22:04:27 2007 @@ -30,15 +30,6 @@ POBJECT_TYPE IoDriverObjectType = NULL; extern BOOLEAN ExpInTextModeSetup; - -/* DECLARATIONS ***************************************************************/ - -NTSTATUS -NTAPI -LdrTemporaryDriverHack( - PLDR_DATA_TABLE_ENTRY ModuleObject, - PUNICODE_STRING ModuleName -); /* PRIVATE FUNCTIONS **********************************************************/ @@ -810,13 +801,7 @@ &MissingApiName, &MissingDriverName, &LoadedImports); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ExFreePool(LdrEntry->FullDllName.Buffer); - ExFreePool(LdrEntry); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Return */ *ModuleObject = LdrEntry; Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Feb 28 22:04:27 2007 @@ -21,6 +21,25 @@ extern ULONG NtGlobalFlag; /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +MiFreeBootDriverMemory(PVOID BaseAddress, + ULONG Length) +{ + ULONG i; + + /* Loop each page */ + for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) + { + /* Free the page */ + MmDeleteVirtualMapping(NULL, + (PVOID)((ULONG_PTR)BaseAddress + i * PAGE_SIZE), + TRUE, + NULL, + NULL); + } +} NTSTATUS NTAPI @@ -1175,6 +1194,9 @@ LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + NtHeader->OptionalHeader.AddressOfEntryPoint); LdrEntry->SizeOfImage = LdrEntry->SizeOfImage; + + /* Free the old copy */ + MiFreeBootDriverMemory(DllBase, LdrEntry->SizeOfImage); } }

1 0

[ion] 25927: - Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer). - FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes.
by ion＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ion Date: Wed Feb 28 20:48:44 2007 New Revision: 25927 URL: http://svn.reactos.org/svn/reactos?rev=25927&view=rev Log: - Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer). - FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Feb 28 20:48:44 2007 @@ -678,26 +678,17 @@ /* Set the file pointer to zero */ FsSetFilePointer(Image, 0); - if (ImageType != 2) - { - /* Allocate a temporary buffer for the read */ - ReadBuffer = MmAllocateMemory(ImageSize); - - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, ReadBuffer); - - /* Map it into virtual memory */ - ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); - - /* Free the temporary buffer */ - MmFreeMemory(ReadBuffer); - } - else - { - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, LoadBase); - ImageSize = RtlImageNtHeader(LoadBase)->OptionalHeader.SizeOfImage; - } + /* Allocate a temporary buffer for the read */ + ReadBuffer = MmAllocateMemory(ImageSize); + + /* Load the file image */ + FsReadFile(Image, ImageSize, NULL, ReadBuffer); + + /* Map it into virtual memory */ + ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); + + /* Free the temporary buffer */ + MmFreeMemory(ReadBuffer); /* Calculate Difference between Real Base and Compiled Base*/ if (ImageType != 2) LdrRelocateImageWithBias(LoadBase, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Feb 28 20:48:44 2007 @@ -1063,10 +1063,6 @@ PIMAGE_DATA_DIRECTORY DataDirectory; PVOID DllBase, NewImageAddress; NTSTATUS Status; -#if 1 // Disable for FreeLDR 2.5 - ULONG DriverSize = 0, Size; - PIMAGE_SECTION_HEADER Section; -#endif /* Loop driver list */ for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -1093,26 +1089,6 @@ /* Skip non-drivers */ if (!NtHeader) continue; -#if 1 // Disable for FreeLDR 2.5 - /* Get header pointers */ - Section = IMAGE_FIRST_SECTION(NtHeader); - - /* Determine the size of the module */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Skip this section if we're not supposed to load it */ - if (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - /* Add the size of this section into the total size */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - DriverSize = max(DriverSize, Size); - } - } - - /* Round up the driver size to section alignment */ - DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); -#endif - /* Get the file header and make sure we can relocate */ FileHeader = &NtHeader->FileHeader; if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue; @@ -1134,7 +1110,7 @@ LdrEntry->SizeOfImage) { /* They're not, skip */ - continue; + continue; } /* We have relocations */ @@ -1145,7 +1121,7 @@ DllBase = LdrEntry->DllBase; /* Allocate a virtual section for the module */ - NewImageAddress = MmAllocateSection(DriverSize, NULL); + NewImageAddress = MmAllocateSection(LdrEntry->SizeOfImage, NULL); if (!NewImageAddress) { /* Shouldn't happen */ @@ -1157,34 +1133,8 @@ DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); ASSERT(ExpInitializationPhase == 0); -#if 0 // Enable for FreeLDR 2.5 /* Now copy the entire driver over */ RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage); -#else - /* Copy headers over */ - RtlCopyMemory(NewImageAddress, - DllBase, - NtHeader->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Get the size of this section and check if it's valid and on-disk */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - if ((Size <= DriverSize) && (Section[i].SizeOfRawData)) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)NewImageAddress + - Section[i].VirtualAddress), - (PVOID)((ULONG_PTR)DllBase + - Section[i].PointerToRawData), - Section[i].Misc.VirtualSize > - Section[i].SizeOfRawData ? - Section[i].SizeOfRawData : - Section[i].Misc.VirtualSize); - } - } -#endif /* Sanity check */ ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); @@ -1224,7 +1174,7 @@ LdrEntry->Flags |= 0x01000000; LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = DriverSize; + LdrEntry->SizeOfImage = LdrEntry->SizeOfImage; } }

1 0

[spetreolle] 25926: forget to add 2 files
by spetreolle＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: spetreolle Date: Wed Feb 28 17:24:17 2007 New Revision: 25926 URL: http://svn.reactos.org/svn/reactos?rev=25926&view=rev Log: forget to add 2 files Added: trunk/reactos/dll/win32/serialui/lang/fr-FR.rc trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc Added: trunk/reactos/dll/win32/serialui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/fr-FR.rc Wed Feb 28 17:24:17 2007 @@ -1,0 +1,41 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Paire" + IDS_MARKPARITY, "Marque" + IDS_NOPARITY, "Pas de paritÃ©" + IDS_ODDPARITY, "Impaire" + IDS_SPACEPARITY, "Espace" + + IDS_ONESTOPBIT, "1 bit de stop" + IDS_ONE5STOPBITS, "1.5 bit de stop" + IDS_TWOSTOPBITS, "2 bits de stop" + + IDS_FC_NO, "Aucun" + IDS_FC_CTSRTS, "CTS/RTS" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "PropriÃ©tÃ©s pour %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8, "MS Shell Dlg" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "Annuler",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Vitesse en bauds:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "ParitÃ©:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "Bits de stop:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "ContrÃ´le de flux:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Added: trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc Wed Feb 28 17:24:17 2007 @@ -1,0 +1,38 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "CompatibilitÃ©" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionner le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.", -1, 7,7,210,31 + GROUPBOX "Mode de compatibilitÃ©", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "RÃ©glages de l'Ã©cran", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Lancer en 256 colors", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Lancer en resolution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editer les Modes de compatibilitÃ©" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Ajouter...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Editer...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Supprimer", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Annuler", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END +

1 0

[spetreolle] 25925: french translations updates
by spetreolle＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: spetreolle Date: Wed Feb 28 17:15:31 2007 New Revision: 25925 URL: http://svn.reactos.org/svn/reactos?rev=25925&view=rev Log: french translations updates Added: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Added: 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 (added) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc Wed Feb 28 17:15:31 2007 @@ -1,0 +1,56 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Veuillez patienter..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bienvenue Ã ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Appuyer sur les touches Control-Alt-Suppr",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Connection" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler",IDCANCEL,115,122,50,14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 + LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "SÃ©curitÃ©" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Annuler",IDCANCEL,170,95,70,14 + PUSHBUTTON "DÃ©connecter",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Que voulez vous faire?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Bienvenue!" + IDS_LOCKEDSAS "Cet ordinateur est actuellement verrouillÃ©." + IDS_PRESSCTRLALTDELETE "Presser Control+Alt+Suppr pour vous connecter." + IDS_ASKFORUSER "Utilisateur: " + IDS_ASKFORPASSWORD "Mot de passe: " + IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer?" +END Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Wed Feb 28 17:15:31 2007 @@ -10,5 +10,6 @@ IDI_ROSLOGO BITMAP "resources/reactos.bmp" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Added: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc Wed Feb 28 17:15:31 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nom de l'ordinateur" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur sur le rÃ©seau.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Description de l'ordinateur:", IDC_STATIC, 6, 40, 70, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Nom complet de l'ordinateur:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "(Default)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(empty)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Pour utiliser l'Assistant RÃ©seau, afin de rejoindre un domaine ou crÃ©er un utilisateur local, cliquez sur Identification RÃ©seau.", IDC_STATIC, 6, 108, 172, 24 + PUSHBUTTON "&Identification &rÃ©seau...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&Changer...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Note: Seuls les administrateurs peyvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 300, 9 +END Propchange: trunk/reactos/dll/win32/netid/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Wed Feb 28 17:15:31 2007 @@ -10,7 +10,8 @@ IDI_COMPNAME ICON "res/netid.ico" +#include "lang/en-US.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc Wed Feb 28 17:15:31 2007 @@ -10,5 +10,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Wed Feb 28 17:15:31 2007 @@ -8,6 +8,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/nl-NL.rc"

1 0

[tretiakov] 25924: Update testapp
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:25:50 2007 New Revision: 25924 URL: http://svn.reactos.org/svn/reactos?rev=25924&view=rev Log: Update testapp Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Wed Feb 28 16:25:50 2007 @@ -80,7 +80,7 @@ int n, i,j; GetKeyboardLayoutName(buf); - swprintf(buf2, L"Active layout: %s (%x)", buf, GetKeyboardLayout(0)); + swprintf(buf2, L"Active: %s (%x)", buf, GetKeyboardLayout(0)); SetWindowText(GetDlgItem(hDlg, IDC_ACTIVE), buf2); hList = GetDlgItem(hDlg, IDC_LIST); @@ -194,6 +194,18 @@ return ret; } +UINT GetDelayMilliseconds(HWND hDlg) +{ + WCHAR Buf[255]; + UINT ret; + + GetWindowText(GetDlgItem(hDlg, IDC_DELAY), Buf, sizeof(Buf)); + + swscanf(Buf, L"%d", &ret); + + return ret*1000; +} + HKL GetSelectedLayout(HWND hDlg) { int n; @@ -251,6 +263,8 @@ swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); + SetWindowText(GetDlgItem(hDlg, IDC_DELAY), L"0"); + return 0; } /* WM_INITDIALOG */ @@ -268,6 +282,7 @@ { if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) { + Sleep(GetDelayMilliseconds(hDlg)); if(!(hKl = ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg)))) FormatBox(hDlg, MB_ICONERROR, L"Error", L"ActivateKeyboardLayout() failed. %d", GetLastError()); @@ -283,6 +298,7 @@ { if((hKl = GetSelectedLayout(hDlg)) != INVALID_HANDLE_VALUE) { + Sleep(GetDelayMilliseconds(hDlg)); if(!UnloadKeyboardLayout(hKl)) FormatBox(hDlg, MB_ICONERROR, L"Error", L"UnloadKeyboardLayout() failed. %d", @@ -297,6 +313,7 @@ { WCHAR buf[255]; GetWindowText(GetDlgItem(hDlg, IDC_KLID), buf, sizeof(buf)); + Sleep(GetDelayMilliseconds(hDlg)); if(!LoadKeyboardLayout(buf, GetLoadFlags(hDlg))) FormatBox(hDlg, MB_ICONERROR, L"Error", L"LoadKeyboardLayout() failed. %d", Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc Wed Feb 28 16:25:50 2007 @@ -33,10 +33,10 @@ BEGIN PUSHBUTTON "Close",ID_CANCEL,215,172,105,14 EDITTEXT IDC_EDIT1,7,140,199,47,ES_MULTILINE | ES_AUTOHSCROLL - LISTBOX IDC_LIST,124,17,84,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + LISTBOX IDC_LIST,124,60,84,46,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Loaded layouts",IDC_STATIC,128,7,49,8 - LTEXT "Active layout:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN + LTEXT "Loaded layouts",IDC_STATIC,124,50,49,8 + LTEXT "Active:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN PUSHBUTTON "Unload",IDC_UNLOAD,124,109,41,14 PUSHBUTTON "Activate",IDC_ACTIVATE,166,109,41,14 GROUPBOX "Activate Flags",IDC_STATIC,215,7,103,67 @@ -75,6 +75,9 @@ GROUPBOX "Multithreading",IDC_STATIC,216,130,104,39 LTEXT "Current thread ID:",IDC_CURTHREAD,219,141,93,8 PUSHBUTTON "Create new thread",IDC_NEWTHREAD,234,152,71,12 + GROUPBOX "Load\\Activate delay",IDC_STATIC,124,7,85,40 + LTEXT "Delay (seconds):",IDC_STATIC,130,17,75,8 + EDITTEXT IDC_DELAY,128,29,59,14,ES_AUTOHSCROLL END Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Wed Feb 28 16:25:50 2007 @@ -8,6 +8,7 @@ #define IDC_LIST 1022 #define IDC_ACTIVE 1023 #define IDC_EDIT2 1024 +#define IDC_DELAY 1024 #define IDC_UNLOAD 1025 #define IDC_ACTIVATE 1026 #define IDC_KLF_REORDER 1027

1 0

[tretiakov] 25923: WM_INPUTLANGCHANGE is sent not posted.
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:23:51 2007 New Revision: 25923 URL: http://svn.reactos.org/svn/reactos?rev=25923&view=rev Log: WM_INPUTLANGCHANGE is sent not posted. Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Wed Feb 28 16:23:51 2007 @@ -7,7 +7,7 @@ { LIST_ENTRY List; DWORD Flags; - WCHAR Name[9]; // used w GetKeyboardLayoutName same as wszKLID. + WCHAR Name[KL_NAMELENGTH]; // used w GetKeyboardLayoutName same as wszKLID. struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h HANDLE hModule; ULONG RefCount; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Feb 28 16:23:51 2007 @@ -318,10 +318,9 @@ return NULL; } -static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl) +static PKBL co_UserActivateKbl(PW32THREAD Thread, PKBL pKbl) { PKBL Prev; - MSG Msg; Prev = Thread->KeyboardLayout; Prev->RefCount--; @@ -329,13 +328,10 @@ pKbl->RefCount++; // Send WM_INPUTLANGCHANGE to thread's focus window - - Msg.hwnd = Thread->MessageQueue->FocusWindow; - Msg.message = WM_INPUTLANGCHANGE; - Msg.wParam = 0; // Charset. FIXME: what is this? - Msg.lParam = (LPARAM)pKbl->hkl; // klid - - MsqPostMessage(Thread->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); + co_IntSendMessage(Thread->MessageQueue->FocusWindow, + WM_INPUTLANGCHANGE, + 0, // FIXME: put charset here (what is this?) + (LPARAM)pKbl->hkl); //klid return Prev; } @@ -489,7 +485,7 @@ if(Flags & KLF_ACTIVATE) { - UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); + co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); } Ret = pKbl->hkl; @@ -547,7 +543,7 @@ } else { - pKbl = UserActivateKbl(pWThread, pKbl); + pKbl = co_UserActivateKbl(pWThread, pKbl); Ret = pKbl->hkl; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007