Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- Of course the strings could be inlined with the cast kept but that doesn't seems to be the preferred way.
dlls/windowscodecs/bmpencode.c | 4 ++-- dlls/windowscodecs/encoder.c | 40 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 342f2c897e8..4bbeb4c27dd 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -77,7 +77,7 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode;
-static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; +static WCHAR wszEnableV5Header32bppBGRA[] = L"EnableV5Header32bppBGRA";
static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { @@ -562,7 +562,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, HRESULT hr; static const PROPBAG2 opts[1] = { - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszEnableV5Header32bppBGRA }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, wszEnableV5Header32bppBGRA }, };
TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index 869588baec1..b634db6f0c2 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -31,28 +31,28 @@
WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; -static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; -static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; -static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; -static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; -static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; -static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; -static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; -static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; -static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; +static WCHAR wszPngInterlaceOption[] = L"InterlaceOption"; +static WCHAR wszPngFilterOption[] = L"FilterOption"; +static WCHAR wszTiffCompressionMethod[] = L"TiffCompressionMethod"; +static WCHAR wszCompressionQuality[] = L"CompressionQuality"; +static WCHAR wszImageQuality[] = L"ImageQuality"; +static WCHAR wszBitmapTransform[] = L"BitmapTransform"; +static WCHAR wszLuminance[] = L"Luminance"; +static WCHAR wszChrominance[] = L"Chrominance"; +static WCHAR wszJpegYCrCbSubsampling[] = L"JpegYCrCbSubsampling"; +static WCHAR wszSuppressApp0[] = L"SuppressApp0";
static const PROPBAG2 encoder_option_properties[ENCODER_OPTION_END] = { - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 } + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, wszPngInterlaceOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, wszPngFilterOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, wszTiffCompressionMethod }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, wszCompressionQuality }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, wszImageQuality }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, wszBitmapTransform }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, wszLuminance }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, wszChrominance }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, wszJpegYCrCbSubsampling }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, wszSuppressApp0 } };
typedef struct CommonEncoder {
I would rather have these inlined.
-
Esme Povirk (they/them) -
Michael Stefaniuc