Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Code review feedback

Browse Source
This commit is contained in:
Chuck Walbourn
2016-09-01 16:54:42 -07:00
parent 25dbe0e547
commit 0bbee8c588
5 changed files with 67 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ScreenGrab/ScreenGrab.cpp
View File

@@ -701,15 +701,15 @@ namespace
IWICImagingFactory* _GetWIC()
{
static IWICImagingFactory* s_Factory = nullptr;
static ComPtr<IWICImagingFactory> s_Factory;
if ( s_Factory )
return s_Factory;
return s_Factory.Get();
static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&s_initOnce,
[](PINIT_ONCE, PVOID, PVOID *) -> BOOL
[](PINIT_ONCE, PVOID, PVOID *factory) -> BOOL
{
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
HRESULT hr = CoCreateInstance(
@@ -717,13 +717,14 @@ namespace
nullptr,
CLSCTX_INPROC_SERVER,
__uuidof(IWICImagingFactory2),
(LPVOID*)&s_Factory
factory
);
if ( SUCCEEDED(hr) )
{
// WIC2 is available on Windows 10, Windows 8.x, and Windows 7 SP1 with KB 2670838 installed
g_WIC2 = true;
return TRUE;
}
else
{
@@ -731,33 +732,22 @@ namespace
CLSID_WICImagingFactory1,
nullptr,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&s_Factory)
__uuidof(IWICImagingFactory),
factory
);
if ( FAILED(hr) )
{
s_Factory = nullptr;
return FALSE;
}
return SUCCEEDED(hr) ? TRUE : FALSE;
}
#else
HRESULT hr = CoCreateInstance(
return SUCCEEDED( CoCreateInstance(
CLSID_WICImagingFactory,
nullptr,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&s_Factory)
);
if ( FAILED(hr) )
{
s_Factory = nullptr;
return FALSE;
}
__uuidof(IWICImagingFactory),
factory) ) ? TRUE : FALSE;
#endif
return TRUE;
}, nullptr, nullptr);
}, nullptr, reinterpret_cast<LPVOID*>(s_Factory.GetAddressOf()));
return s_Factory;
return s_Factory.Get();
}
} // anonymous namespace

25
ScreenGrab/ScreenGrab12.cpp
View File

@@ -781,30 +781,25 @@ namespace
IWICImagingFactory2* _GetWIC()
{
static IWICImagingFactory2* s_Factory = nullptr;
static ComPtr<IWICImagingFactory2> s_Factory;
if (s_Factory)
return s_Factory;
if ( s_Factory )
return s_Factory.Get();
static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&s_initOnce,
[](PINIT_ONCE, PVOID, PVOID *) -> BOOL
(void)InitOnceExecuteOnce(&s_initOnce,
[](PINIT_ONCE, PVOID, PVOID *factory) -> BOOL
{
HRESULT hr = CoCreateInstance(
return SUCCEEDED( CoCreateInstance(
CLSID_WICImagingFactory2,
nullptr,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&s_Factory));
if (FAILED(hr))
{
s_Factory = nullptr;
return FALSE;
}
return TRUE;
}, nullptr, nullptr);
__uuidof(IWICImagingFactory2),
factory) ) ? TRUE : FALSE;
}, nullptr, reinterpret_cast<LPVOID*>(s_Factory.GetAddressOf()));
return s_Factory;
return s_Factory.Get();
}
} // anonymous namespace