mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: remove last (hidden) users of memset

pull/14250/head
Rubidium 2025-05-10 23:16:29 +02:00 committed by rubidium42
parent c037722cb5
commit f2b48bad79
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/windows/string_uniscribe.cpp
View File

@ -143,8 +143,7 @@ static HFONT HFontFromFont(Font *font)
{ {
if (font->fc->GetOSHandle() != nullptr) return CreateFontIndirect(reinterpret_cast<PLOGFONT>(const_cast<void *>(font->fc->GetOSHandle()))); if (font->fc->GetOSHandle() != nullptr) return CreateFontIndirect(reinterpret_cast<PLOGFONT>(const_cast<void *>(font->fc->GetOSHandle())));
LOGFONT logfont; LOGFONT logfont{};
ZeroMemory(&logfont, sizeof(LOGFONT));
logfont.lfHeight = font->fc->GetHeight(); logfont.lfHeight = font->fc->GetHeight();
logfont.lfWeight = FW_NORMAL; logfont.lfWeight = FW_NORMAL;
logfont.lfCharSet = DEFAULT_CHARSET; logfont.lfCharSet = DEFAULT_CHARSET;
@ -249,12 +248,10 @@ static bool UniscribeShapeRun(const UniscribeParagraphLayoutFactory::CharType *b
static std::vector<SCRIPT_ITEM> UniscribeItemizeString(UniscribeParagraphLayoutFactory::CharType *buff, int32_t length) static std::vector<SCRIPT_ITEM> UniscribeItemizeString(UniscribeParagraphLayoutFactory::CharType *buff, int32_t length)
{ {
/* Itemize text. */ /* Itemize text. */
SCRIPT_CONTROL control; SCRIPT_CONTROL control{};
ZeroMemory(&control, sizeof(SCRIPT_CONTROL));
control.uDefaultLanguage = _current_language->winlangid; control.uDefaultLanguage = _current_language->winlangid;
SCRIPT_STATE state; SCRIPT_STATE state{};
ZeroMemory(&state, sizeof(SCRIPT_STATE));
state.uBidiLevel = _current_text_dir == TD_RTL ? 1 : 0; state.uBidiLevel = _current_text_dir == TD_RTL ? 1 : 0;
std::vector<SCRIPT_ITEM> items(16); std::vector<SCRIPT_ITEM> items(16);

1
src/safeguards.h
View File

@ -49,6 +49,7 @@
#define memcmp SAFEGUARD_DO_NOT_USE_THIS_METHOD #define memcmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
#define memcpy SAFEGUARD_DO_NOT_USE_THIS_METHOD #define memcpy SAFEGUARD_DO_NOT_USE_THIS_METHOD
#define memset SAFEGUARD_DO_NOT_USE_THIS_METHOD
/* Use fgets instead. */ /* Use fgets instead. */
#define gets SAFEGUARD_DO_NOT_USE_THIS_METHOD #define gets SAFEGUARD_DO_NOT_USE_THIS_METHOD