AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-12-28 04:01:03 +00:00
Code Issues Releases Wiki Activity

A few SDL fixes for memcpy_s usage

Browse Source
This commit is contained in:
Chuck Walbourn 2018-10-16 14:10:34 -07:00
parent b207e278e7
commit 45ebdc46c5
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DirectXTex/DirectXTexWIC.cpp
View File

@ -163,7 +163,7 @@ namespace
if (iswic2) if (iswic2)
{ {
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat96bppRGBFloat, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID));
format = DXGI_FORMAT_R32G32B32_FLOAT; format = DXGI_FORMAT_R32G32B32_FLOAT;
} }
else else
@ -172,7 +172,7 @@ namespace
#endif #endif
{ {
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat128bppRGBAFloat, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
format = DXGI_FORMAT_R32G32B32A32_FLOAT; format = DXGI_FORMAT_R32G32B32A32_FLOAT;
} }
} }
@ -183,7 +183,7 @@ namespace
if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0) if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
{ {
if (pConvert) if (pConvert)
memcpy(pConvert, &g_WICConvert[i].target, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &g_WICConvert[i].target, sizeof(GUID));
format = _WICToDXGI(g_WICConvert[i].target); format = _WICToDXGI(g_WICConvert[i].target);
assert(format != DXGI_FORMAT_UNKNOWN); assert(format != DXGI_FORMAT_UNKNOWN);
@ -202,7 +202,7 @@ namespace
{ {
format = DXGI_FORMAT_R8G8B8A8_UNORM; format = DXGI_FORMAT_R8G8B8A8_UNORM;
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat32bppRGBA, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat32bppRGBA, sizeof(GUID));
} }
break; break;
@ -211,7 +211,7 @@ namespace
{ {
format = DXGI_FORMAT_R10G10B10A2_UNORM; format = DXGI_FORMAT_R10G10B10A2_UNORM;
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat32bppRGBA1010102, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat32bppRGBA1010102, sizeof(GUID));
} }
break; break;
@ -221,7 +221,7 @@ namespace
{ {
format = DXGI_FORMAT_R8G8B8A8_UNORM; format = DXGI_FORMAT_R8G8B8A8_UNORM;
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat32bppRGBA, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat32bppRGBA, sizeof(GUID));
} }
break; break;
@ -231,7 +231,7 @@ namespace
// By default we want to promote a black & white to gresycale since R1 is not a generally supported D3D format // By default we want to promote a black & white to gresycale since R1 is not a generally supported D3D format
format = DXGI_FORMAT_R8_UNORM; format = DXGI_FORMAT_R8_UNORM;
if (pConvert) if (pConvert)
memcpy(pConvert, &GUID_WICPixelFormat8bppGray, sizeof(WICPixelFormatGUID)); memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat8bppGray, sizeof(GUID));
} }
break; break;

12
WICTextureLoader/WICTextureLoader.cpp
View File

@ -375,7 +375,7 @@ namespace
return hr; return hr;
WICPixelFormatGUID convertGUID; WICPixelFormatGUID convertGUID;
memcpy(&convertGUID, &pixelFormat, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &pixelFormat, sizeof(GUID));
size_t bpp = 0; size_t bpp = 0;
@ -387,14 +387,14 @@ namespace
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
if (g_WIC2) if (g_WIC2)
{ {
memcpy(&convertGUID, &GUID_WICPixelFormat96bppRGBFloat, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID));
format = DXGI_FORMAT_R32G32B32_FLOAT; format = DXGI_FORMAT_R32G32B32_FLOAT;
bpp = 96; bpp = 96;
} }
else else
#endif #endif
{ {
memcpy(&convertGUID, &GUID_WICPixelFormat128bppRGBAFloat, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
format = DXGI_FORMAT_R32G32B32A32_FLOAT; format = DXGI_FORMAT_R32G32B32A32_FLOAT;
bpp = 128; bpp = 128;
} }
@ -405,7 +405,7 @@ namespace
{ {
if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0) if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
{ {
memcpy(&convertGUID, &g_WICConvert[i].target, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &g_WICConvert[i].target, sizeof(GUID));
format = _WICToDXGI(g_WICConvert[i].target); format = _WICToDXGI(g_WICConvert[i].target);
assert(format != DXGI_FORMAT_UNKNOWN); assert(format != DXGI_FORMAT_UNKNOWN);
@ -432,7 +432,7 @@ namespace
if (FAILED(hr) || !(fmtSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN)) if (FAILED(hr) || !(fmtSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN))
{ {
// Use R32G32B32A32_FLOAT instead which is required for Feature Level 10.0 and up // Use R32G32B32A32_FLOAT instead which is required for Feature Level 10.0 and up
memcpy(&convertGUID, &GUID_WICPixelFormat128bppRGBAFloat, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
format = DXGI_FORMAT_R32G32B32A32_FLOAT; format = DXGI_FORMAT_R32G32B32A32_FLOAT;
bpp = 128; bpp = 128;
} }
@ -489,7 +489,7 @@ namespace
if (FAILED(hr) || !(support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) if (FAILED(hr) || !(support & D3D11_FORMAT_SUPPORT_TEXTURE2D))
{ {
// Fallback to RGBA 32-bit format which is supported by all devices // Fallback to RGBA 32-bit format which is supported by all devices
memcpy(&convertGUID, &GUID_WICPixelFormat32bppRGBA, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat32bppRGBA, sizeof(GUID));
format = DXGI_FORMAT_R8G8B8A8_UNORM; format = DXGI_FORMAT_R8G8B8A8_UNORM;
bpp = 32; bpp = 32;
} }

4
WICTextureLoader/WICTextureLoader12.cpp
View File

@ -315,7 +315,7 @@ namespace
return hr; return hr;
WICPixelFormatGUID convertGUID; WICPixelFormatGUID convertGUID;
memcpy(&convertGUID, &pixelFormat, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &pixelFormat, sizeof(GUID));
size_t bpp = 0; size_t bpp = 0;
@ -326,7 +326,7 @@ namespace
{ {
if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0) if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
{ {
memcpy(&convertGUID, &g_WICConvert[i].target, sizeof(WICPixelFormatGUID)); memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &g_WICConvert[i].target, sizeof(GUID));
format = _WICToDXGI(g_WICConvert[i].target); format = _WICToDXGI(g_WICConvert[i].target);
assert(format != DXGI_FORMAT_UNKNOWN); assert(format != DXGI_FORMAT_UNKNOWN);