From c69eb5f11af8916468fb266056ddd955ad93c8e0 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Mon, 15 Jul 2024 22:40:04 +0700 Subject: [PATCH] GUI: Increase buffer size of section names to 64 (#3461) --- ep_gui/GUI.c | 2 +- ep_gui/GUI.h | 196 +++++++++++++++++++++++++-------------------------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/ep_gui/GUI.c b/ep_gui/GUI.c index daca2de85..9220cba54 100644 --- a/ep_gui/GUI.c +++ b/ep_gui/GUI.c @@ -1284,7 +1284,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt) GUI_SubstituteLocalizedString(text, MAX_LINE_LENGTH); if (_this->sectionNames[currentSection + 1][0] == 0) { - wcscpy_s(_this->sectionNames[currentSection + 1], 32, text); + wcscpy_s(_this->sectionNames[currentSection + 1], 64, text); } if (hDC) { diff --git a/ep_gui/GUI.h b/ep_gui/GUI.h index e1e76c608..659c72f26 100644 --- a/ep_gui/GUI.h +++ b/ep_gui/GUI.h @@ -1,98 +1,98 @@ -#ifndef _H_GUI_H_ -#define _H_GUI_H_ -#define _CRTDBG_MAP_ALLOC -#include -#include -#pragma comment(linker,"\"/manifestdependency:type='win32' \ -name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \ -processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -#include -#pragma comment(lib, "Version.lib") -#include -#pragma comment(lib, "Shlwapi.lib") -#include -#include -#include -#pragma comment(lib, "Shcore.lib") -#include -#include -#include -#pragma comment(lib, "UxTheme.lib") -#include -#pragma comment(lib, "Dwmapi.lib") -#include "resources/resource.h" -#include "../ExplorerPatcher/getline.h" -#include "../ExplorerPatcher/fmemopen.h" -#include "../ExplorerPatcher/Localization.h" -#include "../ExplorerPatcher/utility.h" -#include "../ep_weather_host/ep_weather.h" -#include "../ep_weather_host/ep_weather_host_h.h" - -#define MAX_LINE_LENGTH 2000 -extern HMODULE hModule; - -#define GUI_POSITION_X CW_USEDEFAULT -#define GUI_POSITION_Y CW_USEDEFAULT -#define GUI_POSITION_WIDTH 367 -#define GUI_POSITION_HEIGHT 316 -#define GUI_WINDOWSWITCHER_THEME_CLASS "ControlPanelStyle" -#define GUI_CAPTION_FONT_SIZE -12 -#define GUI_SECTION_FONT_SIZE -12 -#define GUI_SECTION_HEIGHT 32 -#define GUI_TITLE_FONT_SIZE -12 -#define GUI_LINE_HEIGHT 26 -#define GUI_CAPTION_LINE_HEIGHT_DEFAULT 42 -#define GUI_TEXTCOLOR RGB(0, 0, 0) -#define GUI_TEXTCOLOR_SELECTED RGB(255, 0, 0) -#define GUI_TEXTCOLOR_DARK RGB(240, 240, 240) -#define GUI_TEXTCOLOR_SELECTED_DARK RGB(255, 150, 150) -#define GUI_MAX_TABORDER 9999 -#define GUI_PADDING 5 -#define GUI_PADDING_LEFT GUI_PADDING * 3 -#define GUI_SIDEBAR_WIDTH 150 // 110 -#define GUI_PADDING_RIGHT GUI_PADDING * 3 -#define GUI_PADDING_TOP GUI_PADDING -#define GUI_PADDING_BOTTOM GUI_PADDING -#define GUI_STATUS_PADDING 10 - -#define GUI_TIMER_READ_HELP 1 -#define GUI_TIMER_READ_HELP_TIMEOUT 1000 -#define GUI_TIMER_READ_REPEAT_SELECTION 2 -#define GUI_TIMER_READ_REPEAT_SELECTION_TIMEOUT 1000 -#define GUI_TIMER_REFRESH_FOR_PEOPLEBAND 2 -#define GUI_TIMER_REFRESH_FOR_PEOPLEBAND_TIMEOUT 1000 -typedef struct _GUI -{ - POINT location; - SIZE size; - RECT padding; - UINT sidebarWidth; - HBRUSH hBackgroundBrush; - HTHEME hTheme; - POINT dpi; - MARGINS extent; - UINT tabOrder; - DWORD bCalcExtent; - SIZE_T section; - DWORD dwStatusbarY; - HICON hIcon; - RECT border_thickness; - UINT GUI_CAPTION_LINE_HEIGHT; - long long LeftClickTime; - long long LastClickTime; - HMODULE hExplorerFrame; - void* pAccPropServices; - HWND hAccLabel; - BOOL bShouldAnnounceSelected; - WCHAR sectionNames[20][32]; - BOOL bRebuildIfTabOrderIsEmpty; - int dwPageLocation; - DWORD last_section; -} GUI; - -static BOOL GUI_Build(HDC hDC, HWND hWnd); - -static LRESULT CALLBACK GUI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - -__declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow); -#endif +#ifndef _H_GUI_H_ +#define _H_GUI_H_ +#define _CRTDBG_MAP_ALLOC +#include +#include +#pragma comment(linker,"\"/manifestdependency:type='win32' \ +name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \ +processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +#include +#pragma comment(lib, "Version.lib") +#include +#pragma comment(lib, "Shlwapi.lib") +#include +#include +#include +#pragma comment(lib, "Shcore.lib") +#include +#include +#include +#pragma comment(lib, "UxTheme.lib") +#include +#pragma comment(lib, "Dwmapi.lib") +#include "resources/resource.h" +#include "../ExplorerPatcher/getline.h" +#include "../ExplorerPatcher/fmemopen.h" +#include "../ExplorerPatcher/Localization.h" +#include "../ExplorerPatcher/utility.h" +#include "../ep_weather_host/ep_weather.h" +#include "../ep_weather_host/ep_weather_host_h.h" + +#define MAX_LINE_LENGTH 2000 +extern HMODULE hModule; + +#define GUI_POSITION_X CW_USEDEFAULT +#define GUI_POSITION_Y CW_USEDEFAULT +#define GUI_POSITION_WIDTH 367 +#define GUI_POSITION_HEIGHT 316 +#define GUI_WINDOWSWITCHER_THEME_CLASS "ControlPanelStyle" +#define GUI_CAPTION_FONT_SIZE -12 +#define GUI_SECTION_FONT_SIZE -12 +#define GUI_SECTION_HEIGHT 32 +#define GUI_TITLE_FONT_SIZE -12 +#define GUI_LINE_HEIGHT 26 +#define GUI_CAPTION_LINE_HEIGHT_DEFAULT 42 +#define GUI_TEXTCOLOR RGB(0, 0, 0) +#define GUI_TEXTCOLOR_SELECTED RGB(255, 0, 0) +#define GUI_TEXTCOLOR_DARK RGB(240, 240, 240) +#define GUI_TEXTCOLOR_SELECTED_DARK RGB(255, 150, 150) +#define GUI_MAX_TABORDER 9999 +#define GUI_PADDING 5 +#define GUI_PADDING_LEFT GUI_PADDING * 3 +#define GUI_SIDEBAR_WIDTH 150 // 110 +#define GUI_PADDING_RIGHT GUI_PADDING * 3 +#define GUI_PADDING_TOP GUI_PADDING +#define GUI_PADDING_BOTTOM GUI_PADDING +#define GUI_STATUS_PADDING 10 + +#define GUI_TIMER_READ_HELP 1 +#define GUI_TIMER_READ_HELP_TIMEOUT 1000 +#define GUI_TIMER_READ_REPEAT_SELECTION 2 +#define GUI_TIMER_READ_REPEAT_SELECTION_TIMEOUT 1000 +#define GUI_TIMER_REFRESH_FOR_PEOPLEBAND 2 +#define GUI_TIMER_REFRESH_FOR_PEOPLEBAND_TIMEOUT 1000 +typedef struct _GUI +{ + POINT location; + SIZE size; + RECT padding; + UINT sidebarWidth; + HBRUSH hBackgroundBrush; + HTHEME hTheme; + POINT dpi; + MARGINS extent; + UINT tabOrder; + DWORD bCalcExtent; + SIZE_T section; + DWORD dwStatusbarY; + HICON hIcon; + RECT border_thickness; + UINT GUI_CAPTION_LINE_HEIGHT; + long long LeftClickTime; + long long LastClickTime; + HMODULE hExplorerFrame; + void* pAccPropServices; + HWND hAccLabel; + BOOL bShouldAnnounceSelected; + WCHAR sectionNames[20][64]; + BOOL bRebuildIfTabOrderIsEmpty; + int dwPageLocation; + DWORD last_section; +} GUI; + +static BOOL GUI_Build(HDC hDC, HWND hWnd); + +static LRESULT CALLBACK GUI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +__declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow); +#endif