From c9a1298e0254f7e25fd5d1982882bc798827b1b0 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Thu, 30 Nov 2023 18:27:11 +0800 Subject: [PATCH] parse SOCVendor/GPUVendor needs len param. --- inc/hgl/platform/SOC.h | 4 ++-- src/CMakeLists.txt | 1 - src/SOC/SOC.cpp | 8 ++++---- src/Win/EnumWinFonts.cpp | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/inc/hgl/platform/SOC.h b/inc/hgl/platform/SOC.h index 49d3d48..4c444df 100644 --- a/inc/hgl/platform/SOC.h +++ b/inc/hgl/platform/SOC.h @@ -41,7 +41,7 @@ namespace hgl "JLQ", }; - const SOCVendor ParseSOCVendor(const char *str); + const SOCVendor ParseSOCVendor(const char *str,const int len=0); enum class CpuArch { @@ -173,7 +173,7 @@ namespace hgl "Maleoon", }; - const SOCGPUVendor ParseSOCGPUVendor(const char *str); + const SOCGPUVendor ParseSOCGPUVendor(const char *str,const int len=0); struct SOCGPUInfo { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebd8658..82eedc9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -127,7 +127,6 @@ IF(CM_PLATFORM_SOC) SET(SOC_SOURCE ${CMPLATFORM_ROOT_INCLUDE_PATH}/hgl/platform/SOC.h SOC/SOC.cpp SOC/ARMCpuInfo.cpp - SOC/Kryo.cpp ) SOURCE_GROUP("SOC" FILES ${SOC_SOURCE}) diff --git a/src/SOC/SOC.cpp b/src/SOC/SOC.cpp index 4c9ff3d..b0565eb 100644 --- a/src/SOC/SOC.cpp +++ b/src/SOC/SOC.cpp @@ -150,11 +150,11 @@ namespace namespace hgl { - const SOCVendor ParseSOCVendor(const char *str) + const SOCVendor ParseSOCVendor(const char *str,const int len) { if(!str||!*str)return(SOCVendor::Unknow); - int index=hgl::find_str_in_array(int(SOCVendor::RANGE_SIZE),(const char **)SOCVendorName,str); + int index=hgl::find_str_in_array(int(SOCVendor::RANGE_SIZE),(const char **)SOCVendorName,str,len); if(index<0||index>=int(SOCVendor::RANGE_SIZE)) return(SOCVendor::Unknow); @@ -162,11 +162,11 @@ namespace hgl return SOCVendor(index); } - const SOCGPUVendor ParseSOCGPUVendor(const char *str) + const SOCGPUVendor ParseSOCGPUVendor(const char *str,const int len) { if(!str||!*str)return(SOCGPUVendor::Unknow); - int index=hgl::find_str_in_array(int(SOCGPUVendor::RANGE_SIZE),(const char **)SOCGPUVendorName,str); + int index=hgl::find_str_in_array(int(SOCGPUVendor::RANGE_SIZE),(const char **)SOCGPUVendorName,str,len); if(index<0||index>=int(SOCGPUVendor::RANGE_SIZE)) return(SOCGPUVendor::Unknow); diff --git a/src/Win/EnumWinFonts.cpp b/src/Win/EnumWinFonts.cpp index 740934a..23593ea 100644 --- a/src/Win/EnumWinFonts.cpp +++ b/src/Win/EnumWinFonts.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include