Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 01/01: [WIN32SS][NTGDI] Don't use FLOAT for orientation (#1574)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fabbd7c1c162dc4dec8a2… commit fabbd7c1c162dc4dec8a23f8470cafb8871d4675 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 24 08:24:21 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 24 08:24:21 2019 +0900 [WIN32SS][NTGDI] Don't use FLOAT for orientation (#1574) Addendum to 0137096. Use 16.16 fixed-point values instead of FLOAT. CORE-15838 --- win32ss/gdi/ntgdi/freetype.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3dc10bc63fc..eef7cb3e5c0 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3469,7 +3469,6 @@ ftGdiGetGlyphOutline( FT_Bitmap ft_bitmap; FT_Error error; INT left, right, top = 0, bottom = 0; - FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; FLOAT eM11, widthRatio = 1.0; FT_Matrix transMat = identityMat; @@ -3599,14 +3598,8 @@ ftGdiGetGlyphOutline( if (orientation) { FT_Matrix rotationMat; - FT_Vector vecAngle; DPRINT("Rotation Trans!\n"); - angle = FT_FixedFromFloat((FLOAT)orientation / 10.0); - FT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; + IntEscapeMatrix(&rotationMat, orientation); FT_Matrix_Multiply(&rotationMat, &transMat); needsTransform = TRUE; }

5 years, 7 months

[reactos] 01/01: [SETUP] Fix controls position in 1st stage GUI setup for Russian translation

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b0e093aba918d6b40a9d… commit 3b0e093aba918d6b40a9d55062bed18de13a0568 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu May 23 21:47:21 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 23 23:29:46 2019 +0200 [SETUP] Fix controls position in 1st stage GUI setup for Russian translation --- base/setup/reactos/lang/ru-RU.rc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index 5077e4999aa..08c4b4373dc 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -55,23 +55,23 @@ BEGIN CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 15 - PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 122, 50, 15, WS_DISABLED - PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 176, 122, 122, 15 + PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 119, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 189, 122, 122, 15 // LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20 END -IDD_PARTITION DIALOGEX 0, 0, 145, 90 +IDD_PARTITION DIALOGEX 0, 0, 167, 90 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION CAPTION "Создать раздел на диске" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "Создать и отформатировать раздел диска", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 127, 22, 9, 13 + CONTROL "Создать и отформатировать раздел диска", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 153, 57 LTEXT "Размер:", IDC_STATIC, 13, 24, 27, 9 - EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "Гб", IDC_UNIT, 117, 24, 14, 9 - LTEXT "Файловая система:", IDC_STATIC, 13, 46, 42, 9 - CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 + EDITTEXT IDC_PARTSIZE, 80, 22, 47, 13, WS_VISIBLE | WS_TABSTOP + LTEXT "Гб", IDC_UNIT, 143, 24, 14, 9 + LTEXT "Файловая система:", IDC_STATIC, 13, 44, 65, 9 + CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 80, 42, 73, 50 PUSHBUTTON "&Есть", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Отставить", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END @@ -85,10 +85,10 @@ BEGIN EDITTEXT IDC_PATH, 10, 12, 283, 14, WS_VISIBLE CONTROL "Установка загрузчика", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 CONTROL "Установить загрузчик на диск (MBR и VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 49, 278, 11 - CONTROL "Установить загрузчик на диск (только VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Не устанавливать загрузчик", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Отмена", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + CONTROL "Установить загрузчик на диск (только VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 59, 278, 11 + CONTROL "Не устанавливать загрузчик", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 69, 278, 11 + PUSHBUTTON "&OK", IDOK, 184, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Отмена", IDCANCEL, 244, 94, 50, 15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -133,10 +133,10 @@ CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер будет перезагружен.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Вы можете извлечь установочный диск. Для перезагрузки компьютера нажмите клавишу ""Завершить"".", IDC_STATIC, 10, 176, 297, 20 + LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 115, 50, 182, 10 + LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер будет перезагружен.", IDC_STATIC, 115, 80, 182, 20 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 120, 182, 8 + LTEXT "Вы можете извлечь установочный диск. Для перезагрузки компьютера нажмите клавишу ""Завершить"".", IDC_STATIC, 115, 166, 182, 25 END STRINGTABLE

5 years, 7 months

[reactos] 01/01: [WIN32SS][NTGDI] Don't use FLOAT in IntEscapeMatrix (#1572)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01370964495a0769edafb… commit 01370964495a0769edafb76a06e7b5a81374c1fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 23 19:40:54 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 23 19:40:54 2019 +0900 [WIN32SS][NTGDI] Don't use FLOAT in IntEscapeMatrix (#1572) Appendum to 1a40284. Use a 16.16 fixed point value instead of FLOAT. CORE-15838 --- win32ss/gdi/ntgdi/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 126040c88f7..3dc10bc63fc 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -719,8 +719,8 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) { FT_Vector vecAngle; - /* Convert from angle in tenths of degrees to 'FT_Angle' degrees */ - FT_Angle angle = FT_FixedFromFloat((FLOAT)lfEscapement / 10); + /* Convert the angle in tenths of degrees into degrees as a 16.16 fixed-point value */ + FT_Angle angle = INT_TO_FIXED(lfEscapement) / 10; FT_Vector_Unit(&vecAngle, angle); pmat->xx = vecAngle.x; pmat->xy = -vecAngle.y;

5 years, 7 months

[reactos] 05/05: [NTOS:KDBG] Use CONTEXT instead of KTRAP_FRAME

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5bffe49da21f5faf2a88… commit e5bffe49da21f5faf2a88a0983ad4876d388e0ea Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu May 23 10:59:53 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu May 23 11:04:40 2019 +0200 [NTOS:KDBG] Use CONTEXT instead of KTRAP_FRAME Change KdbpTrapFrameToKdbTrapFrame to prefer CONTEXT (if available) over KTRAP_FRAME. --- ntoskrnl/include/internal/kd.h | 2 +- ntoskrnl/kdbg/kdb.c | 115 ++++++++++++++++++++++++++++++----------- ntoskrnl/kdbg/kdb.h | 11 ++-- ntoskrnl/kdbg/kdb_cli.c | 10 ++-- ntoskrnl/kdbg/kdb_expr.c | 6 +-- ntoskrnl/kdbg/kdb_symbols.c | 2 +- 6 files changed, 99 insertions(+), 47 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 162ece58f71..c336d3e0062 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -59,7 +59,7 @@ KdbSymProcessSymbols( BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PKTRAP_FRAME Context + IN PCONTEXT Context ); NTSTATUS diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index 6b9d4695581..5611de62ed6 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -134,40 +134,92 @@ KiEspToTrapFrame( static VOID KdbpTrapFrameToKdbTrapFrame( + PCONTEXT Context, PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) { - /* Copy the TrapFrame only up to Eflags and zero the rest*/ - RtlCopyMemory(&KdbTrapFrame->Tf, TrapFrame, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); - RtlZeroMemory((PVOID)((ULONG_PTR)&KdbTrapFrame->Tf + FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)), - sizeof(KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); - - KdbTrapFrame->Cr0 = __readcr0(); - KdbTrapFrame->Cr2 = __readcr2(); - KdbTrapFrame->Cr3 = __readcr3(); - KdbTrapFrame->Cr4 = __readcr4(); - - KdbTrapFrame->Tf.HardwareEsp = KiEspFromTrapFrame(TrapFrame); - KdbTrapFrame->Tf.HardwareSegSs = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); - - - /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ + if (Context) + { + KdbTrapFrame->Tf = *Context; + } + else + { + ASSERT(TrapFrame); + + RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME)); + KdbTrapFrame->Tf.Dr0 = TrapFrame->Dr0; + KdbTrapFrame->Tf.Dr1 = TrapFrame->Dr1; + KdbTrapFrame->Tf.Dr2 = TrapFrame->Dr2; + KdbTrapFrame->Tf.Dr3 = TrapFrame->Dr3; + KdbTrapFrame->Tf.Dr6 = TrapFrame->Dr6; + KdbTrapFrame->Tf.Dr7 = TrapFrame->Dr7; + KdbTrapFrame->Tf.SegGs = TrapFrame->SegGs; + KdbTrapFrame->Tf.SegEs = TrapFrame->SegEs; + KdbTrapFrame->Tf.SegDs = TrapFrame->SegDs; + KdbTrapFrame->Tf.Edx = TrapFrame->Edx; + KdbTrapFrame->Tf.Ecx = TrapFrame->Ecx; + KdbTrapFrame->Tf.Eax = TrapFrame->Eax; + KdbTrapFrame->Tf.SegFs = TrapFrame->SegFs; + KdbTrapFrame->Tf.Edi = TrapFrame->Edi; + KdbTrapFrame->Tf.Esi = TrapFrame->Esi; + KdbTrapFrame->Tf.Ebx = TrapFrame->Ebx; + KdbTrapFrame->Tf.Ebp = TrapFrame->Ebp; + KdbTrapFrame->Tf.Eip = TrapFrame->Eip; + KdbTrapFrame->Tf.SegCs = TrapFrame->SegCs; + KdbTrapFrame->Tf.EFlags = TrapFrame->EFlags; + KdbTrapFrame->Tf.Esp = KiEspFromTrapFrame(TrapFrame); + KdbTrapFrame->Tf.SegSs = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); + + KdbTrapFrame->Cr0 = __readcr0(); + KdbTrapFrame->Cr2 = __readcr2(); + KdbTrapFrame->Cr3 = __readcr3(); + KdbTrapFrame->Cr4 = __readcr4(); + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ + } } static VOID KdbpKdbTrapFrameToTrapFrame( PKDB_KTRAP_FRAME KdbTrapFrame, + PCONTEXT Context, PKTRAP_FRAME TrapFrame) { - /* Copy the TrapFrame only up to Eflags and zero the rest*/ - RtlCopyMemory(TrapFrame, &KdbTrapFrame->Tf, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); - - /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ - - KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareSegSs); - KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareEsp); - - /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ + if (Context) + { + /* Update context */ + *Context = KdbTrapFrame->Tf; + } + + if (TrapFrame) + { + TrapFrame->Dr0 = KdbTrapFrame->Tf.Dr0; + TrapFrame->Dr1 = KdbTrapFrame->Tf.Dr1; + TrapFrame->Dr2 = KdbTrapFrame->Tf.Dr2; + TrapFrame->Dr3 = KdbTrapFrame->Tf.Dr3; + TrapFrame->Dr6 = KdbTrapFrame->Tf.Dr6; + TrapFrame->Dr7 = KdbTrapFrame->Tf.Dr7; + TrapFrame->SegGs = KdbTrapFrame->Tf.SegGs; + TrapFrame->SegEs = KdbTrapFrame->Tf.SegEs; + TrapFrame->SegDs = KdbTrapFrame->Tf.SegDs; + TrapFrame->Edx = KdbTrapFrame->Tf.Edx; + TrapFrame->Ecx = KdbTrapFrame->Tf.Ecx; + TrapFrame->Eax = KdbTrapFrame->Tf.Eax; + TrapFrame->SegFs = KdbTrapFrame->Tf.SegFs; + TrapFrame->Edi = KdbTrapFrame->Tf.Edi; + TrapFrame->Esi = KdbTrapFrame->Tf.Esi; + TrapFrame->Ebx = KdbTrapFrame->Tf.Ebx; + TrapFrame->Ebp = KdbTrapFrame->Tf.Ebp; + TrapFrame->Eip = KdbTrapFrame->Tf.Eip; + TrapFrame->SegCs = KdbTrapFrame->Tf.SegCs; + TrapFrame->EFlags = KdbTrapFrame->Tf.EFlags; + KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.SegSs); + KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.Esp); + + /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ + } } static VOID @@ -185,8 +237,8 @@ KdbpKdbTrapFrameFromKernelStack( KdbTrapFrame->Tf.Esi = StackPtr[5]; KdbTrapFrame->Tf.Ebx = StackPtr[6]; KdbTrapFrame->Tf.Eip = StackPtr[7]; - KdbTrapFrame->Tf.HardwareEsp = (ULONG) (StackPtr + 8); - KdbTrapFrame->Tf.HardwareSegSs = KGDT_R0_DATA; + KdbTrapFrame->Tf.Esp = (ULONG) (StackPtr + 8); + KdbTrapFrame->Tf.SegSs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegCs = KGDT_R0_CODE; KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA; @@ -1326,9 +1378,10 @@ KdbEnterDebuggerException( IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, IN KPROCESSOR_MODE PreviousMode, IN PCONTEXT Context, - IN OUT PKTRAP_FRAME TrapFrame, + IN OUT PKTRAP_FRAME InitialTrapFrame, IN BOOLEAN FirstChance) { + PKTRAP_FRAME TrapFrame = InitialTrapFrame; KDB_ENTER_CONDITION EnterCondition; KD_CONTINUE_TYPE ContinueType = kdHandleException; PKDB_BREAKPOINT BreakPoint; @@ -1447,7 +1500,7 @@ KdbEnterDebuggerException( if (BreakPoint->Condition) { /* Setup the KDB trap frame */ - KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); + KdbpTrapFrameToKdbTrapFrame(Context, InitialTrapFrame, &KdbTrapFrame); ull = 0; if (!KdbpRpnEvaluateParsedExpression(BreakPoint->Condition, &KdbTrapFrame, &ull, NULL, NULL)) @@ -1608,7 +1661,7 @@ KdbEnterDebuggerException( KdbCurrentTrapFrame = &KdbTrapFrame; /* Setup the KDB trap frame */ - KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); + KdbpTrapFrameToKdbTrapFrame(Context, InitialTrapFrame, &KdbTrapFrame); /* Enter critical section */ OldEflags = __readeflags(); @@ -1655,8 +1708,8 @@ KdbEnterDebuggerException( KeUnstackDetachProcess(&KdbApcState); } - /* Update the exception TrapFrame */ - KdbpKdbTrapFrameToTrapFrame(&KdbTrapFrame, TrapFrame); + /* Update the exception Context/TrapFrame */ + KdbpKdbTrapFrameToTrapFrame(&KdbTrapFrame, Context, InitialTrapFrame); /* Decrement the entry count */ InterlockedDecrement(&KdbEntryCount); diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index b6419079e61..f87381a9fa2 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -12,12 +12,11 @@ /* from kdb.c */ typedef struct _KDB_KTRAP_FRAME { - KTRAP_FRAME Tf; - ULONG Cr0; - ULONG Cr1; /* reserved/unused */ - ULONG Cr2; - ULONG Cr3; - ULONG Cr4; + CONTEXT Tf; + ULONG Cr0; + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; } KDB_KTRAP_FRAME, *PKDB_KTRAP_FRAME; typedef enum _KDB_BREAKPOINT_TYPE diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 4009e0a7319..32d2fe553a5 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -849,7 +849,7 @@ KdbpCmdRegs( ULONG Argc, PCHAR Argv[]) { - PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf; + PCONTEXT Tf = &KdbCurrentTrapFrame->Tf; INT i; static const PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5", " ZF", " SF", " TF", " IF", " DF", " OF", @@ -868,7 +868,7 @@ KdbpCmdRegs( " ESI 0x%08x EDI 0x%08x\n" " EBP 0x%08x\n", Tf->SegCs & 0xFFFF, Tf->Eip, - Tf->HardwareSegSs, Tf->HardwareEsp, + Tf->SegSs, Tf->Esp, Tf->Eax, Tf->Ebx, Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, @@ -966,7 +966,7 @@ KdbpCmdRegs( KdbpPrint("GS 0x%04x Index 0x%04x %cDT RPL%d\n", Tf->SegGs, Tf->SegGs >> 3, (Tf->SegGs & (1 << 2)) ? 'L' : 'G', Tf->SegGs & 3); KdbpPrint("SS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->HardwareSegSs, Tf->HardwareSegSs >> 3, (Tf->HardwareSegSs & (1 << 2)) ? 'L' : 'G', Tf->HardwareSegSs & 3); + Tf->SegSs, Tf->SegSs >> 3, (Tf->SegSs & (1 << 2)) ? 'L' : 'G', Tf->SegSs & 3); } else /* dregs */ { @@ -986,7 +986,7 @@ KdbpCmdRegs( static BOOLEAN KdbpTrapFrameFromPrevTss( - PKTRAP_FRAME TrapFrame) + PCONTEXT TrapFrame) { ULONG_PTR Eip, Ebp; KDESCRIPTOR Gdtr; @@ -1075,7 +1075,7 @@ KdbpCmdBackTrace( ULONGLONG Result = 0; ULONG_PTR Frame = KdbCurrentTrapFrame->Tf.Ebp; ULONG_PTR Address; - KTRAP_FRAME TrapFrame; + CONTEXT TrapFrame; if (Argc >= 2) { diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index de856536e08..9e3d15c6b20 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -106,7 +106,7 @@ RpnStack = static const struct { PCHAR Name; - UCHAR Offset; + ULONG Offset; UCHAR Size; } RegisterToTrapFrame[] = @@ -119,14 +119,14 @@ RegisterToTrapFrame[] = {"edx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edx)}, {"esi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esi)}, {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edi)}, - {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareEsp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareEsp)}, + {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esp)}, {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebp)}, {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegCs), 2 }, /* Use only the lower 2 bytes */ {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegDs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegDs)}, {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegEs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegEs)}, {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegFs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegFs)}, {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegGs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegGs)}, - {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareSegSs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareSegSs)}, + {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegSs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegSs)}, {"dr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr0)}, {"dr1", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr1), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr1)}, {"dr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr2)}, diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 1b2d8f695c8..07f55eba1ca 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -147,7 +147,7 @@ KdbpSymUnicodeToAnsi(IN PUNICODE_STRING Unicode, BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PKTRAP_FRAME Context) + IN PCONTEXT Context) { PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG_PTR RelativeAddress;

5 years, 7 months

[reactos] 04/05: [NTOS:KD] Remove some _WINDK_ usages

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7ec84eea0790899ca34b… commit f7ec84eea0790899ca34b79f2ec5a308204254ac Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 20 12:17:22 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu May 23 11:04:40 2019 +0200 [NTOS:KD] Remove some _WINDK_ usages - Always include kd64.h - Change KdpPrompt() prototype to be compatible between KDBG and _WINDK_ - Rename KdComponentTable to KdpComponentTable to prevent a conflict - Add some functions stubs and global variables --- ntoskrnl/ex/init.c | 2 -- ntoskrnl/include/internal/kd.h | 10 ---------- ntoskrnl/include/internal/ntoskrnl.h | 4 ---- ntoskrnl/kd/kdmain.c | 35 ++++++++++++++++++++++++++--------- ntoskrnl/kdbg/kdb.h | 1 + ntoskrnl/kdbg/kdb_cli.c | 6 ++++-- ntoskrnl/ke/bug.c | 4 ---- ntoskrnl/ps/psmgr.c | 2 -- 8 files changed, 31 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 1e31003af6b..39869a5b061 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1792,10 +1792,8 @@ Phase1InitializationDiscard(IN PVOID Context) /* Update progress bar */ InbvUpdateProgressBar(25); -#ifdef _WINKD_ /* No KD Time Slip is pending */ KdpTimeSlipPending = 0; -#endif /* Initialize in-place execution support */ XIPInit(LoaderBlock); diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 3e57fc2c30a..162ece58f71 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -189,16 +189,6 @@ KdpPrintString( _In_ ULONG Length, _In_ KPROCESSOR_MODE PreviousMode); -ULONG -NTAPI -KdpPrompt( - _In_reads_bytes_(InStringLength) PCHAR UnsafeInString, - _In_ USHORT InStringLength, - _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString, - _In_ USHORT OutStringLength, - _In_ KPROCESSOR_MODE PreviousMode -); - BOOLEAN NTAPI KdpDetectConflicts(PCM_RESOURCE_LIST DriverList); diff --git a/ntoskrnl/include/internal/ntoskrnl.h b/ntoskrnl/include/internal/ntoskrnl.h index d0dfe4dbde1..b3dd74f196b 100644 --- a/ntoskrnl/include/internal/ntoskrnl.h +++ b/ntoskrnl/include/internal/ntoskrnl.h @@ -61,11 +61,7 @@ #include "po.h" #include "se.h" #include "ldr.h" -#ifndef _WINKD_ -#include "kd.h" -#else #include "kd64.h" -#endif #include "fsrtl.h" #include "lpc.h" #include "rtl.h" diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index d613848bef2..fdbeeea4deb 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -21,6 +21,8 @@ BOOLEAN KdPitchDebugger = TRUE; BOOLEAN KdIgnoreUmExceptions = FALSE; KD_CONTEXT KdpContext; ULONG Kd_WIN2000_Mask; +LONG KdpTimeSlipPending; +KDDEBUGGER_DATA64 KdDebuggerDataBlock; VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); typedef struct @@ -29,7 +31,7 @@ typedef struct ULONG Level; } KD_COMPONENT_DATA; #define MAX_KD_COMPONENT_TABLE_ENTRIES 128 -KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; +KD_COMPONENT_DATA KdpComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; ULONG KdComponentTableEntries = 0; ULONG Kd_DEFAULT_MASK = 1 << DPFLTR_ERROR_LEVEL; @@ -204,7 +206,9 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, ExceptionInformation[2], OutString, OutStringLength, - PreviousMode); + PreviousMode, + TrapFrame, + ExceptionFrame); /* Return the number of characters that we received */ Context->Eax = ReturnValue; @@ -264,6 +268,12 @@ KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord, /* PUBLIC FUNCTIONS *********************************************************/ +VOID +NTAPI +KdUpdateDataBlock(VOID) +{ +} + /* * @implemented */ @@ -302,6 +312,13 @@ KdDisableDebugger(VOID) return STATUS_SUCCESS; } +NTSTATUS +NTAPI +KdEnableDebuggerWithLock(IN BOOLEAN NeedLock) +{ + return STATUS_ACCESS_DENIED; +} + /* * @implemented */ @@ -383,10 +400,10 @@ NtQueryDebugFilterState(IN ULONG ComponentId, for (i = 0; i < KdComponentTableEntries; i++) { /* Check if it is the right component */ - if (ComponentId == KdComponentTable[i].ComponentId) + if (ComponentId == KdpComponentTable[i].ComponentId) { /* Check if mask are matching */ - return (Level & KdComponentTable[i].Level) ? TRUE : FALSE; + return (Level & KdpComponentTable[i].Level) ? TRUE : FALSE; } } } @@ -423,7 +440,7 @@ NtSetDebugFilterState(IN ULONG ComponentId, /* Search for an existing entry */ for (i = 0; i < KdComponentTableEntries; i++ ) { - if (ComponentId == KdComponentTable[i].ComponentId) + if (ComponentId == KdpComponentTable[i].ComponentId) break; } @@ -436,15 +453,15 @@ NtSetDebugFilterState(IN ULONG ComponentId, /* Add a new entry */ ++KdComponentTableEntries; - KdComponentTable[i].ComponentId = ComponentId; - KdComponentTable[i].Level = Kd_DEFAULT_MASK; + KdpComponentTable[i].ComponentId = ComponentId; + KdpComponentTable[i].Level = Kd_DEFAULT_MASK; } /* Update entry table */ if (State) - KdComponentTable[i].Level |= Level; + KdpComponentTable[i].Level |= Level; else - KdComponentTable[i].Level &= ~Level; + KdpComponentTable[i].Level &= ~Level; return STATUS_SUCCESS; } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 65bedf227af..b6419079e61 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -1,4 +1,5 @@ #pragma once +#include "internal/kd.h" /* DEFINES *******************************************************************/ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 5ef7f616af0..4009e0a7319 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3672,14 +3672,16 @@ KdpSerialDebugPrint( STRING KdpPromptString = RTL_CONSTANT_STRING("kdb:> "); extern KSPIN_LOCK KdpSerialSpinLock; -ULONG +USHORT NTAPI KdpPrompt( _In_reads_bytes_(InStringLength) PCHAR UnsafeInString, _In_ USHORT InStringLength, _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString, _In_ USHORT OutStringLength, - _In_ KPROCESSOR_MODE PreviousMode) + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame) { USHORT i; CHAR Response; diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index a92acb1baba..3208e6ba687 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -1062,9 +1062,7 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, } /* Check if we need to save the context for KD */ -#ifdef _WINKD_ if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG_PTR)&Context; -#endif /* Check if a debugger is connected */ if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) @@ -1147,9 +1145,7 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) { /* Enable it */ -#ifdef _WINKD_ KdEnableDebuggerWithLock(FALSE); -#endif } else { diff --git a/ntoskrnl/ps/psmgr.c b/ntoskrnl/ps/psmgr.c index 317861c1288..4b70413653a 100644 --- a/ntoskrnl/ps/psmgr.c +++ b/ntoskrnl/ps/psmgr.c @@ -383,10 +383,8 @@ PspInitializeSystemDll(VOID) KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 8, 0, 0); } -#ifdef _WINKD_ /* Let KD know we are done */ KdUpdateDataBlock(); -#endif /* Return status */ return Status;

5 years, 7 months

[reactos] 03/05: [NTOS:KD] Remove dead code

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5e962ff2ed9d701cc284… commit f5e962ff2ed9d701cc28431eb9ddad2811e9821b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 20 13:20:31 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu May 23 11:04:40 2019 +0200 [NTOS:KD] Remove dead code --- ntoskrnl/include/internal/kd.h | 8 -------- ntoskrnl/kd/kdmain.c | 31 ------------------------------- 2 files changed, 39 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 4354ba3066e..3e57fc2c30a 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -182,14 +182,6 @@ KdpKdbgInit( /* KD ROUTINES ***************************************************************/ -BOOLEAN -NTAPI -KdpCallGdb( - IN PKTRAP_FRAME TrapFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context -); - ULONG NTAPI KdpPrintString( diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 17c734dff09..d613848bef2 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -252,37 +252,6 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, return TRUE; } -BOOLEAN -NTAPI -KdpCallGdb(IN PKTRAP_FRAME TrapFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - KD_CONTINUE_TYPE Return = kdDoNotHandleException; - - /* Get out of here if the Debugger isn't connected */ - if (KdDebuggerNotPresent) return FALSE; - - /* FIXME: - * Right now, the GDB wrapper seems to handle exceptions differntly - * from KDGB and both are called at different times, while the GDB - * one is only called once and that's it. I don't really have the knowledge - * to fix the GDB stub, so until then, we'll be using this hack - */ - if (WrapperInitRoutine) - { - Return = WrapperTable.KdpExceptionRoutine(ExceptionRecord, - Context, - TrapFrame); - } - - /* Debugger didn't handle it, please handle! */ - if (Return == kdHandleException) return FALSE; - - /* Debugger handled it */ - return TRUE; -} - BOOLEAN NTAPI KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord,

5 years, 7 months

[reactos] 02/05: [NTOS:KD] Remove CTRL+C pending support left over, likely broken by 5a6adb4f13abeafcc842e880384a16b05b797ffb

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95d5b39b57da8511c304a… commit 95d5b39b57da8511c304af6d3259a24d3c7369e0 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 20 13:35:08 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu May 23 11:04:40 2019 +0200 [NTOS:KD] Remove CTRL+C pending support left over, likely broken by 5a6adb4f13abeafcc842e880384a16b05b797ffb --- ntoskrnl/kd/kdmain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index d219f1bb04a..17c734dff09 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -17,7 +17,6 @@ BOOLEAN KdDebuggerEnabled = FALSE; BOOLEAN KdEnteredDebugger = FALSE; BOOLEAN KdDebuggerNotPresent = TRUE; BOOLEAN KdBreakAfterSymbolLoad = FALSE; -BOOLEAN KdpBreakPending = FALSE; BOOLEAN KdPitchDebugger = TRUE; BOOLEAN KdIgnoreUmExceptions = FALSE; KD_CONTEXT KdpContext; @@ -366,7 +365,7 @@ BOOLEAN NTAPI KdPollBreakIn(VOID) { - return KdpBreakPending; + return FALSE; } /*

5 years, 7 months

[reactos] 01/05: [NTOS:KD] Remove /BREAK support left over, likely broken by 819a0ed90a7c1a5dedff08aa3b3c5501dc58c632

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6cec6d5cb989484537b8… commit f6cec6d5cb989484537b8afe737bd1315e25d3c9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri May 17 14:18:52 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu May 23 11:04:40 2019 +0200 [NTOS:KD] Remove /BREAK support left over, likely broken by 819a0ed90a7c1a5dedff08aa3b3c5501dc58c632 --- ntoskrnl/include/internal/kd.h | 3 --- ntoskrnl/kd/kdinit.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index daad7538e18..4354ba3066e 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -347,9 +347,6 @@ extern KD_DISPATCH_TABLE WrapperTable; /* The KD Native Provider List */ extern LIST_ENTRY KdProviders; -/* Whether to enter KDB as early as possible or not */ -extern BOOLEAN KdpEarlyBreak; - extern PKDEBUG_ROUTINE KiDebugRoutine; extern KD_CONTEXT KdpContext; extern ULONG Kd_WIN2000_Mask; diff --git a/ntoskrnl/kd/kdinit.c b/ntoskrnl/kd/kdinit.c index b5ec7f4e809..3a7071d5cb3 100644 --- a/ntoskrnl/kd/kdinit.c +++ b/ntoskrnl/kd/kdinit.c @@ -26,7 +26,6 @@ KDP_DEBUG_MODE KdpDebugMode; #endif PKDP_INIT_ROUTINE WrapperInitRoutine; KD_DISPATCH_TABLE WrapperTable; -BOOLEAN KdpEarlyBreak = FALSE; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; @@ -188,7 +187,6 @@ KdInitSystem(ULONG BootPhase, _strupr(CommandLine); /* XXX Check for settings that we support */ - if (strstr(CommandLine, "BREAK")) KdpEarlyBreak = TRUE; if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; else if (strstr(CommandLine, "DEBUG"))

5 years, 7 months

[reactos] 01/01: [WIN32SS][NTUSER] Fix msvc-x64 build

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba1a2f7423c0d6dbc8b3… commit cba1a2f7423c0d6dbc8b3018a204d9bd266a4660 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 23 08:32:41 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu May 23 08:32:41 2019 +0900 [WIN32SS][NTUSER] Fix msvc-x64 build --- win32ss/user/ntuser/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 25b1f947014..19264d613b0 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -786,7 +786,7 @@ UserChangeDisplaySettings( /* Shall we apply the settings? */ if (!(flags & CDS_NORESET)) { - ULONG ulResult; + ULONG_PTR ulResult; PVOID pvOldCursor; TEXTMETRICW tmw;

5 years, 7 months

[reactos] 01/01: [FREETYPE] Fix regression CORE-16041 Font/Text Rotation Angles Too Small

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a402847ed307af7e72fc… commit 1a402847ed307af7e72fcd9e15bb970b4285690d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed May 22 23:14:42 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed May 22 23:15:09 2019 +0200 [FREETYPE] Fix regression CORE-16041 Font/Text Rotation Angles Too Small Thanks to the patches author Doug Lyons and the reviewers hbelusca and Katayama Hirofumi MZ. The regression was introduced by 0.4.13-dev-24-g 61475b9fede67b4eb2236c4ff9a495052c66cda9 --- win32ss/gdi/ntgdi/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index f73c1c09022..126040c88f7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -719,7 +719,8 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) { FT_Vector vecAngle; - FT_Angle angle = FT_FixedFromFloat((FLOAT)(lfEscapement * M_PI) / (FLOAT)(180 * 10)); + /* Convert from angle in tenths of degrees to 'FT_Angle' degrees */ + FT_Angle angle = FT_FixedFromFloat((FLOAT)lfEscapement / 10); FT_Vector_Unit(&vecAngle, angle); pmat->xx = vecAngle.x; pmat->xy = -vecAngle.y;

5 years, 7 months

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