Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/03: [ZIPFLDR] Move CConfirmReplace to a new file

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=410320df06e5b7c53ccd1… commit 410320df06e5b7c53ccd1d7c1e195b42456f1124 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Feb 27 22:18:32 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 6 23:09:35 2019 +0100 [ZIPFLDR] Move CConfirmReplace to a new file --- dll/shellext/zipfldr/CConfirmReplace.cpp | 77 ++++++++++++++++++++++++++++ dll/shellext/zipfldr/CMakeLists.txt | 1 + dll/shellext/zipfldr/CZipExtract.cpp | 86 ++------------------------------ 3 files changed, 83 insertions(+), 81 deletions(-) diff --git a/dll/shellext/zipfldr/CConfirmReplace.cpp b/dll/shellext/zipfldr/CConfirmReplace.cpp new file mode 100644 index 0000000000..93edf99570 --- /dev/null +++ b/dll/shellext/zipfldr/CConfirmReplace.cpp @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Ask the user to replace a file + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +class CConfirmReplace : public CDialogImpl<CConfirmReplace> +{ +private: + CStringA m_Filename; +public: + + CConfirmReplace(const char* filename) + { + m_Filename = filename; + } + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + CenterWindow(GetParent()); + + HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION); + SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon); + + /* Our CString does not support FormatMessage yet */ + CStringA message(MAKEINTRESOURCE(IDS_OVERWRITEFILE_TEXT)); + CHeapPtr<CHAR, CLocalAllocator> formatted; + + DWORD_PTR args[2] = + { + (DWORD_PTR)m_Filename.GetString(), + NULL + }; + + ::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args); + + ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted); + return 0; + } + + LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + EndDialog(wID); + return 0; + } + +public: + enum { IDD = IDD_CONFIRM_FILE_REPLACE }; + + BEGIN_MSG_MAP(CConfirmReplace) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDYES, OnButton) + COMMAND_ID_HANDLER(IDYESALL, OnButton) + COMMAND_ID_HANDLER(IDNO, OnButton) + COMMAND_ID_HANDLER(IDCANCEL, OnButton) + END_MSG_MAP() +}; + + +eZipConfirmResponse _CZipAskReplace(HWND hDlg, PCSTR FullPath) +{ + PCSTR Filename = PathFindFileNameA(FullPath); + CConfirmReplace confirm(Filename); + INT_PTR Result = confirm.DoModal(hDlg); + switch (Result) + { + case IDYES: return eYes; + case IDYESALL: return eYesToAll; + default: + case IDNO: return eNo; + case IDCANCEL: return eCancel; + } +} diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt index d491f1d7c2..86a1b9c289 100644 --- a/dll/shellext/zipfldr/CMakeLists.txt +++ b/dll/shellext/zipfldr/CMakeLists.txt @@ -24,6 +24,7 @@ list(APPEND SOURCE zippidl.cpp zippidl.hpp IZip.hpp + CConfirmReplace.cpp CExplorerCommand.cpp CEnumZipContents.cpp CFolderViewCB.cpp diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index baa0b308fc..a95f8ba108 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -66,82 +66,6 @@ public: return uf; } - class CConfirmReplace : public CDialogImpl<CConfirmReplace> - { - private: - CStringA m_Filename; - public: - enum DialogResult - { - Yes, - YesToAll, - No, - Cancel - }; - - static DialogResult ShowDlg(HWND hDlg, PCSTR FullPath) - { - PCSTR Filename = PathFindFileNameA(FullPath); - CConfirmReplace confirm(Filename); - INT_PTR Result = confirm.DoModal(hDlg); - switch (Result) - { - case IDYES: return Yes; - case IDYESALL: return YesToAll; - default: - case IDNO: return No; - case IDCANCEL: return Cancel; - } - } - - CConfirmReplace(const char* filename) - { - m_Filename = filename; - } - - LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - CenterWindow(GetParent()); - - HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION); - SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon); - - /* Our CString does not support FormatMessage yet */ - CStringA message(MAKEINTRESOURCE(IDS_OVERWRITEFILE_TEXT)); - CHeapPtr<CHAR, CLocalAllocator> formatted; - - DWORD_PTR args[2] = - { - (DWORD_PTR)m_Filename.GetString(), - NULL - }; - - ::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, - message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args); - - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted); - return 0; - } - - LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) - { - EndDialog(wID); - return 0; - } - - public: - enum { IDD = IDD_CONFIRM_FILE_REPLACE }; - - BEGIN_MSG_MAP(CConfirmReplace) - MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) - COMMAND_ID_HANDLER(IDYES, OnButton) - COMMAND_ID_HANDLER(IDYESALL, OnButton) - COMMAND_ID_HANDLER(IDNO, OnButton) - COMMAND_ID_HANDLER(IDCANCEL, OnButton) - END_MSG_MAP() - }; - - class CExtractSettingsPage : public CPropertyPageImpl<CExtractSettingsPage> { private: @@ -405,17 +329,17 @@ public: bool bOverwrite = bOverwriteAll; if (!bOverwriteAll) { - CConfirmReplace::DialogResult Result = CConfirmReplace::ShowDlg(hDlg, FullPath); + eZipConfirmResponse Result = _CZipAskReplace(hDlg, FullPath); switch (Result) { - case CConfirmReplace::YesToAll: + case eYesToAll: bOverwriteAll = true; - case CConfirmReplace::Yes: + case eYes: bOverwrite = true; break; - case CConfirmReplace::No: + case eNo: break; - case CConfirmReplace::Cancel: + case eCancel: unzCloseCurrentFile(uf); Close(); return false;

5 years, 9 months

[reactos] 01/01: [DRWTSN32] Print some extra exception info

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bff6dda91dbccf5c98856… commit bff6dda91dbccf5c9885626c7cf3f1ee0db77a69 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 28 23:10:43 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 6 23:04:11 2019 +0100 [DRWTSN32] Print some extra exception info --- base/applications/drwtsn32/sysinfo.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/base/applications/drwtsn32/sysinfo.cpp b/base/applications/drwtsn32/sysinfo.cpp index f52c58b2cb..84bc023a53 100644 --- a/base/applications/drwtsn32/sysinfo.cpp +++ b/base/applications/drwtsn32/sysinfo.cpp @@ -59,8 +59,20 @@ void PrintSystemInfo(FILE* output, DumpData& data) xfprintf(output, " When: %d/%d/%d @ %02d:%02d:%02d.%d" NEWLINE, LocalTime.wDay, LocalTime.wMonth, LocalTime.wYear, LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond, LocalTime.wMilliseconds); - DWORD ExceptionCode = data.ExceptionInfo.ExceptionRecord.ExceptionCode; - xfprintf(output, " Exception number: 0x%8x (%s)" NEWLINE, ExceptionCode, Exception2Str(ExceptionCode)); + + xfprintf(output, " First chance: %u" NEWLINE, data.ExceptionInfo.dwFirstChance); + EXCEPTION_RECORD& Record = data.ExceptionInfo.ExceptionRecord; + xfprintf(output, " Exception number: 0x%08x (%s)" NEWLINE, Record.ExceptionCode, Exception2Str(Record.ExceptionCode)); + xfprintf(output, " Exception flags: 0x%08x" NEWLINE, Record.ExceptionFlags); + xfprintf(output, " Exception address: %p" NEWLINE, Record.ExceptionAddress); + if (Record.NumberParameters) + { + xfprintf(output, " Exception parameters: %u" NEWLINE, Record.NumberParameters); + for (DWORD n = 0; n < std::min<DWORD>(EXCEPTION_MAXIMUM_PARAMETERS, Record.NumberParameters); ++n) + { + xfprintf(output, " Parameter %u: 0x%p" NEWLINE, n, Record.ExceptionInformation[n]); + } + } char Buffer[MAX_PATH]; DWORD count = sizeof(Buffer);

5 years, 9 months

[reactos] 01/01: [NTOS:PS] Use NULL instead of 0 in ps/kill.c

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a4c5763dac0a3c8a0d3b… commit 8a4c5763dac0a3c8a0d3b776bd5d4529b3f7bf9b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 12 15:18:53 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:49:59 2019 +0100 [NTOS:PS] Use NULL instead of 0 in ps/kill.c --- ntoskrnl/ps/kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ps/kill.c b/ntoskrnl/ps/kill.c index 5681783881..1cf6995798 100644 --- a/ntoskrnl/ps/kill.c +++ b/ntoskrnl/ps/kill.c @@ -201,7 +201,7 @@ PspReapRoutine(IN PVOID Context) /* Remove magic value, keep looping if it got changed */ } while (InterlockedCompareExchangePointer((PVOID*)&PspReaperListHead.Flink, - 0, + NULL, (PVOID)1) != (PVOID)1); }

5 years, 9 months

[reactos] 04/04: [PSDK] Use CALLBACK instead of APIENTRY

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33c6f6f4b554488bccddf… commit 33c6f6f4b554488bccddf1fae9132c3dbfe0bead Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 20 16:03:08 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:42:43 2019 +0100 [PSDK] Use CALLBACK instead of APIENTRY --- sdk/include/psdk/commdlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/commdlg.h b/sdk/include/psdk/commdlg.h index f69be04b55..e8a413cd01 100644 --- a/sdk/include/psdk/commdlg.h +++ b/sdk/include/psdk/commdlg.h @@ -226,7 +226,7 @@ extern "C" { #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0)) #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e))) -typedef UINT_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); +typedef UINT_PTR (CALLBACK *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); typedef __CDHOOKPROC LPCCHOOKPROC; typedef __CDHOOKPROC LPCFHOOKPROC; typedef __CDHOOKPROC LPFRHOOKPROC;

5 years, 9 months

[reactos] 03/04: [PSDK] Add missing D3DFORMAT enum members to d3d9types.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22bacc6e08a74bb5b2de9… commit 22bacc6e08a74bb5b2de95dbfa5301882af7b436 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 14 20:04:50 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:41:52 2019 +0100 [PSDK] Add missing D3DFORMAT enum members to d3d9types.h --- sdk/include/psdk/d3d9types.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/psdk/d3d9types.h b/sdk/include/psdk/d3d9types.h index f406cab624..b2c384437c 100644 --- a/sdk/include/psdk/d3d9types.h +++ b/sdk/include/psdk/d3d9types.h @@ -816,6 +816,11 @@ typedef enum _D3DFORMAT { D3DFMT_D32F_LOCKABLE = 82, D3DFMT_D24FS8 = 83, +#ifndef D3D_DISABLE_9EX + D3DFMT_D32_LOCKABLE = 84, + D3DFMT_S8_LOCKABLE = 85, +#endif + D3DFMT_VERTEXDATA = 100, D3DFMT_INDEX16 = 101, D3DFMT_INDEX32 = 102,

5 years, 9 months

[reactos] 02/04: [SPEC] Add missing newlines

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c25857f29103fb2539093… commit c25857f29103fb2539093ed2e4a98637e331265c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 20 15:50:01 2017 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:40:29 2019 +0100 [SPEC] Add missing newlines --- dll/cpl/appwiz/appwiz.spec | 2 +- dll/cpl/console/console.spec | 2 +- dll/cpl/input/input.spec | 2 +- dll/cpl/intl/intl.spec | 2 +- dll/cpl/joy/joy.spec | 2 +- dll/cpl/main/main.spec | 2 +- dll/cpl/ncpa/ncpa.spec | 2 +- dll/cpl/odbccp32/odbccp32.spec | 2 +- dll/cpl/powercfg/powercfg.spec | 2 +- dll/cpl/telephon/telephon.spec | 2 +- dll/cpl/timedate/timedate.spec | 2 +- dll/cpl/usrmgr/usrmgr.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/cpl/appwiz/appwiz.spec b/dll/cpl/appwiz/appwiz.spec index 7794c6cf50..6d2b9dbd3f 100644 --- a/dll/cpl/appwiz/appwiz.spec +++ b/dll/cpl/appwiz/appwiz.spec @@ -2,4 +2,4 @@ @ stdcall ConfigStartMenu(ptr long ptr ptr) @ stdcall NewLinkHere(ptr long ptr ptr) NewLinkHereA @ stdcall NewLinkHereA(ptr long ptr ptr) -@ stdcall NewLinkHereW(ptr long ptr ptr) \ No newline at end of file +@ stdcall NewLinkHereW(ptr long ptr ptr) diff --git a/dll/cpl/console/console.spec b/dll/cpl/console/console.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/console/console.spec +++ b/dll/cpl/console/console.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/input/input.spec b/dll/cpl/input/input.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/input/input.spec +++ b/dll/cpl/input/input.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/intl/intl.spec b/dll/cpl/intl/intl.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/intl/intl.spec +++ b/dll/cpl/intl/intl.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/joy/joy.spec b/dll/cpl/joy/joy.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/joy/joy.spec +++ b/dll/cpl/joy/joy.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/main/main.spec b/dll/cpl/main/main.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/main/main.spec +++ b/dll/cpl/main/main.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/ncpa/ncpa.spec b/dll/cpl/ncpa/ncpa.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/ncpa/ncpa.spec +++ b/dll/cpl/ncpa/ncpa.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/odbccp32/odbccp32.spec b/dll/cpl/odbccp32/odbccp32.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/odbccp32/odbccp32.spec +++ b/dll/cpl/odbccp32/odbccp32.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/powercfg/powercfg.spec b/dll/cpl/powercfg/powercfg.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/powercfg/powercfg.spec +++ b/dll/cpl/powercfg/powercfg.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/telephon/telephon.spec b/dll/cpl/telephon/telephon.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/telephon/telephon.spec +++ b/dll/cpl/telephon/telephon.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/timedate/timedate.spec b/dll/cpl/timedate/timedate.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/timedate/timedate.spec +++ b/dll/cpl/timedate/timedate.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/dll/cpl/usrmgr/usrmgr.spec b/dll/cpl/usrmgr/usrmgr.spec index 9c55a90e17..9e552162fb 100644 --- a/dll/cpl/usrmgr/usrmgr.spec +++ b/dll/cpl/usrmgr/usrmgr.spec @@ -1 +1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) \ No newline at end of file +@ stdcall CPlApplet(ptr long ptr ptr)

5 years, 9 months

[reactos] 01/04: [NTOS:KE] Add function comments

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=addc01d90b41245624ef3… commit addc01d90b41245624ef3d5c739ad4b79f0a3bdb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 12 15:36:11 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:39:25 2019 +0100 [NTOS:KE] Add function comments --- ntoskrnl/ke/i386/ctxswitch.S | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/ntoskrnl/ke/i386/ctxswitch.S b/ntoskrnl/ke/i386/ctxswitch.S index bbeb462d11..1151a021b1 100644 --- a/ntoskrnl/ke/i386/ctxswitch.S +++ b/ntoskrnl/ke/i386/ctxswitch.S @@ -23,6 +23,27 @@ EXTERN _KeI386FxsrPresent:DWORD /* FUNCTIONS ****************************************************************/ .code +/*++ + * KiSwapContextInternal + * + * \brief + * The KiSwapContextInternal routine switches context to another thread. + * + * BOOLEAN USERCALL KiSwapContextInternal(); + * + * Params: + * ESI - Pointer to the KTHREAD to which the caller wishes to + * switch to. + * EDI - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * \returns + * APC state. + * + * \remarks + * Absolutely all registers except ESP can be trampled here for maximum code flexibility. + * + *--*/ PUBLIC @KiSwapContextInternal@0 @KiSwapContextInternal@0: /* Build switch frame */ @@ -31,6 +52,33 @@ PUBLIC @KiSwapContextInternal@0 jmp @KiSwapContextEntry@8 +/** + * KiSwapContext + * + * \brief + * The KiSwapContext routine switches context to another thread. + * + * BOOLEAN FASTCALL + * KiSwapContext(PKTHREAD CurrentThread, PKTHREAD TargetThread); + * + * \param CurrentThread + * Pointer to the KTHREAD of the current thread. + * + * \param TargetThread + * Pointer to the KTHREAD to which the caller wishes to switch to. + * + * \returns + * The WaitStatus of the Target Thread. + * + * \remarks + * This is a wrapper around KiSwapContextInternal which will save all the + * non-volatile registers so that the Internal function can use all of + * them. It will also save the old current thread and set the new one. + * + * The calling thread does not return after KiSwapContextInternal until + * another thread switches to IT. + * + *--*/ PUBLIC @KiSwapContext@8 @KiSwapContext@8: /* Save 4 registers */

5 years, 9 months

[reactos] 01/01: [NtGDI] Fix crash and simplify code.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f35bb6e4c805404cfd880… commit f35bb6e4c805404cfd8808eca51698ee48610460 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 17:05:23 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 17:05:23 2019 -0600 [NtGDI] Fix crash and simplify code. Revert previous changes. simplify rendering check. Fix missed unlocking which caused a crash. --- win32ss/gdi/ntgdi/freetype.c | 50 +------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7aa65f2c35..197304d469 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -50,16 +50,6 @@ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; FT_Library g_FreeTypeLibrary; -typedef struct -{ - FT_Int major; - FT_Int minor; - FT_Int patch; -} FT_Version_t; -static FT_Version_t FT_Version; -static DWORD FT_SimpleVersion; -#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch)) - /* special font names */ static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett"); @@ -651,13 +641,6 @@ InitFontSupport(VOID) return FALSE; } - FT_Library_Version(g_FreeTypeLibrary,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); - - DPRINT1("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch); - FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) | - ((FT_Version.minor << 8) & 0x00ff00) | - ((FT_Version.patch ) & 0x0000ff); - IntLoadSystemFonts(); IntLoadFontSubstList(&g_FontSubstListHead); @@ -1655,40 +1638,10 @@ IntGdiCleanupPrivateFontsForProcess(VOID) } while (Entry); } -static BOOL is_hinting_enabled(void) -{ - static int enabled = -1; - - if (enabled == -1) - { - /* Use the >= 2.2.0 function if available */ - FT_TrueTypeEngineType type = FT_Get_TrueType_Engine_Type(g_FreeTypeLibrary); - enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); - - DPRINT1("hinting is %senabled\n", enabled ? "" : "NOT "); - } - return enabled; -} - -static BOOL is_subpixel_rendering_enabled( void ) -{ - static int enabled = -1; - if (enabled == -1) - { - /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ - if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1)) - enabled = TRUE; - else enabled = FALSE; - - DPRINT1("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); - } - return enabled; -} - BOOL FASTCALL IntIsFontRenderingEnabled(VOID) { - return is_hinting_enabled() && is_subpixel_rendering_enabled() && g_RenderingEnabled; + return (gpsi->BitsPixel > 8) && g_RenderingEnabled; } VOID FASTCALL @@ -5616,7 +5569,6 @@ IntExtTextOutW( String, Count, (const INT *)Dx); - DC_UnlockDc(dc); return bResult; }

5 years, 9 months

[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12cfd71058e2953ab11db… commit 12cfd71058e2953ab11dbee61fa6f2608e116ddb Merge: 3377fe184e dbb69cb2d9 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 16:03:31 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 16:03:31 2019 -0600 Merge branch 'master' of https://github.com/reactos/reactos boot/bootdata/hivedef.inf | 4 ++-- boot/bootdata/hivesft.inf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

5 years, 9 months

[reactos] 01/02: [NtGDI] Change TextOut

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3377fe184efa77e7c4971… commit 3377fe184efa77e7c4971c2ac70ed33ab12f0724 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 16:03:15 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 16:03:15 2019 -0600 [NtGDI] Change TextOut Separate TextOut for internal use. Use flTextAlign internally. Not sure why GetDeviceCap was used for determining rendering. SVN commit logs are unavailable. Include code from wine that might make more sense. --- win32ss/gdi/ntgdi/font.c | 2 +- win32ss/gdi/ntgdi/freetype.c | 125 +++++++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c index d106e57ac0..a48904cd8e 100644 --- a/win32ss/gdi/ntgdi/font.c +++ b/win32ss/gdi/ntgdi/font.c @@ -410,7 +410,7 @@ IntGetFontLanguageInfo(PDC Dc) pdcattr = Dc->pdcattr; /* This might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if ( pdcattr->lTextAlign & TA_RTLREADING ) + if ( pdcattr->flTextAlign & TA_RTLREADING ) if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) result|=GCP_REORDER; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index d76d63dfea..7aa65f2c35 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -50,6 +50,16 @@ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; FT_Library g_FreeTypeLibrary; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; +static FT_Version_t FT_Version; +static DWORD FT_SimpleVersion; +#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch)) + /* special font names */ static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett"); @@ -641,6 +651,13 @@ InitFontSupport(VOID) return FALSE; } + FT_Library_Version(g_FreeTypeLibrary,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); + + DPRINT1("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch); + FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) | + ((FT_Version.minor << 8) & 0x00ff00) | + ((FT_Version.patch ) & 0x0000ff); + IntLoadSystemFonts(); IntLoadFontSubstList(&g_FontSubstListHead); @@ -1638,17 +1655,40 @@ IntGdiCleanupPrivateFontsForProcess(VOID) } while (Entry); } -BOOL FASTCALL -IntIsFontRenderingEnabled(VOID) +static BOOL is_hinting_enabled(void) { - BOOL Ret = g_RenderingEnabled; - HDC hDC; + static int enabled = -1; - hDC = IntGetScreenDC(); - if (hDC) - Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && g_RenderingEnabled; + if (enabled == -1) + { + /* Use the >= 2.2.0 function if available */ + FT_TrueTypeEngineType type = FT_Get_TrueType_Engine_Type(g_FreeTypeLibrary); + enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); - return Ret; + DPRINT1("hinting is %senabled\n", enabled ? "" : "NOT "); + } + return enabled; +} + +static BOOL is_subpixel_rendering_enabled( void ) +{ + static int enabled = -1; + if (enabled == -1) + { + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1)) + enabled = TRUE; + else enabled = FALSE; + + DPRINT1("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); + } + return enabled; +} + +BOOL FASTCALL +IntIsFontRenderingEnabled(VOID) +{ + return is_hinting_enabled() && is_subpixel_rendering_enabled() && g_RenderingEnabled; } VOID FASTCALL @@ -5506,8 +5546,8 @@ IntNormalizeAngle(LONG nTenthAngle) BOOL APIENTRY -GreExtTextOutW( - IN HDC hDC, +IntExtTextOutW( + IN PDC dc, IN INT XStart, IN INT YStart, IN UINT fuOptions, @@ -5523,7 +5563,6 @@ GreExtTextOutW( * appropriate) */ - DC *dc; PDC_ATTR pdcattr; SURFOBJ *SurfObj; SURFACE *psurf = NULL; @@ -5565,19 +5604,8 @@ GreExtTextOutW( return FALSE; } - /* NOTE: This function locks the screen DC, so it must never be called - with a DC already locked */ Render = IntIsFontRenderingEnabled(); - // TODO: Write test-cases to exactly match real Windows in different - // bad parameters (e.g. does Windows check the DC or the RECT first?). - dc = DC_LockDc(hDC); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (PATH_IsPathOpen(dc->dclevel)) { bResult = PATH_ExtTextOut(dc, @@ -5608,7 +5636,7 @@ GreExtTextOutW( IntLPtoDP(dc, (POINT *)lprc, 2); } - if (pdcattr->lTextAlign & TA_UPDATECP) + if (pdcattr->flTextAlign & TA_UPDATECP) { Start.x = pdcattr->ptlCurrent.x; Start.y = pdcattr->ptlCurrent.y; @@ -5743,7 +5771,7 @@ GreExtTextOutW( use_kerning = FT_HAS_KERNING(face); previous = 0; if ((fuOptions & ETO_OPAQUE) || - (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT)) || + (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT)) || memcmp(&mat, &identityMat, sizeof(mat)) != 0 || plf->lfUnderline || plf->lfStrikeOut) { @@ -5813,12 +5841,12 @@ GreExtTextOutW( } // Process the X and Y alignments. - if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) + if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) { XStart64 = -DeltaX64 / 2; YStart64 = -DeltaY64 / 2; } - else if ((pdcattr->lTextAlign & TA_RIGHT) == TA_RIGHT) + else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) { XStart64 = -DeltaX64; YStart64 = -DeltaY64; @@ -5849,13 +5877,13 @@ GreExtTextOutW( /* Process the vertical alignment */ #define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) RtlZeroMemory(vecs, sizeof(vecs)); - if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) + if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE) { vecs[1].y = -FontGDI->tmAscent << 16; // upper left vecs[4].y = 0; // baseline vecs[0].y = FontGDI->tmDescent << 16; // lower left } - else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM) { vecs[1].y = -FontGDI->tmHeight << 16; // upper left vecs[4].y = -FontGDI->tmDescent << 16; // baseline @@ -6236,7 +6264,7 @@ GreExtTextOutW( MouseSafetyOnDrawEnd(dc->ppdev); } - if (pdcattr->lTextAlign & TA_UPDATECP) { + if (pdcattr->flTextAlign & TA_UPDATECP) { pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; } @@ -6252,6 +6280,45 @@ Cleanup: if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); + return bResult; +} + + +BOOL +APIENTRY +GreExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL PRECTL lprc, + IN LPCWSTR String, + IN INT Count, + IN OPTIONAL LPINT Dx, + IN DWORD dwCodePage) +{ + BOOL bResult; + DC *dc; + + // TODO: Write test-cases to exactly match real Windows in different + // bad parameters (e.g. does Windows check the DC or the RECT first?). + dc = DC_LockDc(hDC); + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + bResult = IntExtTextOutW( dc, + XStart, + YStart, + fuOptions, + lprc, + String, + Count, + Dx, + dwCodePage ); + DC_UnlockDc(dc); return bResult;

5 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
22
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 March 2019