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

Piotr Caban : hhctrl.ocx: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 96c6d45759a3bdd296e214e8f3f1318e0ea0bd0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c6d45759a3bdd296e214e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:14 2019 +0200 hhctrl.ocx: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/content.c | 18 +++++++++--------- dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/index.c | 22 +++++++++++----------- dlls/hhctrl.ocx/search.c | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 0140336..48500ca 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -595,7 +595,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "title")) { + if(!_strnicmp(node_name.buf, "title", -1)) { if(next_content(&stream, &content) && content.len > 1) { document_title = strdupnAtoW(&content.buf[1], content.len-1); diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 6a7c8f8..a20d486 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -62,11 +62,11 @@ static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const return; } - if(!strncasecmp("name", ptr, len)) { + if(!_strnicmp("name", ptr, len)) { param = &item->name; - }else if(!strncasecmp("merge", ptr, len)) { + }else if(!_strnicmp("merge", ptr, len)) { param = &merge; - }else if(!strncasecmp("local", ptr, len)) { + }else if(!_strnicmp("local", ptr, len)) { param = &item->local; }else { WARN("unhandled param %s\n", debugstr_an(ptr, len)); @@ -148,9 +148,9 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "/object")) + if(!_strnicmp(node_name.buf, "/object", -1)) break; - if(!strcasecmp(node_name.buf, "param")) + if(!_strnicmp(node_name.buf, "param", -1)) parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage); strbuf_zero(&node); @@ -195,7 +195,7 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "object")) { + if(!_strnicmp(node_name.buf, "object", -1)) { const char *ptr; int len; @@ -210,10 +210,10 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro if(!ret) ret = prev; } - }else if(!strcasecmp(node_name.buf, "ul")) { + }else if(!_strnicmp(node_name.buf, "ul", -1)) { new_item = parse_ul(info, stream, hhc_root); insert_item(prev, new_item, INSERT_CHILD); - }else if(!strcasecmp(node_name.buf, "/ul")) { + }else if(!_strnicmp(node_name.buf, "/ul", -1)) { break; } @@ -245,7 +245,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root, TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "ul")) { + if(!_strnicmp(node_name.buf, "ul", -1)) { ContentItem *item = parse_ul(info, &stream, hhc_root); prev = insert_item(prev, item, INSERT_CHILD); if(!ret) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index b358f54..ae525cf 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winuser.h" #include "winnls.h" #include "htmlhelp.h" diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 8b80ce2..375f3e4 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -83,20 +83,20 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text, UINT c /* Allocate a new sub-item, either on the first run or whenever a * sub-topic has filled out both the "name" and "local" params. */ - if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len))) + if(item->itemFlags == 0x11 && (!_strnicmp("name", ptr, len) || !_strnicmp("local", ptr, len))) item_realloc(item, item->nItems+1); - if(!strncasecmp("keyword", ptr, len)) { + if(!_strnicmp("keyword", ptr, len)) { param = &item->keyword; - }else if(!item->keyword && !strncasecmp("name", ptr, len)) { + }else if(!item->keyword && !_strnicmp("name", ptr, len)) { /* Some HTML Help index files use an additional "name" parameter * rather than the "keyword" parameter. In this case, the first * occurrence of the "name" parameter is the keyword. */ param = &item->keyword; - }else if(!strncasecmp("name", ptr, len)) { + }else if(!_strnicmp("name", ptr, len)) { item->itemFlags |= 0x01; param = &item->items[item->nItems-1].name; - }else if(!strncasecmp("local", ptr, len)) { + }else if(!_strnicmp("local", ptr, len)) { item->itemFlags |= 0x10; param = &item->items[item->nItems-1].local; }else { @@ -137,9 +137,9 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "param")) { + if(!_strnicmp(node_name.buf, "param", -1)) { parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage); - }else if(!strcasecmp(node_name.buf, "/object")) { + }else if(!_strnicmp(node_name.buf, "/object", -1)) { break; }else { WARN("Unhandled tag! %s\n", node_name.buf); @@ -173,7 +173,7 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "object")) { + if(!_strnicmp(node_name.buf, "object", -1)) { const char *ptr; int len; @@ -228,7 +228,7 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "li")) { + if(!_strnicmp(node_name.buf, "li", -1)) { IndexItem *new_item; new_item = parse_li(info, &stream); @@ -246,9 +246,9 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) item = item->next; item->indentLevel = indent_level; } - }else if(!strcasecmp(node_name.buf, "ul")) { + }else if(!_strnicmp(node_name.buf, "ul", -1)) { indent_level++; - }else if(!strcasecmp(node_name.buf, "/ul")) { + }else if(!_strnicmp(node_name.buf, "/ul", -1)) { indent_level--; }else { WARN("Unhandled tag! %s\n", node_name.buf); diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 0e198b8..0c38f1d 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -102,7 +102,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * char *text = &content.buf[1]; int textlen = content.len-1; - if(!strcasecmp(node_name.buf, "title")) + if(!_strnicmp(node_name.buf, "title", -1)) { int wlen = MultiByteToWideChar(CP_ACP, 0, text, textlen, NULL, 0); title = heap_alloc((wlen+1)*sizeof(WCHAR));

1 0

Piotr Caban : crypt32: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 57a8c4dbe8e2f48edf0f2d03aef826d542622964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a8c4dbe8e2f48edf0f2d03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:30 2019 +0200 crypt32: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/oid.c | 5 +++-- dlls/crypt32/store.c | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 02693b9..48eaac0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2151,7 +2151,7 @@ static BOOL find_matching_rdn_attr(DWORD dwFlags, const CERT_NAME_INFO *name, name->rgRDN[i].rgRDNAttr[j].Value.cbData) match = FALSE; else if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) - match = !strncasecmp(nameStr, attrStr, + match = !_strnicmp(nameStr, attrStr, attr->Value.cbData); else match = !strncmp(nameStr, attrStr, attr->Value.cbData); diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index bf0ad32..94270c5 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -29,6 +29,7 @@ #define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wine/debug.h" #include "wine/list.h" @@ -118,7 +119,7 @@ HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, EnterCriticalSection(&funcSetCS); LIST_FOR_EACH_ENTRY(cursor, &funcSets, struct OIDFunctionSet, next) { - if (!strcasecmp(pszFuncName, cursor->name)) + if (!_strnicmp(pszFuncName, cursor->name, -1)) { ret = cursor; break; @@ -403,7 +404,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, if (!IS_INTOID(pszOID)) { if (!IS_INTOID(function->entry.pszOID) && - !strcasecmp(function->entry.pszOID, pszOID)) + !_strnicmp(function->entry.pszOID, pszOID, -1)) { *ppvFuncAddr = function->entry.pvFuncAddr; *phFuncAddr = NULL; /* FIXME: what should it be? */ diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 2b8ea1d..1c9ed91 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h" @@ -873,19 +874,19 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, FIXME("unimplemented type %d\n", LOWORD(lpszStoreProvider)); } } - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY, -1)) openFunc = CRYPT_MemOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_FILENAME_W)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_FILENAME_W, -1)) openFunc = CRYPT_FileOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM, -1)) openFunc = CRYPT_SysOpenStoreW; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7, -1)) openFunc = CRYPT_PKCSOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED, -1)) openFunc = CRYPT_SerializedOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION, -1)) openFunc = CRYPT_CollectionOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY, -1)) openFunc = CRYPT_SysRegOpenStoreW; else {

1 0

Piotr Caban : ws2_32: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 17779b44d10c3eff0a4b3b8b239da8a5966d07df URL: https://source.winehq.org/git/wine.git/?a=commit;h=17779b44d10c3eff0a4b3b8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:39 2019 +0200 ws2_32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a56e284..a302612 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,7 +6509,7 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) unsigned int i; for (i = 0; i < ARRAY_SIZE(protocols); i++) { - if (strcasecmp( protocols[i].names[0], name )) continue; + if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break;

1 0

Piotr Caban : wininet: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 380d5dff85eefaca79ffece33c484aaf922730a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380d5dff85eefaca79ffece3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:22:33 2019 +0200 wininet: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ec94f85..f2a88b7 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3745,7 +3745,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - if(!strcasecmp(pszToken, "<DIR>")) { + if(!_strnicmp(pszToken, "<DIR>", -1)) { lpfp->bIsDirectory = TRUE; lpfp->nSize = 0; TRACE("Is directory\n");

1 0

Piotr Caban : winex11.drv: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: b8f0a28e8cae5e268e44ae556de1fd583759ed7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0a28e8cae5e268e44ae55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:23:18 2019 +0200 winex11.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/xim.c | 7 ++++--- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b9b8293..3b8d916 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2334,7 +2334,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) { char* idx = strrchr(name, '_'); - if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) + if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) { LeaveCriticalSection( &kbd_section ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index f6af293..44fe62e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "x11drv.h" #include "imm.h" #include "wine/debug.h" @@ -293,11 +294,11 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) */ BOOL X11DRV_InitXIM( const char *input_style ) { - if (!strcasecmp(input_style, "offthespot")) + if (!_strnicmp(input_style, "offthespot", -1)) ximStyleRequest = STYLE_OFFTHESPOT; - else if (!strcasecmp(input_style, "overthespot")) + else if (!_strnicmp(input_style, "overthespot", -1)) ximStyleRequest = STYLE_OVERTHESPOT; - else if (!strcasecmp(input_style, "root")) + else if (!_strnicmp(input_style, "root", -1)) ximStyleRequest = STYLE_ROOT; if (!XSupportsLocale()) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4d04741..8350bad 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -800,7 +800,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; TRACE( "got antialias '%s'\n", value ); if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !strcasecmp( value, "off" )) + value[0] == '0' || !_strnicmp( value, "off", -1 )) { ret = GGO_BITMAP; break;

1 0

Michael Müller : server: Correctly validate SID length in sd_is_valid.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f926811e0df963319aa1b7903c368fbfe4a51986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f926811e0df963319aa1b790… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 3 17:44:31 2019 +0200 server: Correctly validate SID length in sd_is_valid. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/token.c b/server/token.c index e58e6a4..5c35bcc 100644 --- a/server/token.c +++ b/server/token.c @@ -305,8 +305,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) owner = sd_get_owner( sd ); if (owner) { - size_t needed_size = security_sid_len( owner ); - if ((sd->owner_len < sizeof(SID)) || (needed_size > sd->owner_len)) + if ((sd->owner_len < sizeof(SID)) || (security_sid_len( owner ) > sd->owner_len)) return FALSE; } offset += sd->owner_len; @@ -317,8 +316,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) group = sd_get_group( sd ); if (group) { - size_t needed_size = security_sid_len( group ); - if ((sd->group_len < sizeof(SID)) || (needed_size > sd->group_len)) + if ((sd->group_len < sizeof(SID)) || (security_sid_len( group ) > sd->group_len)) return FALSE; } offset += sd->group_len;

1 0

Francois Gouget : Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 1684b011189435d9bd3d6838be4cf1ce62edba4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1684b011189435d9bd3d6838… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 2 19:26:10 2019 +0200 Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set. The nouveau graphics driver's support for multithreaded OpenGL is buggy at least up to (18.2.8) so that any Wine test that performs multithreaded OpenGL accesses freezes, crashes the Mesa stack and eventually freezes the whole computer. Typically the first such test is d2d1:d2d1. The relevant tests have a --single option but WineTest neither knows which tests accept this option, nor whether it is needed for the current host. The WINETEST_NO_MT_D3D environnement variable can be set on hosts that need it (such as the cw2-gtx560 box) and is automatically inherited by the relevant tests thus working around this issue. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 ++ dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/dxgi/tests/dxgi.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2214be6..f8fc1f5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8051,6 +8051,8 @@ START_TEST(d2d1) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 00bd16b..f799922 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17925,6 +17925,8 @@ START_TEST(d3d10core) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90bcbae..d5445ef 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29191,6 +29191,8 @@ START_TEST(d3d11) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 91d218f..79e4bc0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5041,6 +5041,8 @@ START_TEST(dxgi) registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) {

1 0

Zebediah Figura : d3d9/tests: Add more tests for calling stateblock methods while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: bfe911e86c202adf4e6df807948c0a51d55e555f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe911e86c202adf4e6df807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:45 2019 -0500 d3d9/tests: Add more tests for calling stateblock methods while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 63 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f79f261..652b81a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10548,10 +10548,11 @@ cleanup: static void test_begin_end_state_block(void) { - IDirect3DStateBlock9 *stateblock; + IDirect3DStateBlock9 *stateblock, *stateblock2; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; + DWORD value; HWND window; HRESULT hr; @@ -10566,33 +10567,61 @@ static void test_begin_end_state_block(void) return; } - /* Should succeed. */ hr = IDirect3DDevice9_BeginStateBlock(device); - ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Calling BeginStateBlock() while recording should return - * D3DERR_INVALIDCALL. */ - hr = IDirect3DDevice9_BeginStateBlock(device); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Should succeed. */ stateblock = (IDirect3DStateBlock9 *)0xdeadbeef; hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); - ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!!stateblock && stateblock != (IDirect3DStateBlock9 *)0xdeadbeef, "Got unexpected stateblock %p.\n", stateblock); - IDirect3DStateBlock9_Release(stateblock); - /* Calling EndStateBlock() while not recording should return - * D3DERR_INVALIDCALL. stateblock should not be touched. */ - stateblock = (IDirect3DStateBlock9 *)0xdeadbeef; - hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + stateblock2 = (IDirect3DStateBlock9 *)0xdeadbeef; + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock2); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - ok(stateblock == (IDirect3DStateBlock9 *)0xdeadbeef, - "Got unexpected stateblock %p.\n", stateblock); + ok(stateblock2 == (IDirect3DStateBlock9 *)0xdeadbeef, + "Got unexpected stateblock %p.\n", stateblock2); + + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Capture(stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + IDirect3DStateBlock9_Release(stateblock); + IDirect3DStateBlock9_Release(stateblock2); refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + todo_wine ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Zebediah Figura : d3d9: Forbid applying a stateblock while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3fcec2b7566c2e58f5b430e9e596a610e39c90bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcec2b7566c2e58f5b430e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:46 2019 -0500 d3d9: Forbid applying a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/stateblock.c | 8 +++++++- dlls/d3d9/tests/device.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 14f47d9..124e1ef 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -121,8 +121,14 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_stateblock_apply(stateblock->wined3d_stateblock); device = impl_from_IDirect3DDevice9Ex(stateblock->parent_device); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_stateblock_apply(stateblock->wined3d_stateblock); device->sysmem_vb = 0; for (i = 0; i < D3D9_MAX_STREAMS; ++i) { diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 652b81a..639c26d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10596,7 +10596,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DStateBlock9_Apply(stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DStateBlock9_Capture(stateblock); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); @@ -10616,7 +10616,7 @@ static void test_begin_end_state_block(void) hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + ok(value == TRUE, "Got unexpected value %#x.\n", value); IDirect3DStateBlock9_Release(stateblock); IDirect3DStateBlock9_Release(stateblock2);

1 0

Nikolay Sivov : dbgeng: Add IDebugDataSpaces stub.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: a47bb5dc839811f52219ebf6a3acf4cea679f138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47bb5dc839811f52219ebf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:45 2019 +0300 dbgeng: Add IDebugDataSpaces stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 236 +++++++++++++++++++++++++++++++++++++++++++++++++-- include/dbgeng.h | 40 +++++++++ 2 files changed, 271 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a47bb5dc839811f52219…

1 0