Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [WIN32SS][FONT] Fix the system logical stock font data (#709)
by Katayama Hirofumi MZ 10 Aug '18

10 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbfe4d023b748693fe6e4… commit cbfe4d023b748693fe6e4f3aac5abdbaa26c1112 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 10 22:37:37 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 10 15:37:37 2018 +0200 [WIN32SS][FONT] Fix the system logical stock font data (#709) This fixes the stock font data to improve font selection. CORE-14885 --- win32ss/gdi/ntgdi/freetype.c | 29 ++++++++++ win32ss/gdi/ntgdi/stockobj.c | 126 +++++++++++++++++++++++++++++++++++++------ win32ss/gdi/ntgdi/text.h | 1 + 3 files changed, 140 insertions(+), 16 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index c201b3d698..9d380c0566 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -160,6 +160,35 @@ static const CHARSETINFO g_FontTci[MAXTCIINDEX] = { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; +#ifndef CP_OEMCP + #define CP_OEMCP 1 + #define CP_MACCP 2 +#endif + +/* Get charset from specified codepage. + g_FontTci is used also in TranslateCharsetInfo. */ +BYTE FASTCALL IntCharSetFromCodePage(UINT uCodePage) +{ + UINT i; + + if (uCodePage == CP_OEMCP) + return OEM_CHARSET; + + if (uCodePage == CP_MACCP) + return MAC_CHARSET; + + for (i = 0; i < MAXTCIINDEX; ++i) + { + if (g_FontTci[i].ciACP == 0) + continue; + + if (g_FontTci[i].ciACP == uCodePage) + return g_FontTci[i].ciCharset; + } + + return DEFAULT_CHARSET; +} + /* list head */ static RTL_STATIC_LIST_HEAD(g_FontSubstListHead); diff --git a/win32ss/gdi/ntgdi/stockobj.c b/win32ss/gdi/ntgdi/stockobj.c index ac339b6bcd..06dbe28267 100644 --- a/win32ss/gdi/ntgdi/stockobj.c +++ b/win32ss/gdi/ntgdi/stockobj.c @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: win32ss/gdi/ntgdi/stockobj.c * PURPOSE: Stock objects functions - * PROGRAMMER: + * PROGRAMMERS: Colin Finck <colin(a)reactos.org> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <win32k.h> @@ -67,33 +68,33 @@ static LOGFONTW OEMFixedFont = }; static LOGFONTW AnsiFixedFont = - { 14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Courier" }; static LOGFONTW AnsiVarFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"MS Sans Serif" }; static LOGFONTW SystemFont = - { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + { 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" }; static LOGFONTW DeviceDefaultFont = - { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" + { 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_SWISS | VARIABLE_PITCH, L"System" }; static LOGFONTW SystemFixedFont = - { 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + { 15, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Fixedsys" }; static LOGFONTW DefaultGuiFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Shell Dlg" + { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, DEFAULT_PITCH | FF_DONTCARE, L"MS Shell Dlg" }; HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; @@ -140,6 +141,105 @@ IntCreateStockPen(DWORD dwPenStyle, return hPen; } +static VOID FASTCALL +CreateStockFonts(void) +{ + USHORT ActiveCodePage, OemCodePage; + BYTE bActiveCharSet, bOemCharSet; + BOOL bIsCJK; + static const WCHAR SimSun[] = { 0x5B8B, 0x4F53, 0 }; + static const WCHAR MingLiU[] = { 0x7D30, 0x660E, 0x9AD4, 0 }; + static const WCHAR Batang[] = { 0xBC14, 0xD0D5, 0 }; + + RtlGetDefaultCodePage(&ActiveCodePage, &OemCodePage); + bActiveCharSet = IntCharSetFromCodePage(ActiveCodePage); + bOemCharSet = IntCharSetFromCodePage(OemCodePage); + + if (bOemCharSet == DEFAULT_CHARSET) + bOemCharSet = OEM_CHARSET; + + switch (ActiveCodePage) + { + case 936: + /* Simplified Chinese */ + bIsCJK = TRUE; + wcscpy(DefaultGuiFont.lfFaceName, SimSun); + break; + + case 950: + /* Traditional Chinese */ + bIsCJK = TRUE; + wcscpy(DefaultGuiFont.lfFaceName, MingLiU); + break; + + case 932: + /* Japanese */ + bIsCJK = TRUE; + wcscpy(DefaultGuiFont.lfFaceName, L"MS UI Gothic"); + break; + + case 949: + case 1361: + /* Korean */ + bIsCJK = TRUE; + wcscpy(DefaultGuiFont.lfFaceName, Batang); + break; + + default: + /* Otherwise */ + bIsCJK = FALSE; + wcscpy(DefaultGuiFont.lfFaceName, L"MS Shell Dlg"); + break; + } + + if (bIsCJK) + { + OEMFixedFont.lfHeight = 18; + OEMFixedFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH; + SystemFont.lfHeight = 18; + SystemFont.lfPitchAndFamily = FF_DONTCARE | VARIABLE_PITCH; + DeviceDefaultFont.lfHeight = 18; + DeviceDefaultFont.lfPitchAndFamily = FF_DONTCARE | VARIABLE_PITCH; + SystemFixedFont.lfHeight = 18; + SystemFixedFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH; + DefaultGuiFont.lfHeight = -12; + } + else + { + OEMFixedFont.lfHeight = 12; + OEMFixedFont.lfPitchAndFamily = FF_MODERN | FIXED_PITCH; + SystemFont.lfHeight = 16; + SystemFont.lfPitchAndFamily = FF_SWISS | VARIABLE_PITCH; + DeviceDefaultFont.lfHeight = 16; + DeviceDefaultFont.lfPitchAndFamily = FF_SWISS | VARIABLE_PITCH; + if (bActiveCharSet == RUSSIAN_CHARSET) + { + SystemFixedFont.lfHeight = 16; + SystemFixedFont.lfPitchAndFamily = FF_SWISS | FIXED_PITCH; + } + else + { + SystemFixedFont.lfHeight = 15; + SystemFixedFont.lfPitchAndFamily = FF_MODERN | FIXED_PITCH; + } + DefaultGuiFont.lfHeight = -11; + } + + OEMFixedFont.lfCharSet = bOemCharSet; + SystemFont.lfCharSet = bActiveCharSet; + DeviceDefaultFont.lfCharSet = bActiveCharSet; + SystemFixedFont.lfCharSet = bActiveCharSet; + DefaultGuiFont.lfCharSet = bActiveCharSet; + + TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); + TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]); + TextIntCreateFontIndirect(&AnsiVarFont, (HFONT*)&StockObjects[ANSI_VAR_FONT]); + TextIntCreateFontIndirect(&SystemFont, (HFONT*)&StockObjects[SYSTEM_FONT]); + TextIntCreateFontIndirect(&DeviceDefaultFont, (HFONT*)&StockObjects[DEVICE_DEFAULT_FONT]); + TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); + TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); +} + /*! * Creates a bunch of stock objects: brushes, pens, fonts. */ @@ -168,13 +268,7 @@ CreateStockObjects(void) StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ StockObjects[DEFAULT_BITMAP] = GreCreateBitmap(1, 1, 1, 1, NULL); - (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&AnsiVarFont, (HFONT*)&StockObjects[ANSI_VAR_FONT]); - (void) TextIntCreateFontIndirect(&SystemFont, (HFONT*)&StockObjects[SYSTEM_FONT]); - (void) TextIntCreateFontIndirect(&DeviceDefaultFont, (HFONT*)&StockObjects[DEVICE_DEFAULT_FONT]); - (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); + CreateStockFonts(); StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)gppalDefault->BaseObject.hHmgr; diff --git a/win32ss/gdi/ntgdi/text.h b/win32ss/gdi/ntgdi/text.h index b0e1e0c61f..cd8b5b22f0 100644 --- a/win32ss/gdi/ntgdi/text.h +++ b/win32ss/gdi/ntgdi/text.h @@ -106,6 +106,7 @@ TEXTOBJ_UnlockText(PLFONT plfnt) PTEXTOBJ FASTCALL RealizeFontInit(HFONT); NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ); NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont); +BYTE FASTCALL IntCharSetFromCodePage(UINT uCodePage); BOOL FASTCALL InitFontSupport(VOID); BOOL FASTCALL IntIsFontRenderingEnabled(VOID); BOOL FASTCALL IntIsFontRenderingEnabled(VOID);

1 0

01/01: [SHELL32] Fix a careless mistake of ShellExecCmdLine (#737)
by Katayama Hirofumi MZ 10 Aug '18

10 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db13b422b3281ccc97dad… commit db13b422b3281ccc97dad4b6e574eb26bf447e07 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 10 20:25:50 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 10 13:25:50 2018 +0200 [SHELL32] Fix a careless mistake of ShellExecCmdLine (#737) CORE-14886 --- dll/win32/shell32/shlexec.cpp | 1 - modules/rostests/apitests/shell32/ShellExecCmdLine.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 55b3d051fe..09ccfec0a3 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2430,7 +2430,6 @@ HRESULT WINAPI ShellExecCmdLine( SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); - pchParams = NULL; } else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || SearchPathW(NULL, lpCommand, wszExe, _countof(szFile2), szFile2, NULL) || diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index c540321a65..44a22a5162 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -140,7 +140,6 @@ HRESULT WINAPI ShellExecCmdLine( SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); - pchParams = NULL; } else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || SearchPathW(NULL, lpCommand, wszExe, _countof(szFile2), szFile2, NULL) || @@ -415,6 +414,7 @@ static void DoEntry(const TEST_ENTRY *pEntry) { bFound = TRUE; SendMessage(hwnd, WM_CLOSE, 0, 0); + Sleep(RETRY_INTERVAL); break; } Sleep(RETRY_INTERVAL);

1 0

01/01: [CONSRV] Implement support for file/directory drag-and-drop (#692). CORE-14833
by Katayama Hirofumi MZ 09 Aug '18

09 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83891d28434deea87da05… commit 83891d28434deea87da05863c8ed937bfa7c6ef8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 19 05:02:49 2018 +0900 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 9 14:08:05 2018 +0200 [CONSRV] Implement support for file/directory drag-and-drop (#692). CORE-14833 --- win32ss/user/winsrv/consrv.cmake | 2 +- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 34 ++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index ea30acf25a..1307a0fb91 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -56,6 +56,6 @@ add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) list(APPEND CONSRV_IMPORT_LIBS psapi) -list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32) +list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32) list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid) set_module_type(consrv module UNICODE) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 6071a5dd9c..2c48f7841b 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -7,6 +7,7 @@ * Johannes Anderwald * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* INCLUDES *******************************************************************/ @@ -14,6 +15,7 @@ #include <consrv.h> #include <intrin.h> #include <windowsx.h> +#include <shellapi.h> #define NDEBUG #include <debug.h> @@ -586,7 +588,7 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams; PCONSRV_CONSOLE Console; - if (NULL == GuiData) + if (GuiData == NULL) { DPRINT1("GuiConsoleNcCreate: No GUI data\n"); return FALSE; @@ -639,6 +641,9 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) DPRINT("OnNcCreate - setting start event\n"); NtSetEvent(GuiData->hGuiInitEvent, NULL); + /* We accept dropped files */ + DragAcceptFiles(GuiData->hWindow, TRUE); + return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); } @@ -2100,6 +2105,29 @@ OnMove(PGUI_CONSOLE_DATA GuiData) GuiData->GuiInfo.WindowOrigin.y = rcWnd.top; } +static VOID +OnDropFiles(PCONSRV_CONSOLE Console, HDROP hDrop) +{ + LPWSTR pszPath; + WCHAR szPath[MAX_PATH + 2]; + + szPath[0] = L'"'; + + DragQueryFileW(hDrop, 0, &szPath[1], ARRAYSIZE(szPath) - 1); + DragFinish(hDrop); + + if (wcschr(&szPath[1], L' ') != NULL) + { + StringCchCatW(szPath, ARRAYSIZE(szPath), L"\""); + pszPath = szPath; + } + else + { + pszPath = &szPath[1]; + } + + PasteText(Console, pszPath, wcslen(pszPath)); +} /* // HACK: This functionality is standard for general scrollbars. Don't add it by hand. @@ -2387,6 +2415,10 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) break; } + case WM_DROPFILES: + OnDropFiles(Console, (HDROP)wParam); + break; + case WM_SETFOCUS: case WM_KILLFOCUS: OnFocus(GuiData, (msg == WM_SETFOCUS));

1 0

04/04: [REACTOS] Improve how some ASSERTMSG() message values are printed: enforce ending "\n".
by Serge Gautherie 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d6bda16c61faac1ccf0c… commit 7d6bda16c61faac1ccf0c1e0a3d26a3260ca9efd Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jul 4 03:42:04 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 22:03:45 2018 +0200 [REACTOS] Improve how some ASSERTMSG() message values are printed: enforce ending "\n". NB: Not touching calls in "third-party" code: class and classpnp. --- base/system/smss/smss.c | 2 +- boot/freeldr/freeldr/arch/i386/pcmem.c | 8 ++++---- drivers/bus/acpi/buspdo.c | 2 +- drivers/bus/pcix/arb/tr_irq.c | 2 +- drivers/bus/pcix/enum.c | 4 ++-- drivers/bus/pcix/intrface/agpintrf.c | 2 +- drivers/bus/pcix/intrface/busintrf.c | 2 +- drivers/bus/pcix/intrface/cardbus.c | 2 +- drivers/bus/pcix/intrface/devhere.c | 2 +- drivers/bus/pcix/intrface/lddintrf.c | 2 +- drivers/bus/pcix/intrface/locintrf.c | 2 +- drivers/bus/pcix/intrface/pmeintf.c | 2 +- drivers/bus/pcix/intrface/routintf.c | 2 +- drivers/bus/pcix/utils.c | 2 +- modules/rostests/kmtests/npfs/NpfsHelpers.c | 4 ++-- ntoskrnl/config/cmconfig.c | 2 +- ntoskrnl/config/cmparse.c | 3 ++- ntoskrnl/config/cmvalche.c | 2 +- ntoskrnl/ex/callback.c | 2 +- ntoskrnl/include/internal/cm.h | 2 +- ntoskrnl/po/power.c | 2 +- sdk/lib/cmlib/cmlib.h | 2 +- 22 files changed, 28 insertions(+), 27 deletions(-) diff --git a/base/system/smss/smss.c b/base/system/smss/smss.c index 28bd66f22d..0da3fa6e74 100644 --- a/base/system/smss/smss.c +++ b/base/system/smss/smss.c @@ -70,7 +70,7 @@ SmpExecuteImage(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { /* This is a pretty bad failure. ASSERT on checked builds and exit */ - ASSERTMSG("RtlCreateProcessParameters", NT_SUCCESS(Status)); + ASSERTMSG("RtlCreateProcessParameters failed.\n", NT_SUCCESS(Status)); DPRINT1("SMSS: RtlCreateProcessParameters failed for %wZ - Status == %lx\n", FileName, Status); return Status; diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 28d6e06e4c..21647d49a8 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -322,7 +322,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi /* Warn user, unless wrong case is "first and not too big entry", which is otherwise harmless. */ if (PcBiosMapCount > 0 || Regs.x.ecx > sizeof(BIOS_MEMORY_MAP)) { - ASSERTMSG("Int 15h AX=E820h returned an invalid entry length!", FALSE); + ASSERTMSG("Int 15h AX=E820h returned an invalid entry length!\n", FALSE); } /* We keep previous entries (if any), but do not dare trying next entries. * We assume these entries are good to use as is. If they are not, we are in trouble... @@ -360,7 +360,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi PcBiosMemoryMap[PcBiosMapCount].Length, PcBiosMemoryMap[PcBiosMapCount].Type, PcBiosMemoryMap[PcBiosMapCount].ExtendedAttributesAsULONG); - // NotWantedForPublicBuilds: ASSERTMSG("EA.ErrorLog = 1. Check/Report then CONTinue.", FALSE); + // NotWantedForPublicBuilds: ASSERTMSG("EA.ErrorLog = 1. Check/Report then CONTinue.\n", FALSE); } if (PcBiosMemoryMap[PcBiosMapCount].Length == 0) @@ -433,7 +433,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi { ERR("PcMemoryMap is already full! (PcBiosMapCount = %lu, PcMapCount = %lu (>= %lu))\n", PcBiosMapCount, PcMapCount, MaxMemoryMapSize); - // NotWantedForPublicBuilds: ASSERTMSG("PcMemoryMap is already full!", FALSE); + // NotWantedForPublicBuilds: ASSERTMSG("PcMemoryMap is already full!\n", FALSE); /* We keep previous entries, and half-retrieve current/next entries. * We assume all these entries are good to use as is. If they are not, we are in trouble... * @@ -466,7 +466,7 @@ nextRange: { ERR("PcBiosMemoryMap is already full! (PcBiosMapCount = %lu (>= %lu), PcMapCount = %lu)\n", PcBiosMapCount, MAX_BIOS_DESCRIPTORS, PcMapCount); - // NotWantedForPublicBuilds: ASSERTMSG("PcBiosMemoryMap is already full!", FALSE); + // NotWantedForPublicBuilds: ASSERTMSG("PcBiosMemoryMap is already full!\n", FALSE); /* We keep retrieved entries, but ignore next entries. * We assume these entries are good to use as is. If they are not, we are in trouble... * diff --git a/drivers/bus/acpi/buspdo.c b/drivers/bus/acpi/buspdo.c index 59a437e671..9abd48a2a8 100644 --- a/drivers/bus/acpi/buspdo.c +++ b/drivers/bus/acpi/buspdo.c @@ -1851,7 +1851,7 @@ Return Value: // Only PDO can handle this request. Somebody above // is not playing by rule. // - ASSERTMSG("Someone above is handling TargetDeviceRelation", !deviceRelations); + ASSERTMSG("Someone above is handling TargetDeviceRelation\n", !deviceRelations); } deviceRelations = ExAllocatePoolWithTag(PagedPool, diff --git a/drivers/bus/pcix/arb/tr_irq.c b/drivers/bus/pcix/arb/tr_irq.c index f6b393a913..87aa3bff69 100644 --- a/drivers/bus/pcix/arb/tr_irq.c +++ b/drivers/bus/pcix/arb/tr_irq.c @@ -36,7 +36,7 @@ tranirq_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI tranirq_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI tranirq_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/enum.c b/drivers/bus/pcix/enum.c index 8c4caa938a..edb8a261d9 100644 --- a/drivers/bus/pcix/enum.c +++ b/drivers/bus/pcix/enum.c @@ -1128,7 +1128,7 @@ PciSkipThisFunction(IN PPCI_COMMON_HEADER PciData, else { /* Logic error in the driver */ - ASSERTMSG("PCI Skip Function - Operation type unknown.", FALSE); + ASSERTMSG("PCI Skip Function - Operation type unknown.\n", FALSE); } /* Check for legacy bridges during resource enumeration */ @@ -2172,7 +2172,7 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension, if (!PcipIsSameDevice(PdoExtension, &PciData)) { /* Fail */ - ASSERTMSG("PCI Set resources - not same device", FALSE); + ASSERTMSG("PCI Set resources - not same device.\n", FALSE); return STATUS_DEVICE_DOES_NOT_EXIST; } diff --git a/drivers/bus/pcix/intrface/agpintrf.c b/drivers/bus/pcix/intrface/agpintrf.c index 89c25ec0d2..47dbd4132e 100644 --- a/drivers/bus/pcix/intrface/agpintrf.c +++ b/drivers/bus/pcix/intrface/agpintrf.c @@ -38,7 +38,7 @@ agpintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI agpintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI agpintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/busintrf.c b/drivers/bus/pcix/intrface/busintrf.c index 93aecd322a..cf2d032910 100644 --- a/drivers/bus/pcix/intrface/busintrf.c +++ b/drivers/bus/pcix/intrface/busintrf.c @@ -36,7 +36,7 @@ busintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI busintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI busintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/cardbus.c b/drivers/bus/pcix/intrface/cardbus.c index 63c2ce6a27..b549d8b480 100644 --- a/drivers/bus/pcix/intrface/cardbus.c +++ b/drivers/bus/pcix/intrface/cardbus.c @@ -100,7 +100,7 @@ pcicbintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI pcicbintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI pcicbintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/devhere.c b/drivers/bus/pcix/intrface/devhere.c index 9d2566cf05..c0f81ab286 100644 --- a/drivers/bus/pcix/intrface/devhere.c +++ b/drivers/bus/pcix/intrface/devhere.c @@ -36,7 +36,7 @@ devpresent_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI devpresent_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI devpresent_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/lddintrf.c b/drivers/bus/pcix/intrface/lddintrf.c index 705c2c0a93..498bcfbb9e 100644 --- a/drivers/bus/pcix/intrface/lddintrf.c +++ b/drivers/bus/pcix/intrface/lddintrf.c @@ -36,7 +36,7 @@ lddintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI lddintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI lddintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/locintrf.c b/drivers/bus/pcix/intrface/locintrf.c index 236b2be8eb..303dfcf6ff 100644 --- a/drivers/bus/pcix/intrface/locintrf.c +++ b/drivers/bus/pcix/intrface/locintrf.c @@ -36,7 +36,7 @@ locintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI locintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI locintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/pmeintf.c b/drivers/bus/pcix/intrface/pmeintf.c index 2a6346a42b..dda75c08f8 100644 --- a/drivers/bus/pcix/intrface/pmeintf.c +++ b/drivers/bus/pcix/intrface/pmeintf.c @@ -36,7 +36,7 @@ PciPmeInterfaceInitializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI PciPmeInterfaceInitializer, unexpected call.", FALSE); + ASSERTMSG("PCI PciPmeInterfaceInitializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/intrface/routintf.c b/drivers/bus/pcix/intrface/routintf.c index e27b9bae85..7d0865bd79 100644 --- a/drivers/bus/pcix/intrface/routintf.c +++ b/drivers/bus/pcix/intrface/routintf.c @@ -38,7 +38,7 @@ routeintrf_Initializer(IN PVOID Instance) { UNREFERENCED_PARAMETER(Instance); /* PnP Interfaces don't get Initialized */ - ASSERTMSG("PCI routeintrf_Initializer, unexpected call.", FALSE); + ASSERTMSG("PCI routeintrf_Initializer, unexpected call.\n", FALSE); return STATUS_UNSUCCESSFUL; } diff --git a/drivers/bus/pcix/utils.c b/drivers/bus/pcix/utils.c index e335a63de8..32a03339e6 100644 --- a/drivers/bus/pcix/utils.c +++ b/drivers/bus/pcix/utils.c @@ -494,7 +494,7 @@ PciGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, Status, STATUS_BUFFER_TOO_SMALL); *OutputBuffer = NULL; - ASSERTMSG("PCI Successfully did the impossible!", FALSE); + ASSERTMSG("PCI Successfully did the impossible!\n", FALSE); break; } diff --git a/modules/rostests/kmtests/npfs/NpfsHelpers.c b/modules/rostests/kmtests/npfs/NpfsHelpers.c index 3dc9267bf8..4ba7271792 100644 --- a/modules/rostests/kmtests/npfs/NpfsHelpers.c +++ b/modules/rostests/kmtests/npfs/NpfsHelpers.c @@ -105,7 +105,7 @@ NpCreatePipe( ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE; else { - ASSERTMSG("Invalid NamedPipeConfiguration parameter value!", FALSE); + ASSERTMSG("Invalid NamedPipeConfiguration parameter value!\n", FALSE); return STATUS_INVALID_PARAMETER_6; } @@ -192,7 +192,7 @@ NpOpenPipe( ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE; else { - ASSERTMSG("Invalid NamedPipeConfiguration parameter value!", FALSE); + ASSERTMSG("Invalid NamedPipeConfiguration parameter value!\n", FALSE); return STATUS_INVALID_PARAMETER_3; } diff --git a/ntoskrnl/config/cmconfig.c b/ntoskrnl/config/cmconfig.c index 9da721e241..97b81d682e 100644 --- a/ntoskrnl/config/cmconfig.c +++ b/ntoskrnl/config/cmconfig.c @@ -153,7 +153,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); if (Length > CmpConfigurationAreaSize) { - ASSERTMSG("Component too large -- need reallocation!", FALSE); + ASSERTMSG("Component too large -- need reallocation!\n", FALSE); } else { diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index 44525de2c0..fe25e252bd 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -1097,7 +1097,8 @@ CmpParseKey(IN PVOID ParseObject, ASSERT(ParentKcb != NULL); /* Check if everything was found cached */ - if (!TotalRemainingSubkeys) ASSERTMSG("Caching not implemented", FALSE); + if (!TotalRemainingSubkeys) + ASSERTMSG("Caching not implemented\n", FALSE); /* Don't do anything if we're being deleted */ if (Kcb->Delete) diff --git a/ntoskrnl/config/cmvalche.c b/ntoskrnl/config/cmvalche.c index 03d6c8bede..7759b7c646 100644 --- a/ntoskrnl/config/cmvalche.c +++ b/ntoskrnl/config/cmvalche.c @@ -35,7 +35,7 @@ CmpSetValueCached(IN PHCELL_INDEX CellIndex) } #define ASSERT_VALUE_CACHE() \ - ASSERTMSG("Cached Values Not Yet Supported!", FALSE); + ASSERTMSG("Cached Values Not Yet Supported!\n", FALSE); /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/ex/callback.c b/ntoskrnl/ex/callback.c index 6ef87970a0..07b1d50b2a 100644 --- a/ntoskrnl/ex/callback.c +++ b/ntoskrnl/ex/callback.c @@ -183,7 +183,7 @@ ExCompareExchangeCallBack(IN OUT PEX_CALLBACK CallBack, MAX_FAST_REFS + 1)) { /* This should never happen */ - ASSERTMSG("Callback block is already undergoing rundown", FALSE); + ASSERTMSG("Callback block is already undergoing rundown\n", FALSE); return FALSE; } } diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index 2a6f980204..a3f801df1f 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -40,7 +40,7 @@ // Hack since bigkeys are not yet supported // #define ASSERT_VALUE_BIG(h, s) \ - ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); + ASSERTMSG("Big keys not supported!\n", !CmpIsKeyValueBig(h, s)); // // CM_KEY_CONTROL_BLOCK Signatures diff --git a/ntoskrnl/po/power.c b/ntoskrnl/po/power.c index 2dee988b34..c34a660c86 100644 --- a/ntoskrnl/po/power.c +++ b/ntoskrnl/po/power.c @@ -991,7 +991,7 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction, } /* You should not have made it this far */ - // ASSERTMSG("System is still up and running?!", FALSE); + // ASSERTMSG("System is still up and running?!\n", FALSE); DPRINT1("System is still up and running, you may not have chosen a yet supported power option: %u\n", PopAction.Action); break; } diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index e49bd38462..46676a2122 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -313,7 +313,7 @@ extern ULONG CmlibTraceLevel; // Hack since bigkeys are not yet supported // #define ASSERT_VALUE_BIG(h, s) \ - ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); + ASSERTMSG("Big keys not supported!\n", !CmpIsKeyValueBig(h, s)); // // Returns whether or not this is a small valued key

1 0

03/04: [CMLIB] Simplify an ASSERTMSG() as an ASSERT().
by Serge Gautherie 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb48381cb490312e57cb5… commit fb48381cb490312e57cb5df7d0a20e12b2b774c1 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jul 2 11:45:01 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 21:45:46 2018 +0200 [CMLIB] Simplify an ASSERTMSG() as an ASSERT(). --- sdk/lib/cmlib/cmindex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/cmlib/cmindex.c b/sdk/lib/cmlib/cmindex.c index 618de3f35d..599900124d 100644 --- a/sdk/lib/cmlib/cmindex.c +++ b/sdk/lib/cmlib/cmindex.c @@ -1285,7 +1285,7 @@ CmpSelectLeaf(IN PHHIVE Hive, if (!IndexKey) { /* Should not happen! */ - ASSERTMSG("IndexKey = NULL!, it should not happen!\n", FALSE); + ASSERT(IndexKey != NULL); return HCELL_NIL; }

1 0

02/04: [BOOTLIB] Fix the implementation of RtlAssert() ('Message' can be NULL, and fix the printing of ANSI string). Fix also the implementation of DbgPrint().
by Hermès Bélusca-Maïto 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d53991895d6753dcdd378… commit d53991895d6753dcdd3788807c02b6d2f4c0b113 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 8 21:37:22 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 21:37:22 2018 +0200 [BOOTLIB] Fix the implementation of RtlAssert() ('Message' can be NULL, and fix the printing of ANSI string). Fix also the implementation of DbgPrint(). --- boot/environ/lib/misc/rtlcompat.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/boot/environ/lib/misc/rtlcompat.c b/boot/environ/lib/misc/rtlcompat.c index 06ebf7e35d..6f0c7bf7c0 100644 --- a/boot/environ/lib/misc/rtlcompat.c +++ b/boot/environ/lib/misc/rtlcompat.c @@ -72,11 +72,24 @@ RtlAssert ( IN PCHAR Message OPTIONAL ) { - EfiPrintf(L"*** ASSERTION %s FAILED AT %d in %s (%s) ***\r\n", - FailedAssertion, - LineNumber, - FileName, - Message); + if (Message != NULL) + { + EfiPrintf(L"*** ASSERTION \'%S\' FAILED AT line %lu in %S (%S) ***\r\n", + (PCHAR)FailedAssertion, + LineNumber, + (PCHAR)FileName, + Message); + } + else + { + EfiPrintf(L"*** ASSERTION \'%S\' FAILED AT line %lu in %S ***\r\n", + (PCHAR)FailedAssertion, + LineNumber, + (PCHAR)FileName); + } + + /* Issue a breakpoint */ + __debugbreak(); } ULONG @@ -85,7 +98,7 @@ DbgPrint ( ... ) { - EfiPrintf(L"%s\r\n", Format); + EfiPrintf(L"%S\r\n", Format); return 0; }

1 0

01/04: [REACTOS] RtlAssert(): use "%lu" as LineNumber format.
by Serge Gautherie 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97d3b3ce3349fa87d01ee… commit 97d3b3ce3349fa87d01ee29d0d08ff2ca8618a7d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Jun 21 05:05:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 21:24:07 2018 +0200 [REACTOS] RtlAssert(): use "%lu" as LineNumber format. --- boot/freeldr/freeldr/lib/debug.c | 4 ++-- sdk/lib/rtl/assert.c | 2 +- sdk/tools/mkhive/rtl.c | 42 ++++++++++++++++++++-------------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index d2143ad599..1f01f869b2 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -488,7 +488,7 @@ RtlAssert(IN PVOID FailedAssertion, { if (Message) { - DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", + DbgPrint("Assertion \'%s\' failed at %s line %lu: %s\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber, @@ -496,7 +496,7 @@ RtlAssert(IN PVOID FailedAssertion, } else { - DbgPrint("Assertion \'%s\' failed at %s line %u\n", + DbgPrint("Assertion \'%s\' failed at %s line %lu\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber); diff --git a/sdk/lib/rtl/assert.c b/sdk/lib/rtl/assert.c index c25516e4a1..0c6fcaeeef 100644 --- a/sdk/lib/rtl/assert.c +++ b/sdk/lib/rtl/assert.c @@ -36,7 +36,7 @@ RtlAssert(IN PVOID FailedAssertion, { /* Print the assertion */ DbgPrint("\n*** Assertion failed: %s%s\n" - "*** Source File: %s, line %ld\n\n", + "*** Source File: %s, line %lu\n\n", Message != NULL ? Message : "", (PSTR)FailedAssertion, (PSTR)FileName, diff --git a/sdk/tools/mkhive/rtl.c b/sdk/tools/mkhive/rtl.c index 3bef91da9a..d8649d22c8 100644 --- a/sdk/tools/mkhive/rtl.c +++ b/sdk/tools/mkhive/rtl.c @@ -131,28 +131,28 @@ DbgPrint( VOID NTAPI -RtlAssert(PVOID FailedAssertion, - PVOID FileName, - ULONG LineNumber, - PCHAR Message) +RtlAssert(IN PVOID FailedAssertion, + IN PVOID FileName, + IN ULONG LineNumber, + IN PCHAR Message OPTIONAL) { - if (NULL != Message) - { - DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber, - Message); - } - else - { - DbgPrint("Assertion \'%s\' failed at %s line %d\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber); - } - - //DbgBreakPoint(); + if (Message != NULL) + { + DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber, + Message); + } + else + { + DbgPrint("Assertion \'%s\' failed at %s line %u\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber); + } + + //DbgBreakPoint(); } // DECLSPEC_NORETURN

1 0

02/02: [CONSRV] Minor code re-organization.
by Hermès Bélusca-Maïto 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a89a3e731a4c22f757a5… commit 1a89a3e731a4c22f757a55862d50731a649e9f82 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 8 20:45:39 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 20:46:41 2018 +0200 [CONSRV] Minor code re-organization. --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 37 +------------ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 2 - win32ss/user/winsrv/consrv/frontends/gui/guiterm.h | 62 +++++++++++++++++++++- 3 files changed, 61 insertions(+), 40 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 860244f6c5..6071a5dd9c 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -642,16 +642,6 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); } - -BOOL -EnterFullScreen(PGUI_CONSOLE_DATA GuiData); -VOID -LeaveFullScreen(PGUI_CONSOLE_DATA GuiData); -VOID -SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); -VOID -GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData); - static VOID OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam) { @@ -973,18 +963,6 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData, DeleteObject(oldRgn); } - -VOID -GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData, - PRECT rcView, - PRECT rcFramebuffer); -VOID -GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData, - PRECT rcView, - PRECT rcFramebuffer); - static VOID OnPaint(PGUI_CONSOLE_DATA GuiData) { @@ -1966,12 +1944,6 @@ Quit: return DefWindowProcW(GuiData->hWindow, msg, wParam, lParam); } -VOID -GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData); -VOID -GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData); static VOID Copy(PGUI_CONSOLE_DATA GuiData) @@ -1996,13 +1968,6 @@ Copy(PGUI_CONSOLE_DATA GuiData) UpdateSelection(GuiData, NULL, NULL); } -VOID -GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData); -VOID -GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData); - static VOID Paste(PGUI_CONSOLE_DATA GuiData) { @@ -2135,6 +2100,7 @@ OnMove(PGUI_CONSOLE_DATA GuiData) GuiData->GuiInfo.WindowOrigin.y = rcWnd.top; } + /* // HACK: This functionality is standard for general scrollbars. Don't add it by hand. @@ -2163,7 +2129,6 @@ GuiConsoleHandleScrollbarMenu(VOID) } */ - static LRESULT CALLBACK ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 1b6120ec63..a3ebb0390c 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -96,8 +96,6 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData, * GUI Terminal Initialization * ******************************************************************************/ -VOID -SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); VOID CreateSysMenu(HWND hWnd); diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h index 1d29d352c7..4ed6c1e8c1 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h @@ -14,6 +14,9 @@ #include "guisettings.h" #include "conwnd.h" + +/* HELPER FUNCTIONS ***********************************************************/ + FORCEINLINE VOID GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, @@ -50,11 +53,16 @@ SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit; } + +/* FUNCTIONS ******************************************************************/ + +/* guiterm.c */ + VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData); -VOID -SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); + +/* conwnd.c */ BOOL InitFonts(PGUI_CONSOLE_DATA GuiData, @@ -64,3 +72,53 @@ InitFonts(PGUI_CONSOLE_DATA GuiData, ULONG FontWeight); VOID DeleteFonts(PGUI_CONSOLE_DATA GuiData); + + +/* fullscreen.c */ + +BOOL +EnterFullScreen(PGUI_CONSOLE_DATA GuiData); +VOID +LeaveFullScreen(PGUI_CONSOLE_DATA GuiData); +VOID +SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); +VOID +GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData); + + +/* graphics.c */ + +VOID +GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData, + PRECT rcView, + PRECT rcFramebuffer); + + +/* text.c */ + +VOID +PasteText( + IN PCONSRV_CONSOLE Console, + IN PWCHAR Buffer, + IN SIZE_T cchSize); + +VOID +GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData, + PRECT rcView, + PRECT rcFramebuffer); + +/* EOF */

1 0

01/02: [CONSRV] Add a PasteText() helper function and use it.
by Hermès Bélusca-Maïto 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9064d328396837a09d93… commit a9064d328396837a09d939372884b16fa88106f8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 8 20:38:41 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 8 20:46:34 2018 +0200 [CONSRV] Add a PasteText() helper function and use it. --- win32ss/user/winsrv/consrv/frontends/gui/text.c | 124 +++++++++++++----------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/text.c b/win32ss/user/winsrv/consrv/frontends/gui/text.c index 8e6e870399..57009fd128 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/text.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/text.c @@ -225,6 +225,69 @@ CopyLines(PTEXTMODE_SCREEN_BUFFER Buffer, } +VOID +PasteText( + IN PCONSRV_CONSOLE Console, + IN PWCHAR Buffer, + IN SIZE_T cchSize) +{ + USHORT VkKey; // MAKEWORD(low = vkey_code, high = shift_state); + INPUT_RECORD er; + WCHAR CurChar = 0; + + /* Do nothing if we have nothing to paste */ + if (!Buffer || (cchSize <= 0)) + return; + + er.EventType = KEY_EVENT; + er.Event.KeyEvent.wRepeatCount = 1; + while (cchSize--) + { + /* \r or \n characters. Go to the line only if we get "\r\n" sequence. */ + if (CurChar == L'\r' && *Buffer == L'\n') + { + ++Buffer; + continue; + } + CurChar = *Buffer++; + + /* Get the key code (+ shift state) corresponding to the character */ + VkKey = VkKeyScanW(CurChar); + if (VkKey == 0xFFFF) + { + DPRINT1("FIXME: TODO: VkKeyScanW failed - Should simulate the key!\n"); + /* + * We don't really need the scan/key code because we actually only + * use the UnicodeChar for output purposes. It may pose few problems + * later on but it's not of big importance. One trick would be to + * convert the character to OEM / multibyte and use MapVirtualKey() + * on each byte (simulating an Alt-0xxx OEM keyboard press). + */ + } + + /* Pressing some control keys */ + + /* Pressing the character key, with the control keys maintained pressed */ + er.Event.KeyEvent.bKeyDown = TRUE; + er.Event.KeyEvent.wVirtualKeyCode = LOBYTE(VkKey); + er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_VSC); + er.Event.KeyEvent.uChar.UnicodeChar = CurChar; + er.Event.KeyEvent.dwControlKeyState = 0; + if (HIBYTE(VkKey) & 1) + er.Event.KeyEvent.dwControlKeyState |= SHIFT_PRESSED; + if (HIBYTE(VkKey) & 2) + er.Event.KeyEvent.dwControlKeyState |= LEFT_CTRL_PRESSED; // RIGHT_CTRL_PRESSED; + if (HIBYTE(VkKey) & 4) + er.Event.KeyEvent.dwControlKeyState |= LEFT_ALT_PRESSED; // RIGHT_ALT_PRESSED; + + ConioProcessInputEvent(Console, &er); + + /* Up all the character and control keys */ + er.Event.KeyEvent.bKeyDown = FALSE; + ConioProcessInputEvent(Console, &er); + } +} + VOID GetSelectionBeginEnd(PCOORD Begin, PCOORD End, PCOORD SelectionAnchor, @@ -274,67 +337,16 @@ GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, PCONSRV_CONSOLE Console = Buffer->Header.Console; HANDLE hData; - LPWSTR str; - WCHAR CurChar = 0; - - USHORT VkKey; // MAKEWORD(low = vkey_code, high = shift_state); - INPUT_RECORD er; + LPWSTR pszText; hData = GetClipboardData(CF_UNICODETEXT); if (hData == NULL) return; - str = GlobalLock(hData); - if (str == NULL) return; - - DPRINT("Got data <%S> from clipboard\n", str); + pszText = GlobalLock(hData); + if (pszText == NULL) return; - er.EventType = KEY_EVENT; - er.Event.KeyEvent.wRepeatCount = 1; - while (*str) - { - /* \r or \n characters. Go to the line only if we get "\r\n" sequence. */ - if (CurChar == L'\r' && *str == L'\n') - { - str++; - continue; - } - CurChar = *str++; - - /* Get the key code (+ shift state) corresponding to the character */ - VkKey = VkKeyScanW(CurChar); - if (VkKey == 0xFFFF) - { - DPRINT1("FIXME: TODO: VkKeyScanW failed - Should simulate the key!\n"); - /* - * We don't really need the scan/key code because we actually only - * use the UnicodeChar for output purposes. It may pose few problems - * later on but it's not of big importance. One trick would be to - * convert the character to OEM / multibyte and use MapVirtualKey - * on each byte (simulating an Alt-0xxx OEM keyboard press). - */ - } - - /* Pressing some control keys */ - - /* Pressing the character key, with the control keys maintained pressed */ - er.Event.KeyEvent.bKeyDown = TRUE; - er.Event.KeyEvent.wVirtualKeyCode = LOBYTE(VkKey); - er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_VSC); - er.Event.KeyEvent.uChar.UnicodeChar = CurChar; - er.Event.KeyEvent.dwControlKeyState = 0; - if (HIBYTE(VkKey) & 1) - er.Event.KeyEvent.dwControlKeyState |= SHIFT_PRESSED; - if (HIBYTE(VkKey) & 2) - er.Event.KeyEvent.dwControlKeyState |= LEFT_CTRL_PRESSED; // RIGHT_CTRL_PRESSED; - if (HIBYTE(VkKey) & 4) - er.Event.KeyEvent.dwControlKeyState |= LEFT_ALT_PRESSED; // RIGHT_ALT_PRESSED; - - ConioProcessInputEvent(Console, &er); - - /* Up all the character and control keys */ - er.Event.KeyEvent.bKeyDown = FALSE; - ConioProcessInputEvent(Console, &er); - } + DPRINT("Got data <%S> from clipboard\n", pszText); + PasteText(Console, pszText, wcslen(pszText)); GlobalUnlock(hData); }

1 0

01/01: [HAL] Remove misleading debug prints about USB controllers.
by Thomas Faber 08 Aug '18

08 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ed0f9ab576f094b27e11… commit 1ed0f9ab576f094b27e11ba374738ecabc00e2e6 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Aug 8 19:58:56 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Aug 8 20:08:38 2018 +0200 [HAL] Remove misleading debug prints about USB controllers. --- hal/halx86/legacy/bussupp.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index a37d875ede..4d20396560 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -1128,32 +1128,6 @@ HalpInitializePciBus(VOID) } } - /* Check if this is a USB controller */ - if ((PciData->BaseClass == PCI_CLASS_SERIAL_BUS_CTLR) && - (PciData->SubClass == PCI_SUBCLASS_SB_USB)) - { - /* Check if this is an OHCI controller */ - if (PciData->ProgIf == 0x10) - { - DbgPrint("\tDevice is an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n\n"); - continue; - } - - /* Check for Intel UHCI controller */ - if (PciData->VendorID == 0x8086) - { - DbgPrint("\tDevice is an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); - continue; - } - - /* Check for VIA UHCI controller */ - if (PciData->VendorID == 0x1106) - { - DbgPrint("\tDevice is a VIA UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); - continue; - } - } - /* Now check the registry for chipset hacks */ Status = HalpGetChipHacks(PciData->VendorID, PciData->DeviceID,

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
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 August 2018