April 2019 - Wine-commits - list.winehq.org

Piotr Caban : ntoskrnl.exe: Don't use strcasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 5e807741319eb53f9646ade8a5b41c6bb9398cd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e807741319eb53f9646ade8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:36 2019 +0200 ntoskrnl.exe: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 77a610d..f336012 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4101,7 +4101,7 @@ void * __cdecl NTOSKRNL_memset( void *dst, int c, size_t n ) */ int __cdecl NTOSKRNL__stricmp( LPCSTR str1, LPCSTR str2 ) { - return strcasecmp( str1, str2 ); + return _strnicmp( str1, str2, -1 ); } /********************************************************************* @@ -4109,7 +4109,7 @@ int __cdecl NTOSKRNL__stricmp( LPCSTR str1, LPCSTR str2 ) */ int __cdecl NTOSKRNL__strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) { - return strncasecmp( str1, str2, n ); + return _strnicmp( str1, str2, n ); } /*********************************************************************

1 0

Piotr Caban : msvideo.dll16: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 87a6f2fc0ffde2ecfc60d79eb1fd91825d340b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a6f2fc0ffde2ecfc60d79e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:40 2019 +0200 msvideo.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index bc239a8..840de2e 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -28,6 +28,7 @@ #include "winver.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wine/winbase16.h" #include "wownt32.h" @@ -892,7 +893,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncasecmp(buf, "vid", 3)) continue; + if (_strnicmp(buf, "vid", 3)) continue; if (nr--) continue; fnLen = sizeof(fn); lRet = RegQueryValueExA(hKey, buf, 0, 0, (LPBYTE)fn, &fnLen); @@ -907,7 +908,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, { for (s = buf; *s; s += strlen(s) + 1) { - if (strncasecmp(s, "vid", 3)) continue; + if (_strnicmp(s, "vid", 3)) continue; if (nr--) continue; if (GetPrivateProfileStringA("drivers32", s, NULL, fn, sizeof(fn), "system.ini")) found = TRUE;

1 0

Piotr Caban : msvfw32: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 12783557155987d37c1c7828b8c3c20a3c5300ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=12783557155987d37c1c7828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:44 2019 +0200 msvfw32: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 235410b..fe140b2 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -35,6 +35,7 @@ #include "winreg.h" #include "winnls.h" #include "wingdi.h" +#include "winternl.h" #include "winuser.h" #include "commdlg.h" #include "vfw.h" @@ -220,7 +221,7 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) char fcc_str2[4]; fourcc_to_string(fcc_str1, fcc1); fourcc_to_string(fcc_str2, fcc2); - return strncasecmp(fcc_str1, fcc_str2, 4); + return _strnicmp(fcc_str1, fcc_str2, 4); } static DWORD get_size_image(LONG width, LONG height, WORD depth)

1 0

Piotr Caban : mshtml: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 5ab0d1443cc7a1019f23d5848a8acb0d5002233a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab0d1443cc7a1019f23d584… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:50 2019 +0200 mshtml: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9b9e575..97435c7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "winternl.h" #include "ole2.h" #include "shlguid.h" #include "wininet.h" @@ -1181,7 +1182,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, nsACString_GetData(aRequestMethod, &method); for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { - if(!strcasecmp(method, request_method_strings[i])) { + if(!_strnicmp(method, request_method_strings[i], -1)) { This->request_method = i; return NS_OK; } @@ -3708,11 +3709,11 @@ static BOOL is_gecko_special_uri(const char *spec) unsigned int i; for(i=0; i < ARRAY_SIZE(special_schemes); i++) { - if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i]))) + if(!_strnicmp(spec, special_schemes[i], strlen(special_schemes[i]))) return TRUE; } - if(!strncasecmp(spec, "file:", 5)) { + if(!_strnicmp(spec, "file:", 5)) { const char *ptr = spec+5; while(*ptr == '/') ptr++; @@ -3753,7 +3754,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC } } - if(aOriginCharset && *aOriginCharset && strncasecmp(aOriginCharset, "utf", 3)) { + if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) { BSTR charset; int len;

1 0

Piotr Caban : mscoree: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: cef4d3465b0826b05f944ca62570b2b5274fd1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef4d3465b0826b05f944ca6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:53 2019 +0200 mscoree: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index c02bfe1..fc1d178 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winternl.h" #include "ole2.h" #include "corerror.h" @@ -1242,7 +1243,7 @@ static void parse_override_entry(override_entry *entry, const char *string, int value = equals + 1; switch (key_len) { case 3: - if (!strncasecmp(string, "gac", 3)) { + if (!_strnicmp(string, "gac", 3)) { if (IS_OPTION_TRUE(*value)) entry->flags |= ASSEMBLY_SEARCH_GAC; else if (IS_OPTION_FALSE(*value))

1 0

Piotr Caban : krnl386.exe16: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: ea4d756cbdefd545da69785ef75b7561653e1cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4d756cbdefd545da69785e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:52:01 2019 +0200 krnl386.exe16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/atom.c | 6 +++--- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/resource.c | 8 ++++---- dlls/krnl386.exe16/snoop.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/atom.c b/dlls/krnl386.exe16/atom.c index a059561..23ef717 100644 --- a/dlls/krnl386.exe16/atom.c +++ b/dlls/krnl386.exe16/atom.c @@ -108,7 +108,7 @@ static WORD ATOM_Hash( TRACE("%x, %s, %x\n", entries, str, len); - for (i = 0; i < len; i++) hash ^= toupper(str[i]) + i; + for (i = 0; i < len; i++) hash ^= RtlUpperChar(str[i]) + i; return hash % entries; } @@ -223,7 +223,7 @@ ATOM WINAPI AddAtom16( LPCSTR str ) { entryPtr = ATOM_MakePtr( entry ); if ((entryPtr->length == len) && - (!strncasecmp( entryPtr->str, buffer, len ))) + (!_strnicmp( entryPtr->str, buffer, len ))) { entryPtr->refCount++; TRACE("-- existing 0x%x\n", entry); @@ -310,7 +310,7 @@ ATOM WINAPI FindAtom16( LPCSTR str ) { ATOMENTRY * entryPtr = ATOM_MakePtr( entry ); if ((entryPtr->length == len) && - (!strncasecmp( entryPtr->str, str, len ))) + (!_strnicmp( entryPtr->str, str, len ))) { TRACE("-- found %x\n", entry); return HANDLETOATOM( entry ); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index d494585..0d343aa 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1455,7 +1455,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) if (pModule->ne_flags & NE_FFLAGS_WIN32) continue; name_table = (BYTE *)pModule + pModule->ne_restab; - /* FIXME: the strncasecmp is WRONG. It should not be case insensitive, + /* FIXME: the _strnicmp is WRONG. It should not be case insensitive, * but case sensitive! (Unfortunately Winword 6 and subdlls have * lowercased module names, but try to load uppercase DLLs, so this * 'i' compare is just a quickfix until the loader handles that diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index 2f606fa..42a6d14 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -213,7 +213,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[1] & 0x8000) { if (!HIWORD(typeId)) continue; - if (strcasecmp( typeId, (char *)(p + 3) )) continue; + if (_strnicmp( typeId, (char *)(p + 3), -1 )) continue; } else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1])) continue; @@ -223,7 +223,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[2] & 0x8000) { if (!HIWORD(resId)) continue; - if (strcasecmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1 )) continue; + if (_strnicmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1, -1 )) continue; } else if (HIWORD(resId) || ((LOWORD(resId) & ~0x8000) != p[2])) @@ -261,7 +261,7 @@ static NE_TYPEINFO *NE_FindTypeSection( LPBYTE pResTab, NE_TYPEINFO *pTypeInfo, if (!(pTypeInfo->type_id & 0x8000)) { BYTE *p = pResTab + pTypeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, str, len )) + if ((*p == len) && !_strnicmp( (char*)p+1, str, len )) { TRACE(" Found type '%s'\n", str ); return pTypeInfo; @@ -308,7 +308,7 @@ static NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab, NE_TYPEINFO *pTypeI { if (pNameInfo->id & 0x8000) continue; p = pResTab + pNameInfo->id; - if ((*p == len) && !strncasecmp( (char*)p+1, str, len )) + if ((*p == len) && !_strnicmp( (char*)p+1, str, len )) return pNameInfo; } } diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 4496080..af06e35 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -224,7 +224,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { if (strchr(fun->name,'_')) { char *s=strchr(fun->name,'_'); - if (!strncasecmp(s,"_thunkdata",10)) { + if (!_strnicmp(s,"_thunkdata",10)) { HeapFree(GetProcessHeap(),0,fun->name); fun->name = NULL; return origfun;

1 0

Piotr Caban : krnl386.exe16: Get rid of NE_str(n)casecmp helper.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 6b2c2eb76d3f2d7ca12a9b0a09b1eb6e5b43cf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2c2eb76d3f2d7ca12a9b0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:52:10 2019 +0200 krnl386.exe16: Get rid of NE_str(n)casecmp helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 0d343aa..16d2f28 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -113,34 +113,6 @@ static inline BOOL contains_path( LPCSTR name ) /*********************************************************************** - * NE_strcasecmp - * - * locale-independent case conversion for module lookups - */ -static int NE_strcasecmp( const char *str1, const char *str2 ) -{ - int ret = 0; - for ( ; ; str1++, str2++) - if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break; - return ret; -} - - -/*********************************************************************** - * NE_strncasecmp - * - * locale-independent case conversion for module lookups - */ -static int NE_strncasecmp( const char *str1, const char *str2, int len ) -{ - int ret = 0; - for ( ; len > 0; len--, str1++, str2++) - if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break; - return ret; -} - - -/*********************************************************************** * NE_GetPtr */ NE_MODULE *NE_GetPtr( HMODULE16 hModule ) @@ -1461,7 +1433,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) * 'i' compare is just a quickfix until the loader handles that * correctly. -MM 990705 */ - if ((*name_table == len) && !NE_strncasecmp(tmpstr, (const char*)name_table+1, len)) + if ((*name_table == len) && !_strnicmp(tmpstr, (const char*)name_table+1, len)) return hModule; } @@ -1500,7 +1472,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!NE_strcasecmp(loadedfn, s)) + if (!_strnicmp(loadedfn, s, -1)) return hModule; } return 0; @@ -1820,7 +1792,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!NE_strcasecmp(loadedfn, s)) + if (!_strnicmp(loadedfn, s, -1)) return hModule; } /* If basename (without ext) matches the module name of a module: @@ -1837,7 +1809,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) if (pModule->ne_flags & NE_FFLAGS_WIN32) continue; name_table = (BYTE *)pModule + pModule->ne_restab; - if ((*name_table == len) && !NE_strncasecmp(s, (const char*)name_table+1, len)) + if ((*name_table == len) && !_strnicmp(s, (const char*)name_table+1, len)) return hModule; }

1 0

Gijs Vermeulen : kernel32: Add DECLSPEC_HOTPATCH to SizeofResource().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 002a19599be273b9f947425a820897816317c378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=002a19599be273b9f947425a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Apr 2 18:46:15 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to SizeofResource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a04fe62..5c9383d 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -617,7 +617,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) /********************************************************************** * SizeofResource (KERNEL32.@) */ -DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) +DWORD WINAPI DECLSPEC_HOTPATCH SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;

1 0

Henri Verbeet : d3d10core/tests: Introduce and use check_readback_data_u16.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 1f9b99298fa29d27dff99e10cf6a9fde13312a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9b99298fa29d27dff99e10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:44 2019 +0430 d3d10core/tests: Introduce and use check_readback_data_u16. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 94 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b9b83f4..7d76cc2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -728,11 +728,16 @@ static void *get_readback_data(struct resource_readback *rb, unsigned int x, uns return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(BYTE *)get_readback_data(rb, x, y, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); @@ -785,12 +790,12 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -804,27 +809,57 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u), sub-resource %u.\n", value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -840,14 +875,12 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n", color, expected_color, x, y, rb->sub_resource_idx); @@ -15590,14 +15623,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -15662,17 +15688,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -17864,7 +17880,7 @@ static void test_render_a8(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black);

1 0

Henri Verbeet : d3d10core/tests: Introduce and use check_readback_data_u24.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 86aaebc48aa16f2b5fc7d335914aee8243e5ae10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86aaebc48aa16f2b5fc7d335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:45 2019 +0430 d3d10core/tests: Introduce and use check_readback_data_u24. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 55 +++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d76cc2..00bd16b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -738,11 +738,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); } -static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } +static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return get_readback_u32(rb, x, y); +} + static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(float *)get_readback_data(rb, x, y, sizeof(float)); @@ -854,6 +859,38 @@ done: value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e) +static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb, + const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + DWORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u32(rb, x, y) >> shift; + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%06x, expected 0x%06x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -15524,10 +15561,10 @@ static void test_depth_bias(void) struct resource_readback rb; ID3D10DepthStencilView *dsv; unsigned int expected_value; - unsigned int x, y, i, j, k; ID3D10RasterizerState *rs; ID3D10Texture2D *texture; unsigned int format_idx; + unsigned int y, i, j, k; unsigned int shift = 0; ID3D10Device *device; float *depth_values; @@ -15667,19 +15704,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u32 = get_readback_data(&rb, x, y, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - } - } + check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1); release_resource_readback(&rb); break; case DXGI_FORMAT_D16_UNORM:

1 0