Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[hbelusca] 74366: [CONSOLE.CPL]: Paint the text samples using the correct character set (derived from the current code page). This e.g. fixes display for the backslash symbol in CJK languages (that...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 17 23:26:07 2017 New Revision: 74366 URL: http://svn.reactos.org/svn/reactos?rev=74366&view=rev Log: [CONSOLE.CPL]: Paint the text samples using the correct character set (derived from the current code page). This e.g. fixes display for the backslash symbol in CJK languages (that should appear as the Chinese "yuan" / Japanese "yen" currency symbol ¥, or the Korean "won" currency symbol ₩). CORE-12451 Modified: trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Mon Apr 17 23:26:07 2017 @@ -131,7 +131,7 @@ FALSE, FALSE, FALSE, - OEM_CHARSET, + CodePageToCharSet(pConInfo->CodePage), OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, @@ -233,11 +233,11 @@ case WM_NOTIFY: { - LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; - LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; + LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == UDN_DELTAPOS) { + LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; DWORD wheight, wwidth; DWORD sheight, swidth; DWORD left, top; Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Mon Apr 17 23:26:07 2017 @@ -107,11 +107,12 @@ case WM_NOTIFY: { - LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; - LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; + LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == UDN_DELTAPOS) { + LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; + if (lppsn->hdr.idFrom == IDC_UPDOWN_BUFFER_SIZE) { lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 1), 999);

7 years, 8 months

[hbelusca] 74365: [CONSOLE.CPL]: Add support for Asian fonts & CJK codepage in the console properties dialog. Based on a patch by Katayama Hirofumi MZ. CORE-12451

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 17 23:21:13 2017 New Revision: 74365 URL: http://svn.reactos.org/svn/reactos?rev=74365&view=rev Log: [CONSOLE.CPL]: Add support for Asian fonts & CJK codepage in the console properties dialog. Based on a patch by Katayama Hirofumi MZ. CORE-12451 Modified: trunk/reactos/dll/cpl/console/console.h trunk/reactos/dll/cpl/console/font.c Modified: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.h [iso-8859-1] Mon Apr 17 23:21:13 2017 @@ -8,6 +8,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winnls.h> #include <winreg.h> #include <winuser.h> #include <wincon.h> @@ -32,6 +33,7 @@ extern PCONSOLE_STATE_INFO ConInfo; VOID ApplyConsoleInfo(HWND hwndDlg); +BYTE CodePageToCharSet(UINT CodePage); VOID PaintConsole(LPDRAWITEMSTRUCT drawItem, PCONSOLE_STATE_INFO pConInfo); BOOL PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_STATE_INFO pConInfo, TEXT_TYPE TextMode); Modified: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/console/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/font.c [iso-8859-1] Mon Apr 17 23:21:13 2017 @@ -5,6 +5,7 @@ * PURPOSE: Font dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "console.h" @@ -92,6 +93,26 @@ // 22, 24, 26, 28, 36, 48, 72 5, 6, 7, 8, 10, 12, 14, 16, 18, 20, 24, 28, 36, 72 }; + +#define CP_SHIFTJIS 932 // Japanese Shift-JIS +#define CP_HANGUL 949 // Korean Hangul +#define CP_GB2312 936 // Chinese Simplified (GB2312) +#define CP_BIG5 950 // Chinese Traditional (Big5) + +/* IsFarEastCP(CodePage) */ +#define IsCJKCodePage(CodePage) \ + ((CodePage) == CP_SHIFTJIS || (CodePage) == CP_HANGUL || \ + (CodePage) == CP_BIG5 || (CodePage) == CP_GB2312) + +/* Retrieves the character set associated with a given code page */ +BYTE CodePageToCharSet(UINT CodePage) +{ + CHARSETINFO CharInfo; + if (TranslateCharsetInfo((LPDWORD)CodePage, &CharInfo, TCI_SRCCODEPAGE)) + return CharInfo.ciCharset; + else + return DEFAULT_CHARSET; +} static BOOL CALLBACK EnumFontNamesProc(PLOGFONTW lplf, @@ -134,7 +155,6 @@ * that can be italic or have negative A or C space. * - If it is not a TrueType font, it can be from another character set * than OEM_CHARSET. - * - We do not support Asian criteria at the moment. * - We do not look into the magic registry key mentioned above. */ @@ -162,23 +182,42 @@ return TRUE; } - /* Reject non-TrueType fonts that are not OEM */ -#if 0 - if ((FontType != TRUETYPE_FONTTYPE) && (lplf->lfCharSet != OEM_CHARSET)) - { - DPRINT1("Non-TrueType font '%S' rejected because it's not OEM_CHARSET %d\n", - pszName, lplf->lfCharSet); - return TRUE; - } -#else // Improved criterium - if ((FontType != TRUETYPE_FONTTYPE) && - ((lplf->lfCharSet != ANSI_CHARSET) && (lplf->lfCharSet != DEFAULT_CHARSET) && (lplf->lfCharSet != OEM_CHARSET))) - { - DPRINT1("Non-TrueType font '%S' rejected because it's not ANSI_CHARSET or DEFAULT_CHARSET or OEM_CHARSET (lfCharSet = %d)\n", - pszName, lplf->lfCharSet); - return TRUE; - } -#endif + /* Is the current code page Chinese, Japanese or Korean? */ + if (IsCJKCodePage(ConInfo->CodePage)) + { + /* It's Asian */ + if (FontType == TRUETYPE_FONTTYPE) + { + if (lplf->lfCharSet != CodePageToCharSet(ConInfo->CodePage)) + { + DPRINT1("TrueType font '%S' rejected because it's not user Asian charset (lfCharSet = %d)\n", + pszName, lplf->lfCharSet); + return TRUE; + } + } + else + { + /* Reject non-TrueType fonts that are not Terminal */ + if (wcscmp(pszName, L"Terminal") != 0) + { + DPRINT1("Non-TrueType font '%S' rejected because it's not Terminal\n", pszName); + return TRUE; + } + } + } + else + { + /* Not CJK */ + if ((FontType != TRUETYPE_FONTTYPE) && + (lplf->lfCharSet != ANSI_CHARSET) && + (lplf->lfCharSet != DEFAULT_CHARSET) && + (lplf->lfCharSet != OEM_CHARSET)) + { + DPRINT1("Non-TrueType font '%S' rejected because it's not ANSI_CHARSET or DEFAULT_CHARSET or OEM_CHARSET (lfCharSet = %d)\n", + pszName, lplf->lfCharSet); + return TRUE; + } + } /* Reject fonts that are vertical (tategaki) */ if (pszName[0] == L'@') @@ -186,17 +225,6 @@ DPRINT1("Font '%S' rejected because it's vertical\n", pszName); return TRUE; } - -#if 0 // For Asian installations only - /* Reject non-TrueType fonts that are not Terminal */ - if ((FontType != TRUETYPE_FONTTYPE) && (wcscmp(pszName, L"Terminal") != 0)) - { - DPRINT1("Non-TrueType font '%S' rejected because it's not Terminal\n", pszName); - return TRUE; - } - - // TODO: Asian TrueType font must also be an Asian character set. -#endif /* Make sure the font doesn't already exist in the list */ if (SendMessageW(hwndCombo, LB_FINDSTRINGEXACT, 0, (LPARAM)pszName) == LB_ERR) @@ -314,7 +342,7 @@ /* Enumerate the available sizes for the selected font */ ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; // OEM_CHARSET; + lf.lfCharSet = DEFAULT_CHARSET; // CodePageToCharSet(pConInfo->CodePage); // lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; wcsncpy(lf.lfFaceName, FaceName, LF_FACESIZE); lf.lfFaceName[Length] = L'\0'; @@ -386,13 +414,39 @@ INT idx; ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; // OEM_CHARSET; + lf.lfCharSet = DEFAULT_CHARSET; // CodePageToCharSet(ConInfo->CodePage); // lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; hDC = GetDC(NULL); EnumFontFamiliesExW(hDC, &lf, (FONTENUMPROCW)EnumFontNamesProc, (LPARAM)GetDlgItem(hwndDlg, IDC_LBOX_FONTTYPE), 0); ReleaseDC(NULL, hDC); + + idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, LB_GETCOUNT, 0, 0); + if ((idx == 0) || (idx == LB_ERR)) + { + DPRINT1("The ideal console fonts are not found; manually add default ones.\n"); + + /* This world is not ideal. We have to do it realistically. */ + idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, LB_ADDSTRING, 0, + (LPARAM)L"Lucida Console"); + if (idx != LB_ERR) + { + SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, + LB_SETITEMDATA, idx, TRUETYPE_FONTTYPE); + } + + if (CodePageToCharSet(ConInfo->CodePage) != DEFAULT_CHARSET) + { + idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, LB_ADDSTRING, 0, + (LPARAM)L"Droid Sans Fallback"); + if (idx != LB_ERR) + { + SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, + LB_SETITEMDATA, idx, TRUETYPE_FONTTYPE); + } + } + } DPRINT1("ConInfo->FaceName = '%S'\n", ConInfo->FaceName); idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE,

7 years, 8 months

[ekohl] 74364: [AT] Applied hotfix for russian translation. Patch by Sergey Stopkin. CORE-12961

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 17 22:28:42 2017 New Revision: 74364 URL: http://svn.reactos.org/svn/reactos?rev=74364&view=rev Log: [AT] Applied hotfix for russian translation. Patch by Sergey Stopkin. CORE-12961 Modified: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc [iso-8859-1] Mon Apr 17 22:28:42 2017 @@ -11,7 +11,7 @@ \\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° ÐÐ¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°. ÐÑÐ»Ð¸ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, \n\ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.\n\ id ÐÐ¾ÑÑÐ´ÐºÐ¾Ð²ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¹ Ð·Ð°Ð´Ð°ÑÐ¸.\n\ -/DELETE ÐÑÐ¼ÐµÐ½ÑÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. ÐÑÐ»Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ is Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, ÑÐ¾\n\ +/DELETE ÐÑÐ¼ÐµÐ½ÑÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. ÐÑÐ»Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ id Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, ÑÐ¾\n\ Ð²ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ, Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ, Ð±ÑÐ´ÑÑ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ñ.\n\ /YES ÐÑÐ¼ÐµÐ½Ð° Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸ Ð¾ÑÐ¼ÐµÐ½Ðµ Ð²ÑÐµÑ\n\ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð·Ð°Ð´Ð°Ñ.\n\ @@ -27,7 +27,7 @@ ""ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"" ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n" IDS_CONFIRM_QUESTION "ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸? (Y-Ð´Ð°/N-Ð½ÐµÑ) [N] " - IDS_CONFIRM_INVALID "\nThis is an invalid response.\n" + IDS_CONFIRM_INVALID "\nÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¾ÑÐ²ÐµÑ.\n" IDS_CONFIRM_YES "Y" IDS_CONFIRM_NO "N" @@ -49,6 +49,6 @@ IDS_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ: %s\n" IDS_SCHEDULE "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ: %s\n" IDS_TIME "ÐÑÐµÐ¼Ñ ÑÑÑÐ¾Ðº: %s\n" - IDS_INTERACTIVE "Interactive: %s\n" + IDS_INTERACTIVE "ÐÐ½ÑÐµÑÐ°ÐºÑÐ¸Ð²Ð½ÑÐ¹: %s\n" IDS_COMMAND "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°: %s\n" END

7 years, 8 months

[ekohl] 74363: [NEWDEV] When the driver installation fails, set the CONFIGFLAG_FAILEDINSTALL flag only if the user checked the 'Do not show this dialog anymore' checkbox. CORE-13095

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 17 22:20:44 2017 New Revision: 74363 URL: http://svn.reactos.org/svn/reactos?rev=74363&view=rev Log: [NEWDEV] When the driver installation fails, set the CONFIGFLAG_FAILEDINSTALL flag only if the user checked the 'Do not show this dialog anymore' checkbox. CORE-13095 Modified: trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Apr 17 22:20:44 2017 @@ -1010,6 +1010,12 @@ 0, NULL); } + else + { + SetFailedInstall(DevInstData->hDevInfo, + &DevInstData->devInfoData, + FALSE); + } break; }

7 years, 8 months

[ekohl] 74362: [NETID] Load, display and store the computer description. Patch by Grzegorz Araminowicz. - Moved most of the code into separate functions and got rid of its deeply nested structure. ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 17 21:05:02 2017 New Revision: 74362 URL: http://svn.reactos.org/svn/reactos?rev=74362&view=rev Log: [NETID] Load, display and store the computer description. Patch by Grzegorz Araminowicz. - Moved most of the code into separate functions and got rid of its deeply nested structure. - Added some notification code, so that the Apply button gets enabled when the user changes the description. CORE-12337 Modified: trunk/reactos/dll/win32/netid/netid.c Modified: trunk/reactos/dll/win32/netid/netid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.c?re… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] Mon Apr 17 21:05:02 2017 @@ -13,11 +13,15 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> +#include <winreg.h> #include <tchar.h> #include <lm.h> #include <prsht.h> #include "resource.h" + + +#define MAX_COMPUTERDESCRIPTION_LENGTH 256 static INT_PTR CALLBACK NetIDPageProc(IN HWND hwndDlg, @@ -266,54 +270,153 @@ return FALSE; } +static +VOID +NetIDPage_OnInitDialog( + HWND hwndDlg) +{ + WCHAR ComputerDescription[MAX_COMPUTERDESCRIPTION_LENGTH + 1]; + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD RegSize = sizeof(ComputerDescription); + DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; + HKEY KeyHandle; + LPWKSTA_INFO_101 wki; + LONG lError; + + /* Display computer name and description */ + SendDlgItemMessage(hwndDlg, IDC_COMPDESC, EM_SETLIMITTEXT, MAX_COMPUTERDESCRIPTION_LENGTH, 0); + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\LanmanServer\\Parameters", + 0, + KEY_QUERY_VALUE, + &KeyHandle); + if (lError == ERROR_SUCCESS) + { + lError = RegQueryValueExW(KeyHandle, + L"srvcomment", + 0, + NULL, + (LPBYTE)ComputerDescription, + &RegSize); + if (lError == ERROR_SUCCESS) + { + ComputerDescription[RegSize / sizeof(WCHAR)] = UNICODE_NULL; + SetDlgItemText(hwndDlg, IDC_COMPDESC, ComputerDescription); + } + + RegCloseKey(KeyHandle); + } + + if (GetComputerName(ComputerName,&Size)) + { + SetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName); + } + + if (NetWkstaGetInfo(NULL, 101, (LPBYTE*)&wki) == NERR_Success) + { + SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, wki->wki101_langroup); + NetApiBufferFree(wki); + } +} + +static +LONG +NetIDPage_OnApply( + HWND hwndDlg) +{ + WCHAR ComputerDescription[MAX_COMPUTERDESCRIPTION_LENGTH + 1]; + WCHAR NewComputerDescription[MAX_COMPUTERDESCRIPTION_LENGTH + 1]; + HKEY KeyHandle = NULL; + DWORD dwSize; + LONG lError; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\LanmanServer\\Parameters", + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &KeyHandle); + if (lError != ERROR_SUCCESS) + return lError; + + GetDlgItemTextW(hwndDlg, + IDC_COMPDESC, + NewComputerDescription, + ARRAYSIZE(NewComputerDescription)); + if (GetLastError() != ERROR_SUCCESS) + { + lError = GetLastError(); + goto done; + } + + dwSize = sizeof(ComputerDescription); + lError = RegQueryValueExW(KeyHandle, + L"srvcomment", + 0, + NULL, + (PBYTE)ComputerDescription, + &dwSize); + if (lError != ERROR_SUCCESS && lError != ERROR_FILE_NOT_FOUND) + goto done; + + lError = ERROR_SUCCESS; + if (wcscmp(ComputerDescription, NewComputerDescription) != 0) + { + lError = RegSetValueExW(KeyHandle, + L"srvcomment", + 0, + REG_SZ, + (PBYTE)NewComputerDescription, + (wcslen(NewComputerDescription) + 1) * sizeof(WCHAR)); + } + +done: + if (KeyHandle != NULL) + RegCloseKey(KeyHandle); + + return lError; +} + static INT_PTR CALLBACK NetIDPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { + static BOOL bEnable = FALSE; INT_PTR Ret = 0; - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) { case WM_INITDIALOG: - { - /* Display computer name */ - LPWKSTA_INFO_101 wki = NULL; - DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; - TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - if (GetComputerName(ComputerName,&Size)) - { - SetDlgItemText(hwndDlg, - IDC_COMPUTERNAME, - ComputerName); - } - if (NetWkstaGetInfo(NULL, - 101, - (LPBYTE*)&wki) == NERR_Success) - { - SetDlgItemText(hwndDlg, - IDC_WORKGROUPDOMAIN_NAME, - wki->wki101_langroup); - } - - if (wki) NetApiBufferFree(wki); - + NetIDPage_OnInitDialog(hwndDlg); + bEnable = TRUE; Ret = TRUE; break; - } + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + NetIDPage_OnApply(hwndDlg); + break; + } + break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_COMPDESC: + if (HIWORD(wParam) == EN_CHANGE && bEnable == TRUE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_NETWORK_PROPERTY: DialogBox(hDllInstance, MAKEINTRESOURCE(IDD_PROPPAGECOMPNAMECHENGE), hwndDlg, NetworkPropDlgProc); - break; + break; } break; }

7 years, 8 months

[tfaber] 74361: [KMTESTS:MM] - Add some missing newlines and skip()s

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 20:37:26 2017 New Revision: 74361 URL: http://svn.reactos.org/svn/reactos?rev=74361&view=rev Log: [KMTESTS:MM] - Add some missing newlines and skip()s Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] Mon Apr 17 20:37:26 2017 @@ -272,7 +272,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_ulongptr(IoStatusBlock.Information, FILE_CREATED); ok(*WriteOnlyFile != NULL, "WriteOnlyFile is NULL\n"); - if (*WriteOnlyFile) + if (!skip(*WriteOnlyFile != NULL, "No WriteOnlyFile\n")) { FileOffset.QuadPart = 0; Status = ZwWriteFile(*WriteOnlyFile, NULL, NULL, NULL, &IoStatusBlock, (PVOID)TestString, TestStringSize, &FileOffset, NULL); @@ -324,7 +324,7 @@ CREATE_SECTION(Section, SECTION_ALL_ACCESS, NULL, MaximumSize, PAGE_READWRITE, SEC_COMMIT, NULL, STATUS_INVALID_PARAMETER_4, IGNORE); //division by zero in ROS - if (!skip(SharedUserData->LargePageMinimum > 0, "LargePageMinimum is 0")) + if (!skip(SharedUserData->LargePageMinimum > 0, "LargePageMinimum is 0\n")) { MaximumSize.QuadPart = (_4mb / SharedUserData->LargePageMinimum) * SharedUserData->LargePageMinimum; //4mb CREATE_SECTION(Section, SECTION_ALL_ACCESS, NULL, MaximumSize, PAGE_READWRITE, (SEC_LARGE_PAGES | SEC_COMMIT), NULL, STATUS_SUCCESS, STATUS_SUCCESS); @@ -425,7 +425,7 @@ //MaximumSize Status = ZwQueryInformationFile(FileHandleExecuteOnly, &IoStatusBlock, &FileStandardInfo, sizeof(FILE_STANDARD_INFORMATION), FileStandardInformation); - if (!skip(NT_SUCCESS(Status), "Cannot query file information")) + if (!skip(NT_SUCCESS(Status), "Cannot query file information\n")) { //as big as file MaximumSize = FileStandardInfo.EndOfFile; @@ -503,7 +503,7 @@ KmtInitTestFiles(&FileHandleReadOnly, &FileHandleWriteOnly, &FileHandleExecuteOnly); - if (FileHandleReadOnly && FileHandleWriteOnly && FileHandleExecuteOnly) + if (!skip(FileHandleReadOnly && FileHandleWriteOnly && FileHandleExecuteOnly, "Missing one or more file handles\n")) { FileSectionViewPermissionCheck(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); SimpleErrorChecks(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); Modified: trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwMapView… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c [iso-8859-1] Mon Apr 17 20:37:26 2017 @@ -81,7 +81,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_ulongptr(IoStatusBlock.Information, FILE_CREATED); ok(*WriteOnlyFile != NULL, "WriteOnlyFile is NULL\n"); - if (*WriteOnlyFile) + if (!skip(*WriteOnlyFile != NULL, "No WriteOnlyFile\n")) { FileOffset.QuadPart = 0; Status = ZwWriteFile(*WriteOnlyFile, NULL, NULL, NULL, &IoStatusBlock, (PVOID)TestString, TestStringSize, &FileOffset, NULL);

7 years, 8 months

[tfaber] 74360: [WIN32K] Fix automatic resolution change when resizing the VirtualBox window. Based on a patch by Ismael Ferreras Morezuelas. - Provide a function, PDEVOBJ_vRefreshModeList, to relo...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 20:25:55 2017 New Revision: 74360 URL: http://svn.reactos.org/svn/reactos?rev=74360&view=rev Log: [WIN32K] Fix automatic resolution change when resizing the VirtualBox window. Based on a patch by Ismael Ferreras Morezuelas. - Provide a function, PDEVOBJ_vRefreshModeList, to reload the list of display modes - Call PDEVOBJ_vRefreshModeList from UserEnumDisplaySettings to get an updated list of modes each time CORE-6742 #resolve Modified: trunk/reactos/win32ss/gdi/eng/device.h trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/device.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Mon Apr 17 20:25:55 2017 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Mon Apr 17 20:25:55 2017 @@ -256,6 +256,45 @@ DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEINFO pdminfo, pdmiNext; + DEVMODEW dmDefault; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Remember our default mode */ + dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + + /* Clear out the modes */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo; + pdminfo; + pdminfo = pdmiNext) + { + pdmiNext = pdminfo->pdmiNext; + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + } + pGraphicsDevice->pdevmodeInfo = NULL; + ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); + pGraphicsDevice->pDevModeList = NULL; + + /* Now re-populate the list */ + if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + { + DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Mon Apr 17 20:25:55 2017 @@ -463,19 +463,27 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_INVALID_PARAMETER_1; } + + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++)

7 years, 8 months

[tfaber] 74359: [WIN32K:ENG] - Split populating the display mode list out from EngpRegisterGraphicsDevice, into its own function, EngpPopulateDeviceModeList. Based on a patch by Ismael Ferreras Mor...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 19:44:32 2017 New Revision: 74359 URL: http://svn.reactos.org/svn/reactos?rev=74359&view=rev Log: [WIN32K:ENG] - Split populating the display mode list out from EngpRegisterGraphicsDevice, into its own function, EngpPopulateDeviceModeList. Based on a patch by Ismael Ferreras Morezuelas. CORE-6742 Modified: trunk/reactos/win32ss/gdi/eng/device.c trunk/reactos/win32ss/gdi/eng/device.h Modified: trunk/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/device.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Mon Apr 17 19:44:32 2017 @@ -30,99 +30,22 @@ return STATUS_SUCCESS; } - -PGRAPHICS_DEVICE -NTAPI -EngpRegisterGraphicsDevice( - _In_ PUNICODE_STRING pustrDeviceName, - _In_ PUNICODE_STRING pustrDiplayDrivers, - _In_ PUNICODE_STRING pustrDescription, +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVICE_OBJECT pDeviceObject; - PFILE_OBJECT pFileObject; - NTSTATUS Status; PWSTR pwsz; - ULONG i, cj, cModes = 0; - SIZE_T cjWritten; - BOOL bEnable = TRUE; + PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; - PLDEVOBJ pldev; + ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; - TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); - - /* Allocate a GRAPHICS_DEVICE structure */ - pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, - sizeof(GRAPHICS_DEVICE), - GDITAG_GDEVICE); - if (!pGraphicsDevice) - { - ERR("ExAllocatePoolWithTag failed\n"); - return NULL; - } - - /* Try to open the driver */ - Status = IoGetDeviceObjectPointer(pustrDeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &pFileObject, - &pDeviceObject); - if (!NT_SUCCESS(Status)) - { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); - - /* Copy the device and file object pointers */ - pGraphicsDevice->DeviceObject = pDeviceObject; - pGraphicsDevice->FileObject = pFileObject; - - /* Copy device name */ - RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); - - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); - - /* Allocate a buffer for the strings */ - cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); - pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); - if (!pwsz) - { - ERR("Could not allocate string buffer\n"); - ASSERT(FALSE); // FIXME - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Copy display driver names */ - pGraphicsDevice->pDiplayDrivers = pwsz; - RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, - pustrDiplayDrivers->Buffer, - pustrDiplayDrivers->Length); - - /* Copy description */ - pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); - RtlCopyMemory(pGraphicsDevice->pwszDescription, - pustrDescription->Buffer, - pustrDescription->Length); - pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; - - /* Initialize the pdevmodeInfo list and default index */ - pGraphicsDevice->pdevmodeInfo = NULL; - pGraphicsDevice->iDefaultMode = 0; - pGraphicsDevice->iCurrentMode = 0; - - // FIXME: initialize state flags - pGraphicsDevice->StateFlags = 0; + ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; /* Loop through the driver names * This is a REG_MULTI_SZ string */ @@ -138,7 +61,7 @@ } /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject); + pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); if (!pdminfo) { ERR("Could not get mode list for '%ls'\n", pwsz); @@ -170,8 +93,7 @@ if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) { ERR("No devmodes\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } /* Allocate an index buffer */ @@ -182,8 +104,7 @@ if (!pGraphicsDevice->pDevModeList) { ERR("No devmode list\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", @@ -232,7 +153,106 @@ pGraphicsDevice->pDevModeList[i].pdm = pdm; i++; } - } + } + return TRUE; +} + +PGRAPHICS_DEVICE +NTAPI +EngpRegisterGraphicsDevice( + _In_ PUNICODE_STRING pustrDeviceName, + _In_ PUNICODE_STRING pustrDiplayDrivers, + _In_ PUNICODE_STRING pustrDescription, + _In_ PDEVMODEW pdmDefault) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pDeviceObject; + PFILE_OBJECT pFileObject; + NTSTATUS Status; + PWSTR pwsz; + ULONG cj; + SIZE_T cjWritten; + BOOL bEnable = TRUE; + + TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); + + /* Allocate a GRAPHICS_DEVICE structure */ + pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, + sizeof(GRAPHICS_DEVICE), + GDITAG_GDEVICE); + if (!pGraphicsDevice) + { + ERR("ExAllocatePoolWithTag failed\n"); + return NULL; + } + + /* Try to open the driver */ + Status = IoGetDeviceObjectPointer(pustrDeviceName, + FILE_READ_DATA | FILE_WRITE_DATA, + &pFileObject, + &pDeviceObject); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Enable the device */ + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); + + /* Copy the device and file object pointers */ + pGraphicsDevice->DeviceObject = pDeviceObject; + pGraphicsDevice->FileObject = pFileObject; + + /* Copy device name */ + RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); + + /* Create a win device name (FIXME: virtual devices!) */ + swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + + /* Allocate a buffer for the strings */ + cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); + pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); + if (!pwsz) + { + ERR("Could not allocate string buffer\n"); + ASSERT(FALSE); // FIXME + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Copy display driver names */ + pGraphicsDevice->pDiplayDrivers = pwsz; + RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, + pustrDiplayDrivers->Buffer, + pustrDiplayDrivers->Length); + + /* Copy description */ + pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); + RtlCopyMemory(pGraphicsDevice->pwszDescription, + pustrDescription->Buffer, + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; + + /* Initialize the pdevmodeInfo list and default index */ + pGraphicsDevice->pdevmodeInfo = NULL; + pGraphicsDevice->iDefaultMode = 0; + pGraphicsDevice->iCurrentMode = 0; + + // FIXME: initialize state flags + pGraphicsDevice->StateFlags = 0; + + /* Create the mode list */ + pGraphicsDevice->pDevModeList = NULL; + if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault)) + { + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } /* Lock loader */ EngAcquireSemaphore(ghsemGraphicsDeviceList); @@ -250,7 +270,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: trunk/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/device.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Mon Apr 17 19:44:32 2017 @@ -29,6 +29,11 @@ _In_ PUNICODE_STRING pustrDescription, _In_ PDEVMODEW pdmDefault); +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW pdmDefault); + INIT_FUNCTION NTSTATUS NTAPI

7 years, 8 months

[tfaber] 74358: [NTOS:CC] - Respect the TruncateSize parameter in CcUninitializeCacheMap. Avoids "freeing dirty VACB" messages for cache views beyond the end of the file. CORE-12893 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 18:37:12 2017 New Revision: 74358 URL: http://svn.reactos.org/svn/reactos?rev=74358&view=rev Log: [NTOS:CC] - Respect the TruncateSize parameter in CcUninitializeCacheMap. Avoids "freeing dirty VACB" messages for cache views beyond the end of the file. CORE-12893 #resolve Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=74358… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Mon Apr 17 18:37:12 2017 @@ -286,13 +286,34 @@ IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL) { NTSTATUS Status; + PROS_SHARED_CACHE_MAP SharedCacheMap; + KIRQL OldIrql; CCTRACE(CC_API_DEBUG, "FileObject=%p TruncateSize=%p UninitializeCompleteEvent=%p\n", FileObject, TruncateSize, UninitializeCompleteEvent); + if (TruncateSize != NULL && + FileObject->SectionObjectPointer != NULL && + FileObject->SectionObjectPointer->SharedCacheMap != NULL) + { + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + if (SharedCacheMap->FileSize.QuadPart > TruncateSize->QuadPart) + { + SharedCacheMap->FileSize = *TruncateSize; + } + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + CcPurgeCacheSection(FileObject->SectionObjectPointer, + TruncateSize, + 0, + FALSE); + } + Status = CcRosReleaseFileCache(FileObject); if (UninitializeCompleteEvent) + { KeSetEvent(&UninitializeCompleteEvent->Event, IO_NO_INCREMENT, FALSE); + } return NT_SUCCESS(Status); }

7 years, 8 months

[tfaber] 74357: [NTOS:CC] - Simplify CcSetFileSizes by using CcPurgeCacheSection CORE-12893

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 18:13:17 2017 New Revision: 74357 URL: http://svn.reactos.org/svn/reactos?rev=74357&view=rev Log: [NTOS:CC] - Simplify CcSetFileSizes by using CcPurgeCacheSection CORE-12893 Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=74357… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Mon Apr 17 18:13:17 2017 @@ -225,10 +225,6 @@ { KIRQL oldirql; PROS_SHARED_CACHE_MAP SharedCacheMap; - PLIST_ENTRY current_entry; - PROS_VACB current; - LIST_ENTRY FreeListHead; - NTSTATUS Status; CCTRACE(CC_API_DEBUG, "FileObject=%p FileSizes=%p\n", FileObject, FileSizes); @@ -251,63 +247,16 @@ if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->SectionSize.QuadPart) { - InitializeListHead(&FreeListHead); - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); - - current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; - while (current_entry != &SharedCacheMap->CacheMapVacbListHead) - { - current = CONTAINING_RECORD(current_entry, - ROS_VACB, - CacheMapVacbListEntry); - current_entry = current_entry->Flink; - if (current->FileOffset.QuadPart >= FileSizes->AllocationSize.QuadPart) - { - if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) - { - RemoveEntryList(&current->CacheMapVacbListEntry); - RemoveEntryList(&current->VacbLruListEntry); - if (current->Dirty) - { - RemoveEntryList(&current->DirtyVacbListEntry); - DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; - } - InsertHeadList(&FreeListHead, &current->CacheMapVacbListEntry); - } - else - { - DPRINT1("Someone has referenced a VACB behind the new size.\n"); - KeBugCheck(CACHE_MANAGER); - } - } - } - - SharedCacheMap->SectionSize = FileSizes->AllocationSize; - SharedCacheMap->FileSize = FileSizes->FileSize; - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); - KeReleaseGuardedMutex(&ViewLock); - - current_entry = FreeListHead.Flink; - while(current_entry != &FreeListHead) - { - current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - current_entry = current_entry->Flink; - Status = CcRosInternalFreeVacb(current); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CcRosInternalFreeVacb failed, status = %x\n", Status); - KeBugCheck(CACHE_MANAGER); - } - } - } - else - { - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); - SharedCacheMap->SectionSize = FileSizes->AllocationSize; - SharedCacheMap->FileSize = FileSizes->FileSize; - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); - } + CcPurgeCacheSection(FileObject->SectionObjectPointer, + &FileSizes->AllocationSize, + 0, + FALSE); + } + + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); + SharedCacheMap->SectionSize = FileSizes->AllocationSize; + SharedCacheMap->FileSize = FileSizes->FileSize; + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } /*

7 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2017