September 2020 - Wine-Commits

Nikolay Sivov : evr/tests: Add a test for returned input type instance.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 7c1b534a182f74835e84337e5c7ac6617755970a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c1b534a182f74835e84337e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:24:39 2020 +0300 evr/tests: Add a test for returned input type instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a68952c42a..3e2675497a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -805,11 +805,11 @@ done: static void test_default_mixer_type_negotiation(void) { + IMFMediaType *media_type, *media_type2; IDirect3DDeviceManager9 *manager; DXVA2_VideoProcessorCaps caps; IMFVideoMediaType *video_type; IMFVideoProcessor *processor; - IMFMediaType *media_type; IDirect3DDevice9 *device; IMFTransform *transform; GUID guid, *guids; @@ -896,6 +896,18 @@ static void test_default_mixer_type_negotiation(void) todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (hr == S_OK) +{ + ok(media_type != (IMFMediaType *)video_type, "Unexpected media type instance.\n"); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); +} hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Gijs Vermeulen : msvcirt: Set error when file can't be opened in fstream_open_ctor.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 19342f43bb34402df76dedbadf0ced52209123ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=19342f43bb34402df76dedba… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 17 12:44:15 2020 +0200 msvcirt: Set error when file can't be opened in fstream_open_ctor. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3443261934..0b0a34940d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4627,13 +4627,14 @@ iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_ope } filebuf_ctor(fb); - filebuf_open(fb, name, mode, protection); iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init); base = istream_get_ios(&this->base1); base->delbuf = 1; + if (!filebuf_open(fb, name, mode, protection)) + base->state |= IOSTATE_failbit; return this; }

1 0

Hans Leidekker : crypt32: Set key context if PKCS12_NO_PERSIST_KEY is passed, otherwise set key provider info.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 4e11e6e045edd514d553d32ef797cecf98d9a203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e11e6e045edd514d553d32e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 17 15:48:16 2020 +0200 crypt32: Set key context if PKCS12_NO_PERSIST_KEY is passed, otherwise set key provider info. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 89 ++++++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/store.c | 26 +++++++++++--- 2 files changed, 104 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 711cf76de2..475ec0369e 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -256,6 +256,77 @@ static char *password_to_ascii( const WCHAR *str ) #endif +static BOOL set_key_context( const void *ctx, HCRYPTPROV prov ) +{ + CERT_KEY_CONTEXT key_ctx; + key_ctx.cbSize = sizeof(key_ctx); + key_ctx.hCryptProv = prov; + key_ctx.dwKeySpec = AT_KEYEXCHANGE; + return CertSetCertificateContextProperty( ctx, CERT_KEY_CONTEXT_PROP_ID, 0, &key_ctx ); +} + +static WCHAR *get_provider_property( HCRYPTPROV prov, DWORD prop_id, DWORD *len ) +{ + DWORD size = 0; + WCHAR *ret; + char *str; + + CryptGetProvParam( prov, prop_id, NULL, &size, 0 ); + if (!size) return NULL; + if (!(str = CryptMemAlloc( size ))) return NULL; + CryptGetProvParam( prov, prop_id, (BYTE *)str, &size, 0 ); + + *len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = CryptMemAlloc( *len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, *len ); + CryptMemFree( str ); + return ret; +} + +static BOOL set_key_prov_info( const void *ctx, HCRYPTPROV prov ) +{ + CRYPT_KEY_PROV_INFO *prov_info; + DWORD size, len_container, len_name; + WCHAR *ptr, *container, *name; + BOOL ret; + + if (!(container = get_provider_property( prov, PP_CONTAINER, &len_container ))) return FALSE; + if (!(name = get_provider_property( prov, PP_NAME, &len_name ))) + { + CryptMemFree( container ); + return FALSE; + } + if (!(prov_info = CryptMemAlloc( sizeof(*prov_info) + (len_container + len_name) * sizeof(WCHAR) ))) + { + CryptMemFree( container ); + CryptMemFree( name ); + return FALSE; + } + + ptr = (WCHAR *)(prov_info + 1); + prov_info->pwszContainerName = ptr; + strcpyW( prov_info->pwszContainerName, container ); + + ptr += len_container; + prov_info->pwszProvName = ptr; + strcpyW( prov_info->pwszProvName, name ); + + size = sizeof(prov_info->dwProvType); + CryptGetProvParam( prov, PP_PROVTYPE, (BYTE *)&prov_info->dwProvType, &size, 0 ); + + prov_info->dwFlags = 0; + prov_info->cProvParam = 0; + prov_info->rgProvParam = NULL; + size = sizeof(prov_info->dwKeySpec); + CryptGetProvParam( prov, PP_KEYSPEC, (BYTE *)&prov_info->dwKeySpec, &size, 0 ); + + ret = CertSetCertificateContextProperty( ctx, CERT_KEY_PROV_INFO_PROP_ID, 0, prov_info ); + + CryptMemFree( prov_info ); + CryptMemFree( name ); + CryptMemFree( container ); + return ret; +} + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS @@ -265,7 +336,6 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor gnutls_x509_crt_t *chain; unsigned int chain_len, i; HCERTSTORE store = NULL; - CERT_KEY_CONTEXT key_ctx; HCRYPTPROV prov = 0; char *pwd = NULL; int ret; @@ -339,16 +409,21 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor } heap_free( crt_data ); - key_ctx.cbSize = sizeof(key_ctx); - key_ctx.hCryptProv = prov; - key_ctx.dwKeySpec = AT_KEYEXCHANGE; - if (!CertSetCertificateContextProperty( ctx, CERT_KEY_CONTEXT_PROP_ID, 0, &key_ctx )) + if (flags & PKCS12_NO_PERSIST_KEY) { - WARN( "CertSetCertificateContextProperty failed %08x\n", GetLastError() ); + if (!set_key_context( ctx, prov )) + { + WARN( "failed to set context property %08x\n", GetLastError() ); + CertFreeCertificateContext( ctx ); + goto error; + } + } + else if (!set_key_prov_info( ctx, prov )) + { + WARN( "failed to set provider info property %08x\n", GetLastError() ); CertFreeCertificateContext( ctx ); goto error; } - if (!CertAddCertificateContextToStore( store, ctx, CERT_STORE_ADD_ALWAYS, NULL )) { WARN( "CertAddCertificateContextToStore failed %08x\n", GetLastError() ); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b8d0ad6666..b2d5c7cb7e 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3286,7 +3286,8 @@ static void test_PFXImportCertStore(void) CRYPT_DATA_BLOB pfx; const CERT_CONTEXT *cert; CERT_KEY_CONTEXT key; - CRYPT_KEY_PROV_INFO keyprov; + char buf[512]; + CRYPT_KEY_PROV_INFO *keyprov = (CRYPT_KEY_PROV_INFO *)buf; CERT_INFO *info; DWORD count, size; BOOL ret; @@ -3299,7 +3300,7 @@ static void test_PFXImportCertStore(void) pfx.pbData = (BYTE *)pfxdata; pfx.cbData = sizeof(pfxdata); store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); - ok( store != NULL || broken(store == NULL) /* winxp */, "got %p\n", store ); + ok( store != NULL || broken(store == NULL) /* winxp */, "got %u\n", GetLastError() ); if (!store) return; count = countCertsInStore( store ); ok( count == 1, "got %u\n", count ); @@ -3324,11 +3325,28 @@ static void test_PFXImportCertStore(void) ok( key.hCryptProv, "hCryptProv not set\n" ); ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); - size = sizeof(keyprov); + size = sizeof(buf); SetLastError( 0xdeadbeef ); - ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, &keyprov, &size ); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, keyprov, &size ); + ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); + + /* without PKCS12_NO_PERSIST_KEY */ + store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %08x\n", GetLastError() ); + + size = sizeof(key); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_CONTEXT_PROP_ID, &key, &size ); ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + size = sizeof(buf); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, buf, &size ); + ok(ret, "got %u\n", GetLastError()); + CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); }

1 0

Nikolay Sivov : ole32/comcat: Use wide string constants.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: b68b58e604ae84964999ff3546e672d68a5a8342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68b58e604ae84964999ff35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:20:24 2020 +0300 ole32/comcat: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/comcat.c | 51 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 467724c5ba..e258f8835b 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -67,14 +67,9 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR impl_req, IEnumC /********************************************************************** * File-scope string constants */ -static const WCHAR comcat_keyname[] = { - 'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR impl_keyname[] = { - 'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR req_keyname[] = { - 'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR clsid_keyname[] = { 'C','L','S','I','D',0 }; - +static const WCHAR comcat_keyname[] = L"Component Categories"; +static const WCHAR impl_keyname[] = L"Implemented Categories"; +static const WCHAR req_keyname[] = L"Required Categories"; /********************************************************************** * COMCAT_RegisterClassCategories @@ -96,7 +91,7 @@ static HRESULT COMCAT_RegisterClassCategories( if (FAILED(res)) return res; /* Create (or open) the CLSID key. */ - res = create_classes_key(HKEY_CLASSES_ROOT, clsid_keyname, KEY_READ|KEY_WRITE, &clsid_key); + res = create_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ|KEY_WRITE, &clsid_key); if (res != ERROR_SUCCESS) return E_FAIL; /* Create (or open) the class key. */ @@ -169,7 +164,6 @@ static HRESULT COMCAT_UnRegisterClassCategories( static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, ULONG buf_wchars) { - static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; WCHAR valname[5]; HRESULT res; DWORD type, size = (buf_wchars - 1) * sizeof(WCHAR); @@ -177,7 +171,7 @@ static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, if (pszDesc == NULL) return E_INVALIDARG; /* FIXME: lcid comparisons are more complex than this! */ - wsprintfW(valname, fmt, lcid); + wsprintfW(valname, L"%lX", lcid); res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size); if (res != ERROR_SUCCESS || type != REG_SZ) { FIXME("Simplified lcid comparison\n"); @@ -341,8 +335,8 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( res = create_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ|KEY_WRITE, &comcat_key); if (res != ERROR_SUCCESS) return E_FAIL; - for (; cCategories; --cCategories, ++rgci) { - static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; + for (; cCategories; --cCategories, ++rgci) + { WCHAR keyname[CHARS_IN_GUID]; WCHAR valname[9]; HKEY cat_key; @@ -353,7 +347,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( if (res != ERROR_SUCCESS) continue; /* Set the value for this locale's description. */ - wsprintfW(valname, fmt, rgci->lcid); + wsprintfW(valname, L"%lX", rgci->lcid); RegSetValueExW(cat_key, valname, 0, REG_SZ, (const BYTE*)rgci->szDescription, (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR)); @@ -634,16 +628,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[] = { '\\', 'I', 'm', 'p', 'l', 'e', 'm', 'e', - 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', - 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; - TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); + return CATIDEnumGUID_Construct(rclsid, L"\\Implemented Categories", ppenumCATID); } /********************************************************************** @@ -654,16 +644,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[] = { '\\', 'R', 'e', 'q', 'u', 'i', 'r', 'e', - 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; - TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); + return CATIDEnumGUID_Construct(rclsid, L"\\Required Categories", ppenumCATID); } /********************************************************************** @@ -855,9 +841,6 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( IEnumCATEGORYINFO **ppenum) { IEnumCATEGORYINFOImpl *This = impl_from_IEnumCATEGORYINFO(iface); - static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', - 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; IEnumCATEGORYINFOImpl *new_this; TRACE("\n"); @@ -871,7 +854,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( new_this->ref = 1; new_this->lcid = This->lcid; /* FIXME: could we more efficiently use DuplicateHandle? */ - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &new_this->key); + open_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ, &new_this->key); new_this->next_index = This->next_index; *ppenum = &new_this->IEnumCATEGORYINFO_iface; @@ -891,7 +874,6 @@ static const IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl = static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret) { - static const WCHAR keyname[] = {'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0}; IEnumCATEGORYINFOImpl *This; *ret = NULL; @@ -902,7 +884,7 @@ static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret) This->IEnumCATEGORYINFO_iface.lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; This->ref = 1; This->lcid = lcid; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + open_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ, &This->key); *ret = &This->IEnumCATEGORYINFO_iface; return S_OK; @@ -1043,7 +1025,6 @@ static HRESULT WINAPI CLSIDEnumGUID_Clone( IEnumGUID *iface, IEnumGUID **ppenum) { - static const WCHAR keynameW[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This = impl_from_IEnumCLSID(iface); CLSID_IEnumGUIDImpl *cloned; @@ -1067,7 +1048,7 @@ static HRESULT WINAPI CLSIDEnumGUID_Clone( memcpy(cloned->categories, This->categories, This->categories->size); cloned->key = NULL; - open_classes_key(HKEY_CLASSES_ROOT, keynameW, KEY_READ, &cloned->key); + open_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ, &cloned->key); cloned->next_index = This->next_index; *ppenum = &cloned->IEnumGUID_iface; @@ -1087,7 +1068,6 @@ static const IEnumGUIDVtbl CLSIDEnumGUIDVtbl = static HRESULT CLSIDEnumGUID_Construct(struct class_categories *categories, IEnumCLSID **ret) { - static const WCHAR keyname[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This; *ret = NULL; @@ -1098,7 +1078,7 @@ static HRESULT CLSIDEnumGUID_Construct(struct class_categories *categories, IEnu This->IEnumGUID_iface.lpVtbl = &CLSIDEnumGUIDVtbl; This->ref = 1; This->categories = categories; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + open_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ, &This->key); *ret = &This->IEnumGUID_iface; @@ -1265,7 +1245,6 @@ static const IEnumGUIDVtbl CATIDEnumGUIDVtbl = static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGUID **ret) { - static const WCHAR prefixW[] = {'C','L','S','I','D','\\',0}; WCHAR keyname[100], clsidW[CHARS_IN_GUID]; CATID_IEnumGUIDImpl *This; @@ -1278,7 +1257,7 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGU This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; This->ref = 1; - lstrcpyW(keyname, prefixW); + lstrcpyW(keyname, L"CLSID\\"); lstrcatW(keyname, clsidW); lstrcatW(keyname, postfix);

1 0

Nikolay Sivov : ole32/clipboard: Use wide string constants.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: d26ad6db7d5a70c49d051af403d9befe2be7c8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26ad6db7d5a70c49d051af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:20:23 2020 +0300 ole32/clipboard: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 53 +++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index cb6770c05b..01cfda831f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1743,35 +1743,19 @@ static snapshot *snapshot_construct(DWORD seq_no) */ static void register_clipboard_formats(void) { - static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0}; - static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0}; - static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0}; - static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0}; - static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0}; - static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0}; - static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ', - 'D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; - - static const WCHAR WineMarshalledDataObject[] = {'W','i','n','e',' ','M','a','r','s','h','a','l','l','e','d',' ', - 'D','a','t','a','O','b','j','e','c','t',0}; - - ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); - filename_clipboard_format = RegisterClipboardFormatW(FileName); - filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); - dataobject_clipboard_format = RegisterClipboardFormatW(DataObject); - embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject); - embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource); - custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource); - link_source_clipboard_format = RegisterClipboardFormatW(LinkSource); - object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); - link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); - ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); - - wine_marshal_clipboard_format = RegisterClipboardFormatW(WineMarshalledDataObject); + ownerlink_clipboard_format = RegisterClipboardFormatW(L"OwnerLink"); + filename_clipboard_format = RegisterClipboardFormatW(L"FileName"); + filenameW_clipboard_format = RegisterClipboardFormatW(L"FileNameW"); + dataobject_clipboard_format = RegisterClipboardFormatW(L"DataObject"); + embedded_object_clipboard_format = RegisterClipboardFormatW(L"Embedded Object"); + embed_source_clipboard_format = RegisterClipboardFormatW(L"Embed Source"); + custom_link_source_clipboard_format = RegisterClipboardFormatW(L"Custom Link Source"); + link_source_clipboard_format = RegisterClipboardFormatW(L"Link Source"); + object_descriptor_clipboard_format = RegisterClipboardFormatW(L"Object Descriptor"); + link_source_descriptor_clipboard_format = RegisterClipboardFormatW(L"Link Source Descriptor"); + ole_private_data_clipboard_format = RegisterClipboardFormatW(L"Ole Private Data"); + + wine_marshal_clipboard_format = RegisterClipboardFormatW(L"Wine Marshalled DataObject"); } /*********************************************************************** @@ -2026,9 +2010,6 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd ) { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - /* OleUninitialize() does not release the reference to the dataobject, so take an additional reference here. This reference is then leaked. */ if (clipbrd->src_data) @@ -2040,7 +2021,7 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd->window ) { DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); + UnregisterClassW( clipbrd_wndclass, GetModuleHandleW(L"ole32") ); } IStream_Release(clipbrd->marshal_data); @@ -2115,9 +2096,7 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, static HWND create_clipbrd_window(void) { WNDCLASSEXW class; - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - static const WCHAR title[] = {'C','l','i','p','b','o','a','r','d','W','i','n','d','o','w',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); + HINSTANCE hinst = GetModuleHandleW(L"ole32"); class.cbSize = sizeof(class); class.style = 0; @@ -2134,7 +2113,7 @@ static HWND create_clipbrd_window(void) RegisterClassExW(&class); - return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, + return CreateWindowW(clipbrd_wndclass, L"ClipboardWindow", WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); }

1 0

Nikolay Sivov : dxva2: Return single software device for GetVideoProcessorDeviceGuids().
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 88f47823e1e8e188379162f1cf785808f9edb981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88f47823e1e8e188379162f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:25:36 2020 +0300 dxva2: Return single software device for GetVideoProcessorDeviceGuids(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 +- dlls/dxva2/main.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index e3fc2fd6c3..d331512f01 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxva2.dll -IMPORTS = uuid +IMPORTS = uuid ole32 IMPORTLIB = dxva2 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 15d65a5834..22a35c4fbb 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -180,9 +180,15 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { - FIXME("%p, %p, %p, %p.\n", iface, video_desc, count, guids); + FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); - return E_NOTIMPL; + if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) + return E_OUTOFMEMORY; + + memcpy(*guids, &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); + *count = 1; + + return S_OK; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTargets(

1 0

Nikolay Sivov : dxva2: Implement CreateSurface().
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 574fd3d3effa13ad1d4b0ed39d2155a7c03cb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574fd3d3effa13ad1d4b0ed3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:25:35 2020 +0300 dxva2: Implement CreateSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 37 +++++++++++++++++++++++++++++---- dlls/dxva2/tests/dxva2.c | 54 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index dd949b3d31..15d65a5834 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" #include "d3d9.h" @@ -132,12 +133,40 @@ static ULONG WINAPI device_manager_processor_service_Release(IDirectXVideoProces static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVideoProcessorService *iface, UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, - IDirect3DSurface9 **surface, HANDLE *shared_handle) + IDirect3DSurface9 **surfaces, HANDLE *shared_handle) { - FIXME("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, - surface, shared_handle); + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + unsigned int i, j; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + surfaces, shared_handle); + + if (backbuffers >= UINT_MAX) + return E_INVALIDARG; + + memset(surfaces, 0, (backbuffers + 1) * sizeof(*surfaces)); + + for (i = 0; i < backbuffers + 1; ++i) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(manager->device, width, height, format, + pool, &surfaces[i], NULL))) + break; + } + + if (FAILED(hr)) + { + for (j = 0; j < i; ++j) + { + if (surfaces[j]) + { + IDirect3DSurface9_Release(surfaces[j]); + surfaces[j] = NULL; + } + } + } + + return hr; } static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSoftwareDevice( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 49b192a1fa..58b0231420 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -59,13 +59,31 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) return device; } +static void test_surface_desc(IDirect3DSurface9 *surface) +{ + D3DSURFACE_DESC desc = { 0 }; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(desc.Format == D3DFMT_X8R8G8B8, "Unexpected format %d.\n", desc.Format); + ok(desc.Type == D3DRTYPE_SURFACE, "Unexpected type %d.\n", desc.Type); + ok(desc.Usage == 0, "Unexpected usage %d.\n", desc.Usage); + ok(desc.Pool == D3DPOOL_DEFAULT, "Unexpected pool %d.\n", desc.Pool); + ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Unexpected multisample type %d.\n", desc.MultiSampleType); + ok(desc.MultiSampleQuality == 0, "Unexpected multisample quality %d.\n", desc.MultiSampleQuality); + ok(desc.Width == 64, "Unexpected width %u.\n", desc.Width); + ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; IDirectXVideoAccelerationService *accel_service; IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; - IDirect3DSurface9 *surface; + IDirect3DSurface9 *surfaces[2]; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -262,12 +280,20 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + surfaces[0] = surfaces[1] = NULL; + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(!!surfaces[0] && !surfaces[1], "Unexpected surfaces.\n"); + IDirect3DSurface9_Release(surfaces[0]); + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DSurface9_Release(surface); + ok(!!surfaces[0] && !!surfaces[1], "Unexpected surfaces.\n"); + test_surface_desc(surfaces[0]); + IDirect3DSurface9_Release(surfaces[0]); + IDirect3DSurface9_Release(surfaces[1]); IDirectXVideoAccelerationService_Release(accel_service); @@ -281,20 +307,16 @@ todo_wine hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirect3DSurface9_GetDevice(surface, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(device2 == device3, "Unexpected device.\n"); - IDirect3DDevice9_Release(device3); + hr = IDirect3DSurface9_GetDevice(surfaces[0], &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); - IDirect3DSurface9_Release(surface); - } + IDirect3DSurface9_Release(surfaces[0]); IDirectXVideoAccelerationService_Release(accel_service);

1 0

Nikolay Sivov : oleacc: Use wide string constants.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 58285160895f39e0ec396a01e99d8ab28bf5d273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58285160895f39e0ec396a01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 10:43:02 2020 +0300 oleacc: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 3 +-- dlls/oleacc/main.c | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 1d43ec3106..3b33be55a2 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -274,7 +274,6 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { - static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); WCHAR name[1024]; UINT i, len; @@ -293,7 +292,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, if(i+1 >= len) return S_FALSE; - *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + *pszKeyboardShortcut = SysAllocString(L"Alt+!"); if(!*pszKeyboardShortcut) return E_OUTOFMEMORY; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f26abbd117..f6b66a8bca 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,15 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; -static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; -static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; -static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; -static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; -static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; -static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; -static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; - typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; @@ -60,15 +51,15 @@ static struct { accessible_create create_window; } builtin_classes[] = { {WC_LISTBOXW, 0x10000, NULL, NULL}, - {menuW, 0x10001, NULL, NULL}, + {L"#32768", 0x10001, NULL, NULL}, /* menu */ {WC_BUTTONW, 0x10002, NULL, NULL}, {WC_STATICW, 0x10003, NULL, NULL}, {WC_EDITW, 0x10004, NULL, NULL}, {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {dialogW, 0x10006, NULL, NULL}, - {winswitchW, 0x10007, NULL, NULL}, - {mdi_clientW, 0x10008, NULL, NULL}, - {desktopW, 0x10009, NULL, NULL}, + {L"#32770", 0x10006, NULL, NULL}, /* dialog */ + {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ + {L"MDIClient", 0x10008, NULL, NULL}, + {L"#32769", 0x10009, NULL, NULL}, /* desktop */ {WC_SCROLLBARW, 0x1000a, NULL, NULL}, {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, @@ -85,9 +76,9 @@ static struct { {MONTHCAL_CLASSW, 0, NULL, NULL}, {DATETIMEPICK_CLASSW, 0, NULL, NULL}, {WC_IPADDRESSW, 0, NULL, NULL}, - {richeditW, 0x1001c, NULL, NULL}, - {richedit20aW, 0, NULL, NULL}, - {richedit20wW, 0, NULL, NULL}, + {L"RICHEDIT", 0x1001c, NULL, NULL}, + {L"RichEdit20A", 0, NULL, NULL}, + {L"RichEdit20W", 0, NULL, NULL}, }; static HINSTANCE oleacc_handle = 0; @@ -243,7 +234,6 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { - static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; static const LARGE_INTEGER seek_zero = {{0}}; WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; @@ -319,7 +309,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, L"%08x:%08x:%08x", GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) {

1 0

Esme Povirk : gdiplus/tests: Don't test point type array padding.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 6a5eed549de8947e6d789c6e87ae24b58bc979b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5eed549de8947e6d789c6e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 16 16:29:01 2020 -0500 gdiplus/tests: Don't test point type array padding. Since the point types are an array of bytes, padded to a DWORD boundary, some of the bytes at the end are undefined, and there's no good reason to test them. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d69f09db60..04c388bf5a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -641,8 +641,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, - "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + ok((*(buf + 28) & 0xffff) == 0x0101, + "expected ????0101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); @@ -791,9 +791,8 @@ static void test_getregiondata(void) expect_float(buf + 30, 789.799561); expect_dword(buf + 31, 0x03030300); expect_dword(buf + 32, 0x03030301); - ok(*(buf + 33) == 0x00030303 /* before win7 */ || - *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, - "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + ok((*(buf + 33) & 0xffffff) == 0x030303, + "expected 0x??030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); test_region_data(buf, needed, __LINE__);

1 0

Isabella Bosia : vkd3d-shader: Output "isoline" instead of "line" in tessellator domains.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 83c9c2bd7233bd301ecbf7d59eff4943cf2e84d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83c9c2bd7233bd301ecbf7d… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:54 2020 +0100 vkd3d-shader: Output "isoline" instead of "line" in tessellator domains. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index bcdad28..c487eae 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -424,7 +424,7 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE: - shader_addline(buffer, "line"); + shader_addline(buffer, "isoline"); break; case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: shader_addline(buffer, "triangle");

1 0