Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [BOOTLIB] Remove a useless 'FontDirectory' check as it becomes always valid (!= NULL) through the function. CORE-11590

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f986527d49026fa538c6b… commit f986527d49026fa538c6b61d7c12752124000de8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 27 01:30:56 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 27 01:30:56 2019 +0100 [BOOTLIB] Remove a useless 'FontDirectory' check as it becomes always valid (!= NULL) through the function. CORE-11590 Adapted from Victor Martinez patch & Serge Gautherie PR #2062 --- boot/environ/lib/io/display/display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/environ/lib/io/display/display.c b/boot/environ/lib/io/display/display.c index 6c186df37a1..9e5ab92bb51 100644 --- a/boot/environ/lib/io/display/display.c +++ b/boot/environ/lib/io/display/display.c @@ -91,9 +91,9 @@ DsppLoadFontFile ( if (!FontDirectory) { /* Use the boot device and boot directory */ + CustomDevice = FALSE; FontDevice = BlpBootDevice; FontDirectory = L"\\EFI\\Microsoft\\Boot\\Fonts"; - CustomDevice = FALSE; } else { @@ -157,8 +157,9 @@ Quickie: } /* Check if we had a custom font directory allocated and free it */ - if ((FontDirectory) && (CustomDirectory)) + if ((CustomDirectory) && (CustomDevice)) { + ASSERT(FontDirectory); BlMmFreeHeap(FontDirectory); }

4 years, 10 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.31

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=591b2b807ccf0243313b1… commit 591b2b807ccf0243313b1787675a656ea6df8568 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 27 09:06:21 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 27 09:06:21 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.31 Tahoma Bold. Version 0.017 khmz. GRAVE ACCENT. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 145612 -> 145612 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index dc32eb0f2a5..9156c6e1d36 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 10 months

[reactos] 01/01: [COMCTL32] Minimize Wine diff (#2035)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27502f5c511893a649746… commit 27502f5c511893a6497460262f27e5b2f85fb194 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Nov 26 23:27:21 2019 +0100 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 27 07:27:21 2019 +0900 [COMCTL32] Minimize Wine diff (#2035) Addendum to b931f643e35e6a23dbef99e785804039ea579b6a. CORE-16466 --- dll/win32/comctl32/listview.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 7aa9c4c611c..ee2524faddf 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2115,26 +2115,17 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) ZeroMemory(&vertInfo, sizeof(SCROLLINFO)); vertInfo.cbSize = sizeof(SCROLLINFO); #ifdef __REACTOS__ /* CORE-16466 part 2 of 4 */ - vertInfo.nPage = max((infoPtr->rcList.bottom - infoPtr->rcList.top), 0); + vertInfo.nPage = max(0, infoPtr->rcList.bottom - infoPtr->rcList.top); #else vertInfo.nPage = infoPtr->rcList.bottom - infoPtr->rcList.top; #endif if (infoPtr->uView == LV_VIEW_DETAILS) { -#ifdef __REACTOS__ /* CORE-16466 part 3 of 4 */ - if (vertInfo.nPage != 0) - { - vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if (vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; - - if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; - } -#else +#ifdef __REACTOS__ /* CORE-16466 part 3a of 4 */ + if (vertInfo.nPage != 0) + { +#endif vertInfo.nMax = infoPtr->nItemCount; /* scroll by at least one page */ @@ -2143,6 +2134,8 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->nItemHeight > 0) vertInfo.nPage /= infoPtr->nItemHeight; +#ifdef __REACTOS__ /* CORE-16466 part 3b of 4 */ + } #endif } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */

4 years, 10 months

[reactos] 01/01: [MMC] DoSaveFileAs(): Respect szPath size (#2068)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bc93e9353d8397c28672… commit 3bc93e9353d8397c2867293dc8b71b8bc4b193e0 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Nov 26 23:24:51 2019 +0100 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 27 07:24:51 2019 +0900 [MMC] DoSaveFileAs(): Respect szPath size (#2068) CORE-11688 --- base/applications/mmc/console.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/applications/mmc/console.c b/base/applications/mmc/console.c index 58d98ad5117..f56fbc546f3 100644 --- a/base/applications/mmc/console.c +++ b/base/applications/mmc/console.c @@ -18,6 +18,8 @@ */ #include "precomp.h" +#include <stdlib.h> +#include <strsafe.h> #include "resource.h" @@ -233,12 +235,12 @@ DoSaveFileAs( if (pChildInfo->pFileName != NULL) { - _tcscpy(szPath, pChildInfo->pFileName); + StringCbCopy(szPath, sizeof(szPath), pChildInfo->pFileName); } else { - GetWindowText(pChildInfo->hwnd, szPath, MAX_PATH); - _tcscat(szPath, TEXT(".msc")); + GetWindowText(pChildInfo->hwnd, szPath, _countof(szPath)); + StringCbCat(szPath, sizeof(szPath), TEXT(".msc")); } saveas.lStructSize = sizeof(OPENFILENAME);

4 years, 10 months

[reactos] 01/01: [SHELL32] Follow-up of #2076 (#2091)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfdbccf9377d73b1eb4c0… commit cfdbccf9377d73b1eb4c0d1b31af4ac778ab0263 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 26 21:45:58 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 26 21:45:58 2019 +0900 [SHELL32] Follow-up of #2076 (#2091) Fix EXE and SCR file icons. CORE-16533 --- dll/win32/shell32/CExtractIcon.cpp | 15 --------------- dll/win32/shell32/folders/CFSFolder.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dll/win32/shell32/CExtractIcon.cpp b/dll/win32/shell32/CExtractIcon.cpp index e24f6c12800..26bdb4e9307 100644 --- a/dll/win32/shell32/CExtractIcon.cpp +++ b/dll/win32/shell32/CExtractIcon.cpp @@ -138,21 +138,6 @@ HRESULT STDMETHODCALLTYPE CExtractIcon::SetNormalIcon( { TRACE("(%p, %s, %d)\n", this, debugstr_w(pszFile), iIcon); - if (lstrcmpiW(PathFindExtensionW(pszFile), L".exe") == 0) - { - if (!PrivateExtractIconExW(pszFile, 0, NULL, NULL, 1)) - { - WCHAR szPath[MAX_PATH]; - GetModuleFileNameW(shell32_hInstance, szPath, _countof(szPath)); - DuplicateString(szPath, &normalIcon.file); - if (!normalIcon.file) - return E_OUTOFMEMORY; - - normalIcon.index = -IDI_SHELL_EXE; - return S_OK; - } - } - DuplicateString(pszFile, &normalIcon.file); if (!normalIcon.file) return E_OUTOFMEMORY; diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 6acf3013e43..493eeeafa49 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -312,6 +312,13 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE { ILGetDisplayNameExW(psf, pidl, wTemp, ILGDN_FORPARSING); icon_idx = 0; + + INT ret = ExtractIconExW(wTemp, -1, NULL, NULL, 0); + if (ret <= 0) + { + StringCbCopyW(wTemp, sizeof(wTemp), swShell32Name); + icon_idx = -IDI_SHELL_EXE; + } } initIcon->SetNormalIcon(wTemp, icon_idx);

4 years, 10 months

[reactos] 01/01: [SHELL32] Make SHFormatDrive multi-thread (#2080)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd25333e248bb08d55315… commit bd25333e248bb08d55315b219b5404f5a945e02c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 26 18:26:25 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 26 18:26:25 2019 +0900 [SHELL32] Make SHFormatDrive multi-thread (#2080) CORE-12756 --- dll/win32/shell32/dialogs/drive.cpp | 62 ++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 4742c50e201..674e81cb21b 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -20,6 +20,7 @@ */ #include "precomp.h" +#include <process.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -28,6 +29,7 @@ typedef struct WCHAR Drive; UINT Options; UINT Result; + BOOL bFormattingNow; } FORMAT_DRIVE_CONTEXT, *PFORMAT_DRIVE_CONTEXT; EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); @@ -577,6 +579,36 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) } } +struct FORMAT_DRIVE_PARAMS +{ + HWND hwndDlg; + PFORMAT_DRIVE_CONTEXT pContext; +}; + +static unsigned __stdcall DoFormatDrive(void *args) +{ + FORMAT_DRIVE_PARAMS *pParams = reinterpret_cast<FORMAT_DRIVE_PARAMS *>(args); + HWND hwndDlg = pParams->hwndDlg; + PFORMAT_DRIVE_CONTEXT pContext = pParams->pContext; + + HMENU hSysMenu = GetSystemMenu(hwndDlg, FALSE); + EnableMenuItem(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED); + EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + EnableWindow(GetDlgItem(hwndDlg, 28677), FALSE); + + FormatDrive(hwndDlg, pContext); + + EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), TRUE); + EnableWindow(GetDlgItem(hwndDlg, 28677), TRUE); + EnableMenuItem(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED); + pContext->bFormattingNow = FALSE; + + delete pParams; + return 0; +} + static INT_PTR CALLBACK FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -592,20 +624,40 @@ FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch(LOWORD(wParam)) { case IDOK: - if (ShellMessageBoxW(shell32_hInstance, hwndDlg, MAKEINTRESOURCEW(IDS_FORMAT_WARNING), MAKEINTRESOURCEW(IDS_FORMAT_TITLE), MB_OKCANCEL | MB_ICONWARNING) == IDOK) + pContext = (PFORMAT_DRIVE_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (pContext->bFormattingNow) + break; + + if (ShellMessageBoxW(shell32_hInstance, hwndDlg, + MAKEINTRESOURCEW(IDS_FORMAT_WARNING), + MAKEINTRESOURCEW(IDS_FORMAT_TITLE), + MB_OKCANCEL | MB_ICONWARNING) == IDOK) { - pContext = (PFORMAT_DRIVE_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); - FormatDrive(hwndDlg, pContext); + pContext->bFormattingNow = TRUE; + + FORMAT_DRIVE_PARAMS *pParams = new FORMAT_DRIVE_PARAMS; + pParams->hwndDlg = hwndDlg; + pParams->pContext = pContext; + + unsigned tid; + HANDLE hThread = (HANDLE)_beginthreadex(NULL, 0, DoFormatDrive, pParams, 0, &tid); + CloseHandle(hThread); } break; case IDCANCEL: pContext = (PFORMAT_DRIVE_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (pContext->bFormattingNow) + break; + EndDialog(hwndDlg, pContext->Result); break; case 28677: // filesystem combo if (HIWORD(wParam) == CBN_SELENDOK) { pContext = (PFORMAT_DRIVE_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (pContext->bFormattingNow) + break; + InsertDefaultClusterSizeForFs(hwndDlg, pContext); } break; @@ -629,10 +681,10 @@ SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options) Context.Drive = drive; Context.Options = options; + Context.Result = FALSE; + Context.bFormattingNow = FALSE; result = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_FORMAT_DRIVE), hwnd, FormatDriveDlg, (LPARAM)&Context); return result; } - -

4 years, 10 months

[reactos] 01/01: [SHELL32] Improve DragEnter of CFSDropTarget (#2073)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd75a87cfd5f78469143d… commit cd75a87cfd5f78469143df50d947a0cd8f3210ef Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 26 17:34:24 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 26 17:34:24 2019 +0900 [SHELL32] Improve DragEnter of CFSDropTarget (#2073) Reduce failures of DragDrop testcase. CORE-11238 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 42 +++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index bdf65e1fcc5..b8e67fd9adf 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -300,7 +300,41 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, m_fAcceptFmt = TRUE; m_grfKeyState = dwKeyState; - m_dwDefaultEffect = DROPEFFECT_MOVE; + +#define D_NONE DROPEFFECT_NONE +#define D_COPY DROPEFFECT_COPY +#define D_MOVE DROPEFFECT_MOVE +#define D_LINK DROPEFFECT_LINK + m_dwDefaultEffect = *pdwEffect; + switch (*pdwEffect & (D_COPY | D_MOVE | D_LINK)) + { + case D_COPY | D_MOVE: + if (dwKeyState & MK_CONTROL) + m_dwDefaultEffect = D_COPY; + else + m_dwDefaultEffect = D_MOVE; + break; + case D_COPY | D_MOVE | D_LINK: + if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL)) + m_dwDefaultEffect = D_LINK; + else if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == MK_CONTROL) + m_dwDefaultEffect = D_COPY; + else + m_dwDefaultEffect = D_MOVE; + break; + case D_COPY | D_LINK: + if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL)) + m_dwDefaultEffect = D_LINK; + else + m_dwDefaultEffect = D_COPY; + break; + case D_MOVE | D_LINK: + if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL)) + m_dwDefaultEffect = D_LINK; + else + m_dwDefaultEffect = D_MOVE; + break; + } STGMEDIUM medium; if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium))) @@ -317,7 +351,11 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, ReleaseStgMedium(&medium); } - _QueryDrop(dwKeyState, pdwEffect); + if (!m_fAcceptFmt) + *pdwEffect = DROPEFFECT_NONE; + else + *pdwEffect = m_dwDefaultEffect; + return S_OK; }

4 years, 10 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.30

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8187d33be9b47c10edc3… commit d8187d33be9b47c10edc3fb3178b61a461909284 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 26 09:41:46 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 26 09:41:46 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.30 Tahoma Bold. Version 0.016 khmz. PUNCTUATIONS. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 145604 -> 145612 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 701c6433486..dc32eb0f2a5 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 10 months

[reactos] 01/01: [NTOS] Revert pool debugging code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21647e2c4ecf2bb71e642… commit 21647e2c4ecf2bb71e642ee5023133cc9641013f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 25 19:32:06 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 25 19:32:06 2019 +0100 [NTOS] Revert pool debugging code Revert "[NTOS] On DBG builds, fill pool allocations with 0xCD and freed pool with 0xDD" This reverts commit 24f240be8a5f7b09a0c122f40384fc63576accfa. Revert "[NTOS] Add compile time option to trace callers of pool allocations" This reverts commit 8b20755040754506f3f12a30857f8edc5bf83f33. Revert "WIP" This reverts commit 8cfd5c601f354625a11ee097984cda0c90f93889. --- ntoskrnl/mm/ARM3/expool.c | 87 +++++++---------------------------------------- ntoskrnl/mm/ARM3/pool.c | 20 ++--------- 2 files changed, 15 insertions(+), 92 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index bbf6e407f09..bccb0e9bbdd 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -22,10 +22,6 @@ #define POOL_BIG_TABLE_ENTRY_FREE 0x1 -/* DEBUGGING ******************************************************************/ - -//#define DBG_NUMBER_OF_FRAMES_TO_CAPTURE 5 - typedef struct _POOL_DPC_CONTEXT { PPOOL_TRACKER_TABLE PoolTrackTable; @@ -1851,14 +1847,9 @@ ExReturnPoolQuota(IN PVOID P) */ PVOID NTAPI -#ifdef DBG_NUMBER_OF_FRAMES_TO_CAPTURE -ExAllocatePoolWithTagInternal( -#else -ExAllocatePoolWithTag( -#endif - _In_ POOL_TYPE PoolType, - _In_ SIZE_T NumberOfBytes, - _In_ ULONG Tag) +ExAllocatePoolWithTag(IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes, + IN ULONG Tag) { PPOOL_DESCRIPTOR PoolDesc; PLIST_ENTRY ListHead; @@ -1868,7 +1859,6 @@ ExAllocatePoolWithTag( ULONG OriginalType; PKPRCB Prcb = KeGetCurrentPrcb(); PGENERAL_LOOKASIDE LookasideList; - PVOID Allocation; // // Some sanity checks @@ -1908,13 +1898,10 @@ ExAllocatePoolWithTag( if (MmUseSpecialPool(NumberOfBytes, Tag)) { // - // Try to allocate using special pool (initialized with random byte) + // Try to allocate using special pool // - Allocation = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); - if (Allocation != NULL) - { - return Allocation; - } + Entry = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); + if (Entry) return Entry; } } } @@ -1935,8 +1922,8 @@ ExAllocatePoolWithTag( // // Allocate pages for it // - Allocation = MiAllocatePoolPages(OriginalType, NumberOfBytes); - if (Allocation == NULL) + Entry = MiAllocatePoolPages(OriginalType, NumberOfBytes); + if (!Entry) { #if DBG // @@ -2008,7 +1995,7 @@ ExAllocatePoolWithTag( // Add a tag for the big page allocation and switch to the generic "BIG" // tag if we failed to do so, then insert a tracker for this alloation. // - if (!ExpAddTagForBigPages(Allocation, + if (!ExpAddTagForBigPages(Entry, Tag, (ULONG)BYTES_TO_PAGES(NumberOfBytes), OriginalType)) @@ -2016,10 +2003,7 @@ ExAllocatePoolWithTag( Tag = ' GIB'; } ExpInsertPoolTracker(Tag, ROUND_TO_PAGES(NumberOfBytes), OriginalType); -#if DBG - RtlFillMemory(Allocation, NumberOfBytes, 0xCD); -#endif - return Allocation; + return Entry; } // @@ -2089,11 +2073,7 @@ ExAllocatePoolWithTag( Entry->PoolTag = Tag; (POOL_FREE_BLOCK(Entry))->Flink = NULL; (POOL_FREE_BLOCK(Entry))->Blink = NULL; - Allocation = POOL_FREE_BLOCK(Entry); -#if DBG - RtlFillMemory(Allocation, NumberOfBytes, 0xCD); -#endif - return Allocation; + return POOL_FREE_BLOCK(Entry); } } @@ -2277,11 +2257,7 @@ ExAllocatePoolWithTag( Entry->PoolTag = Tag; (POOL_FREE_BLOCK(Entry))->Flink = NULL; (POOL_FREE_BLOCK(Entry))->Blink = NULL; - Allocation = POOL_FREE_BLOCK(Entry); -#if DBG - RtlFillMemory(Allocation, NumberOfBytes, 0xCD); -#endif - return Allocation; + return POOL_FREE_BLOCK(Entry); } } while (++ListHead != &PoolDesc->ListHeads[POOL_LISTS_PER_PAGE]); @@ -2424,37 +2400,8 @@ ExAllocatePoolWithTag( // ExpCheckPoolBlocks(Entry); Entry->PoolTag = Tag; - Allocation = POOL_FREE_BLOCK(Entry); - - return Allocation; -} - -#ifdef DBG_NUMBER_OF_FRAMES_TO_CAPTURE -PVOID -NTAPI -ExAllocatePoolWithTag( - _In_ POOL_TYPE PoolType, - _In_ SIZE_T NumberOfBytes, - _In_ ULONG Tag) -{ - SIZE_T FullSize; - PVOID Allocation, *DbgData; - - /* Allocate a larger chunk to add the debug data */ - FullSize = NumberOfBytes + (DBG_NUMBER_OF_FRAMES_TO_CAPTURE + 2) * sizeof(PVOID); - Allocation = ExAllocatePoolWithTagInternal(PoolType, FullSize, Tag); - if (Allocation == NULL) - { - return NULL; - } - - /* Append the debug data, separated by a '####' */ - DbgData = ALIGN_UP_POINTER_BY((PUCHAR)Allocation + NumberOfBytes, sizeof(PVOID)); - DbgData[0] = (PVOID)(ULONG_PTR)'####'; - RtlWalkFrameChain(&DbgData[1], DBG_NUMBER_OF_FRAMES_TO_CAPTURE, 0); - return Allocation; + return POOL_FREE_BLOCK(Entry); } -#endif /* * @implemented @@ -2597,10 +2544,6 @@ ExFreePoolWithTag(IN PVOID P, Tag &= ~PROTECTED_POOL; } -#if DBG - RtlFillMemory(P, PageCount * PAGE_SIZE, 0xDD); -#endif - // // Check block tag // @@ -2726,10 +2669,6 @@ ExFreePoolWithTag(IN PVOID P, } } -#if DBG - RtlFillMemory(P, BlockSize * POOL_BLOCK_SIZE - sizeof(*Entry), 0xDD); -#endif - // // Is this allocation small enough to have come from a lookaside list? // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index afafcf823ec..5d6554bad75 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -665,9 +665,6 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Return the allocation address to the caller // -#if DBG - RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); -#endif return BaseVa; } @@ -677,13 +674,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, if ((SizeInPages == 1) && (ExQueryDepthSList(&MiNonPagedPoolSListHead))) { BaseVa = InterlockedPopEntrySList(&MiNonPagedPoolSListHead); - if (BaseVa) - { -#if DBG - RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); -#endif - return BaseVa; - } + if (BaseVa) return BaseVa; } // @@ -811,9 +802,6 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // Release the nonpaged pool lock, and return the allocation // KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); -#if DBG - RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); -#endif return BaseVa; } @@ -909,11 +897,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Return the address // - BaseVa = MiPteToAddress(StartPte); -#if DBG - RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); -#endif - return BaseVa; + return MiPteToAddress(StartPte); } ULONG

4 years, 10 months

[reactos] 01/01: [SYSDM] IMGINFO: Fix 'iPLanes' typo (#2059)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8dcf3c0ef287e265c75… commit 1f8dcf3c0ef287e265c7501a1d838887f5e4db6a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 25 18:50:03 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 25 18:50:03 2019 +0100 [SYSDM] IMGINFO: Fix 'iPLanes' typo (#2059) --- dll/cpl/sysdm/general.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 555db444d06..9c76df6ae83 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -24,7 +24,7 @@ typedef struct _IMGINFO HBITMAP hBitmap; INT cxSource; INT cySource; - INT iPLanes; + INT iPlanes; INT iBits; } IMGINFO, *PIMGINFO; @@ -123,7 +123,7 @@ static VOID InitLogo(HWND hwndDlg) pImgInfo->cxSource = logoBitmap.bmWidth; pImgInfo->cySource = logoBitmap.bmHeight; pImgInfo->iBits = logoBitmap.bmBitsPixel; - pImgInfo->iPLanes = logoBitmap.bmPlanes; + pImgInfo->iPlanes = logoBitmap.bmPlanes; DeleteObject(hLogo); DeleteObject(hMask); @@ -172,7 +172,7 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam iDevsHeight = rcCredits.bottom - rcCredits.top; - hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPLanes, pImgInfo->iBits, NULL); + hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); if(!hCreditsBitmap) break;

4 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
33
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 November 2019