May 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/datetime: Use designated initializers for constants.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 0c4f7c2554fffd3d09de8146d5482fd957df61cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4f7c2554fffd3d09de8146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:04 2020 +0300 comctl32/datetime: Use designated initializers for constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2ce3da591f..7b7ac8a86a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -130,8 +130,8 @@ static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; -static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; +static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDayOfWeek = 0, .wDay = 31 }; +static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDayOfWeek = 0, .wDay = 14 }; static DWORD DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *systime)

1 0

Nikolay Sivov : comctl32/syslink: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 1141a7df28acc5b5a86af110ef68932eeb823a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1141a7df28acc5b5a86af110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:03 2020 +0300 comctl32/syslink: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 78d0fd0986..802a8803e8 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -165,10 +165,6 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) */ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { - static const WCHAR SL_LINKOPEN[] = { '<','a' }; - static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' }; - static const WCHAR SL_ID[] = { 'i','d','=','\"' }; - static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' }; LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL; int taglen = 0, textlen = 0, linklen = 0, docitems = 0; PDOC_ITEM Last = NULL; @@ -182,7 +178,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!wcsnicmp(current, SL_LINKOPEN, ARRAY_SIZE(SL_LINKOPEN)) && (CurrentType == slText)) + if(!wcsnicmp(current, L"<a", 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -210,14 +206,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!wcsnicmp(tmp, SL_HREF, ARRAY_SIZE(SL_HREF))) + if(!wcsnicmp(tmp, L"href=\"", 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!wcsnicmp(tmp, SL_ID, ARRAY_SIZE(SL_ID))) + else if(!wcsnicmp(tmp, L"id=\"", 4)) { taglen += 4; ValidParam = TRUE; @@ -291,7 +287,7 @@ CheckParameter: } } } - else if(!wcsnicmp(current, SL_LINKCLOSE, ARRAY_SIZE(SL_LINKCLOSE)) && (CurrentType == slLink) && firsttag) + else if (!wcsnicmp(current, L"</a>", 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Nikolay Sivov : comctl32/datetime: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 8fee131b28a3a7889c698baa7fe1fd6aad23c714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fee131b28a3a7889c698baa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:02 2020 +0300 comctl32/datetime: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 63 +++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 51c20a7063..2ce3da591f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -361,9 +361,6 @@ DATETIME_SetFormatA (DATETIME_INFO *infoPtr, LPCSTR lpszFormat) static void DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int resultSize) { - static const WCHAR fmt_dW[] = { '%', 'd', 0 }; - static const WCHAR fmt__2dW[] = { '%', '.', '2', 'd', 0 }; - static const WCHAR fmt__3sW[] = { '%', '.', '3', 's', 0 }; SYSTEMTIME date = infoPtr->date; int spec; WCHAR buffer[80]; @@ -395,10 +392,10 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int *result = 0; break; case ONEDIGITDAY: - wsprintfW (result, fmt_dW, date.wDay); + wsprintfW (result, L"%d", date.wDay); break; case TWODIGITDAY: - wsprintfW (result, fmt__2dW, date.wDay); + wsprintfW (result, L"%.2d", date.wDay); break; case THREECHARDAY: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1+(date.wDayOfWeek+6)%7, result, 4); @@ -414,7 +411,7 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[2] = 0; } else - wsprintfW (result, fmt_dW, date.wHour - (date.wHour > 12 ? 12 : 0)); + wsprintfW (result, L"%d", date.wHour - (date.wHour > 12 ? 12 : 0)); break; case TWODIGIT12HOUR: if (date.wHour == 0) { @@ -423,35 +420,35 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[2] = 0; } else - wsprintfW (result, fmt__2dW, date.wHour - (date.wHour > 12 ? 12 : 0)); + wsprintfW (result, L"%.2d", date.wHour - (date.wHour > 12 ? 12 : 0)); break; case ONEDIGIT24HOUR: - wsprintfW (result, fmt_dW, date.wHour); + wsprintfW (result, L"%d", date.wHour); break; case TWODIGIT24HOUR: - wsprintfW (result, fmt__2dW, date.wHour); + wsprintfW (result, L"%.2d", date.wHour); break; case ONEDIGITSECOND: - wsprintfW (result, fmt_dW, date.wSecond); + wsprintfW (result, L"%d", date.wSecond); break; case TWODIGITSECOND: - wsprintfW (result, fmt__2dW, date.wSecond); + wsprintfW (result, L"%.2d", date.wSecond); break; case ONEDIGITMINUTE: - wsprintfW (result, fmt_dW, date.wMinute); + wsprintfW (result, L"%d", date.wMinute); break; case TWODIGITMINUTE: - wsprintfW (result, fmt__2dW, date.wMinute); + wsprintfW (result, L"%.2d", date.wMinute); break; case ONEDIGITMONTH: - wsprintfW (result, fmt_dW, date.wMonth); + wsprintfW (result, L"%d", date.wMonth); break; case TWODIGITMONTH: - wsprintfW (result, fmt__2dW, date.wMonth); + wsprintfW (result, L"%.2d", date.wMonth); break; case THREECHARMONTH: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+date.wMonth -1, buffer, ARRAY_SIZE(buffer)); - wsprintfW (result, fmt__3sW, buffer); + wsprintfW (result, L"%s.3s", buffer); break; case FULLMONTH: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+date.wMonth -1, @@ -472,14 +469,14 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[1] = 0; break; case ONEDIGITYEAR: - wsprintfW (result, fmt_dW, date.wYear % 10); + wsprintfW (result, L"%d", date.wYear % 10); break; case TWODIGITYEAR: - wsprintfW (result, fmt__2dW, date.wYear % 100); + wsprintfW (result, L"%.2d", date.wYear % 100); break; case INVALIDFULLYEAR: case FULLYEAR: - wsprintfW (result, fmt_dW, date.wYear); + wsprintfW (result, L"%d", date.wYear); break; } @@ -601,11 +598,6 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co { /* fields are a fixed width, determined by the largest possible string */ /* presumably, these widths should be language dependent */ - static const WCHAR fld_d1W[] = { '2', 0 }; - static const WCHAR fld_d2W[] = { '2', '2', 0 }; - static const WCHAR fld_d4W[] = { '2', '2', '2', '2', 0 }; - static const WCHAR fld_am1[] = { 'A', 0 }; - static const WCHAR fld_am2[] = { 'A', 'M', 0 }; int spec; WCHAR buffer[80]; LPCWSTR bufptr; @@ -640,22 +632,17 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co case TWODIGITMINUTE: case TWODIGITMONTH: case TWODIGITYEAR: - bufptr = fld_d2W; + bufptr = L"22"; break; case INVALIDFULLYEAR: case FULLYEAR: - bufptr = fld_d4W; + bufptr = L"2222"; break; case THREECHARMONTH: case FULLMONTH: case THREECHARDAY: case FULLDAY: { - static const WCHAR fld_day[] = {'W','e','d','n','e','s','d','a','y',0}; - static const WCHAR fld_abbrday[] = {'W','e','d',0}; - static const WCHAR fld_mon[] = {'S','e','p','t','e','m','b','e','r',0}; - static const WCHAR fld_abbrmon[] = {'D','e','c',0}; - const WCHAR *fall; LCTYPE lctype; INT i, max_count; @@ -664,22 +651,22 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co /* choose locale data type and fallback string */ switch (spec) { case THREECHARDAY: - fall = fld_abbrday; + fall = L"Wed"; lctype = LOCALE_SABBREVDAYNAME1; max_count = 7; break; case FULLDAY: - fall = fld_day; + fall = L"Wednesday"; lctype = LOCALE_SDAYNAME1; max_count = 7; break; case THREECHARMONTH: - fall = fld_abbrmon; + fall = L"Dec"; lctype = LOCALE_SABBREVMONTHNAME1; max_count = 12; break; default: /* FULLMONTH */ - fall = fld_mon; + fall = L"September"; lctype = LOCALE_SMONTHNAME1; max_count = 12; break; @@ -704,13 +691,13 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co return cx; } case ONELETTERAMPM: - bufptr = fld_am1; + bufptr = L"A"; break; case TWOLETTERAMPM: - bufptr = fld_am2; + bufptr = L"AM"; break; default: - bufptr = fld_d1W; + bufptr = L"2"; break; } }

1 0

Nikolay Sivov : comctl32/animate: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 202c71761314f29d125efee8d496c45ef08f9a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=202c71761314f29d125efee8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:00 2020 +0300 comctl32/animate: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index f8ba159779..f7ac28ae4c 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -94,12 +94,11 @@ static void ANIMATE_Notify(const ANIMATE_INFO *infoPtr, UINT notif) static BOOL ANIMATE_LoadResW(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPCWSTR lpName) { - static const WCHAR aviW[] = { 'A', 'V', 'I', 0 }; HRSRC hrsrc; MMIOINFO mminfo; LPVOID lpAvi; - hrsrc = FindResourceW(hInst, lpName, aviW); + hrsrc = FindResourceW(hInst, lpName, L"AVI"); if (!hrsrc) return FALSE; @@ -794,12 +793,11 @@ static BOOL ANIMATE_Stop(ANIMATE_INFO *infoPtr) static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) { - static const WCHAR msvfw32W[] = { 'm', 's', 'v', 'f', 'w', '3', '2', '.', 'd', 'l', 'l', 0 }; ANIMATE_INFO *infoPtr; if (!fnIC.hModule) { - fnIC.hModule = LoadLibraryW(msvfw32W); + fnIC.hModule = LoadLibraryW(L"msvfw32.dll"); if (!fnIC.hModule) return FALSE; fnIC.fnICOpen = (void*)GetProcAddress(fnIC.hModule, "ICOpen");

1 0

Zebediah Figura : qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive().
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: fc45c96383698aeec790848716a4f746eb4144cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc45c96383698aeec7908487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 12:45:04 2020 -0500 qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 5e63facf7b..af148d4aa1 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -85,7 +85,11 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) || !WriteFile(filter->file, data, stop - start, &size, NULL)) + { ERR("Failed to write file, error %u.\n", GetLastError()); + return HRESULT_FROM_WIN32(hr); + } + if (size != stop - start) ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start));

1 0

Gijs Vermeulen : kernel32: Remove unused functions is_executable() and get_table_entry().
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: e7abfe953394fdb36ce95e588b6ce1988d833736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abfe953394fdb36ce95e58… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:25 2020 +0200 kernel32: Remove unused functions is_executable() and get_table_entry(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 5 ----- dlls/kernel32/path.c | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ac04e85946..52c24b275d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,11 +62,6 @@ extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); -static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) -{ - return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; -} - /*********************************************************************** * get_lcid_codepage * diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 93759592c4..54dbf5a4f6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,17 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 -/* check if a file name is for an executable file (.exe or .com) */ -static inline BOOL is_executable( const WCHAR *name ) -{ - static const WCHAR exeW[] = {'.','e','x','e',0}; - static const WCHAR comW[] = {'.','c','o','m',0}; - int len = strlenW(name); - - if (len < 4) return FALSE; - return (!strcmpiW( name + len - 4, exeW ) || !strcmpiW( name + len - 4, comW )); -} - /*********************************************************************** * copy_filename_WtoA *

1 0

Zebediah Figura : d3dcompiler: Add a helper to initialize the hlsl_ir_node structure.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 2dc666c9df06be9053f5864c3a244f635c2e2c3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc666c9df06be9053f5864c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 23:54:23 2020 -0500 d3dcompiler: Add a helper to initialize the hlsl_ir_node structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 ++- dlls/d3dcompiler_43/hlsl.y | 110 ++++++++++++++++++------------ dlls/d3dcompiler_43/utils.c | 58 ++-------------- 3 files changed, 81 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dc666c9df06be9053f5…

1 0

Alexandre Julliard : ntoskrnl: Add missing exports for functions that are already implemented.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 1028a5c15f28edea10c3acdd262a9868bffd78d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1028a5c15f28edea10c3acdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 15:38:55 2020 +0200 ntoskrnl: Add missing exports for functions that are already implemented. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 136 ++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1028a5c15f28edea10c3…

1 0

Andrew Eikum : setupapi: Quiet down missing driver debug message.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 20a283e7e20a456ccb34730013e837571c884448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a283e7e20a456ccb347300… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 30 15:39:23 2020 -0500 setupapi: Quiet down missing driver debug message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..fca60402a5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + WARN("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; }

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 5beefc63bac65e6cb255924eec4888c4d03d7e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beefc63bac65e6cb255924e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:23 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 222b3bf92c..e7f04cbdf2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4187,6 +4187,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0