Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[aandrejevic] 67894: [FAST486] Fix the implementation of FSIN and FCOS: First of all, 4 steps for a Maclaurin series is not enough. Second, the angle should be normalized to the [-pi/2, pi/2] range.
by aandrejevic＠svn.reactos.org 25 May '15

25 May '15

Author: aandrejevic Date: Mon May 25 03:23:40 2015 New Revision: 67894 URL: http://svn.reactos.org/svn/reactos?rev=67894&view=rev Log: [FAST486] Fix the implementation of FSIN and FCOS: First of all, 4 steps for a Maclaurin series is not enough. Second, the angle should be normalized to the [-pi/2, pi/2] range. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6789… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 25 03:23:40 2015 @@ -55,6 +55,9 @@ /* 2.00 */ static const FAST486_FPU_DATA_REG FpuTwo = {0x8000000000000000ULL, FPU_REAL10_BIAS + 1, FALSE}; + +/* Pi / 2 */ +static const FAST486_FPU_DATA_REG FpuHalfPi = {0xC90FDAA22168C235ULL, FPU_REAL10_BIAS, FALSE}; static const FAST486_FPU_DATA_REG FpuInverseNumber[INVERSE_NUMBERS_COUNT] = { @@ -110,6 +113,114 @@ {0xA3D70A3D70A3D70AULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 50 */ }; +static const FAST486_FPU_DATA_REG FpuInverseNumberSine[INVERSE_NUMBERS_COUNT] = +{ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 6 */ + {0xCCCCCCCCCCCCCCCCULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 20 */ + {0xC30C30C30C30C30CULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 42 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 72 */ + {0x94F2094F2094F209ULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 110 */ + {0xD20D20D20D20D20DULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 156 */ + {0x9C09C09C09C09C09ULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 210 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 272 */ + {0xBFA02FE80BFA02FEULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 342 */ + {0x9C09C09C09C09C09ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 420 */ + {0x81848DA8FAF0D277ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 506 */ + {0xDA740DA740DA740DULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 600 */ + {0xBAB656100BAB6561ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 702 */ + {0xA16B312EA8FC377CULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 812 */ + {0x8CF008CF008CF008ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 930 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1056 */ + {0xDC4A00DC4A00DC4AULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1190 */ + {0xC4CE07B00C4CE07BULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1332 */ + {0xB0E2A2600B0E2A26ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1482 */ + {0x9FD809FD809FD809ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1640 */ + {0x9126D6E4802449B5ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1806 */ + {0x84655D9BAB2F1008ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1980 */ + {0xF2805AF0221A0CC9ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2162 */ + {0xDEE95C4CA037BA57ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2352 */ + {0xCD9A673400CD9A67ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2550 */ + {0xBE3C310B84A4F832ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2756 */ + {0xB087277A39941560ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2970 */ + {0xA44029100A440291ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3192 */ + {0x9936034AA9121AA1ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3422 */ + {0x8F3F82A86DACA008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3660 */ + {0x8639F00218E7C008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3906 */ + {0xFC0FC0FC0FC0FC0FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4160 */ + {0xED208916CF412FD1ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4422 */ + {0xDF7B4EC93886702DULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4692 */ + {0xD2FB287C7224E167ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4970 */ + {0xC78031E00C78031EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5256 */ + {0xBCEEBFB33F021F2EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5550 */ + {0xB32EB86E96D5D441ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5852 */ + {0xAA2B0A62E08248F3ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6162 */ + {0xA1D139855F7268EDULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6480 */ + {0x9A1100604AA03C2EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6806 */ + {0x92DC0092DC0092DCULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7140 */ + {0x8C258008C258008CULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7482 */ + {0x85E230A32BAB46DDULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7832 */ + {0x8008008008008008ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 8190 */ + {0xF51BE2CC2D7AAC94ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8556 */ + {0xEAD7EC46DDA80C62ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8930 */ + {0xE135A9C97500E135ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9312 */ + {0xD8281B71177BDB7BULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9702 */ + {0xCFA3892CE9FFCC17ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 10100 */ +}; + +static const FAST486_FPU_DATA_REG FpuInverseNumberCosine[INVERSE_NUMBERS_COUNT] = +{ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 1 / 2 */ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 12 */ + {0x8888888888888888ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 30 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 56 */ + {0xB60B60B60B60B60BULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 90 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 132 */ + {0xB40B40B40B40B40BULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 182 */ + {0x8888888888888888ULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 240 */ + {0xD62B80D62B80D62BULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 306 */ + {0xAC7691840AC76918ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 380 */ + {0x8DDA520237694808ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 462 */ + {0xED7303B5CC0ED730ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 552 */ + {0xC9A633FCD967300CULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 650 */ + {0xAD602B580AD602B5ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 756 */ + {0x96A850096A850096ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 870 */ + {0x8421084210842108ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 992 */ + {0xE9A3D25E00E9A3D2ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1122 */ + {0xD00D00D00D00D00DULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1260 */ + {0xBA7258200BA72582ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1406 */ + {0xA80A80A80A80A80AULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1560 */ + {0x983B773A92E16009ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1722 */ + {0x8A8DCD1FEEAE465CULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1892 */ + {0xFD477B6C956529CDULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2070 */ + {0xE865AC7B7603A196ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2256 */ + {0xD5FEBF01E17D2DC4ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2450 */ + {0xC5B200C5B200C5B2ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2652 */ + {0xB7307B1492B1D28FULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2862 */ + {0xAA392F35DC17F00AULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3080 */ + {0x9E96394D47B46C68ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3306 */ + {0x941A9CC82BF7E68BULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3540 */ + {0x8AA08EF5936D4008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3782 */ + {0x8208208208208208ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 4032 */ + {0xF46C5E0BB22F800FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4290 */ + {0xE6271BA5329217D3ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4556 */ + {0xD918B2EF5B7B4866ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4830 */ + {0xCD1ED923A7DCBEB2ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5112 */ + {0xC21BDD800C21BDD8ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5402 */ + {0xB7F5F08CD84C2BD5ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5700 */ + {0xAE968C517F46800AULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6006 */ + {0xA5E9F6ED347F0721ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6320 */ + {0x9DDEDA75A1CD4726ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6642 */ + {0x9665EE14DB2283E4ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6972 */ + {0x8F71AD362448008FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7310 */ + {0x88F61A371B048C2BULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7656 */ + {0x82E88A942AB2D933ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 8010 */ + {0xFA7EF5D91AC9538AULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8372 */ + {0xEFE4D31416B96CFEULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8742 */ + {0xE5F36CB00E5F36CBULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9120 */ + {0xDC9D0ECFCB6E9378ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9506 */ + {0xD3D56292AB7E800DULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9900 */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -1202,7 +1313,8 @@ PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, BOOLEAN RoundToNearest, - PFAST486_FPU_DATA_REG Result) + PFAST486_FPU_DATA_REG Result, + PLONGLONG Quotient OPTIONAL) { BOOLEAN Success = FALSE; INT OldRoundingMode = State->FpuControl.Rc; @@ -1219,6 +1331,7 @@ if (!Fast486FpuMultiply(State, &Temp, SecondOperand, &Temp)) goto Cleanup; if (!Fast486FpuSubtract(State, FirstOperand, &Temp, Result)) goto Cleanup; + if (Quotient) *Quotient = Integer; Success = TRUE; Cleanup: @@ -1236,14 +1349,43 @@ PFAST486_FPU_DATA_REG Result) { INT i; - FAST486_FPU_DATA_REG TempResult = *Operand; - FAST486_FPU_DATA_REG OperandSquared = *Operand; - FAST486_FPU_DATA_REG SeriesElement = *Operand; + ULONGLONG Quadrant; + FAST486_FPU_DATA_REG Normalized = *Operand; + FAST486_FPU_DATA_REG TempResult; + FAST486_FPU_DATA_REG OperandSquared; + FAST486_FPU_DATA_REG SeriesElement; + PCFAST486_FPU_DATA_REG Inverse; + + if (!Fast486FpuRemainder(State, + Operand, + &FpuHalfPi, + FALSE, + &Normalized, + (PLONGLONG)&Quadrant)) + { + return FALSE; + } + + /* Normalize the quadrant number */ + Quadrant &= 3; + + if (!(Quadrant & 1)) + { + /* This is a sine */ + Inverse = FpuInverseNumberSine; + TempResult = SeriesElement = Normalized; + } + else + { + /* This is a cosine */ + Inverse = FpuInverseNumberCosine; + TempResult = SeriesElement = FpuOne; + } /* Calculate the square of the operand */ - if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; - - for (i = 2; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) + if (!Fast486FpuMultiply(State, &Normalized, &Normalized, &OperandSquared)) return FALSE; + + for (i = 0; i < INVERSE_NUMBERS_COUNT; i++) { if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) { @@ -1253,7 +1395,7 @@ if (!Fast486FpuMultiply(State, &SeriesElement, - &FpuInverseNumber[i * (i + 1) - 1], + &Inverse[i], &SeriesElement)) { /* An exception occurred */ @@ -1269,6 +1411,9 @@ return FALSE; } } + + /* Flip the sign for the third and fourth quadrant */ + if (Quadrant >= 2) TempResult.Sign = !TempResult.Sign; *Result = TempResult; return TRUE; @@ -1283,43 +1428,13 @@ PFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { - INT i; - FAST486_FPU_DATA_REG TempResult = FpuOne; - FAST486_FPU_DATA_REG OperandSquared = *Operand; - FAST486_FPU_DATA_REG SeriesElement = FpuOne; - - /* Calculate the square of the operand */ - if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; - - for (i = 1; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) - { - if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) - { - /* An exception occurred */ - return FALSE; - } - - if (!Fast486FpuMultiply(State, - &SeriesElement, - &FpuInverseNumber[i * (i + 1) - 1], - &SeriesElement)) - { - /* An exception occurred */ - return FALSE; - } - - /* Toggle the sign of the series element */ - SeriesElement.Sign = !SeriesElement.Sign; - - if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) - { - /* An exception occurred */ - return FALSE; - } - } - - *Result = TempResult; - return TRUE; + FAST486_FPU_DATA_REG Value = *Operand; + + /* Add pi / 2 */ + if (!Fast486FpuAdd(State, &Value, &FpuHalfPi, &Value)) return FALSE; + + /* Calculate the sine */ + return Fast486FpuCalculateSine(State, &Value, Result); } static inline VOID FASTCALL @@ -2090,7 +2205,7 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0)); + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0), NULL); FPU_UPDATE_TAG(0); break; @@ -2121,7 +2236,7 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0)); + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0), NULL); FPU_UPDATE_TAG(0); break;

1 0

[ekohl] 67893: [SYSDM] Show a warning if the user tries to copy or rename a hardware profile to a name that is already in use.
by ekohl＠svn.reactos.org 24 May '15

24 May '15

Author: ekohl Date: Sun May 24 22:51:12 2015 New Revision: 67893 URL: http://svn.reactos.org/svn/reactos?rev=67893&view=rev Log: [SYSDM] Show a warning if the user tries to copy or rename a hardware profile to a name that is already in use. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Sun May 24 22:51:12 2015 @@ -34,16 +34,39 @@ { WCHAR szSourceName[PROFILE_NAME_LENGTH]; WCHAR szDestinationName[PROFILE_NAME_LENGTH]; + PPROFILEDATA pProfileData; } PROFILENAMES, *PPROFILENAMES; + + +static +BOOL +IsProfileNameInUse( + PPROFILENAMES pProfileNames, + BOOL bIgnoreCurrent) +{ + DWORD i; + + for (i = 0; i < pProfileNames->pProfileData->dwProfileCount; i++) + { + if (bIgnoreCurrent == TRUE && i == pProfileNames->pProfileData->dwSelectedProfileIndex) + continue; + + if (wcscmp(pProfileNames->pProfileData->pProfiles[i].szFriendlyName, pProfileNames->szDestinationName) == 0) + return TRUE; + } + + return FALSE; +} static INT_PTR CALLBACK -CopyProfileDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +CopyProfileDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { PPROFILENAMES pProfileNames; @@ -71,7 +94,14 @@ IDC_COPYPROFILETO, pProfileNames->szDestinationName, PROFILE_NAME_LENGTH); - EndDialog(hwndDlg, IDOK); + if (IsProfileNameInUse(pProfileNames, FALSE)) + ResourceMessageBox(hApplet, + NULL, + MB_OK | MB_ICONERROR, + IDS_HWPROFILE_WARNING, + IDS_HWPROFILE_ALREADY_IN_USE); + else + EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: @@ -101,6 +131,8 @@ wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + ProfileNames.pProfileData = pProfileData; if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_COPYPROFILE), @@ -145,10 +177,11 @@ static INT_PTR CALLBACK -RenameProfileDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +RenameProfileDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { PPROFILENAMES pProfileNames; @@ -176,7 +209,14 @@ IDC_RENPROFEDITTO, pProfileNames->szDestinationName, PROFILE_NAME_LENGTH); - EndDialog(hwndDlg, IDOK); + if (IsProfileNameInUse(pProfileNames, TRUE)) + ResourceMessageBox(hApplet, + NULL, + MB_OK | MB_ICONERROR, + IDS_HWPROFILE_WARNING, + IDS_HWPROFILE_ALREADY_IN_USE); + else + EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: @@ -206,6 +246,8 @@ wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + ProfileNames.pProfileData = pProfileData; if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), @@ -248,36 +290,36 @@ if (MessageBox(NULL, szMessage, szCaption, - MB_YESNO | MB_ICONQUESTION) == IDYES) - { - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); - - if (pProfileData->dwSelectedProfileIndex != pProfileData->dwProfileCount - 1) - { - RtlMoveMemory(&pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex], - &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex + 1], - (pProfileData->dwProfileCount - pProfileData->dwSelectedProfileIndex - 1) * sizeof(PPROFILE)); - } - else - { - pProfileData->dwSelectedProfileIndex--; - } - - pProfiles = HeapReAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - pProfileData->pProfiles, - (pProfileData->dwProfileCount - 1) * sizeof(PROFILE)); - if (pProfiles == NULL) - { - DPRINT1("HeapReAlloc() failed!\n"); - return; - } - - pProfileData->dwProfileCount--; - pProfileData->pProfiles = pProfiles; - - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); - } + MB_YESNO | MB_ICONQUESTION) != IDYES) + return; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); + + if (pProfileData->dwSelectedProfileIndex != pProfileData->dwProfileCount - 1) + { + RtlMoveMemory(&pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex], + &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex + 1], + (pProfileData->dwProfileCount - pProfileData->dwSelectedProfileIndex - 1) * sizeof(PPROFILE)); + } + else + { + pProfileData->dwSelectedProfileIndex--; + } + + pProfiles = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pProfileData->pProfiles, + (pProfileData->dwProfileCount - 1) * sizeof(PROFILE)); + if (pProfiles == NULL) + { + DPRINT1("HeapReAlloc() failed!\n"); + return; + } + + pProfileData->dwProfileCount--; + pProfileData->pProfiles = pProfiles; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); } Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -288,4 +288,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -291,4 +291,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -291,4 +291,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Sun May 24 22:51:12 2015 @@ -47,6 +47,7 @@ #define IDS_HWPROFILE_CONFIRM_DELETE 86 #define IDS_HWPROFILE_ALREADY_IN_USE 87 #define IDS_HWPROFILE_PROFILE 88 +#define IDS_HWPROFILE_WARNING 89 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100

1 0

[pschweitzer] 67892: [NTFS] Handle IRP_MJ_CLOSE with the dispatch routine
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 21:29:34 2015 New Revision: 67892 URL: http://svn.reactos.org/svn/reactos?rev=67892&view=rev Log: [NTFS] Handle IRP_MJ_CLOSE with the dispatch routine Modified: trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -79,35 +79,30 @@ } -NTSTATUS NTAPI -NtfsFsdClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS +NtfsClose(PNTFS_IRP_CONTEXT IrpContext) { PDEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; DPRINT("NtfsClose() called\n"); + DeviceObject = IrpContext->DeviceObject; if (DeviceObject == NtfsGlobalData->DeviceObject) { DPRINT("Closing file system\n"); - Status = STATUS_SUCCESS; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_SUCCESS; } - Stack = IoGetCurrentIrpStackLocation(Irp); - FileObject = Stack->FileObject; + FileObject = IrpContext->FileObject; DeviceExtension = DeviceObject->DeviceExtension; - Status = NtfsCloseFile(DeviceExtension,FileObject); + Status = NtfsCloseFile(DeviceExtension, FileObject); -ByeBye: - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IrpContext->Irp->IoStatus.Information = 0; return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -96,6 +96,10 @@ case IRP_MJ_WRITE: Status = NtfsWrite(IrpContext); break; + + case IRP_MJ_CLOSE: + Status = NtfsClose(IrpContext); + break; } ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -124,7 +124,7 @@ NtfsInitializeFunctionPointers(PDRIVER_OBJECT DriverObject) { DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsFsdCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsFsdClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NtfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 24 21:29:34 2015 @@ -521,10 +521,8 @@ NtfsCloseFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject); -DRIVER_DISPATCH NtfsFsdClose; -NTSTATUS NTAPI -NtfsFsdClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NtfsClose(PNTFS_IRP_CONTEXT IrpContext); /* create.c */

1 0

[akhaldi] 67891: [README.WINE] Mark some modules as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 24 May '15

24 May '15

Author: akhaldi Date: Sun May 24 20:51:18 2015 New Revision: 67891 URL: http://svn.reactos.org/svn/reactos?rev=67891&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun May 24 20:51:18 2015 @@ -17,7 +17,7 @@ reactos/tools/unicode # Synced to WineStaging-1.7.37 reactos/tools/widl # Synced to Wine-1.7.17 -reactos/tools/wpp # Synced to Wine-1.7.27 +reactos/tools/wpp # Synced to WineStaging-1.7.37 The following libraries are shared with Wine. @@ -43,8 +43,8 @@ reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37 -reactos/dll/win32/activeds # Synced to Wine-1.7.27 -reactos/dll/win32/actxprxy # Synced to Wine-1.7.27 +reactos/dll/win32/activeds # Synced to WineStaging-1.7.37 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.37 reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 reactos/dll/win32/atl # Synced to WineStaging-1.7.37 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37 @@ -53,15 +53,15 @@ reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37 -reactos/dll/win32/clusapi # Synced to Wine-1.7.27 -reactos/dll/win32/comcat # Synced to Wine-1.7.27 +reactos/dll/win32/clusapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/comcat # Synced to WineStaging-1.7.37 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/compstui # Synced to Wine-1.7.27 -reactos/dll/win32/credui # Synced to Wine-1.7.27 +reactos/dll/win32/compstui # Synced to WineStaging-1.7.37 +reactos/dll/win32/credui # Synced to WineStaging-1.7.37 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27 -reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 +reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.37 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.37

1 0

[akhaldi] 67890: [NOTEPAD] Printer output improvements by Ricardo Hanke. See CORE-9088 for more details.
by akhaldi＠svn.reactos.org 24 May '15

24 May '15

Author: akhaldi Date: Sun May 24 20:37:29 2015 New Revision: 67890 URL: http://svn.reactos.org/svn/reactos?rev=67890&view=rev Log: [NOTEPAD] Printer output improvements by Ricardo Hanke. See CORE-9088 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun May 24 20:37:29 2015 @@ -515,6 +515,7 @@ VOID DIALOG_FilePrint(VOID) { DOCINFO di; + TEXTMETRIC tm; PRINTDLG printer; SIZE szMetric; int cWidthPels, cHeightPels, border; @@ -557,7 +558,7 @@ printer.nFromPage = 0; printer.nMinPage = 1; /* we really need to calculate number of pages to set nMaxPage and nToPage */ - printer.nToPage = 0; + printer.nToPage = (WORD)-1; printer.nMaxPage = (WORD)-1; /* Let commdlg manage copy settings */ @@ -622,22 +623,39 @@ size = GetWindowText(Globals.hEdit, pTemp, size); } + /* Ensure that each logical unit maps to one pixel */ + SetMapMode(printer.hDC, MM_TEXT); + + /* Needed to get the correct height of a text line */ + GetTextMetrics(printer.hDC, &tm); + border = 150; for (copycount=1; copycount <= printer.nCopies; copycount++) { i = 0; pagecount = 1; do { - static const TCHAR letterM[] = _T("M"); - - if (pagecount >= printer.nFromPage && - /* ((printer.Flags & PD_PAGENUMS) == 0 || pagecount <= printer.nToPage))*/ - pagecount <= printer.nToPage) + /* Don't start a page if none of the conditions below are true */ + dopage = 0; + + /* The user wants to print the current selection */ + if (printer.Flags & PD_SELECTION) + { dopage = 1; - else - dopage = 0; + } + + /* The user wants to print the entire document */ + if (!(printer.Flags & PD_PAGENUMS) && !(printer.Flags & PD_SELECTION)) + { + dopage = 1; + } + + /* The user wants to print a specified range of pages */ + if ((pagecount >= printer.nFromPage && pagecount <= printer.nToPage)) + { + dopage = 1; + } old_font = SelectObject(printer.hDC, font); - GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); if (dopage) { if (StartPage(printer.hDC) <= 0) { @@ -650,35 +668,44 @@ return; } /* Write a rectangle and header at the top of each page */ - Rectangle(printer.hDC, border, border, cWidthPels-border, border+szMetric.cy*2); + Rectangle(printer.hDC, border, border, cWidthPels-border, border + tm.tmHeight * 2); /* I don't know what's up with this TextOut command. This comes out kind of mangled. */ TextOut(printer.hDC, border * 2, - border + szMetric.cy / 2, + border + tm.tmHeight / 2, Globals.szFileTitle, lstrlen(Globals.szFileTitle)); } /* The starting point for the main text */ xLeft = border * 2; - yTop = border + szMetric.cy * 4; + yTop = border + tm.tmHeight * 4; SelectObject(printer.hDC, old_font); - GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); /* Since outputting strings is giving me problems, output the main * text one character at a time. */ do { if (pTemp[i] == '\n') { xLeft = border * 2; - yTop += szMetric.cy; + yTop += tm.tmHeight; } else if (pTemp[i] != '\r') { if (dopage) TextOut(printer.hDC, xLeft, yTop, &pTemp[i], 1); + + /* We need to get the width for each individual char, since a proportional font may be used */ + GetTextExtentPoint32(printer.hDC, &pTemp[i], 1, &szMetric); xLeft += szMetric.cx; + + /* Insert a line break if the current line does not fit into the printing area */ + if (xLeft > (cWidthPels - border * 2)) + { + xLeft = border * 2; + yTop = yTop + tm.tmHeight; + } } } while (i++ < size && yTop < (cHeightPels - border * 2));

1 0

[ekohl] 67889: [SYSDM] - Move the code to copy and rename hardware profiles from the dialog procedures into separate functions. - Use the dialogs only to retrieve the destination profile name. - Do...
by ekohl＠svn.reactos.org 24 May '15

24 May '15

Author: ekohl Date: Sun May 24 20:20:04 2015 New Revision: 67889 URL: http://svn.reactos.org/svn/reactos?rev=67889&view=rev Log: [SYSDM] - Move the code to copy and rename hardware profiles from the dialog procedures into separate functions. - Use the dialogs only to retrieve the destination profile name. - Do not copy or rename a hardware profile if it source and destination name is the same. - Replace a hard.-coded string by a resource string. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Sun May 24 20:20:04 2015 @@ -28,66 +28,13 @@ DWORD dwSelectedProfile; DWORD dwSelectedProfileIndex; PPROFILE pProfiles; - HWND hwndProfileDlg; } PROFILEDATA, *PPROFILEDATA; - -static -VOID -OnCopyProfileInit(HWND hwndDlg, - PPROFILEDATA pProfileData, - UINT idFrom, - UINT idTo) -{ - WCHAR szNewProfileName[PROFILE_NAME_LENGTH]; - - SetDlgItemText(hwndDlg, idFrom, pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName); - - swprintf(szNewProfileName, L"Profile %lu", pProfileData->dwProfileCount); - SendDlgItemMessageW(hwndDlg, idTo, EM_SETLIMITTEXT, PROFILE_NAME_LENGTH - 1, 0); - SetDlgItemText(hwndDlg, idTo, szNewProfileName); -} - - -static -VOID -CopyProfile( - HWND hwndDlg, - PPROFILEDATA pProfileData) -{ - PPROFILE pProfiles; -// PPROFILE pSrcProfile - PPROFILE pDstProfile; - - /* Allocate memory for the new profile */ - pProfiles = HeapReAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - pProfileData->pProfiles, - (pProfileData->dwProfileCount + 1) * sizeof(PROFILE)); - if (pProfiles == NULL) - { - DPRINT1("HeapReAlloc() failed!\n"); - return; - } - - pProfileData->dwProfileCount++; - pProfileData->pProfiles = pProfiles; - -// pSrcProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; - pDstProfile = &pProfileData->pProfiles[pProfileData->dwProfileCount - 1]; - - GetDlgItemText(hwndDlg, - IDC_COPYPROFILETO, - pDstProfile->szFriendlyName, - PROFILE_NAME_LENGTH); - - pDstProfile->dwProfileNumber = ++pProfileData->dwLastProfile; - swprintf(pDstProfile->szName, L"%04lu", pDstProfile->dwProfileNumber); - - pDstProfile->dwPreferenceOrder = pDstProfile->dwProfileNumber; - - SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pDstProfile->szFriendlyName); -} +typedef struct _PROFILENAMES +{ + WCHAR szSourceName[PROFILE_NAME_LENGTH]; + WCHAR szDestinationName[PROFILE_NAME_LENGTH]; +} PROFILENAMES, *PPROFILENAMES; static @@ -98,54 +45,100 @@ WPARAM wParam, LPARAM lParam) { - PPROFILEDATA pProfileData; - - pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PPROFILENAMES pProfileNames; + + pProfileNames = (PPROFILENAMES)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); - pProfileData = (PPROFILEDATA)lParam; - OnCopyProfileInit(hwndDlg, pProfileData, IDC_COPYPROFILEFROM, IDC_COPYPROFILETO); + pProfileNames = (PPROFILENAMES)lParam; + + /* Set the old name */ + SetDlgItemText(hwndDlg, IDC_COPYPROFILEFROM, pProfileNames->szSourceName); + + /* Set the new name */ + SendDlgItemMessageW(hwndDlg, IDC_COPYPROFILETO, EM_SETLIMITTEXT, PROFILE_NAME_LENGTH - 1, 0); + SetDlgItemText(hwndDlg, IDC_COPYPROFILETO, pProfileNames->szDestinationName); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - CopyProfile(hwndDlg, pProfileData); + GetDlgItemText(hwndDlg, + IDC_COPYPROFILETO, + pProfileNames->szDestinationName, + PROFILE_NAME_LENGTH); EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - return TRUE; + return TRUE; } break; } + return FALSE; } static VOID -RenameProfile( +CopyHardwareProfile( HWND hwndDlg, PPROFILEDATA pProfileData) { - PPROFILE pProfile; + PROFILENAMES ProfileNames; + PPROFILE pProfile, pNewProfiles, pNewProfile; + WCHAR szBuffer[80]; pProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; - GetDlgItemText(hwndDlg, - IDC_RENPROFEDITTO, - pProfile->szFriendlyName, - PROFILE_NAME_LENGTH); - - /* Replace the listbox string */ - SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); - SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_INSERTSTRING, pProfileData->dwSelectedProfileIndex, (LPARAM)pProfile->szFriendlyName); + LoadStringW(hApplet, IDS_HWPROFILE_PROFILE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + + wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); + swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_COPYPROFILE), + hwndDlg, + (DLGPROC)CopyProfileDlgProc, + (LPARAM)&ProfileNames) != IDOK) + return; + + /* Apply new name only if it has been changed */ + if (wcscmp(ProfileNames.szSourceName, ProfileNames.szDestinationName) == 0) + return; + + /* Allocate memory for the new profile */ + pNewProfiles = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pProfileData->pProfiles, + (pProfileData->dwProfileCount + 1) * sizeof(PROFILE)); + if (pNewProfiles == NULL) + { + DPRINT1("HeapReAlloc() failed!\n"); + return; + } + + pProfileData->dwProfileCount++; + pProfileData->pProfiles = pNewProfiles; + + pNewProfile = &pProfileData->pProfiles[pProfileData->dwProfileCount - 1]; + + CopyMemory(pNewProfile, pProfile, sizeof(PROFILE)); + + wcscpy(pNewProfile->szFriendlyName, ProfileNames.szDestinationName); + + pNewProfile->dwProfileNumber = ++pProfileData->dwLastProfile; + swprintf(pNewProfile->szName, L"%04lu", pNewProfile->dwProfileNumber); + + pNewProfile->dwPreferenceOrder = pNewProfile->dwProfileNumber; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pNewProfile->szFriendlyName); } @@ -157,29 +150,38 @@ WPARAM wParam, LPARAM lParam) { - PPROFILEDATA pProfileData; - - pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PPROFILENAMES pProfileNames; + + pProfileNames = (PPROFILENAMES)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); - pProfileData = (PPROFILEDATA)lParam; - OnCopyProfileInit(hwndDlg, pProfileData, IDC_RENPROFEDITFROM, IDC_RENPROFEDITTO); + pProfileNames = (PPROFILENAMES)lParam; + + /* Set the old name */ + SetDlgItemText(hwndDlg, IDC_RENPROFEDITFROM, pProfileNames->szSourceName); + + /* Set the new name */ + SendDlgItemMessageW(hwndDlg, IDC_RENPROFEDITTO, EM_SETLIMITTEXT, PROFILE_NAME_LENGTH - 1, 0); + SetDlgItemText(hwndDlg, IDC_RENPROFEDITTO, pProfileNames->szDestinationName); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - RenameProfile(hwndDlg, pProfileData); + GetDlgItemText(hwndDlg, + IDC_RENPROFEDITTO, + pProfileNames->szDestinationName, + PROFILE_NAME_LENGTH); EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - return TRUE; + return TRUE; } break; } @@ -190,14 +192,52 @@ static VOID -DeleteHardwareProfile(PPROFILEDATA pProfileData) +RenameHardwareProfile( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + PROFILENAMES ProfileNames; + PPROFILE pProfile; + WCHAR szBuffer[80]; + + pProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; + + LoadStringW(hApplet, IDS_HWPROFILE_PROFILE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + + wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); + swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_RENAMEPROFILE), + hwndDlg, + (DLGPROC)RenameProfileDlgProc, + (LPARAM)&ProfileNames) != IDOK) + return; + + /* Apply new name only if it has been changed */ + if (wcscmp(pProfile->szFriendlyName, ProfileNames.szDestinationName) == 0) + return; + + /* Replace the profile name in the profile list */ + wcscpy(pProfile->szFriendlyName, ProfileNames.szDestinationName); + + /* Replace the profile name in the listbox */ + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_INSERTSTRING, pProfileData->dwSelectedProfileIndex, (LPARAM)pProfile->szFriendlyName); +} + + +static +VOID +DeleteHardwareProfile( + HWND hwndDlg, + PPROFILEDATA pProfileData) { WCHAR szMessage[256]; WCHAR szBuffer[128]; WCHAR szCaption[80]; PPROFILE pProfiles; PPROFILE pProfile; - INT n; pProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; @@ -205,13 +245,12 @@ LoadStringW(hApplet, IDS_HWPROFILE_CONFIRM_DELETE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); swprintf(szMessage, szBuffer, pProfile->szFriendlyName); - n = MessageBox(NULL, + if (MessageBox(NULL, szMessage, szCaption, - MB_YESNO | MB_ICONQUESTION); - if (n == IDYES) - { - SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); if (pProfileData->dwSelectedProfileIndex != pProfileData->dwProfileCount - 1) { @@ -237,7 +276,7 @@ pProfileData->dwProfileCount--; pProfileData->pProfiles = pProfiles; - SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); } } @@ -393,7 +432,6 @@ if (pProfileData == NULL) return FALSE; - pProfileData->hwndProfileDlg = hwndDlg; pProfileData->dwLastProfile = (DWORD)-1; pProfileData->dwSelectedProfileIndex = (DWORD)-1; @@ -543,23 +581,15 @@ switch (LOWORD(wParam)) { case IDC_HRDPROFCOPY: - DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_COPYPROFILE), - hwndDlg, - (DLGPROC)CopyProfileDlgProc, - (LPARAM)pProfileData); + CopyHardwareProfile(hwndDlg, pProfileData); break; case IDC_HRDPROFRENAME: - DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_RENAMEPROFILE), - hwndDlg, - (DLGPROC)RenameProfileDlgProc, - (LPARAM)pProfileData); + RenameHardwareProfile(hwndDlg, pProfileData); break; case IDC_HRDPROFDEL: - DeleteHardwareProfile(pProfileData); + DeleteHardwareProfile(hwndDlg, pProfileData); break; case IDC_HRDPROFWAIT: Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -286,4 +286,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -290,4 +290,6 @@ IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nEquipo de ReactOS\n\nCoordinador del proyecto\n\nAleksey Bragin\n\nEquipo de desarrollo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngenieros de publicaciÃ³n de versiÃ³n\n\nColin Finck\nZ98\n\nEquipo Web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEquipo multimedia\n\nMindflyer\nWierd_W\n\nqueremos agradecer especialmente el trabajo realizado por\n\ntodos los colaboradores\nEl equipo de Wine\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -290,4 +290,6 @@ IDS_DEVS "\nEkipa ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nEkipa ProgramistÃ³w\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nInÅ¼ynierowie WydaÅ\n\nColin Finck\nZ98\n\nEkipa WWW\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEkipa PR\n\nMindflyer\nWierd_W\n\nPodziÄkowania dla\n\nwszystkich wspÃ³ÅpracownikÃ³w\nEkipy Wine\n\n"//FIXME IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -290,4 +290,6 @@ IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngineri de distribuÈie\n\nColin Finck\nZ98\n\nEchipa paginii web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa multimedia\n\nMindflyer\nWierd_W\n\nmulÈumiri adresate cÄtre\n\ntoÈi Contribuitorii\nEchipa Wine\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\n\nÐÐ¾Ð»Ð»ÐµÐºÑÐ¸Ð² ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð²\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\nÐÐ½Ð´ÑÑ ÐÑÐ¸Ð½Ð²ÑÐ´\nÐÐ½Ð´ÑÐµÐ¹ ÐÐ¾ÑÐ¾ÑÐ°ÐµÐ²\nÐÑÑ ÐÐµÑÐºÑ\nÐÑÐ¸ÑÑÐ¾Ñ ÑÐ¾Ð½ ÐÐ¸ÑÑÐ¸Ñ\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐÐ°Ð½Ð¸ÑÐ»Ñ Ð Ð°Ð¹Ð¼ÐµÑ\nÐÐ¼Ð¸ÑÑÐ¸Ð¹ Ð§Ð°Ð¿ÑÑÐµÐ²\nÐÑÐ¸Ðº ÐÐ¾Ð»Ñ\nÐÐµÐ´ ÐÑÑÑÐ¸\nÐÑÐµÐ³Ð¾Ñ ÐÑÑÐ½Ð¼Ð°Ñ\nÐÑÐ²Ðµ ÐÐ¾ÑÑÐ¸Ð½Ð¾\nÐÐ¶ÐµÐ¹Ð¼Ñ Ð¢ÑÐ±Ð¾Ñ\nÐÐ¶ÐµÑÑÑÐ¸ ÐÐ¾ÑÐ»Ð°Ð½\nÐÐ¾ÑÐ°Ð½Ð½ÐµÑ ÐÐ½Ð´ÐµÑÐ²Ð°Ð»ÑÐ´\nKamil HornÃÄek\nKJK::ÐÐ¸Ð¿ÐµÑÐ¸Ð¾Ð½\nÐÐ°Ð°ÑÑÐµÐ½ ÐÐ¾ÑÐ¼Ð°\nÐÐ°Ð³Ð½ÑÑ ÐÐ»ÑÐµÐ½\nÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ\nÐÐ°ÑÑÐ¸Ð°Ñ ÐÑÐ¿ÑÐµÑ\nÐÐ°Ð¹Ðº ÐÐ¾ÑÐ´ÐµÐ»Ð»\nÐÐ¸ÑÐµÑ ÐÐ°ÑÐ´\nÐÑÐµÑ Ð¨Ð²ÐµÐ¹ÑÐµÑ\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢ÑÐµÑÑÑÐºÐ¾Ð²\nÐ¡ÑÐµÑÐ°Ð½ ÐÐ¸Ð½ÑÐ±ÐµÑÐ³\nÐ¡Ð¸Ð»ÑÐ²ÐµÐ¹Ð½ ÐÐµÑÑÐµÐ¾Ð»Ñ\nÐ¢Ð¾Ð¼Ð°Ñ ÐÐ»ÑÐ¼ÐµÐ»Ñ\nÐ¢Ð¸Ð¼Ð¾ ÐÑÐ¾Ð¹ÑÐµÑ\n\nÐÐ»ÐµÐºÑ ÐÐ¾Ð½ÐµÑÐºÑ\nÐ¤Ð¸Ð»Ð¸Ð¿ ÐÐ°Ð²Ð°ÑÐ°\nÐÑÐ½Ð½Ð°Ñ ÐÐ°Ð»ÑÐ½ÐµÑ\nÐÐ°ÑÑÐ¸Ð½ Ð¤ÑÐºÑ\nÐ Ð¾Ð¹Ñ ÐÐ¸ÑÑÐµÐ»Ð» III\nÐÑÑÐ½Ð´Ð¾Ð½ Ð¢ÑÑÐ½ÐµÑ\nÐÑÐ°Ð¹Ð°Ð½ ÐÐ°Ð»Ð¼ÐµÑ\nÐÐ°ÑÐ¿ÐµÑ Ð¥Ð¾ÑÐ½ÑÑÑÑÐ¿\nÐÑÐ²Ð¸Ð´ ÐÐµÐ»Ñ\nÐÐ¼Ð°Ð½ÑÑÐ»Ñ ÐÐ»Ð¸Ð±ÐµÑÑÐ¸\nÐÐµ Ð²Ð°Ð½ ÐÐµÐ»ÑÐ´Ð¾ÑÐ¿\nÐÑÐµÐ³Ð¾Ñ ÐÐ½Ð¸Ñ\nÐÐ¶ÐµÐ¹ÑÐ¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐÐµÐ½Ñ ÐÐ¾Ð»Ð»Ð¸Ð½\nÐÐ¸ÑÐ°ÑÐ»Ñ ÐÐ¸ÑÑ\nÐÐ°ÑÐ°Ð½ ÐÑÐ´Ñ\nÐ Ð¾Ð±ÐµÑÑ ÐÐ¸ÐºÐµÐ½ÑÐ¾Ð½\nÐ ÐµÐºÑ ÐÐ¶Ð¾Ð»Ð»Ð¸ÑÑ\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑÑ\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐ Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ ÐÐ»ÑÐ¼ÐºÐ²Ð¸ÑÑ ÐÐ¸Ð½Ð°Ð½Ð´ÐµÑ\nÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¤ÑÐ¸Ð´Ð»\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐÐ»Ð°Ð³Ð¾Ð´Ð°ÑÐ½Ð¾ÑÑÐ¸\n\nÐ²ÑÐµÐ¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°Ð¼ Ð¿ÑÐ¾ÐµÐºÑÐ°\nÐÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -289,4 +289,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -281,4 +281,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nReactOS TakÄ±mÄ±\n\nTasarÄ± EÅ GÃ¼dÃ¼mcÃ¼sÃ¼:\n\nAleksey Bragin\n\nGeliÅtirme TakÄ±mÄ±:\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nSÃ¼rÃ¼m MÃ¼hendisleri:\n\nColin Finck\nZ98\n\nUmÃ»mÃ® AÄ Sitesi TakÄ±mÄ±:\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nOrtam TakÄ±mÄ±:\n\nMindflyer\nWierd_W\n\nAyrÄ±ca, tÃ¼m katkÄ±da bulunanlara teÅekkÃ¼rler:\nWine TakÄ±mÄ±\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -289,4 +289,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sun May 24 20:20:04 2015 @@ -283,4 +283,6 @@ IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" -END + IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." + IDS_HWPROFILE_PROFILE "Profile" +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Sun May 24 20:20:04 2015 @@ -45,6 +45,8 @@ #define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 85 #define IDS_HWPROFILE_CONFIRM_DELETE 86 +#define IDS_HWPROFILE_ALREADY_IN_USE 87 +#define IDS_HWPROFILE_PROFILE 88 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100

1 0

[pschweitzer] 67888: [KMTEST] Leak less memory.
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 18:14:49 2015 New Revision: 67888 URL: http://svn.reactos.org/svn/reactos?rev=67888&view=rev Log: [KMTEST] Leak less memory. Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlT… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] Sun May 24 18:14:49 2015 @@ -97,6 +97,13 @@ ok (b == 0, "long name after call FsRtlAddToTunnelCache != long name befo call FsRtlAddToTunnelCache\n\n"); b = RtlCompareUnicodeString(s_name, bs_name, TRUE); ok (b == 0, "short name after call FsRtlAddToTunnelCache != short name befo call FsRtlAddToTunnelCache\n\n"); + + if (bs_name->Buffer) ExFreePool(bs_name->Buffer); + ExFreePool(bs_name); + if (bl_name->Buffer) ExFreePool(bl_name->Buffer); + ExFreePool(bl_name); + ExFreePool(Bufb); + ExFreePool(Buf); } BOOLEAN TestFsRtlFindInTunnelCache(ULONG DirectoryKey, PUNICODE_STRING name, PUNICODE_STRING s_name, PUNICODE_STRING l_name) @@ -168,4 +175,12 @@ is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); + + ExFreePool(a); + ExFreePool(name); + ExFreePool(l_name); + ExFreePool(s_name); + + ExFreePool(Tb); + ExFreePool(T); }

1 0

[pschweitzer] 67887: [KMTEST] Enable FsRtlTunnel tests. They all pass in ReactOS now. CORE-7272
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 17:42:52 2015 New Revision: 67887 URL: http://svn.reactos.org/svn/reactos?rev=67887&view=rev Log: [KMTEST] Enable FsRtlTunnel tests. They all pass in ReactOS now. CORE-7272 Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun May 24 17:42:52 2015 @@ -80,7 +80,7 @@ { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, { "FsRtlMcb", Test_FsRtlMcb }, - { "-FsRtlTunnel", Test_FsRtlTunnel }, + { "FsRtlTunnel", Test_FsRtlTunnel }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent },

1 0

[pschweitzer] 67886: [NTOSKRNL] Short commit message: implementation of (names) tunnel cache in file system RTL. This is in the vast majority work done by Johannes Anderwald, I've just reviewed, fi...
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 17:42:05 2015 New Revision: 67886 URL: http://svn.reactos.org/svn/reactos?rev=67886&view=rev Log: [NTOSKRNL] Short commit message: implementation of (names) tunnel cache in file system RTL. This is in the vast majority work done by Johannes Anderwald, I've just reviewed, fixed a few things, and implemented last bits. Thanks to Johannes for his initial implementation (and huge work!). Dedicated to Hervé's secret plans ;-). CORE-7272 CORE-3875 Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c trunk/reactos/ntoskrnl/fsrtl/tunnel.c trunk/reactos/ntoskrnl/include/internal/fsrtl.h Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Sun May 24 17:42:05 2015 @@ -170,6 +170,7 @@ IFS_POOL_TAG, 0); + FsRtlInitializeTunnels(); FsRtlInitializeLargeMcbs(); /* Allocate the Resource Buffer */ Modified: trunk/reactos/ntoskrnl/fsrtl/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/tunnel.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] Sun May 24 17:42:05 2015 @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/tunnel.c * PURPOSE: Provides the Tunnel Cache implementation for file system drivers. - * PROGRAMMERS: None. + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,11 +13,298 @@ #define NDEBUG #include <debug.h> +typedef struct { + RTL_SPLAY_LINKS SplayInfo; + LIST_ENTRY TimerQueueEntry; + LARGE_INTEGER Time; + ULONGLONG DirectoryKey; + ULONG Flags; + UNICODE_STRING LongName; + UNICODE_STRING ShortName; + PVOID Data; + ULONG DataLength; +} TUNNEL_NODE_ENTRY, *PTUNNEL_NODE_ENTRY; + +ULONG TunnelMaxEntries = 256; +ULONG TunnelMaxAge = 15; +PAGED_LOOKASIDE_LIST TunnelLookasideList; + +#define DEFAULT_EXTRA_SIZE (72) +#define DEFAULT_ENTRY_SIZE (sizeof(TUNNEL_NODE_ENTRY) + DEFAULT_EXTRA_SIZE) + +#define TUNNEL_FLAG_POOL 0x2 +#define TUNNEL_FLAG_KEY_SHORT_NAME 0x1 + +VOID +FsRtlFreeTunnelNode( + IN PTUNNEL_NODE_ENTRY CurEntry, + IN PLIST_ENTRY PoolList OPTIONAL) +{ + if (PoolList) + { + /* divert the linked list entry, it's not required anymore, but we need it */ + InsertHeadList(PoolList, &CurEntry->TimerQueueEntry); + return; + } + + if (CurEntry->Flags & TUNNEL_FLAG_POOL) + ExFreePool(CurEntry); + else + ExFreeToPagedLookasideList(&TunnelLookasideList, CurEntry); +} + +VOID +FsRtlRemoveNodeFromTunnel( + IN PTUNNEL Cache, + IN PTUNNEL_NODE_ENTRY CurEntry, + IN PLIST_ENTRY PoolList, + OUT PBOOLEAN Rebalance) +{ + /* delete entry and rebalance if required */ + if (Rebalance && *Rebalance) + { + Cache->Cache = RtlDelete(&CurEntry->SplayInfo); + /* reset */ + *Rebalance = FALSE; + } + else + { + RtlDeleteNoSplay(&CurEntry->SplayInfo, &Cache->Cache); + } + + /* remove entry */ + RemoveEntryList(&CurEntry->TimerQueueEntry); + + /* free node entry */ + FsRtlFreeTunnelNode(CurEntry, PoolList); + + /* decrement node count */ + Cache->NumEntries--; +} + +VOID +FsRtlPruneTunnelCache( + IN PTUNNEL Cache, + IN PLIST_ENTRY PoolList) +{ + PLIST_ENTRY Entry, NextEntry; + PTUNNEL_NODE_ENTRY CurEntry; + LARGE_INTEGER CurTime, OldTime; + BOOLEAN Rebalance = TRUE; + PAGED_CODE(); + + /* query time */ + KeQuerySystemTime(&CurTime); + + /* subtract maximum node age */ + OldTime.QuadPart = CurTime.QuadPart - TunnelMaxAge; + + /* free all entries */ + Entry = Cache->TimerQueue.Flink; + + while(Entry != &Cache->TimerQueue) + { + /* get node entry */ + CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + + /* get next entry */ + NextEntry = Entry->Flink; + + /* prune if expired OR if in advance in time */ + if (CurEntry->Time.QuadPart < OldTime.QuadPart || + CurEntry->Time.QuadPart > CurTime.QuadPart) + { + FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance); + } + + /* move to next entry */ + Entry = NextEntry; + } + + /* If we have too many entries */ + while (Cache->NumEntries > TunnelMaxEntries) + { + CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance); + } +} + +VOID +FsRtlGetTunnelParameterValue( + IN PUNICODE_STRING ParameterName, + OUT PULONG Value) +{ + UNICODE_STRING Root = RTL_CONSTANT_STRING(L"Registry\\Machine\\System\\CurrentControlSet\\Control\\FileSystem"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hKey; + NTSTATUS Status; + ULONG Length; + PKEY_VALUE_FULL_INFORMATION Info; + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &Root, OBJ_CASE_INSENSITIVE, NULL, NULL); + + /* open registry key */ + Status = ZwOpenKey(&hKey, KEY_READ, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + /* failed to open key */ + return; + } + + /* query value size */ + Status = ZwQueryValueKey(hKey, ParameterName, KeyValueFullInformation, NULL, 0, &Length); + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* failed to query size */ + ZwClose(hKey); + return; + } + + /* allocate buffer */ + Info = ExAllocatePool(PagedPool, Length); + + if (!Info) + { + /* out of memory */ + ZwClose(hKey); + return; + } + + /* query value */ + Status = ZwQueryValueKey(hKey, ParameterName, KeyValueFullInformation, NULL, 0, &Length); + + if (NT_SUCCESS(Status)) + { + if (Info->DataLength) + { + /* store result */ + *Value = (ULONG)((ULONG_PTR)Info + Info->DataOffset); + } + } + + /* free buffer */ + ExFreePool(Info); + + /* close key */ + ZwClose(hKey); +} + +VOID +NTAPI +FsRtlInitializeTunnels() +{ + ULONG TunnelEntries; + UNICODE_STRING MaximumTunnelEntryAgeInSeconds = RTL_CONSTANT_STRING(L"MaximumTunnelEntryAgeInSeconds"); + UNICODE_STRING MaximumTunnelEntries = RTL_CONSTANT_STRING( L"MaximumTunnelEntries"); + + /* check for nt */ + if (MmIsThisAnNtAsSystem()) + { + /* default */ + TunnelMaxEntries = 1024; + } + + /* check for custom override of max entries*/ + FsRtlGetTunnelParameterValue(&MaximumTunnelEntries, &TunnelMaxEntries); + + /* check for custom override of age*/ + FsRtlGetTunnelParameterValue(&MaximumTunnelEntryAgeInSeconds, &TunnelMaxAge); + + if (!TunnelMaxAge) + { + /* no age means no entries */ + TunnelMaxEntries = 0; + } + + /* get max entries */ + TunnelEntries = TunnelMaxEntries; + + /* convert to ticks */ + TunnelMaxAge *= 10000000; + + if(TunnelMaxEntries <= 65535) + { + /* use max 256 entries */ + TunnelEntries = TunnelMaxEntries / 16; + } + + if(!TunnelEntries && TunnelMaxEntries ) + { + /* max tunnel entries was too small */ + TunnelEntries = TunnelMaxEntries + 1; + } + + if (TunnelEntries > 0xFFFF) + { + /* max entries is 256 */ + TunnelEntries = 256; + } + + /* initialize look aside list */ + ExInitializePagedLookasideList(&TunnelLookasideList, NULL, NULL, 0, DEFAULT_ENTRY_SIZE, 0 /*FIXME*/, TunnelEntries); +} + +LONG +FsRtlCompareNodeAndKey( + IN PTUNNEL_NODE_ENTRY CurEntry, + IN ULONGLONG DirectoryKey, + IN PUNICODE_STRING KeyString) +{ + PUNICODE_STRING String; + LONG Ret; + + if (DirectoryKey > CurEntry->DirectoryKey) + { + Ret = 1; + } + else if (DirectoryKey < CurEntry->DirectoryKey) + { + Ret = -1; + } + else + { + if (CurEntry->Flags & TUNNEL_FLAG_KEY_SHORT_NAME) + { + /* use short name as key */ + String = &CurEntry->ShortName; + } + else + { + /* use long name as key */ + String = &CurEntry->LongName; + } + + Ret = RtlCompareUnicodeString(KeyString, String, TRUE); + } + + return Ret; +} + +VOID +FsRtlEmptyFreePoolList( + IN PLIST_ENTRY PoolList) +{ + PLIST_ENTRY CurEntry; + PTUNNEL_NODE_ENTRY CurNode; + + /* loop over all the entry */ + while (!IsListEmpty(PoolList)) + { + /* and free them, one by one */ + CurEntry = RemoveHeadList(PoolList); + CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + FsRtlFreeTunnelNode(CurNode, 0); + } +} + /* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name FsRtlAddToTunnelCache - * @unimplemented + * @implemented * * FILLME * @@ -56,13 +344,228 @@ IN ULONG DataLength, IN PVOID Data) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + PTUNNEL_NODE_ENTRY NodeEntry; + PRTL_SPLAY_LINKS CurEntry, LastEntry; + ULONG Length; + LONG Result = 0; + BOOLEAN AllocatedFromPool = FALSE; + PUNICODE_STRING KeyString; + LIST_ENTRY PoolList; + + PAGED_CODE(); + + /* check if tunnel cache is enabled */ + if (!TunnelMaxEntries) + { + /* entries are disabled */ + return; + } + + /* initialize free pool list */ + InitializeListHead(&PoolList); + + /* calculate node length */ + Length = sizeof(TUNNEL_NODE_ENTRY); + + /* add data size */ + Length += DataLength; + + if (ShortName) + { + /* add short name length */ + Length += ShortName->Length; + } + + if (LongName) + { + /* add short name length */ + Length += LongName->Length; + } + + if (Length > DEFAULT_ENTRY_SIZE) + { + /* bigger than default entry */ + NodeEntry = ExAllocatePool(NonPagedPool, Length); + AllocatedFromPool = TRUE; + } + else + { + /* get standard entry */ + NodeEntry = ExAllocateFromPagedLookasideList(&TunnelLookasideList); + } + + /* check for success */ + if (!NodeEntry) + { + /* out of memory */ + return; + } + + /* acquire lock */ + ExAcquireFastMutex(&Cache->Mutex); + + /* now search cache for existing entries */ + CurEntry = Cache->Cache; + + /* check which key should be used for search */ + KeyString = (KeyByShortName ? ShortName : LongName); + + /* initialize last entry */ + LastEntry = NULL; + + while(CurEntry) + { + /* compare current node */ + Result = FsRtlCompareNodeAndKey((PTUNNEL_NODE_ENTRY)CurEntry, DirectoryKey, KeyString); + + /* backup last entry */ + LastEntry = CurEntry; + + if (Result > 0) + { + /* current directory key is bigger */ + CurEntry = CurEntry->LeftChild; + } + else + { + if (Result == 0) + { + /* found equal entry */ + break; + } + + /* current directory key is smaller */ + CurEntry = CurEntry->RightChild; + } + } + + /* initialize node entry */ + RtlInitializeSplayLinks(&NodeEntry->SplayInfo); + + if (CurEntry != NULL) + { + /* found existing item */ + if (CurEntry->LeftChild) + { + /* update parent */ + RtlInsertAsLeftChild(NodeEntry, CurEntry->LeftChild); + } + + if (CurEntry->RightChild) + { + /* update parent */ + RtlInsertAsRightChild(NodeEntry, CurEntry->RightChild); + } + + if (CurEntry->Parent == CurEntry) + { + /* cur entry was root */ + Cache->Cache = (struct _RTL_SPLAY_LINKS*)NodeEntry; + } + else + { + /* update parent node */ + if (LastEntry->LeftChild == CurEntry) + { + RtlInsertAsLeftChild(LastEntry, NodeEntry); + } + else + { + RtlInsertAsRightChild(LastEntry, NodeEntry); + } + } + + /* remove entry */ + RemoveEntryList(&((PTUNNEL_NODE_ENTRY)LastEntry)->TimerQueueEntry); + + /* free node entry */ + FsRtlFreeTunnelNode((PTUNNEL_NODE_ENTRY)LastEntry, &PoolList); + + /* decrement node count */ + Cache->NumEntries--; + } + else + { + if (LastEntry == NULL) + { + /* first entry in tunnel cache */ + Cache->Cache = (struct _RTL_SPLAY_LINKS*)NodeEntry; + } + else + { + if (Result > 0) + { + /* new left node */ + RtlInsertAsLeftChild(LastEntry, NodeEntry); + } + else + { + /* new right node */ + RtlInsertAsRightChild(LastEntry, NodeEntry); + } + } + } + + /* initialize entry */ + KeQuerySystemTime(&NodeEntry->Time); + + NodeEntry->DirectoryKey = DirectoryKey; + NodeEntry->Flags = (AllocatedFromPool ? TUNNEL_FLAG_POOL : 0x0); + NodeEntry->Flags |= (KeyByShortName ? TUNNEL_FLAG_KEY_SHORT_NAME : 0x0); + + if (ShortName) + { + /* copy short name */ + NodeEntry->ShortName.Length = ShortName->Length; + NodeEntry->ShortName.MaximumLength = ShortName->Length; + NodeEntry->ShortName.Buffer = (LPWSTR)((ULONG_PTR)NodeEntry + sizeof(TUNNEL_NODE_ENTRY)); + + RtlMoveMemory(NodeEntry->ShortName.Buffer, ShortName->Buffer, ShortName->Length); + } + else + { + NodeEntry->ShortName.Length = NodeEntry->ShortName.MaximumLength = 0; + NodeEntry->ShortName.Buffer = NULL; + } + + if (LongName) + { + /* copy long name */ + NodeEntry->LongName.Length = LongName->Length; + NodeEntry->LongName.MaximumLength = LongName->Length; + NodeEntry->LongName.Buffer = (LPWSTR)((ULONG_PTR)NodeEntry + sizeof(TUNNEL_NODE_ENTRY) + NodeEntry->ShortName.Length); + + RtlMoveMemory(NodeEntry->LongName.Buffer, LongName->Buffer, LongName->Length); + } + else + { + NodeEntry->LongName.Length = NodeEntry->LongName.MaximumLength = 0; + NodeEntry->LongName.Buffer = NULL; + } + + NodeEntry->DataLength = DataLength; + NodeEntry->Data = (PVOID)((ULONG_PTR)NodeEntry + sizeof(TUNNEL_NODE_ENTRY) + NodeEntry->ShortName.Length + NodeEntry->LongName.Length); + RtlMoveMemory(NodeEntry->Data, Data, DataLength); + + /* increment node count */ + Cache->NumEntries++; + + /* insert into list */ + InsertTailList(&Cache->TimerQueue, &NodeEntry->TimerQueueEntry); + + /* prune cache */ + FsRtlPruneTunnelCache(Cache, &PoolList); + + /* release lock */ + ExReleaseFastMutex(&Cache->Mutex); + + /* free pool list */ + FsRtlEmptyFreePoolList(&PoolList); } /*++ * @name FsRtlDeleteKeyFromTunnelCache - * @unimplemented + * @implemented * * FILLME * @@ -82,13 +585,92 @@ FsRtlDeleteKeyFromTunnelCache(IN PTUNNEL Cache, IN ULONGLONG DirectoryKey) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + BOOLEAN Rebalance = TRUE; + LIST_ENTRY PoolList; + PTUNNEL_NODE_ENTRY CurNode; + PRTL_SPLAY_LINKS CurEntry, LastEntry = NULL, Successors; + + PAGED_CODE(); + + /* check if tunnel cache is enabled */ + if (!TunnelMaxEntries) + { + /* entries are disabled */ + return; + } + + /* initialize free pool list */ + InitializeListHead(&PoolList); + + /* acquire lock */ + ExAcquireFastMutex(&Cache->Mutex); + + /* Look for the entry */ + CurEntry = Cache->Cache; + while (CurEntry) + { + CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, SplayInfo); + + if (CurNode->DirectoryKey > DirectoryKey) + { + /* current directory key is bigger */ + CurEntry = CurEntry->LeftChild; + } + else if (CurNode->DirectoryKey < DirectoryKey) + { + /* if we have already found one suitable, break */ + if (LastEntry != NULL) + { + break; + } + + /* current directory key is smaller */ + CurEntry = CurEntry->RightChild; + } + else + { + /* save and look for another */ + LastEntry = CurEntry; + CurEntry = CurEntry->LeftChild; + } + } + + /* was it found? */ + if (LastEntry == NULL) + { + /* release tunnel lock */ + ExReleaseFastMutex(&Cache->Mutex); + + return; + } + + /* delete any matching key */ + do + { + CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(LastEntry, TUNNEL_NODE_ENTRY, SplayInfo); + + Successors = RtlRealSuccessor(LastEntry); + if (CurNode->DirectoryKey != DirectoryKey) + { + break; + } + + /* remove from tunnel */ + FsRtlRemoveNodeFromTunnel(Cache, CurNode, &PoolList, &Rebalance); + LastEntry = Successors; + } + while (LastEntry != NULL); + + /* release tunnel lock */ + ExReleaseFastMutex(&Cache->Mutex); + + /* free pool */ + FsRtlEmptyFreePoolList(&PoolList); } /*++ * @name FsRtlDeleteTunnelCache - * @unimplemented + * @implemented * * FILLME * @@ -104,12 +686,48 @@ NTAPI FsRtlDeleteTunnelCache(IN PTUNNEL Cache) { - UNIMPLEMENTED; + PLIST_ENTRY Entry, NextEntry; + PTUNNEL_NODE_ENTRY CurEntry; + + PAGED_CODE(); + + /* check if tunnel cache is enabled */ + if (!TunnelMaxEntries) + { + /* entries are disabled */ + return; + } + + /* free all entries */ + Entry = Cache->TimerQueue.Flink; + + while(Entry != &Cache->TimerQueue) + { + /* get node entry */ + CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + + /* get next entry */ + NextEntry = Entry->Flink; + + /* remove entry from list */ + RemoveEntryList(&CurEntry->TimerQueueEntry); + + /* free entry */ + FsRtlFreeTunnelNode(CurEntry, NULL); + + /* move to next entry */ + Entry = NextEntry; + } + + /* reset object */ + Cache->Cache = NULL; + Cache->NumEntries = 0; + InitializeListHead(&Cache->TimerQueue); } /*++ * @name FsRtlFindInTunnelCache - * @unimplemented + * @implemented * * FILLME * @@ -149,14 +767,111 @@ IN OUT PULONG DataLength, OUT PVOID Data) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); - return FALSE; + BOOLEAN Ret = FALSE; + PTUNNEL_NODE_ENTRY CurEntry; + LIST_ENTRY PoolList; + //NTSTATUS Status; + LONG Result; + + PAGED_CODE(); + + /* check if tunnel cache is enabled */ + if (!TunnelMaxEntries) + { + /* entries are disabled */ + return FALSE; + } + + /* initialize free pool list */ + InitializeListHead(&PoolList); + + /* acquire tunnel lock */ + ExAcquireFastMutex(&Cache->Mutex); + + /* prune old entries */ + FsRtlPruneTunnelCache(Cache, &PoolList); + + /* now search cache for existing entries */ + CurEntry = (PTUNNEL_NODE_ENTRY)Cache->Cache; + + while(CurEntry) + { + /* compare current node */ + Result = FsRtlCompareNodeAndKey(CurEntry, DirectoryKey, Name); + + if (Result > 0) + { + /* current directory key is bigger */ + CurEntry = (PTUNNEL_NODE_ENTRY)CurEntry->SplayInfo.LeftChild; + } + else + { + if (Result == 0) + { + /* found equal entry */ + break; + } + + /* current directory key is smaller */ + CurEntry = (PTUNNEL_NODE_ENTRY)CurEntry->SplayInfo.RightChild; + } + } + + if (CurEntry != NULL) + { + _SEH2_TRY + { + /* copy short name */ + RtlCopyUnicodeString(ShortName, &CurEntry->ShortName); + + /* check size */ + if (LongName->MaximumLength < CurEntry->LongName.Length) + { + /* buffer is too small */ + LongName->Buffer = ExAllocatePool(PagedPool, CurEntry->LongName.Length); + if (LongName->Buffer) + { + LongName->Length = CurEntry->LongName.Length; + LongName->MaximumLength = CurEntry->LongName.MaximumLength; + RtlMoveMemory(LongName->Buffer, CurEntry->LongName.Buffer, CurEntry->LongName.Length); + } + } + else + { + /* buffer is big enough */ + RtlCopyUnicodeString(LongName, &CurEntry->LongName); + } + + /* copy data */ + RtlMoveMemory(Data, CurEntry->Data, CurEntry->DataLength); + + /* store size */ + *DataLength = CurEntry->DataLength; + + /* done */ + Ret = TRUE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the status */ + //Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + } + + /* release tunnel lock */ + ExReleaseFastMutex(&Cache->Mutex); + + /* free pool */ + FsRtlEmptyFreePoolList(&PoolList); + + return Ret; } /*++ - * @name FsRtlDeleteTunnelCache - * @unimplemented + * @name FsRtlInitializeTunnelCache + * @implemented * * FILLME * @@ -172,7 +887,19 @@ NTAPI FsRtlInitializeTunnelCache(IN PTUNNEL Cache) { - UNIMPLEMENTED; + PAGED_CODE(); + + /* initialize mutex */ + ExInitializeFastMutex(&Cache->Mutex); + + /* initialize node tree */ + Cache->Cache = NULL; + + /* initialize timer list */ + InitializeListHead(&Cache->TimerQueue); + + /* initialize node count */ + Cache->NumEntries = 0; } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Sun May 24 17:42:05 2015 @@ -114,6 +114,12 @@ VOID ); +VOID +NTAPI +FsRtlInitializeTunnels( + VOID +); + // // File contexts Routines //

1 0

[pschweitzer] 67885: [KMTEST] Don't attempt to allocate null-size buffer when copying empty string. Note to next generations students: test your code and DON'T LEAK MEMORY!!!! It still leaks atm, w...
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 17:31:49 2015 New Revision: 67885 URL: http://svn.reactos.org/svn/reactos?rev=67885&view=rev Log: [KMTEST] Don't attempt to allocate null-size buffer when copying empty string. Note to next generations students: test your code and DON'T LEAK MEMORY!!!! It still leaks atm, will have a look later on. Note to Mr Bragin, beloved ReactOS Project Coordinator: did you actually reviewed your students work? CORE-7272 Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlT… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] Sun May 24 17:31:49 2015 @@ -33,9 +33,16 @@ ok(b != NULL, "US is NULL after allocated memory\n"); b->Length = 0; b->MaximumLength =a->MaximumLength; - b->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, b->MaximumLength, 1633); - ok(b->Buffer != NULL, "US->Buffer is NULL after allocated memory\n"); - RtlCopyUnicodeString(b, a); + if (b->MaximumLength) + { + b->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, b->MaximumLength, 1633); + ok(b->Buffer != NULL, "US->Buffer is NULL after allocated memory\n"); + RtlCopyUnicodeString(b, a); + } + else + { + b->Buffer = NULL; + } return b; } @@ -147,6 +154,7 @@ TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); TestFsRtlAddToTunnelCache(12347, s_name, l_name, TRUE); a = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + RtlInitUnicodeString(a, NULL); TestFsRtlAddToTunnelCache(12346, a, l_name, FALSE); //Clear all

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
50
Older →

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