Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[aandrejevic] 67814: [FAST486] Implement F2XM1 using a Maclaurin series.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun May 17 16:21:29 2015 New Revision: 67814 URL: http://svn.reactos.org/svn/reactos?rev=67814&view=rev Log: [FAST486] Implement F2XM1 using a Maclaurin series. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun May 17 16:21:29 2015 @@ -53,6 +53,30 @@ /* ln(2) */ static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; +static const FAST486_FPU_DATA_REG FpuInverseNumber[INVERSE_NUMBERS_COUNT] = +{ + {0x8000000000000000ULL, FPU_REAL10_BIAS, FALSE}, /* 1 / 1 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 1 / 2 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 2, FALSE}, /* 1 / 3 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 2, FALSE}, /* 1 / 4 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 5 */ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 6 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 7 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 8 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 9 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 10 */ + {0xBA2E8BA2E8BA2E8CULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 11 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 12 */ + {0x9D89D89D89D89D8AULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 13 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 14 */ + {0x8888888888888889ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 15 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 16 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 17 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 18 */ + {0xD79435E50D79435EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 19 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 20 */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -527,7 +551,7 @@ return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuAdd(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -545,7 +569,7 @@ if (!State->FpuControl.Dm) { Fast486FpuException(State); - return; + return FALSE; } } @@ -604,7 +628,7 @@ else { Fast486FpuException(State); - return; + return FALSE; } } else @@ -617,11 +641,17 @@ } /* Normalize the result and return it */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + *Result = TempResult; + return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuSubtract(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -633,7 +663,7 @@ NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; /* And perform an addition instead */ - Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); + return Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); } static inline VOID FASTCALL @@ -689,7 +719,7 @@ } } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuMultiply(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -707,7 +737,7 @@ Result->Sign = TRUE; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_INDEFINITE_MANTISSA; - return; + return TRUE; } if (FPU_IS_ZERO(FirstOperand) || FPU_IS_ZERO(SecondOperand)) @@ -716,7 +746,7 @@ Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; Result->Exponent = 0; Result->Mantissa = 0ULL; - return; + return TRUE; } if (FPU_IS_INFINITY(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) @@ -725,7 +755,7 @@ Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_MANTISSA_HIGH_BIT; - return; + return TRUE; } if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) @@ -736,7 +766,7 @@ if (!State->FpuControl.Dm) { Fast486FpuException(State); - return; + return FALSE; } } @@ -759,7 +789,7 @@ if (!State->FpuControl.Um) { Fast486FpuException(State); - return; + return FALSE; } /* The exponent will be zero */ @@ -777,7 +807,7 @@ if (!State->FpuControl.Om) { Fast486FpuException(State); - return; + return FALSE; } /* Make the result infinity */ @@ -787,11 +817,17 @@ else TempResult.Exponent = (USHORT)Exponent; /* Normalize the result */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + *Result = TempResult; + return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuDivide(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -815,10 +851,13 @@ Result->Sign = TRUE; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_INDEFINITE_MANTISSA; - } - else Fast486FpuException(State); - - return; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } } if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) @@ -832,10 +871,13 @@ Result->Sign = FirstOperand->Sign; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_MANTISSA_HIGH_BIT; - } - else Fast486FpuException(State); - - return; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } } /* Calculate the sign of the result */ @@ -847,7 +889,7 @@ Result->Sign = TempResult.Sign; Result->Mantissa = 0ULL; Result->Exponent = 0; - return; + return TRUE; } /* Calculate the exponent of the result */ @@ -886,7 +928,62 @@ TempResult.Exponent = (USHORT)(Exponent + FPU_REAL10_BIAS); /* Normalize the result */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + + *Result = TempResult; + return TRUE; +} + +/* + * Calculates using the identity: + * 2 ^ x - 1 = 1 + sum { 2 * (((x - 1) * ln(2)) ^ n) / n! } + */ +static inline VOID FASTCALL +Fast486FpuCalculateTwoPowerMinusOne(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Operand, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + FAST486_FPU_DATA_REG TempResult = FpuOne; + FAST486_FPU_DATA_REG Value; + FAST486_FPU_DATA_REG SeriesElement; + + /* Calculate the first series element, which is 2 * (x - 1) * ln(2) */ + Fast486FpuSubtract(State, Operand, &FpuOne, &Value); + Fast486FpuMultiply(State, &Value, &FpuLnTwo, &Value); + Fast486FpuAdd(State, &Value, &Value, &SeriesElement); + + for (i = 2; i < INVERSE_NUMBERS_COUNT; i++) + { + /* Add the series element to the final sum */ + if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) + { + /* An exception occurred */ + return; + } + + /* + * Calculate the next series element (partially) by multiplying + * it with (x - 1) * ln(2) + */ + if (!Fast486FpuMultiply(State, &SeriesElement, &Value, &SeriesElement)) + { + /* An exception occurred */ + return; + } + + /* And now multiply the series element by the inverse counter */ + if (!Fast486FpuMultiply(State, &SeriesElement, &FpuInverseNumber[i], &SeriesElement)) + { + /* An exception occurred */ + return; + } + } + *Result = TempResult; } @@ -1471,8 +1568,10 @@ /* F2XM1 */ case 0x30: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FPU_SAVE_LAST_INST(); + + Fast486FpuCalculateTwoPowerMinusOne(State, &FPU_ST(0), &FPU_ST(0)); + FPU_UPDATE_TAG(0); break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sun May 17 16:21:29 2015 @@ -71,6 +71,8 @@ #define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) #define FPU_IS_INDEFINITE(x) (FPU_IS_NAN(x) && !FPU_IS_INFINITY(x)) +#define INVERSE_NUMBERS_COUNT 21 + enum { FPU_SINGLE_PRECISION = 0,

9 years, 7 months

[ekohl] 67813: [SYSDM] Implement renaming and copying of hardware profiles. Modifications are not yet stored in the registry. WIP

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 17 16:11:15 2015 New Revision: 67813 URL: http://svn.reactos.org/svn/reactos?rev=67813&view=rev Log: [SYSDM] Implement renaming and copying of hardware profiles. Modifications are not yet stored in the registry. WIP Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c 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 17 16:11:15 2015 @@ -14,13 +14,77 @@ typedef struct _PROFILE { WCHAR szFriendlyName[256]; + WCHAR szName[5]; + DWORD dwProfileNumber; + DWORD dwPreferenceOrder; } PROFILE, *PPROFILE; typedef struct _PROFILEDATA { DWORD dwProfileCount; + DWORD dwLastProfile; + DWORD dwSelectedProfile; + DWORD dwSelectedProfileIndex; PPROFILE pProfiles; + HWND hwndProfileDlg; } PROFILEDATA, *PPROFILEDATA; + + +static +VOID +OnCopyProfileInit(HWND hwndDlg, + PPROFILEDATA pProfileData, + UINT idFrom, + UINT idTo) +{ + WCHAR szNewProfileName[256]; + + SetDlgItemText(hwndDlg, idFrom, pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName); + + swprintf(szNewProfileName, L"Profile %lu", pProfileData->dwProfileCount); + 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, + 256); + + 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); +} static @@ -31,22 +95,54 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + PPROFILEDATA pProfileData; + + pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + pProfileData = (PPROFILEDATA)lParam; + OnCopyProfileInit(hwndDlg, pProfileData, IDC_COPYPROFILEFROM, IDC_COPYPROFILETO); + break; + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + CopyProfile(hwndDlg, pProfileData); + EndDialog(hwndDlg, IDOK); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + return TRUE; } break; } return FALSE; +} + + +static +VOID +RenameProfile( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + PPROFILE pProfile; + + pProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; + + GetDlgItemText(hwndDlg, + IDC_RENPROFEDITTO, + pProfile->szFriendlyName, + 256); + + /* 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); } @@ -58,21 +154,33 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + PPROFILEDATA pProfileData; + + pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + pProfileData = (PPROFILEDATA)lParam; + OnCopyProfileInit(hwndDlg, pProfileData, IDC_RENPROFEDITFROM, IDC_RENPROFEDITTO); + break; + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + RenameProfile(hwndDlg, pProfileData); + EndDialog(hwndDlg, IDOK); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + return TRUE; } break; } + return FALSE; } @@ -161,7 +269,12 @@ static VOID -GetProfile(HWND hwndDlg, HKEY hKey, LPWSTR lpName, PPROFILE pProfile) +GetProfile( + HWND hwndDlg, + HKEY hKey, + LPWSTR lpName, + DWORD dwProfileNumber, + PPROFILE pProfile) { HKEY hProfileKey; DWORD dwSize; @@ -185,8 +298,23 @@ if (lError == ERROR_SUCCESS) { DPRINT1("Profile: %S\n", pProfile->szFriendlyName); - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pProfile->szFriendlyName); - } + } + + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(hProfileKey, + L"PreferenceOrder", + NULL, + NULL, + (LPBYTE)pProfile->dwPreferenceOrder, + &dwSize); + if (lError == ERROR_SUCCESS) + { + DPRINT1("PreferenceOrder: %lu\n", pProfile->dwPreferenceOrder); + } + + pProfile->dwProfileNumber = dwProfileNumber; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pProfile->szFriendlyName); RegCloseKey(hProfileKey); } @@ -199,6 +327,7 @@ PPROFILEDATA pProfileData; WCHAR szName[8]; DWORD dwNameLength; + DWORD dwProfileNumber; DWORD dwIndex = 0; HKEY hKey; LONG lError; @@ -206,6 +335,10 @@ pProfileData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROFILEDATA)); if (pProfileData == NULL) return FALSE; + + pProfileData->hwndProfileDlg = hwndDlg; + pProfileData->dwLastProfile = (DWORD)-1; + pProfileData->dwSelectedProfileIndex = (DWORD)-1; if (!GetProfileCount(&pProfileData->dwProfileCount)) { @@ -244,9 +377,17 @@ if (lError != ERROR_SUCCESS) break; + dwProfileNumber = wcstoul(szName, NULL, 10); DPRINT("Profile name: %S\n", szName); - - GetProfile(hwndDlg, hKey, szName, &pProfileData->pProfiles[dwIndex]); + DPRINT("Profile number: %lu\n", dwProfileNumber); + + if ((pProfileData->dwLastProfile == (DWORD)-1) || + (pProfileData->dwLastProfile < dwProfileNumber)) + pProfileData->dwLastProfile = dwProfileNumber; + + DPRINT("Last Profile number: %lu\n", pProfileData->dwLastProfile); + + GetProfile(hwndDlg, hKey, szName, dwProfileNumber, &pProfileData->pProfiles[dwIndex]); } RegCloseKey(hKey); @@ -345,17 +486,19 @@ switch (LOWORD(wParam)) { case IDC_HRDPROFCOPY: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_COPYPROFILE), - hwndDlg, - (DLGPROC)CopyProfileDlgProc); + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_COPYPROFILE), + hwndDlg, + (DLGPROC)CopyProfileDlgProc, + (LPARAM)pProfileData); break; case IDC_HRDPROFRENAME: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_RENAMEPROFILE), - hwndDlg, - (DLGPROC)RenameProfileDlgProc); + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_RENAMEPROFILE), + hwndDlg, + (DLGPROC)RenameProfileDlgProc, + (LPARAM)pProfileData); break; case IDC_HRDPROFWAIT: @@ -366,12 +509,21 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFEDIT), TRUE); return TRUE; + case IDC_HRDPROFLSTBOX: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + pProfileData->dwSelectedProfileIndex = (DWORD)SendDlgItemMessage(hwndDlg, IDC_HRDPROFLSTBOX, LB_GETCURSEL, 0, 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFCOPY), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFRENAME), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); + } + return TRUE; + case IDOK: OnOk(hwndDlg); case IDCANCEL: - EndDialog(hwndDlg, - LOWORD(wParam)); + EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; } break;

9 years, 7 months

[akhaldi] 67812: [SHLWAPI] Properly stub SHGetPrivateProfileSection. CORE-9708

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 17 14:53:38 2015 New Revision: 67812 URL: http://svn.reactos.org/svn/reactos?rev=67812&view=rev Log: [SHLWAPI] Properly stub SHGetPrivateProfileSection. CORE-9708 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sun May 17 14:53:38 2015 @@ -560,7 +560,7 @@ 560 stdcall -stub -noname SHWindowsPolicyGetValue(ptr ptr ptr) 561 stub -noname AssocGetUrlAction 562 stub -noname SHGetPrivateProfileInt -563 stub -noname SHGetPrivateProfileSection +563 stdcall -stub -noname SHGetPrivateProfileSection(wstr ptr long ptr) 564 stub -noname SHGetPrivateProfileSectionNames 565 stub -noname SHGetPrivateProfileString 566 stub -noname SHGetPrivateProfileStruct

9 years, 7 months

[tkreuzer] 67811: [WIN32K] Add debugprints to some region and path functions.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 17 14:34:49 2015 New Revision: 67811 URL: http://svn.reactos.org/svn/reactos?rev=67811&view=rev Log: [WIN32K] Add debugprints to some region and path functions. Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Sun May 17 14:34:49 2015 @@ -1252,6 +1252,7 @@ if (numStrokes == 0) { + DPRINT1("numStrokes is 0\n"); return FALSE; } @@ -1259,6 +1260,7 @@ pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH); if (!pNumPointsInStroke) { + DPRINT1("Failed to allocate %lu strokes\n", numStrokes); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -1285,6 +1287,10 @@ pNumPointsInStroke, numStrokes, nPolyFillMode); + if (!Ret) + { + DPRINT1("REGION_SetPolyPolygonRgn failed\n"); + } /* Free memory for number-of-points-in-stroke array */ ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Sun May 17 14:34:49 2015 @@ -3253,7 +3253,10 @@ /* Check if iMode is valid */ if ((iMode != ALTERNATE) && (iMode != WINDING)) + { + DPRINT1("Invalid iMode: %lu\n", iMode); return FALSE; + } /* Special case a rectangle */ if (((cPolygons == 1) && ((pcPoints[0] == 4) || @@ -3283,6 +3286,7 @@ TAG_REGION); if (pETEs == NULL) { + DPRINT1("Failed to allocate %lu edge entries\n", total); return FALSE; } @@ -3320,7 +3324,7 @@ TAG_REGION); if (tmpPtBlock == NULL) { - DPRINT1("Can't alloc tPB\n"); + DPRINT1("Can't alloc tmpPtBlock\n"); ExFreePoolWithTag(pETEs, TAG_REGION); return FALSE; }

9 years, 7 months

[tkreuzer] 67810: [NTOSKRNL] Implement MiGetFileObjectForSectionAddress and use it in MmGetFileNameForAddress and NtAreMappedFilesTheSame. Don't call MmLocateMemoryAreaByAddress from these function...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 17 13:46:12 2015 New Revision: 67810 URL: http://svn.reactos.org/svn/reactos?rev=67810&view=rev Log: [NTOSKRNL] Implement MiGetFileObjectForSectionAddress and use it in MmGetFileNameForAddress and NtAreMappedFilesTheSame. Don't call MmLocateMemoryAreaByAddress from these functions anymore. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun May 17 13:46:12 2015 @@ -1603,6 +1603,69 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +MiGetFileObjectForSectionAddress( + IN PVOID Address, + OUT PFILE_OBJECT *FileObject) +{ + PMMVAD Vad; + PCONTROL_AREA ControlArea; + + /* Get the VAD */ + Vad = MiLocateAddress(Address); + if (Vad == NULL) + { + /* Fail, the address does not exist */ + DPRINT1("Invalid address\n"); + return STATUS_INVALID_ADDRESS; + } + + /* Check if this is a RosMm memory area */ + if (Vad->u.VadFlags.Spare != 0) + { + PMEMORY_AREA MemoryArea = (PMEMORY_AREA)Vad; + PROS_SECTION_OBJECT Section; + + /* Check if it's a section view (RosMm section) */ + if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + /* Get the section pointer to the SECTION_OBJECT */ + Section = MemoryArea->Data.SectionData.Section; + *FileObject = Section->FileObject; + } + else + { + ASSERT(MemoryArea->Type == MEMORY_AREA_CACHE); + DPRINT1("Address is a cache section!\n"); + return STATUS_SECTION_NOT_IMAGE; + } + } + else + { + /* Make sure it's not a VM VAD */ + if (Vad->u.VadFlags.PrivateMemory == 1) + { + DPRINT1("Address is not a section\n"); + return STATUS_SECTION_NOT_IMAGE; + } + + /* Get the control area */ + ControlArea = Vad->ControlArea; + if (!(ControlArea) || !(ControlArea->u.Flags.Image)) + { + DPRINT1("Address is not a section\n"); + return STATUS_SECTION_NOT_IMAGE; + } + + /* Get the file object */ + *FileObject = ControlArea->FilePointer; + } + + /* Return success */ + return STATUS_SUCCESS; +} + PFILE_OBJECT NTAPI MmGetFileObjectForSection(IN PVOID SectionObject) @@ -1705,92 +1768,46 @@ MmGetFileNameForAddress(IN PVOID Address, OUT PUNICODE_STRING ModuleName) { - PVOID Section; - PMEMORY_AREA MemoryArea; - POBJECT_NAME_INFORMATION ModuleNameInformation; - PVOID AddressSpace; - NTSTATUS Status; - PFILE_OBJECT FileObject = NULL; - PMMVAD Vad; - PCONTROL_AREA ControlArea; - - /* Lock address space */ - AddressSpace = MmGetCurrentAddressSpace(); - MmLockAddressSpace(AddressSpace); - - /* Locate the memory area for the process by address */ - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - if (!MemoryArea) - { - /* Fail, the address does not exist */ -InvalidAddress: - DPRINT1("Invalid address\n"); - MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) - { - /* Get the section pointer to the SECTION_OBJECT */ - Section = MemoryArea->Data.SectionData.Section; - - /* Unlock address space */ - MmUnlockAddressSpace(AddressSpace); - - /* Get the filename of the section */ - Status = MmGetFileNameForSection(Section, &ModuleNameInformation); - } - else if (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3) - { - /* Get the VAD */ - Vad = MiLocateAddress(Address); - if (!Vad) goto InvalidAddress; - - /* Make sure it's not a VM VAD */ - if (Vad->u.VadFlags.PrivateMemory == 1) - { -NotSection: - DPRINT1("Address is not a section\n"); - MmUnlockAddressSpace(AddressSpace); - return STATUS_SECTION_NOT_IMAGE; - } - - /* Get the control area */ - ControlArea = Vad->ControlArea; - if (!(ControlArea) || !(ControlArea->u.Flags.Image)) goto NotSection; - - /* Get the file object */ - FileObject = ControlArea->FilePointer; - ASSERT(FileObject != NULL); - ObReferenceObject(FileObject); - - /* Unlock address space */ - MmUnlockAddressSpace(AddressSpace); - - /* Get the filename of the file object */ - Status = MmGetFileNameForFileObject(FileObject, &ModuleNameInformation); - - /* Dereference it */ - ObDereferenceObject(FileObject); - } - else - { - /* Trying to access virtual memory or something */ - goto InvalidAddress; - } - - /* Check if we were able to get the file object name */ - if (NT_SUCCESS(Status)) - { + POBJECT_NAME_INFORMATION ModuleNameInformation; + PVOID AddressSpace; + NTSTATUS Status; + PFILE_OBJECT FileObject = NULL; + + /* Lock address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Get the file object pointer for the address */ + Status = MiGetFileObjectForSectionAddress(Address, &FileObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", Address); + MmUnlockAddressSpace(AddressSpace); + return Status; + } + + /* Reference the file object */ + ObReferenceObject(FileObject); + + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + /* Get the filename of the file object */ + Status = MmGetFileNameForFileObject(FileObject, &ModuleNameInformation); + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + + /* Check if we were able to get the file object name */ + if (NT_SUCCESS(Status)) + { /* Init modulename */ - RtlCreateUnicodeString(ModuleName, - ModuleNameInformation->Name.Buffer); - - /* Free temp taged buffer from MmGetFileNameForFileObject() */ - ExFreePoolWithTag(ModuleNameInformation, TAG_MM); - DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer, Address); - } + RtlCreateUnicodeString(ModuleName, ModuleNameInformation->Name.Buffer); + + /* Free temp taged buffer from MmGetFileNameForFileObject() */ + ExFreePoolWithTag(ModuleNameInformation, TAG_MM); + DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer, Address); + } /* Return status */ return Status; @@ -3082,74 +3099,41 @@ IN PVOID File2MappedAsFile) { PVOID AddressSpace; - PMEMORY_AREA MemoryArea1, MemoryArea2; - PROS_SECTION_OBJECT Section1, Section2; + PFILE_OBJECT FileObject1, FileObject2; + NTSTATUS Status; /* Lock address space */ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); - /* Locate the memory area for the process by address */ - MemoryArea1 = MmLocateMemoryAreaByAddress(AddressSpace, File1MappedAsAnImage); - if (!MemoryArea1) - { - /* Fail, the address does not exist */ + /* Get the file object pointer for address 1 */ + Status = MiGetFileObjectForSectionAddress(File1MappedAsAnImage, &FileObject1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea1->Type != MEMORY_AREA_SECTION_VIEW) - { - /* Fail, the address is not a section */ + return Status; + } + + /* Get the file object pointer for address 2 */ + Status = MiGetFileObjectForSectionAddress(File2MappedAsFile, &FileObject2); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the section pointer to the SECTION_OBJECT */ - Section1 = MemoryArea1->Data.SectionData.Section; - if (Section1->FileObject == NULL) + return Status; + } + + /* SectionObjectPointer is equal if the files are equal */ + if (FileObject1->SectionObjectPointer != FileObject2->SectionObjectPointer) { MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Locate the memory area for the process by address */ - MemoryArea2 = MmLocateMemoryAreaByAddress(AddressSpace, File2MappedAsFile); - if (!MemoryArea2) - { - /* Fail, the address does not exist */ - MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea2->Type != MEMORY_AREA_SECTION_VIEW) - { - /* Fail, the address is not a section */ - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the section pointer to the SECTION_OBJECT */ - Section2 = MemoryArea2->Data.SectionData.Section; - if (Section2->FileObject == NULL) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* The shared cache map seems to be the same if both of these are equal */ - if (Section1->FileObject->SectionObjectPointer->SharedCacheMap == - Section2->FileObject->SectionObjectPointer->SharedCacheMap) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; + return STATUS_NOT_SAME_DEVICE; } /* Unlock address space */ MmUnlockAddressSpace(AddressSpace); - return STATUS_NOT_SAME_DEVICE; + return STATUS_SUCCESS; } /*

9 years, 7 months

[tkreuzer] 67809: [GDIPLUS] Add even more debugprints

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 17 13:44:34 2015 New Revision: 67809 URL: http://svn.reactos.org/svn/reactos?rev=67809&view=rev Log: [GDIPLUS] Add even more debugprints Modified: trunk/reactos/dll/win32/gdiplus/region.c Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun May 17 13:44:34 2015 @@ -1098,12 +1098,16 @@ { new_hdc = CreateCompatibleDC(0); if (!new_hdc) + { + ERR("CreateCompatibleDC failed\n"); return OutOfMemory; + } stat = GdipCreateFromHDC(new_hdc, &new_graphics); graphics = new_graphics; if (stat != Ok) { + ERR("GdipCreateFromHDC failed: 0x%x\n", stat); DeleteDC(new_hdc); return stat; } @@ -1112,7 +1116,10 @@ { graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) + { + ERR("CreateCompatibleDC failed\n"); return OutOfMemory; + } } save_state = SaveDC(graphics->hdc); @@ -1125,7 +1132,15 @@ if (stat == Ok) { *hrgn = PathToRegion(graphics->hdc); + if (*hrgn == NULL) + { + ERR("PathToRegion failed\n"); + } stat = *hrgn ? Ok : OutOfMemory; + } + else + { + ERR("trace_path failed: 0x%x\n", stat); } RestoreDC(graphics->hdc, save_state); @@ -1282,12 +1297,18 @@ */ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) { + GpStatus status; TRACE("(%p, %p, %p)\n", region, graphics, hrgn); if (!region || !hrgn) return InvalidParameter; - return get_region_hrgn(&region->node, graphics, hrgn); + status = get_region_hrgn(&region->node, graphics, hrgn); + if (status != Ok) + { + ERR("get_region_hrgn() failed. region->node.type = 0x%x\n", region->node.type); + } + return status; } GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res)

9 years, 7 months

[pschweitzer] 67808: [FASTFAT] Fix a fixme in VfatGetUserBuffer(): Only request high priority page when in the paging path. Otherwise, request normal priority

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 17 12:22:28 2015 New Revision: 67808 URL: http://svn.reactos.org/svn/reactos?rev=67808&view=rev Log: [FASTFAT] Fix a fixme in VfatGetUserBuffer(): Only request high priority page when in the paging path. Otherwise, request normal priority Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -419,7 +419,7 @@ ProbeForWrite(IrpContext->Irp->UserBuffer, BufferLength, 1); } #endif - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, FALSE); if (!ExAcquireResourceSharedLite(&pFcb->MainResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -327,15 +327,14 @@ PVOID VfatGetUserBuffer( - IN PIRP Irp) + IN PIRP Irp, + IN BOOLEAN Paging) { ASSERT(Irp); if (Irp->MdlAddress) { - /* This call may be in the paging path, so use maximum priority */ - /* FIXME: call with normal priority in the non-paging path */ - return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, (Paging ? HighPagePriority : NormalPagePriority)); } else { Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -655,7 +655,7 @@ } } - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; @@ -926,7 +926,7 @@ OldFileSize = Fcb->RFCB.FileSize; - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun May 17 12:22:28 2015 @@ -928,7 +928,8 @@ PVOID VfatGetUserBuffer( - IN PIRP); + IN PIRP, + IN BOOLEAN Paging); NTSTATUS VfatLockUserBuffer(

9 years, 7 months

[tkreuzer] 67807: [GDIPLUS] Add some debug output to try to track winetest failures.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 17 11:49:04 2015 New Revision: 67807 URL: http://svn.reactos.org/svn/reactos?rev=67807&view=rev Log: [GDIPLUS] Add some debug output to try to track winetest failures. Modified: trunk/reactos/dll/win32/gdiplus/region.c Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun May 17 11:49:04 2015 @@ -1161,11 +1161,18 @@ stat = GdipCreatePath(FillModeAlternate, &path); if (stat != Ok) + { + ERR("GdipCreatePath failed: 0x%x\n", stat); return stat; + } stat = GdipAddPathRectangle(path, rc->X, rc->Y, rc->Width, rc->Height); if (stat == Ok) stat = get_path_hrgn(path, graphics, hrgn); + else + { + ERR("GdipAddPathRectangle failed: 0x%x\n", stat); + } GdipDeletePath(path);

9 years, 7 months

[tkreuzer] 67806: [DINPUT_WINETEST] Skip randomly failing tests. See ROSTESTS-176 and CORE-9710

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 17 10:55:03 2015 New Revision: 67806 URL: http://svn.reactos.org/svn/reactos?rev=67806&view=rev Log: [DINPUT_WINETEST] Skip randomly failing tests. See ROSTESTS-176 and CORE-9710 Modified: trunk/rostests/winetests/dinput/mouse.c Modified: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Sun May 17 10:55:03 2015 @@ -147,6 +147,10 @@ hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Acquire() failed: %08x\n", hr); +if (!winetest_interactive) + skip("ROSTESTS-176/CORE-9710: Skipping randomly failing tests\n"); +else { + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); @@ -176,7 +180,7 @@ cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - +} if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

9 years, 7 months

[pschweitzer] 67805: [CONSOLE] Fix memory leaks

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 17 10:20:58 2015 New Revision: 67805 URL: http://svn.reactos.org/svn/reactos?rev=67805&view=rev Log: [CONSOLE] Fix memory leaks Modified: trunk/reactos/dll/cpl/console/layout.c Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sun May 17 10:20:58 2015 @@ -140,6 +140,7 @@ if (Font == NULL) { DPRINT1("PaintText: CreateFont failed\n"); + DeleteObject(hBrush); return FALSE; } @@ -147,6 +148,7 @@ if (OldFont == NULL) { DeleteObject(Font); + DeleteObject(hBrush); return FALSE; }

9 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015