- wine-devel - winehq.org

[PATCH 2/2] setupapi: Strip trailing spaces from field values.
by Dmitry Timoshkov 10 Sep '20

10 Sep '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/setupapi/parser.c | 12 ++++++++++++ dlls/setupapi/tests/parser.c | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 560c2401b8..f15009be88 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -524,6 +524,17 @@ static int add_section_from_token( struct parser *parser ) } +static void strip_trailing_spaces( WCHAR *text ) +{ + int len = wcslen( text ); + + while (len > 1 && text[len - 1] == ' ') + { + text[len - 1] = 0; + len--; + } +} + /* add a field containing the current token to the current line */ static struct field *add_field_from_token( struct parser *parser, BOOL is_key ) { @@ -542,6 +553,7 @@ static struct field *add_field_from_token( struct parser *parser, BOOL is_key ) else assert(!is_key); text = push_string( parser->file, parser->token ); + strip_trailing_spaces( text ); if ((field = add_field( parser->file, text ))) { if (!is_key) parser->line->nb_fields++; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 4f7736473c..4428413c36 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -821,21 +821,18 @@ static void test_SetupGetStringField(void) ok(ret, "SetupFindFirstLine error %u\n", GetLastError()); ret = SetupGetStringFieldA(&context, 1, buf, sizeof(buf), NULL); ok(ret, "SetupGetStringField error %u\n", GetLastError()); -todo_wine ok(!strcmp(buf, "Company Name.Admin\\InstallerData\\Product Name\\1.2.3.45678_{11111111-1234-5678-1234-567812345678}\\Sources\\Setup.msi"), "got %s\n", buf); ret = SetupFindFirstLineA(hinf, "MSIinstaller", "Name2", &context); ok(ret, "SetupFindFirstLine error %u\n", GetLastError()); ret = SetupGetStringFieldA(&context, 1, buf, sizeof(buf), NULL); ok(ret, "SetupGetStringField error %u\n", GetLastError()); -todo_wine ok(!strcmp(buf, "Company Name.Admin\\InstallerData\\Product Name\\1.2.3.45678_{22222222-1234-5678-1234 -567812345678}\\Sources\\Setup.msi"), "got %s\n", buf); ret = SetupFindFirstLineA(hinf, "MSIinstaller", "Name3", &context); ok(ret, "SetupFindFirstLine error %u\n", GetLastError()); ret = SetupGetStringFieldA(&context, 1, buf, sizeof(buf), NULL); ok(ret, "SetupGetStringField error %u\n", GetLastError()); -todo_wine ok(!strcmp(buf, "Company Name.Admin\\InstallerData\\Product Name\\1.2.3.45678_{33333333-1234-5678-1234-567812345678}\\Sources\\Setup.msi"), "got %s\n", buf); SetupCloseInfFile(hinf); -- 2.26.2

1 0

[PATCH] crypt32: Store CERT_KEY_CONTEXT in a platform independent way.
by Hans Leidekker 10 Sep '20

10 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49792 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/cert.c | 34 ++++++++++++++++++++++++++++++---- dlls/crypt32/crypt32_private.h | 8 ++++++++ dlls/crypt32/serialize.c | 7 +++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e4cab01cd92..13d8df9258e 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -428,6 +428,13 @@ static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, return ret; } +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) +{ + dst->cbSize = sizeof(*dst); + dst->hCryptProv = src->hCryptProv; + dst->dwKeySpec = src->dwKeySpec; +} + static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -441,7 +448,16 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, else ret = FALSE; if (ret) + { + CERT_KEY_CONTEXT ctx; + if (dwPropId == CERT_KEY_CONTEXT_PROP_ID) + { + CRYPT_ConvertKeyContext((const struct store_CERT_KEY_CONTEXT *)blob.pbData, &ctx); + blob.pbData = (BYTE *)&ctx; + blob.cbData = ctx.cbSize; + } ret = CertContext_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); + } else { /* Implicit properties */ @@ -732,6 +748,19 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties return ret; } +static BOOL CertContext_SetKeyContextProperty(CONTEXT_PROPERTY_LIST *properties, + const CERT_KEY_CONTEXT *keyContext) +{ + struct store_CERT_KEY_CONTEXT ctx; + + ctx.cbSize = sizeof(ctx); + ctx.hCryptProv = keyContext->hCryptProv; + ctx.dwKeySpec = keyContext->dwKeySpec; + + return ContextPropertyList_SetProperty(properties, CERT_KEY_CONTEXT_PROP_ID, + (const BYTE *)&ctx, ctx.cbSize); +} + static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, DWORD dwFlags, const void *pvData) { @@ -790,7 +819,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, } break; case CERT_KEY_CONTEXT_PROP_ID: - { if (pvData) { const CERT_KEY_CONTEXT *keyContext = pvData; @@ -801,8 +829,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = FALSE; } else - ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId, - (const BYTE *)keyContext, keyContext->cbSize); + ret = CertContext_SetKeyContextProperty(cert->base.properties, pvData); } else { @@ -810,7 +837,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = TRUE; } break; - } case CERT_KEY_PROV_INFO_PROP_ID: if (pvData) ret = CertContext_SetKeyProvInfoProperty(cert->base.properties, pvData); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d92eb1a1570..c552bdf9498 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -378,6 +378,14 @@ BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, */ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DECLSPEC_HIDDEN; +struct store_CERT_KEY_CONTEXT +{ + DWORD cbSize; + DWORD64 hCryptProv; + DWORD dwKeySpec; +}; +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) DECLSPEC_HIDDEN; + /** * String functions */ diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e8ccc4a06e0..7f7a4bc3691 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -280,6 +280,13 @@ static BOOL CRYPT_ReadContextProp( hdr->propID, 0, pbElement); break; } + case CERT_KEY_CONTEXT_PROP_ID: + { + CERT_KEY_CONTEXT ctx; + CRYPT_ConvertKeyContext((struct store_CERT_KEY_CONTEXT *)pbElement, &ctx); + ret = contextInterface->setProp(context, hdr->propID, 0, &ctx); + break; + } default: ret = FALSE; } -- 2.20.1

1 0

[PATCH] advapi32: Use wide character string literals.
by Hans Leidekker 10 Sep '20

10 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/advapi.c | 6 +- dlls/advapi32/cred.c | 76 ++++------ dlls/advapi32/crypt.c | 81 +++------- dlls/advapi32/lsa.c | 23 +-- dlls/advapi32/security.c | 316 ++++++++++++--------------------------- 5 files changed, 151 insertions(+), 351 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index ebf2d234b52..33c63f3cb20 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -58,8 +58,7 @@ BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size ) */ BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size ) { - static const WCHAR wineusernameW[] = {'W','I','N','E','U','S','E','R','N','A','M','E',0}; - DWORD len = GetEnvironmentVariableW( wineusernameW, name, *size ); + DWORD len = GetEnvironmentVariableW( L"WINEUSERNAME", name, *size ); BOOL ret; if (!len) return FALSE; @@ -273,14 +272,13 @@ typedef UINT (WINAPI *fnMsiProvideComponentFromDescriptor)(LPCWSTR,LPWSTR,DWORD* DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, WCHAR *szCommandLine, DWORD *pcchCommandLine ) { - static const WCHAR szMsi[] = { 'm','s','i',0 }; fnMsiProvideComponentFromDescriptor mpcfd; HMODULE hmsi; UINT r = ERROR_CALL_NOT_IMPLEMENTED; TRACE("%s %p %p\n", debugstr_w(szDescriptor), szCommandLine, pcchCommandLine); - hmsi = LoadLibraryW( szMsi ); + hmsi = LoadLibraryW( L"msi" ); if (!hmsi) return r; mpcfd = (fnMsiProvideComponentFromDescriptor)GetProcAddress( hmsi, diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 86357e6b8f5..de94cb1b876 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -42,19 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cred); /* the size of the ARC4 key used to encrypt the password data */ #define KEY_SIZE 8 -static const WCHAR wszCredentialManagerKey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'C','r','e','d','e','n','t','i','a','l',' ','M','a','n','a','g','e','r',0}; -static const WCHAR wszEncryptionKeyValue[] = {'E','n','c','r','y','p','t','i','o','n','K','e','y',0}; - -static const WCHAR wszFlagsValue[] = {'F','l','a','g','s',0}; -static const WCHAR wszTypeValue[] = {'T','y','p','e',0}; -static const WCHAR wszCommentValue[] = {'C','o','m','m','e','n','t',0}; -static const WCHAR wszLastWrittenValue[] = {'L','a','s','t','W','r','i','t','t','e','n',0}; -static const WCHAR wszPersistValue[] = {'P','e','r','s','i','s','t',0}; -static const WCHAR wszTargetAliasValue[] = {'T','a','r','g','e','t','A','l','i','a','s',0}; -static const WCHAR wszUserNameValue[] = {'U','s','e','r','N','a','m','e',0}; -static const WCHAR wszPasswordValue[] = {'P','a','s','s','w','o','r','d',0}; - static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], LPBYTE credential_blob, DWORD *credential_blob_size) @@ -63,7 +50,7 @@ static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], DWORD type; *credential_blob_size = 0; - ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, NULL, credential_blob_size); + ret = RegQueryValueExW(hkey, L"Password", 0, &type, NULL, credential_blob_size); if (ret != ERROR_SUCCESS) return ret; else if (type != REG_BINARY) @@ -73,7 +60,7 @@ static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], struct ustring data; struct ustring key; - ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, credential_blob, + ret = RegQueryValueExW(hkey, L"Password", 0, &type, credential_blob, credential_blob_size); if (ret != ERROR_SUCCESS) return ret; @@ -113,7 +100,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, buffer += count; } - ret = RegQueryValueExW(hkey, wszCommentValue, 0, &type, NULL, &count); + ret = RegQueryValueExW(hkey, L"Comment", 0, &type, NULL, &count); if (ret != ERROR_FILE_NOT_FOUND && ret != ERROR_SUCCESS) return ret; else if (type != REG_SZ) @@ -122,7 +109,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, if (credential) { credential->Comment = (LPWSTR)buffer; - ret = RegQueryValueExW(hkey, wszCommentValue, 0, &type, (LPVOID)credential->Comment, + ret = RegQueryValueExW(hkey, L"Comment", 0, &type, (LPVOID)credential->Comment, &count); if (ret == ERROR_FILE_NOT_FOUND) credential->Comment = NULL; @@ -134,7 +121,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, buffer += count; } - ret = RegQueryValueExW(hkey, wszTargetAliasValue, 0, &type, NULL, &count); + ret = RegQueryValueExW(hkey, L"TargetAlias", 0, &type, NULL, &count); if (ret != ERROR_FILE_NOT_FOUND && ret != ERROR_SUCCESS) return ret; else if (type != REG_SZ) @@ -143,7 +130,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, if (credential) { credential->TargetAlias = (LPWSTR)buffer; - ret = RegQueryValueExW(hkey, wszTargetAliasValue, 0, &type, (LPVOID)credential->TargetAlias, + ret = RegQueryValueExW(hkey, L"TargetAlias", 0, &type, (LPVOID)credential->TargetAlias, &count); if (ret == ERROR_FILE_NOT_FOUND) credential->TargetAlias = NULL; @@ -155,7 +142,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, buffer += count; } - ret = RegQueryValueExW(hkey, wszUserNameValue, 0, &type, NULL, &count); + ret = RegQueryValueExW(hkey, L"UserName", 0, &type, NULL, &count); if (ret != ERROR_FILE_NOT_FOUND && ret != ERROR_SUCCESS) return ret; else if (type != REG_SZ) @@ -164,7 +151,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, if (credential) { credential->UserName = (LPWSTR)buffer; - ret = RegQueryValueExW(hkey, wszUserNameValue, 0, &type, (LPVOID)credential->UserName, + ret = RegQueryValueExW(hkey, L"UserName", 0, &type, (LPVOID)credential->UserName, &count); if (ret == ERROR_FILE_NOT_FOUND) credential->UserName = NULL; @@ -201,14 +188,14 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, if (!credential) return ERROR_SUCCESS; count = sizeof(credential->Flags); - ret = RegQueryValueExW(hkey, wszFlagsValue, NULL, &type, (LPVOID)&credential->Flags, + ret = RegQueryValueExW(hkey, L"Flags", NULL, &type, (LPVOID)&credential->Flags, &count); if (ret != ERROR_SUCCESS) return ret; else if (type != REG_DWORD) return ERROR_REGISTRY_CORRUPT; count = sizeof(credential->Type); - ret = RegQueryValueExW(hkey, wszTypeValue, NULL, &type, (LPVOID)&credential->Type, + ret = RegQueryValueExW(hkey, L"Type", NULL, &type, (LPVOID)&credential->Type, &count); if (ret != ERROR_SUCCESS) return ret; @@ -216,14 +203,14 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, return ERROR_REGISTRY_CORRUPT; count = sizeof(credential->LastWritten); - ret = RegQueryValueExW(hkey, wszLastWrittenValue, NULL, &type, (LPVOID)&credential->LastWritten, + ret = RegQueryValueExW(hkey, L"LastWritten", NULL, &type, (LPVOID)&credential->LastWritten, &count); if (ret != ERROR_SUCCESS) return ret; else if (type != REG_BINARY) return ERROR_REGISTRY_CORRUPT; count = sizeof(credential->Persist); - ret = RegQueryValueExW(hkey, wszPersistValue, NULL, &type, (LPVOID)&credential->Persist, + ret = RegQueryValueExW(hkey, L"Persist", NULL, &type, (LPVOID)&credential->Persist, &count); if (ret == ERROR_SUCCESS && type != REG_DWORD) return ERROR_REGISTRY_CORRUPT; @@ -250,7 +237,7 @@ static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, data.Buffer = encrypted_credential_blob; SystemFunction032(&data, &key); - ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, encrypted_credential_blob, credential_blob_size); + ret = RegSetValueExW(hkey, L"Password", 0, REG_BINARY, encrypted_credential_blob, credential_blob_size); heap_free(encrypted_credential_blob); return ret; @@ -264,10 +251,10 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, GetSystemTimeAsFileTime(&LastWritten); - ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (const BYTE*)&credential->Flags, + ret = RegSetValueExW(hkey, L"Flags", 0, REG_DWORD, (const BYTE*)&credential->Flags, sizeof(credential->Flags)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (const BYTE*)&credential->Type, + ret = RegSetValueExW(hkey, L"Type", 0, REG_DWORD, (const BYTE*)&credential->Type, sizeof(credential->Type)); if (ret != ERROR_SUCCESS) return ret; ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (LPVOID)credential->TargetName, @@ -275,26 +262,26 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, if (ret != ERROR_SUCCESS) return ret; if (credential->Comment) { - ret = RegSetValueExW(hkey, wszCommentValue, 0, REG_SZ, (LPVOID)credential->Comment, + ret = RegSetValueExW(hkey, L"Comment", 0, REG_SZ, (LPVOID)credential->Comment, sizeof(WCHAR)*(lstrlenW(credential->Comment)+1)); if (ret != ERROR_SUCCESS) return ret; } - ret = RegSetValueExW(hkey, wszLastWrittenValue, 0, REG_BINARY, (LPVOID)&LastWritten, + ret = RegSetValueExW(hkey, L"LastWritten", 0, REG_BINARY, (LPVOID)&LastWritten, sizeof(LastWritten)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (const BYTE*)&credential->Persist, + ret = RegSetValueExW(hkey, L"Persist", 0, REG_DWORD, (const BYTE*)&credential->Persist, sizeof(credential->Persist)); if (ret != ERROR_SUCCESS) return ret; /* FIXME: Attributes */ if (credential->TargetAlias) { - ret = RegSetValueExW(hkey, wszTargetAliasValue, 0, REG_SZ, (LPVOID)credential->TargetAlias, + ret = RegSetValueExW(hkey, L"TargetAlias", 0, REG_SZ, (LPVOID)credential->TargetAlias, sizeof(WCHAR)*(lstrlenW(credential->TargetAlias)+1)); if (ret != ERROR_SUCCESS) return ret; } if (credential->UserName) { - ret = RegSetValueExW(hkey, wszUserNameValue, 0, REG_SZ, (LPVOID)credential->UserName, + ret = RegSetValueExW(hkey, L"UserName", 0, REG_SZ, (LPVOID)credential->UserName, sizeof(WCHAR)*(lstrlenW(credential->UserName)+1)); if (ret != ERROR_SUCCESS) return ret; } @@ -377,7 +364,7 @@ static DWORD host_write_credential( const CREDENTIALW *credential, BOOL preserve static DWORD open_cred_mgr_key(HKEY *hkey, BOOL open_for_write) { - return RegCreateKeyExW(HKEY_CURRENT_USER, wszCredentialManagerKey, 0, + return RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Wine\\Credential Manager", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | (open_for_write ? KEY_WRITE : 0), NULL, hkey, NULL); } @@ -395,7 +382,7 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) memcpy(key_data, my_key_data, KEY_SIZE); count = KEY_SIZE; - ret = RegQueryValueExW(hkeyMgr, wszEncryptionKeyValue, NULL, &type, key_data, + ret = RegQueryValueExW(hkeyMgr, L"EncryptionKey", NULL, &type, key_data, &count); if (ret == ERROR_SUCCESS) { @@ -415,14 +402,14 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) value = RtlUniform(&seed); *(DWORD *)(key_data + 4) = value; - ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, + ret = RegSetValueExW(hkeyMgr, L"EncryptionKey", 0, REG_BINARY, key_data, KEY_SIZE); if (ret == ERROR_ACCESS_DENIED) { ret = open_cred_mgr_key(&hkeyMgr, TRUE); if (ret == ERROR_SUCCESS) { - ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, + ret = RegSetValueExW(hkeyMgr, L"EncryptionKey", 0, REG_BINARY, key_data, KEY_SIZE); RegCloseKey(hkeyMgr); } @@ -432,8 +419,6 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) { - static const WCHAR wszGenericPrefix[] = {'G','e','n','e','r','i','c',':',' ',0}; - static const WCHAR wszDomPasswdPrefix[] = {'D','o','m','P','a','s','s','w','d',':',' ',0}; INT len; LPCWSTR prefix = NULL; LPWSTR key_name, p; @@ -441,13 +426,13 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) len = lstrlenW(target_name); if (type == CRED_TYPE_GENERIC) { - prefix = wszGenericPrefix; - len += ARRAY_SIZE(wszGenericPrefix); + prefix = L"Generic: "; + len += ARRAY_SIZE(L"Generic: "); } else { - prefix = wszDomPasswdPrefix; - len += ARRAY_SIZE(wszDomPasswdPrefix); + prefix = L"DomPasswd: "; + len += ARRAY_SIZE(L"DomPasswd: "); } key_name = heap_alloc(len * sizeof(WCHAR)); @@ -916,7 +901,6 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, #define CRED_DATA_SIZE 2048 static DWORD host_enumerate_credentials( const WCHAR *filter, CREDENTIALW **credentials, char *buf, DWORD *len, DWORD *count ) { - static const WCHAR emptyW[] = {0}; struct mountmgr_credential_list *list, *tmp; DWORD i, j, ret, size, filter_size, offset = 0; HANDLE mgr; @@ -925,8 +909,8 @@ static DWORD host_enumerate_credentials( const WCHAR *filter, CREDENTIALW **cred if (filter) filter_size = (lstrlenW( filter ) + 1) * sizeof(WCHAR); else { - filter = emptyW; - filter_size = sizeof(emptyW); + filter = L""; + filter_size = sizeof(L""); } mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 2877c61bf69..e28b6f96699 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -59,13 +59,7 @@ static HWND crypt_hWindow; static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) { - static const WCHAR KEYSTR[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\',0 - }; + static const WCHAR KEYSTR[] = L"Software\\Microsoft\\Cryptography\\Defaults\\Provider\\"; PWSTR keyname; keyname = CRYPT_Alloc((lstrlenW(KEYSTR) + lstrlenW(pProvName) +1)*sizeof(WCHAR)); @@ -80,20 +74,8 @@ static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) { - static const WCHAR MACHINESTR[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r',' ','T','y','p','e','s','\\', - 'T','y','p','e',' ','X','X','X',0 - }; - static const WCHAR USERSTR[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'P','r','o','v','i','d','e','r',' ','T','y','p','e',' ','X','X','X',0 - }; + static const WCHAR MACHINESTR[] = L"Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX"; + static const WCHAR USERSTR[] = L"Software\\Microsoft\\Cryptography\\Provider Type XXX"; PWSTR keyname; PWSTR ptr; @@ -272,22 +254,16 @@ error: static void CRYPT_CreateMachineGuid(void) { - static const WCHAR cryptographyW[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y',0 }; - static const WCHAR machineGuidW[] = { - 'M','a','c','h','i','n','e','G','u','i','d',0 }; LONG r; HKEY key; - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Cryptography", 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &key); if (!r) { DWORD size; - r = RegQueryValueExW(key, machineGuidW, NULL, NULL, NULL, &size); + r = RegQueryValueExW(key, L"MachineGuid", NULL, NULL, NULL, &size); if (r == ERROR_FILE_NOT_FOUND) { UUID uuid; @@ -301,7 +277,7 @@ static void CRYPT_CreateMachineGuid(void) uuid.Data4[2], uuid.Data4[3], uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7] ); - RegSetValueExW(key, machineGuidW, 0, REG_SZ, + RegSetValueExW(key, L"MachineGuid", 0, REG_SZ, (const BYTE *)buf, (lstrlenW(buf)+1)*sizeof(WCHAR)); } @@ -351,9 +327,6 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, PSTR provnameA = NULL, pszContainerA = NULL; DWORD keytype, type, len; ULONG r; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR typeW[] = {'T','y','p','e',0}; - static const WCHAR imagepathW[] = {'I','m','a','g','e',' ','P','a','t','h',0}; TRACE("(%p, %s, %s, %d, %08x)\n", phProv, debugstr_w(pszContainer), debugstr_w(pszProvider), dwProvType, dwFlags); @@ -401,7 +374,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, } } CRYPT_Free(keyname); - r = RegQueryValueExW(key, nameW, NULL, &keytype, NULL, &len); + r = RegQueryValueExW(key, L"Name", NULL, &keytype, NULL, &len); if( r != ERROR_SUCCESS || !len || keytype != REG_SZ) { TRACE("error %d reading size of 'Name' from registry\n", r ); @@ -415,7 +388,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - r = RegQueryValueExW(key, nameW, NULL, NULL, (LPBYTE)provname, &len); + r = RegQueryValueExW(key, L"Name", NULL, NULL, (LPBYTE)provname, &len); if( r != ERROR_SUCCESS ) { TRACE("error %d reading 'Name' from registry\n", r ); @@ -442,7 +415,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, goto error; } len = sizeof(DWORD); - r = RegQueryValueExW(key, typeW, NULL, NULL, (BYTE*)&type, &len); + r = RegQueryValueExW(key, L"Type", NULL, NULL, (BYTE*)&type, &len); if (r != ERROR_SUCCESS) { SetLastError(NTE_PROV_TYPE_ENTRY_BAD); @@ -455,7 +428,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, goto error; } - r = RegQueryValueExW(key, imagepathW, NULL, &keytype, NULL, &len); + r = RegQueryValueExW(key, L"Image Path", NULL, &keytype, NULL, &len); if ( r != ERROR_SUCCESS || keytype != REG_SZ) { TRACE("error %d reading size of 'Image Path' from registry\n", r ); @@ -469,7 +442,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - r = RegQueryValueExW(key, imagepathW, NULL, NULL, (LPBYTE)temp, &len); + r = RegQueryValueExW(key, L"Image Path", NULL, NULL, (LPBYTE)temp, &len); if( r != ERROR_SUCCESS ) { TRACE("error %d reading 'Image Path' from registry\n", r ); @@ -1125,14 +1098,6 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR pszProvName, DWORD *pcbProvName) { HKEY hKey; - static const WCHAR providerW[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r',0 - }; - static const WCHAR typeW[] = {'T','y','p','e',0}; BOOL ret; TRACE("(%d, %p, %d, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, @@ -1149,7 +1114,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, return FALSE; } - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, providerW, &hKey)) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) { SetLastError(NTE_FAIL); return FALSE; @@ -1199,7 +1164,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, return FALSE; } - if (RegQueryValueExW(subkey, typeW, NULL, NULL, (BYTE*)pdwProvType, &size)) + if (RegQueryValueExW(subkey, L"Type", NULL, NULL, (BYTE*)pdwProvType, &size)) ret = FALSE; RegCloseKey(subkey); @@ -1275,14 +1240,6 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, DWORD keylen, numkeys, dwType; PWSTR keyname, ch; DWORD result; - static const WCHAR KEYSTR[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r',' ','T','y','p','e','s',0 - }; - static const WCHAR typenameW[] = {'T','y','p','e','N','a','m','e',0}; TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); @@ -1298,7 +1255,7 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, return FALSE; } - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, KEYSTR, &hKey)) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) return FALSE; RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numkeys, &keylen, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1330,7 +1287,7 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, *pdwProvType += (*(--ch) - '0') * 100; CRYPT_Free(keyname); - result = RegQueryValueExW(hSubkey, typenameW, NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); + result = RegQueryValueExW(hSubkey, L"TypeName", NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); if (result) { SetLastError(result); @@ -1494,7 +1451,6 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, HKEY hKey; PWSTR keyname; DWORD result; - static const WCHAR nameW[] = {'N','a','m','e',0}; if (pdwReserved || !pcbProvName) { @@ -1524,7 +1480,7 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, } CRYPT_Free(keyname); - result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + result = RegQueryValueExW(hKey, L"Name", NULL, NULL, (LPBYTE)pszProvName, pcbProvName); RegCloseKey(hKey); if (result) @@ -2057,7 +2013,6 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p { HKEY hProvKey, hTypeKey; PWSTR keyname; - static const WCHAR nameW[] = {'N','a','m','e',0}; TRACE("(%s, %d, %p, %08x)\n", debugstr_w(pszProvName), dwProvType, pdwReserved, dwFlags); @@ -2094,7 +2049,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p if (dwFlags & CRYPT_DELETE_DEFAULT) { - RegDeleteValueW(hTypeKey, nameW); + RegDeleteValueW(hTypeKey, L"Name"); } else { @@ -2114,7 +2069,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p } CRYPT_Free(keyname); - if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName, + if (RegSetValueExW(hTypeKey, L"Name", 0, REG_SZ, (const BYTE *)pszProvName, (lstrlenW(pszProvName) + 1)*sizeof(WCHAR))) { RegCloseKey(hTypeKey); diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 45b82c72c73..bd3585f8d06 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -69,19 +69,11 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) BYTE* ptr = NULL; UNICODE_STRING* ustr; - static const WCHAR wVNETSUP[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s','\\', - 'V','x','D','\\','V','N','E','T','S','U','P','\0'}; - - ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wVNETSUP, 0, KEY_READ, &key); + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, KEY_READ, &key); if (ret == ERROR_SUCCESS) { DWORD size = 0; - static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; - - ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); + ret = RegQueryValueExW(key, L"Workgroup", NULL, NULL, NULL, &size); if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) { ptr = heap_alloc_zero(sz + size); @@ -89,7 +81,7 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) ustr = (UNICODE_STRING*)(ptr + ofs); ustr->MaximumLength = size; ustr->Buffer = (WCHAR*)(ptr + sz); - ret = RegQueryValueExW(key, wg, NULL, NULL, (LPBYTE)ustr->Buffer, &size); + ret = RegQueryValueExW(key, L"Workgroup", NULL, NULL, (LPBYTE)ustr->Buffer, &size); if (ret != ERROR_SUCCESS) { heap_free(ptr); @@ -101,14 +93,13 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) } if (!ptr) { - static const WCHAR wDomain[] = {'D','O','M','A','I','N','\0'}; - ptr = heap_alloc_zero(sz + sizeof(wDomain)); + ptr = heap_alloc_zero(sz + sizeof(L"DOMAIN")); if (!ptr) return NULL; ustr = (UNICODE_STRING*)(ptr + ofs); - ustr->MaximumLength = sizeof(wDomain); + ustr->MaximumLength = sizeof(L"DOMAIN"); ustr->Buffer = (WCHAR*)(ptr + sz); - ustr->Length = sizeof(wDomain) - sizeof(WCHAR); - memcpy(ustr->Buffer, wDomain, sizeof(wDomain)); + ustr->Length = sizeof(L"DOMAIN") - sizeof(WCHAR); + memcpy(ustr->Buffer, L"DOMAIN", sizeof(L"DOMAIN")); } return ptr; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 943386abe8e..a01791bbf0b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -63,116 +63,52 @@ typedef struct _AccountSid { LPCWSTR alias; } AccountSid; -static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; -static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; -static const WCHAR ALL_APPLICATION_PACKAGES[] = { 'A','L','L',' ','A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E','S',0 }; -static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; -static const WCHAR APPLICATION_PACKAGE_AUTHORITY[] = { 'A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E',' ','A','U','T','H','O','R','I','T','Y',0 }; -static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; -static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; -static const WCHAR Blank[] = { 0 }; -static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; -static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; -static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; -static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; -static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; -static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; -static const WCHAR CURRENT_USER[] = { 'C','U','R','R','E','N','T','_','U','S','E','R',0 }; -static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; -static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; -static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; -static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; -static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR None[] = { 'N','o','n','e',0 }; -static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; -static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; -static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; -static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; -static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; -static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; -static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; -static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; -static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR LOCAL_SERVICE2[] = { 'L','O','C','A','L','S','E','R','V','I','C','E',0 }; -static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; -static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR NETWORK_SERVICE2[] = { 'N','E','T','W','O','R','K','S','E','R','V','I','C','E',0 }; -static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; -static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; -static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; -static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; -static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; -static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; -static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; -static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; -static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; -static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; -static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; -static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; -static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; -static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; -static const WCHAR SELF[] = { 'S','E','L','F',0 }; -static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; -static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; -static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; -static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Users[] = { 'U','s','e','r','s',0 }; - static const AccountSid ACCOUNT_SIDS[] = { - { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, - { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, - { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, - { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, - { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, - { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, - { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, - { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, - { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup, LOCAL_SERVICE2 }, - { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup , NETWORK_SERVICE2}, - { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, - { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, - { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, - { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, - { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, - { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, - { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, - { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinAnyPackageSid, ALL_APPLICATION_PACKAGES, APPLICATION_PACKAGE_AUTHORITY, SidTypeWellKnownGroup }, + { WinNullSid, L"NULL SID", L"", SidTypeWellKnownGroup }, + { WinWorldSid, L"Everyone", L"", SidTypeWellKnownGroup }, + { WinLocalSid, L"LOCAL", L"", SidTypeWellKnownGroup }, + { WinCreatorOwnerSid, L"CREATOR OWNER", L"", SidTypeWellKnownGroup }, + { WinCreatorGroupSid, L"CREATOR GROUP", L"", SidTypeWellKnownGroup }, + { WinCreatorOwnerServerSid, L"CREATOR OWNER SERVER", L"", SidTypeWellKnownGroup }, + { WinCreatorGroupServerSid, L"CREATOR GROUP SERVER", L"", SidTypeWellKnownGroup }, + { WinNtAuthoritySid, L"NT Pseudo Domain", L"NT Pseudo Domain", SidTypeDomain }, + { WinDialupSid, L"DIALUP", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinNetworkSid, L"NETWORK", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinBatchSid, L"BATCH", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinInteractiveSid, L"INTERACTIVE", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinServiceSid, L"SERVICE", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinAnonymousSid, L"ANONYMOUS LOGON", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinProxySid, L"PROXY", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinEnterpriseControllersSid, L"ENTERPRISE DOMAIN CONTROLLERS", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinSelfSid, L"SELF", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinAuthenticatedUserSid, L"Authenticated Users", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinRestrictedCodeSid, L"RESTRICTED", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinTerminalServerSid, L"TERMINAL SERVER USER", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinRemoteLogonIdSid, L"REMOTE INTERACTIVE LOGON", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinLocalSystemSid, L"SYSTEM", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinLocalServiceSid, L"LOCAL SERVICE", L"NT AUTHORITY", SidTypeWellKnownGroup, L"LOCALSERVICE" }, + { WinNetworkServiceSid, L"NETWORK SERVICE", L"NT AUTHORITY", SidTypeWellKnownGroup , L"NETWORKSERVICE"}, + { WinBuiltinDomainSid, L"BUILTIN", L"BUILTIN", SidTypeDomain }, + { WinBuiltinAdministratorsSid, L"Administrators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinUsersSid, L"Users", L"BUILTIN", SidTypeAlias }, + { WinBuiltinGuestsSid, L"Guests", L"BUILTIN", SidTypeAlias }, + { WinBuiltinPowerUsersSid, L"Power Users", L"BUILTIN", SidTypeAlias }, + { WinBuiltinAccountOperatorsSid, L"Account Operators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinSystemOperatorsSid, L"Server Operators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinPrintOperatorsSid, L"Print Operators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinBackupOperatorsSid, L"Backup Operators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinReplicatorSid, L"Replicators", L"BUILTIN", SidTypeAlias }, + { WinBuiltinPreWindows2000CompatibleAccessSid, L"Pre-Windows 2000 Compatible Access", L"BUILTIN", SidTypeAlias }, + { WinBuiltinRemoteDesktopUsersSid, L"Remote Desktop Users", L"BUILTIN", SidTypeAlias }, + { WinBuiltinNetworkConfigurationOperatorsSid, L"Network Configuration Operators", L"BUILTIN", SidTypeAlias }, + { WinNTLMAuthenticationSid, L"NTML Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinDigestAuthenticationSid, L"Digest Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinSChannelAuthenticationSid, L"SChannel Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinThisOrganizationSid, L"This Organization", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinOtherOrganizationSid, L"Other Organization", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinBuiltinPerfMonitoringUsersSid, L"Performance Monitor Users", L"BUILTIN", SidTypeAlias }, + { WinBuiltinPerfLoggingUsersSid, L"Performance Log Users", L"BUILTIN", SidTypeAlias }, + { WinBuiltinAnyPackageSid, L"ALL APPLICATION PACKAGES", L"APPLICATION PACKAGE AUTHORITY", SidTypeWellKnownGroup }, }; const char * debugstr_sid(PSID sid) @@ -265,22 +201,18 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = wcschr(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; if (!p) return ERROR_INVALID_PARAMETER; - if (wcsncmp( full_key_name, classes_rootW, len ) == 0) + if (!wcsncmp( full_key_name, L"CLASSES_ROOT", len )) hParent = HKEY_CLASSES_ROOT; - else if (wcsncmp( full_key_name, current_userW, len ) == 0) + else if (!wcsncmp( full_key_name, L"CURRENT_USER", len )) hParent = HKEY_CURRENT_USER; - else if (wcsncmp( full_key_name, machineW, len ) == 0) + else if (!wcsncmp( full_key_name, L"MACHINE", len )) hParent = HKEY_LOCAL_MACHINE; - else if (wcsncmp( full_key_name, usersW, len ) == 0) + else if (!wcsncmp( full_key_name, L"USERS", len )) hParent = HKEY_USERS; else return ERROR_INVALID_PARAMETER; @@ -519,99 +451,39 @@ done: return ret; } - -static const WCHAR SE_CREATE_TOKEN_NAME_W[] = - { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME_W[] = - { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOCK_MEMORY_NAME_W[] = - { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INCREASE_QUOTA_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','Q','u','o','t','a','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MACHINE_ACCOUNT_NAME_W[] = - { 'S','e','M','a','c','h','i','n','e','A','c','c','o','u','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TCB_NAME_W[] = - { 'S','e','T','c','b','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SECURITY_NAME_W[] = - { 'S','e','S','e','c','u','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TAKE_OWNERSHIP_NAME_W[] = - { 'S','e','T','a','k','e','O','w','n','e','r','s','h','i','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOAD_DRIVER_NAME_W[] = - { 'S','e','L','o','a','d','D','r','i','v','e','r','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_PROFILE_NAME_W[] = - { 'S','e','S','y','s','t','e','m','P','r','o','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEMTIME_NAME_W[] = - { 'S','e','S','y','s','t','e','m','t','i','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_PROF_SINGLE_PROCESS_NAME_W[] = - { 'S','e','P','r','o','f','i','l','e','S','i','n','g','l','e','P','r','o','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INC_BASE_PRIORITY_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','B','a','s','e','P','r','i','o','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PAGEFILE_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','a','g','e','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PERMANENT_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','e','r','m','a','n','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_BACKUP_NAME_W[] = - { 'S','e','B','a','c','k','u','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_RESTORE_NAME_W[] = - { 'S','e','R','e','s','t','o','r','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SHUTDOWN_NAME_W[] = - { 'S','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_DEBUG_NAME_W[] = - { 'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_AUDIT_NAME_W[] = - { 'S','e','A','u','d','i','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_ENVIRONMENT_NAME_W[] = - { 'S','e','S','y','s','t','e','m','E','n','v','i','r','o','n','m','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CHANGE_NOTIFY_NAME_W[] = - { 'S','e','C','h','a','n','g','e','N','o','t','i','f','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_REMOTE_SHUTDOWN_NAME_W[] = - { 'S','e','R','e','m','o','t','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_UNDOCK_NAME_W[] = - { 'S','e','U','n','d','o','c','k','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYNC_AGENT_NAME_W[] = - { 'S','e','S','y','n','c','A','g','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ENABLE_DELEGATION_NAME_W[] = - { 'S','e','E','n','a','b','l','e','D','e','l','e','g','a','t','i','o','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MANAGE_VOLUME_NAME_W[] = - { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_IMPERSONATE_NAME_W[] = - { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_GLOBAL_NAME_W[] = - { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; - static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = { NULL, NULL, - SE_CREATE_TOKEN_NAME_W, - SE_ASSIGNPRIMARYTOKEN_NAME_W, - SE_LOCK_MEMORY_NAME_W, - SE_INCREASE_QUOTA_NAME_W, - SE_MACHINE_ACCOUNT_NAME_W, - SE_TCB_NAME_W, - SE_SECURITY_NAME_W, - SE_TAKE_OWNERSHIP_NAME_W, - SE_LOAD_DRIVER_NAME_W, - SE_SYSTEM_PROFILE_NAME_W, - SE_SYSTEMTIME_NAME_W, - SE_PROF_SINGLE_PROCESS_NAME_W, - SE_INC_BASE_PRIORITY_NAME_W, - SE_CREATE_PAGEFILE_NAME_W, - SE_CREATE_PERMANENT_NAME_W, - SE_BACKUP_NAME_W, - SE_RESTORE_NAME_W, - SE_SHUTDOWN_NAME_W, - SE_DEBUG_NAME_W, - SE_AUDIT_NAME_W, - SE_SYSTEM_ENVIRONMENT_NAME_W, - SE_CHANGE_NOTIFY_NAME_W, - SE_REMOTE_SHUTDOWN_NAME_W, - SE_UNDOCK_NAME_W, - SE_SYNC_AGENT_NAME_W, - SE_ENABLE_DELEGATION_NAME_W, - SE_MANAGE_VOLUME_NAME_W, - SE_IMPERSONATE_NAME_W, - SE_CREATE_GLOBAL_NAME_W, + L"SeCreateTokenPrivilege", + L"SeAssignPrimaryTokenPrivilege", + L"SeLockMemoryPrivilege", + L"SeIncreaseQuotaPrivilege", + L"SeMachineAccountPrivilege", + L"SeTcbPrivilege", + L"SeSecurityPrivilege", + L"SeTakeOwnershipPrivilege", + L"SeLoadDriverPrivilege", + L"SeSystemProfilePrivilege", + L"SeSystemtimePrivilege", + L"SeProfileSingleProcessPrivilege", + L"SeIncreaseBasePriorityPrivilege", + L"SeCreatePagefilePrivilege", + L"SeCreatePermanentPrivilege", + L"SeBackupPrivilege", + L"SeRestorePrivilege", + L"SeShutdownPrivilege", + L"SeDebugPrivilege", + L"SeAuditPrivilege", + L"SeSystemEnvironmentPrivilege", + L"SeChangeNotifyPrivilege", + L"SeRemoteShutdownPrivilege", + L"SeUndockPrivilege", + L"SeSyncAgentPrivilege", + L"SeEnableDelegationPrivilege", + L"SeManageVolumePrivilege", + L"SeImpersonatePrivilege", + L"SeCreateGlobalPrivilege", }; const WCHAR *get_wellknown_privilege_name(const LUID *luid) @@ -1001,7 +873,7 @@ LookupAccountSidW( if (result) { if (EqualSid(sid, &local)) { dm = computer_name; - ac = Blank; + ac = L""; use = 3; } else { local.SubAuthorityCount++; @@ -1011,41 +883,41 @@ LookupAccountSidW( use = 1; switch (((MAX_SID *)sid)->SubAuthority[4]) { case DOMAIN_USER_RID_ADMIN: - ac = Administrator; + ac = L"Administrator"; break; case DOMAIN_USER_RID_GUEST: - ac = Guest; + ac = L"Guest"; break; case DOMAIN_GROUP_RID_ADMINS: - ac = Domain_Admins; + ac = L"Domain Admins"; break; case DOMAIN_GROUP_RID_USERS: - ac = None; + ac = L"None"; use = SidTypeGroup; break; case DOMAIN_GROUP_RID_GUESTS: - ac = Domain_Guests; + ac = L"Domain Guests"; break; case DOMAIN_GROUP_RID_COMPUTERS: - ac = Domain_Computers; + ac = L"Domain Computers"; break; case DOMAIN_GROUP_RID_CONTROLLERS: - ac = Domain_Controllers; + ac = L"Domain Controllers"; break; case DOMAIN_GROUP_RID_CERT_ADMINS: - ac = Cert_Publishers; + ac = L"Cert Publishers"; break; case DOMAIN_GROUP_RID_SCHEMA_ADMINS: - ac = Schema_Admins; + ac = L"Schema Admins"; break; case DOMAIN_GROUP_RID_ENTERPRISE_ADMINS: - ac = Enterprise_Admins; + ac = L"Enterprise Admins"; break; case DOMAIN_GROUP_RID_POLICY_ADMINS: - ac = Group_Policy_Creator_Owners; + ac = L"Group Policy Creator Owners"; break; case DOMAIN_ALIAS_RID_RAS_SERVERS: - ac = RAS_and_IAS_Servers; + ac = L"RAS and IAS Servers"; break; case 1000: /* first user account */ size = UNLEN + 1; @@ -1519,9 +1391,9 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI return FALSE; } - if (!lpAccountName || !wcscmp( lpAccountName, Blank )) + if (!lpAccountName || !wcscmp( lpAccountName, L"" )) { - lpAccountName = BUILTIN; + lpAccountName = L"BUILTIN"; } RtlInitUnicodeString( &account, lpAccountName ); @@ -2146,7 +2018,7 @@ static DWORD trustee_to_sid( DWORD nDestinationSidLength, PSID pDestinationSid, DWORD sid_size = nDestinationSidLength; DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; SID_NAME_USE use; - if (!wcscmp( pTrustee->ptstrName, CURRENT_USER )) + if (!wcscmp( pTrustee->ptstrName, L"CURRENT_USER" )) { if (!lookup_user_account_name( pDestinationSid, &sid_size, NULL, &domain_size, &use )) { -- 2.20.1

1 0

[PATCH v3 1/4] msxml3: Use msxml6 header for defining GUIDs.
by Alistair Leslie-Hughes 10 Sep '20

10 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/factory.c | 2 +- dlls/msxml3/uuid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 445cfbf730..3be974c58a 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -34,7 +34,7 @@ #include "winuser.h" #include "ole2.h" #include "msxml.h" -#include "msxml2.h" +#include "msxml6.h" #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index 4abbe5e476..7403b27c72 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -39,7 +39,7 @@ /* Now we can initialize the rest of the uuids */ #include "initguid.h" -#include "msxml2.h" +#include "msxml6.h" /* * Note that because of a #define in msxml2.h, we end up initializing -- 2.28.0

2 1

[PATCH v3 3/4] include: Remove interfaces already define in msxml6.idl
by Alistair Leslie-Hughes 10 Sep '20

10 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml2.idl | 109 --------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index cfafc42133..a2d72d2063 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1605,15 +1605,6 @@ coclass FreeThreadedDOMDocument40 [default, source] dispinterface XMLDOMDocumentEvents; } -[ - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - [ helpstring("Free threaded XML DOM Document"), progid("Msxml2.FreeThreadedDOMDocument"), @@ -1655,14 +1646,6 @@ coclass XMLHTTP40 [default] interface IXMLHTTPRequest; } -[ - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - [ helpstring("XML HTTP"), progid("Msxml2.XMLHTTP"), @@ -1695,14 +1678,6 @@ coclass ServerXMLHTTP40 [default] interface IServerXMLHTTPRequest2; } -[ - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - [ helpstring("Server XML HTTP"), progid("Msxml2.ServerXMLHTTP"), @@ -1743,14 +1718,6 @@ coclass XMLSchemaCache40 [default] interface IXMLDOMSchemaCollection2; } -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - [ helpstring("XML Schema Cache"), progid("Msxml2.XMLSchemaCache"), @@ -1791,14 +1758,6 @@ coclass XSLTemplate40 [default] interface IXSLTemplate; } -[ - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - [ helpstring("XSL Template"), progid("Msxml2.XSLTemplate"), @@ -3290,15 +3249,6 @@ coclass SAXXMLReader40 interface ISAXXMLReader; } -[ - uuid(88d96a0c-f192-11d4-a65f-0040963251e5) -] -coclass SAXXMLReader60 -{ - [default] interface IVBSAXXMLReader; - interface ISAXXMLReader; -} - [ helpstring("SAX XML Reader"), progid("Msxml2.SAXXMLReader"), @@ -3373,26 +3323,6 @@ coclass MXHTMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a10-f192-11d4-a65f-0040963251e5) -] -coclass MXHTMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter 3.0"), progid("Msxml2.MXXMLWriter.3.0"), @@ -3437,26 +3367,6 @@ coclass MXXMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a0f-f192-11d4-a65f-0040963251e5) -] -coclass MXXMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter"), progid("Msxml2.MXXMLWriter"), @@ -3499,15 +3409,6 @@ coclass MXNamespaceManager40 interface IMXNamespaceManager; } -[ - uuid(88d96a11-f192-11d4-a65f-0040963251e5) -] -coclass MXNamespaceManager60 -{ - [default] interface IVBMXNamespaceManager; - interface IMXNamespaceManager; -} - [ helpstring("SAXAttributes 3.0"), progid("Msxml2.SAXAttributes.3.0"), @@ -3532,16 +3433,6 @@ coclass SAXAttributes40 interface ISAXAttributes; } -[ - uuid(88d96a0e-f192-11d4-a65f-0040963251e5) -] -coclass SAXAttributes60 -{ - [default] interface IMXAttributes; - interface IVBSAXAttributes; - interface ISAXAttributes; -} - [ helpstring("SAXAttributes"), progid("Msxml2.SAXAttributes"), -- 2.28.0

2 1

[PATCH v2] msxml3: Fix a memory leak (Valgrind).
by Yongjie Yao 10 Sep '20

10 Sep '20

==1461== 8 bytes in 1 blocks are possibly lost in loss record 178 of 3,995 ==1461== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==1461== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==1461== by 0x7B04CEC2: LocalAlloc (memory.c:606) ==1461== by 0x7B04CD6A: GlobalAlloc (memory.c:570) ==1461== by 0x5D9FC30: CreateStreamOnHGlobal (hglobalstream.c:600) ==1461== by 0x20580F06: domdoc_load_from_stream (domdoc.c:780)

2 1

[PATCH] comdlg32: Fix error precedence in IFileDialog2_SetFileTypes
by Alex Henrie 10 Sep '20

10 Sep '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Discovered while debugging ShareX. --- dlls/comdlg32/itemdlg.c | 6 +++--- dlls/comdlg32/tests/itemdlg.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1ae20ca782..f17c2f926d 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2402,12 +2402,12 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypes(IFileDialog2 *iface, UINT cFil UINT i; TRACE("%p (%d, %p)\n", This, cFileTypes, rgFilterSpec); - if(This->filterspecs) - return E_UNEXPECTED; - if(!rgFilterSpec) return E_INVALIDARG; + if(This->filterspecs) + return E_UNEXPECTED; + if(!cFileTypes) return S_OK; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6ee0d5fc3d..c38457a0a1 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -675,6 +675,8 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_SetFileTypes(pfod, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype); -- 2.28.0

2 1

[PATCH] user32/menu: Store application defined value as pointer
by Fabian Maurer 10 Sep '20

10 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49805 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3b1e3f25f42..59c2083c17c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -104,7 +104,7 @@ typedef struct { UINT cyMax; /* max height of the whole menu, 0 is screen height */ HBRUSH hbrBack; /* brush for menu background */ DWORD dwContextHelpID; - DWORD dwMenuData; /* application defined value */ + ULONG_PTR dwMenuData; /* application defined value */ HMENU hSysMenuOwner; /* Handle to the dummy sys menu holder */ WORD textOffset; /* Offset of text when items have both bitmaps and text */ } POPUPMENU, *LPPOPUPMENU; -- 2.28.0

2 1

[PATCH] server: Fix some alt + hotkeys dont' work if the msg param is WM_SYSKEYDOWN in queue_hotkey_message function.
by Yongjie Yao 10 Sep '20

10 Sep '20

1 0

[PATCH v3] comdlg32/tests: Add test for overwrite when IFileDialog set FOS_PICKFOLDERS option.
by Jiangyi Chen 10 Sep '20

10 Sep '20

2 1

[PATCH] server: Fix some alt + hotkeys dont' work if the msg param is WM_SYSKEYDOWN in queue_hotkey_message function.
by Yongjie Yao 10 Sep '20

10 Sep '20

1 0

Re: [PATCH] shell32: Skip OpenAs_RunDLL in uri
by Nikolay Sivov 10 Sep '20

10 Sep '20

On 9/8/20 12:28 PM, Haoyang Chen wrote: > > Through windows 7, I found that OpenAs_RunDLL functions will open a > dialog that can choose to specify the application. my idea is to skip > this OpenAs_RunDLL and use wine's default application execution. > > eg: ShellExecuteW(NULL, L"open", L"rundll32.exe", L"shell32.dll, > OpenAs_RunDLL https://www.winehq.org/", NULL, SW_SHOW); If it's only meant to open a dialog, why would you shellexec instead? P.S. please cc wine-devel on replies. > > 在 2020/9/8 下午3:57, Nikolay Sivov 写道: >> It's probably easier to implement OpenAs_RunDLL(). What is the full >> command line and what is supposed to happen on OpenAs_RunDLL() call? >> >> >> >> > >

2 3

[PATCH v2] comdlg32/tests: Add test for overwrite when IFileDialog set FOS_PICKFOLDERS option.
by Jiangyi Chen 10 Sep '20

10 Sep '20

2 1

[PATCH] msxml3: Fix a memory leak (Valgrind).
by 阿杰 10 Sep '20

10 Sep '20

==1461== 8 bytes in 1 blocks are possibly lost in loss record 178 of 3,995 ==1461== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==1461== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==1461== by 0x7B04CEC2: LocalAlloc (memory.c:606) ==1461== by 0x7B04CD6A: GlobalAlloc (memory.c:570) ==1461== by 0x5D9FC30: CreateStreamOnHGlobal (hglobalstream.c:600) ==1461== by 0x20580F06: domdoc_load_from_stream (domdoc.c:780)

1 0

[PATCH v3] comdlg32: Fix the wrong popup when saving the same file again in the same directory.
by Jiangyi Chen 10 Sep '20

10 Sep '20

1 0

[PATCH v2] comdlg32: Fix the wrong popup when saving the same file again in the same directory.
by Jiangyi Chen 10 Sep '20

10 Sep '20

1 0

[PATCH 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 56 +++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 6 ++-- 2 files changed, 57 insertions(+), 5 deletions(-)

3 2

[PATCH] ntdll: Fix a memory leak (Valgrind).
by Jiangyi Chen 10 Sep '20

10 Sep '20

==15674== 82 bytes in 1 blocks are definitely lost in loss record 1,041 of 2,256 ==15674== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==15674== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==15674== by 0x7BCA3BC2: RtlCreateUnicodeString (rtlstr.c:239) ==15674== by 0x7BC63CEA: get_image_path (env.c:720) ==15674== by 0x7BC6583E: init_user_process_params (env.c:1450)

2 1

[PATCH 3/3] d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 13 +++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-)

2 1

[PATCH] comdlg32/tests: Add test for overwrite when IFileDialog set FOS_PICKFOLDERS option.
by Jiangyi Chen 10 Sep '20

10 Sep '20

2 1

[PATCH] ntdll: Fix a ImagePathName memory leak(Valgrind).
by Chao Long 10 Sep '20

10 Sep '20

Valgrind.log: ==15674== 82 bytes in 1 blocks are definitely lost in loss record 1,041 of 2,256 ==15674== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==15674== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==15674== by 0x7BCA3BC2: RtlCreateUnicodeString (rtlstr.c:239) ==15674== by 0x7BC63CEA: get_image_path (env.c:720) ==15674== by 0x7BC6583E: init_user_process_params (env.c:1450)

1 0

[PATCH 2/3] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 44 +++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-)

1 0

[PATCH] comdlg32: Fix the wrong popup when saving the same file again in the same directory.
by Jiangyi Chen 10 Sep '20

10 Sep '20

1 0

[PATCH] winegstreamer: Dereference messages dropped from watch_bus().
by Zebediah Figura 09 Sep '20

09 Sep '20

>From GStreamer documentation: "If the handler returns GST_BUS_DROP, it should unref the message, else the message should not be unreffed by the sync handler." Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2c9aafd7a6b..724ac8fd25f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1280,6 +1280,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) default: break; } + gst_message_unref(msg); return GST_BUS_DROP; } -- 2.28.0

1 0

[PATCH v3 1/5] amstream: Implement AMDirectDrawStream::GetFormat.
by Anton Baskanov 09 Sep '20

09 Sep '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 111 ++++++++++++- dlls/amstream/tests/amstream.c | 279 +++++++++++++++++++++++++++++++++ 2 files changed, 382 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0d3f2d0d4b8..e33dac58d94 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,6 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; +struct format +{ + DWORD flags; + DWORD width; + DWORD height; + DDPIXELFORMAT pf; +}; + struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -47,6 +55,7 @@ struct ddraw_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + struct format format; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -363,11 +372,46 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetFormat(IDirectDrawMediaStr DDSURFACEDESC *current_format, IDirectDrawPalette **palette, DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, - flags); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, current_format %p, palette %p, desired_format %p, flags %p.\n", stream, current_format, palette, + desired_format, flags); - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + if (current_format) + { + current_format->dwFlags = stream->format.flags | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + current_format->dwWidth = stream->format.width; + current_format->dwHeight = stream->format.height; + current_format->ddpfPixelFormat = stream->format.pf; + current_format->ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + } + + if (palette) + *palette = NULL; + + if (desired_format) + { + desired_format->dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + desired_format->dwWidth = stream->format.width; + desired_format->dwHeight = stream->format.height; + desired_format->ddpfPixelFormat = stream->format.pf; + desired_format->ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + } + + if (flags) + *flags = 0; + + LeaveCriticalSection(&stream->cs); + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStream *iface, @@ -638,7 +682,11 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct ddraw_stream *stream = impl_from_IPin(iface); + const VIDEOINFOHEADER *video_info; PIN_DIRECTION dir; + DWORD width; + DWORD height; + DDPIXELFORMAT pf = {sizeof(DDPIXELFORMAT)}; TRACE("stream %p, peer %p, mt %p.\n", stream, peer, mt); @@ -651,17 +699,56 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons } if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; } + video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + + width = video_info->bmiHeader.biWidth; + height = abs(video_info->bmiHeader.biHeight); + pf.dwFlags = DDPF_RGB; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + { + pf.dwFlags |= DDPF_PALETTEINDEXED8; + pf.u1.dwRGBBitCount = 8; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555)) + { + pf.u1.dwRGBBitCount = 16; + pf.u2.dwRBitMask = 0x7c00; + pf.u3.dwGBitMask = 0x03e0; + pf.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + { + pf.u1.dwRGBBitCount = 16; + pf.u2.dwRBitMask = 0xf800; + pf.u3.dwGBitMask = 0x07e0; + pf.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24)) + { + pf.u1.dwRGBBitCount = 24; + pf.u2.dwRBitMask = 0xff0000; + pf.u3.dwGBitMask = 0x00ff00; + pf.u4.dwBBitMask = 0x0000ff; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32)) + { + pf.u1.dwRGBBitCount = 32; + pf.u2.dwRBitMask = 0xff0000; + pf.u3.dwGBitMask = 0x00ff00; + pf.u4.dwBBitMask = 0x0000ff; + } + else + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { @@ -673,6 +760,11 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); + stream->format.width = width; + stream->format.height = height; + if (!(stream->format.flags & DDSD_PIXELFORMAT)) + stream->format.pf = pf; + LeaveCriticalSection(&stream->cs); return S_OK; @@ -981,6 +1073,9 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->format.width = 100; + object->format.height = 100; + InitializeCriticalSection(&object->cs); TRACE("Created ddraw stream %p.\n", object); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a1807..eff0893c8f4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -51,6 +51,164 @@ static const AM_MEDIA_TYPE audio_mt = .pbFormat = (BYTE *)&audio_format, }; +static const VIDEOINFO rgb8_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 8, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb555_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb565_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_BITFIELDS, + .dwBitMasks = {0xf800, 0x07e0, 0x001f}, +}; + +static const VIDEOINFO rgb24_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb32_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 32, + .bmiHeader.biCompression = BI_RGB, +}; + +static const AM_MEDIA_TYPE rgb8_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB8, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb8_video_info, +}; + +static const AM_MEDIA_TYPE rgb555_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB555, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb555_video_info, +}; + +static const AM_MEDIA_TYPE rgb565_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB565, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb565_video_info, +}; + +static const AM_MEDIA_TYPE rgb24_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB24, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb24_video_info, +}; + +static const AM_MEDIA_TYPE rgb32_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB32, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb32_video_info, +}; + +static const DDSURFACEDESC rgb8_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, + .ddpfPixelFormat.dwRGBBitCount = 8, +}; + +static const DDSURFACEDESC rgb555_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0x7c00, + .ddpfPixelFormat.dwGBitMask = 0x03e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb565_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0xf800, + .ddpfPixelFormat.dwGBitMask = 0x07e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb24_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 24, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + +static const DDSURFACEDESC rgb32_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 32, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -4474,6 +4632,126 @@ static void test_ddrawstream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_ddrawstream_get_format(a,b,c) check_ddrawstream_get_format_(__LINE__,a,b,c) +static void check_ddrawstream_get_format_(int line, IDirectDrawMediaStream *stream, + const AM_MEDIA_TYPE *mt, const DDSURFACEDESC *expected_format) +{ + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + struct testfilter source; + FILTER_INFO filter_info; + DDSURFACEDESC format; + PIN_INFO pin_info; + DWORD flags; + HRESULT hr; + IPin *pin; + + hr = IDirectDrawMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_QueryPinInfo(pin, &pin_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_QueryFilterInfo(pin_info.pFilter, &filter_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + hr = IFilterGraph_AddFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface, L"source"); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_ConnectDirect(filter_info.pGraph, &source.source.pin.IPin_iface, pin, mt); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetFormat(stream, NULL, NULL, NULL, NULL); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&current_format, 0xcc, sizeof(current_format)); + current_format.dwSize = sizeof(current_format); + memset(&desired_format, 0xcc, sizeof(desired_format)); + desired_format.dwSize = sizeof(desired_format); + flags = 0xdeadbeef; + hr = IDirectDrawMediaStream_GetFormat(stream, &current_format, NULL, &desired_format, &flags); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + memset(&format, 0xcc, sizeof(format)); + format.dwSize = sizeof(format); + format.ddpfPixelFormat = expected_format->ddpfPixelFormat; + format.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + format.dwWidth = 333; + format.dwHeight = 444; + format.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + ok_(__FILE__, line)(memcmp(&current_format, &format, sizeof(DDSURFACEDESC)) == 0, "Current format didn't match.\n"); + format.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ok_(__FILE__, line)(memcmp(&desired_format, &format, sizeof(DDSURFACEDESC)) == 0, "Desired format didn't match.\n"); + + hr = IFilterGraph_Disconnect(filter_info.pGraph, &source.source.pin.IPin_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph_Disconnect(filter_info.pGraph, pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_RemoveFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph_Release(filter_info.pGraph); + IBaseFilter_Release(pin_info.pFilter); + IPin_Release(pin); +} + +static void test_ddrawstream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + DWORD flags; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.rcSource.right = 222; + video_info.rcSource.bottom = 333; + video_info.rcTarget.right = 444; + video_info.rcTarget.bottom = 666; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + video_info = rgb32_video_info; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + check_ddrawstream_get_format(ddraw_stream, &rgb8_mt, &rgb8_format); + check_ddrawstream_get_format(ddraw_stream, &rgb555_mt, &rgb555_format); + check_ddrawstream_get_format(ddraw_stream, &rgb565_mt, &rgb565_format); + check_ddrawstream_get_format(ddraw_stream, &rgb24_mt, &rgb24_format); + check_ddrawstream_get_format(ddraw_stream, &rgb32_mt, &rgb32_format); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5936,6 +6214,7 @@ START_TEST(amstream) test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); test_ddrawstream_create_sample(); + test_ddrawstream_get_format(); test_ddrawstreamsample_get_media_stream(); -- 2.17.1

2 9

[PATCH v2 1/5] amstream: Implement AMDirectDrawStream::GetFormat.
by Anton Baskanov 09 Sep '20

09 Sep '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 98 ++++++++++- dlls/amstream/tests/amstream.c | 306 +++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0d3f2d0d4b8..eb8e35b5ac4 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -47,6 +47,7 @@ struct ddraw_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + DDSURFACEDESC format; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -363,11 +364,40 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetFormat(IDirectDrawMediaStr DDSURFACEDESC *current_format, IDirectDrawPalette **palette, DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, - flags); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, current_format %p, palette %p, desired_format %p, flags %p.\n", stream, current_format, palette, + desired_format, flags); - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + if (current_format) + { + *current_format = stream->format; + current_format->dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + } + + if (palette) + *palette = NULL; + + if (desired_format) + { + *desired_format = stream->format; + desired_format->dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + } + + if (flags) + *flags = 0; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStream *iface, @@ -637,8 +667,12 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { + const VIDEOINFOHEADER *video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + DDPIXELFORMAT pixel_format = {sizeof(DDPIXELFORMAT)}; struct ddraw_stream *stream = impl_from_IPin(iface); PIN_DIRECTION dir; + DWORD width; + DWORD height; TRACE("stream %p, peer %p, mt %p.\n", stream, peer, mt); @@ -651,17 +685,54 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons } if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; } + width = video_info->bmiHeader.biWidth; + height = abs(video_info->bmiHeader.biHeight); + pixel_format.dwFlags = DDPF_RGB; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + { + pixel_format.dwFlags |= DDPF_PALETTEINDEXED8; + pixel_format.u1.dwRGBBitCount = 8; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555)) + { + pixel_format.u1.dwRGBBitCount = 16; + pixel_format.u2.dwRBitMask = 0x7c00; + pixel_format.u3.dwGBitMask = 0x03e0; + pixel_format.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + { + pixel_format.u1.dwRGBBitCount = 16; + pixel_format.u2.dwRBitMask = 0xf800; + pixel_format.u3.dwGBitMask = 0x07e0; + pixel_format.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24)) + { + pixel_format.u1.dwRGBBitCount = 24; + pixel_format.u2.dwRBitMask = 0xff0000; + pixel_format.u3.dwGBitMask = 0x00ff00; + pixel_format.u4.dwBBitMask = 0x0000ff; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32)) + { + pixel_format.u1.dwRGBBitCount = 32; + pixel_format.u2.dwRBitMask = 0xff0000; + pixel_format.u3.dwGBitMask = 0x00ff00; + pixel_format.u4.dwBBitMask = 0x0000ff; + } + else + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { @@ -673,6 +744,11 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); + stream->format.dwWidth = width; + stream->format.dwHeight = height; + if (!(stream->format.dwFlags & DDSD_PIXELFORMAT)) + stream->format.ddpfPixelFormat = pixel_format; + LeaveCriticalSection(&stream->cs); return S_OK; @@ -981,6 +1057,12 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->format.dwSize = sizeof(DDSURFACEDESC); + object->format.dwFlags = DDSD_CAPS; + object->format.dwWidth = 100; + object->format.dwHeight = 100; + object->format.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + InitializeCriticalSection(&object->cs); TRACE("Created ddraw stream %p.\n", object); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a1807..2a69ff60fc3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -51,6 +51,164 @@ static const AM_MEDIA_TYPE audio_mt = .pbFormat = (BYTE *)&audio_format, }; +static const VIDEOINFO rgb8_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 8, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb555_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb565_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_BITFIELDS, + .dwBitMasks = {0xff0000, 0x00ff00, 0x0000ff}, +}; + +static const VIDEOINFO rgb24_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb32_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 32, + .bmiHeader.biCompression = BI_RGB, +}; + +static const AM_MEDIA_TYPE rgb8_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB8, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb8_video_info, +}; + +static const AM_MEDIA_TYPE rgb555_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB555, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb555_video_info, +}; + +static const AM_MEDIA_TYPE rgb565_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB565, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb565_video_info, +}; + +static const AM_MEDIA_TYPE rgb24_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB24, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb24_video_info, +}; + +static const AM_MEDIA_TYPE rgb32_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB32, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb32_video_info, +}; + +static const DDSURFACEDESC rgb8_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, + .ddpfPixelFormat.dwRGBBitCount = 8, +}; + +static const DDSURFACEDESC rgb555_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0x7c00, + .ddpfPixelFormat.dwGBitMask = 0x03e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb565_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0xf800, + .ddpfPixelFormat.dwGBitMask = 0x07e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb24_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 24, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + +static const DDSURFACEDESC rgb32_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 32, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -4474,6 +4632,153 @@ static void test_ddrawstream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_ddrawstream_get_format(a,b,c) check_ddrawstream_get_format_(__LINE__,a,b,c) +static void check_ddrawstream_get_format_(int line, IDirectDrawMediaStream *stream, + const AM_MEDIA_TYPE *mt, const DDSURFACEDESC *expected_format) +{ + const DDPIXELFORMAT *expected_pf = &expected_format->ddpfPixelFormat; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + struct testfilter source; + FILTER_INFO filter_info; + PIN_INFO pin_info; + DWORD flags; + HRESULT hr; + IPin *pin; + + hr = IDirectDrawMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_QueryPinInfo(pin, &pin_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_QueryFilterInfo(pin_info.pFilter, &filter_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + hr = IFilterGraph_AddFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface, L"source"); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_ConnectDirect(filter_info.pGraph, &source.source.pin.IPin_iface, pin, mt); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetFormat(stream, NULL, NULL, NULL, NULL); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&current_format, 0xcc, sizeof(current_format)); + current_format.dwSize = sizeof(current_format); + memset(&desired_format, 0xcc, sizeof(desired_format)); + desired_format.dwSize = sizeof(desired_format); + flags = 0xdeadbeef; + hr = IDirectDrawMediaStream_GetFormat(stream, &current_format, NULL, &desired_format, &flags); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + ok_(__FILE__, line)(current_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS), + "Got current format flags %#x.\n", current_format.dwFlags); + ok_(__FILE__, line)(current_format.dwWidth == 333, "Got current format width %u.\n", current_format.dwWidth); + ok_(__FILE__, line)(current_format.dwHeight == 444, "Got current format height %u.\n", current_format.dwHeight); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT), + "Got current format size %u.\n", current_format.ddpfPixelFormat.dwSize); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwFlags == expected_pf->dwFlags, + "Got current format flags %#x.\n", current_format.ddpfPixelFormat.dwFlags); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwRGBBitCount == expected_pf->dwRGBBitCount, + "Got current format rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwRBitMask == expected_pf->dwRBitMask, + "Got current format r bit mask %#x.\n", current_format.ddpfPixelFormat.dwRBitMask); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwGBitMask == expected_pf->dwGBitMask, + "Got current format g bit mask %#x.\n", current_format.ddpfPixelFormat.dwGBitMask); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwBBitMask == expected_pf->dwBBitMask, + "Got current format b bit mask %#x.\n", current_format.ddpfPixelFormat.dwBBitMask); + ok_(__FILE__, line)(current_format.ddsCaps.dwCaps == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY), + "Got current format caps %#x.\n", current_format.ddsCaps.dwCaps); + ok_(__FILE__, line)(desired_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT), + "Got desired format flags %#x.\n", desired_format.dwFlags); + ok_(__FILE__, line)(desired_format.dwWidth == 333, "Got desired format width %u.\n", desired_format.dwWidth); + ok_(__FILE__, line)(desired_format.dwHeight == 444, "Got desired format height %u.\n", desired_format.dwHeight); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT), + "Got desired format size %u.\n", desired_format.ddpfPixelFormat.dwSize); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwFlags == expected_pf->dwFlags, + "Got desired format flags %#x.\n", desired_format.ddpfPixelFormat.dwFlags); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwRGBBitCount == expected_pf->dwRGBBitCount, + "Got desired format rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwRBitMask == expected_pf->dwRBitMask, + "Got desired format r bit mask %#x.\n", desired_format.ddpfPixelFormat.dwRBitMask); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwGBitMask == expected_pf->dwGBitMask, + "Got desired format g bit mask %#x.\n", desired_format.ddpfPixelFormat.dwGBitMask); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwBBitMask == expected_pf->dwBBitMask, + "Got desired format b bit mask %#x.\n", desired_format.ddpfPixelFormat.dwBBitMask); + ok_(__FILE__, line)(desired_format.ddsCaps.dwCaps == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY), + "Got desired format caps %#x.\n", desired_format.ddsCaps.dwCaps); + ok_(__FILE__, line)(flags == 0, "Got flags %#x.\n", flags); + + hr = IFilterGraph_Disconnect(filter_info.pGraph, &source.source.pin.IPin_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph_Disconnect(filter_info.pGraph, pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_RemoveFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph_Release(filter_info.pGraph); + IBaseFilter_Release(pin_info.pFilter); + IPin_Release(pin); +} + +static void test_ddrawstream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + DWORD flags; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.rcSource.right = 222; + video_info.rcSource.bottom = 333; + video_info.rcTarget.right = 444; + video_info.rcTarget.bottom = 666; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + video_info = rgb32_video_info; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + check_ddrawstream_get_format(ddraw_stream, &rgb8_mt, &rgb8_format); + check_ddrawstream_get_format(ddraw_stream, &rgb555_mt, &rgb555_format); + check_ddrawstream_get_format(ddraw_stream, &rgb565_mt, &rgb565_format); + check_ddrawstream_get_format(ddraw_stream, &rgb24_mt, &rgb24_format); + check_ddrawstream_get_format(ddraw_stream, &rgb32_mt, &rgb32_format); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5936,6 +6241,7 @@ START_TEST(amstream) test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); test_ddrawstream_create_sample(); + test_ddrawstream_get_format(); test_ddrawstreamsample_get_media_stream(); -- 2.17.1

2 7

[PATCH] winemac.drv: Don't fail GPU detection if some IOKit properties are missing.
by Brendan Shanks 09 Sep '20

09 Sep '20

Fixes GPU detection when running in VMware Fusion, where the GPU entry lacks a "model" property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49774 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 9d95eee99a9..e769772feaa 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -215,18 +215,15 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en if (IORegistryEntryGetRegistryEntryID(gpu_entry, &gpu->id) != kIOReturnSuccess) goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id)) - goto done; - if (get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name))) - goto done; ret = 0; + + get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id); + get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id); + get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id); + get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id); + get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name)); + done: if (gpu_entry != entry) IOObjectRelease(gpu_entry); -- 2.26.2

2 1

[PATCH] mountmgr: Avoid operating on a null CFStringRef, which would crash.
by Ken Thomases 09 Sep '20

09 Sep '20

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/mountmgr.sys/diskarb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3d531b95ee5..12da89d7688 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -298,7 +298,7 @@ static CFStringRef find_service_id( const WCHAR *adapter ) service = CFArrayGetValueAtIndex( services, i ); name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); - if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + if (name && CFStringGetLength( name ) < ARRAY_SIZE( buf )) { CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service ))) -- 2.27.0

1 0

[PATCH] dbghelp: Avoid asserting on egregiously long stabs symbol names.
by Ken Thomases 09 Sep '20

09 Sep '20

Some Mac libraries have symbols which are many thousands of characters long. (Thank you, C++ templates!) It doesn't seem worth it to accommodate those by dynamically allocating the symbol name buffer, but we definitely don't want to assert. Just log an ERR. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/dbghelp/stabs.c | 58 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b1b4a6ef1c5..517299897c4 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -static void stab_strcpy(char* dest, int sz, const char* source) +static BOOL stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest; /* @@ -115,7 +115,7 @@ static void stab_strcpy(char* dest, int sz, const char* source) while (ptr > dest && isdigit(*ptr)) ptr--; if (*ptr == '.') *ptr = '\0'; } - assert(sz > 0); + return (sz > 0); } typedef struct @@ -1134,8 +1134,12 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam { pending_make_room(pending); pending->objs[pending->num].tag = PENDING_VAR; - stab_strcpy(pending->objs[pending->num].u.var.name, - sizeof(pending->objs[pending->num].u.var.name), name); + if (!stab_strcpy(pending->objs[pending->num].u.var.name, + sizeof(pending->objs[pending->num].u.var.name), name)) + { + ERR("symbol too long %s\n", debugstr_a(name)); + return; + } pending->objs[pending->num].u.var.type = stabs_parse_type(name); pending->objs[pending->num].u.var.kind = dt; pending->objs[pending->num].u.var.loc = *loc; @@ -1327,8 +1331,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, stabbuf_append(&stabbuff, &stabbufflen, ptr); ptr = stabbuff; } - stab_strcpy(symname, sizeof(symname), ptr); - if (!stabs_parse_typedef(module, ptr, symname)) + if (!stab_strcpy(symname, sizeof(symname), ptr) || + !stabs_parse_typedef(module, ptr, symname)) { /* skip this definition */ stabbuff[0] = '\0'; @@ -1348,7 +1352,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * * With a.out or mingw, they actually do make some amount of sense. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1358,7 +1367,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, case N_LCSYM: case N_STSYM: /* These are static symbols and BSS symbols. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1383,7 +1397,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (curr_func != NULL) { struct symt* param_type = stabs_parse_type(ptr); - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = n_value; @@ -1442,7 +1461,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, loc.reg = CV_REG_NONE; break; } - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (ptr[strlen(symname) + 1] == 'P') { struct symt* param_type = stabs_parse_type(ptr); @@ -1494,7 +1518,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * all of the pages related to the stabs, and that * sucks up swap space like crazy. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (*symname) { struct symt_function_signature* func_type; @@ -1620,7 +1649,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, } if (*ptr == '_') ptr++; - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } callback(module, load_offset, symname, n_value, is_public, is_global, stab_ptr->n_other, compiland, user); -- 2.27.0

1 0

[PATCH] winemac.drv: Print error when no GPUs are detected.
by Brendan Shanks 09 Sep '20

09 Sep '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a96a7b2c5f6..078cb55ab8a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1790,6 +1790,8 @@ void macdrv_init_display_devices(BOOL force) if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); + if (!gpu_count) + ERR("No GPUs detected\n"); for (gpu = 0; gpu < gpu_count; gpu++) { -- 2.26.2

2 1

[PATCH] kernelbase: Also pass CreateFile2 dwFileFlags to CreateFileW.
by Rémi Bernon 09 Sep '20

09 Sep '20

Instead of just attributes. Otherwise we may miss important flags like FILE_FLAG_OVERLAPPED and open the file for synchronous I/O, causing a deadlock in Flight Simulator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 48 +++++++++++++++++++++++++++++++------- dlls/kernelbase/file.c | 30 ++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0f2c00d75ad..ec0e923706c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1675,14 +1675,14 @@ static void test_CreateFileW(void) static void test_CreateFile2(void) { - HANDLE hFile; + HANDLE hFile, iocp; WCHAR temp_path[MAX_PATH]; WCHAR filename[MAX_PATH]; CREATEFILE2_EXTENDED_PARAMETERS exparams; static const WCHAR emptyW[]={'\0'}; static const WCHAR prefix[] = {'p','f','x',0}; static const WCHAR bogus[] = { '\\', '\\', '.', '\\', 'B', 'O', 'G', 'U', 'S', 0 }; - DWORD ret; + DWORD i, ret; if (!pCreateFile2) { @@ -1699,8 +1699,8 @@ static void test_CreateFile2(void) SetLastError(0xdeadbeef); exparams.dwSize = sizeof(exparams); - exparams.dwFileAttributes = FILE_FLAG_RANDOM_ACCESS; - exparams.dwFileFlags = 0; + exparams.dwFileAttributes = 0; + exparams.dwFileFlags = FILE_FLAG_RANDOM_ACCESS; exparams.dwSecurityQosFlags = 0; exparams.lpSecurityAttributes = NULL; exparams.hTemplateFile = 0; @@ -1744,14 +1744,46 @@ static void test_CreateFile2(void) ret = CreateDirectoryW(filename, NULL); ok(ret == TRUE, "couldn't create temporary directory\n"); - exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS; + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS; + SetLastError(0xdeadbeef); hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, 0, OPEN_ALWAYS, &exparams); - todo_wine - ok(hFile == INVALID_HANDLE_VALUE, - "expected CreateFile2 to fail on existing directory, error: %d\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFile2 failed with FILE_FLAG_BACKUP_SEMANTICS on existing directory, error: %d\n", GetLastError()); CloseHandle(hFile); ret = RemoveDirectoryW(filename); ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + for (i = 0; i < 2; ++i) + { + memset(&exparams, 0, sizeof(exparams)); + exparams.dwSize = sizeof(exparams); + if (i == 0) + { + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + else + { + exparams.dwFileFlags = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileAttributes = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: hFile %p, last error %u\n", i, hFile, GetLastError()); + + iocp = CreateIoCompletionPort(hFile, NULL, 0, 2); + if (i == 1) ok(iocp == NULL && GetLastError() == ERROR_INVALID_PARAMETER, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + else ok(iocp != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + + CloseHandle(iocp); + CloseHandle(hFile); + + ret = DeleteFileW(filename); + if (i == 1) ok(ret, "%d: unexpected DeleteFileW failure, error %u\n", i, GetLastError()); + else ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "%d: unexpected DeleteFileW result, ret %d error %u\n", i, ret, GetLastError()); + } } static void test_GetTempFileNameA(void) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index d9b34408692..b265866ac54 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -655,13 +655,39 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryExW( LPCWSTR template, LPCWSTR path HANDLE WINAPI DECLSPEC_HOTPATCH CreateFile2( LPCWSTR name, DWORD access, DWORD sharing, DWORD creation, CREATEFILE2_EXTENDED_PARAMETERS *params ) { + static const DWORD attributes_mask = FILE_ATTRIBUTE_READONLY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_NORMAL | + FILE_ATTRIBUTE_TEMPORARY | + FILE_ATTRIBUTE_OFFLINE | + FILE_ATTRIBUTE_ENCRYPTED | + FILE_ATTRIBUTE_INTEGRITY_STREAM; + static const DWORD flags_mask = FILE_FLAG_BACKUP_SEMANTICS | + FILE_FLAG_DELETE_ON_CLOSE | + FILE_FLAG_NO_BUFFERING | + FILE_FLAG_OPEN_NO_RECALL | + FILE_FLAG_OPEN_REPARSE_POINT | + FILE_FLAG_OVERLAPPED | + FILE_FLAG_POSIX_SEMANTICS | + FILE_FLAG_RANDOM_ACCESS | + FILE_FLAG_SEQUENTIAL_SCAN | + FILE_FLAG_WRITE_THROUGH; + LPSECURITY_ATTRIBUTES sa = params ? params->lpSecurityAttributes : NULL; - DWORD attributes = params ? params->dwFileAttributes : 0; HANDLE template = params ? params->hTemplateFile : NULL; + DWORD attributes = params ? params->dwFileAttributes : 0; + DWORD flags = params ? params->dwFileFlags : 0; FIXME( "(%s %x %x %x %p), partial stub\n", debugstr_w(name), access, sharing, creation, params ); - return CreateFileW( name, access, sharing, sa, creation, attributes, template ); + if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#x\n", attributes ); + if (flags & ~flags_mask) FIXME( "unsupported flags %#x\n", flags ); + attributes &= attributes_mask; + flags &= flags_mask; + + return CreateFileW( name, access, sharing, sa, creation, flags | attributes, template ); } -- 2.28.0

1 0

[PATCH resend 1/3] ntoskrnl.exe: Store current thread object at right offset from GS.
by Derek Lesho 09 Sep '20

09 Sep '20

In kernel mode, GS base is not set to a TEB, but fortunately the offset for the current thread object, which EasyAntiCheat.sys relies on, doesn't conflict with anything in the TEB. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e94feabc826..a0f45b4135c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -870,7 +870,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { - NtCurrentTeb()->Reserved5[1] = NULL; + NtCurrentTeb()->SystemReserved1[15] = NULL; if (!context.in_buff && !(context.in_buff = HeapAlloc( GetProcessHeap(), 0, context.in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -891,7 +891,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) context.params = reply->params; context.in_size = reply->in_size; client_tid = reply->client_tid; - NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); + NtCurrentTeb()->SystemReserved1[15] = wine_server_get_ptr( reply->client_thread ); } else { @@ -2338,7 +2338,7 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + struct _KTHREAD *thread = NtCurrentTeb()->SystemReserved1[15]; if (!thread) { @@ -2351,7 +2351,11 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle ); - NtCurrentTeb()->Reserved5[1] = thread; + /* In kernel mode, GS base is not set to a TEB, but fortunately the offset + for the current thread object, which EasyAntiCheat.sys relies on, + doesn't conflict with anything in the TEB. */ + + NtCurrentTeb()->SystemReserved1[15] = thread; } return thread; @@ -2912,6 +2916,22 @@ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) } +struct system_thread_ctx +{ + PKSTART_ROUTINE start; + PVOID context; +}; + +static void WINAPI init_system_thread(PVOID context) +{ + struct system_thread_ctx info = *(struct system_thread_ctx *)context; + HeapFree( GetProcessHeap(), 0, context ); + + NtCurrentTeb()->SystemReserved1[15] = KeGetCurrentThread(); + + info.start(info.context); +} + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ @@ -2920,9 +2940,16 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, HANDLE ProcessHandle, PCLIENT_ID ClientId, PKSTART_ROUTINE StartRoutine, PVOID StartContext) { + struct system_thread_ctx *info; + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info->start = StartRoutine; + info->context = StartContext; + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, - 0, StartRoutine, StartContext, + 0, init_system_thread, info, ThreadHandle, ClientId); } -- 2.28.0

1 2

[PATCH v3 2/2] windowscodecs: Correctly set output frame size for WriteSource().
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Use IWICBitmapFrameEncode_SetSize() to set frame size. dlls/windowscodecs/main.c | 23 +++++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-)

2 1

[PATCH v3 1/2] windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/converter.c | 48 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 18 deletions(-)

2 1

[PATCH 1/2] server: Use GENERIC_READ | GENERIC_WRITE in inherit_console().
by Zebediah Figura 09 Sep '20

09 Sep '20

The inherited console must have at least FILE_READ_DATA | FILE_WRITE_DATA. This also matches the access rights in AllocConsole(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 3ea8a0fe531..6a4a0b60d5f 100644 --- a/server/console.c +++ b/server/console.c @@ -784,7 +784,7 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, process->console = console; console->num_proc++; return alloc_handle( process, process->console, - SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); + SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); } struct thread *console_get_renderer( struct console_input *console ) -- 2.28.0

2 3

[PATCH 3/3] dxgi/tests: Fix output ownership test failures on Win10 1909.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

All DXGI output ownership calls on Win10 1909 return S_OK. It doesn't grab VidPN output exclusive ownership for full screen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 78 +++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index acbcadda354..ce1aee5ee3b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -548,9 +548,12 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, "Got unexpected state %#x, expected %#x.\n", state, expected); } -#define wait_vidpn_exclusive_ownership(a, b, c) wait_vidpn_exclusive_ownership_(__LINE__, a, b, c) -static void wait_vidpn_exclusive_ownership_(unsigned int line, - const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected, BOOL todo) +/* VidPN exclusive ownership doesn't change immediately. + * This helper is used to wait for the expected status */ +#define get_expected_vidpn_exclusive_ownership(a, b) \ + get_expected_vidpn_exclusive_ownership_(__LINE__, a, b) +static NTSTATUS get_expected_vidpn_exclusive_ownership_(unsigned int line, + const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected) { static const unsigned int wait_timeout = 2000; static const unsigned int wait_step = 100; @@ -565,8 +568,7 @@ static void wait_vidpn_exclusive_ownership_(unsigned int line, Sleep(wait_step); total_time += wait_step; } - todo_wine_if(todo) ok_(__FILE__, line)(status == expected, - "Got unexpected status %#x, expected %#x.\n", status, expected); + return status; } static HWND create_window(void) @@ -6315,7 +6317,9 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -6349,20 +6353,41 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(fullscreen, "Got unexpected fullscreen state.\n"); + /* Win10 1909 doesn't seem to grab output exclusive ownership. + * And all output ownership calls return S_OK on D3D10 and D3D12 with 1909. */ if (is_d3d12) - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); + } else - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + todo_wine ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + } hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + if (is_d3d12) + todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); /* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests * finished. */ @@ -6370,16 +6395,21 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -6389,16 +6419,24 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!fullscreen, "Unexpected fullscreen state.\n"); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); done: IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); -- 2.25.1

3 2

[PATCH 2/3] dxgi/tests: Fix swapchain parameter test failures on Win10 1909.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

Some of the invalid swapchain parameter tests crash on Win10 1909. And DXGI_USAGE_DISCARD_ON_PRESENT is a DXGI internal flag. It doesn't always get added if swap effect is DXGI_SWAP_EFFECT_DISCARD. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5c5e3b786f..acbcadda354 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4293,66 +4293,79 @@ static void test_swapchain_parameters(void) } tests[] = { - {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 0 */ {TRUE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, + /* 5 */ {TRUE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 10 */ {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + /* 15 */ {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, + /* 20 */ {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - - {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 25 */ {FALSE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 30 */ {FALSE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, + /* 35 */ {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 40 */ {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 45 */ + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the * process. Disable it for now. {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, */ + + /* The following tests crash on Win10 1909 + {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + */ }; static const DXGI_USAGE usage_tests[] = { @@ -4417,11 +4430,10 @@ static void test_swapchain_parameters(void) } expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - if (tests[i].swap_effect == DXGI_SWAP_EFFECT_DISCARD) - expected_usage |= DXGI_USAGE_DISCARD_ON_PRESENT; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u.\n", hr, i); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); + ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n", + usage, expected_usage, i); IDXGIResource_Release(resource); -- 2.25.1

3 2

[PATCH 1/3] dxgi/tests: Relax closest matching mode comparison.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

On Windows, a DXGI output may support 1920x1440 and 2560x1080 display modes, both of which have the same pixel count. And when finding a mode closest to 2559x1079 or 2561x1081, 1920x1440 is returned. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 59b23918de3..f5c5e3b786f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -207,8 +207,9 @@ static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, #define MODE_DESC_IGNORE_FORMAT 0x00000004u #define MODE_DESC_IGNORE_SCANLINE_ORDERING 0x00000008u #define MODE_DESC_IGNORE_SCALING 0x00000010u +#define MODE_DESC_IGNORE_EXACT_RESOLUTION 0x00000020u -#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION) +#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION & ~MODE_DESC_IGNORE_EXACT_RESOLUTION) #define MODE_DESC_CHECK_FORMAT (~MODE_DESC_IGNORE_FORMAT) #define check_mode_desc(a, b, c) check_mode_desc_(__LINE__, a, b, c) @@ -217,10 +218,16 @@ static void check_mode_desc_(unsigned int line, const DXGI_MODE_DESC *desc, { if (!(ignore_flags & MODE_DESC_IGNORE_RESOLUTION)) { - ok_(__FILE__, line)(desc->Width == expected_desc->Width - && desc->Height == expected_desc->Height, - "Got resolution %ux%u, expected %ux%u.\n", - desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + if (ignore_flags & MODE_DESC_IGNORE_EXACT_RESOLUTION) + ok_(__FILE__, line)(desc->Width * desc->Height == + expected_desc->Width * expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + else + ok_(__FILE__, line)(desc->Width == expected_desc->Width && + desc->Height == expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); } if (!(ignore_flags & MODE_DESC_IGNORE_REFRESH_RATE)) { @@ -1526,7 +1533,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); memset(&mode, 0, sizeof(mode)); mode.Width = modes[i].Width + 1; @@ -1534,7 +1542,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); } memset(&mode, 0, sizeof(mode)); -- 2.25.1

3 2

[PATCH] msvcrt: Handle rethrowing from nested try blocks on x64.
by Paul Gofman 09 Sep '20

09 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- MSVC testcase: https://gist.github.com/gofman/bc98c826eeb6c6d206fd377a0b2ce3cb dlls/msvcrt/except_x86_64.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 09eddfb9793..42283131e82 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -90,6 +90,7 @@ typedef struct { cxx_frame_info frame_info; BOOL rethrow; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -306,14 +307,13 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; - thread_data_t *data = msvcrt_get_thread_data(); cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; - if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -340,6 +340,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("calling handler %p\n", handler); ctx.rethrow = FALSE; + ctx.prev_rec = prev_rec; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); msvcrt_get_thread_data()->processing_throw--; __TRY @@ -565,6 +566,12 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh)) -- 2.26.2

2 1

[PATCH v6] quartz: Return E_POINTER from IVideoWindow::get_Visible() if "visible" is NULL.
by Zebediah Figura 09 Sep '20

09 Sep '20

From: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v6: Fix an accidental double space in the test message; make subject line clearer and more grammatical. dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/window.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c2b6271021a..448efe501b6 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2257,6 +2257,9 @@ static void test_video_window(void) hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Visible(window, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 07e042eccdb..3983d43b08f 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -334,6 +334,9 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *visi TRACE("window %p, visible %p.\n", window, visible); + if (!visible) + return E_POINTER; + *visible = IsWindowVisible(window->hwnd) ? OATRUE : OAFALSE; return S_OK; } -- 2.28.0

2 1

[PATCH 1/4] combase: Implement CoCreateInstanceFromApp().
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- CoGetClassObject() moved to helper to make it easier to get flags validation right later - CLSCTX_APPCONTAINER can't be used with it, and should return E_INVALIDARG, while it's usable for CoCreateInstance*. .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.c | 110 +++++++++------- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 1 + dlls/ole32/tests/compobj.c | 122 ++++++++++++++++++ include/objbase.h | 2 + include/wtypes.idl | 41 +++--- 8 files changed, 217 insertions(+), 65 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index eb81d238550..f5be6d88c75 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -8,7 +8,7 @@ @ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) ole32.CoCreateInstanceFromApp @ stub CoDecodeProxy @ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 6c3115d6007..f443592db3b 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -8,7 +8,7 @@ @ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) ole32.CoCreateInstanceFromApp @ stub CoDecodeProxy @ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c90cba6185c..66c99b53523 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1527,53 +1527,19 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out } /*********************************************************************** - * CoCreateInstanceEx (combase.@) + * CoCreateInstanceFromApp (combase.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, - COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + void *server_info, ULONG count, MULTI_QI *results) { - IClassFactory *factory; - IUnknown *unk = NULL; - CLSID clsid; - HRESULT hr; - - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); - - if (!count || !results) - return E_INVALIDARG; - - if (server_info) - FIXME("Server info is not supported.\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - hr = CoGetTreatAsClass(rclsid, &clsid); - if (FAILED(hr)) - clsid = *rclsid; - - hr = CoGetClassObject(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory); - if (FAILED(hr)) - return hr; + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, + count, results); - hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); - IClassFactory_Release(factory); - if (FAILED(hr)) - { - if (hr == CLASS_E_NOAGGREGATION && outer) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hr %#x.\n", - debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); - return hr; - } - - return return_multi_qi(unk, count, results, TRUE); + return CoCreateInstanceEx(rclsid, outer, cls_context | CLSCTX_APPCONTAINER, server_info, + count, results); } -/*********************************************************************** - * CoGetClassObject (combase.@) - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, +static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, COSERVERINFO *server_info, REFIID riid, void **obj) { struct class_reg_data clsreg = { 0 }; @@ -1581,8 +1547,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont IUnknown *registered_obj; struct apartment *apt; - TRACE("%s, %s\n", debugstr_guid(rclsid), debugstr_guid(riid)); - if (!obj) return E_INVALIDARG; @@ -1601,7 +1565,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont { if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler) || IsEqualCLSID(rclsid, &CLSID_GlobalOptions) || - IsEqualCLSID(rclsid, &CLSID_ManualResetEvent) || + (!(clscontext & CLSCTX_APPCONTAINER) && IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) || IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); @@ -1637,7 +1601,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont * First, try and see if we can't match the class ID with one of the * registered classes. */ - if ((registered_obj = com_get_registered_class_object(apt, rclsid, clscontext))) + if (!(clscontext & CLSCTX_APPCONTAINER) && (registered_obj = com_get_registered_class_object(apt, rclsid, clscontext))) { hr = IUnknown_QueryInterface(registered_obj, riid, obj); IUnknown_Release(registered_obj); @@ -1737,6 +1701,60 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscont return hr; } +/*********************************************************************** + * CoCreateInstanceEx (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +{ + IClassFactory *factory; + IUnknown *unk = NULL; + CLSID clsid; + HRESULT hr; + + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("Server info is not supported.\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + clsid = *rclsid; + if (!(cls_context & CLSCTX_APPCONTAINER)) + CoGetTreatAsClass(rclsid, &clsid); + + if (FAILED(hr = com_get_class_object(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory))) + return hr; + + hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); + IClassFactory_Release(factory); + if (FAILED(hr)) + { + if (hr == CLASS_E_NOAGGREGATION && outer) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hr %#x.\n", + debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); + return hr; + } + + return return_multi_qi(unk, count, results, TRUE); +} + +/*********************************************************************** + * CoGetClassObject (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, + COSERVERINFO *server_info, REFIID riid, void **obj) +{ + TRACE("%s, %#x, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); + + return com_get_class_object(rclsid, clscontext, server_info, riid, obj); +} + /*********************************************************************** * CoFreeUnusedLibraries (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d9b34640be..6e74cca1f24 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -82,7 +82,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) -@ stub CoCreateInstanceFromApp +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a6f62ebfa99..8e73fdd16b4 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx +@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) combase.CoCreateInstanceFromApp @ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) combase.CoDisableCallCancellation @ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index eb172aac28d..98b3ef642b8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -80,6 +80,8 @@ static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); +static HRESULT (WINAPI * pCoCreateInstanceFromApp)(REFCLSID clsid, IUnknown *outer, DWORD clscontext, + void *reserved, DWORD count, MULTI_QI *results); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); @@ -2244,6 +2246,23 @@ static void test_TreatAsClass(void) pIP = NULL; } + if (pCoCreateInstanceFromApp) + { + MULTI_QI mqi = { 0 }; + + mqi.pIID = &IID_IInternetProtocol; + hr = pCoCreateInstanceFromApp(&deadbeef, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, &IID_IInternetProtocol, + (void **)&pIP); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(pIP); + } + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); @@ -3943,6 +3962,7 @@ static void init_funcs(void) pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); + pCoCreateInstanceFromApp = (void*)GetProcAddress(hOle32, "CoCreateInstanceFromApp"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -4075,6 +4095,107 @@ static void test_mta_usage(void) test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } +static void test_CoCreateInstanceFromApp(void) +{ + static const CLSID *supported_classes[] = + { + &CLSID_InProcFreeMarshaler, + &CLSID_GlobalOptions, + &CLSID_StdGlobalInterfaceTable, + }; + static const CLSID *unsupported_classes[] = + { + &CLSID_ManualResetEvent, + }; + unsigned int i; + IUnknown *unk; + DWORD cookie; + MULTI_QI mqi; + HRESULT hr; + HANDLE handle; + ULONG_PTR actctx_cookie; + + if (!pCoCreateInstanceFromApp) + { + win_skip("CoCreateInstanceFromApp() is not available.\n"); + return; + } + + CoInitialize(NULL); + + for (i = 0; i < ARRAY_SIZE(supported_classes); ++i) + { + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(supported_classes[i], NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(mqi.pItf); + + hr = CoCreateInstance(supported_classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_classes); ++i) + { + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(unsupported_classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + } + + /* Locally registered classes are filtered out. */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, NULL, + &IID_IClassFactory, (void **)&unk); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + memset(&mqi, 0, sizeof(mqi)); + mqi.pIID = &IID_IUnknown; + hr = pCoCreateInstanceFromApp(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &mqi); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + hr = CoRevokeClassObject(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Activation context */ + if ((handle = activate_context(actctx_manifest, &actctx_cookie))) + { + hr = CoCreateInstance(&IID_Testiface7, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&IID_Testiface7, NULL, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, + &IID_IUnknown, (void **)&unk); + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + deactivate_context(handle, actctx_cookie); + } + + CoUninitialize(); +} + START_TEST(compobj) { init_funcs(); @@ -4124,6 +4245,7 @@ START_TEST(compobj) test_implicit_mta(); test_CoGetCurrentProcess(); test_mta_usage(); + test_CoCreateInstanceFromApp(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index e5a6b2a9faf..0a50d28e9d2 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -319,6 +319,8 @@ HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid, COSERVERINFO* pServerInfo, ULONG cmq, MULTI_QI* pResults); +HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID clsid, IUnknown *outer, DWORD clscontext, void *reserved, + DWORD count, MULTI_QI *results); HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults); HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); diff --git a/include/wtypes.idl b/include/wtypes.idl index a6682212b5b..754258839d7 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -336,22 +336,31 @@ cpp_quote("#define ROTFLAGS_ALLOWANYCLIENT 0x2") cpp_quote("#endif") typedef enum tagCLSCTX { - CLSCTX_INPROC_SERVER = 0x1, - CLSCTX_INPROC_HANDLER = 0x2, - CLSCTX_LOCAL_SERVER = 0x4, - CLSCTX_INPROC_SERVER16 = 0x8, - CLSCTX_REMOTE_SERVER = 0x10, - CLSCTX_INPROC_HANDLER16 = 0x20, - CLSCTX_INPROC_SERVERX86 = 0x40, - CLSCTX_INPROC_HANDLERX86 = 0x80, - CLSCTX_ESERVER_HANDLER = 0x100, - CLSCTX_NO_CODE_DOWNLOAD = 0x400, - CLSCTX_NO_CUSTOM_MARSHAL = 0x1000, - CLSCTX_ENABLE_CODE_DOWNLOAD = 0x2000, - CLSCTX_NO_FAILURE_LOG = 0x4000, - CLSCTX_DISABLE_AAA = 0x8000, - CLSCTX_ENABLE_AAA = 0x10000, - CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000 + CLSCTX_INPROC_SERVER = 0x00000001, + CLSCTX_INPROC_HANDLER = 0x00000002, + CLSCTX_LOCAL_SERVER = 0x00000004, + CLSCTX_INPROC_SERVER16 = 0x00000008, + CLSCTX_REMOTE_SERVER = 0x00000010, + CLSCTX_INPROC_HANDLER16 = 0x00000020, + CLSCTX_INPROC_SERVERX86 = 0x00000040, + CLSCTX_INPROC_HANDLERX86 = 0x00000080, + CLSCTX_ESERVER_HANDLER = 0x00000100, + CLSCTX_NO_CODE_DOWNLOAD = 0x00000400, + CLSCTX_NO_CUSTOM_MARSHAL = 0x00001000, + CLSCTX_ENABLE_CODE_DOWNLOAD = 0x00002000, + CLSCTX_NO_FAILURE_LOG = 0x00004000, + CLSCTX_DISABLE_AAA = 0x00008000, + CLSCTX_ENABLE_AAA = 0x00010000, + CLSCTX_FROM_DEFAULT_CONTEXT = 0x00020000, + CLSCTX_ACTIVATE_X86_SERVER = 0x00040000, + CLSCTX_ACTIVATE_32_BIT_SERVER = CLSCTX_ACTIVATE_X86_SERVER, + CLSCTX_ACTIVATE_64_BIT_SERVER = 0x00080000, + CLSCTX_ENABLE_CLOAKING = 0x00100000, + CLSCTX_APPCONTAINER = 0x00400000, + CLSCTX_ACTIVATE_AAA_AS_IU = 0x00800000, + CLSCTX_RESERVED6 = 0x01000000, + CLSCTX_ACTIVATE_ARM32_SERVER = 0x02000000, + CLSCTX_PS_DLL = 0x80000000, } CLSCTX; cpp_quote("#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER)") -- 2.28.0

3 8

[PATCH] vcruntime140_1: Handle rethrowing from nested try blocks on x64.
by Paul Gofman 09 Sep '20

09 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Here is MSVC test program I made for testing it: https://gist.github.com/gofman/a7cc10c4b815f3d35396d669901d37ad dlls/vcruntime140_1/except_x86_64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 0e27b02db13..f66ae43721f 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -103,6 +103,7 @@ typedef struct BOOL rethrow; INT search_state; INT unwind_state; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -473,7 +474,7 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -503,6 +504,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __CxxRegisterExceptionObject(&ep, &ctx.frame_info); ctx.search_state = rec->ExceptionInformation[2]; ctx.unwind_state = rec->ExceptionInformation[3]; + ctx.prev_rec = prev_rec; (*__processing_throw())--; __TRY { @@ -685,6 +687,12 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *(EXCEPTION_RECORD*)*__current_exception(); + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh)) -- 2.26.2

2 1

[PATCH] maintainers: Get rid of removed paths.
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 46b3d40ec33..b57eb5a5363 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -198,8 +198,6 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c -F: dlls/ole32/rpc.c -F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage -- 2.28.0

1 0

[PATCH] evr/mixer: Add another set of attributes.
by Nikolay Sivov 09 Sep '20

09 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 355 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 25 ++- 2 files changed, 377 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c7dbf8ff975..70199f37a1c 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -60,6 +60,7 @@ struct video_mixer IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; IMFVideoProcessor IMFVideoProcessor_iface; + IMFAttributes IMFAttributes_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -73,6 +74,7 @@ struct video_mixer IDirect3DDeviceManager9 *device_manager; IMediaEventSink *event_sink; IMFAttributes *attributes; + IMFAttributes *internal_attributes; unsigned int mixing_flags; CRITICAL_SECTION cs; }; @@ -122,6 +124,11 @@ static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); } +static struct video_mixer *impl_from_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFAttributes_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -206,6 +213,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFVideoProcessor_iface; } + else if (IsEqualIID(riid, &IID_IMFAttributes)) + { + *obj = &mixer->IMFAttributes_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -247,6 +258,8 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) IDirect3DDeviceManager9_Release(mixer->device_manager); if (mixer->attributes) IMFAttributes_Release(mixer->attributes); + if (mixer->internal_attributes) + IMFAttributes_Release(mixer->internal_attributes); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -1326,6 +1339,337 @@ static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = video_mixer_processor_SetBackgroundColor, }; +static HRESULT WINAPI video_mixer_attributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_attributes_AddRef(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_attributes_Release(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_attributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetItem(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); + + return IMFAttributes_GetItemType(mixer->internal_attributes, key, type); +} + +static HRESULT WINAPI video_mixer_attributes_CompareItem(IMFAttributes *iface, REFGUID key, + REFPROPVARIANT value, BOOL *result) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); + + return IMFAttributes_CompareItem(mixer->internal_attributes, key, value, result); +} + +static HRESULT WINAPI video_mixer_attributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, match_type, ret); + + return IMFAttributes_Compare(mixer->internal_attributes, theirs, match_type, ret); +} + +static HRESULT WINAPI video_mixer_attributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT32(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT64(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetDouble(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetGUID(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_GetStringLength(IMFAttributes *iface, REFGUID key, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); + + return IMFAttributes_GetStringLength(mixer->internal_attributes, key, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetString(IMFAttributes *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), value, size, length); + + return IMFAttributes_GetString(mixer->internal_attributes, key, value, size, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); + + return IMFAttributes_GetAllocatedString(mixer->internal_attributes, key, value, length); +} + +static HRESULT WINAPI video_mixer_attributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); + + return IMFAttributes_GetBlobSize(mixer->internal_attributes, key, size); +} + +static HRESULT WINAPI video_mixer_attributes_GetBlob(IMFAttributes *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + + return IMFAttributes_GetBlob(mixer->internal_attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI video_mixer_attributes_GetAllocatedBlob(IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_GetAllocatedBlob(mixer->internal_attributes, key, buf, size); +} + +static HRESULT WINAPI video_mixer_attributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), out); + + return IMFAttributes_GetUnknown(mixer->internal_attributes, key, riid, out); +} + +static HRESULT WINAPI video_mixer_attributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetItem(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_DeleteItem(IMFAttributes *iface, REFGUID key) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s.\n", iface, debugstr_guid(key)); + + return IMFAttributes_DeleteItem(mixer->internal_attributes, key); +} + +static HRESULT WINAPI video_mixer_attributes_DeleteAllItems(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_DeleteAllItems(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetUINT32(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + + return IMFAttributes_SetUINT64(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetDouble(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); + + return IMFAttributes_SetGUID(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetString(IMFAttributes *iface, REFGUID key, const WCHAR *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); + + return IMFAttributes_SetString(mixer->internal_attributes, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_SetBlob(IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_SetBlob(mixer->internal_attributes, key, buf, size); +} + +static HRESULT WINAPI video_mixer_attributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), unknown); + + return IMFAttributes_SetUnknown(mixer->internal_attributes, key, unknown); +} + +static HRESULT WINAPI video_mixer_attributes_LockStore(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_LockStore(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_UnlockStore(IMFAttributes *iface) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_UnlockStore(mixer->internal_attributes); +} + +static HRESULT WINAPI video_mixer_attributes_GetCount(IMFAttributes *iface, UINT32 *count) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, count); + + return IMFAttributes_GetCount(mixer->internal_attributes, count); +} + +static HRESULT WINAPI video_mixer_attributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, + GUID *key, PROPVARIANT *value) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return IMFAttributes_GetItemByIndex(mixer->internal_attributes, index, key, value); +} + +static HRESULT WINAPI video_mixer_attributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) +{ + struct video_mixer *mixer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, dest); + + return IMFAttributes_CopyAllItems(mixer->internal_attributes, dest); +} + +static const IMFAttributesVtbl video_mixer_attributes_vtbl = +{ + video_mixer_attributes_QueryInterface, + video_mixer_attributes_AddRef, + video_mixer_attributes_Release, + video_mixer_attributes_GetItem, + video_mixer_attributes_GetItemType, + video_mixer_attributes_CompareItem, + video_mixer_attributes_Compare, + video_mixer_attributes_GetUINT32, + video_mixer_attributes_GetUINT64, + video_mixer_attributes_GetDouble, + video_mixer_attributes_GetGUID, + video_mixer_attributes_GetStringLength, + video_mixer_attributes_GetString, + video_mixer_attributes_GetAllocatedString, + video_mixer_attributes_GetBlobSize, + video_mixer_attributes_GetBlob, + video_mixer_attributes_GetAllocatedBlob, + video_mixer_attributes_GetUnknown, + video_mixer_attributes_SetItem, + video_mixer_attributes_DeleteItem, + video_mixer_attributes_DeleteAllItems, + video_mixer_attributes_SetUINT32, + video_mixer_attributes_SetUINT64, + video_mixer_attributes_SetDouble, + video_mixer_attributes_SetGUID, + video_mixer_attributes_SetString, + video_mixer_attributes_SetBlob, + video_mixer_attributes_SetUnknown, + video_mixer_attributes_LockStore, + video_mixer_attributes_UnlockStore, + video_mixer_attributes_GetCount, + video_mixer_attributes_GetItemByIndex, + video_mixer_attributes_CopyAllItems +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1355,6 +1699,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; + object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; @@ -1366,10 +1711,20 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) IUnknown_Release(&object->IUnknown_inner); return hr; } + if (FAILED(hr = MFCreateAttributes(&object->internal_attributes, 0))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + + /* Default attributes configuration. */ + rect.left = rect.top = 0.0f; rect.right = rect.bottom = 1.0f; IMFAttributes_SetBlob(object->attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&rect, sizeof(rect)); + IMFAttributes_SetUINT32(object->internal_attributes, &MF_SA_D3D_AWARE, 1); + *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 92810b516a7..ecf1f850c77 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -424,8 +424,8 @@ static void test_default_mixer(void) DWORD input_id, output_id; IMFTransform *transform; DXVA2_ValueRange range; - DXVA2_Fixed32 value; - DWORD flags, count; + DXVA2_Fixed32 dxva_value; + DWORD flags, value, count; IMFGetService *gs; COLORREF color; unsigned int i; @@ -487,7 +487,7 @@ static void test_default_mixer(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); - hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &value); + hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); @@ -533,6 +533,25 @@ todo_wine ok(attributes == attributes2, "Unexpected attributes instance.\n"); IMFAttributes_Release(attributes2); + hr = IMFTransform_QueryInterface(transform, &IID_IMFAttributes, (void **)&attributes2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes != attributes2, "Unexpected attributes instance.\n"); + + hr = IMFAttributes_QueryInterface(attributes2, &IID_IMFTransform, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFAttributes_GetCount(attributes2, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + value = 0; + hr = IMFAttributes_GetUINT32(attributes2, &MF_SA_D3D_AWARE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected value %d.\n", value); + + IMFAttributes_Release(attributes2); + hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); -- 2.28.0

1 0

[PATCH] shell32: Make SHELL_translate_idlist() support url in PIDL.
by Haoyang Chen 09 Sep '20

09 Sep '20

1 0

[PATCH v5] quartz: Handle NULL visible in, IVideoWindow::get_Visible().
by Pengpeng Dong 09 Sep '20

09 Sep '20

2 1

[PATCH] hidclass.sys: Fix a leak in hid_device_thread()
by Haoyang Chen 09 Sep '20

09 Sep '20

1 0

[PATCH v3] ntdll: Fix arch heap free.
by Chao Long 09 Sep '20

09 Sep '20

valgrind log: 2178 ==31639== 4 bytes in 1 blocks are definitely lost in loss record 21 of 457 2179 ==31639== at 0x7BC6F0DA: notify_alloc (heap.c:260) 2180 ==31639== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) 2181 ==31639== by 0x7BC43A69: xmlstrdupW (actctx.c:747) 2182 ==31639== by 0x7BC462EA: parse_assembly_identity_elem (actctx.c:1524) 2183 ==31639== by 0x7BC483D9: parse_dependent_assembly_elem (actctx.c:2210) 2184 ==31639== by 0x7BC486AE: parse_dependency_elem (actctx.c:2254) 2185 ==31639== by 0x7BC49B23: parse_assembly_elem (actctx.c:2681)

1 0

[PATCH v2] ntdll: Fix arch heap free.
by Chao Long 09 Sep '20

09 Sep '20

2178 ==31639== 4 bytes in 1 blocks are definitely lost in loss record 21 of 457 2179 ==31639== at 0x7BC6F0DA: notify_alloc (heap.c:260) 2180 ==31639== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) 2181 ==31639== by 0x7BC43A69: xmlstrdupW (actctx.c:747) 2182 ==31639== by 0x7BC462EA: parse_assembly_identity_elem (actctx.c:1524) 2183 ==31639== by 0x7BC483D9: parse_dependent_assembly_elem (actctx.c:2210) 2184 ==31639== by 0x7BC486AE: parse_dependency_elem (actctx.c:2254) 2185 ==31639== by 0x7BC49B23: parse_assembly_elem (actctx.c:2681)

1 0

[PATCH v4] quartz: Fix crash when pVisible is NULL.
by Pengpeng Dong 09 Sep '20

09 Sep '20

3 2

[PATCH] ntdll: Fix arch heap free.
by Chao Long 09 Sep '20

09 Sep '20

2178 ==31639== 4 bytes in 1 blocks are definitely lost in loss record 21 of 457 2179 ==31639== at 0x7BC6F0DA: notify_alloc (heap.c:260) 2180 ==31639== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) 2181 ==31639== by 0x7BC43A69: xmlstrdupW (actctx.c:747) 2182 ==31639== by 0x7BC462EA: parse_assembly_identity_elem (actctx.c:1524) 2183 ==31639== by 0x7BC483D9: parse_dependent_assembly_elem (actctx.c:2210) 2184 ==31639== by 0x7BC486AE: parse_dependency_elem (actctx.c:2254) 2185 ==31639== by 0x7BC49B23: parse_assembly_elem (actctx.c:2681)

2 1

[PATCH v2 1/4] windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/converter.c | 48 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 18 deletions(-)

2 1

[PATCH v2 2/4] windowscodecs: Change argument type of configure_write_source() and write_source().
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/main.c | 6 +++--- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 1/4] include: Add more setupapi error codes.
by Zebediah Figura 09 Sep '20

09 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/setupapi.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/setupapi.h b/include/setupapi.h index ac789ae215b..e52dc253afd 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1218,7 +1218,26 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define ERROR_SET_SYSTEM_RESTORE_POINT (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x236) #define ERROR_INCORRECTLY_COPIED_INF (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x237) #define ERROR_SCE_DISABLED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x238) +#define ERROR_UNKNOWN_EXCEPTION (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x239) +#define ERROR_PNP_REGISTRY_ERROR (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23A) +#define ERROR_REMOTE_REQUEST_UNSUPPORTED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23B) +#define ERROR_NOT_AN_INSTALLED_OEM_INF (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23C) +#define ERROR_INF_IN_USE_BY_DEVICES (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23D) +#define ERROR_DI_FUNCTION_OBSOLETE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23E) +#define ERROR_NO_AUTHENTICODE_CATALOG (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23F) +#define ERROR_AUTHENTICODE_DISALLOWED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x240) +#define ERROR_AUTHENTICODE_TRUSTED_PUBLISHER (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x241) +#define ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x242) +#define ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x243) +#define ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x244) +#define ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x245) +#define ERROR_DEVICE_INSTALLER_NOT_READY (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x246) +#define ERROR_DRIVER_STORE_ADD_FAILED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x247) +#define ERROR_DEVICE_INSTALL_BLOCKED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x248) +#define ERROR_DRIVER_INSTALL_BLOCKED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x249) #define ERROR_WRONG_INF_TYPE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24A) +#define ERROR_FILE_HASH_NOT_IN_CATALOG (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24B) +#define ERROR_DRIVER_STORE_DELETE_FAILED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24C) #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE #define ERROR_INTERFACE_DEVICE_ACTIVE ERROR_DEVICE_INTERFACE_ACTIVE #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED -- 2.28.0

1 3

[PATCH 1/7] d3dcompiler: Support ID3D12ShaderReflection interface in D3DReflect().
by Paul Gofman 08 Sep '20

08 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 190599 - 190603. dlls/d3dcompiler_43/reflection.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a081b20d68f..3b451615103 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -93,6 +93,13 @@ struct d3dcompiler_shader_reflection_constant_buffer struct d3dcompiler_shader_reflection_variable *variables; }; +enum D3DCOMPILER_REFLECTION_VERSION +{ + D3DCOMPILER_REFLECTION_VERSION_D3D10, + D3DCOMPILER_REFLECTION_VERSION_D3D11, + D3DCOMPILER_REFLECTION_VERSION_D3D12, +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -100,6 +107,8 @@ struct d3dcompiler_shader_reflection ID3D10ShaderReflection ID3D10ShaderReflection_iface; LONG refcount; + enum D3DCOMPILER_REFLECTION_VERSION interface_version; + DWORD target; char *creator; UINT flags; @@ -332,7 +341,8 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) - || IsEqualGUID(riid, &IID_IUnknown)) + || IsEqualGUID(riid, &IID_IUnknown) + || (D3D_COMPILER_VERSION >= 47 && IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { IUnknown_AddRef(iface); *object = iface; @@ -486,7 +496,9 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - memcpy(desc, &reflection->bound_resources[index], sizeof(*desc)); + memcpy(desc, &reflection->bound_resources[index], + reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } @@ -583,7 +595,7 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); @@ -594,14 +606,15 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { TRACE("Returning D3D11_SHADER_INPUT_BIND_DESC %p.\n", d); - memcpy(desc, d, sizeof(*desc)); + memcpy(desc, d, reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } } @@ -2308,6 +2321,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad } object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->interface_version = D3DCOMPILER_REFLECTION_VERSION_D3D10; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); @@ -2350,7 +2364,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void #endif } - if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) + if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection) + && (D3D_COMPILER_VERSION < 47 || !IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection)); #if D3D_COMPILER_VERSION >= 46 @@ -2366,6 +2381,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; object->refcount = 1; + object->interface_version = IsEqualGUID(riid, &IID_ID3D12ShaderReflection) + ? D3DCOMPILER_REFLECTION_VERSION_D3D12 : D3DCOMPILER_REFLECTION_VERSION_D3D11; hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr)) -- 2.26.2

4 14

[PATCH 2/5] d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation.
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/d3dx10_43_main.c | 18 ++++++++++++++++++ include/d3dx10tex.h | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-)

2 4

[PATCH 1/5] d3dx10: Add D3DX10GetImageInfoFromFile{A, W}() stub implementation.
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/d3dx10_43_main.c | 16 ++++++++++++++++ include/d3dx10tex.h | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-)

2 1

[PATCH v2 6/7] d3dcompiler/tests: Test d3d12 interface in test_reflection_constant_buffer().
by Paul Gofman 08 Sep '20

08 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix test failures on d3d10. dlls/d3dcompiler_43/tests/reflection.c | 287 ++++++++++++++++++------- 1 file changed, 211 insertions(+), 76 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index c29c800ccdd..4a914b3251e 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1569,26 +1569,38 @@ static const D3D11_SHADER_TYPE_DESC test_reflection_constant_buffer_type_result[ static void test_reflection_constant_buffer(void) { - HRESULT hr; - ULONG count; - ID3D11ShaderReflection *ref11; + ID3D12ShaderReflectionType *t12, *mt12, *mt12_2, *t12_dummy = NULL, *t12_valid = NULL; + ID3D12ShaderReflectionConstantBuffer *cb12, *cb12_dummy = NULL, *cb12_valid = NULL; ID3D11ShaderReflectionConstantBuffer *cb11, *cb11_dummy = NULL, *cb11_valid = NULL; - ID3D11ShaderReflectionVariable *v11, *v11_dummy = NULL, *v11_valid = NULL; ID3D11ShaderReflectionType *t11, *t, *t2, *t11_dummy = NULL, *t11_valid = NULL; - D3D11_SHADER_BUFFER_DESC cbdesc = {0}; + ID3D12ShaderReflectionVariable *v12, *v12_dummy = NULL, *v12_valid = NULL; + ID3D11ShaderReflectionVariable *v11, *v11_dummy = NULL, *v11_valid = NULL; + D3D12_SHADER_VARIABLE_DESC vdesc12 = {0}; + const D3D11_SHADER_VARIABLE_DESC *pvdesc; + const D3D11_SHADER_BUFFER_DESC *pcbdesc; + D3D12_SHADER_BUFFER_DESC cbdesc12 = {0}; D3D11_SHADER_VARIABLE_DESC vdesc = {0}; + D3D11_SHADER_BUFFER_DESC cbdesc = {0}; + ID3D12ShaderReflection *ref12 = NULL; + const D3D11_SHADER_TYPE_DESC *ptdesc; + D3D12_SHADER_TYPE_DESC tdesc12 = {0}; D3D11_SHADER_TYPE_DESC tdesc = {0}; + ID3D11ShaderReflection *ref11; D3D11_SHADER_DESC sdesc = {0}; - const D3D11_SHADER_BUFFER_DESC *pcbdesc; - const D3D11_SHADER_VARIABLE_DESC *pvdesc; - const D3D11_SHADER_TYPE_DESC *ptdesc; unsigned int i, expected; LPCSTR string; + ULONG count; + HRESULT hr; hr = call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed %x\n", hr); +#if D3D_COMPILER_VERSION + call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], + &IID_ID3D12ShaderReflection, (void **)&ref12); +#endif + hr = ref11->lpVtbl->GetDesc(ref11, &sdesc); ok(hr == S_OK, "GetDesc failed %x\n", hr); @@ -1639,20 +1651,44 @@ static void test_reflection_constant_buffer(void) /* get the dummys for comparison */ cb11_dummy = ref11->lpVtbl->GetConstantBufferByIndex(ref11, 0xffffffff); - ok(cb11_dummy != NULL, "GetConstantBufferByIndex failed\n"); + ok(!!cb11_dummy, "Got unexpected buffer %p.\n", cb11_dummy); + + if (ref12) + { + cb12_dummy = ref12->lpVtbl->GetConstantBufferByIndex(ref12, 0xffffffff); + ok(!!cb12_dummy, "Got unexpected buffer %p.\n", cb12_dummy); + ok(cb12_dummy == (void *)cb11_dummy, "Got unexpected buffer %p.\n", cb12_dummy); + v12_dummy = cb12_dummy->lpVtbl->GetVariableByIndex(cb12_dummy, 0xffffffff); + ok(!!v12_dummy, "Got unexpected NULL variable.\n"); + } v11_dummy = cb11_dummy->lpVtbl->GetVariableByIndex(cb11_dummy, 0xffffffff); - ok(v11_dummy != NULL, "GetVariableByIndex failed\n"); + ok(!!v11_dummy, "Got unexpected NULL variable.\n"); t11_dummy = v11_dummy->lpVtbl->GetType(v11_dummy); - ok(t11_dummy != NULL, "GetType failed\n"); + ok(!!t11_dummy, "Got NULL type.\n"); /* get the valid variables */ cb11_valid = ref11->lpVtbl->GetConstantBufferByIndex(ref11, 1); - ok(cb11_valid != cb11_dummy && cb11_valid, "GetConstantBufferByIndex failed\n"); + ok(cb11_valid != cb11_dummy && cb11_valid, "Got unexpected buffer %p.\n", cb11_valid); + if (ref12) + { + cb12_valid = ref12->lpVtbl->GetConstantBufferByIndex(ref12, 1); + ok(cb12_valid != cb12_dummy && cb12_valid, "Got unexpected buffer %p.\n", cb11_valid); + ok(cb12_valid != (void *)cb11_valid, "Got unexpected buffer %p.\n", cb12_valid); + + v12_valid = cb12_valid->lpVtbl->GetVariableByIndex(cb12_valid, 0); + ok(v12_valid != v12_dummy && v12_valid, "Got unexpected variable %p.\n", v12_valid); + + t12_dummy = v12_dummy->lpVtbl->GetType(v12_dummy); + ok(!!t12_dummy, "Got NULL type.\n"); + + t12_valid = v12_valid->lpVtbl->GetType(v12_valid); + ok(t12_valid != t12_dummy && t12_valid, "GetType failed\n"); + } v11_valid = cb11_valid->lpVtbl->GetVariableByIndex(cb11_valid, 0); - ok(v11_valid != v11_dummy && v11_valid, "GetVariableByIndex failed\n"); + ok(v11_valid != v11_dummy && v11_valid, "Got unexpected variable %p.\n", v11_valid); t11_valid = v11_valid->lpVtbl->GetType(v11_valid); ok(t11_valid != t11_dummy && t11_valid, "GetType failed\n"); @@ -1666,30 +1702,36 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION v11 = ref11->lpVtbl->GetVariableByName(ref11, NULL); - ok(v11_dummy == v11, "GetVariableByIndex failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = ref11->lpVtbl->GetVariableByName(ref11, "invalid"); - ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = ref11->lpVtbl->GetVariableByName(ref11, "a"); - ok(v11_valid == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_valid); + ok(v11_valid == v11, "Got unexpected variable %p.\n", v11); #endif /* constant buffer calls */ v11 = cb11_dummy->lpVtbl->GetVariableByName(cb11_dummy, NULL); - ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = cb11_dummy->lpVtbl->GetVariableByName(cb11_dummy, "invalid"); - ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = cb11_valid->lpVtbl->GetVariableByName(cb11_valid, NULL); - ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = cb11_valid->lpVtbl->GetVariableByName(cb11_valid, "invalid"); - ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); + ok(v11_dummy == v11, "Got unexpected variable %p.\n", v11); v11 = cb11_valid->lpVtbl->GetVariableByName(cb11_valid, "a"); - ok(v11_valid == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_valid); + ok(v11_valid == v11, "Got unexpected variable %p.\n", v11); + + if (ref12) + { + v12 = cb12_valid->lpVtbl->GetVariableByName(cb12_valid, "a"); + ok(v12_valid == v12, "Got unexpected variable %p.\n", v12); + } hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, NULL); ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); @@ -1764,21 +1806,30 @@ static void test_reflection_constant_buffer(void) pcbdesc = &test_reflection_constant_buffer_cb_result[i]; cb11 = ref11->lpVtbl->GetConstantBufferByIndex(ref11, i); - ok(cb11_dummy != cb11, "GetConstantBufferByIndex(%u) failed\n", i); + ok(cb11_dummy != cb11, "Got dummy constant buffer, i %u.\n", i); hr = cb11->lpVtbl->GetDesc(cb11, &cbdesc); - ok(hr == S_OK, "GetDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); - - ok(!strcmp(cbdesc.Name, pcbdesc->Name), "GetDesc(%u) Name failed, got \"%s\", expected \"%s\"\n", - i, cbdesc.Name, pcbdesc->Name); - ok(cbdesc.Type == pcbdesc->Type, "GetDesc(%u) Type failed, got %x, expected %x\n", - i, cbdesc.Type, pcbdesc->Type); - ok(cbdesc.Variables == pcbdesc->Variables, "GetDesc(%u) Variables failed, got %u, expected %u\n", - i, cbdesc.Variables, pcbdesc->Variables); - ok(cbdesc.Size == pcbdesc->Size, "GetDesc(%u) Size failed, got %u, expected %u\n", - i, cbdesc.Size, pcbdesc->Size); - ok(cbdesc.uFlags == pcbdesc->uFlags, "GetDesc(%u) uFlags failed, got %u, expected %u\n", - i, cbdesc.uFlags, pcbdesc->uFlags); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + ok(!strcmp(cbdesc.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); + ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); + ok(cbdesc.Variables == pcbdesc->Variables, "Got unexpected Variables %u, i %u.\n", cbdesc.Variables, i); + ok(cbdesc.Size == pcbdesc->Size, "Got unexpected Size %u, i %u.\n", cbdesc.Size, i); + ok(cbdesc.uFlags == pcbdesc->uFlags, "Got unexpected uFlags %#x, i %u.\n", cbdesc.uFlags, i); + + if (ref12) + { + cb12 = ref12->lpVtbl->GetConstantBufferByIndex(ref12, i); + ok(cb12_dummy != cb12, "Got dummy constant buffer, i %u.\n", i); + + hr = cb12->lpVtbl->GetDesc(cb12, &cbdesc12); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + ok(!strcmp(cbdesc12.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); + ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); + ok(!memcmp(&cbdesc12.Type, &cbdesc.Type, sizeof(cbdesc) - offsetof(D3D11_SHADER_BUFFER_DESC, Type)), + "CB description does not match. i %u.\n", i); + } } /* variables */ @@ -1790,45 +1841,85 @@ static void test_reflection_constant_buffer(void) v11 = ref11->lpVtbl->GetVariableByName(ref11, pvdesc->Name); else v11 = cb11_valid->lpVtbl->GetVariableByName(cb11_valid, pvdesc->Name); - ok(v11_dummy != v11, "Test %u: got unexpected variable %p.\n", i, v11); + ok(v11_dummy != v11, "Test %u, got unexpected variable %p.\n", i, v11); + + if (D3D_COMPILER_VERSION) + { + vdesc.StartTexture = 0xdeadbeef; + vdesc.TextureSize = 0xdeadbeef; + vdesc.StartSampler = 0xdeadbeef; + vdesc.SamplerSize = 0xdeadbeef; + } + else + { + vdesc.StartTexture = 0xffffffff; + vdesc.StartSampler = 0xffffffff; + } hr = v11->lpVtbl->GetDesc(v11, &vdesc); - ok(hr == S_OK, "GetDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); - - ok(!strcmp(vdesc.Name, pvdesc->Name), "GetDesc(%u) Name failed, got \"%s\", expected \"%s\"\n", - i, vdesc.Name, pvdesc->Name); - ok(vdesc.StartOffset == pvdesc->StartOffset, "GetDesc(%u) StartOffset failed, got %u, expected %u\n", - i, vdesc.StartOffset, pvdesc->StartOffset); - ok(vdesc.Size == pvdesc->Size, "GetDesc(%u) Size failed, got %u, expected %u\n", - i, vdesc.Size, pvdesc->Size); - ok(vdesc.uFlags == pvdesc->uFlags, "GetDesc(%u) uFlags failed, got %u, expected %u\n", - i, vdesc.uFlags, pvdesc->uFlags); - ok(vdesc.DefaultValue == pvdesc->DefaultValue, "GetDesc(%u) DefaultValue failed\n", i); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + ok(!strcmp(vdesc.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc.Name, i); + ok(vdesc.StartOffset == pvdesc->StartOffset, "Got unexpected StartOffset %u, i %u.\n", + vdesc.StartOffset, i); + ok(vdesc.Size == pvdesc->Size, "Got unexpected Size %u, i %u.\n", vdesc.Size, i); + ok(vdesc.uFlags == pvdesc->uFlags, "Got unexpected uFlags %#x, i %u.\n", vdesc.uFlags, i); + ok(vdesc.DefaultValue == pvdesc->DefaultValue, "Got unexpected DefaultValue %p, i %u.\n", + vdesc.DefaultValue, i); + todo_wine_if(D3D_COMPILER_VERSION) + { + ok(vdesc.StartTexture == 0xffffffff, "Got unexpected StartTexture %#x, i %u.\n", vdesc.StartTexture, i); + ok(!vdesc.TextureSize, "Got unexpected TextureSize %u, i %u.\n", vdesc.TextureSize, i); + ok(vdesc.StartSampler == 0xffffffff, "Got unexpected StartSampler %u, i %u.\n", vdesc.StartSampler, i); + ok(!vdesc.SamplerSize, "Got unexpected SamplerSize %u, i %u.\n", vdesc.SamplerSize, i); + } + + if (ref12) + { + v12 = ref12->lpVtbl->GetVariableByName(ref12, pvdesc->Name); + ok(v12_dummy != v12, "Test %u, got unexpected variable %p.\n", i, v12); + hr = v12->lpVtbl->GetDesc(v12, &vdesc12); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); + todo_wine ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, + sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), + "D3D11 and D3D12 descs do not match.\n"); + } + else + { + /* Silence compiler warning. */ + v12 = NULL; + } /* types */ ptdesc = &test_reflection_constant_buffer_type_result[test_reflection_constant_buffer_variable_result[i].type]; t11 = v11->lpVtbl->GetType(v11); - ok(t11_dummy != t11, "GetType(%u) failed\n", i); + ok(t11_dummy != t11, "Got unexpected type %p, i %u.\n", t11, i); hr = t11->lpVtbl->GetDesc(t11, &tdesc); - ok(hr == S_OK, "GetDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); - - ok(tdesc.Class == ptdesc->Class, "GetDesc(%u) Class failed, got %x, expected %x\n", - i, tdesc.Class, ptdesc->Class); - ok(tdesc.Type == ptdesc->Type, "GetDesc(%u) Type failed, got %x, expected %x\n", - i, tdesc.Type, ptdesc->Type); - ok(tdesc.Rows == ptdesc->Rows, "GetDesc(%u) Rows failed, got %x, expected %x\n", - i, tdesc.Rows, ptdesc->Rows); - ok(tdesc.Columns == ptdesc->Columns, "GetDesc(%u) Columns failed, got %u, expected %u\n", - i, tdesc.Columns, ptdesc->Columns); - ok(tdesc.Elements == ptdesc->Elements, "GetDesc(%u) Elements failed, got %u, expected %u\n", - i, tdesc.Elements, ptdesc->Elements); - ok(tdesc.Offset == ptdesc->Offset, "GetDesc(%u) Offset failed, got %u, expected %u\n", - i, tdesc.Offset, ptdesc->Offset); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + ok(tdesc.Class == ptdesc->Class, "Got unexpected Class %u, i %u.\n", tdesc.Class, i); + ok(tdesc.Type == ptdesc->Type, "Got unexpected Type %u, i %u.\n", tdesc.Type, i); + ok(tdesc.Rows == ptdesc->Rows, "Got unexpected Rows %u, i %u.\n", tdesc.Rows, i); + ok(tdesc.Columns == ptdesc->Columns, "Got unexpected Columns %u, i %u.\n", tdesc.Columns, i); + ok(tdesc.Elements == ptdesc->Elements, "Got unexpected Elements %u, i %u.\n", tdesc.Elements, i); + ok(tdesc.Offset == ptdesc->Offset, "Got unexpected Offset %u, i %u.\n", tdesc.Offset, i); if (D3D_COMPILER_VERSION) - ok(!strcmp(tdesc.Name, ptdesc->Name), "Test %u: got unexpected Name %s.\n", - i, debugstr_a(tdesc.Name)); + ok(!strcmp(tdesc.Name, ptdesc->Name), "Got unexpected Name %s, i %u.\n", debugstr_a(tdesc.Name), i); + + if (ref12) + { + t12 = v12->lpVtbl->GetType(v12); + ok(t12_dummy != t12, "Got unexpected type %p, i %u.\n", t12, i); + + hr = t12->lpVtbl->GetDesc(t12, &tdesc12); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(!memcmp(&tdesc12, &tdesc, offsetof(D3D11_SHADER_TYPE_DESC, Name)), + "D3D11 and D3D12 descs do not match.\n"); + ok(!strcmp(tdesc12.Name, ptdesc->Name), "Got unexpected Name %s, i %u.\n", debugstr_a(tdesc12.Name), i); + } } /* types */ @@ -1839,47 +1930,91 @@ static void test_reflection_constant_buffer(void) ok(v11_dummy != v11, "Got unexpected variable %p.\n", v11); t11 = v11->lpVtbl->GetType(v11); - ok(t11 != t11_dummy, "GetType failed\n"); + ok(t11 != t11_dummy, "Got unexpected type %p.\n", t11); t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); - ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + ok(t != t11_dummy, "Got unexpected type %p.\n", t); t2 = t11->lpVtbl->GetMemberTypeByName(t11, "a"); - ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + ok(t == t2, "Got unexpected type %p.\n", t2); string = t11->lpVtbl->GetMemberTypeName(t11, 0); - ok(!strcmp(string, "a"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "a"); + ok(!strcmp(string, "a"), "Got unexpected string \"%s\".\n", string); t = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); - ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + ok(t != t11_dummy, "Got unexpected type %p.\n", t); t2 = t11->lpVtbl->GetMemberTypeByName(t11, "b"); - ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + ok(t == t2, "Got unexpected type %p.\n", t2); string = t11->lpVtbl->GetMemberTypeName(t11, 1); - ok(!strcmp(string, "b"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "b"); + ok(!strcmp(string, "b"), "Got unexpected string \"%s\".\n", string); #if D3D_COMPILER_VERSION /* float vs float (in struct) */ hr = t11->lpVtbl->IsEqual(t11, t11_valid); - ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); - ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); /* float vs float */ t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); - ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + ok(t != t11_dummy, "Got unexpected type %p.\n", t); t2 = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); - ok(t2 != t11_dummy, "GetMemberTypeByIndex failed\n"); + ok(t2 != t11_dummy, "Got unexpected type %p.\n", t2); hr = t->lpVtbl->IsEqual(t, t2); - ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); #endif + if (ref12) + { + v12 = ref12->lpVtbl->GetVariableByName(ref12, "t"); + ok(v12_dummy != v12, "Got unexpected variable %p.\n", v12); + + t12 = v12->lpVtbl->GetType(v12); + ok(t12 != t12_dummy, "Got unexpected type %p.\n", t12); + + mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 0); + ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); + + mt12_2 = t12->lpVtbl->GetMemberTypeByName(t12, "a"); + ok(mt12 == mt12_2, "Got unexpected type %p.\n", mt12_2); + + string = t12->lpVtbl->GetMemberTypeName(t12, 0); + ok(!strcmp(string, "a"), "Got unexpected string \"%s\".\n", string); + + mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 1); + ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); + + mt12_2 = t12->lpVtbl->GetMemberTypeByName(t12, "b"); + ok(mt12 == mt12_2, "Got unexpected type %p.\n", mt12_2); + + string = t12->lpVtbl->GetMemberTypeName(t12, 1); + ok(!strcmp(string, "b"), "Got unexpected string \"%s\".\n", string); + + hr = t12->lpVtbl->IsEqual(t12, t12_valid); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = t12_valid->lpVtbl->IsEqual(t12_valid, t12); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 0); + ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); + + mt12_2 = t12->lpVtbl->GetMemberTypeByIndex(t12, 1); + ok(mt12_2 != t12_dummy, "Got unexpected type %p.\n", mt12_2); + + hr = mt12->lpVtbl->IsEqual(mt12, mt12_2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + count = ref12->lpVtbl->Release(ref12); + ok(!count, "Got unexpected ref count %u.\n", count); + } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected ref count %u.\n", count); } /* -- 2.26.2

2 2

[PATCH v3 resend 4/4] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 08 Sep '20

08 Sep '20

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). Best, Erich

1 0

[PATCH v3 resend 2/4] mountmgr: Add support for IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 08 Sep '20

08 Sep '20

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr. v3: Use SystemBuffer instead of UserBuffer (see 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23) v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

1 0

[PATCH] winevulkan: Change make_vulkan interpreter to '/usr/bin/env python3'.
by Brendan Shanks 08 Sep '20

08 Sep '20

Fixes running on macOS and BSDs where Python 3 isn't installed in /usr/bin. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2ebdb44a095..5a807c12e4e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Wine Vulkan generator # # Copyright 2017-2018 Roderick Colenbrander -- 2.26.2

2 1

[PATCH] comctl32/listview: Add Get/SetSelectedColumn() support
by Eric Wheeler 08 Sep '20

08 Sep '20

In some programs using listview with columns, the first column of the listbox will select but is not editable and the remaining columns do not respond to clicking. When clicking one of the checkboxes in the column nothing happens and you get these two errors in the console: 0118:err:listview:LISTVIEW_WindowProc unknown msg 108c wp=00000004 lp=00000000 0118:err:listview:LISTVIEW_WindowProc unknown msg 10ae wp=00000000 lp=00000000 We find that include/commctrl.h defines these as follows: #define LVM_SETSELECTEDCOLUMN (LVM_FIRST + 140) /* 108c is 0x1000 + 140 */ #define LVM_GETSELECTEDCOLUMN (LVM_FIRST + 174) /* 10ae is 0x1000 + 174 */ Changes: * These defines were removed from the TODO seciton * An INT was added to the LISTVIEW_INFO structure to track the selected column * LISTVIEW_WindowProc() case statements were added to handle the mapping. Fixes: https://forum.winehq.org/viewtopic.php?f=8&t=34287 Signed-off-by: Eric Wheeler <wine(a)linux.ewheeler.net> diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dba16d1..92e8faa 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVM_GETINSERTMARKRECT * -- LVM_GETNUMBEROFWORKAREAS * -- LVM_GETOUTLINECOLOR, LVM_SETOUTLINECOLOR - * -- LVM_GETSELECTEDCOLUMN, LVM_SETSELECTEDCOLUMN * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO @@ -248,6 +247,7 @@ typedef struct tagLISTVIEW_INFO /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ BOOL colRectsDirty; /* trigger column rectangles requery from header */ + INT iSelectedColumn; /* for use with Set/GetSelectedColumn() */ /* item metrics */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ @@ -11465,7 +11465,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_GETOUTLINECOLOR: */ - /* case LVM_GETSELECTEDCOLUMN: */ + case LVM_GETSELECTEDCOLUMN: + return infoPtr->iSelectedColumn; case LVM_GETSELECTEDCOUNT: return LISTVIEW_GetSelectedCount(infoPtr); @@ -11638,7 +11639,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETOUTLINECOLOR: */ - /* case LVM_SETSELECTEDCOLUMN: */ + case LVM_SETSELECTEDCOLUMN: + infoPtr->iSelectedColumn = (INT)wParam; + return TRUE; case LVM_SETSELECTIONMARK: return LISTVIEW_SetSelectionMark(infoPtr, (INT)lParam);

2 8

[PATCH v2 5/5] conhost: Use more standard hide cursor sequence.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 +- programs/conhost/tests/tty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] winevulkan: fail on explicit layer usage
by Liam Middlebrook 08 Sep '20

08 Sep '20

Fixes failure in dEQP-VK.api.device_init.create_instance_layer_name_abuse which expects all layers passed in as part of test to cause instance creation to fail. A quirk bit WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS has been added to optionally restore the previous functionality. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 14 ++++++++++---- dlls/winevulkan/vulkan_private.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1b359d22c8c..a8beef126bd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -335,7 +335,7 @@ static void wine_vk_init_once(void) * driver is responsible for handling e.g. surface extensions. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, - VkInstanceCreateInfo *dst) + VkInstanceCreateInfo *dst, struct VkInstance_T *object) { unsigned int i; VkResult res; @@ -351,8 +351,14 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader * filter this data out as well. */ - dst->enabledLayerCount = 0; - dst->ppEnabledLayerNames = NULL; + if (object->quirks & WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS) { + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + WARN("Ignoring explicit layers!\n"); + } else if (dst->enabledLayerCount) { + FIXME("Loading explicit layers is not supported by winevulkan!\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) @@ -673,7 +679,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) { wine_vk_instance_free(object); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index b048108f7a6..4bcc4de440d 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -39,6 +39,7 @@ #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 #define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 struct vulkan_func { -- 2.17.1

1 1

[PATCH v2 3/5] conhost/tests: Add tty input tests.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 257 ++++++++++++++++++++++++++++++++++- 1 file changed, 256 insertions(+), 1 deletion(-)

2 1

[PATCH v3] ws2_32: Very minimal support for AF_UNIX.
by Richard W.M. Jones 08 Sep '20

08 Sep '20

I haven't added any tests yet as the wine/dlls/ws2_32/tests/sock.c fiile is rather daunting. However it does fix a signficant bug - I forgot to translate the filename in the sun_path field from a Windows name to a Unix name. This happened to work by accident with my server which was setting a relative path here, but as soon as I used an absolute path for the socket it revealed the bug in my Wine patch. Rich.

2 4

[PATCH v2 4/5] kernel32/tests: Skip more tests on old Windows.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2 2/5] conhost: Add tty input implementation.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.c | 263 ++++++++++++++++++++++++++++++++++- 2 files changed, 262 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/5] conhost: Move console input processing into a separated function.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)

1 0

[PATCH 5/5] conhost: Use more standard hide cursor sequence.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 +- programs/conhost/tests/tty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 4/5] kernel32/tests: Skip more tests on old Windows.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] amstream: Implement AMDirectDrawStream::GetFormat.
by Anton Baskanov 08 Sep '20

08 Sep '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 46 ++++++++++- dlls/amstream/tests/amstream.c | 135 +++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0d3f2d0d4b8..0a291f37214 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -47,6 +47,7 @@ struct ddraw_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + DDSURFACEDESC format; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -363,11 +364,40 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetFormat(IDirectDrawMediaStr DDSURFACEDESC *current_format, IDirectDrawPalette **palette, DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, - flags); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, current_format %p, palette %p, desired_format %p, flags %p.\n", stream, current_format, palette, + desired_format, flags); + + EnterCriticalSection(&stream->cs); - return MS_E_NOSTREAM; + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + if (current_format) + { + *current_format = stream->format; + current_format->dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + } + if (palette) + *palette = NULL; + + if (desired_format) + { + *desired_format = stream->format; + desired_format->dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + } + + if (flags) + *flags = 0; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStream *iface, @@ -637,6 +667,7 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { + const VIDEOINFOHEADER *video_info = (const VIDEOINFOHEADER *)mt->pbFormat; struct ddraw_stream *stream = impl_from_IPin(iface); PIN_DIRECTION dir; @@ -673,6 +704,9 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); + stream->format.dwWidth = video_info->bmiHeader.biWidth; + stream->format.dwHeight = abs(video_info->bmiHeader.biHeight); + LeaveCriticalSection(&stream->cs); return S_OK; @@ -981,6 +1015,12 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->format.dwSize = sizeof(DDSURFACEDESC); + object->format.dwFlags = DDSD_CAPS; + object->format.dwWidth = 100; + object->format.dwHeight = 100; + object->format.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + InitializeCriticalSection(&object->cs); TRACE("Created ddraw stream %p.\n", object); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a1807..934639258d6 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -51,6 +51,26 @@ static const AM_MEDIA_TYPE audio_mt = .pbFormat = (BYTE *)&audio_format, }; +static const VIDEOINFO rgb32_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 32, + .bmiHeader.biCompression = BI_RGB, +}; + +static const AM_MEDIA_TYPE rgb32_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB32, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb32_video_info, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -4474,6 +4494,120 @@ static void test_ddrawstream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void check_ddrawstream_get_format(IDirectDrawMediaStream *ddraw_stream) +{ + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + DWORD flags; + HRESULT hr; + + memset(&current_format, 0xcc, sizeof(current_format)); + current_format.dwSize = sizeof(current_format); + palette = (IDirectDrawPalette *)0xdeadbeef; + memset(&desired_format, 0xcc, sizeof(desired_format)); + desired_format.dwSize = sizeof(desired_format); + flags = 0xdeadbeef; + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS), "Got flags %#x.\n", current_format.dwFlags); + ok(current_format.dwWidth == 333, "Got width %u.\n", current_format.dwWidth); + ok(current_format.dwHeight == 444, "Got height %u.\n", current_format.dwHeight); + ok(current_format.ddsCaps.dwCaps == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY), + "Got caps %#x.\n", current_format.ddsCaps.dwCaps); + ok(palette == NULL, "Got palette %p.\n", palette); + ok(desired_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT), "Got flags %#x.\n", desired_format.dwFlags); + ok(desired_format.dwWidth == 333, "Got width %u.\n", desired_format.dwWidth); + ok(desired_format.dwHeight == 444, "Got height %u.\n", desired_format.dwHeight); + ok(flags == 0, "Got flags %#x.\n", flags); +} + +static void test_ddrawstream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + DWORD flags; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.rcSource.right = 222; + video_info.rcSource.bottom = 333; + video_info.rcTarget.right = 444; + video_info.rcTarget.bottom = 666; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_ddrawstream_get_format(ddraw_stream); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_ddrawstream_get_format(ddraw_stream); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5936,6 +6070,7 @@ START_TEST(amstream) test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); test_ddrawstream_create_sample(); + test_ddrawstream_get_format(); test_ddrawstreamsample_get_media_stream(); -- 2.17.1

2 14

[PATCH 3/5] conhost/tests: Add tty input tests.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 256 ++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-)

2 1

[PATCH 2/5] conhost: Add tty input implementation.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.c | 258 ++++++++++++++++++++++++++++++++++- 2 files changed, 258 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] conhost: Move console input processing into a separated function.
by Jacek Caban 08 Sep '20

08 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)

1 0

[PATCH v4 1/3] qcap/tests: Test effect of setting stream format on media type enumeration.
by Zebediah Figura 08 Sep '20

08 Sep '20

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: Minor spacing changes; remove a not particularly necessary comment. dlls/qcap/tests/videocapture.c | 61 ++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 326601a398c..8bda036e1d9 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,12 @@ #include "wine/test.h" #include "wine/strmbase.h" +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -78,11 +84,11 @@ static void test_media_types(IPin *pin) static void test_stream_config(IPin *pin) { VIDEOINFOHEADER *video_info, *video_info2; + LONG depth, compression, count, size, i; + IEnumMediaTypes *enum_media_types; AM_MEDIA_TYPE *format, *format2; - VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; - LONG depth, compression; - LONG count, size; + VIDEO_STREAM_CONFIG_CAPS vscc; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -96,6 +102,16 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* After setting the format, a single media type is enumerated. + * This persists until the filter is released. */ + IPin_EnumMediaTypes(pin, &enum_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + DeleteMediaType(format2); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumMediaTypes_Release(enum_media_types); + format->majortype = MEDIATYPE_Audio; hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == E_FAIL, "Got hr %#x.\n", hr); @@ -162,14 +178,37 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", - debugstr_guid(&MEDIATYPE_Video)); - ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) - || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", - debugstr_guid(&vscc.guid)); - FreeMediaType(format); + for (i = 0; i < count; ++i) + { + hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + DeleteMediaType(format2); + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine_if (!compare_media_types(format, format2)) + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + + DeleteMediaType(format2); + IEnumMediaTypes_Release(enum_media_types); + + DeleteMediaType(format); + } IAMStreamConfig_Release(stream_config); } -- 2.28.0

1 2

[PATCH v3 1/4] qcap/tests: Test effect of setting stream format on media type enumeration.
by Jeff Smith 08 Sep '20

08 Sep '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v3: - Fixup patches failing to apply. dlls/qcap/tests/videocapture.c | 59 ++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 326601a398..dcce3a7869 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,12 @@ #include "wine/test.h" #include "wine/strmbase.h" +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -81,8 +87,9 @@ static void test_stream_config(IPin *pin) AM_MEDIA_TYPE *format, *format2; VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; + IEnumMediaTypes *enum_media_types; LONG depth, compression; - LONG count, size; + LONG count, size, i; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -96,6 +103,16 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* After setting format, a single media type is enumerated. + * This persists until the filter is released. */ + IPin_EnumMediaTypes(pin, &enum_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + DeleteMediaType(format2); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumMediaTypes_Release(enum_media_types); + format->majortype = MEDIATYPE_Audio; hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == E_FAIL, "Got hr %#x.\n", hr); @@ -162,14 +179,38 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", - debugstr_guid(&MEDIATYPE_Video)); - ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) - || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", - debugstr_guid(&vscc.guid)); - FreeMediaType(format); + for (i = 0; i < count; i++) + { + hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + DeleteMediaType(format2); + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Which media types will match varies in wine depending on the attached webcam */ + todo_wine_if(compare_media_types(format, format2) == FALSE) + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + + DeleteMediaType(format2); + IEnumMediaTypes_Release(enum_media_types); + + DeleteMediaType(format); + } IAMStreamConfig_Release(stream_config); } -- 2.23.0

2 4

[PATCH v3 1/2] quartz/tests: Add a test case where BaseControlWindowImpl_get_Visible returns the result when visible is NULL.
by dongpengpeng＠uniontech.com 08 Sep '20

08 Sep '20

3 2

[PATCH v2] shell32: Skip OpenAs_RunDLL in uri
by Haoyang Chen 08 Sep '20

08 Sep '20

1 0

[PATCH v3] msvcirt: Implement a part of fstream.
by Arkadiusz Hiler 08 Sep '20

08 Sep '20

This patch make it possible to play Tron 2.0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v3: rebase on top of current master - _mtlock tests changed the context so the patch didn't apply anymore v2: * msvcrt20 & msvcrt40 * fixed ??_Efstream@@UAEPAXI@Z * include iostream in rtti hierarchy dlls/msvcirt/msvcirt.c | 37 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 22 +++++------ dlls/msvcirt/tests/msvcirt.c | 74 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 26 ++++++------- dlls/msvcrt40/msvcrt40.spec | 18 ++++----- 5 files changed, 143 insertions(+), 33 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 170dcee462a..99ce1d929c0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -200,6 +200,8 @@ extern const vtable_ptr MSVCP_iostream_vtable; extern const vtable_ptr MSVCP_strstream_vtable; /* ??_7stdiostream@@6B@ */ extern const vtable_ptr MSVCP_stdiostream_vtable; +/* ??_7fstream@@6B@ */ +extern const vtable_ptr MSVCP_fstream_vtable; __ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(streambuf, @@ -272,6 +274,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(stdiostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); + __ASM_VTABLE(fstream, + VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_BLOCK_END #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) @@ -321,6 +325,9 @@ DEFINE_RTTI_DATA5(strstream, sizeof(iostream), &iostream_rtti_base_descriptor, DEFINE_RTTI_DATA5(stdiostream, sizeof(iostream), &iostream_rtti_base_descriptor, &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstdiostream@@") +DEFINE_RTTI_DATA5(fstream, sizeof(iostream), &iostream_rtti_base_descriptor, + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, + &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVfstream@@") /* ?cin@@3Vistream_withassign@@A */ struct { @@ -4369,6 +4376,8 @@ iostream* __thiscall iostream_copy_ctor(iostream *this, const iostream *copy, BO /* ??1stdiostream@@UEAA@XZ */ /* ??1strstream@@UAE@XZ */ /* ??1strstream@@UEAA@XZ */ +/* ??1fstream@@UAE@XZ */ +/* ??1fstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(iostream_dtor, 4) void __thiscall iostream_dtor(ios *base) { @@ -4601,6 +4610,32 @@ stdiobuf* __thiscall stdiostream_rdbuf(const iostream *this) return (stdiobuf*) istream_get_ios(&this->base1)->sb; } +/* ??0fstream@@QAE@PBDHH@Z */ +/* ??0fstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_open_ctor, 20) +iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (!fb) { + FIXME("out of memory\n"); + return NULL; + } + + 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; + + return this; +} + /* ??0Iostream_init@@QAE@AAVios@@H@Z */ /* ??0Iostream_init@@QEAA@AEAVios@@H@Z */ DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) @@ -4771,6 +4806,7 @@ static void init_io(void *base) init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); + init_fstream_rtti(base); #endif if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 4e8f221b2c0..0842b143141 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -22,8 +22,8 @@ @ stub -arch=win64 ??0fstream@@QEAA@H@Z @ stub -arch=win32 ??0fstream@@QAE@HPADH@Z # __thiscall fstream::fstream(int,char *,int) @ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0fstream@@QAE@PBDHH@Z # __thiscall fstream::fstream(char const *,int,int) -@ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) fstream_open_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) fstream_open_ctor @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor @@ -136,8 +136,8 @@ @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) MSVCP_exception_dtor @ thiscall -arch=win32 ??1filebuf@@UAE@XZ(ptr) filebuf_dtor @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor -@ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) -@ stub -arch=win64 ??1fstream@@UEAA@XZ +@ thiscall -arch=win32 ??1fstream@@UAE@XZ(ptr) iostream_dtor +@ cdecl -arch=win64 ??1fstream@@UEAA@XZ(ptr) iostream_dtor @ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor @ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @@ -304,7 +304,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) ios_op_void @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable -# @ extern ??_7fstream@@6B@ # const fstream::`vftable' +@ extern ??_7fstream@@6B@ MSVCP_fstream_vtable @ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @@ -321,8 +321,8 @@ @ extern ??_7streambuf@@6B@ MSVCP_streambuf_vtable @ extern ??_7strstream@@6B@ MSVCP_strstream_vtable @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable -# @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} -# @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} +@ extern ??_8fstream@@7Bistream@@@ iostream_vbtable_istream +@ extern ??_8fstream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @@ -337,8 +337,8 @@ @ extern ??_8stdiostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8strstream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream -@ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Dfstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Dfstream@@QAEXXZ(ptr) iostream_vbase_dtor +@ cdecl -arch=win64 ??_Dfstream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor @ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @@ -363,7 +363,7 @@ @ cdecl -arch=win64 ??_Dstrstream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor -@ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Efstream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @@ -382,7 +382,7 @@ @ thiscall -arch=win32 ??_Estrstreambuf@@UAEPAXI@Z(ptr long) strstreambuf_vector_dtor @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor -@ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gfstream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index b87bd422668..7bb8bdcf738 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -232,6 +232,7 @@ static int (*__thiscall p_filebuf_sync)(filebuf*); static int (*__thiscall p_filebuf_overflow)(filebuf*, int); static int (*__thiscall p_filebuf_underflow)(filebuf*); static streampos (*__thiscall p_filebuf_seekoff)(filebuf*, streamoff, ios_seek_dir, int); +static int (*__thiscall p_filebuf_is_open)(filebuf*); /* strstreambuf */ static strstreambuf* (*__thiscall p_strstreambuf_dynamic_ctor)(strstreambuf*, int); @@ -436,6 +437,11 @@ static void (*__thiscall p_stdiostream_dtor)(ios*); static void (*__thiscall p_stdiostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_stdiostream_assign)(iostream*, const iostream*); +/* fstream */ +static iostream* (*__thiscall p_fstream_open_ctor)(iostream*, const char*, ios_open_mode, int, BOOL); +static void (*__thiscall p_fstream_dtor)(ios*); +static void (*__thiscall p_fstream_vbase_dtor)(iostream*); + /* Iostream_init */ static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); @@ -574,6 +580,7 @@ static BOOL init(void) SET(p_filebuf_overflow, "?overflow@filebuf@@UEAAHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UEAAHXZ"); SET(p_filebuf_seekoff, "?seekoff@filebuf@@UEAAJJW4seek_dir@ios@@H@Z"); + SET(p_filebuf_is_open, "?is_open@filebuf@@QEBAHXZ"); SET(p_strstreambuf_dynamic_ctor, "??0strstreambuf@@QEAA@H@Z"); SET(p_strstreambuf_funcs_ctor, "??0strstreambuf@@QEAA@P6APEAXJ@ZP6AXPEAX@Z@Z"); @@ -754,6 +761,10 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QEAAXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QEAAAEAV0@AEAV0@@Z"); + SET(p_fstream_open_ctor, "??0fstream@@QEAA@PEBDHH@Z"); + SET(p_fstream_dtor, "??1fstream@@UEAA@XZ"); + SET(p_fstream_vbase_dtor, "??_Dfstream@@QEAAXXZ"); + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA@AEAVios@@H@Z"); SET(p_exception_ctor, "??0exception@@QEAA@AEBQEBD@Z"); @@ -804,6 +815,7 @@ static BOOL init(void) SET(p_filebuf_overflow, "?overflow@filebuf@@UAEHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UAEHXZ"); SET(p_filebuf_seekoff, "?seekoff@filebuf@@UAEJJW4seek_dir@ios@@H@Z"); + SET(p_filebuf_is_open, "?is_open@filebuf@@QBEHXZ"); SET(p_strstreambuf_dynamic_ctor, "??0strstreambuf@@QAE@H@Z"); SET(p_strstreambuf_funcs_ctor, "??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z"); @@ -984,6 +996,10 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QAEXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0@AAV0@@Z"); + SET(p_fstream_open_ctor, "??0fstream@@QAE@PBDHH@Z"); + SET(p_fstream_dtor, "??1fstream@@UAE@XZ"); + SET(p_fstream_vbase_dtor, "??_Dfstream@@QAEXXZ"); + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE@AAVios@@H@Z"); SET(p_exception_ctor, "??0exception@@QAE@ABQBD@Z"); @@ -7936,6 +7952,63 @@ static void test_std_streams(void) ok(p_cin->count == 0xabababab, "expected %d got %d\n", 0xabababab, p_cin->count); } +static void test_fstream(void) +{ + iostream fs, *pfs; + filebuf *pfb; + ostream *pos; + istream *pis; + int i; + char st[8]; + const char *filename = "fstream_test"; + + /* constructors */ + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); + ok(pfs == &fs, "constructor returned wrong pointer, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "wrong stream state, expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + pfb = (filebuf*) fs.base_ios.sb; + ok((int) call_func1(p_filebuf_is_open, pfb) == TRUE, "expected filebuf to be open\n"); + ok(fs.base_ios.delbuf == 1, "internal filebuf not makred for deletion\n"); + + /* integration with ostream */ + pos = call_func2(p_ostream_print_str, (ostream*) &fs.base2, "ftest "); + ok(pos == (ostream*) &fs.base2, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base2); + pos = call_func2(p_ostream_print_int, (ostream*) &fs.base2, 15); + ok(pos == (ostream*) &fs.base2, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base2); + + /* make sure that OPENMODE_in is not implied */ + ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + + /* reopen the file for reading */ + call_func1(p_fstream_vbase_dtor, &fs); + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_in, filebuf_openprot, TRUE); + ok(pfs == &fs, "constructor returned wrong pointer, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "wrong stream state, expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + pfb = (filebuf*) fs.base_ios.sb; + ok((int) call_func1(p_filebuf_is_open, pfb) == TRUE, "expected filebuf to be open\n"); + + /* integration with istream */ + memset(st, 'A', sizeof(st)); + pis = call_func2(p_istream_read_str, (istream*) &fs.base1, st); + ok(pis == (istream*) &fs.base1, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base1); + st[7] = 0; + ok(!strcmp(st, "ftest"), "expected 'ftest' got '%s'\n", st); + + i = 12345; + pis = call_func2(p_istream_read_int, (istream*) &fs.base1, &i); + ok(pis == (istream*) &fs.base1, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base1); + ok(i == 15, "expected 12 got %d\n", i); + + /* make sure that OPENMODE_out is not implied */ + ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + + /* cleanup */ + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s', some filedescs are still open?\n", filename); +} + static void test_exception(void) { const char *unknown = "Unknown exception"; @@ -8031,6 +8104,7 @@ START_TEST(msvcirt) test_stdiostream(); test_Iostream_init(); test_std_streams(); + test_fstream(); test_exception(); test_mtlock_mtunlock(); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b791202470f..30526ef818e 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -16,8 +16,8 @@ @ stub -arch=win64 ??0fstream@@QEAA@H@Z @ stub -arch=win32 ??0fstream@@QAE@HPADH@Z @ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0fstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z @@ -122,8 +122,8 @@ @ cdecl -arch=win64 ??1Iostream_init@@QEAA@XZ(ptr) msvcirt.??1Iostream_init@@QEAA@XZ @ thiscall -arch=win32 ??1filebuf@@UAE@XZ(ptr) msvcirt.??1filebuf@@UAE@XZ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ -@ stub -arch=win32 ??1fstream@@UAE@XZ -@ stub -arch=win64 ??1fstream@@UEAA@XZ +@ thiscall -arch=win32 ??1fstream@@UAE@XZ(ptr) msvcirt.??1fstream@@UAE@XZ +@ cdecl -arch=win64 ??1fstream@@UEAA@XZ(ptr) msvcirt.??1fstream@@UEAA@XZ @ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ @ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @@ -287,7 +287,7 @@ @ thiscall -arch=win32 ??Bios@@QBEPAXXZ(ptr) msvcirt.??Bios@@QBEPAXXZ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) msvcirt.??Bios@@QEBAPEAXXZ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ -# @ extern ??_7fstream@@6B@ +@ extern ??_7fstream@@6B@ msvcirt.??_7fstream@@6B@ @ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @@ -303,8 +303,8 @@ @ extern ??_7streambuf@@6B@ msvcirt.??_7streambuf@@6B@ @ extern ??_7strstream@@6B@ msvcirt.??_7strstream@@6B@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ -# @ extern ??_8fstream@@7Bistream@@@ -# @ extern ??_8fstream@@7Bostream@@@ +@ extern ??_8fstream@@7Bistream@@@ msvcirt.??_8fstream@@7Bistream@@@ +@ extern ??_8fstream@@7Bostream@@@ msvcirt.??_8fstream@@7Bostream@@@ @ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @@ -319,8 +319,8 @@ @ extern ??_8stdiostream@@7Bostream@@@ msvcirt.??_8stdiostream@@7Bostream@@@ @ extern ??_8strstream@@7Bistream@@@ msvcirt.??_8strstream@@7Bistream@@@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ -@ stub -arch=win32 ??_Dfstream@@QAEXXZ -@ stub -arch=win64 ??_Dfstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Dfstream@@QAEXXZ(ptr) msvcirt.??_Dfstream@@QAEXXZ +@ cdecl -arch=win64 ??_Dfstream@@QEAAXXZ(ptr) msvcirt.??_Dfstream@@QEAAXXZ @ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ @ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @@ -331,8 +331,8 @@ @ cdecl -arch=win64 ??_Distream_withassign@@QEAAXXZ(ptr) msvcirt.??_Distream_withassign@@QEAAXXZ @ thiscall -arch=win32 ??_Distrstream@@QAEXXZ(ptr) msvcirt.??_Distrstream@@QAEXXZ @ cdecl -arch=win64 ??_Distrstream@@QEAAXXZ(ptr) msvcirt.??_Distrstream@@QEAAXXZ -@ stub -arch=win32 ??_Dofstream@@QAEXXZ -@ stub -arch=win64 ??_Dofstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Dofstream@@QAEXXZ(ptr) msvcirt.??_Dofstream@@QAEXXZ +@ cdecl -arch=win64 ??_Dofstream@@QEAAXXZ(ptr) msvcirt.??_Dofstream@@QEAAXXZ @ thiscall -arch=win32 ??_Dostream@@QAEXXZ(ptr) msvcirt.??_Dostream@@QAEXXZ @ cdecl -arch=win64 ??_Dostream@@QEAAXXZ(ptr) msvcirt.??_Dostream@@QEAAXXZ @ thiscall -arch=win32 ??_Dostream_withassign@@QAEXXZ(ptr) msvcirt.??_Dostream_withassign@@QAEXXZ @@ -345,7 +345,7 @@ @ cdecl -arch=win64 ??_Dstrstream@@QEAAXXZ(ptr) msvcirt.??_Dstrstream@@QEAAXXZ @ stub -arch=win32 ??_EIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z -@ stub -arch=win32 ??_Efstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Efstream@@UAEPAXI@Z(ptr long) msvcirt.??_Efstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @@ -363,7 +363,7 @@ @ thiscall -arch=win32 ??_Estrstreambuf@@UAEPAXI@Z(ptr long) msvcirt.??_Estrstreambuf@@UAEPAXI@Z @ stub -arch=win32 ??_GIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z -@ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gfstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gfstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 3f4f2f90e1d..d2cf3f86c5f 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -34,8 +34,8 @@ @ stub -arch=win64 ??0fstream@@QEAA@H@Z @ stub -arch=win32 ??0fstream@@QAE@HPADH@Z @ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0fstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z @@ -339,7 +339,7 @@ @ extern ??_7bad_typeid@@6B@ msvcrt.??_7bad_typeid@@6B@ @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ -# @ extern ??_7fstream@@6B@ +@ extern ??_7fstream@@6B@ msvcirt.??_7fstream@@6B@ @ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @@ -356,8 +356,8 @@ @ extern ??_7streambuf@@6B@ msvcirt.??_7streambuf@@6B@ @ extern ??_7strstream@@6B@ msvcirt.??_7strstream@@6B@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ -# @ extern ??_8fstream@@7Bistream@@@ -# @ extern ??_8fstream@@7Bostream@@@ +@ extern ??_8fstream@@7Bistream@@@ msvcirt.??_8fstream@@7Bistream@@@ +@ extern ??_8fstream@@7Bostream@@@ msvcirt.??_8fstream@@7Bostream@@@ @ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @@ -372,8 +372,8 @@ @ extern ??_8stdiostream@@7Bostream@@@ msvcirt.??_8stdiostream@@7Bostream@@@ @ extern ??_8strstream@@7Bistream@@@ msvcirt.??_8strstream@@7Bistream@@@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ -@ stub -arch=win32 ??_Dfstream@@QAEXXZ -@ stub -arch=win64 ??_Dfstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Dfstream@@QAEXXZ(ptr) msvcirt.??_Dfstream@@QAEXXZ +@ cdecl -arch=win64 ??_Dfstream@@QEAAXXZ(ptr) msvcirt.??_Dfstream@@QEAAXXZ @ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ @ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @@ -402,7 +402,7 @@ @ thiscall -arch=win32 ??_Ebad_typeid@@UAEPAXI@Z(ptr long) msvcrt.??_Ebad_typeid@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) msvcrt.??_Eexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z -@ stub -arch=win32 ??_Efstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Efstream@@UAEPAXI@Z(ptr long) msvcirt.??_Efstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @@ -425,7 +425,7 @@ @ thiscall -arch=win32 ??_Gbad_typeid@@UAEPAXI@Z(ptr long) msvcrt.??_Gbad_typeid@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) msvcrt.??_Gexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z -@ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gfstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gfstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z -- 2.28.0

4 3

[PATCH v2 4/4] windowscodecs: Fix WriteSource() for GIF encoder.
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/gifformat.c | 12 ++++++++++++ dlls/windowscodecs/tests/converter.c | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH v2 3/4] windowscodecs: Correctly set output frame size for WriteSource().
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/main.c | 21 +++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 7 ++++--- 2 files changed, 23 insertions(+), 5 deletions(-)

1 0

[PATCH] vbscript: colon used in for loop
by Robert Wilhelm 08 Sep '20

08 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35782 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 2 ++ dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 71bea72b1b..ad606c1b26 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -221,6 +221,8 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, @$, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, @$, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $2); CHECK_ERROR; } + | tFOR Identifier '=' Expression tTO Expression Step_opt ':' SimpleStatement ':' tNEXT + { $$ = new_forto_statement(ctx, @$, $2, $4, $6, $7, $9); CHECK_ERROR; } | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT { $$ = new_forto_statement(ctx, @$, $2, $4, $6, $7, $9); CHECK_ERROR; } | tFOR tEACH Identifier tIN Expression StSep StatementsNl_opt tNEXT diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 94e2bbd436..5754292079 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -542,6 +542,12 @@ for x = 1 to 5 : Call ok(false, "exit for not escaped the loop?") next +dim a1(8) +a1(6)=8 +for x=1 to 8:a1(x)=x-1:next +Call ok(a1(6) = 5, "colon used in for loop") + + do while true for x = 1 to 100 exit do -- 2.26.2

3 6

[PATCH v3] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.
by Daniel Lehman 08 Sep '20

08 Sep '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: no \r 'null' isn't translated --- dlls/wininet/http.c | 103 +++++++++++++++++++++++++++++++ dlls/wininet/resource.h | 11 ++++ dlls/wininet/tests/http.c | 127 +++++++++++++++++++++++++++++++++++++- dlls/wininet/wininet.rc | 11 ++++ 4 files changed, 250 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 220493718c..dd7c23dcea 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -54,6 +54,7 @@ #include "internet.h" #include "zlib.h" +#include "resource.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2277,6 +2278,108 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } + case INTERNET_OPTION_SECURITY_CERTIFICATE: { + DWORD err; + int needed; + char subject[64]; + char issuer[64]; + char effective[64]; + char expiration[64]; + char protocol[64]; + char signature[64]; + char encryption[64]; + char privacy[64]; + char bits[16]; + char strength[16]; + char start_date[32]; + char start_time[32]; + char expiry_date[32]; + char expiry_time[32]; + SYSTEMTIME start, expiry; + INTERNET_CERTIFICATE_INFOA info; + + if(!size) + return ERROR_INVALID_PARAMETER; + + if(!req->netconn) { + *size = 0; + return ERROR_INTERNET_INVALID_OPERATION; + } + + if(!buffer) { + *size = 1; + return ERROR_INSUFFICIENT_BUFFER; + } + + if((err = get_security_cert_struct(req, &info))) + return err; + + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + FIXME("INTERNET_OPTION_SECURITY_CERTIFICATE currently English-only\n"); + + LoadStringA(WININET_hModule, IDS_CERT_SUBJECT, subject, sizeof(subject)); + LoadStringA(WININET_hModule, IDS_CERT_ISSUER, issuer, sizeof(issuer)); + LoadStringA(WININET_hModule, IDS_CERT_EFFECTIVE, effective, sizeof(effective)); + LoadStringA(WININET_hModule, IDS_CERT_EXPIRATION, expiration, sizeof(expiration)); + LoadStringA(WININET_hModule, IDS_CERT_PROTOCOL, protocol, sizeof(protocol)); + LoadStringA(WININET_hModule, IDS_CERT_SIGNATURE, signature, sizeof(signature)); + LoadStringA(WININET_hModule, IDS_CERT_ENCRYPTION, encryption, sizeof(encryption)); + LoadStringA(WININET_hModule, IDS_CERT_PRIVACY, privacy, sizeof(privacy)); + LoadStringA(WININET_hModule, info.dwKeySize >= 128 ? IDS_CERT_HIGH : IDS_CERT_LOW, + strength, sizeof(strength)); + LoadStringA(WININET_hModule, IDS_CERT_BITS, bits, sizeof(bits)); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + needed = _scprintf("%s:\r\n%s\r\n" + "%s:\r\n%s\r\n" + "%s:\t%s %s\r\n" + "%s:\t%s %s\r\n" + "%s:\t(null)\r\n" + "%s:\t(null)\r\n" + "%s:\t(null)\r\n" + "%s:\t%s (%u %s)", + subject, info.lpszSubjectInfo, + issuer, info.lpszIssuerInfo, + effective, start_date, start_time, + expiration, expiry_date, expiry_time, + protocol, signature, encryption, + privacy, strength, info.dwKeySize, bits); + + if(needed < *size) { + err = ERROR_SUCCESS; + *size = snprintf(buffer, *size, + "%s:\r\n%s\r\n" + "%s:\r\n%s\r\n" + "%s:\t%s %s\r\n" + "%s:\t%s %s\r\n" + "%s:\t(null)\r\n" + "%s:\t(null)\r\n" + "%s:\t(null)\r\n" + "%s:\t%s (%u %s)", + subject, info.lpszSubjectInfo, + issuer, info.lpszIssuerInfo, + effective, start_date, start_time, + expiration, expiry_date, expiry_time, + protocol, signature, encryption, + privacy, strength, info.dwKeySize, bits); + }else { + err = ERROR_INSUFFICIENT_BUFFER; + *size = 1; + } + + LocalFree(info.lpszSubjectInfo); + LocalFree(info.lpszIssuerInfo); + LocalFree(info.lpszProtocolName); + LocalFree(info.lpszSignatureAlgName); + LocalFree(info.lpszEncryptionAlgName); + return err; + } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 256a374af0..a9ccd19cf3 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -38,3 +38,14 @@ #define IDS_CERT_DATE_INVALID 0x502 #define IDS_CERT_CN_INVALID 0x503 #define IDS_CERT_ERRORS 0x504 +#define IDS_CERT_SUBJECT 0x505 +#define IDS_CERT_ISSUER 0x506 +#define IDS_CERT_EFFECTIVE 0x507 +#define IDS_CERT_EXPIRATION 0x508 +#define IDS_CERT_PROTOCOL 0x509 +#define IDS_CERT_SIGNATURE 0x50a +#define IDS_CERT_ENCRYPTION 0x50b +#define IDS_CERT_PRIVACY 0x50c +#define IDS_CERT_HIGH 0x50d +#define IDS_CERT_LOW 0x50e +#define IDS_CERT_BITS 0x50f diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c07d60d2a9..ca355d3c75 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6112,9 +6112,26 @@ static const cert_struct_test_t test_winehq_com_cert = { "webmaster(a)winehq.org" }; +static const char *cert_string_fmt = + "Subject:\r\n%s\r\n" + "Issuer:\r\n%s\r\n" + "Effective Date:\t%s %s\r\n" + "Expiration Date:\t%s %s\r\n" + "Security Protocol:\t%s\r\n" + "Signature Type:\t%s\r\n" + "Encryption Type:\t%s\r\n" + "Privacy Strength:\t%s (%u bits)"; + static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; + SYSTEMTIME start, expiry; + char expiry_date[32]; + char expiry_time[32]; + char start_date[32]; + char start_time[32]; + char expect[512]; + char actual[512]; DWORD size; BOOL res; @@ -6138,6 +6155,42 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded English)\n"); + release_cert_info(&info); + return; + } + + size = sizeof(actual); + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + snprintf(expect, sizeof(expect), cert_string_fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + info.lpszSignatureAlgName, info.lpszEncryptionAlgName, info.lpszProtocolName, + info.dwKeySize >= 128 ? "High" : "Low", info.dwKeySize); + ok(size == strlen(actual), "size = %u\n", size); + ok(!strcmp(actual, expect), "expected:\n%s\nactual:\n%s\n", expect, actual); + + --size; + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(actual[0] == 0x55, "unexpected byte: %02x\n", actual[0]); + release_cert_info(&info); } @@ -6217,7 +6270,7 @@ static void test_security_flags(void) INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; - char buf[100]; + char buf[512]; BOOL res; if (!https_support) @@ -6378,6 +6431,30 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetQueryOption failed: %d\n", GetLastError()); + + size = 0; + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + + size = 42; + SetLastError(0xdeadbeef); + memset(buf, 0x55, sizeof(buf)); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(buf[0] == 0x55, "unexpected byte: %02x\n", buf[0]); + + size = sizeof(buf); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(res && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size < sizeof(buf), "unexpected size: %u\n", size); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -6562,9 +6639,10 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags, err; + DWORD size, size2, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + char certstr1[512], certstr2[512]; BOOL ret; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -6629,6 +6707,19 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); + SetLastError(0xdeadbeef); + size = sizeof(certstr1); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr1, &size); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size2 = sizeof(certstr2); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr2, &size2); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + ok(size == size2, "expected same size\n"); + ok(!strcmp(certstr1, certstr2), "expected same string\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -7517,6 +7608,37 @@ static void test_concurrent_header_access(void) CloseHandle( wait ); } +static void test_cert_string(void) +{ + HINTERNET ses, con, req; + char actual[512]; + DWORD size; + BOOL res; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, NULL, "/", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + size = sizeof(actual); + SetLastError( 0xdeadbeef ); + memset( actual, 0x55, sizeof(actual) ); + res = InternetQueryOptionA( req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size ); + ok( !res && GetLastError() == ERROR_INTERNET_INVALID_OPERATION, + "InternetQueryOption failed: %u\n", GetLastError() ); + ok( size == 0, "unexpected size: %u\n", size ); + ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + START_TEST(http) { HMODULE hdll; @@ -7566,5 +7688,6 @@ START_TEST(http) test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); + test_cert_string(); free_events(); } diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b6e35629ca..485c80793e 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -29,6 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "The date on the certificate is invalid." IDS_CERT_CN_INVALID "The name on the certificate does not match the site." IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + IDS_CERT_SUBJECT "Subject" + IDS_CERT_ISSUER "Issuer" + IDS_CERT_EFFECTIVE "Effective Date" + IDS_CERT_EXPIRATION "Expiration Date" + IDS_CERT_PROTOCOL "Security Protocol" + IDS_CERT_SIGNATURE "Signature Type" + IDS_CERT_ENCRYPTION "Encryption Type" + IDS_CERT_PRIVACY "Privacy Strength" + IDS_CERT_HIGH "High" + IDS_CERT_LOW "Low" + IDS_CERT_BITS "bits" } IDD_PROXYDLG DIALOG 36, 24, 220, 146 -- 2.25.1

3 2

[PATCH v2] quartz: Fix crash when pVisible is NULL.
by dongpengpeng＠uniontech.com 08 Sep '20

08 Sep '20

3 2

[PATCH vkd3d] build: Stop ignoring the vkd3d-compiler directory.
by Isabella Bosia 08 Sep '20

08 Sep '20

--- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 51cba31..51b28d8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Makefile Makefile.in test-suite.log vkd3d-compiler +!programs/vkd3d-compiler/ vkd3d-*.tar.xz -- 2.25.1

3 4

[PATCH v2 1/7] gdi32/tests: Test extended TTF font names and collisions.
by Rémi Bernon 08 Sep '20

08 Sep '20

This shows that although Windows is only matching family names up to LF_FACESIZE chars, and that it doesn't match against the preferred / typographic family names and styles, it still keeps the faces separate when the full names don't match. Wine incorrectly discard one of them. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 71 ++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 6 ++ dlls/gdi32/tests/wine_ttfnames.sfd | 85 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames.ttf | Bin 0 -> 2232 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 85 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 0 -> 2272 bytes 6 files changed, 247 insertions(+) create mode 100644 dlls/gdi32/tests/wine_ttfnames.sfd create mode 100644 dlls/gdi32/tests/wine_ttfnames.ttf create mode 100644 dlls/gdi32/tests/wine_ttfnames_bold.sfd create mode 100644 dlls/gdi32/tests/wine_ttfnames_bold.ttf diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad894dfdcad..b1848a43743 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6940,6 +6940,76 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +static void test_ttf_names(void) +{ + struct enum_fullname_data efnd; + char ttf_name[MAX_PATH], ttf_name_bold[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_ttfnames.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + if (!write_ttf_file("wine_ttfnames_bold.ttf", ttf_name_bold)) + { + skip("Failed to create ttf file for testing\n"); + DeleteFileA(ttf_name); + return; + } + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + ret = AddFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + dc = GetDC(NULL); + + strcpy(font.lfFaceName, "Wine_TTF_Names_Long_Family1_Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + /* Windows doesn't match with Typographic/Preferred Family tags */ + strcpy(font.lfFaceName, "Wine TTF Names Long Family1"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Ext"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + todo_wine + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name_bold); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + typedef struct { USHORT majorVersion; @@ -7351,6 +7421,7 @@ START_TEST(font) test_bitmap_font_glyph_index(); test_GetCharWidthI(); test_long_names(); + test_ttf_names(); test_char_width(); /* These tests should be last test until RemoveFontResource diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index 6dcbd42ab52..b5a6107a987 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -31,3 +31,9 @@ vertical.ttf RCDATA vertical.ttf /* @makedep: wine_longname.ttf */ wine_longname.ttf RCDATA wine_longname.ttf + +/* @makedep: wine_ttfnames.ttf */ +wine_ttfnames.ttf RCDATA wine_ttfnames.ttf + +/* @makedep: wine_ttfnames_bold.ttf */ +wine_ttfnames_bold.ttf RCDATA wine_ttfnames_bold.ttf diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd new file mode 100644 index 00000000000..566749d19a7 --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1598865292 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 Cond" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Regular" \ + +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2eb2ad1f95e7bb384abe41bcf68f64da320fefb9 GIT binary patch literal 2232 zcmdT`O>7%Q6#iy+?W8oKb_J*AFt|aaC_ft;MWu?6mDHvOQ>qXpJyhK+$@)jKcdfM( zVhN-kdqAQW1eFk%-YVsgs22{1142S57eGR&px#j_Js>zi%{SwT?exH(xG>i2eDBSB zZ{FX|8UnzRxCR^R#p22<Z-00-0!BX|cl_n^g(9BDQ>3pc`qkHFv#SaJ4M0>$uWvN` zCQc;plm3=-abvqJk+H4=_Bi*Qir;E>yR?ka9nzzfdZ+x^-oDHIDbmeq;BTJ%;nphg zkDT*WG7`s}1Z_=_o~Sn3J7W;flKz}@svd3lcpWR$m!zL)_&ZHpz>D0!Kw5@=BY3zw z(d9n<cXpdmtKGeac^+Nj{_{|=a(=ygx$B)+_yxxuGJtPhcz8>#-^I-_WB|*uZj&5^ zrMMi_(VQzidCSt4dV9U6qd87rM`;Sp%VS21I25@7#%A5L4#;_@w~G77iDTp<!KWF@ z&;GbnE^M+sdF1U}H-{_Q6YW!9L_*Lrdd{fz6wJBGyPo65+XYg}@;HSgSBF1E=UF5D z?0#w_A(Ddwgo;JY;c>*n;f(=S$N$fV?q&9k`kiGgmddfnvH~_nFtaBxyRbjv;6ZjT znfQKT-?j*`XDfC>vG+%k;<tr;rtm>FmwqPwTrPb&BT_#d99Xx1U(Hx$niIAtvE$xX zIToi#emNsbqV(vFO5RD_JFE$2v2L(n{k}5T!U(I~tA~yA;$4FsykuQAIDwS)k-<q! z^6l)&r*O)C%iuK9_Q$G29My+cIeS<jj~fPCyeWP**v55n++YW9in|6UAg%WdPU4dF zg~2Jz+XaKu$k;crga}P^5Tk|)s%SH+No?Q@*DPE;r-+vkpg|dlMWPrX^+Hl*t}$0- zXOlZ?oIbX-Obb|wnw_{-skY_h#u=G)v+k5!4jMJN7{p-|%5oITrD!u)3;gXMrotM} z2&pZ3!>pjl^&;&x$Y~Lm^r;o1qUP36r|)y5)%hVkz*;Q~<jP7>UgSm8lBFoD$fDn< z)jM-MDWrr7rGhQ0`g9%3L1nA%6BM<Hwq9dOC?~SKI9#shI1gR(jBDPIYhK?q?=jcB zzH8oNC-<!8=>9Ytd%B-)6r-?RjN(clvoo$dCsjxuL-KS;o(jn`A$ck!&xAnH+}!lp zX_e-GpUDDt*ab1eS6Ns2J(_owxH@@<bs6M7U<F##`HLzPcG_{!2<jbEoUM9Y7fY8X z2wMU5S7|1uv6`-lWDQ*AN!3FABn8+lH8zmz&ds>4OU{2?9^FZQC+&ly|5?-iS*!BR zF%3OPYVRc+>ReTOoiDypriXcBn6E_l4sxUf=h5Mi6qGux*@EAl!IyN5|1;FSvY|A4 Q+WL9-*GHcyjp6U~A6<%D%m4rY literal 0 HcmV?d00001 diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd new file mode 100644 index 00000000000..b3bf4ddfe90 --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1598865292 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 CondBold" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed Bold" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Bold Regular" \ + +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..919a5ea1310dd95904d882afb56b95aaf94dc9be GIT binary patch literal 2272 zcmdT`O>7%Q6#iy+?W7Qqq~hn$9ELQA6eZ5aMxj(bL`h?M2yGRj<WhCB#2eevde>Sz zA-)v}p&pRvjUpj_)C<ZjR_+`Ci9;?(2v9*iAc0i1g%g~h=9}@vPAY^7;=)+7?|X0F zn|Xh`V+a6`;R<Z56$;BQzxDp*80i0u(vg?WE)?(t9w+~?;xD{1m0d~suK}V=er>(# z*D#pAL;hRNx%I7v#He)@ut&J=l>B<F-R92d|B!rtDQs?hzT0xSK0&@#4*cTr+c#E- z?{dzRDM%f2Qrv5d{8+i#*dBm*hWr=ghr)Q>$E#STy(Irg)!(k+9A4!5Ir1{{tHC>& z*AuS4$K$`L#q~z}7G`*KgX_;h#mf1{&IcE~!Thgy)S&?Q`uSgODEeJe8^9=FS=J8O zeppJ%K^rZ()X}#ry;Enc^K`Vt>Dnkup=GnkXcdPl*TC4UcddO&-tJIw2RU(!Ql$7a zL;2Yq7dIA)xPn>C+PQWPm$WC^r>=^Gpl9@)QR^v~bCq{JM~t_5a%$%hDoIj@KgG|o zM*7+Q)M!Gadj|*=i<*bW5f2Y9^sqYqe?D|Cvv1VzG-I(;jzyLgu+fLiuE12j)#u<| zb~l~+KHst}LhRZ~oKoUeUt0X0Z!v}Uvbo`>ho8+2pBxoKKkx5bJAbT<S{vL>*kX|# zcU|RJoFMyUMl6cO`+F*R$8qbRCYZvS!2)BrX|RPpF=()jv*IIz9n4#i!6^(`Um2Xn zxc!2`LpWhyH+UFN+CQicaa12(=Img>H|(0h7QYngeO5X)u8OA&cJQY7$>0>E)iOAZ zi`I_@4`Ie$Gk6#i_8#UDqlP9DR8T@04R+-?)^Un73s=tx;w1#AQb%HrC_zNKh};Hg zLaO#Da%Gj%$ClQq1M_jMnN&*Uh8$l%C9`hUosdgGwIb(&B#I-s5hrp!E(WWCzZE1j zSmhZJttG!O%P5eZ=YCa6>cors)DlraODhQJ`!soVenb!ENJCPrR-!;IFBjx_evs;N zF^)>I;8!bQbDAec#kn}7mI|wcO`7-&14}_^GxP}xdb@_E2{n{MS$;%Z(leX~ZhFQ| z?~t2b*G=yMH@&W#-UBChcFi%ANjCXpH}xpQQKJwir9fsgt~?`ESRTXjbXcAW%QInl zDlE^0K-Jvz<mpM3@_(Pz1#Gh;5{9oTpmKe*1}bqOWd}9t)gfRt>a;0x^`UCAu-!<4 zY7jO}sW!t<mrfTei0VO6c1pIwT@&tI(It{BiOaO9(x{&VR@g`t_Ll2TXI$5%<iD<# zZmx%^LhtB**3W;}y?m)mum4q!J8$ZtmR3#COCMi8)8PlVNqY}DerE*d(V;FeL9LTo gEO<ZlZrlO>A5rV-MpBj?YyG_W+x<_J#o_z>Pvq`pzyJUM literal 0 HcmV?d00001 -- 2.28.0

2 13

[PATCH 1/5] mf/tests: Fix tests crashes.
by Nikolay Sivov 08 Sep '20

08 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f01385cc46c..7013939ab0b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1451,7 +1451,10 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); +todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + return; hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); -- 2.28.0

1 4

[PATCH] shell32: Add a browser custom protocol handler to run the application through the web browser
by Haoyang Chen 08 Sep '20

08 Sep '20

When functions like /ShellExecute/ use PIDL to open a URL, it will not work. It’s a bit difficult to test this, you need to add the corresponding browser custom protocol handler to the registry.

3 3

[PATCH v3 2/2] quartz: Fix crash when pVisible is NULL.
by dongpengpeng＠uniontech.com 08 Sep '20

08 Sep '20

1 0

Re: [PATCH] include: add AV1 support to dxva.h
by Steve Lhomme 08 Sep '20

08 Sep '20

Hi, > Date: Mon, 7 Sep 2020 23:32:36 +0530 > From: Biswapriyo Nath <nathbappai(a)gmail.com> > To: wine-devel <wine-devel(a)winehq.org> > Subject: Re: [PATCH] include: add AV1 support to dxva.h > Message-ID: > <CALK-3mJBnymXWNzXRJ4v8PrHrvyWcQV9nbRJkw8Qv1yy92=pGg(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > The structures are not present in the current stable Windows 10 SDK 19041 > build aka. 20H1. I have found those in the latest Windows 10 Insider SDK > 20206 build aka. 20H2. Also the docx provided by Steve Lhomme has this in > the copyright notice: > > "Information and views expressed in this document, including URL and other > Internet Web site references, may change without notice. You bear the risk > of using it." > > But the DXVA_ModeAV1_VLD GUIDs are present in 20H1 WinSDK which may be > added safely. I used these structures to decode AV1 with hardware from 2 different manufacturers. I doubt they will update their code to changes in the structures or that MS will change the API as easily now.

1 0

[PATCH 2/2] quartz: Add a test case where BaseControlWindowImpl_get_Visible returns the result when visible is empty
by dongpengpeng＠uniontech.com 08 Sep '20

08 Sep '20

2 1

[PATCH 2/4] windowscodecs: Change argument type of configure_write_source() and write_source().
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/main.c | 4 ++-- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-)

2 1

[PATCH 4/4] windowscodecs: Fix WriteSource() for GIF encoder.
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/gifformat.c | 12 ++++++++++++ dlls/windowscodecs/tests/converter.c | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] windowscodecs: Correctly set output frame size for WriteSource().
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/main.c | 21 +++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 7 ++++--- 2 files changed, 23 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Ziqing Hui 08 Sep '20

08 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/converter.c | 48 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 18 deletions(-)

1 0

[PATCH v2 1/4] qcap/tests: Test effect of setting stream format on media type enumeration.
by Jeff Smith 07 Sep '20

07 Sep '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Supersedes 191583-191585 v2: - Removed some tests that weren't providing much value - Added calculation of image size when setting format - Made use of VIDIOC_TRY_FMT ioctl - Added get_media_type entry to video_capture_device_ops dlls/qcap/tests/videocapture.c | 59 ++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 326601a398..dcce3a7869 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,12 @@ #include "wine/test.h" #include "wine/strmbase.h" +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -81,8 +87,9 @@ static void test_stream_config(IPin *pin) AM_MEDIA_TYPE *format, *format2; VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; + IEnumMediaTypes *enum_media_types; LONG depth, compression; - LONG count, size; + LONG count, size, i; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -96,6 +103,16 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* After setting format, a single media type is enumerated. + * This persists until the filter is released. */ + IPin_EnumMediaTypes(pin, &enum_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + DeleteMediaType(format2); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumMediaTypes_Release(enum_media_types); + format->majortype = MEDIATYPE_Audio; hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == E_FAIL, "Got hr %#x.\n", hr); @@ -162,14 +179,38 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", - debugstr_guid(&MEDIATYPE_Video)); - ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) - || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", - debugstr_guid(&vscc.guid)); - FreeMediaType(format); + for (i = 0; i < count; i++) + { + hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + DeleteMediaType(format2); + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Which media types will match varies in wine depending on the attached webcam */ + todo_wine_if(compare_media_types(format, format2) == FALSE) + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + + DeleteMediaType(format2); + IEnumMediaTypes_Release(enum_media_types); + + DeleteMediaType(format); + } IAMStreamConfig_Release(stream_config); } -- 2.23.0

2 6

[PATCH] include: add AV1 support to dxva.h
by Steve Lhomme 07 Sep '20

07 Sep '20

Based on the DXVA AV1 specs https://www.microsoft.com/en-us/download/details.aspx?id=101577 --- include/dxva.h | 276 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/include/dxva.h b/include/dxva.h index 25354f5887..4142a64d84 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -563,6 +563,282 @@ typedef struct _DXVA_Status_VPx USHORT wNumMbsAffected; } DXVA_Status_VPx, *LPDXVA_Status_VPx; +/* AV1 decoder GUIDs */ +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); + +/* AV1 picture entry data structure */ +typedef struct _DXVA_PicEntry_AV1 { + UINT width; + UINT height; + + // Global motion parameters + INT wmmat[6]; + union { + struct { + UCHAR wminvalid : 1; + UCHAR wmtype : 2; + UCHAR Reserved : 5; + }; + UCHAR wGlobalMotionFlags; + }; + UCHAR Index; + USHORT Reserved16Bits; +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; + +/* AV1 picture parameters data structure */ +typedef struct _DXVA_PicParams_AV1 { + UINT width; + UINT height; + + UINT max_width; + UINT max_height; + + UCHAR CurrPicTextureIndex; + UCHAR superres_denom; + UCHAR bitdepth; + UCHAR seq_profile; + + // Tiles: + struct { + UCHAR cols; + UCHAR rows; + USHORT context_update_id; + USHORT widths[64]; + USHORT heights[64]; + } tiles; + + // Coding Tools + union { + struct { + UINT use_128x128_superblock : 1; + UINT intra_edge_filter : 1; + UINT interintra_compound : 1; + UINT masked_compound : 1; + UINT warped_motion : 1; + UINT dual_filter : 1; + UINT jnt_comp : 1; + UINT screen_content_tools : 1; + UINT integer_mv : 1; + UINT cdef : 1; + UINT restoration : 1; + UINT film_grain : 1; + UINT intrabc : 1; + UINT high_precision_mv : 1; + UINT switchable_motion_mode : 1; + UINT filter_intra : 1; + UINT disable_frame_end_update_cdf : 1; + UINT disable_cdf_update : 1; + UINT reference_mode : 1; + UINT skip_mode : 1; + UINT reduced_tx_set : 1; + UINT superres : 1; + UINT tx_mode : 2; + UINT use_ref_frame_mvs : 1; + UINT enable_ref_frame_mvs : 1; + UINT reference_frame_update : 1; + UINT Reserved : 5; + }; + UINT32 CodingParamToolFlags; + } coding; + + // Format & Picture Info flags + union { + struct { + UCHAR frame_type : 2; + UCHAR show_frame : 1; + UCHAR showable_frame : 1; + UCHAR subsampling_x : 1; + UCHAR subsampling_y : 1; + UCHAR mono_chrome : 1; + UCHAR Reserved : 1; + }; + UCHAR FormatAndPictureInfoFlags; + } format; + + // References + UCHAR primary_ref_frame; + UCHAR order_hint; + UCHAR order_hint_bits; + + DXVA_PicEntry_AV1 frame_refs[7]; + UCHAR RefFrameMapTextureIndex[8]; + + // Loop filter parameters + struct { + UCHAR filter_level[2]; + UCHAR filter_level_u; + UCHAR filter_level_v; + + UCHAR sharpness_level; + union { + struct { + UCHAR mode_ref_delta_enabled : 1; + UCHAR mode_ref_delta_update : 1; + UCHAR delta_lf_multi : 1; + UCHAR delta_lf_present : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + CHAR ref_deltas[8]; + CHAR mode_deltas[2]; + UCHAR delta_lf_res; + UCHAR frame_restoration_type[3]; + USHORT log2_restoration_unit_size[3]; + UINT16 Reserved16Bits; + } loop_filter; + + // Quantization + struct { + union { + struct { + UCHAR delta_q_present : 1; + UCHAR delta_q_res : 2; + UCHAR Reserved : 5; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + UCHAR base_qindex; + CHAR y_dc_delta_q; + CHAR u_dc_delta_q; + CHAR v_dc_delta_q; + CHAR u_ac_delta_q; + CHAR v_ac_delta_q; + // using_qmatrix: + UCHAR qm_y; + UCHAR qm_u; + UCHAR qm_v; + UINT16 Reserved16Bits; + } quantization; + + // Cdef parameters + struct { + union { + struct { + UCHAR damping : 2; + UCHAR bits : 2; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } y_strengths[8]; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } uv_strengths[8]; + + } cdef; + + UCHAR interp_filter; + + // Segmentation + struct { + union { + struct { + UCHAR enabled : 1; + UCHAR update_map : 1; + UCHAR update_data : 1; + UCHAR temporal_update : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + UCHAR Reserved24Bits[3]; + + union { + struct { + UCHAR alt_q : 1; + UCHAR alt_lf_y_v : 1; + UCHAR alt_lf_y_h : 1; + UCHAR alt_lf_u : 1; + UCHAR alt_lf_v : 1; + UCHAR ref_frame : 1; + UCHAR skip : 1; + UCHAR globalmv : 1; + }; + UCHAR mask; + } feature_mask[8]; + + SHORT feature_data[8][8]; + + } segmentation; + + struct { + union { + struct { + USHORT apply_grain : 1; + USHORT scaling_shift_minus8 : 2; + USHORT chroma_scaling_from_luma : 1; + USHORT ar_coeff_lag : 2; + USHORT ar_coeff_shift_minus6 : 2; + USHORT grain_scale_shift : 2; + USHORT overlap_flag : 1; + USHORT clip_to_restricted_range : 1; + USHORT matrix_coeff_is_identity : 1; + USHORT Reserved : 3; + }; + USHORT ControlFlags; + } DUMMYUNIONNAME; + + USHORT grain_seed; + UCHAR scaling_points_y[14][2]; + UCHAR num_y_points; + UCHAR scaling_points_cb[10][2]; + UCHAR num_cb_points; + UCHAR scaling_points_cr[10][2]; + UCHAR num_cr_points; + UCHAR ar_coeffs_y[24]; + UCHAR ar_coeffs_cb[25]; + UCHAR ar_coeffs_cr[25]; + UCHAR cb_mult; + UCHAR cb_luma_mult; + UCHAR cr_mult; + UCHAR cr_luma_mult; + UCHAR Reserved8Bits; + SHORT cb_offset; + SHORT cr_offset; + } film_grain; + + UINT Reserved32Bits; + UINT StatusReportFeedbackNumber; +} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1; + +/* AV1 tile data structure */ +typedef struct _DXVA_Tile_AV1 { + UINT DataOffset; + UINT DataSize; + USHORT row; + USHORT column; + USHORT Reserved16Bits; + UCHAR anchor_frame; + UCHAR Reserved8Bits; +} DXVA_Tile_AV1, *LPDXVA_Tile_AV1; + +typedef struct _DXVA_Status_AV1 { + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_AV1 CurrPic; + UCHAR bBufType; + UCHAR bStatus; + UCHAR bReserved8Bits; + USHORT wNumMbsAffected; +} DXVA_Status_AV1, *LPDXVA_Status_AV1; + #include <poppack.h> #ifdef __cplusplus -- 2.26.2

3 2

[PATCH 1/2] msvcirt: Include iostream in strstream's and stdiostream's rtti hierarchy.
by Arkadiusz Hiler 07 Sep '20

07 Sep '20

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcp90/cxx.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6bd910e9a89..06218b7cac0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -315,10 +315,10 @@ DEFINE_RTTI_DATA2(ifstream, sizeof(istream), DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") -DEFINE_RTTI_DATA4(strstream, sizeof(iostream), +DEFINE_RTTI_DATA5(strstream, sizeof(iostream), &iostream_rtti_base_descriptor, &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstrstream@@") -DEFINE_RTTI_DATA4(stdiostream, sizeof(iostream), +DEFINE_RTTI_DATA5(stdiostream, sizeof(iostream), &iostream_rtti_base_descriptor, &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstdiostream@@") diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 721d02c5487..02735a3c168 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -247,6 +247,8 @@ static void init_ ## type ## _cxx(char *base) \ DEFINE_RTTI_DATA(name, off, 3, cl1, cl2, cl3, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA4(name, off, cl1, cl2, cl3, cl4, mangled_name) \ DEFINE_RTTI_DATA(name, off, 4, cl1, cl2, cl3, cl4, NULL, NULL, NULL, NULL, NULL, mangled_name) +#define DEFINE_RTTI_DATA5(name, off, cl1, cl2, cl3, cl4, cl5, mangled_name) \ + DEFINE_RTTI_DATA(name, off, 5, cl1, cl2, cl3, cl4, cl5, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA8(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, mangled_name) \ DEFINE_RTTI_DATA(name, off, 8, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, NULL, mangled_name) #define DEFINE_RTTI_DATA9(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ -- 2.28.0

2 3

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 07 Sep '20

07 Sep '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-)

1 0

[PATCH vkd3d 1/8] vkd3d-shader: Implement vkd3d_spirv_binary_to_text helper.
by Isabella Bosia 07 Sep '20

07 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 46 ++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb251a4..6a6d187 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -50,36 +50,62 @@ static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_spirv_environm } } -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) +static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) { - const static uint32_t options - = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; spv_diagnostic diagnostic = NULL; spv_text text = NULL; spv_context context; - spv_result_t ret; + spv_result_t spvret; + enum vkd3d_result result = VKD3D_OK; context = spvContextCreate(spv_target_env_from_vkd3d(environment)); - if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), + if (!(spvret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) { - const char *str, *current = text->str; - while ((str = strchr(current, '\n'))) + void *code = vkd3d_malloc(text->length); + if (code) { - TRACE("%.*s\n", (int)(str - current), current); - current = str + 1; + memcpy(code, text->str, text->length); + out->size = text->length; + out->code = code; } + else + result = VKD3D_ERROR_OUT_OF_MEMORY; } else { - FIXME("Failed to convert SPIR-V binary to text, ret %d.\n", ret); + FIXME("Failed to convert SPIR-V binary to text, ret %d.\n", spvret); FIXME("Diagnostic message: %s.\n", debugstr_a(diagnostic->error)); + result = VKD3D_ERROR; } spvTextDestroy(text); spvDiagnosticDestroy(diagnostic); spvContextDestroy(context); + + return result; +} + +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) +{ + const static uint32_t options + = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; + struct vkd3d_shader_code text; + + if (!vkd3d_spirv_binary_to_text(spirv, environment, options, &text)) + { + const char *str, *current = text.code; + while ((str = strchr(current, '\n'))) + { + TRACE("%.*s\n", (int)(str - current), current); + current = str + 1; + } + + vkd3d_shader_free_shader_code(&text); + } } static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, -- 2.25.1

3 20

[PATCH vkd3d 1/2] vkd3d-shader: Read the SM5 resource type instruction modifier.
by Zebediah Figura 07 Sep '20

07 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- libs/vkd3d-shader/dxbc.c | 74 ++++++++++++++++------- libs/vkd3d-shader/trace.c | 77 ++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 94e46210..c2690d8b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -21,7 +21,11 @@ #define VKD3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) -#define VKD3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define VKD3D_SM4_MODIFIER_MASK 0x3fu + +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) + #define VKD3D_SM4_AOFFIMMI_U_SHIFT 9 #define VKD3D_SM4_AOFFIMMI_U_MASK (0xfu << VKD3D_SM4_AOFFIMMI_U_SHIFT) #define VKD3D_SM4_AOFFIMMI_V_SHIFT 13 @@ -303,6 +307,12 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum vkd3d_sm4_instruction_modifier +{ + VKD3D_SM4_MODIFIER_AOFFIMMI = 0x1, + VKD3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, +}; + enum vkd3d_sm4_register_type { VKD3D_SM4_RT_TEMP = 0x00, @@ -1734,32 +1744,49 @@ static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_shader_instruction *ins) { - static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER - | VKD3D_SM4_MODIFIER_AOFFIMMI - | VKD3D_SM4_AOFFIMMI_U_MASK - | VKD3D_SM4_AOFFIMMI_V_MASK - | VKD3D_SM4_AOFFIMMI_W_MASK; + enum vkd3d_sm4_instruction_modifier modifier_type = modifier & VKD3D_SM4_MODIFIER_MASK; - if (modifier & ~recognized_bits) + switch (modifier_type) { - WARN("Unhandled modifier 0x%08x.\n", modifier); - } - else - { - /* Bit fields are used for sign extension */ - struct + case VKD3D_SM4_MODIFIER_AOFFIMMI: { - int u : 4; - int v : 4; - int w : 4; + static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER + | VKD3D_SM4_MODIFIER_MASK + | VKD3D_SM4_AOFFIMMI_U_MASK + | VKD3D_SM4_AOFFIMMI_V_MASK + | VKD3D_SM4_AOFFIMMI_W_MASK; + + /* Bit fields are used for sign extension. */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } aoffimmi; + + if (modifier & ~recognized_bits) + FIXME("Unhandled instruction modifier %#x.\n", modifier); + + aoffimmi.u = (modifier & VKD3D_SM4_AOFFIMMI_U_MASK) >> VKD3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & VKD3D_SM4_AOFFIMMI_V_MASK) >> VKD3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & VKD3D_SM4_AOFFIMMI_W_MASK) >> VKD3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + break; + } + + case VKD3D_SM5_MODIFIER_RESOURCE_TYPE: + { + enum vkd3d_sm4_resource_type resource_type + = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + + ins->resource_type = resource_type_table[resource_type]; + break; } - aoffimmi; - aoffimmi.u = (modifier & VKD3D_SM4_AOFFIMMI_U_MASK) >> VKD3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & VKD3D_SM4_AOFFIMMI_V_MASK) >> VKD3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & VKD3D_SM4_AOFFIMMI_W_MASK) >> VKD3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + + default: + FIXME("Unhandled instruction modifier %#x.\n", modifier); } } @@ -1818,6 +1845,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b0ad387c..f4a93b48 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -494,6 +494,29 @@ static void shader_dump_shader_input_sysval_semantic(struct vkd3d_string_buffer shader_addline(buffer, "unknown_shader_input_sysval_semantic(%#x)", semantic); } +static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum vkd3d_shader_resource_type type) +{ + static const char *const resource_type_names[] = + { + /* VKD3D_SHADER_RESOURCE_NONE */ "none", + /* VKD3D_SHADER_RESOURCE_BUFFER */ "buffer", + /* VKD3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", + /* VKD3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", + /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", + /* VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", + /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + }; + + if (type <= ARRAY_SIZE(resource_type_names)) + shader_addline(buffer, "%s", resource_type_names[type]); + else + shader_addline(buffer, "unknown"); +} + static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_semantic *semantic, unsigned int flags, const struct vkd3d_shader_version *shader_version) @@ -527,52 +550,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); - switch (semantic->resource_type) - { - case VKD3D_SHADER_RESOURCE_BUFFER: - shader_addline(buffer, "buffer"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_1D: - shader_addline(buffer, "texture1d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2D: - shader_addline(buffer, "texture2d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DMS: - shader_addline(buffer, "texture2dms"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "texture3d"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE: - shader_addline(buffer, "texturecube"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY: - shader_addline(buffer, "texture1darray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY: - shader_addline(buffer, "texture2darray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: - shader_addline(buffer, "texture2dmsarray"); - break; - - case VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: - shader_addline(buffer, "texturecubearray"); - break; - - default: - shader_addline(buffer, "unknown"); - break; - } + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) @@ -1522,6 +1500,13 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); } + if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE) + { + shader_addline(buffer, "("); + shader_dump_resource_type(buffer, ins->resource_type); + shader_addline(buffer, ")"); + } + for (i = 0; i < ins->dst_count; ++i) { shader_dump_ins_modifiers(buffer, &ins->dst[i]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 25d62161..9b369d87 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -764,6 +764,7 @@ struct vkd3d_shader_instruction const struct vkd3d_shader_dst_param *dst; const struct vkd3d_shader_src_param *src; struct vkd3d_shader_texel_offset texel_offset; + enum vkd3d_shader_resource_type resource_type; bool coissue; const struct vkd3d_shader_src_param *predicate; union -- 2.28.0

2 3

[PATCH vkd3d] vkd3d-shader: Rename VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 to VKD3D_SHADER_MINIMUM_PRECISION_FIXED_8_2.
by Zebediah Figura 07 Sep '20

07 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- According to [1] this is fixed-point, not floating-point. This was the most specific documentation I was able to locate. [1] https://docs.microsoft.com/en-us/windows/uwp/gaming/glsl-to-hlsl-reference include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 4d4166c4..f05feabe 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1068,7 +1068,7 @@ enum vkd3d_shader_minimum_precision /** 16-bit floating-point. */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, /** 10-bit fixed point (2 integer and 8 fractional bits). */ - VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + VKD3D_SHADER_MINIMUM_PRECISION_FIXED_8_2 = 2, /** 16-bit signed integer. */ VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, /** 16-bit unsigned integer. */ -- 2.28.0

2 1

[PATCH v2 1/3] ntdll/tests: Fix exception test failures on win10pro.
by Paul Gofman 07 Sep '20

07 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index aac5df531a0..43c4859e005 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -6690,12 +6690,14 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 0); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 3); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; @@ -6877,7 +6879,9 @@ static void test_extended_context(void) length2 = 0xdeadbeef; p = pRtlLocateExtendedFeature(context_ex, 2, &length2); - ok(!p && length2 == sizeof(YMMCONTEXT), "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok((!p && length2 == sizeof(YMMCONTEXT)) + || broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */, + "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); @@ -6899,7 +6903,8 @@ static void test_extended_context(void) - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); - ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT), + ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT) + || broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */, "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, @@ -6995,7 +7000,8 @@ static void test_extended_context(void) context->ContextFlags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!xs->Mask || broken(xs->Mask == 4) /* win10pro */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -7003,7 +7009,7 @@ static void test_extended_context(void) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -7020,7 +7026,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); xs->CompactionMask = 4; @@ -7035,7 +7042,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); context_ex->XState.Length = sizeof(XSTATE); -- 2.26.2

1 2

[PATCH] msvcirt: Implement a part of fstream.
by Arkadiusz Hiler 07 Sep '20

07 Sep '20

This patch make it possible to play Tron 2.0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 36 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 22 +++++------ dlls/msvcirt/tests/msvcirt.c | 74 ++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 11 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6bd910e9a89..498af8189cb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -200,6 +200,8 @@ extern const vtable_ptr MSVCP_iostream_vtable; extern const vtable_ptr MSVCP_strstream_vtable; /* ??_7stdiostream@@6B@ */ extern const vtable_ptr MSVCP_stdiostream_vtable; +/* ??_7fstream@@6B@ */ +extern const vtable_ptr MSVCP_fstream_vtable; __ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(streambuf, @@ -272,6 +274,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(stdiostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); + __ASM_VTABLE(fstream, + VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_BLOCK_END #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) @@ -321,6 +325,9 @@ DEFINE_RTTI_DATA4(strstream, sizeof(iostream), DEFINE_RTTI_DATA4(stdiostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstdiostream@@") +DEFINE_RTTI_DATA4(fstream, sizeof(iostream), + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, + &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVfstream@@") /* ?cin@@3Vistream_withassign@@A */ struct { @@ -4369,6 +4376,8 @@ iostream* __thiscall iostream_copy_ctor(iostream *this, const iostream *copy, BO /* ??1stdiostream@@UEAA@XZ */ /* ??1strstream@@UAE@XZ */ /* ??1strstream@@UEAA@XZ */ +/* ??1fstream@@UAE@XZ */ +/* ??1fstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(iostream_dtor, 4) void __thiscall iostream_dtor(ios *base) { @@ -4601,6 +4610,32 @@ stdiobuf* __thiscall stdiostream_rdbuf(const iostream *this) return (stdiobuf*) istream_get_ios(&this->base1)->sb; } +/* ??0fstream@@QAE@PBDHH@Z */ +/* ??0fstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(fstream_open_ctor, 20) +iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (!fb) { + FIXME("out of memory\n"); + return NULL; + } + + 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; + + return this; +} + /* ??0Iostream_init@@QAE@AAVios@@H@Z */ /* ??0Iostream_init@@QEAA@AEAVios@@H@Z */ DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) @@ -4759,6 +4794,7 @@ static void init_io(void *base) init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); + init_fstream_rtti(base); #endif if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index c2b4b9d30eb..21e4dcf3c60 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -22,8 +22,8 @@ @ stub -arch=win64 ??0fstream@@QEAA@H@Z @ stub -arch=win32 ??0fstream@@QAE@HPADH@Z # __thiscall fstream::fstream(int,char *,int) @ stub -arch=win64 ??0fstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0fstream@@QAE@PBDHH@Z # __thiscall fstream::fstream(char const *,int,int) -@ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0fstream@@QAE@PBDHH@Z(ptr str long long long) fstream_open_ctor +@ cdecl -arch=win64 ??0fstream@@QEAA@PEBDHH@Z(ptr str long long long) fstream_open_ctor @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ @ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor @@ -136,8 +136,8 @@ @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) MSVCP_exception_dtor @ thiscall -arch=win32 ??1filebuf@@UAE@XZ(ptr) filebuf_dtor @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor -@ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) -@ stub -arch=win64 ??1fstream@@UEAA@XZ +@ thiscall -arch=win32 ??1fstream@@UAE@XZ(ptr) iostream_dtor +@ cdecl -arch=win64 ??1fstream@@UEAA@XZ(ptr) iostream_dtor @ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor @ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @@ -304,7 +304,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) ios_op_void @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable -# @ extern ??_7fstream@@6B@ # const fstream::`vftable' +@ extern ??_7fstream@@6B@ MSVCP_fstream_vtable @ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @@ -321,8 +321,8 @@ @ extern ??_7streambuf@@6B@ MSVCP_streambuf_vtable @ extern ??_7strstream@@6B@ MSVCP_strstream_vtable @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable -# @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} -# @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} +@ extern ??_8fstream@@7Bistream@@@ iostream_vbtable_istream +@ extern ??_8fstream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @@ -337,8 +337,8 @@ @ extern ??_8stdiostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8strstream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream -@ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Dfstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Dfstream@@QAEXXZ(ptr) iostream_vbase_dtor +@ cdecl -arch=win64 ??_Dfstream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor @ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @@ -363,7 +363,7 @@ @ cdecl -arch=win64 ??_Dstrstream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor -@ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Efstream@@UAEPAXI@Z(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @@ -382,7 +382,7 @@ @ thiscall -arch=win32 ??_Estrstreambuf@@UAEPAXI@Z(ptr long) strstreambuf_vector_dtor @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor -@ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gfstream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e1a62967835..4d395d7eaa6 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -232,6 +232,7 @@ static int (*__thiscall p_filebuf_sync)(filebuf*); static int (*__thiscall p_filebuf_overflow)(filebuf*, int); static int (*__thiscall p_filebuf_underflow)(filebuf*); static streampos (*__thiscall p_filebuf_seekoff)(filebuf*, streamoff, ios_seek_dir, int); +static int (*__thiscall p_filebuf_is_open)(filebuf*); /* strstreambuf */ static strstreambuf* (*__thiscall p_strstreambuf_dynamic_ctor)(strstreambuf*, int); @@ -436,6 +437,11 @@ static void (*__thiscall p_stdiostream_dtor)(ios*); static void (*__thiscall p_stdiostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_stdiostream_assign)(iostream*, const iostream*); +/* fstream */ +static iostream* (*__thiscall p_fstream_open_ctor)(iostream*, const char*, ios_open_mode, int, BOOL); +static void (*__thiscall p_fstream_dtor)(ios*); +static void (*__thiscall p_fstream_vbase_dtor)(iostream*); + /* Iostream_init */ static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); @@ -570,6 +576,7 @@ static BOOL init(void) SET(p_filebuf_overflow, "?overflow@filebuf@@UEAAHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UEAAHXZ"); SET(p_filebuf_seekoff, "?seekoff@filebuf@@UEAAJJW4seek_dir@ios@@H@Z"); + SET(p_filebuf_is_open, "?is_open@filebuf@@QEBAHXZ"); SET(p_strstreambuf_dynamic_ctor, "??0strstreambuf@@QEAA@H@Z"); SET(p_strstreambuf_funcs_ctor, "??0strstreambuf@@QEAA@P6APEAXJ@ZP6AXPEAX@Z@Z"); @@ -750,6 +757,10 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QEAAXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QEAAAEAV0@AEAV0@@Z"); + SET(p_fstream_open_ctor, "??0fstream@@QEAA@PEBDHH@Z"); + SET(p_fstream_dtor, "??1fstream@@UEAA@XZ"); + SET(p_fstream_vbase_dtor, "??_Dfstream@@QEAAXXZ"); + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA@AEAVios@@H@Z"); SET(p_exception_ctor, "??0exception@@QEAA@AEBQEBD@Z"); @@ -800,6 +811,7 @@ static BOOL init(void) SET(p_filebuf_overflow, "?overflow@filebuf@@UAEHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UAEHXZ"); SET(p_filebuf_seekoff, "?seekoff@filebuf@@UAEJJW4seek_dir@ios@@H@Z"); + SET(p_filebuf_is_open, "?is_open@filebuf@@QBEHXZ"); SET(p_strstreambuf_dynamic_ctor, "??0strstreambuf@@QAE@H@Z"); SET(p_strstreambuf_funcs_ctor, "??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z"); @@ -980,6 +992,10 @@ static BOOL init(void) SET(p_stdiostream_vbase_dtor, "??_Dstdiostream@@QAEXXZ"); SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0@AAV0@@Z"); + SET(p_fstream_open_ctor, "??0fstream@@QAE@PBDHH@Z"); + SET(p_fstream_dtor, "??1fstream@@UAE@XZ"); + SET(p_fstream_vbase_dtor, "??_Dfstream@@QAEXXZ"); + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE@AAVios@@H@Z"); SET(p_exception_ctor, "??0exception@@QAE@ABQBD@Z"); @@ -7929,6 +7945,63 @@ static void test_std_streams(void) ok(p_cin->count == 0xabababab, "expected %d got %d\n", 0xabababab, p_cin->count); } +static void test_fstream(void) +{ + iostream fs, *pfs; + filebuf *pfb; + ostream *pos; + istream *pis; + int i; + char st[8]; + const char *filename = "fstream_test"; + + /* constructors */ + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_out, filebuf_openprot, TRUE); + ok(pfs == &fs, "constructor returned wrong pointer, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "wrong stream state, expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + pfb = (filebuf*) fs.base_ios.sb; + ok((int) call_func1(p_filebuf_is_open, pfb) == TRUE, "expected filebuf to be open\n"); + ok(fs.base_ios.delbuf == 1, "internal filebuf not makred for deletion\n"); + + /* integration with ostream */ + pos = call_func2(p_ostream_print_str, (ostream*) &fs.base2, "ftest "); + ok(pos == (ostream*) &fs.base2, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base2); + pos = call_func2(p_ostream_print_int, (ostream*) &fs.base2, 15); + ok(pos == (ostream*) &fs.base2, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base2); + + /* make sure that OPENMODE_in is not implied */ + ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + + /* reopen the file for reading */ + call_func1(p_fstream_vbase_dtor, &fs); + pfs = call_func5(p_fstream_open_ctor, &fs, filename, OPENMODE_in, filebuf_openprot, TRUE); + ok(pfs == &fs, "constructor returned wrong pointer, expected %p got %p\n", &fs, pfs); + ok(fs.base_ios.state == IOSTATE_goodbit, "wrong stream state, expected %d got %d\n", IOSTATE_goodbit, fs.base_ios.state); + pfb = (filebuf*) fs.base_ios.sb; + ok((int) call_func1(p_filebuf_is_open, pfb) == TRUE, "expected filebuf to be open\n"); + + /* integration with istream */ + memset(st, 'A', sizeof(st)); + pis = call_func2(p_istream_read_str, (istream*) &fs.base1, st); + ok(pis == (istream*) &fs.base1, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base1); + st[7] = 0; + ok(!strcmp(st, "ftest"), "expected 'ftest' got '%s'\n", st); + + i = 12345; + pis = call_func2(p_istream_read_int, (istream*) &fs.base1, &i); + ok(pis == (istream*) &fs.base1, "stream operation returned wrong pointer, expected %p got %p\n", &fs, &fs.base1); + ok(i == 15, "expected 12 got %d\n", i); + + /* make sure that OPENMODE_out is not implied */ + ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + + /* cleanup */ + call_func1(p_fstream_vbase_dtor, &fs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s', some filedescs are still open?\n", filename); +} + static void test_exception(void) { const char *unknown = "Unknown exception"; @@ -7983,6 +8056,7 @@ START_TEST(msvcirt) test_stdiostream(); test_Iostream_init(); test_std_streams(); + test_fstream(); test_exception(); FreeLibrary(msvcrt); -- 2.28.0

1 0

[PATCH v3 5/5] comsvcs: Implement ISharedPropertyGroup_CreateProperty().
by Jactry Zeng 07 Sep '20

07 Sep '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Fix some leaks. - Add more tests. - Check SysAllocString() result in CreateProperty(). v2: No changes. --- dlls/comsvcs/comsvcs_private.h | 2 + dlls/comsvcs/property.c | 250 ++++++++++++++++++++++++++++++++- dlls/comsvcs/tests/property.c | 81 +++++++++++ 3 files changed, 331 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index eee6e9938c..3eeb9d751a 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -38,6 +38,7 @@ enum tid_t NULL_tid, ISharedPropertyGroupManager_tid, ISharedPropertyGroup_tid, + ISharedProperty_tid, LAST_tid }; @@ -46,6 +47,7 @@ static REFIID tid_ids[] = &IID_NULL, &IID_ISharedPropertyGroupManager, &IID_ISharedPropertyGroup, + &IID_ISharedProperty, }; HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index a73964d288..b2b3920a2d 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -21,6 +21,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); +struct shared_property +{ + ISharedProperty ISharedProperty_iface; + LONG refcount; + BSTR name; +}; + struct group_manager { ISharedPropertyGroupManager ISharedPropertyGroupManager_iface; @@ -37,10 +44,44 @@ struct property_group LONG isolation, release; struct list entry; BSTR name; + struct shared_property *properties; + size_t capacity, count; + CRITICAL_SECTION cs; }; static struct group_manager *group_manager = NULL; +static BOOL comsvcs_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(size_t)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!*elements) + new_elements = heap_alloc_zero(new_capacity * size); + else + new_elements = heap_realloc(*elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + static inline struct group_manager *impl_from_ISharedPropertyGroupManager(ISharedPropertyGroupManager *iface) { return CONTAINING_RECORD(iface, struct group_manager, ISharedPropertyGroupManager_iface); @@ -51,6 +92,139 @@ static inline struct property_group *impl_from_ISharedPropertyGroup(ISharedPrope return CONTAINING_RECORD(iface, struct property_group, ISharedPropertyGroup_iface); } +static inline struct shared_property *impl_from_ISharedProperty(ISharedProperty *iface) +{ + return CONTAINING_RECORD(iface, struct shared_property, ISharedProperty_iface); +} + +static HRESULT WINAPI shared_property_QueryInterface(ISharedProperty *iface, REFIID riid, void **out) +{ + struct shared_property *property = impl_from_ISharedProperty(iface); + + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch) + || IsEqualGUID(riid, &IID_ISharedProperty)) + { + *out = &property->ISharedProperty_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + WARN("%s not implemented.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI shared_property_AddRef(ISharedProperty *iface) +{ + struct shared_property *property = impl_from_ISharedProperty(iface); + ULONG refcount = InterlockedIncrement(&property->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI shared_property_Release(ISharedProperty *iface) +{ + struct shared_property *property = impl_from_ISharedProperty(iface); + ULONG refcount = InterlockedDecrement(&property->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + SysFreeString(property->name); + } + + return refcount; +} + +static HRESULT WINAPI shared_property_GetTypeInfoCount(ISharedProperty *iface, UINT *info) +{ + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + *info = 1; + return S_OK; +} + +static HRESULT WINAPI shared_property_GetTypeInfo(ISharedProperty *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedProperty_tid, info); +} + +static HRESULT WINAPI shared_property_GetIDsOfNames(ISharedProperty *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", + iface, debugstr_guid(riid), names, count, lcid, dispid); + + hr = get_typeinfo(ISharedProperty_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI shared_property_Invoke(ISharedProperty *iface, DISPID member, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", + iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); + + hr = get_typeinfo(ISharedProperty_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI shared_property_get_Value(ISharedProperty *iface, VARIANT *value) +{ + FIXME("iface %p, value %p: stub.\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI shared_property_put_Value(ISharedProperty *iface, VARIANT value) +{ + FIXME("iface %p, value %s: stub.\n", iface, debugstr_variant(&value)); + return E_NOTIMPL; +} + +static const ISharedPropertyVtbl shared_property_vtbl = +{ + shared_property_QueryInterface, + shared_property_AddRef, + shared_property_Release, + shared_property_GetTypeInfoCount, + shared_property_GetTypeInfo, + shared_property_GetIDsOfNames, + shared_property_Invoke, + shared_property_get_Value, + shared_property_put_Value +}; + static HRESULT WINAPI property_group_QueryInterface(ISharedPropertyGroup *iface, REFIID riid, void **out) { struct property_group *group = impl_from_ISharedPropertyGroup(iface); @@ -93,12 +267,14 @@ static ULONG WINAPI property_group_Release(ISharedPropertyGroup *iface) struct group_manager *manager = group->parent; SysFreeString(group->name); + heap_free(group->properties); EnterCriticalSection(&manager->cs); list_remove(&group->entry); LeaveCriticalSection(&manager->cs); ISharedPropertyGroupManager_Release(&manager->ISharedPropertyGroupManager_iface); + DeleteCriticalSection(&group->cs); heap_free(group); } @@ -163,6 +339,18 @@ static HRESULT WINAPI property_group_Invoke(ISharedPropertyGroup *iface, DISPID return hr; } +static struct shared_property *find_shared_property(struct property_group *group, BSTR name) +{ + int index; + + for (index = 0; index < group->count; index++) + { + if (!lstrcmpW(group->properties[index].name, name)) + return &group->properties[index]; + } + return NULL; +} + static HRESULT WINAPI property_group_CreatePropertyByPosition(ISharedPropertyGroup *iface, int index, VARIANT_BOOL *exists, ISharedProperty **property) { @@ -180,8 +368,54 @@ static HRESULT WINAPI property_group_get_PropertyByPosition(ISharedPropertyGroup static HRESULT WINAPI property_group_CreateProperty(ISharedPropertyGroup *iface, BSTR name, VARIANT_BOOL *exists, ISharedProperty **property) { - FIXME("iface %p, name %s, exists %p, property %p: stub.\n", iface, debugstr_w(name), exists, property); - return E_NOTIMPL; + struct property_group *group = impl_from_ISharedPropertyGroup(iface); + struct shared_property *shared_property; + BSTR property_name; + HRESULT hr; + + TRACE("iface %p, name %s, exists %p, property %p.\n", iface, debugstr_w(name), exists, property); + + EnterCriticalSection(&group->cs); + + shared_property = find_shared_property(group, name); + if (!shared_property) + { + property_name = SysAllocString(name); + if (!property_name) + { + heap_free(shared_property); + LeaveCriticalSection(&group->cs); + return E_OUTOFMEMORY; + } + + if (!comsvcs_array_reserve((void **)&group->properties, &group->capacity, group->count + 1, + sizeof(*group->properties))) + { + SysFreeString(property_name); + LeaveCriticalSection(&group->cs); + return E_OUTOFMEMORY; + } + + shared_property = &group->properties[group->count]; + shared_property->refcount = 1; + shared_property->name = property_name; + shared_property->ISharedProperty_iface.lpVtbl = &shared_property_vtbl; + + group->count++; + *exists = FALSE; + *property = &shared_property->ISharedProperty_iface; + hr = S_OK; + } + else + { + *exists = TRUE; + hr = ISharedProperty_QueryInterface(&shared_property->ISharedProperty_iface, + &IID_ISharedProperty, (void **)property); + } + + LeaveCriticalSection(&group->cs); + + return hr; } static HRESULT WINAPI property_group_get_Property(ISharedPropertyGroup *iface, BSTR name, ISharedProperty **property) @@ -349,6 +583,17 @@ static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupMana property_group->isolation = *isolation; property_group->release = *release; property_group->refcount = 1; + property_group->capacity = 0; + property_group->count = 0; + property_group->properties = NULL; + if (!comsvcs_array_reserve((void **)&property_group->properties, &property_group->capacity, 2, + sizeof(*property_group->properties))) + { + heap_free(property_group); + LeaveCriticalSection(&manager->cs); + return E_OUTOFMEMORY; + } + property_group->name = SysAllocString(name); if (!property_group->name) { @@ -356,6 +601,7 @@ static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupMana heap_free(property_group); return E_OUTOFMEMORY; } + InitializeCriticalSection(&property_group->cs); list_add_tail(&manager->property_groups, &property_group->entry); diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 7321bbcfe6..1f62656e7a 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -320,12 +320,93 @@ static void test_property_group(void) ISharedPropertyGroupManager_Release(manager); } +static void test_shared_property(void) +{ + ISharedProperty *property, *property1; + ISharedPropertyGroupManager *manager; + ULONG refcount, expected_refcount; + ISharedPropertyGroup *group; + BSTR name, property_name; + LONG isolation, release; + VARIANT_BOOL exists; + IDispatch *dispatch; + HRESULT hr; + static const struct test_name_id test_name_ids[] = + { + {L"Value", DISPID_VALUE}, + }; + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + name = SysAllocString(L"testgroupname"); + isolation = 0; + release = 0; + exists = FALSE; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SysFreeString(name); + + property_name = SysAllocString(L"testpropertyname"); + exists = TRUE; + expected_refcount = get_refcount(group); + hr = ISharedPropertyGroup_CreateProperty(group, property_name, &exists, &property); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!exists, "Got unexpected value: %d.\n", exists); + refcount = get_refcount(group); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + hr = ISharedPropertyGroup_get_PropertyByPosition(group, 0, &property1); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = ISharedPropertyGroup_get_PropertyByPosition(group, 1, &property1); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + exists = FALSE; + expected_refcount = get_refcount(property) + 1; + hr = ISharedPropertyGroup_CreateProperty(group, property_name, &exists, &property1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!exists, "Got unexpected value: %d.\n", exists); + refcount = get_refcount(property); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + expected_refcount--; + ISharedProperty_Release(property1); + refcount = get_refcount(property); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + expected_refcount = get_refcount(property) + 1; + property1 = NULL; + hr = ISharedPropertyGroup_get_Property(group, property_name, &property1); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(property1 == property, "Got wrong pointer %p.\n", property); + refcount = get_refcount(property); + todo_wine ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + if (property1) + ISharedProperty_Release(property1); + SysFreeString(property_name); + + property_name = SysAllocString(L"Testpropertyname"); + hr = ISharedPropertyGroup_get_Property(group, property_name, &property1); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SysFreeString(property_name); + + hr = ISharedProperty_QueryInterface(property, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Got hr %#x.\n", hr); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedProperty); + IDispatch_Release(dispatch); + + ISharedProperty_Release(property); + ISharedPropertyGroup_Release(group); + ISharedPropertyGroupManager_Release(manager); +} + START_TEST(property) { CoInitialize(NULL); test_interfaces(); test_property_group(); + test_shared_property(); CoUninitialize(); } -- 2.28.0

3 2

[PATCH v3 3/5] comsvcs: Implement ISharedPropertyGroupManager_CreatePropertyGroup().
by Jactry Zeng 07 Sep '20

07 Sep '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Free group in ISharedPropertyGroup_Release(). - Use LIST_FOR_EACH_ENTRY instead of LIST_FOR_EACH_ENTRY_SAFE in find_propery_group(). - Add CRITICAL_SECTION for struct group_manager. - Simplify CreatePropertyGroup() and check SysAllocString() result. - Fix some leaks. - Add more tests. v2: - Storage struct group_manager * instead of ISharedPropertyGroupManager * in struct property_group; - Storage property groups to a link instead of an array; - Add more tests of ISharedPropertyGroupManager_CreatePropertyGroup(). --- dlls/comsvcs/comsvcs_private.h | 2 + dlls/comsvcs/property.c | 244 ++++++++++++++++++++++++++++++++- dlls/comsvcs/tests/property.c | 129 +++++++++++++++++ include/winerror.h | 11 ++ 4 files changed, 384 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index 8a67bcffd8..eee6e9938c 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -37,6 +37,7 @@ enum tid_t { NULL_tid, ISharedPropertyGroupManager_tid, + ISharedPropertyGroup_tid, LAST_tid }; @@ -44,6 +45,7 @@ static REFIID tid_ids[] = { &IID_NULL, &IID_ISharedPropertyGroupManager, + &IID_ISharedPropertyGroup, }; HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 44e111fe71..045415e246 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -17,6 +17,7 @@ */ #include <comsvcs_private.h> +#include <wine/list.h> WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); @@ -24,6 +25,18 @@ struct group_manager { ISharedPropertyGroupManager ISharedPropertyGroupManager_iface; LONG refcount; + struct list property_groups; + CRITICAL_SECTION cs; +}; + +struct property_group +{ + ISharedPropertyGroup ISharedPropertyGroup_iface; + LONG refcount; + struct group_manager *parent; + LONG isolation, release; + struct list entry; + BSTR name; }; static struct group_manager *group_manager = NULL; @@ -33,6 +46,165 @@ static inline struct group_manager *impl_from_ISharedPropertyGroupManager(IShare return CONTAINING_RECORD(iface, struct group_manager, ISharedPropertyGroupManager_iface); } +static inline struct property_group *impl_from_ISharedPropertyGroup(ISharedPropertyGroup *iface) +{ + return CONTAINING_RECORD(iface, struct property_group, ISharedPropertyGroup_iface); +} + +static HRESULT WINAPI property_group_QueryInterface(ISharedPropertyGroup *iface, REFIID riid, void **out) +{ + struct property_group *group = impl_from_ISharedPropertyGroup(iface); + + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch) + || IsEqualGUID(riid, &IID_ISharedPropertyGroup)) + { + *out = &group->ISharedPropertyGroup_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + WARN("%s not implemented.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI property_group_AddRef(ISharedPropertyGroup *iface) +{ + struct property_group *group = impl_from_ISharedPropertyGroup(iface); + ULONG refcount = InterlockedIncrement(&group->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI property_group_Release(ISharedPropertyGroup *iface) +{ + struct property_group *group = impl_from_ISharedPropertyGroup(iface); + ULONG refcount = InterlockedDecrement(&group->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + struct group_manager *manager = group->parent; + + SysFreeString(group->name); + + EnterCriticalSection(&manager->cs); + list_remove(&group->entry); + LeaveCriticalSection(&manager->cs); + + ISharedPropertyGroupManager_Release(&manager->ISharedPropertyGroupManager_iface); + heap_free(group); + } + + return refcount; +} + +static HRESULT WINAPI property_group_GetTypeInfoCount(ISharedPropertyGroup *iface, UINT *info) +{ + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + *info = 1; + return S_OK; +} + +static HRESULT WINAPI property_group_GetTypeInfo(ISharedPropertyGroup *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedPropertyGroup_tid, info); +} + +static HRESULT WINAPI property_group_GetIDsOfNames(ISharedPropertyGroup *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", + iface, debugstr_guid(riid), names, count, lcid, dispid); + + hr = get_typeinfo(ISharedPropertyGroup_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI property_group_Invoke(ISharedPropertyGroup *iface, DISPID member, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", + iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); + + hr = get_typeinfo(ISharedPropertyGroup_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI property_group_CreatePropertyByPosition(ISharedPropertyGroup *iface, int index, + VARIANT_BOOL *exists, ISharedProperty **property) +{ + FIXME("iface %p, index %d, exisits %p, property %p: stub.\n", + iface, index, exists, property); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_group_get_PropertyByPosition(ISharedPropertyGroup *iface, int index, ISharedProperty **property) +{ + FIXME("iface %p, index %d, property %p: stub.\n", iface, index, property); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_group_CreateProperty(ISharedPropertyGroup *iface, BSTR name, VARIANT_BOOL *exists, + ISharedProperty **property) +{ + FIXME("iface %p, name %s, exists %p, property %p: stub.\n", iface, debugstr_w(name), exists, property); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_group_get_Property(ISharedPropertyGroup *iface, BSTR name, ISharedProperty **property) +{ + FIXME("iface %p, name %s, property %p: stub.\n", iface, debugstr_w(name), property); + return E_NOTIMPL; +} + +static const ISharedPropertyGroupVtbl property_group_vtbl = +{ + property_group_QueryInterface, + property_group_AddRef, + property_group_Release, + property_group_GetTypeInfoCount, + property_group_GetTypeInfo, + property_group_GetIDsOfNames, + property_group_Invoke, + property_group_CreatePropertyByPosition, + property_group_get_PropertyByPosition, + property_group_CreateProperty, + property_group_get_Property, +}; + static HRESULT WINAPI group_manager_QueryInterface(ISharedPropertyGroupManager *iface, REFIID riid, void **out) { struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); @@ -131,12 +303,77 @@ static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, D return hr; } +static struct property_group *find_propery_group(struct group_manager *manager, BSTR name) +{ + struct property_group *group; + + LIST_FOR_EACH_ENTRY(group, &group_manager->property_groups, struct property_group, entry) + { + if (!lstrcmpW(group->name, name)) + return group; + } + return NULL; +} + static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, LONG *isolation, LONG *release, VARIANT_BOOL *exists, ISharedPropertyGroup **group) { - FIXME("iface %p, name %s, isolation %p, release %p, exists %p, group %p: stub.\n", + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + struct property_group *property_group; + + TRACE("iface %p, name %s, isolation %p, release %p, exists %p, group %p.\n", iface, debugstr_w(name), isolation, release, exists, group); - return E_NOTIMPL; + + if (!name) + return E_POINTER; + + if (*isolation > 1 || *release > 1) + return E_INVALIDARG; + + if (*isolation || *release) + FIXME("Unsopported mode: isolation %d, release %d.\n", *isolation, *release); + + EnterCriticalSection(&manager->cs); + + property_group = find_propery_group(manager, name); + if (!property_group) + { + property_group = heap_alloc(sizeof(*property_group)); + if (!property_group) + { + LeaveCriticalSection(&manager->cs); + return E_OUTOFMEMORY; + } + property_group->ISharedPropertyGroup_iface.lpVtbl = &property_group_vtbl; + property_group->parent = manager; + property_group->isolation = *isolation; + property_group->release = *release; + property_group->refcount = 1; + property_group->name = SysAllocString(name); + if (!property_group->name) + { + LeaveCriticalSection(&manager->cs); + heap_free(property_group); + return E_OUTOFMEMORY; + } + + list_add_tail(&manager->property_groups, &property_group->entry); + + *exists = FALSE; + ISharedPropertyGroupManager_AddRef(&property_group->parent->ISharedPropertyGroupManager_iface); + } + else + { + *exists = TRUE; + *isolation = property_group->isolation; + *release = property_group->release; + ISharedPropertyGroup_AddRef(&property_group->ISharedPropertyGroup_iface); + } + *group = &property_group->ISharedPropertyGroup_iface; + + LeaveCriticalSection(&manager->cs); + + return S_OK; } static HRESULT WINAPI group_manager_get_Group(ISharedPropertyGroupManager *iface, BSTR name, ISharedPropertyGroup **group) @@ -182,9 +419,12 @@ HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFII } manager->ISharedPropertyGroupManager_iface.lpVtbl = &group_manager_vtbl; manager->refcount = 1; + list_init(&manager->property_groups); + InitializeCriticalSection(&manager->cs); if (InterlockedCompareExchangePointer((void **)&group_manager, manager, NULL)) { + DeleteCriticalSection(&manager->cs); heap_free(manager); } } diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 2cc7ff1d44..8ac5e522f5 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -164,11 +164,140 @@ static void test_interfaces(void) ISharedPropertyGroupManager_Release(manager); } +static void test_property_group(void) +{ + ISharedPropertyGroup *group, *group1; + ISharedPropertyGroupManager *manager; + ULONG refcount, expected_refcount; + LONG isolation, release; + VARIANT_BOOL exists; + IDispatch *dispatch; + HRESULT hr; + BSTR name; + static const struct test_name_id test_name_ids[] = + { + {L"CreatePropertyByPosition", 0x1}, + {L"PropertyByPosition", 0x2}, + {L"CreateProperty", 0x3}, + {L"Property", 0x4}, + }; + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, NULL, &isolation, &release, &exists, &group); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + name = SysAllocString(L"testgroupname"); + isolation = 2; + release = 0; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + /* Crash on Windows */ + if (0) + { + ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, NULL, &release, &exists, &group); + ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, NULL, &exists, &group); + ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, NULL, &group); + } + + isolation = 0; + release = 2; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + isolation = 1; + release = 0; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group); + todo_wine ok(hr == CONTEXT_E_NOCONTEXT, "Got hr %#x.\n", hr); + if (group) + ISharedPropertyGroup_Release(group); + + isolation = 0; + release = 0; + exists = TRUE; + expected_refcount = get_refcount(manager) + 1; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!exists, "Got unexpected value %d.\n", exists); + refcount = get_refcount(group); + ok(refcount == 1, "Got unexpected refcount: %u.\n", refcount); + + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroup_AddRef(group); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroup_Release(group); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + /* Create an existing group */ + isolation = 1; + release = 1; + expected_refcount = get_refcount(manager); + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!exists, "Got unexpected value %d.\n", exists); + ok(!isolation, "Got unexpected value %d.\n", isolation); + ok(!release, "Got unexpected value %d.\n", release); + ok(group == group1, "Got unexpected pointer: %p.\n", group1); + refcount = get_refcount(group); + ok(refcount == 2, "Got unexpected refcount: %u.\n", refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroup_Release(group1); + refcount = get_refcount(group); + ok(refcount == 1, "Got unexpected refcount: %u.\n", refcount); + SysFreeString(name); + + name = SysAllocString(L"testgroupname2"); + isolation = 0; + release = 1; + exists = TRUE; + expected_refcount = get_refcount(manager) + 1; + hr = ISharedPropertyGroupManager_CreatePropertyGroup(manager, name, &isolation, &release, &exists, &group1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!exists, "Got unexpected value %d.\n", exists); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(group1); + todo_wine ok(refcount == 2, "Got unexpected refcount: %u.\n", refcount); + SysFreeString(name); + + if (refcount >= 2) + { + expected_refcount = get_refcount(manager); + ISharedPropertyGroup_Release(group1); + refcount = get_refcount(manager); + todo_wine ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + expected_refcount = get_refcount(manager) - 1; + ISharedPropertyGroup_Release(group1); + refcount = get_refcount(manager); + todo_wine ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + } + + hr = ISharedPropertyGroup_QueryInterface(group, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Got hr %#x.\n", hr); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroup); + IDispatch_Release(dispatch); + + expected_refcount = get_refcount(manager) - 1; + ISharedPropertyGroup_Release(group); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + ISharedPropertyGroupManager_Release(manager); +} + START_TEST(property) { CoInitialize(NULL); test_interfaces(); + test_property_group(); CoUninitialize(); } diff --git a/include/winerror.h b/include/winerror.h index 4ebb48c124..ef5279201d 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3036,6 +3036,17 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define CO_E_DECODEFAILED _HRESULT_TYPEDEF_(0x8004021A) #define CO_E_ACNOTINITIALIZED _HRESULT_TYPEDEF_(0x8004021B) +#define CONTEXT_E_ABORTED _HRESULT_TYPEDEF_(0x8004e002) +#define CONTEXT_E_ABORTING _HRESULT_TYPEDEF_(0x8004e003) +#define CONTEXT_E_NOCONTEXT _HRESULT_TYPEDEF_(0x8004e004) +#define CONTEXT_E_WOULD_DEADLOCK _HRESULT_TYPEDEF_(0x8004e005) +#define CONTEXT_E_SYNCH_TIMEOUT _HRESULT_TYPEDEF_(0x8004e006) +#define CONTEXT_E_OLDREF _HRESULT_TYPEDEF_(0x8004e007) +#define CONTEXT_E_ROLENOTFOUND _HRESULT_TYPEDEF_(0x8004e00c) +#define CONTEXT_E_TMNOTAVAILABLE _HRESULT_TYPEDEF_(0x8004e00f) +#define CONTEXT_E_NOJIT _HRESULT_TYPEDEF_(0x8004e026) +#define CONTEXT_E_NOTRANSACTION _HRESULT_TYPEDEF_(0x8004e027) + /* Task Scheduler Service Error Codes */ #define SCHED_S_TASK_READY _HRESULT_TYPEDEF_(0x00041300) #define SCHED_S_TASK_RUNNING _HRESULT_TYPEDEF_(0x00041301) -- 2.28.0

3 2

[PATCH 1/2] ntdll: Return buffer filled with random values from NtQuerySystemInformation(SystemInterruptInformation).
by Hans Leidekker 07 Sep '20

07 Sep '20

Based on a patch by Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 2 ++ dlls/ntdll/tests/info.c | 3 ++- dlls/ntdll/unix/system.c | 34 +++++++++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 006087e05ec..c017d204aab 100644 --- a/configure.ac +++ b/configure.ac @@ -514,6 +514,7 @@ AC_CHECK_HEADERS(\ sys/protosw.h \ sys/ptrace.h \ sys/queue.h \ + sys/random.h \ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ @@ -2203,6 +2204,7 @@ AC_CHECK_FUNCS(\ getauxval \ getifaddrs \ getopt_long_only \ + getrandom \ kqueue \ lstat \ mach_continuous_time \ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 057b855914a..b09c57b97a7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -643,7 +643,8 @@ static void test_query_interrupt(void) sii = HeapAlloc(GetProcessHeap(), 0, NeededLength); status = pNtQuerySystemInformation(SystemInterruptInformation, sii, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(ReturnLength == NeededLength, "got %u\n", ReturnLength); /* Try it for all processors */ status = pNtQuerySystemInformation(SystemInterruptInformation, sii, NeededLength, &ReturnLength); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c2412643afa..ccbc68b972d 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -29,6 +29,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <errno.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -42,6 +43,9 @@ #ifdef HAVE_MACHINE_CPU_H # include <machine/cpu.h> #endif +#ifdef HAVE_SYS_RANDOM_H +# include <sys/random.h> +#endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> @@ -2422,16 +2426,36 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemInterruptInformation: { - SYSTEM_INTERRUPT_INFORMATION sii = {{ 0 }}; - - len = sizeof(sii); + len = NtCurrentTeb()->Peb->NumberOfProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION); if (size >= len) { if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy( info, &sii, len); + else + { +#ifdef HAVE_GETRANDOM + int ret; + do + { + ret = getrandom( info, len, 0 ); + } + while (ret == -1 && errno == EINTR); +#else + int fd = open( "/dev/urandom", O_RDONLY ); + if (fd != -1) + { + int ret; + do + { + ret = read( fd, info, len ); + } + while (ret == -1 && errno == EINTR); + close( fd ); + } + else WARN( "can't open /dev/urandom\n" ); +#endif + } } else ret = STATUS_INFO_LENGTH_MISMATCH; - FIXME("info_class SYSTEM_INTERRUPT_INFORMATION\n"); break; } -- 2.20.1

2 1

[PATCH v3 1/5] comsvcs: Add ISharedPropertyGroupManager stub.
by Jactry Zeng 07 Sep '20

07 Sep '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Make creation of group manager safe. v2: - Add CRITICAL_SECTION for struct group_manager; - Use DISPID_VALUE and DISPID_NEWENUM instead; - Improve tests. --- dlls/comsvcs/Makefile.in | 3 +- dlls/comsvcs/comsvcs_private.h | 38 ++++++++ dlls/comsvcs/main.c | 28 +++--- dlls/comsvcs/property.c | 163 +++++++++++++++++++++++++++++++++ dlls/comsvcs/tests/Makefile.in | 3 +- dlls/comsvcs/tests/property.c | 115 +++++++++++++++++++++++ include/comsvcs.idl | 65 +++++++++++++ 7 files changed, 401 insertions(+), 14 deletions(-) create mode 100644 dlls/comsvcs/comsvcs_private.h create mode 100644 dlls/comsvcs/property.c create mode 100644 dlls/comsvcs/tests/property.c diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2..b4a4244bce 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -5,7 +5,8 @@ IMPORTS = ole32 uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + property.c IDL_SRCS = \ comsvcs_classes.idl \ diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h new file mode 100644 index 0000000000..6d299d3a88 --- /dev/null +++ b/dlls/comsvcs/comsvcs_private.h @@ -0,0 +1,38 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _COMSVCS_PRIVATE_H_ +#define _COMSVCS_PRIVATE_H_ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "comsvcs.h" +#include "initguid.h" + +#include "wine/heap.h" +#include "wine/debug.h" + +HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); + +#endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 9ab77dfced..1d3f7db174 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "comsvcs.h" -#include "wine/heap.h" -#include "wine/debug.h" -#include "initguid.h" +#include "comsvcs_private.h" #include "comsvcs_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); @@ -1027,8 +1016,18 @@ static const IClassFactoryVtbl newmoniker_cf_vtbl = comsvcscf_LockServer }; +static const IClassFactoryVtbl group_manager_cf_vtbl = +{ + comsvcscf_QueryInterface, + comsvcscf_AddRef, + comsvcscf_Release, + group_manager_create, + comsvcscf_LockServer +}; + static IClassFactory DispenserManageFactory = { &comsvcscf_vtbl }; static IClassFactory NewMonikerFactory = { &newmoniker_cf_vtbl }; +static IClassFactory GroupManagerFactory = { &group_manager_cf_vtbl }; /****************************************************************** * DllGetClassObject @@ -1045,6 +1044,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) TRACE("(CLSID_NewMoniker %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&NewMonikerFactory, riid, ppv); } + else if (IsEqualGUID(&CLSID_SharedPropertyGroupManager, rclsid)) + { + TRACE("(CLSID_SharedPropertyGroupManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&GroupManagerFactory, riid, ppv); + } FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c new file mode 100644 index 0000000000..3c9917c926 --- /dev/null +++ b/dlls/comsvcs/property.c @@ -0,0 +1,163 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <comsvcs_private.h> + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + +struct group_manager +{ + ISharedPropertyGroupManager ISharedPropertyGroupManager_iface; + LONG refcount; +}; + +static struct group_manager *group_manager = NULL; + +static inline struct group_manager *impl_from_ISharedPropertyGroupManager(ISharedPropertyGroupManager *iface) +{ + return CONTAINING_RECORD(iface, struct group_manager, ISharedPropertyGroupManager_iface); +} + +static HRESULT WINAPI group_manager_QueryInterface(ISharedPropertyGroupManager *iface, REFIID riid, void **out) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch) + || IsEqualGUID(riid, &IID_ISharedPropertyGroupManager)) + { + *out = &manager->ISharedPropertyGroupManager_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + WARN("%s not implemented.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI group_manager_AddRef(ISharedPropertyGroupManager *iface) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) +{ + FIXME("iface %p, info %p: stub.\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + iface, debugstr_guid(riid), names, count, lcid, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) +{ + FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, LONG *isolation, + LONG *release, VARIANT_BOOL *exists, ISharedPropertyGroup **group) +{ + FIXME("iface %p, name %s, isolation %p, release %p, exists %p, group %p: stub.\n", + iface, debugstr_w(name), isolation, release, exists, group); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_get_Group(ISharedPropertyGroupManager *iface, BSTR name, ISharedPropertyGroup **group) +{ + FIXME("iface %p, name %s, group %p: stub.\n", iface, debugstr_w(name), group); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_get__NewEnum(ISharedPropertyGroupManager *iface, IUnknown **retval) +{ + FIXME("iface %p, retval %p: stub.\n", iface, retval); + return E_NOTIMPL; +} + +static const ISharedPropertyGroupManagerVtbl group_manager_vtbl = +{ + group_manager_QueryInterface, + group_manager_AddRef, + group_manager_Release, + group_manager_GetTypeInfoCount, + group_manager_GetTypeInfo, + group_manager_GetIDsOfNames, + group_manager_Invoke, + group_manager_CreatePropertyGroup, + group_manager_get_Group, + group_manager_get__NewEnum +}; + +HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out) +{ + struct group_manager *manager; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!group_manager) + { + manager = heap_alloc(sizeof(*manager)); + if (!manager) + { + *out = NULL; + return E_OUTOFMEMORY; + } + manager->ISharedPropertyGroupManager_iface.lpVtbl = &group_manager_vtbl; + manager->refcount = 1; + + if (InterlockedCompareExchangePointer((void **)&group_manager, manager, NULL)) + { + heap_free(manager); + } + } + return ISharedPropertyGroupManager_QueryInterface(&group_manager->ISharedPropertyGroupManager_iface, riid, out); +} diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 86da9fda66..1d9146ba5b 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - comsvcs.c + comsvcs.c \ + property.c diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c new file mode 100644 index 0000000000..adad7bd539 --- /dev/null +++ b/dlls/comsvcs/tests/property.c @@ -0,0 +1,115 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "comsvcs.h" + +#include "wine/test.h" + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + ok(0, "Unexpected call.\n"); + return 0; +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_interfaces(void) +{ + ISharedPropertyGroupManager *manager, *manager1; + ULONG refcount, expected_refcount; + IDispatch *dispatch; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == CLASS_E_NOAGGREGATION, "Got hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + expected_refcount = get_refcount(unk) + 1; + hr = IUnknown_QueryInterface(unk, &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == S_OK, "Got hr %#x.\n", hr); + refcount = get_refcount(unk); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + expected_refcount = get_refcount(manager) + 1; + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(manager1 == manager, "Got wrong pointer: %p.\n", manager1); + refcount = get_refcount(manager1); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroupManager_Release(manager1); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Got hr %#x.\n", hr); + refcount = get_refcount(dispatch); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + IDispatch_Release(dispatch); + IUnknown_Release(unk); + ISharedPropertyGroupManager_Release(manager); +} + +START_TEST(property) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a8..ee1fede360 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,67 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Value([out, retval] VARIANT *value); + [id(DISPID_VALUE), propput] + HRESULT Value([in] VARIANT value); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int index, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int index, [out, retval] ISharedProperty **property); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR name, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000004), propget] + HRESULT Property([in] BSTR name, [out, retval] ISharedProperty **property); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR name, [in, out] LONG *isolation, [in, out] LONG *release, + [out] VARIANT_BOOL *exists, [out, retval] ISharedPropertyGroup **group); + [id(0x00000002), propget] + HRESULT Group([in] BSTR name, [out, retval] ISharedPropertyGroup **group); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } } -- 2.28.0

3 2

[PATCH 2/2] advapi32: Reimplement SystemFunction036 using system interrupt information.
by Hans Leidekker 07 Sep '20

07 Sep '20

Here's another proposal based on the discussion. If we implement system interrupt information with random values taken from the urandom source (patch 1/2), we can reimplement SystemFunction036 on top of that and get the same level of randomness. Adding a cache makes this as fast as Windows on my machine, in the getrandom() case. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/crypt.c | 62 +++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 7199795b475..ab06c14393b 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2422,6 +2422,36 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) return TRUE; } +static CRITICAL_SECTION random_cs; +static CRITICAL_SECTION_DEBUG random_debug = +{ + 0, 0, &random_cs, + { &random_debug.ProcessLocksList, &random_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": random_cs") } +}; +static CRITICAL_SECTION random_cs = { &random_debug, -1, 0, 0, 0, 0 }; + +#define MAX_CPUS 128 +static char random_buf[sizeof(SYSTEM_INTERRUPT_INFORMATION) * MAX_CPUS]; +static ULONG random_len; +static ULONG random_pos; + +/* FIXME: assumes interrupt information provides sufficient randomness */ +static BOOL fill_random_buffer(void) +{ + ULONG len = sizeof(SYSTEM_INTERRUPT_INFORMATION) * min( NtCurrentTeb()->Peb->NumberOfProcessors, MAX_CPUS ); + NTSTATUS status; + + if ((status = NtQuerySystemInformation( SystemInterruptInformation, random_buf, len, NULL ))) + { + WARN( "failed to get random bytes %08x\n", status ); + return FALSE; + } + random_len = len; + random_pos = 0; + return TRUE; +} + /****************************************************************************** * SystemFunction036 (ADVAPI32.@) * @@ -2436,26 +2466,30 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) * Failure: FALSE */ -BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) +BOOLEAN WINAPI SystemFunction036( void *buffer, ULONG len ) { - int dev_random; + char *ptr = buffer; - dev_random = open("/dev/urandom", O_RDONLY); - if (dev_random != -1) + EnterCriticalSection( &random_cs ); + while (len) { - if (read(dev_random, pbBuffer, dwLen) == (ssize_t)dwLen) + ULONG size; + if (random_pos >= random_len && !fill_random_buffer()) { - close(dev_random); - return TRUE; + SetLastError( NTE_FAIL ); + LeaveCriticalSection( &random_cs ); + return FALSE; } - close(dev_random); + size = min( len, random_len - random_pos ); + memcpy( ptr, random_buf + random_pos, size ); + random_pos += size; + ptr += size; + len -= size; } - else - FIXME("couldn't open /dev/urandom\n"); - SetLastError(NTE_FAIL); - return FALSE; -} - + LeaveCriticalSection( &random_cs ); + return TRUE; +} + /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, in crypt32.dll. -- 2.20.1

1 0

[PATCH v5 1/5] mfplat: Remove fallback media source.
by Derek Lesho 07 Sep '20

07 Sep '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/main.c | 207 +------------------------------------ dlls/mfplat/tests/mfplat.c | 106 +++++++++++-------- 2 files changed, 64 insertions(+), 249 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6cd409d63b7..ea1b1770e15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5679,188 +5679,6 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } -typedef struct _mfsource -{ - IMFMediaSource IMFMediaSource_iface; - LONG ref; -} mfsource; - -static inline mfsource *impl_from_IMFMediaSource(IMFMediaSource *iface) -{ - return CONTAINING_RECORD(iface, mfsource, IMFMediaSource_iface); -} - -static HRESULT WINAPI mfsource_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFMediaSource) || - IsEqualIID(riid, &IID_IMFMediaEventGenerator) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = &This->IMFMediaSource_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfsource_AddRef(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfsource_Release(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfsource_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%#x, %p)\n", This, flags, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, result, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, - HRESULT hr, const PROPVARIANT *value) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p): stub\n", This, characteristics); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - IMFStreamDescriptor *sd; - IMFMediaType *mediatype; - HRESULT hr; - - FIXME("(%p)->(%p): stub\n", This, descriptor); - - if (FAILED(hr = MFCreateMediaType(&mediatype))) - return hr; - - hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); - IMFMediaType_Release(mediatype); - if (FAILED(hr)) - return hr; - - hr = MFCreatePresentationDescriptor(1, &sd, descriptor); - IMFStreamDescriptor_Release(sd); - - return hr; -} - -static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, - const GUID *time_format, const PROPVARIANT *start_position) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p, %p): stub\n", This, descriptor, time_format, start_position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Stop(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Pause(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Shutdown(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return S_OK; -} - -static const IMFMediaSourceVtbl mfsourcevtbl = -{ - mfsource_QueryInterface, - mfsource_AddRef, - mfsource_Release, - mfsource_GetEvent, - mfsource_BeginGetEvent, - mfsource_EndGetEvent, - mfsource_QueueEvent, - mfsource_GetCharacteristics, - mfsource_CreatePresentationDescriptor, - mfsource_Start, - mfsource_Stop, - mfsource_Pause, - mfsource_Shutdown, -}; - enum resolved_object_origin { OBJECT_FROM_BYTESTREAM, @@ -6505,7 +6323,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv return E_POINTER; if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler))) - goto fallback; + return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; hr = RtwqCreateAsyncResult((IUnknown *)handler, NULL, NULL, &result); IMFByteStreamHandler_Release(handler); @@ -6528,28 +6346,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv hr = resolver_end_create_object(resolver, OBJECT_FROM_BYTESTREAM, result, obj_type, object); IRtwqAsyncResult_Release(result); - /* TODO: following stub is left intentionally until real source plugins are implemented. */ - if (SUCCEEDED(hr)) - return hr; - -fallback: - if (flags & MF_RESOLUTION_MEDIASOURCE) - { - mfsource *new_object; - - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); - if (!new_object) - return E_OUTOFMEMORY; - - new_object->IMFMediaSource_iface.lpVtbl = &mfsourcevtbl; - new_object->ref = 1; - - *object = (IUnknown *)&new_object->IMFMediaSource_iface; - *obj_type = MF_OBJECT_MEDIASOURCE; - return S_OK; - } - - return E_NOTIMPL; + return hr; } static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01749dd9ef8..fa90f1e4bac 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -382,12 +382,16 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall handler = (IMFSchemeHandler *)IMFAsyncResult_GetStateNoAddRef(result); hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); +todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); - hr = IMFAsyncResult_GetObject(result, &object2); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IMFAsyncResult_GetObject(result, &object2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IUnknown_Release(object); + IUnknown_Release(object); + } SetEvent(callback->event); @@ -502,13 +506,43 @@ static void test_source_resolver(void) hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if (hr == S_OK) IMFMediaSource_Release(mediasource); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + IMFByteStream_Release(stream); + + /* Create from URL. */ + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); + IMFByteStream_Release(stream); + + hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, + &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); + ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); + ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); + IUnknown_Release(cancel_cookie); + + if (SUCCEEDED(hr)) + WaitForSingleObject(callback.event, INFINITE); + + /* With explicit scheme. */ + lstrcpyW(pathW, fileschemeW); + lstrcatW(pathW, filename); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); IMFByteStream_Release(stream); /* We have to create a new bytestream here, because all following @@ -522,14 +556,31 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); + /* Start of gstreamer dependent tests */ + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (strcmp(winetest_platform, "wine")) + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IMFByteStream_Release(stream); + IMFSourceResolver_Release(resolver); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + DeleteFileW(filename); + return; + } ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); +todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -540,10 +591,7 @@ static void test_source_resolver(void) IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); -todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; /* Check major/minor type for the test media. */ ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); @@ -624,6 +672,7 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); + IMFPresentationDescriptor_Release(descriptor); hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -633,42 +682,9 @@ todo_wine skip_source_tests: - IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); - /* Create from URL. */ - callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, - &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); - ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); - ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); - IUnknown_Release(cancel_cookie); - - if (SUCCEEDED(hr)) - WaitForSingleObject(callback.event, INFINITE); - - /* With explicit scheme. */ - lstrcpyW(pathW, fileschemeW); - lstrcatW(pathW, filename); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - IMFSourceResolver_Release(resolver); - /* Create directly through scheme handler. */ hr = CoInitialize(NULL); ok(SUCCEEDED(hr), "Failed to initialize, hr %#x.\n", hr); @@ -693,12 +709,14 @@ skip_source_tests: if (do_uninit) CoUninitialize(); + CloseHandle(callback.event); + + IMFSourceResolver_Release(resolver); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); - - CloseHandle(callback.event); } static void init_functions(void) -- 2.28.0

3 11

[PATCH 1/3] ntdll/tests: Fix exception test failures on win10pro.
by Paul Gofman 07 Sep '20

07 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 06c4386a881..340469dd12f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -6652,12 +6652,14 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 0); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 3); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; @@ -6839,7 +6841,9 @@ static void test_extended_context(void) length2 = 0xdeadbeef; p = pRtlLocateExtendedFeature(context_ex, 2, &length2); - ok(!p && length2 == sizeof(YMMCONTEXT), "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok((!p && length2 == sizeof(YMMCONTEXT)) + || broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */, + "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); @@ -6861,7 +6865,8 @@ static void test_extended_context(void) - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); - ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT), + ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT) + || broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */, "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, @@ -6957,7 +6962,8 @@ static void test_extended_context(void) context->ContextFlags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!xs->Mask || broken(xs->Mask == 4) /* win10pro */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -6965,7 +6971,7 @@ static void test_extended_context(void) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -6982,7 +6988,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); xs->CompactionMask = 4; @@ -6997,7 +7004,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); context_ex->XState.Length = sizeof(XSTATE); -- 2.26.2

1 2

[PATCH] dwrite.idl: Use DEFINE_ENUM_FLAG_OPERATORS for enums that need it.
by Jacek Caban 07 Sep '20

07 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes building Wine Gecko with Wine dwrite headers. include/dwrite.idl | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH] ntdll: Fix more corner cases for arm64 packed info unwinding
by Martin Storsjo 07 Sep '20

07 Sep '20

Make sure to restore sp from fp for CR == 3. Fix unwinding of partial prologues/epilogues - the previous logic had an off-by-one for the pos/skip handling; fix a few more corner cases with odd number of saved registers. Functions with the H flag set (saving x0-x7 on the stack) should be considred having 4 nops (for the instructions saving the registers) in the prologue for unwind purposes. When unwinding through a partial epilogue, the same 4 nops should also be considered to be there (even though no sane epilogue would restore the registers there) based on how windows handles partial epilogue unwinding in those cases. Uncomment prologue/epilogue cases in an existing test and add tests for many more cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 41 +++-- dlls/ntdll/tests/exception.c | 322 ++++++++++++++++++++++++++++++++++- 2 files changed, 340 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index df656d90f22..7100da33d54 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -708,6 +708,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION switch (func->u.s.CR) { case 3: + len++; /* mov x29,sp */ len++; /* stp x29,lr,[sp,0] */ if (local_size <= 512) break; /* fall through */ @@ -717,9 +718,10 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (local_size > 4088) len++; /* sub sp,sp,#4088 */ break; } - if (offset < len + 4 * func->u.s.H) /* prolog */ + len += 4 * func->u.s.H; + if (offset < len) /* prolog */ { - skip = len + 4 * func->u.s.H - offset; + skip = len - offset; } else if (offset >= func->u.s.FunctionLength - (len + 1)) /* epilog */ { @@ -733,6 +735,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (func->u.s.CR == 3) { DWORD64 *fp = (DWORD64 *) context->u.s.Fp; /* u.X[29] */ + context->Sp = context->u.s.Fp; context->u.X[29] = fp[0]; context->u.X[30] = fp[1]; } @@ -748,34 +751,36 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION switch (func->u.s.CR) { case 3: + /* mov x29,sp */ + if (pos++ >= skip) context->Sp = context->u.s.Fp; if (local_size <= 512) { /* stp x29,lr,[sp,-#local_size]! */ - if (pos++ > skip) restore_regs( 29, 2, -local_size_regs, context, ptrs ); + if (pos++ >= skip) restore_regs( 29, 2, -local_size_regs, context, ptrs ); break; } /* stp x29,lr,[sp,0] */ - if (pos++ > skip) restore_regs( 29, 2, 0, context, ptrs ); + if (pos++ >= skip) restore_regs( 29, 2, 0, context, ptrs ); /* fall through */ case 0: case 1: if (!local_size) break; /* sub sp,sp,#local_size */ - if (pos++ > skip) context->Sp += (local_size - 1) % 4088 + 1; - if (local_size > 4088 && pos++ > skip) context->Sp += 4088; + if (pos++ >= skip) context->Sp += (local_size - 1) % 4088 + 1; + if (local_size > 4088 && pos++ >= skip) context->Sp += 4088; break; } - if (func->u.s.H && offset < len + 4) pos += 4; + if (func->u.s.H) pos += 4; if (fp_size) { - if (func->u.s.RegF % 2 == 0 && pos++ > skip) + if (func->u.s.RegF % 2 == 0 && pos++ >= skip) /* str d%u,[sp,#fp_size] */ restore_fpregs( 8 + func->u.s.RegF, 1, int_regs + fp_regs - 1, context, ptrs ); - for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) + for (i = (func->u.s.RegF + 1) / 2 - 1; i >= 0; i--) { - if (pos++ <= skip) continue; + if (pos++ < skip) continue; if (!i && !int_size) /* stp d8,d9,[sp,-#regsave]! */ restore_fpregs( 8, 2, -saved_regs, context, ptrs ); @@ -785,9 +790,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION } } - if (pos++ > skip) + if (func->u.s.RegI % 2) { - if (func->u.s.RegI % 2) + if (pos++ >= skip) { /* stp xn,lr,[sp,#offset] */ if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); @@ -796,14 +801,16 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION (func->u.s.RegI > 1) ? func->u.s.RegI - 1 : -saved_regs, context, ptrs ); } - else if (func->u.s.CR == 1) - /* str lr,[sp,#offset] */ - restore_regs( 30, 1, func->u.s.RegI ? int_regs - 1 : -saved_regs, context, ptrs ); + } + else if (func->u.s.CR == 1) + { + /* str lr,[sp,#offset] */ + if (pos++ >= skip) restore_regs( 30, 1, func->u.s.RegI ? int_regs - 1 : -saved_regs, context, ptrs ); } - for (i = func->u.s.RegI / 2 - 1; i >= 0; i--) + for (i = func->u.s.RegI/ 2 - 1; i >= 0; i--) { - if (pos++ <= skip) continue; + if (pos++ < skip) continue; if (i) /* stp xn,xn+1,[sp,#offset] */ restore_regs( 19 + 2 * i, 2, 2 * i, context, ptrs ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 06c4386a881..465c123e675 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4572,23 +4572,17 @@ static void test_virtual_unwind(void) static const BYTE unwind_info_1[] = { DW(unwind_info_1_packed) }; - /* The prologue/epilogue locations are commented out below, as we don't - * handle those cases at the moment. */ static const struct results results_1[] = { /* offset fp handler pc frame offset registers */ -#if 0 { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, { 0x08, 0x00, 0, 0x10, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {lr,0x10}, {-1,-1} }}, -#endif { 0x0c, 0x00, 0, 0x20, 0x030, TRUE, { {x19,0x10}, {x20,0x18}, {lr,0x20}, {-1,-1} }}, { 0x10, 0x00, 0, 0x20, 0x030, TRUE, { {x19,0x10}, {x20,0x18}, {lr,0x20}, {-1,-1} }}, -#if 0 { 0x14, 0x00, 0, 0x10, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {lr,0x10}, {-1,-1} }}, { 0x18, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, { 0x1c, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, -#endif }; static const BYTE function_2[] = @@ -4808,6 +4802,314 @@ static void test_virtual_unwind(void) #endif }; + static const BYTE function_6[] = + { + 0xf3, 0x53, 0xbd, 0xa9, /* 00: stp x19, x20, [sp, #-48]! */ + 0xf5, 0x0b, 0x00, 0xf9, /* 04: str x21, [sp, #16] */ + 0xe8, 0xa7, 0x01, 0x6d, /* 08: stp d8, d9, [sp, #24] */ + 0xea, 0x17, 0x00, 0xfd, /* 0c: str d10, [sp, #40] */ + 0xff, 0x03, 0x00, 0xd1, /* 10: sub sp, sp, #0 */ + 0x1f, 0x20, 0x03, 0xd5, /* 14: nop */ + 0xff, 0x03, 0x00, 0x91, /* 18: add sp, sp, #0 */ + 0xea, 0x17, 0x40, 0xfd, /* 1c: ldr d10, [sp, #40] */ + 0xe8, 0xa7, 0x41, 0x6d, /* 20: ldp d8, d9, [sp, #24] */ + 0xf5, 0x0b, 0x40, 0xf9, /* 24: ldr x21, [sp, #16] */ + 0xf3, 0x53, 0xc3, 0xa8, /* 28: ldp x19, x20, [sp], #48 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 2c: ret */ + }; + + static const DWORD unwind_info_6_packed = + (1 << 0) | /* Flag */ + (sizeof(function_6)/4 << 2) | /* FunctionLength */ + (2 << 13) | /* RegF */ + (3 << 16) | /* RegI */ + (0 << 20) | /* H */ + (0 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_6[] = { DW(unwind_info_6_packed) }; + + static const struct results results_6[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {d10, 0x28}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {d10, 0x28}, {-1,-1} }}, + { 0x18, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {d10, 0x28}, {-1,-1} }}, + { 0x1c, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {d10, 0x28}, {-1,-1} }}, + { 0x20, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {d8, 0x18}, {d9, 0x20}, {-1,-1} }}, + { 0x24, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {x21, 0x10}, {-1,-1} }}, + { 0x28, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, + { 0x2c, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_7[] = + { + 0xf3, 0x0f, 0x1d, 0xf8, /* 00: str x19, [sp, #-48]! */ + 0xe8, 0xa7, 0x00, 0x6d, /* 04: stp d8, d9, [sp, #8] */ + 0xea, 0xaf, 0x01, 0x6d, /* 08: stp d10, d11, [sp, #24] */ + 0xff, 0x03, 0x00, 0xd1, /* 0c: sub sp, sp, #0 */ + 0x1f, 0x20, 0x03, 0xd5, /* 10: nop */ + 0xff, 0x03, 0x00, 0x91, /* 14: add sp, sp, #0 */ + 0xea, 0xaf, 0x41, 0x6d, /* 18: ldp d10, d11, [sp, #24] */ + 0xe8, 0xa7, 0x40, 0x6d, /* 1c: ldp d8, d9, [sp, #8] */ + 0xf3, 0x07, 0x43, 0xf8, /* 20: ldr x19, [sp], #48 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 24: ret */ + }; + + static const DWORD unwind_info_7_packed = + (1 << 0) | /* Flag */ + (sizeof(function_7)/4 << 2) | /* FunctionLength */ + (3 << 13) | /* RegF */ + (1 << 16) | /* RegI */ + (0 << 20) | /* H */ + (0 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_7[] = { DW(unwind_info_7_packed) }; + + static const struct results results_7[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {d10, 0x18}, {d11, 0x20}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {d10, 0x18}, {d11, 0x20}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {d10, 0x18}, {d11, 0x20}, {-1,-1} }}, + { 0x18, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {d10, 0x18}, {d11, 0x20}, {-1,-1} }}, + { 0x1c, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {d8, 0x08}, {d9, 0x10}, {-1,-1} }}, + { 0x20, 0x00, 0, ORIG_LR, 0x030, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x24, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_8[] = + { + 0xe8, 0x27, 0xbf, 0x6d, /* 00: stp d8, d9, [sp, #-16]! */ + 0xff, 0x83, 0x00, 0xd1, /* 04: sub sp, sp, #32 */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0xff, 0x83, 0x00, 0x91, /* 0c: add sp, sp, #32 */ + 0xe8, 0x27, 0xc1, 0x6c, /* 10: ldp d8, d9, [sp], #16 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 14: ret */ + }; + + static const DWORD unwind_info_8_packed = + (1 << 0) | /* Flag */ + (sizeof(function_8)/4 << 2) | /* FunctionLength */ + (1 << 13) | /* RegF */ + (0 << 16) | /* RegI */ + (0 << 20) | /* H */ + (0 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_8[] = { DW(unwind_info_8_packed) }; + + static const struct results results_8[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x010, TRUE, { {d8, 0x00}, {d9, 0x08}, {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x030, TRUE, { {d8, 0x20}, {d9, 0x28}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x030, TRUE, { {d8, 0x20}, {d9, 0x28}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x010, TRUE, { {d8, 0x00}, {d9, 0x08}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_9[] = + { + 0xf3, 0x0f, 0x1b, 0xf8, /* 00: str x19, [sp, #-80]! */ + 0xe0, 0x87, 0x00, 0xa9, /* 04: stp x0, x1, [sp, #8] */ + 0xe2, 0x8f, 0x01, 0xa9, /* 08: stp x2, x3, [sp, #24] */ + 0xe4, 0x97, 0x02, 0xa9, /* 0c: stp x4, x5, [sp, #40] */ + 0xe6, 0x9f, 0x03, 0xa9, /* 10: stp x6, x7, [sp, #56] */ + 0xff, 0x83, 0x00, 0xd1, /* 14: sub sp, sp, #32 */ + 0x1f, 0x20, 0x03, 0xd5, /* 18: nop */ + 0xff, 0x83, 0x00, 0x91, /* 1c: add sp, sp, #32 */ + 0x1f, 0x20, 0x03, 0xd5, /* 20: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 24: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 28: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 2c: nop */ + 0xf3, 0x0f, 0x1b, 0xf8, /* 30: ldr x19, [sp], #80 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 34: ret */ + }; + + static const DWORD unwind_info_9_packed = + (1 << 0) | /* Flag */ + (sizeof(function_9)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (1 << 16) | /* RegI */ + (1 << 20) | /* H */ + (0 << 21) | /* CR */ + (7 << 23); /* FrameSize */ + + static const BYTE unwind_info_9[] = { DW(unwind_info_9_packed) }; + + static const struct results results_9[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x18, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, + { 0x1c, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, + { 0x20, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x24, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x28, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x2c, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x30, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x34, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_10[] = + { + 0xfe, 0x0f, 0x1f, 0xf8, /* 00: str lr, [sp, #-16]! */ + 0xff, 0x43, 0x00, 0xd1, /* 04: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0xff, 0x43, 0x00, 0x91, /* 0c: add sp, sp, #16 */ + 0xfe, 0x07, 0x41, 0xf8, /* 10: ldr lr, [sp], #16 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 14: ret */ + }; + + static const DWORD unwind_info_10_packed = + (1 << 0) | /* Flag */ + (sizeof(function_10)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (0 << 16) | /* RegI */ + (0 << 20) | /* H */ + (1 << 21) | /* CR */ + (2 << 23); /* FrameSize */ + + static const BYTE unwind_info_10[] = { DW(unwind_info_10_packed) }; + + static const struct results results_10[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, 0x00, 0x010, TRUE, { {lr, 0x00}, {-1,-1} }}, + { 0x08, 0x00, 0, 0x10, 0x020, TRUE, { {lr, 0x10}, {-1,-1} }}, + { 0x0c, 0x00, 0, 0x10, 0x020, TRUE, { {lr, 0x10}, {-1,-1} }}, + { 0x10, 0x00, 0, 0x00, 0x010, TRUE, { {lr, 0x00}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_11[] = + { + 0xf3, 0x53, 0xbe, 0xa9, /* 00: stp x19, x20, [sp, #-32]! */ + 0xf5, 0x7b, 0x01, 0xa9, /* 04: stp x21, lr, [sp, #16] */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xff, 0x43, 0x00, 0x91, /* 10: add sp, sp, #16 */ + 0xf5, 0x7b, 0x41, 0xa9, /* 14: ldp x21, lr, [sp, #16] */ + 0xf3, 0x53, 0xc2, 0xa8, /* 18: ldp x19, x20, [sp], #32 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 1c: ret */ + }; + + static const DWORD unwind_info_11_packed = + (1 << 0) | /* Flag */ + (sizeof(function_11)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (3 << 16) | /* RegI */ + (0 << 20) | /* H */ + (1 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_11[] = { DW(unwind_info_11_packed) }; + + static const struct results results_11[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x08, 0x00, 0, 0x18, 0x020, TRUE, { {x19, 0x00}, {x20, 0x08}, {x21, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x0c, 0x00, 0, 0x28, 0x030, TRUE, { {x19, 0x10}, {x20, 0x18}, {x21, 0x20}, {lr, 0x28}, {-1,-1} }}, + { 0x10, 0x00, 0, 0x28, 0x030, TRUE, { {x19, 0x10}, {x20, 0x18}, {x21, 0x20}, {lr, 0x28}, {-1,-1} }}, + { 0x14, 0x00, 0, 0x18, 0x020, TRUE, { {x19, 0x00}, {x20, 0x08}, {x21, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x18, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x1c, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_12[] = + { + 0xf3, 0x53, 0xbf, 0xa9, /* 00: stp x19, x20, [sp, #-16]! */ + 0xfd, 0x7b, 0xbe, 0xa9, /* 04: stp x29, lr, [sp, #-32]! */ + 0xfd, 0x03, 0x00, 0x91, /* 08: mov x29, sp */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xbf, 0x03, 0x00, 0x91, /* 10: mov sp, x29 */ + 0xfd, 0x7b, 0xc2, 0xa8, /* 14: ldp x29, lr, [sp], #32 */ + 0xf3, 0x53, 0xc1, 0xa8, /* 18: ldp x19, x20, [sp], #16 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 1c: ret */ + }; + + static const DWORD unwind_info_12_packed = + (1 << 0) | /* Flag */ + (sizeof(function_12)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (2 << 16) | /* RegI */ + (0 << 20) | /* H */ + (3 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_12[] = { DW(unwind_info_12_packed) }; + + static const struct results results_12[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x10, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x10, 0, ORIG_LR, 0x010, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x08, 0x10, 0, 0x08, 0x030, TRUE, { {x19, 0x20}, {x20, 0x28}, {x29, 0x00}, {lr, 0x08}, {-1,-1} }}, + { 0x0c, 0x10, 0, 0x18, 0x040, TRUE, { {x19, 0x30}, {x20, 0x38}, {x29, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x10, 0x10, 0, 0x18, 0x040, TRUE, { {x19, 0x30}, {x20, 0x38}, {x29, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x14, 0x10, 0, 0x08, 0x030, TRUE, { {x19, 0x20}, {x20, 0x28}, {x29, 0x00}, {lr, 0x08}, {-1,-1} }}, + { 0x18, 0x10, 0, ORIG_LR, 0x010, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x1c, 0x10, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + static const BYTE function_13[] = + { + 0xf3, 0x53, 0xbf, 0xa9, /* 00: stp x19, x20, [sp, #-16]! */ + 0xff, 0x43, 0x08, 0xd1, /* 04: sub sp, sp, #528 */ + 0xfd, 0x7b, 0x00, 0xd1, /* 08: stp x29, lr, [sp] */ + 0xfd, 0x03, 0x00, 0x91, /* 0c: mov x29, sp */ + 0x1f, 0x20, 0x03, 0xd5, /* 10: nop */ + 0xbf, 0x03, 0x00, 0x91, /* 14: mov sp, x29 */ + 0xfd, 0x7b, 0x40, 0xa9, /* 18: ldp x29, lr, [sp] */ + 0xff, 0x43, 0x08, 0x91, /* 1c: add sp, sp, #528 */ + 0xf3, 0x53, 0xc1, 0xa8, /* 20: ldp x19, x20, [sp], #16 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 24: ret */ + }; + + static const DWORD unwind_info_13_packed = + (1 << 0) | /* Flag */ + (sizeof(function_13)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (2 << 16) | /* RegI */ + (0 << 20) | /* H */ + (3 << 21) | /* CR */ + (34 << 23); /* FrameSize */ + + static const BYTE unwind_info_13[] = { DW(unwind_info_13_packed) }; + + static const struct results results_13[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x10, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x10, 0, ORIG_LR, 0x010, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x08, 0x10, 0, ORIG_LR, 0x220, TRUE, { {x19, 0x210}, {x20, 0x218}, {-1,-1} }}, + { 0x0c, 0x10, 0, 0x08, 0x220, TRUE, { {x19, 0x210}, {x20, 0x218}, {x29, 0x00}, {lr, 0x08}, {-1,-1} }}, + { 0x10, 0x10, 0, 0x18, 0x230, TRUE, { {x19, 0x220}, {x20, 0x228}, {x29, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x14, 0x10, 0, 0x18, 0x230, TRUE, { {x19, 0x220}, {x20, 0x228}, {x29, 0x10}, {lr, 0x18}, {-1,-1} }}, + { 0x18, 0x10, 0, 0x08, 0x220, TRUE, { {x19, 0x210}, {x20, 0x218}, {x29, 0x00}, {lr, 0x08}, {-1,-1} }}, + { 0x1c, 0x10, 0, ORIG_LR, 0x220, TRUE, { {x19, 0x210}, {x20, 0x218}, {-1,-1} }}, + { 0x20, 0x10, 0, ORIG_LR, 0x010, TRUE, { {x19, 0x00}, {x20, 0x08}, {-1,-1} }}, + { 0x24, 0x10, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ @@ -4818,6 +5120,14 @@ static void test_virtual_unwind(void) TEST(function_3, unwind_info_3, 0, results_3), TEST(function_4, unwind_info_4, 0, results_4), TEST(function_5, unwind_info_5, 0, results_5), + TEST(function_6, unwind_info_6, 1, results_6), + TEST(function_7, unwind_info_7, 1, results_7), + TEST(function_8, unwind_info_8, 1, results_8), + TEST(function_9, unwind_info_9, 1, results_9), + TEST(function_10, unwind_info_10, 1, results_10), + TEST(function_11, unwind_info_11, 1, results_11), + TEST(function_12, unwind_info_12, 1, results_12), + TEST(function_13, unwind_info_13, 1, results_13), #undef TEST }; unsigned int i; -- 2.17.1

2 1

[v2 PATCH] comctl32/listview: Add Get/SetSelectedColumn() support.
by Nikolay Sivov 07 Sep '20

07 Sep '20

From: Eric Wheeler <wine(a)linux.ewheeler.net> Selected column should be using different background color, this patch does not implement this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed initial index, added some tests dlls/comctl32/listview.c | 10 ++++++--- dlls/comctl32/tests/listview.c | 37 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dba16d13a4c..e31c787c4a4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVM_GETINSERTMARKRECT * -- LVM_GETNUMBEROFWORKAREAS * -- LVM_GETOUTLINECOLOR, LVM_SETOUTLINECOLOR - * -- LVM_GETSELECTEDCOLUMN, LVM_SETSELECTEDCOLUMN * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO @@ -248,6 +247,7 @@ typedef struct tagLISTVIEW_INFO /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ BOOL colRectsDirty; /* trigger column rectangles requery from header */ + INT selected_column; /* index for LVM_SETSELECTEDCOLUMN/LVM_GETSELECTEDCOLUMN */ /* item metrics */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ @@ -9506,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->selected_column = -1; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -11465,7 +11466,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_GETOUTLINECOLOR: */ - /* case LVM_GETSELECTEDCOLUMN: */ + case LVM_GETSELECTEDCOLUMN: + return infoPtr->selected_column; case LVM_GETSELECTEDCOUNT: return LISTVIEW_GetSelectedCount(infoPtr); @@ -11638,7 +11640,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETOUTLINECOLOR: */ - /* case LVM_SETSELECTEDCOLUMN: */ + case LVM_SETSELECTEDCOLUMN: + infoPtr->selected_column = (INT)wParam; + return TRUE; case LVM_SETSELECTIONMARK: return LISTVIEW_SetSelectionMark(infoPtr, (INT)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a9b853eda85..500cc363c2d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6659,6 +6659,42 @@ static void test_item_state_change(void) } } +static void test_selected_column(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + int ret, i; + HWND hwnd; + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + hwnd = create_listview_control(styles[i]); + + /* Initial value */ + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, 100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == 100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6766,6 +6802,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_selected_column(); unload_v6_module(ctx_cookie, hCtx); -- 2.28.0

1 0

[PATCH 1/5] evr/mixer: Use same max input count symbol for GetStreamLimits().
by Nikolay Sivov 07 Sep '20

07 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d9f86a7fc91..7e08beae353 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -284,7 +284,7 @@ static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); *input_minimum = 1; - *input_maximum = 16; + *input_maximum = MAX_MIXER_INPUT_STREAMS; *output_minimum = 1; *output_maximum = 1; -- 2.28.0

1 4

[PATCH v2 2/2] user32: Fix the owned pop-up window visibility issues when its owner window is minimizing or showing.
by Haidong Yu 07 Sep '20

07 Sep '20

2 1

[PATCH v2 1/2] user32/tests: Add tests for showing and minimizing owned windows.
by Haidong Yu 07 Sep '20

07 Sep '20

2 1

[PATCH] quartz: Fix crash when pVisible is NULL.
by dongpengpeng＠uniontech.com 07 Sep '20

07 Sep '20

2 2

[PATCH] quartz: Fix crash when pVisible is NULL.
by dongpengpeng＠uniontech.com 07 Sep '20

07 Sep '20

dongpengpeng(a)uniontech.com

1 0

[PATCH] winex11.drv: Make the size of the window (with WS_THICKFRAME style) not over the minimum range when dragging.
by Chao Long 07 Sep '20

07 Sep '20

1 0

[PATCH] winex11.drv: Make the layered window set transient hint with a new x11 window if the original x11 window has destroyed.
by Chao Long 07 Sep '20

07 Sep '20

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 5).
by genchevaa4＠gmail.com 06 Sep '20

06 Sep '20

Sent from Outlook Mobile

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 5).
by genchevaa4＠gmail.com 06 Sep '20

06 Sep '20

Sent from Outlook Mobile

1 0

[PATCH] mscoree: Use exe basename to name the default domain.
by Esme Povirk 06 Sep '20

06 Sep '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e854ec2bdfa..a3ed1534753 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -298,6 +298,21 @@ fail: return E_FAIL; } +static char* get_exe_basename_utf8(void) +{ + WCHAR filenameW[MAX_PATH], *basenameW; + + GetModuleFileNameW(NULL, filenameW, MAX_PATH); + + basenameW = wcsrchr(filenameW, '\\'); + if (basenameW) + basenameW += 1; + else + basenameW = filenameW; + + return WtoA(basenameW); +} + MonoDomain* get_root_domain(void) { static MonoDomain* root_domain; @@ -309,8 +324,13 @@ MonoDomain* get_root_domain(void) if (root_domain == NULL) { - /* FIXME: Use exe filename to name the domain? */ - root_domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); + char *exe_basename; + + exe_basename = get_exe_basename_utf8(); + + root_domain = mono_jit_init_version(exe_basename, "v4.0.30319"); + + HeapFree(GetProcessHeap(), 0, exe_basename); is_mono_started = TRUE; } -- 2.17.1

1 0

[PATCH v2] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.
by Daniel Lehman 05 Sep '20

05 Sep '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: reverting to the \r -> %c thing for the wine.pot build --- dlls/wininet/http.c | 71 +++++++++++++++++++++ dlls/wininet/resource.h | 3 + dlls/wininet/tests/http.c | 127 +++++++++++++++++++++++++++++++++++++- dlls/wininet/wininet.rc | 11 ++++ 4 files changed, 210 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 220493718c3..5d10db0a308 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -54,6 +54,7 @@ #include "internet.h" #include "zlib.h" +#include "resource.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2277,6 +2278,76 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } + case INTERNET_OPTION_SECURITY_CERTIFICATE: { + DWORD err; + int needed; + char fmt[512]; + char strength[16]; + char start_date[32]; + char start_time[32]; + char expiry_date[32]; + char expiry_time[32]; + SYSTEMTIME start, expiry; + INTERNET_CERTIFICATE_INFOA info; + + if(!size) + return ERROR_INVALID_PARAMETER; + + if(!req->netconn) { + *size = 0; + return ERROR_INTERNET_INVALID_OPERATION; + } + + if(!buffer) { + *size = 1; + return ERROR_INSUFFICIENT_BUFFER; + } + + if((err = get_security_cert_struct(req, &info))) + return err; + + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + FIXME("INTERNET_OPTION_SECURITY_CERTIFICATE currently English-only\n"); + + LoadStringA(WININET_hModule, IDS_CERT_FORMAT, fmt, sizeof(fmt)); + LoadStringA(WININET_hModule, info.dwKeySize >= 128 ? IDS_CERT_HIGH : IDS_CERT_LOW, + strength, sizeof(strength)); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + needed = _scprintf(fmt, + '\r', info.lpszSubjectInfo, '\r', + '\r', info.lpszIssuerInfo, '\r', + start_date, start_time, '\r', + expiry_date, expiry_time, '\r', + '\r', '\r', '\r', + strength, info.dwKeySize); + if(needed < *size) { + err = ERROR_SUCCESS; + *size = snprintf(buffer, *size, fmt, + '\r', info.lpszSubjectInfo, '\r', + '\r', info.lpszIssuerInfo, '\r', + start_date, start_time, '\r', + expiry_date, expiry_time, '\r', + '\r', '\r', '\r', + strength, info.dwKeySize); + }else { + err = ERROR_INSUFFICIENT_BUFFER; + *size = 1; + } + + LocalFree(info.lpszSubjectInfo); + LocalFree(info.lpszIssuerInfo); + LocalFree(info.lpszProtocolName); + LocalFree(info.lpszSignatureAlgName); + LocalFree(info.lpszEncryptionAlgName); + return err; + } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 256a374af08..190d3cc397c 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -38,3 +38,6 @@ #define IDS_CERT_DATE_INVALID 0x502 #define IDS_CERT_CN_INVALID 0x503 #define IDS_CERT_ERRORS 0x504 +#define IDS_CERT_FORMAT 0x505 +#define IDS_CERT_HIGH 0x506 +#define IDS_CERT_LOW 0x507 diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c07d60d2a9d..e0a38e05c41 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6112,9 +6112,26 @@ static const cert_struct_test_t test_winehq_com_cert = { "webmaster(a)winehq.org" }; +static const char *cert_string_fmt = + "Subject:\r\n%s\r\n" + "Issuer:\r\n%s\r\n" + "Effective Date:\t%s %s\r\n" + "Expiration Date:\t%s %s\r\n" + "Security Protocol:\t%s\r\n" + "Signature Type:\t%s\r\n" + "Encryption Type:\t%s\r\n" + "Privacy Strength:\t%s (%u bits)"; + static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; + SYSTEMTIME start, expiry; + char expiry_date[32]; + char expiry_time[32]; + char start_date[32]; + char start_time[32]; + char expect[512]; + char actual[512]; DWORD size; BOOL res; @@ -6138,6 +6155,42 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded English)\n"); + release_cert_info(&info); + return; + } + + size = sizeof(actual); + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + snprintf(expect, sizeof(expect), cert_string_fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + info.lpszSignatureAlgName, info.lpszEncryptionAlgName, info.lpszProtocolName, + info.dwKeySize >= 128 ? "High" : "Low", info.dwKeySize); + ok(size == strlen(actual), "size = %u\n", size); + ok(!strcmp(actual, expect), "cert = actual\n%s\n", actual); + + --size; + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(actual[0] == 0x55, "unexpected byte: %02x\n", actual[0]); + release_cert_info(&info); } @@ -6217,7 +6270,7 @@ static void test_security_flags(void) INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; - char buf[100]; + char buf[512]; BOOL res; if (!https_support) @@ -6378,6 +6431,30 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetQueryOption failed: %d\n", GetLastError()); + + size = 0; + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + + size = 42; + SetLastError(0xdeadbeef); + memset(buf, 0x55, sizeof(buf)); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(buf[0] == 0x55, "unexpected byte: %02x\n", buf[0]); + + size = sizeof(buf); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(res && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size < sizeof(buf), "unexpected size: %u\n", size); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -6562,9 +6639,10 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags, err; + DWORD size, size2, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + char certstr1[512], certstr2[512]; BOOL ret; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -6629,6 +6707,19 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); + SetLastError(0xdeadbeef); + size = sizeof(certstr1); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr1, &size); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size2 = sizeof(certstr2); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr2, &size2); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + ok(size == size2, "expected same size\n"); + ok(!strcmp(certstr1, certstr2), "expected same string\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -7517,6 +7608,37 @@ static void test_concurrent_header_access(void) CloseHandle( wait ); } +static void test_cert_string(void) +{ + HINTERNET ses, con, req; + char actual[512]; + DWORD size; + BOOL res; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, NULL, "/", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + size = sizeof(actual); + SetLastError( 0xdeadbeef ); + memset( actual, 0x55, sizeof(actual) ); + res = InternetQueryOptionA( req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size ); + ok( !res && GetLastError() == ERROR_INTERNET_INVALID_OPERATION, + "InternetQueryOption failed: %u\n", GetLastError() ); + ok( size == 0, "unexpected size: %u\n", size ); + ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + START_TEST(http) { HMODULE hdll; @@ -7566,5 +7688,6 @@ START_TEST(http) test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); + test_cert_string(); free_events(); } diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b6e35629ca2..ede9edab09c 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -29,6 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "The date on the certificate is invalid." IDS_CERT_CN_INVALID "The name on the certificate does not match the site." IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + + IDS_CERT_FORMAT "Subject:%c\n%s%c\n" \ + "Issuer:%c\n%s%c\n" \ + "Effective Date:\t%s %s%c\n" \ + "Expiration Date:\t%s %s%c\n" \ + "Security Protocol:\t(null)%c\n" \ + "Signature Type:\t(null)%c\n" \ + "Encryption Type:\t(null)%c\n" \ + "Privacy Strength:\t%s (%u bits)" + IDS_CERT_HIGH "High" + IDS_CERT_LOW "Low" } IDD_PROXYDLG DIALOG 36, 24, 220, 146 -- 2.25.1

3 6

[PATCH v2 1/2] kernel32/tests: Add new test for passing NULL filename argument.
by Carlos Rivera 05 Sep '20

05 Sep '20

In Windows, when invoked with filename = NULL, these functions: WritePrivateProfileStringW, WritePrivateProfileSectionW, GetPrivateProfileSectionNamesW, GetPrivateProfileStringW Behave as if filename is "win.ini". Then if a map to "win.ini" (and the section if applicable) exists in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\IniFileMapping it gets used. Since in a freshly installed Wine and Windows a map to "win.ini" exists this test only verifies that default mapping behavior. It does not verify actual writting/reading to C:\windows\win.ini. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- v2: fixed broken tests, fixed the wording of the commit. dlls/kernel32/tests/profile.c | 93 +++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index f981558548..b7d239043b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1588,6 +1588,98 @@ static void test_registry_mapping(void) ok(ret, "got error %u\n", GetLastError()); } +static void test_null_filename(void) +{ + /* Some profile functions assume filename is win.ini if filename is passed as NULL + then if a map for win.ini exists in IniFileMapping they use it */ + + HKEY mapping_key, mapped_key; + char buffer[1024]; + char* p; + int found = 0; + LSTATUS ret; + + if (GetFileAttributesA("C:/windows/win.ini") != INVALID_FILE_ATTRIBUTES) + { + ret = MoveFileA("C:/windows/win.ini", "C:/windows/winini.bak"); + + if (!ret) + { + skip("Failed to move C:/windows/win.ini out of the way to prevent possibly destructive tests.\n"); + return; + } + } + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\IniFileMapping\\win.ini", + 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, &mapping_key); + + if (ret) + { + skip("Failed to find a win.ini IniFileMapping registry entry\n"); + return; + } + + ret = RegSetValueExA(mapping_key, "section1", 0, REG_SZ, (BYTE *)"USR:section1_map", sizeof("USR:section1_map")); + ok(!ret, "got error %u\n", ret); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "win.ini"); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("section1", "name1", "42", NULL); + ok(ret, "got error %u\n", ret); + + ret = DeleteFileA("C:/windows/win.ini"); + ok(!ret, "expected failure\n"); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, "section1_map", 0, KEY_READ | KEY_WRITE, &mapped_key); + check_registry_value(mapped_key, "name1", "42"); + + check_profile_string("section1", "name1", NULL, "42"); + + memset(buffer, 0xc, sizeof(buffer)); + ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), NULL); + ok(ret, "got error %u\n", ret); + + if (ret) + { + p = buffer; + while (p < (buffer + sizeof(buffer) - 1)) + { + int len = sizeof(buffer) - (p - buffer); + + if (!strncmp("section1", p, len)) + { + found = 1; + break; + } + while (*p++ && p < (buffer + sizeof(buffer) - 1)); + } + } + + ok(found, + "Expected \"section1\" in buffer, but buffer is %s\n", + debugstr_an(buffer, (ret + 2 >= sizeof(buffer) ? sizeof(buffer) : ret + 1))); + + ret = WritePrivateProfileSectionA("section1", "name2=mango\0", NULL); + ok(ret, "got error %u\n", ret); + + check_registry_value(mapped_key, "name2", "mango"); + + ret = DeleteFileA("C:/windows/win.ini"); + ok(!ret, "expected failure\n"); + + MoveFileA("C:/windows/winini.bak", "C:/windows/win.ini"); + + ret = RegDeleteValueA(mapping_key, "section1"); + ok(!ret, "got error %u\n", ret); + + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "section1_map"); + ok(!ret, "got error %u\n", ret); + + RegCloseKey(mapped_key); + RegCloseKey(mapping_key); +}; + START_TEST(profile) { test_profile_int(); @@ -1617,4 +1709,5 @@ START_TEST(profile) test_WritePrivateProfileString(); test_profile_struct(); test_registry_mapping(); + test_null_filename(); } -- 2.28.0

2 3

[PATCH 1/2] kernel32/tests: Add new test of behavior when passing NULL filename.
by Carlos Rivera 05 Sep '20

05 Sep '20

In Windows, when invoked with filename = NULL, these functions: WritePrivateProfileStringW, WritePrivateProfileSectionW, GetPrivateProfileSectionNamesW, GetPrivateProfileStringW Behave as if filename is "win.ini" If the corresponding map exists in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\IniFileMapping then this map gets used. Since in freshly installed Wine and Windows 10 such a map exists this tests only verifies that behavior. It does not verify actual writting/reading to C:\windows\win.ini. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- This IniFileMapping does not actually happen in Wine, which at least in the case of GetPrivateProfileStringW just tries to read from C:\windows\win.ini This explains the failure in Wine of the first test in function test_profile_int (get 70, expected 0), where there is an invokation like this: GetPrivateProfileIntA(NULL, NULL, 70, NULL) And which ends up calling GetPrivateProfileStringW which because the first parameters are NULL invoke GetPrivateProfileSectionNamesW. It then gets the section names from win.ini. In wine, the IniFileMapping is ignored and if there is no win.ini file, it returns a 0 and the default value 70 ends up being returned to the user. If one creates a C:\win.ini file with just one section like: [hello] Then it gets the section name, and when trying to convert it into a integer it gets converted to 0. The test passes. Thanks to zf in #winehackers for the tip that this bug had something to do with the presence of win.ini. Interestinly enough, if one names the section something like: [42] Then test fails with a value of 42 instead of the expected 0! This behavior is the same in Windows except that it uses the entries in IniFileMapping. If the mapping is removed the file is used as in Wine. My next commit will make Wine to make use of the IniFileMapping too when filename=NULL-->win.ini, as in Windows. --- dlls/kernel32/tests/Makefile.in | 2 +- dlls/kernel32/tests/profile.c | 92 +++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce..04c44e208a 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = kernel32.dll -IMPORTS = user32 advapi32 +IMPORTS = user32 advapi32 kernelbase SOURCES = \ actctx.c \ diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index f981558548..9d89009e46 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "windows.h" +#include "shlwapi.h" #include "sddl.h" #define KEY "ProfileInt" @@ -1588,6 +1589,96 @@ static void test_registry_mapping(void) ok(ret, "got error %u\n", GetLastError()); } +static void test_null_filename(void) +{ + /* Some profile functions assume filename is win.ini if NULL is given + and if such a map exists in IniFileMapping then they use it */ + + HKEY mapping_key, mapped_key; + char buffer[1024]; + char* p; + int found = 0; + LSTATUS ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\IniFileMapping\\win.ini", + 0, KEY_READ | KEY_WRITE, &mapping_key); + + if(ret) + { + skip("Failed to find a win.ini IniFileMapping registry entry\n"); + return; + } + + if (PathFileExistsA("C:/windows/win.ini")) + { + ret = MoveFileA("C:/windows/win.ini", "C:/windows/winini.bak"); + + if (!ret) + { + skip("Failed to move C:/windows/win.ini out of the way to prevent possibly destructive tests.\n"); + return; + } + } + + ret = RegSetValueExA(mapping_key, "section1", 0, REG_SZ, (BYTE *)"USR:section1_map", sizeof("USR:section1_map")); + ok(!ret, "got error %u\n", ret); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "win.ini"); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("section1", "name1", "42", NULL); + ok(ret, "got error %u\n", ret); + + ret = DeleteFileA("C:/windows/win.ini"); + ok(!ret, "expected failure\n"); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, "section1_map", 0, KEY_READ | KEY_WRITE, &mapped_key); + check_registry_value(mapped_key, "name1", "42"); + + check_profile_string("section1", "name1", NULL, "42"); + + memset(buffer, 0xc, sizeof(buffer)); + ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), NULL); + ok(ret, "got error %u\n", ret); + + if (ret) + { + p = buffer; + while (p < (buffer + sizeof(buffer) - 1)) + { + if (!strncmp("section1", p, sizeof(buffer))) + { + found = 1; + break; + } + while (*p++ && p < (buffer + sizeof(buffer) - 1)); + } + } + + ok(found, + "Expected \"section1\" in buffer, but buffer is %s\n", + debugstr_an(buffer, (ret + 2 >= sizeof(buffer) ? sizeof(buffer) : ret + 1))); + + ret = WritePrivateProfileSectionA("section1", "name2=mango\0", NULL); + ok(ret, "got error %u\n", ret); + + check_registry_value(mapped_key, "name2", "mango"); + + ret = DeleteFileA("C:/windows/win.ini"); + ok(!ret, "expected failure\n"); + + MoveFileA("C:/windows/winini.bak", "C:/windows/win.ini"); + + ret = RegDeleteValueA(mapping_key, "section1"); + ok(!ret, "got error %u\n", ret); + + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "section1_map"); + ok(!ret, "got error %u\n", ret); + + RegCloseKey(mapped_key); + RegCloseKey(mapping_key); +}; + START_TEST(profile) { test_profile_int(); @@ -1617,4 +1708,5 @@ START_TEST(profile) test_WritePrivateProfileString(); test_profile_struct(); test_registry_mapping(); + test_null_filename(); } -- 2.28.0

3 6

[PATCH] msvcirt: Implement _mtlock() and _mtunlock().
by Arkadiusz Hiler 05 Sep '20

05 Sep '20

Looks like they are just cdecl wrappers around stdcall EnterCriticalSection() and LeaveCriticalSection(). The game TRON 2.0 was crashing on the stubs. Now it makes it a bit further. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 12 +++++++++ dlls/msvcirt/msvcirt.spec | 4 +-- dlls/msvcirt/tests/msvcirt.c | 49 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 +-- dlls/msvcrt40/msvcrt40.spec | 4 +-- 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..eaeca639db2 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4674,6 +4674,18 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); +void __cdecl _mtlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + EnterCriticalSection(crit); +} + +void __cdecl _mtunlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + LeaveCriticalSection(crit); +} + static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 75ae312b486..77a8f9477ef 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -786,5 +786,5 @@ @ thiscall -arch=win32 ?xsputn@streambuf@@UAEHPBDH@Z(ptr ptr long) streambuf_xsputn @ cdecl -arch=win64 ?xsputn@streambuf@@UEAAHPEBDH@Z(ptr ptr long) streambuf_xsputn @ stub __dummy_export -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) +@ cdecl _mtunlock(ptr) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4f9f859a861..2b12922ed30 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -446,6 +446,10 @@ static const char* (*__thiscall p_exception_what)(exception*); static logic_error* (*__thiscall p_logic_error_ctor)(logic_error*, const char**); static void (*__thiscall p_logic_error_dtor)(logic_error*); +/* locking */ +static void (*__cdecl p__mtlock)(CRITICAL_SECTION *); +static void (*__cdecl p__mtunlock)(CRITICAL_SECTION *); + /* Predefined streams */ static istream *p_cin; static ostream *p_cout, *p_cerr, *p_clog; @@ -1002,6 +1006,9 @@ static BOOL init(void) SET(p_cerr, "?cerr@@3Vostream_withassign@@A"); SET(p_clog, "?clog@@3Vostream_withassign@@A"); + SET(p__mtlock, "_mtlock"); + SET(p__mtunlock, "_mtunlock"); + init_thiscall_thunk(); return TRUE; } @@ -7767,6 +7774,47 @@ static void test_exception(void) call_func1(p_logic_error_dtor, (void*) &le); } +static DWORD WINAPI _try_enter_critical(void *crit) +{ + BOOL ret = TryEnterCriticalSection(crit); + + if (ret) + LeaveCriticalSection(crit); + + return ret; +} + +static void test_mtlock_mtunlock(void) +{ + CRITICAL_SECTION crit; + HANDLE thread; + DWORD exit_code, ret; + + InitializeCriticalSection(&crit); + + p__mtlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == FALSE, "the thread entered critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); + + p__mtunlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == TRUE, "the thread was not able to enter critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); +} + START_TEST(msvcirt) { if(!init()) @@ -7794,6 +7842,7 @@ START_TEST(msvcirt) test_Iostream_init(); test_std_streams(); test_exception(); + test_mtlock_mtunlock(); FreeLibrary(msvcrt); FreeLibrary(msvcirt); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 96c6c681478..4728cd21aa2 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1072,8 +1072,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 6a2c9a7e52e..586de93b020 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1163,8 +1163,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open -- 2.28.0

2 1

[PATCH] qcap/avimux: Pass the correct field to CONTAINING_RECORD in impl_sink_from_strmbase_pin().
by Zebediah Figura 04 Sep '20

04 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ea73e420404..3f4d0f2cd6e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1257,7 +1257,7 @@ static const IQualityControlVtbl AviMuxOut_QualityControlVtbl = { static inline AviMuxIn *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) { - return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); + return CONTAINING_RECORD(iface, AviMuxIn, pin.pin); } static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) -- 2.28.0

1 0

Would someone please fill me in on direction for loader code?
by Jefferson Carpenter 04 Sep '20

04 Sep '20

When I write patches touching the loader code (including process and thread initialization and startup), it would be useful to know the overall plans for that area. Generally I'm asking about ntdll. What is the team's overall direction for that area of code? Is it as simple as "it just has to work"? Are there things about how it works that aren't expressed in code but have to be preserved? Or do you have plans for how you're intending to change it in the future? Thanks, Jefferson

2 2

[PATCH] ntdll: Decouple pthread stack and win32 stack.
by Jefferson Carpenter 04 Sep '20

04 Sep '20

Is there any particular reason to place the pthread stack adjacent to the win32 stack? If the pthread stack happened to extend past PTHREAD_STACK_MIN while the win32 thread was started, writes to the win32 stack (such as the initial CONTEXT) would overwrite the pthread stack. -Jefferson

2 2

[RFC PATCH] advapi32: Use Windows APIs to read /dev/urandom.
by Hans Leidekker 04 Sep '20

04 Sep '20

This will cause a performance regression. SystemFunction036 (RtlGenRandom) is already an order of magnitude slower than native because it opens and closes /dev/urandom on every call. Going through wineserver makes it 2 orders of magnitude slower: int buf[4], i; for (i = 0; i < 100000; i++) RtlGenRandom(buf, sizeof(buf)); Windows: 16 ticks Wine/open(): 209 ticks Wine/NtCreateFile(): 3612 ticks Wine/NtCreateFile()/cached: 96 ticks We could cache the file handle to mitigate that, but then there's the risk that an application accidentally closes the handle. Ideally we'd implement this with getrandom() on Linux. We probably don't want to split advapi32 just for this, so maybe a private ntdll export is justified here? --- dlls/advapi32/crypt.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 7199795b475..53e911820b0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2436,26 +2436,36 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) * Failure: FALSE */ -BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) +BOOLEAN WINAPI SystemFunction036(void *buffer, ULONG len) { - int dev_random; - - dev_random = open("/dev/urandom", O_RDONLY); - if (dev_random != -1) + static const WCHAR urandomW[] = + {'\\','?','?','\\','u','n','i','x','\\','/','d','e','v','/','u','r','a','n','d','o','m',0}; + UNICODE_STRING filename; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + HANDLE handle; + + RtlInitUnicodeString(&filename, urandomW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = 0; + attr.ObjectName = &filename; + attr.SecurityDescriptor = NULL; + if (NtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_OPEN, 0, NULL, 0)) { - if (read(dev_random, pbBuffer, dwLen) == (ssize_t)dwLen) - { - close(dev_random); - return TRUE; - } - close(dev_random); - } - else FIXME("couldn't open /dev/urandom\n"); + SetLastError(NTE_FAIL); + return FALSE; + } + + if (!NtReadFile(handle, 0, NULL, NULL, &io, buffer, len, NULL, NULL) && io.Information == len) + return TRUE; + SetLastError(NTE_FAIL); return FALSE; -} - +} + /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, in crypt32.dll. -- 2.20.1

6 8

[PATCH 1/7] gdi32/tests: Test extended TTF font names and collisions.
by Rémi Bernon 04 Sep '20

04 Sep '20

This shows that although Windows is only matching family names up to LF_FACESIZE chars, and that it doesn't match against the preferred / typographic family names and styles, it still keeps the faces separate when the full names don't match. Wine incorrectly discard one of them. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This "bug fix" is mostly an excuse to begin cleaning up the code. I'm planning on refactoring things a bit to improve process startup time. dlls/gdi32/tests/font.c | 71 ++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 6 ++ dlls/gdi32/tests/wine_ttfnames.sfd | 85 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames.ttf | Bin 0 -> 2232 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 85 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 0 -> 2272 bytes 6 files changed, 247 insertions(+) create mode 100644 dlls/gdi32/tests/wine_ttfnames.sfd create mode 100644 dlls/gdi32/tests/wine_ttfnames.ttf create mode 100644 dlls/gdi32/tests/wine_ttfnames_bold.sfd create mode 100644 dlls/gdi32/tests/wine_ttfnames_bold.ttf diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad894dfdcad..b1848a43743 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6940,6 +6940,76 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +static void test_ttf_names(void) +{ + struct enum_fullname_data efnd; + char ttf_name[MAX_PATH], ttf_name_bold[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_ttfnames.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + if (!write_ttf_file("wine_ttfnames_bold.ttf", ttf_name_bold)) + { + skip("Failed to create ttf file for testing\n"); + DeleteFileA(ttf_name); + return; + } + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + ret = AddFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + dc = GetDC(NULL); + + strcpy(font.lfFaceName, "Wine_TTF_Names_Long_Family1_Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + /* Windows doesn't match with Typographic/Preferred Family tags */ + strcpy(font.lfFaceName, "Wine TTF Names Long Family1"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Ext"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + todo_wine + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name_bold); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + typedef struct { USHORT majorVersion; @@ -7351,6 +7421,7 @@ START_TEST(font) test_bitmap_font_glyph_index(); test_GetCharWidthI(); test_long_names(); + test_ttf_names(); test_char_width(); /* These tests should be last test until RemoveFontResource diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index 6dcbd42ab52..b5a6107a987 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -31,3 +31,9 @@ vertical.ttf RCDATA vertical.ttf /* @makedep: wine_longname.ttf */ wine_longname.ttf RCDATA wine_longname.ttf + +/* @makedep: wine_ttfnames.ttf */ +wine_ttfnames.ttf RCDATA wine_ttfnames.ttf + +/* @makedep: wine_ttfnames_bold.ttf */ +wine_ttfnames_bold.ttf RCDATA wine_ttfnames_bold.ttf diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd new file mode 100644 index 00000000000..566749d19a7 --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1598865292 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 Cond" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Regular" \ + +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2eb2ad1f95e7bb384abe41bcf68f64da320fefb9 GIT binary patch literal 2232 zcmdT`O>7%Q6#iy+?W8oKb_J*AFt|aaC_ft;MWu?6mDHvOQ>qXpJyhK+$@)jKcdfM( zVhN-kdqAQW1eFk%-YVsgs22{1142S57eGR&px#j_Js>zi%{SwT?exH(xG>i2eDBSB zZ{FX|8UnzRxCR^R#p22<Z-00-0!BX|cl_n^g(9BDQ>3pc`qkHFv#SaJ4M0>$uWvN` zCQc;plm3=-abvqJk+H4=_Bi*Qir;E>yR?ka9nzzfdZ+x^-oDHIDbmeq;BTJ%;nphg zkDT*WG7`s}1Z_=_o~Sn3J7W;flKz}@svd3lcpWR$m!zL)_&ZHpz>D0!Kw5@=BY3zw z(d9n<cXpdmtKGeac^+Nj{_{|=a(=ygx$B)+_yxxuGJtPhcz8>#-^I-_WB|*uZj&5^ zrMMi_(VQzidCSt4dV9U6qd87rM`;Sp%VS21I25@7#%A5L4#;_@w~G77iDTp<!KWF@ z&;GbnE^M+sdF1U}H-{_Q6YW!9L_*Lrdd{fz6wJBGyPo65+XYg}@;HSgSBF1E=UF5D z?0#w_A(Ddwgo;JY;c>*n;f(=S$N$fV?q&9k`kiGgmddfnvH~_nFtaBxyRbjv;6ZjT znfQKT-?j*`XDfC>vG+%k;<tr;rtm>FmwqPwTrPb&BT_#d99Xx1U(Hx$niIAtvE$xX zIToi#emNsbqV(vFO5RD_JFE$2v2L(n{k}5T!U(I~tA~yA;$4FsykuQAIDwS)k-<q! z^6l)&r*O)C%iuK9_Q$G29My+cIeS<jj~fPCyeWP**v55n++YW9in|6UAg%WdPU4dF zg~2Jz+XaKu$k;crga}P^5Tk|)s%SH+No?Q@*DPE;r-+vkpg|dlMWPrX^+Hl*t}$0- zXOlZ?oIbX-Obb|wnw_{-skY_h#u=G)v+k5!4jMJN7{p-|%5oITrD!u)3;gXMrotM} z2&pZ3!>pjl^&;&x$Y~Lm^r;o1qUP36r|)y5)%hVkz*;Q~<jP7>UgSm8lBFoD$fDn< z)jM-MDWrr7rGhQ0`g9%3L1nA%6BM<Hwq9dOC?~SKI9#shI1gR(jBDPIYhK?q?=jcB zzH8oNC-<!8=>9Ytd%B-)6r-?RjN(clvoo$dCsjxuL-KS;o(jn`A$ck!&xAnH+}!lp zX_e-GpUDDt*ab1eS6Ns2J(_owxH@@<bs6M7U<F##`HLzPcG_{!2<jbEoUM9Y7fY8X z2wMU5S7|1uv6`-lWDQ*AN!3FABn8+lH8zmz&ds>4OU{2?9^FZQC+&ly|5?-iS*!BR zF%3OPYVRc+>ReTOoiDypriXcBn6E_l4sxUf=h5Mi6qGux*@EAl!IyN5|1;FSvY|A4 Q+WL9-*GHcyjp6U~A6<%D%m4rY literal 0 HcmV?d00001 diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd new file mode 100644 index 00000000000..b3bf4ddfe90 --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1598865292 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 CondBold" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed Bold" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Bold Regular" \ + +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..919a5ea1310dd95904d882afb56b95aaf94dc9be GIT binary patch literal 2272 zcmdT`O>7%Q6#iy+?W7Qqq~hn$9ELQA6eZ5aMxj(bL`h?M2yGRj<WhCB#2eevde>Sz zA-)v}p&pRvjUpj_)C<ZjR_+`Ci9;?(2v9*iAc0i1g%g~h=9}@vPAY^7;=)+7?|X0F zn|Xh`V+a6`;R<Z56$;BQzxDp*80i0u(vg?WE)?(t9w+~?;xD{1m0d~suK}V=er>(# z*D#pAL;hRNx%I7v#He)@ut&J=l>B<F-R92d|B!rtDQs?hzT0xSK0&@#4*cTr+c#E- z?{dzRDM%f2Qrv5d{8+i#*dBm*hWr=ghr)Q>$E#STy(Irg)!(k+9A4!5Ir1{{tHC>& z*AuS4$K$`L#q~z}7G`*KgX_;h#mf1{&IcE~!Thgy)S&?Q`uSgODEeJe8^9=FS=J8O zeppJ%K^rZ()X}#ry;Enc^K`Vt>Dnkup=GnkXcdPl*TC4UcddO&-tJIw2RU(!Ql$7a zL;2Yq7dIA)xPn>C+PQWPm$WC^r>=^Gpl9@)QR^v~bCq{JM~t_5a%$%hDoIj@KgG|o zM*7+Q)M!Gadj|*=i<*bW5f2Y9^sqYqe?D|Cvv1VzG-I(;jzyLgu+fLiuE12j)#u<| zb~l~+KHst}LhRZ~oKoUeUt0X0Z!v}Uvbo`>ho8+2pBxoKKkx5bJAbT<S{vL>*kX|# zcU|RJoFMyUMl6cO`+F*R$8qbRCYZvS!2)BrX|RPpF=()jv*IIz9n4#i!6^(`Um2Xn zxc!2`LpWhyH+UFN+CQicaa12(=Img>H|(0h7QYngeO5X)u8OA&cJQY7$>0>E)iOAZ zi`I_@4`Ie$Gk6#i_8#UDqlP9DR8T@04R+-?)^Un73s=tx;w1#AQb%HrC_zNKh};Hg zLaO#Da%Gj%$ClQq1M_jMnN&*Uh8$l%C9`hUosdgGwIb(&B#I-s5hrp!E(WWCzZE1j zSmhZJttG!O%P5eZ=YCa6>cors)DlraODhQJ`!soVenb!ENJCPrR-!;IFBjx_evs;N zF^)>I;8!bQbDAec#kn}7mI|wcO`7-&14}_^GxP}xdb@_E2{n{MS$;%Z(leX~ZhFQ| z?~t2b*G=yMH@&W#-UBChcFi%ANjCXpH}xpQQKJwir9fsgt~?`ESRTXjbXcAW%QInl zDlE^0K-Jvz<mpM3@_(Pz1#Gh;5{9oTpmKe*1}bqOWd}9t)gfRt>a;0x^`UCAu-!<4 zY7jO}sW!t<mrfTei0VO6c1pIwT@&tI(It{BiOaO9(x{&VR@g`t_Ll2TXI$5%<iD<# zZmx%^LhtB**3W;}y?m)mum4q!J8$ZtmR3#COCMi8)8PlVNqY}DerE*d(V;FeL9LTo gEO<ZlZrlO>A5rV-MpBj?YyG_W+x<_J#o_z>Pvq`pzyJUM literal 0 HcmV?d00001 -- 2.28.0

2 7

[PATCH] gdiplus: Make gdi_alpha_blend fallback to StretchBlt if current Compositing Mode is SourceCopy.
by Jiajin Cui 04 Sep '20

04 Sep '20

2 1

[PATCH v2] msvcirt: Be more obvious in out-of-memory situations.
by Arkadiusz Hiler 04 Sep '20

04 Sep '20

Just like in the new ifstream, if we are out of memory it's better to fail loudly with an obvious FIXME message than to leave user with half-initialized object causing ephemeral issues that are hard to debug. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v2: style consistency - inline curly brackets with if statements dlls/msvcirt/msvcirt.c | 81 ++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..959322bdc86 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3012,11 +3012,15 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if (mode & (OPENMODE_app|OPENMODE_ate)) - ssb->base.pptr = buffer + strlen(buffer); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + if (mode & (OPENMODE_app|OPENMODE_ate)) + ssb->base.pptr = buffer + strlen(buffer); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -3029,8 +3033,13 @@ ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) - strstreambuf_ctor(ssb); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_ctor(ssb); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -4069,11 +4078,14 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, NULL); - istream_sb_ctor(this, &ssb->base, virt_init); - } else - istream_ctor(this, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_buffer_ctor(ssb, buffer, length, NULL); + istream_sb_ctor(this, &ssb->base, virt_init); + base = istream_get_ios(this); base->vtable = &MSVCP_istrstream_vtable; base->delbuf = 1; @@ -4125,8 +4137,7 @@ istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffe TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4151,8 +4162,7 @@ istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) TRACE("(%p %d %d)\n", this, fd, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4177,8 +4187,7 @@ istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4470,13 +4479,17 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) - ssb->base.pptr = buffer + strlen(buffer); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + + if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) + ssb->base.pptr = buffer + strlen(buffer); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ??0strstream@@QAE@XZ */ @@ -4488,11 +4501,14 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) { - strstreambuf_ctor(ssb); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_ctor(ssb); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ?pcount@strstream@@QBEHXZ */ @@ -4537,11 +4553,14 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt TRACE("(%p %p %d)\n", this, file, virt_init); - if (stb) { - stdiobuf_file_ctor(stb, file); - return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); + if (!stb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_stdiostream_vtable, virt_init); + + stdiobuf_file_ctor(stb, file); + + return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); } /* ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ */ -- 2.28.0

4 4

[PATCH vkd3d 4/4] vkd3d-shader: Use proper variables for epilogue arguments.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5781ce18..999abd68 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6877,14 +6877,22 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxb { if (compiler->private_output_variable[i]) { + uint32_t argument_id = compiler->private_output_variable[i]; unsigned int argument_idx = count++; - arguments[argument_idx] = compiler->private_output_variable[i]; if (compiler->private_output_variable_array_idx[i]) { - arguments[argument_idx] = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - arguments[argument_idx], compiler->private_output_variable_array_idx[i]); + uint32_t tmp_id; + + tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + argument_id, compiler->private_output_variable_array_idx[i]); + tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); + argument_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); } + + arguments[argument_idx] = argument_id; } } -- 2.11.0

1 0

[PATCH vkd3d 3/4] vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins.
by Henri Verbeet 04 Sep '20

04 Sep '20

We need these to be per-vertex. This fixes the Wine d3d11 test_clip_distance() test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 78cfd2ae..5781ce18 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4977,9 +4977,11 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp } if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + { vkd3d_spirv_builder_begin_main_function(builder); - vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + } } static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) -- 2.11.0

1 0

[PATCH vkd3d 2/4] vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb251a45..78cfd2ae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3559,6 +3559,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInSampleId: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); break; + case SpvBuiltInClipDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityClipDistance); + break; + case SpvBuiltInCullDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); + break; default: break; } -- 2.11.0

1 0

[PATCH vkd3d 1/4] vkd3d-shader: Add some TRACEs.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e3abaf7c..3c2de057 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -294,6 +294,8 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ void vkd3d_shader_free_messages(char *messages) { + TRACE("messages %p.\n", messages); + vkd3d_free(messages); } @@ -912,11 +914,15 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { + TRACE("scan_descriptor_info %p.\n", scan_descriptor_info); + vkd3d_free(scan_descriptor_info->descriptors); } void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { + TRACE("shader_code %p.\n", shader_code); + vkd3d_free((void *)shader_code->code); } @@ -956,6 +962,8 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_sign void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) { + TRACE("desc %p.\n", desc); + if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) { vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); -- 2.11.0

1 0

[PATCH vkd3d v2 5/5] include: Document vkd3d_shader_signature.
by Zebediah Figura 04 Sep '20

04 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix copy/paste error include/vkd3d_shader.h | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2a2c960a..37525404 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -962,29 +962,50 @@ struct vkd3d_shader_scan_descriptor_info unsigned int descriptor_count; }; +/** + * Data type of a shader varying, returned as part of struct + * vkd3d_shader_signature_element. + */ enum vkd3d_shader_component_type { + /** The varying has no type. */ VKD3D_SHADER_COMPONENT_VOID = 0x0, + /** 32-bit unsigned integer. */ VKD3D_SHADER_COMPONENT_UINT = 0x1, + /** 32-bit signed integer. */ VKD3D_SHADER_COMPONENT_INT = 0x2, + /** 32-bit IEEE floating-point. */ VKD3D_SHADER_COMPONENT_FLOAT = 0x3, + /** Boolean. */ VKD3D_SHADER_COMPONENT_BOOL = 0x4, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE), }; +/** System value semantic, returned as part of struct vkd3d_shader_signature. */ enum vkd3d_shader_sysval_semantic { + /** No system value. */ VKD3D_SHADER_SV_NONE = 0x00, + /** Vertex position; SV_Position in Direct3D. */ VKD3D_SHADER_SV_POSITION = 0x01, + /** Clip distance; SV_ClipDistance in Direct3D. */ VKD3D_SHADER_SV_CLIP_DISTANCE = 0x02, + /** Cull distance; SV_CullDistance in Direct3D. */ VKD3D_SHADER_SV_CULL_DISTANCE = 0x03, + /** Render target layer; SV_RenderTargetArrayIndex in Direct3D. */ VKD3D_SHADER_SV_RENDER_TARGET_ARRAY_INDEX = 0x04, + /** Viewport index; SV_ViewportArrayIndex in Direct3D. */ VKD3D_SHADER_SV_VIEWPORT_ARRAY_INDEX = 0x05, + /** Vertex ID; SV_VertexID in Direct3D. */ VKD3D_SHADER_SV_VERTEX_ID = 0x06, + /** Primtive ID; SV_PrimitiveID in Direct3D. */ VKD3D_SHADER_SV_PRIMITIVE_ID = 0x07, + /** Instance ID; SV_InstanceID in Direct3D. */ VKD3D_SHADER_SV_INSTANCE_ID = 0x08, + /** Whether the triangle is front-facing; SV_IsFrontFace in Direct3D. */ VKD3D_SHADER_SV_IS_FRONT_FACE = 0x09, + /** Sample index; SV_SampleIndex in Direct3D. */ VKD3D_SHADER_SV_SAMPLE_INDEX = 0x0a, VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE = 0x0b, VKD3D_SHADER_SV_TESS_FACTOR_QUADINT = 0x0c, @@ -996,32 +1017,66 @@ enum vkd3d_shader_sysval_semantic VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), }; +/** + * Minimum interpolation precision of a shader varying, returned as part of + * struct vkd3d_shader_signature_element. + */ enum vkd3d_shader_minimum_precision { VKD3D_SHADER_MINIMUM_PRECISION_NONE = 0, + /** 16-bit floating-point. */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, + /** 10-bit fixed point (2 integer and 8 fractional bits). */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + /** 16-bit signed integer. */ VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, + /** 16-bit unsigned integer. */ VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_MINIMUM_PRECISION), }; +/** + * A single shader varying, returned as part of struct vkd3d_shader_signature. + */ struct vkd3d_shader_signature_element { + /** Semantic name. */ const char *semantic_name; + /** Semantic index, or 0 if the semantic is not indexed. */ unsigned int semantic_index; + /** + * Stream index of a geometry shader output semantic. If the signature is + * not a geometry shader output signature, this field will be set to 0. + */ unsigned int stream_index; + /** + * System value semantic. If the varying is not a system value, this field + * will be set to VKD3D_SHADER_SV_NONE. + */ enum vkd3d_shader_sysval_semantic sysval_semantic; + /** Data type. */ enum vkd3d_shader_component_type component_type; + /** Register index. */ unsigned int register_index; + /** Register mask. */ unsigned int mask; + /** Minimum interpolation precision. */ enum vkd3d_shader_minimum_precision min_precision; }; +/** + * Description of a shader input or output signature. This structure is + * populated by vkd3d_shader_parse_input_signature(). + * + * The helper function vkd3d_shader_find_signature_element() will look up a + * varying element by its semantic name, semantic index, and stream index. + */ struct vkd3d_shader_signature { + /** Pointer to an array of varyings. */ struct vkd3d_shader_signature_element *elements; + /** Size, in elements, of \ref elements. */ unsigned int element_count; }; -- 2.28.0

2 1

[PATCH] evr: Create and initialize mixer transform attributes.
by Nikolay Sivov 04 Sep '20

04 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 28 +++++++++++++++++++++++----- dlls/evr/tests/evr.c | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d92bb6c1704..d9f86a7fc91 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -70,11 +70,9 @@ struct video_mixer struct output_stream output; COLORREF bkgnd_color; - IDirect3DDeviceManager9 *device_manager; - IMediaEventSink *event_sink; - + IMFAttributes *attributes; CRITICAL_SECTION cs; }; @@ -246,6 +244,8 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) video_mixer_clear_types(mixer); if (mixer->device_manager) IDirect3DDeviceManager9_Release(mixer->device_manager); + if (mixer->attributes) + IMFAttributes_Release(mixer->attributes); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -360,9 +360,17 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStreamInfo(IMFTransform *if static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { - FIXME("%p, %p.\n", iface, attributes); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, attributes); + + if (!attributes) + return E_POINTER; + + *attributes = mixer->attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, @@ -1317,6 +1325,8 @@ HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID ri HRESULT evr_mixer_create(IUnknown *outer, void **out) { struct video_mixer *object; + MFVideoNormalizedRect rect; + HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1335,6 +1345,14 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->input_count = 1; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + IMFAttributes_SetBlob(object->attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&rect, sizeof(rect)); *out = &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a5d80df416..ba97eba53d1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -419,6 +419,7 @@ static void test_default_mixer(void) DWORD input_count, output_count; IMFVideoProcessor *processor; IMFVideoDeviceID *deviceid; + MFVideoNormalizedRect rect; DWORD input_id, output_id; IMFTransform *transform; DXVA2_ValueRange range; @@ -508,6 +509,29 @@ todo_wine hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetAttributes(transform, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes == attributes2, "Unexpected attributes instance.\n"); + IMFAttributes_Release(attributes2); + + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + memset(&rect, 0, sizeof(rect)); + hr = IMFAttributes_GetBlob(attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&rect, sizeof(rect), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rect.left == 0.0f && rect.top == 0.0f && rect.right == 1.0f && rect.bottom == 1.0f, + "Unexpected zoom rect (%f, %f) - (%f, %f).\n", rect.left, rect.top, rect.right, rect.bottom); + + IMFAttributes_Release(attributes); + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 0

[PATCH 2/2] ddraw: Report correct frequency in GetDisplayMode().
by Zhiyi Zhang 04 Sep '20

04 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 2 -- dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7545e5c82c..c3c335d978e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; - DDSD->u2.dwRefreshRate = 60; + DDSD->u2.dwRefreshRate = mode.refresh_rate; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6f0948bbaba..2fac4d4b0ba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13865,7 +13865,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index abcd2010b23..6b584798539 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14763,7 +14763,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -14796,7 +14795,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 071acbacedc..d438132764f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17824,7 +17824,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -17857,7 +17856,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0f87d46ec09..288624728f2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18086,7 +18086,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -18119,7 +18118,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, -- 2.25.1

3 2

[PATCH 1/2] ddraw/tests: Add display mode frequency tests.
by Zhiyi Zhang 04 Sep '20

04 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 41 +++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 85 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 85 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 85 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 293 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 532065a4796..6f0948bbaba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13837,7 +13837,48 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + DEVMODEW devmode; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + IDirectDraw_Release(ddraw); } START_TEST(ddraw1) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 800dab0fe83..abcd2010b23 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14495,8 +14495,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc, void *context) @@ -14506,10 +14509,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -14722,7 +14728,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw2_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw2_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw2_Release(ddraw); } START_TEST(ddraw2) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d4f4f08e396..071acbacedc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17556,8 +17556,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_desc, void *context) @@ -17567,10 +17570,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -17783,7 +17789,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw4_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw4_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw4_Release(ddraw); } START_TEST(ddraw4) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5ea81903c47..0f87d46ec09 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17818,8 +17818,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_desc, void *context) @@ -17829,10 +17832,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -18045,7 +18051,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw7_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw7_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw7_Release(ddraw); } START_TEST(ddraw7) -- 2.25.1

3 2

[PATCH vkd3d v2 1/5] include: Document vkd3d-shader swizzles.
by Zebediah Figura 04 Sep '20

04 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 16db0283..044eeb99 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -961,7 +961,7 @@ struct vkd3d_shader_signature unsigned int element_count; }; -/* swizzle bits fields: wwzzyyxx */ +/** Possible values for a single component of a vkd3d-shader swizzle. */ enum vkd3d_shader_swizzle_component { VKD3D_SHADER_SWIZZLE_X = 0x0, @@ -972,17 +972,33 @@ enum vkd3d_shader_swizzle_component VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), }; +/** + * A mask selecting one component from a vkd3d-shader swizzle. The component has + * type \ref vkd3d_shader_swizzle_component. + */ #define VKD3D_SHADER_SWIZZLE_MASK (0xffu) +/** The offset, in bits, of the nth parameter of a vkd3d-shader swizzle. */ #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (8u * (idx)) +/** + * A helper macro which returns a vkd3d-shader swizzle with the given + * components. The components are specified as the suffixes to members of + * \ref vkd3d_shader_swizzle_component. For example, the swizzle ".xwyy" can be + * represented as: + * \code + * VKD3D_SHADER_SWIZZLE(X, W, Y, Y) + * \endcode + */ #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ vkd3d_shader_create_swizzle(VKD3D_SHADER_SWIZZLE_ ## x, \ VKD3D_SHADER_SWIZZLE_ ## y, \ VKD3D_SHADER_SWIZZLE_ ## z, \ VKD3D_SHADER_SWIZZLE_ ## w) +/** The identity swizzle ".xyzw". */ #define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) +/** Build a vkd3d-shader swizzle with the given components. */ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_component x, enum vkd3d_shader_swizzle_component y, enum vkd3d_shader_swizzle_component z, enum vkd3d_shader_swizzle_component w) -- 2.28.0

3 9

[PATCH v2 1/6] msscript.ocx/tests: Add tests for SitehWnd.
by Gabriel Ivăncescu 04 Sep '20

04 Sep '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 161 +++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2e7f14d..5a29c7e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1905,6 +1905,166 @@ static void test_AllowUI(void) IScriptControl_Release(sc); } +static void test_SitehWnd(void) +{ + IScriptControl *sc; + LONG site_hwnd; + HRESULT hr; + HWND hwnd; + BSTR str; + + hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, 50, 50, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window, error %08x\n", GetLastError()); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 1); + todo_wine ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"vbscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + IActiveScriptSiteWindow *site_window; + HWND window; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteWindow, (void**)&site_window); + ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + window = (HWND)0xdeadbeef; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!window, "got %p\n", window); + + site_hwnd = 0; + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(!window, "got %p\n", window); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSiteWindow_Release(site_window); + } + + DestroyWindow(hwnd); +} + static void test_UseSafeSubset(void) { IScriptControl *sc; @@ -4100,6 +4260,7 @@ START_TEST(msscript) test_Reset(); test_AddObject(); test_AllowUI(); + test_SitehWnd(); test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); -- 2.21.0

2 11

[PATCH 9/9] conhost: Update tty output in IOCTL_CONDRV_ACTIVATE.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 14 +++++- programs/conhost/tests/tty.c | 97 ++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-)

2 1

[PATCH 8/9] conhost: Update tty output in scroll_output.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 5 ++++ programs/conhost/tests/tty.c | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)

2 1

[PATCH 7/9] conhost: Update tty output in fill_output.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 12 ++++++++++++ programs/conhost/tests/tty.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)

2 1

[PATCH 6/9] conhost/tests: Add tty output tests.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 344 ++++++++++++++++++++++++++++++++++- 1 file changed, 342 insertions(+), 2 deletions(-)

2 1

[PATCH 3/9] conhost/tests: Add initial tty tests.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/Makefile.in | 6 + programs/conhost/tests/tty.c | 298 +++++++++++++++++++++++++++++ 2 files changed, 304 insertions(+) create mode 100644 programs/conhost/tests/Makefile.in create mode 100644 programs/conhost/tests/tty.c

2 1

[PATCH v2 1/2] msvcirt: Correct the behavior of filebuf::setbuf().
by Arkadiusz Hiler 04 Sep '20

04 Sep '20

While implementing ifstream::setbuf() it turned out that filebuf::setbuf(), behaves a bit different on Windows than our implementation. It seems to reimplement streambuf::setbuf() with a very minor difference - it doesn't ever set unbuffered to 0 and allows to change the underlying buffer as long as the file is not opened. Test for how streambuf::setb() and both setbuf()s affect value of unbuffered are also included. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v2: * styling - inline opening curly bracked with if statements * ok() messages consistency with the actual checks dlls/msvcirt/msvcirt.c | 22 ++++++++++--- dlls/msvcirt/tests/msvcirt.c | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..744d8bc943a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1175,16 +1175,28 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) { - streambuf *ret; - TRACE("(%p %p %d)\n", this, buffer, length); - if (this->base.base != NULL) + + if (filebuf_is_open(this) && this->base.base != NULL) return NULL; streambuf_lock(&this->base); - ret = streambuf_setbuf(&this->base, buffer, length); + + if (buffer == NULL || !length) { + this->base.unbuffered = 1; + } else { + if (this->base.allocated) { + MSVCRT_operator_delete(this->base.base); + this->base.allocated = 0; + } + + this->base.base = buffer; + this->base.ebuf = buffer + length; + } + streambuf_unlock(&this->base); - return ret; + + return &this->base; } /* ?setmode@filebuf@@QAEHH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4f9f859a861..a21ac20267c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1168,16 +1168,22 @@ static void test_streambuf(void) sb.do_lock = -1; /* setb */ + sb.unbuffered = 1; call_func4(p_streambuf_setb, &sb, reserve, reserve+16, 0); + ok(sb.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", sb.unbuffered); ok(sb.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb.base); ok(sb.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb.ebuf); call_func4(p_streambuf_setb, &sb, reserve, reserve+16, 4); + ok(sb.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", sb.unbuffered); ok(sb.allocated == 4, "wrong allocate value, expected 4 got %d\n", sb.allocated); sb.allocated = 0; + sb.unbuffered = 0; call_func4(p_streambuf_setb, &sb, NULL, NULL, 3); + ok(sb.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", sb.unbuffered); ok(sb.allocated == 3, "wrong allocate value, expected 3 got %d\n", sb.allocated); /* setbuf */ + sb.unbuffered = 0; psb = call_func3(p_streambuf_setbuf, &sb, NULL, 5); ok(psb == &sb, "wrong return value, expected %p got %p\n", &sb, psb); ok(sb.allocated == 3, "wrong allocate value, expected 3 got %d\n", sb.allocated); @@ -1659,21 +1665,75 @@ static void test_filebuf(void) /* setbuf */ fb1.base.do_lock = 0; + fb1.fd = -1; /* closed */ + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb1.base.unbuffered); + ok(fb1.fd == -1, "wrong fd, expected -1 got %d\n", fb1.fd); + fb1.base.unbuffered = 1; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 8, 8); + ok(pret == &fb1, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 8, "wrong buffer, expected %p got %p\n", read_buffer + 8, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, NULL, 0); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 8, "wrong buffer, expected %p got %p\n", read_buffer + 8, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok((int) call_func1(p_streambuf_doallocate, &fb1.base) == 1, "failed to allocate buffer\n"); + ok(fb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base != NULL, "wrong buffer, expected not NULL got %p\n", fb1.base.base); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 2, 14); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 2, "wrong buffer, expected %p got %p\n", read_buffer + 2, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + fb1.fd = 1; /* opened */ + fb1.base.unbuffered = 1; + fb1.base.base = fb1.base.ebuf = NULL; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 8, 8); + ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, NULL, 0); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb1.base.unbuffered); ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 1; fb1.base.pbase = fb1.base.pptr = fb1.base.base; fb1.base.epptr = fb1.base.ebuf; fb1.base.do_lock = -1; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); fb1.base.base = fb1.base.ebuf = NULL; fb1.base.do_lock = 0; + fb1.base.unbuffered = 0; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 0); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); -- 2.28.0

2 3

[PATCH 5/9] conhost: Support tty output in write_output.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 67 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)

1 0

[PATCH 4/9] conhost: Synchronize tty cursor position in set_output_info.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 2/9] conhost: Support setting tty title in set_console_title.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 78 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)

1 0

[PATCH 1/9] conhost: Initialize tty output.
by Jacek Caban 04 Sep '20

04 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 114 +++++++++++++++++++++++++++++++------ 1 file changed, 97 insertions(+), 17 deletions(-)

1 0

[PATCH 1/2] ntdll: Fix arm64 regression from "Clear the syscall frame on return"
by Martin Storsjo 04 Sep '20

04 Sep '20

The restoring of registers in call_user_exception_dispatcher was broken in 75e616d52b452d37cc93f492d47eba641f9741c1. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index cfe1c75b59..ec361216d0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -700,7 +700,7 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "mov x0, x19\n\t" "mov x1, x20\n\t" "mov x2, x21\n\t" - "ldp x19, x20, [x5, #64]\n\t" /* frame->x19,x20 */ + "ldp x19, x20, [x5, #80]\n\t" /* frame->x19,x20 */ "ldp x21, x22, [x5, #96]\n\t" /* frame->x21,x22 */ "ldp x23, x24, [x5, #112]\n\t" /* frame->x23,x24 */ "ldp x25, x26, [x5, #128]\n\t" /* frame->x25,x26 */ -- 2.17.1

1 1

[PATCH v2] advapi32: Enumerate host credentials through mountmgr.
by Hans Leidekker 04 Sep '20

04 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/cred.c | 411 +++++++++++--------------------------- 2 files changed, 115 insertions(+), 297 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index e70b1a7a07a..99bc26572ec 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -3,7 +3,6 @@ MODULE = advapi32.dll IMPORTLIB = advapi32 IMPORTS = kernelbase sechost DELAYIMPORTS = rpcrt4 -EXTRALIBS = $(SECURITY_LIBS) C_SRCS = \ advapi.c \ diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 24bcd284145..231330ea35b 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -22,12 +22,6 @@ #include <time.h> #include <limits.h> -#ifdef __APPLE__ -# include <Security/SecKeychain.h> -# include <Security/SecKeychainItem.h> -# include <Security/SecKeychainSearch.h> -#endif - #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -237,189 +231,6 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require_password, - PCREDENTIALW credential, char *buffer, - DWORD *len) -{ - int status; - UInt32 i, cred_blob_len; - void *cred_blob; - WCHAR *user = NULL; - BOOL user_name_present = FALSE; - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, - kSecCommentItemAttr, kSecCreationDateItemAttr }; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob); - if (status == errSecAuthFailed && !require_password) - { - cred_blob_len = 0; - cred_blob = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, NULL); - } - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - return ERROR_NOT_FOUND; - } - - for (i = 0; i < attr_list->count; i++) - if (attr_list->attr[i].tag == kSecAccountItemAttr && attr_list->attr[i].data) - { - user_name_present = TRUE; - break; - } - if (!user_name_present) - { - WARN("no kSecAccountItemAttr for item\n"); - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_NOT_FOUND; - } - - if (buffer) - { - credential->Flags = 0; - credential->Type = CRED_TYPE_DOMAIN_PASSWORD; - credential->TargetName = NULL; - credential->Comment = NULL; - memset(&credential->LastWritten, 0, sizeof(credential->LastWritten)); - credential->CredentialBlobSize = 0; - credential->CredentialBlob = NULL; - credential->Persist = CRED_PERSIST_LOCAL_MACHINE; - credential->AttributeCount = 0; - credential->Attributes = NULL; - credential->TargetAlias = NULL; - credential->UserName = NULL; - } - for (i = 0; i < attr_list->count; i++) - { - switch (attr_list->attr[i].tag) - { - case kSecServiceItemAttr: - TRACE("kSecServiceItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->TargetName = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->TargetName[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecAccountItemAttr: - { - INT str_len; - TRACE("kSecAccountItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - user = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, user, str_len); - user[str_len] = '\0'; - break; - } - case kSecCommentItemAttr: - TRACE("kSecCommentItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->Comment = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->Comment[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecCreationDateItemAttr: - TRACE("kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - LARGE_INTEGER win_time; - struct tm tm; - time_t time; - memset(&tm, 0, sizeof(tm)); - strptime(attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm); - time = mktime(&tm); - RtlSecondsSince1970ToTime(time, &win_time); - credential->LastWritten.dwLowDateTime = win_time.u.LowPart; - credential->LastWritten.dwHighDateTime = win_time.u.HighPart; - } - break; - default: - FIXME("unhandled attribute %u\n", (unsigned)attr_list->attr[i].tag); - break; - } - } - - if (user) - { - INT str_len; - if (buffer) - credential->UserName = (LPWSTR)buffer; - str_len = strlenW(user); - *len += (str_len + 1) * sizeof(WCHAR); - if (buffer) - { - memcpy(buffer, user, (str_len + 1) * sizeof(WCHAR)); - buffer += (str_len + 1) * sizeof(WCHAR); - TRACE("UserName = %s\n", debugstr_w(credential->UserName)); - } - } - heap_free(user); - - if (cred_blob) - { - if (buffer) - { - INT str_len; - credential->CredentialBlob = (BYTE *)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - (LPWSTR)buffer, 0xffff); - credential->CredentialBlobSize = str_len * sizeof(WCHAR); - *len += str_len * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - NULL, 0); - *len += str_len * sizeof(WCHAR); - } - } - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_SUCCESS; -} -#endif - static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, const BYTE key_data[KEY_SIZE], const BYTE *credential_blob, DWORD credential_blob_size) @@ -736,98 +547,6 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, return ret; } -#ifdef __APPLE__ -static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter) -{ - int len; - WCHAR *target_name; - const WCHAR *p; - BOOL ret; - - if (!filter) return TRUE; - - len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); - if (!(target_name = heap_alloc((len + 1) * sizeof(WCHAR)))) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); - target_name[len] = 0; - - TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); - - p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, - (p && !p[1] ? p - filter : -1), target_name, - (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; - heap_free(target_name); - return ret; -} - -static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, - char *buffer, DWORD *len, DWORD *count) -{ - SecKeychainSearchRef search; - SecKeychainItemRef item; - int status; - Boolean saved_user_interaction_allowed; - DWORD ret; - - SecKeychainGetUserInteractionAllowed(&saved_user_interaction_allowed); - SecKeychainSetUserInteractionAllowed(false); - - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) - { - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - BOOL match; - - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (buffer) - { - *len = sizeof(CREDENTIALW); - credentials[*count] = (PCREDENTIALW)buffer; - } - else - *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - continue; - } - TRACE("service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); - match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - if (!match) continue; - ret = mac_read_credential_from_item(item, FALSE, - buffer ? credentials[*count] : NULL, - buffer ? buffer + sizeof(CREDENTIALW) : NULL, - len); - CFRelease(item); - if (ret == ERROR_SUCCESS) - { - (*count)++; - if (buffer) buffer += *len; - } - } - CFRelease(search); - } - else - ERR("SecKeychainSearchCreateFromAttributes returned status %d\n", status); - SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); - return ERROR_SUCCESS; -} -#endif - /****************************************************************************** * convert_PCREDENTIALW_to_PCREDENTIALA [internal] * @@ -1194,11 +913,113 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, return TRUE; } +#define CRED_LIST_COUNT 16 +#define CRED_DATA_SIZE 2048 +static DWORD host_enumerate_credentials( const WCHAR *filter, CREDENTIALW **credentials, char *buf, DWORD *len, DWORD *count ) +{ + static const WCHAR emptyW[] = {0}; + struct mountmgr_credential_list *list, *tmp; + DWORD i, j, ret, size, filter_size, offset = 0; + HANDLE mgr; + WCHAR *ptr; + + if (filter) filter_size = (strlenW( filter ) + 1) * sizeof(WCHAR); + else + { + filter = emptyW; + filter_size = sizeof(emptyW); + } + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = FIELD_OFFSET( struct mountmgr_credential_list, creds[CRED_LIST_COUNT] ) + filter_size + CRED_DATA_SIZE; + if (!(list = heap_alloc( size ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + + for (;;) + { + list->filter_offset = sizeof(*list); + list->filter_size = filter_size; + ptr = (WCHAR *)((char *)list + list->filter_offset); + strcpyW( ptr, filter ); + + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS, list, size, list, size, NULL, NULL )) break; + if ((ret = GetLastError()) != ERROR_MORE_DATA) goto done; + + size = list->size + filter_size; + if (!(tmp = heap_realloc( list, size ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } + list = tmp; + } + + for (i = 0, j = *count; i < list->count; i++) + { + CREDENTIALW *cred = (CREDENTIALW *)(buf + offset); + + offset += sizeof(*cred) + list->creds[i].targetname_size + list->creds[i].comment_size + list->creds[i].blob_size + + list->creds[i].username_size; + if (!buf) continue; + + ptr = (WCHAR *)(cred + 1); + cred->Flags = 0; + cred->Type = CRED_TYPE_DOMAIN_PASSWORD; + cred->TargetName = ptr; + memcpy( cred->TargetName, (char *)&list->creds[i] + list->creds[i].targetname_offset, list->creds[i].targetname_size ); + ptr += list->creds[i].targetname_size / sizeof(WCHAR); + if (list->creds[i].comment_size) + { + cred->Comment = ptr; + memcpy( cred->Comment, (char *)&list->creds[i] + list->creds[i].comment_offset, list->creds[i].comment_size ); + ptr += list->creds[i].comment_size / sizeof(WCHAR); + } + else cred->Comment = NULL; + cred->LastWritten = list->creds[i].last_written; + if (list->creds[i].blob_size) + { + cred->CredentialBlobSize = list->creds[i].blob_size; + cred->CredentialBlob = (BYTE *)ptr; + memcpy( cred->CredentialBlob, (char *)&list->creds[i] + list->creds[i].blob_offset, list->creds[i].blob_size ); + ptr += list->creds[i].blob_size / sizeof(WCHAR); + } + else + { + cred->CredentialBlobSize = 0; + cred->CredentialBlob = NULL; + } + cred->Persist = CRED_PERSIST_LOCAL_MACHINE; + cred->AttributeCount = 0; + cred->Attributes = NULL; + cred->TargetAlias = NULL; + if (list->creds[i].username_size) + { + cred->UserName = ptr; + memcpy( cred->UserName, (char *)&list->creds[i] + list->creds[i].username_offset, list->creds[i].username_size ); + } + else cred->UserName = NULL; + if (credentials) credentials[j++] = cred; + } + + *len += offset; + *count += list->count; + ret = ERROR_SUCCESS; + +done: + heap_free( list ); + CloseHandle( mgr ); + return ret; +} + /****************************************************************************** * CredEnumerateW [ADVAPI32.@] */ -BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, - PCREDENTIALW **Credentials) +BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, PCREDENTIALW **Credentials) { HKEY hkeyMgr; DWORD ret; @@ -1252,10 +1073,11 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, len = 0; ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, NULL, NULL, &len, Count); -#ifdef __APPLE__ if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, NULL, NULL, &len, Count); -#endif + { + ret = host_enumerate_credentials(Filter, NULL, NULL, &len, Count); + if (ret == ERROR_NOT_SUPPORTED) ret = ERROR_SUCCESS; + } if (ret == ERROR_SUCCESS && *Count == 0) ret = ERROR_NOT_FOUND; if (ret != ERROR_SUCCESS) @@ -1275,18 +1097,15 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, { buffer += *Count * sizeof(PCREDENTIALW); *Count = 0; - ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, - target_name_len, key_data, - *Credentials, &buffer, &len, - Count); -#ifdef __APPLE__ + ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, + *Credentials, &buffer, &len, Count); if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, *Credentials, - buffer, &len, Count); -#endif + { + ret = host_enumerate_credentials(Filter, *Credentials, buffer, &len, Count); + if (ret == ERROR_NOT_SUPPORTED) ret = ERROR_SUCCESS; + } } - else - ret = ERROR_OUTOFMEMORY; + else ret = ERROR_OUTOFMEMORY; } heap_free(target_name); -- 2.20.1

1 0

0001-user32-tests-Add-tests-for-showing-and-minimizing-ow
by 于海东 04 Sep '20

04 Sep '20

2 1

[PATCH 1/2] user32/tests: Add tests for showing and minimizing owned windows.
by 于海东 04 Sep '20

04 Sep '20

2 1

[PATCH 2/2] user32: Fix the owned pop-up window visibility issues when its owner window is minimizing or showing.
by 于海东 04 Sep '20

04 Sep '20

2 1

0002-user32-Fix-the-owned-pop-up-window-visibility-issues
by 于海东 04 Sep '20

04 Sep '20

2 1

[PATCH v3 4/4] include: Add IXMLHTTPRequest2/3 interfaces
by Alistair Leslie-Hughes 04 Sep '20

04 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml6.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 1f657a8cde..b837e42477 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -109,6 +109,8 @@ interface ISchemaAny; interface ISchemaIdentityConstraint; interface ISchemaNotation; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") @@ -261,6 +263,35 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +typedef struct tagXHR_COOKIE +{ + [ref, string] WCHAR *pwszUrl; + [ref, string] WCHAR *pwszName; + [unique, string] WCHAR *pwszValue; + [unique, string] WCHAR *pwszP3PPolicy; + FILETIME ftExpires; + DWORD dwFlags; +} XHR_COOKIE; + +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT = 0x0, + XHR_PROP_NO_AUTH = 0x1, + XHR_PROP_TIMEOUT = 0x2, + XHR_PROP_NO_DEFAULT_HEADERS = 0x3, + XHR_PROP_REPORT_REDIRECT_STATUS = 0x4, + XHR_PROP_NO_CACHE = 0x5, + XHR_PROP_EXTENDED_ERROR = 0x6, + XHR_PROP_QUERY_STRING_UTF8 = 0x7, + XHR_PROP_IGNORE_CERT_ERRORS = 0x8, +} XHR_PROPERTY; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1265,6 +1296,70 @@ interface IXMLHTTPRequest : IDispatch HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), + helpstring("IXMLHTTPRequest2 Interface") +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in, string, ref] const WCHAR *method, [in, string, ref] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in, string, unique] const WCHAR *username, [in, string, unique] const WCHAR *password, + [in, string, unique] const WCHAR *proxy_username, [in, string, unique] const WCHAR *proxy_password); + HRESULT Send([in] ISequentialStream *body, [in] ULONGLONG body_size); + HRESULT Abort(); + HRESULT SetCookie([in, ref] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in, string, ref] const WCHAR *header, [in, string, unique] const WCHAR *value); + HRESULT GetAllResponseHeaders([out, string] WCHAR **headers); + HRESULT GetCookie([in, ref, string] const WCHAR *url, [in, unique, string] const WCHAR *name, [in] DWORD dwFlags, + [out] ULONG *cookies_count, [out, size_is(,*cookies_count)] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in, string, ref] const WCHAR *header, [out, string] WCHAR **value); +} + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c), + helpstring("IXMLHttpRequest3 Interface") +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD hash_size, [in, unique, size_is(hash_size)] const BYTE *hash, + [in, string, unique] const WCHAR *pin); +} + +[ + object, + uuid(a44a9299-e321-40de-8866-341b41669162), + helpstring("IXMLHTTPRequest2Callback Interface"), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *request, [in, string] const WCHAR* redirect_url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *request, [in] DWORD status, [in, string] const WCHAR *status_str); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnError([in] IXMLHTTPRequest2 *request, [in] HRESULT error); +} + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb), + helpstring("IXMLHttpRequest3Callback Interface") +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *request, [in] DWORD errors, + [in] DWORD chain_size, + [in, unique,size_is(chain_size)] const XHR_CERT *chain); + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *request, [in] DWORD issuers_size, + [in, string, unique, size_is(issuers_size)] const WCHAR **issuers); +}; + + [ object, dual, @@ -1554,6 +1649,17 @@ coclass XMLHTTP60 [default] interface IXMLHTTPRequest; } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + interface IXMLHTTPRequest2; +} + [ uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1) ] -- 2.28.0

1 0

[PATCH v3 2/4] msxml3/tests: Use msxml6.h where required
by Alistair Leslie-Hughes 04 Sep '20

04 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/tests/saxreader.c | 4 ++-- dlls/msxml3/tests/schema.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 986f429cc1..5c5fa8075d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -28,8 +28,8 @@ #include "windows.h" #include "ole2.h" -#include "msxml2.h" -#include "msxml2did.h" +#include "msxml6.h" +#include "msxml6did.h" #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 4637d62f8b..fc0329bd10 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -26,9 +26,9 @@ #include "initguid.h" #include "windows.h" #include "ole2.h" -#include "msxml2.h" +#include "msxml6.h" #undef CLSID_DOMDocument -#include "msxml2did.h" +#include "msxml6did.h" #include "dispex.h" #include "cguid.h" -- 2.28.0

1 0

[PATCH 1/2] msvcirt: Correct the behavior of filebuf::setbuf().
by Arkadiusz Hiler 04 Sep '20

04 Sep '20

While implementing ifstream::setbuf() it turned out that filebuf::setbuf(), behaves a bit different on Windows than our implementation. It seems to reimplement streambuf::setbuf() with a very minor difference - it doesn't ever set unbuffered to 0 and allows to change the underlying buffer as long as the file is not opened. Test for how streambuf::setb() and both setbuf()s affect value of unbuffered are also included. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 24 ++++++++++++--- dlls/msvcirt/tests/msvcirt.c | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..ab40ad36a28 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1175,16 +1175,30 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) { - streambuf *ret; - TRACE("(%p %p %d)\n", this, buffer, length); - if (this->base.base != NULL) + + if (filebuf_is_open(this) && this->base.base != NULL) return NULL; streambuf_lock(&this->base); - ret = streambuf_setbuf(&this->base, buffer, length); + + if (buffer == NULL || !length) { + this->base.unbuffered = 1; + } else { + + if (this->base.allocated) + { + MSVCRT_operator_delete(this->base.base); + this->base.allocated = 0; + } + + this->base.base = buffer; + this->base.ebuf = buffer + length; + } + streambuf_unlock(&this->base); - return ret; + + return &this->base; } /* ?setmode@filebuf@@QAEHH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4f9f859a861..a21ac20267c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1168,16 +1168,22 @@ static void test_streambuf(void) sb.do_lock = -1; /* setb */ + sb.unbuffered = 1; call_func4(p_streambuf_setb, &sb, reserve, reserve+16, 0); + ok(sb.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", sb.unbuffered); ok(sb.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb.base); ok(sb.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb.ebuf); call_func4(p_streambuf_setb, &sb, reserve, reserve+16, 4); + ok(sb.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", sb.unbuffered); ok(sb.allocated == 4, "wrong allocate value, expected 4 got %d\n", sb.allocated); sb.allocated = 0; + sb.unbuffered = 0; call_func4(p_streambuf_setb, &sb, NULL, NULL, 3); + ok(sb.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", sb.unbuffered); ok(sb.allocated == 3, "wrong allocate value, expected 3 got %d\n", sb.allocated); /* setbuf */ + sb.unbuffered = 0; psb = call_func3(p_streambuf_setbuf, &sb, NULL, 5); ok(psb == &sb, "wrong return value, expected %p got %p\n", &sb, psb); ok(sb.allocated == 3, "wrong allocate value, expected 3 got %d\n", sb.allocated); @@ -1659,21 +1665,75 @@ static void test_filebuf(void) /* setbuf */ fb1.base.do_lock = 0; + fb1.fd = -1; /* closed */ + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb1.base.unbuffered); + ok(fb1.fd == -1, "wrong fd, expected 1 got %d\n", fb1.fd); + fb1.base.unbuffered = 1; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 8, 8); + ok(pret == &fb1, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 8, "wrong buffer, expected %p got %p\n", read_buffer + 8, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, NULL, 0); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 8, "wrong buffer, expected %p got %p\n", read_buffer + 8, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok((int) call_func1(p_streambuf_doallocate, &fb1.base) == 1, "failed to allocate buffer\n"); + ok(fb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base != NULL, "wrong buffer, expected not NULL got %p\n", fb1.base.base); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 2, 14); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer + 2, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + fb1.fd = 1; /* opened */ + fb1.base.unbuffered = 1; + fb1.base.base = fb1.base.ebuf = NULL; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer + 8, 8); + ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, NULL, 0); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb1.base.unbuffered); ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.unbuffered = 1; fb1.base.pbase = fb1.base.pptr = fb1.base.base; fb1.base.epptr = fb1.base.ebuf; fb1.base.do_lock = -1; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); fb1.base.base = fb1.base.ebuf = NULL; fb1.base.do_lock = 0; + fb1.base.unbuffered = 0; pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 0); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); -- 2.28.0

1 1

[PATCH 2/2] user32: Fix the owned pop-up window visibility issues when its owner window is minimizing or showing.
by Haidong Yu 04 Sep '20

04 Sep '20

2 1

[PATCH] msvcirt: Be more obvious in out-of-memory situations.
by Arkadiusz Hiler 04 Sep '20

04 Sep '20

Just like in the new ifstream, if we are out of memory it's better to fail loudly with an obvious FIXME message than to leave user with half-initialized object causing ephemeral issues that are hard to debug. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 78 ++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..c8aaa146e54 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3012,11 +3012,16 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if (mode & (OPENMODE_app|OPENMODE_ate)) - ssb->base.pptr = buffer + strlen(buffer); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + if (mode & (OPENMODE_app|OPENMODE_ate)) + ssb->base.pptr = buffer + strlen(buffer); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -3029,8 +3034,14 @@ ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) - strstreambuf_ctor(ssb); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_ctor(ssb); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -4069,11 +4080,15 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, NULL); - istream_sb_ctor(this, &ssb->base, virt_init); - } else - istream_ctor(this, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_buffer_ctor(ssb, buffer, length, NULL); + istream_sb_ctor(this, &ssb->base, virt_init); + base = istream_get_ios(this); base->vtable = &MSVCP_istrstream_vtable; base->delbuf = 1; @@ -4470,13 +4485,18 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) - ssb->base.pptr = buffer + strlen(buffer); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + + if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) + ssb->base.pptr = buffer + strlen(buffer); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ??0strstream@@QAE@XZ */ @@ -4488,11 +4508,15 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) { - strstreambuf_ctor(ssb); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_ctor(ssb); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ?pcount@strstream@@QBEHXZ */ @@ -4537,11 +4561,15 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt TRACE("(%p %p %d)\n", this, file, virt_init); - if (stb) { - stdiobuf_file_ctor(stb, file); - return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); + if (!stb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_stdiostream_vtable, virt_init); + + stdiobuf_file_ctor(stb, file); + + return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); } /* ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ */ -- 2.28.0

1 0

[PATCH 1/2] user32/tests: Add tests for showing and minimizing owned windows.
by Haidong Yu 04 Sep '20

04 Sep '20

2 1

[PATCH] ntdll: Add ARM64 SEH unwind directives for assembly functions in PE builds
by Martin Storsjo 04 Sep '20

04 Sep '20

This fixes unwinding through RtlRaiseException and call_consolidate_callback in PE builds. Adjust the call_consolidate_callback function to store the whole context on the stack, and use the seh "context" opcode for unwinding to that context instead of the parent. Adjust the dwarf escape codes for reading from the context on the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Clang only got support for the ARM64 SEH assembler directives very recently (https://reviews.llvm.org/D86529 and https://reviews.llvm.org/D86889), in the master branch (that is slated to become Clang 12 in 6 months) fairly soon after the release branch for version 11 was branched off. (So the risk of users using a trunk version 12, before these directives were added is fairly low. But I guess it'd be good to keep track of what version the Android NDK updates to next.) --- dlls/ntdll/signal_arm64.c | 83 ++++++++++++++++++++++++--------------- include/wine/asm.h | 10 ++++- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d0d708c733..412947411f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -959,9 +959,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, * else. All CFI instructions are either DW_CFA_def_cfa_expression or * DW_CFA_expression, and the expressions have the following format: * - * DW_OP_breg29; sleb128 0x10 | Load x29 + 0x10 - * DW_OP_deref | Get *(x29 + 0x10) == context - * DW_OP_plus_uconst; uleb128 <OFFSET> | Add offset to get struct member + * DW_OP_breg31; sleb128 <OFFSET> | Load x31 + struct member offset * [DW_OP_deref] | Dereference, only for CFA */ extern void * WINAPI call_consolidate_callback( CONTEXT *context, @@ -969,40 +967,60 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec, TEB *teb ); __ASM_GLOBAL_FUNC( call_consolidate_callback, - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + __ASM_SEH(".seh_nop\n\t") + "stp x1, x2, [sp, #0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") + "str x3, [sp, #0x20]\n\t" + __ASM_SEH(".seh_nop\n\t") "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x0, [sp, 0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x07,0x8d,0x10,0x06,0x23,0x80,0x02,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x13,0x06,0x8d,0x10,0x06,0x23,0xa0,0x01\n\t") /* x19 */ - __ASM_CFI(".cfi_escape 0x10,0x14,0x06,0x8d,0x10,0x06,0x23,0xa8,0x01\n\t") /* x20 */ - __ASM_CFI(".cfi_escape 0x10,0x15,0x06,0x8d,0x10,0x06,0x23,0xb0,0x01\n\t") /* x21 */ - __ASM_CFI(".cfi_escape 0x10,0x16,0x06,0x8d,0x10,0x06,0x23,0xb8,0x01\n\t") /* x22 */ - __ASM_CFI(".cfi_escape 0x10,0x17,0x06,0x8d,0x10,0x06,0x23,0xc0,0x01\n\t") /* x23 */ - __ASM_CFI(".cfi_escape 0x10,0x18,0x06,0x8d,0x10,0x06,0x23,0xc8,0x01\n\t") /* x24 */ - __ASM_CFI(".cfi_escape 0x10,0x19,0x06,0x8d,0x10,0x06,0x23,0xd0,0x01\n\t") /* x25 */ - __ASM_CFI(".cfi_escape 0x10,0x1a,0x06,0x8d,0x10,0x06,0x23,0xd8,0x01\n\t") /* x26 */ - __ASM_CFI(".cfi_escape 0x10,0x1b,0x06,0x8d,0x10,0x06,0x23,0xe0,0x01\n\t") /* x27 */ - __ASM_CFI(".cfi_escape 0x10,0x1c,0x06,0x8d,0x10,0x06,0x23,0xe8,0x01\n\t") /* x28 */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x06,0x8d,0x10,0x06,0x23,0xf0,0x01\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x06,0x8d,0x10,0x06,0x23,0xf8,0x01\n\t") /* x30 */ - __ASM_CFI(".cfi_escape 0x10,0x48,0x06,0x8d,0x10,0x06,0x23,0x90,0x03\n\t") /* d8 */ - __ASM_CFI(".cfi_escape 0x10,0x49,0x06,0x8d,0x10,0x06,0x23,0xa0,0x03\n\t") /* d9 */ - __ASM_CFI(".cfi_escape 0x10,0x4a,0x06,0x8d,0x10,0x06,0x23,0xb0,0x03\n\t") /* d10 */ - __ASM_CFI(".cfi_escape 0x10,0x4b,0x06,0x8d,0x10,0x06,0x23,0xc0,0x03\n\t") /* d11 */ - __ASM_CFI(".cfi_escape 0x10,0x4c,0x06,0x8d,0x10,0x06,0x23,0xd0,0x03\n\t") /* d12 */ - __ASM_CFI(".cfi_escape 0x10,0x4d,0x06,0x8d,0x10,0x06,0x23,0xe0,0x03\n\t") /* d13 */ - __ASM_CFI(".cfi_escape 0x10,0x4e,0x06,0x8d,0x10,0x06,0x23,0xf0,0x03\n\t") /* d14 */ - __ASM_CFI(".cfi_escape 0x10,0x4f,0x06,0x8d,0x10,0x06,0x23,0x80,0x04\n\t") /* d15 */ + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x1, x0\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x2, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "bl memcpy\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0xf8,0x01\n\t") /* x30 */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + __ASM_SEH(".seh_context\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldp x1, x2, [x29, #0x10]\n\t" + "ldr x18, [x29, #0x20]\n\t" "mov x0, x2\n\t" - "mov x18, x3\n\t" "blr x1\n\t" + "mov sp, x29\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "ldp x29, x30, [sp], #32\n\t" + "ldp x29, x30, [sp], #48\n\t" __ASM_CFI(".cfi_restore 30\n\t") __ASM_CFI(".cfi_restore 29\n\t") __ASM_CFI(".cfi_def_cfa 31, 0\n\t") @@ -1207,6 +1225,9 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void __ASM_STDCALL_FUNC( RtlRaiseException, 4, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "stp x29, x30, [sp]\n\t" + __ASM_SEH(".seh_stackalloc 0x3b0\n\t") + __ASM_SEH(".seh_save_fplr 0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa x29, 944\n\t") __ASM_CFI(".cfi_offset x30, -936\n\t") __ASM_CFI(".cfi_offset x29, -944\n\t") diff --git a/include/wine/asm.h b/include/wine/asm.h index 592f638306..788e26126c 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -40,7 +40,15 @@ #endif #ifdef __SEH__ -# define __ASM_SEH(str) str +# if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) + /* Clang got support for aarch64 SEH assembly directives in Clang 12, + * before that, only .seh_startproc/.seh_endproc but nothing else was + * supported. Support for it doesn't exist in any Apple branded version + * of Clang yet. */ +# define __ASM_SEH(str) +# else +# define __ASM_SEH(str) str +# endif #else # define __ASM_SEH(str) #endif -- 2.17.1

1 0

[PATCH 5/5] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileW().
by Ziqing Hui 04 Sep '20

04 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)

1 0

[PATCH 4/5] d3dx10/tests: Introduce check_image_info().
by Ziqing Hui 04 Sep '20

04 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 60 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 28 deletions(-)

1 0

[PATCH 3/5] d3dx10/tests: Introduce create_file() and delete_file().
by Ziqing Hui 04 Sep '20

04 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 72 ++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 26 deletions(-)

1 0

[PATCH] winex11.drv: Don't wait for the desktop thread to store clipping window.
by Rémi Bernon 03 Sep '20

03 Sep '20

The messages are in flight, the state will be updated eventually in the order they are received by the desktop thread, we shouldn't have to wait. If the clipping window gets overwritten, it will also receive a message from the desktop thread, which is sent asynchronously already. Call of Duty: WWII calls ClipCursor in a loop on startup while the foreground thread is stalled and the messages sometimes pile up. The recursive message processing that SendMessageW induces can then cause stack overflows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49643 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index eb5e6a6c0d4..68e24a320af 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -445,7 +445,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -465,7 +465,7 @@ void ungrab_clipping_window(void) XUnmapWindow( display, clip_window ); if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); } /*********************************************************************** -- 2.28.0

1 0

[PATCH vkd3d 1/5] include: Document vkd3d-shader swizzles.
by Zebediah Figura 03 Sep '20

03 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc5615c9..527d5789 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -961,7 +961,7 @@ struct vkd3d_shader_signature unsigned int element_count; }; -/* swizzle bits fields: wwzzyyxx */ +/** Possible values for a single component of a vkd3d-shader swizzle. */ enum vkd3d_shader_swizzle_component { VKD3D_SHADER_SWIZZLE_X = 0x0, @@ -972,17 +972,33 @@ enum vkd3d_shader_swizzle_component VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), }; +/** + * A mask selecting one component from a vkd3d-shader swizzle. The component has + * type \ref vkd3d_shader_swizzle_component. + */ #define VKD3D_SHADER_SWIZZLE_MASK (0xffu) +/** The offset, in bits, of the nth parameter of a vkd3d-shader swizzle. */ #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (8u * (idx)) +/** + * A helper macro which returns a vkd3d-shader swizzle with the given + * components. The components are specified as the suffixes to members of + * \ref vkd3d_shader_swizzle_component. For example, the swizzle ".xwyy" can be + * represented as: + * \code + * VKD3D_SHADER_SWIZZLE(X, W, Y, Y) + * \endcode + */ #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ vkd3d_shader_create_swizzle(VKD3D_SHADER_SWIZZLE_ ## x, \ VKD3D_SHADER_SWIZZLE_ ## y, \ VKD3D_SHADER_SWIZZLE_ ## z, \ VKD3D_SHADER_SWIZZLE_ ## w) +/** The identity swizzle, ie ".xyzw". */ #define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) +/** Programmatically build a vkd3d-shader swizzle with the given components. */ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_component x, enum vkd3d_shader_swizzle_component y, enum vkd3d_shader_swizzle_component z, enum vkd3d_shader_swizzle_component w) -- 2.28.0

3 10

[PATCH v3 2/2] ntdll/tests: Raise an exception to check that EFlags.AC is cleared.
by Jefferson Carpenter 03 Sep '20

03 Sep '20

1 0

[PATCH 2/2] ntdll/tests: Raise an exception to check that EFlags.AC
by Jefferson Carpenter 03 Sep '20

03 Sep '20

2 1

[PATCH v2 2/2] ntdll/tests: Raise an exception to check that EFlags.AC is cleared.
by Jefferson Carpenter 03 Sep '20

03 Sep '20

1 0

[PATCH 1/2] ntdll/tests: Restore EFlags without re-loading.
by Jefferson Carpenter 03 Sep '20

03 Sep '20

1 0

[PATCH 1/2] dxgi: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2.
by Zebediah Figura 03 Sep '20

03 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dxgi/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 6c49d4539c3..665413e4c62 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -147,6 +147,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_NV12); + WINE_DXGI_TO_STR(DXGI_FORMAT_YUY2); WINE_DXGI_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); @@ -260,6 +262,8 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); @@ -371,6 +375,8 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); -- 2.28.0

2 3

[PATCH 1/2] wined3d: Read the SM5 resource type instruction modifier.
by Zebediah Figura 03 Sep '20

03 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I have as yet been unable to determine a use for this information. dlls/wined3d/shader.c | 77 ++++++++++++++-------------------- dlls/wined3d/shader_sm4.c | 74 ++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f4c4eb07d88..cfcb636346d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2042,6 +2042,29 @@ static void shader_dump_shader_input_sysval_semantic(struct wined3d_string_buffe shader_addline(buffer, "unknown_shader_input_sysval_semantic(%#x)", semantic); } +static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum wined3d_shader_resource_type type) +{ + static const char *const resource_type_names[] = + { + /* WINED3D_SHADER_RESOURCE_NONE */ "none", + /* WINED3D_SHADER_RESOURCE_BUFFER */ "buffer", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", + /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + }; + + if (type <= ARRAY_SIZE(resource_type_names)) + shader_addline(buffer, resource_type_names[type]); + else + shader_addline(buffer, "unknown"); +} + static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, const struct wined3d_shader_semantic *semantic, unsigned int flags, const struct wined3d_shader_version *shader_version) @@ -2075,52 +2098,7 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); - switch (semantic->resource_type) - { - case WINED3D_SHADER_RESOURCE_BUFFER: - shader_addline(buffer, "buffer"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1D: - shader_addline(buffer, "texture1d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - shader_addline(buffer, "texture2d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: - shader_addline(buffer, "texture2dms"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "texture3d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: - shader_addline(buffer, "texturecube"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: - shader_addline(buffer, "texture1darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: - shader_addline(buffer, "texture2darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: - shader_addline(buffer, "texture2dmsarray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: - shader_addline(buffer, "texturecubearray"); - break; - - default: - shader_addline(buffer, "unknown"); - break; - } + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->reg.reg.type == WINED3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) @@ -3116,6 +3094,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); + if (ins.resource_type != WINED3D_SHADER_RESOURCE_NONE) + { + shader_addline(&buffer, "("); + shader_dump_resource_type(&buffer, ins.resource_type); + shader_addline(&buffer, ")"); + } + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 443cfe7e4bd..54646174a29 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -26,7 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define WINED3D_SM4_MODIFIER_MASK 0x3fu + +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) + #define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 #define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) #define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 @@ -304,6 +308,12 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_instruction_modifier +{ + WINED3D_SM4_MODIFIER_AOFFIMMI = 0x1, + WINED3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1609,32 +1619,49 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; + enum wined3d_sm4_instruction_modifier modifier_type = modifier & WINED3D_SM4_MODIFIER_MASK; - if (modifier & ~recognized_bits) + switch (modifier_type) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); - } - else - { - /* Bit fields are used for sign extension */ - struct + case WINED3D_SM4_MODIFIER_AOFFIMMI: { - int u : 4; - int v : 4; - int w : 4; + static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER + | WINED3D_SM4_MODIFIER_MASK + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; + + /* Bit fields are used for sign extension. */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } aoffimmi; + + if (modifier & ~recognized_bits) + FIXME("Unhandled instruction modifier %#x.\n", modifier); + + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + break; + } + + case WINED3D_SM5_MODIFIER_RESOURCE_TYPE: + { + enum wined3d_sm4_resource_type resource_type + = (modifier & WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + + ins->resource_type = resource_type_table[resource_type]; + break; } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + + default: + FIXME("Unhandled instruction modifier %#x.\n", modifier); } } @@ -1703,6 +1730,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + ins->resource_type = WINED3D_SHADER_RESOURCE_NONE; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16b3d0325c5..6e905ca6a49 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1246,6 +1246,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; const struct wined3d_shader_src_param *src; struct wined3d_shader_texel_offset texel_offset; + enum wined3d_shader_resource_type resource_type; BOOL coissue; const struct wined3d_shader_src_param *predicate; union -- 2.28.0

2 3

[PATCH 1/6] msscript.ocx/tests: Add tests for SitehWnd.
by Gabriel Ivăncescu 03 Sep '20

03 Sep '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 161 +++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2e7f14d..5a29c7e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1905,6 +1905,166 @@ static void test_AllowUI(void) IScriptControl_Release(sc); } +static void test_SitehWnd(void) +{ + IScriptControl *sc; + LONG site_hwnd; + HRESULT hr; + HWND hwnd; + BSTR str; + + hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, 50, 50, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window, error %08x\n", GetLastError()); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 1); + todo_wine ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"vbscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + IActiveScriptSiteWindow *site_window; + HWND window; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteWindow, (void**)&site_window); + ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + window = (HWND)0xdeadbeef; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!window, "got %p\n", window); + + site_hwnd = 0; + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(!window, "got %p\n", window); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSiteWindow_Release(site_window); + } + + DestroyWindow(hwnd); +} + static void test_UseSafeSubset(void) { IScriptControl *sc; @@ -4100,6 +4260,7 @@ START_TEST(msscript) test_Reset(); test_AddObject(); test_AllowUI(); + test_SitehWnd(); test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); -- 2.21.0

2 7

[PATCH 6/6] advapi32: Enumerate host credentials through mountmgr.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/cred.c | 405 ++++++++++---------------------------- 2 files changed, 109 insertions(+), 297 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index e70b1a7a07a..99bc26572ec 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -3,7 +3,6 @@ MODULE = advapi32.dll IMPORTLIB = advapi32 IMPORTS = kernelbase sechost DELAYIMPORTS = rpcrt4 -EXTRALIBS = $(SECURITY_LIBS) C_SRCS = \ advapi.c \ diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 24bcd284145..10bcf4acb26 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -22,12 +22,6 @@ #include <time.h> #include <limits.h> -#ifdef __APPLE__ -# include <Security/SecKeychain.h> -# include <Security/SecKeychainItem.h> -# include <Security/SecKeychainSearch.h> -#endif - #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -237,189 +231,6 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require_password, - PCREDENTIALW credential, char *buffer, - DWORD *len) -{ - int status; - UInt32 i, cred_blob_len; - void *cred_blob; - WCHAR *user = NULL; - BOOL user_name_present = FALSE; - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, - kSecCommentItemAttr, kSecCreationDateItemAttr }; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob); - if (status == errSecAuthFailed && !require_password) - { - cred_blob_len = 0; - cred_blob = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, NULL); - } - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - return ERROR_NOT_FOUND; - } - - for (i = 0; i < attr_list->count; i++) - if (attr_list->attr[i].tag == kSecAccountItemAttr && attr_list->attr[i].data) - { - user_name_present = TRUE; - break; - } - if (!user_name_present) - { - WARN("no kSecAccountItemAttr for item\n"); - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_NOT_FOUND; - } - - if (buffer) - { - credential->Flags = 0; - credential->Type = CRED_TYPE_DOMAIN_PASSWORD; - credential->TargetName = NULL; - credential->Comment = NULL; - memset(&credential->LastWritten, 0, sizeof(credential->LastWritten)); - credential->CredentialBlobSize = 0; - credential->CredentialBlob = NULL; - credential->Persist = CRED_PERSIST_LOCAL_MACHINE; - credential->AttributeCount = 0; - credential->Attributes = NULL; - credential->TargetAlias = NULL; - credential->UserName = NULL; - } - for (i = 0; i < attr_list->count; i++) - { - switch (attr_list->attr[i].tag) - { - case kSecServiceItemAttr: - TRACE("kSecServiceItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->TargetName = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->TargetName[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecAccountItemAttr: - { - INT str_len; - TRACE("kSecAccountItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - user = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, user, str_len); - user[str_len] = '\0'; - break; - } - case kSecCommentItemAttr: - TRACE("kSecCommentItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->Comment = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->Comment[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecCreationDateItemAttr: - TRACE("kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - LARGE_INTEGER win_time; - struct tm tm; - time_t time; - memset(&tm, 0, sizeof(tm)); - strptime(attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm); - time = mktime(&tm); - RtlSecondsSince1970ToTime(time, &win_time); - credential->LastWritten.dwLowDateTime = win_time.u.LowPart; - credential->LastWritten.dwHighDateTime = win_time.u.HighPart; - } - break; - default: - FIXME("unhandled attribute %u\n", (unsigned)attr_list->attr[i].tag); - break; - } - } - - if (user) - { - INT str_len; - if (buffer) - credential->UserName = (LPWSTR)buffer; - str_len = strlenW(user); - *len += (str_len + 1) * sizeof(WCHAR); - if (buffer) - { - memcpy(buffer, user, (str_len + 1) * sizeof(WCHAR)); - buffer += (str_len + 1) * sizeof(WCHAR); - TRACE("UserName = %s\n", debugstr_w(credential->UserName)); - } - } - heap_free(user); - - if (cred_blob) - { - if (buffer) - { - INT str_len; - credential->CredentialBlob = (BYTE *)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - (LPWSTR)buffer, 0xffff); - credential->CredentialBlobSize = str_len * sizeof(WCHAR); - *len += str_len * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - NULL, 0); - *len += str_len * sizeof(WCHAR); - } - } - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_SUCCESS; -} -#endif - static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, const BYTE key_data[KEY_SIZE], const BYTE *credential_blob, DWORD credential_blob_size) @@ -736,98 +547,6 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, return ret; } -#ifdef __APPLE__ -static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter) -{ - int len; - WCHAR *target_name; - const WCHAR *p; - BOOL ret; - - if (!filter) return TRUE; - - len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); - if (!(target_name = heap_alloc((len + 1) * sizeof(WCHAR)))) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); - target_name[len] = 0; - - TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); - - p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, - (p && !p[1] ? p - filter : -1), target_name, - (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; - heap_free(target_name); - return ret; -} - -static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, - char *buffer, DWORD *len, DWORD *count) -{ - SecKeychainSearchRef search; - SecKeychainItemRef item; - int status; - Boolean saved_user_interaction_allowed; - DWORD ret; - - SecKeychainGetUserInteractionAllowed(&saved_user_interaction_allowed); - SecKeychainSetUserInteractionAllowed(false); - - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) - { - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - BOOL match; - - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (buffer) - { - *len = sizeof(CREDENTIALW); - credentials[*count] = (PCREDENTIALW)buffer; - } - else - *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - continue; - } - TRACE("service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); - match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - if (!match) continue; - ret = mac_read_credential_from_item(item, FALSE, - buffer ? credentials[*count] : NULL, - buffer ? buffer + sizeof(CREDENTIALW) : NULL, - len); - CFRelease(item); - if (ret == ERROR_SUCCESS) - { - (*count)++; - if (buffer) buffer += *len; - } - } - CFRelease(search); - } - else - ERR("SecKeychainSearchCreateFromAttributes returned status %d\n", status); - SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); - return ERROR_SUCCESS; -} -#endif - /****************************************************************************** * convert_PCREDENTIALW_to_PCREDENTIALA [internal] * @@ -1194,11 +913,113 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, return TRUE; } +#define CRED_LIST_COUNT 16 +#define CRED_DATA_SIZE 2048 +static DWORD host_enumerate_credentials( const WCHAR *filter, CREDENTIALW **credentials, char *buf, DWORD *len, DWORD *count ) +{ + static const WCHAR emptyW[] = {0}; + struct mountmgr_credential_list *list, *tmp; + DWORD i, j, ret, size, filter_size, offset = 0; + HANDLE mgr; + WCHAR *ptr; + + if (filter) filter_size = (strlenW( filter ) + 1) * sizeof(WCHAR); + else + { + filter = emptyW; + filter_size = sizeof(emptyW); + } + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = FIELD_OFFSET( struct mountmgr_credential_list, creds[CRED_LIST_COUNT] ) + filter_size + CRED_DATA_SIZE; + if (!(list = heap_alloc( size ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + + for (;;) + { + list->filter_offset = sizeof(*list); + list->filter_size = filter_size; + ptr = (WCHAR *)((char *)list + list->filter_offset); + strcpyW( ptr, filter ); + + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS, list, size, list, size, NULL, NULL )) break; + if ((ret = GetLastError()) != ERROR_MORE_DATA) goto done; + + size = list->size + filter_size; + if (!(tmp = heap_realloc( list, size ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } + list = tmp; + } + + for (i = 0, j = *count; i < list->count; i++) + { + CREDENTIALW *cred = (CREDENTIALW *)(buf + offset); + + offset += sizeof(*cred) + list->creds[i].targetname_size + list->creds[i].comment_size + list->creds[i].blob_size + + list->creds[i].username_size; + if (!buf) continue; + + ptr = (WCHAR *)(cred + 1); + cred->Flags = 0; + cred->Type = CRED_TYPE_DOMAIN_PASSWORD; + cred->TargetName = ptr; + memcpy( cred->TargetName, (char *)&list->creds[i] + list->creds[i].targetname_offset, list->creds[i].targetname_size ); + ptr += list->creds[i].targetname_size / sizeof(WCHAR); + if (list->creds[i].comment_size) + { + cred->Comment = ptr; + memcpy( cred->Comment, (char *)&list->creds[i] + list->creds[i].comment_offset, list->creds[i].comment_size ); + ptr += list->creds[i].comment_size / sizeof(WCHAR); + } + else cred->Comment = NULL; + cred->LastWritten = list->creds[i].last_written; + if (list->creds[i].blob_size) + { + cred->CredentialBlobSize = list->creds[i].blob_size; + cred->CredentialBlob = (BYTE *)ptr; + memcpy( cred->CredentialBlob, (char *)&list->creds[i] + list->creds[i].blob_offset, list->creds[i].blob_size ); + ptr += list->creds[i].blob_size / sizeof(WCHAR); + } + else + { + cred->CredentialBlobSize = 0; + cred->CredentialBlob = NULL; + } + cred->Persist = CRED_PERSIST_LOCAL_MACHINE; + cred->AttributeCount = 0; + cred->Attributes = NULL; + cred->TargetAlias = NULL; + if (list->creds[i].username_size) + { + cred->UserName = ptr; + memcpy( cred->UserName, (char *)&list->creds[i] + list->creds[i].username_offset, list->creds[i].username_size ); + } + else cred->UserName = NULL; + if (credentials) credentials[j++] = cred; + } + + *len += offset; + *count += list->count; + ret = ERROR_SUCCESS; + +done: + heap_free( list ); + CloseHandle( mgr ); + return ret; +} + /****************************************************************************** * CredEnumerateW [ADVAPI32.@] */ -BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, - PCREDENTIALW **Credentials) +BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, PCREDENTIALW **Credentials) { HKEY hkeyMgr; DWORD ret; @@ -1252,10 +1073,8 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, len = 0; ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, NULL, NULL, &len, Count); -#ifdef __APPLE__ if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, NULL, NULL, &len, Count); -#endif + ret = host_enumerate_credentials(Filter, NULL, NULL, &len, Count); if (ret == ERROR_SUCCESS && *Count == 0) ret = ERROR_NOT_FOUND; if (ret != ERROR_SUCCESS) @@ -1275,18 +1094,12 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, { buffer += *Count * sizeof(PCREDENTIALW); *Count = 0; - ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, - target_name_len, key_data, - *Credentials, &buffer, &len, - Count); -#ifdef __APPLE__ + ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, + *Credentials, &buffer, &len, Count); if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, *Credentials, - buffer, &len, Count); -#endif + ret = host_enumerate_credentials(Filter, *Credentials, buffer, &len, Count); } - else - ret = ERROR_OUTOFMEMORY; + else ret = ERROR_OUTOFMEMORY; } heap_free(target_name); -- 2.20.1

2 2

[PATCH 5/6] mountmgr: Add ioctl to enumerate host credentials on macOS.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 142 +++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.h | 2 + include/ddk/mountmgr.h | 10 +++ 4 files changed, 155 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 97208da4819..ccb0685cedd 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -159,7 +159,7 @@ static char *strdupA( const char *str ) return ret; } -static WCHAR *strdupW( const WCHAR *str ) +WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 95b11d864ab..54ba2857e02 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -836,6 +836,137 @@ static NTSTATUS delete_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO CFRelease( item ); return STATUS_SUCCESS; } + +static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter ) +{ + int len; + WCHAR *targetname; + const WCHAR *p; + BOOL ret; + + if (!*filter) return TRUE; + + len = MultiByteToWideChar( CP_UTF8, 0, data, data_len, NULL, 0 ); + if (!(targetname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_UTF8, 0, data, data_len, targetname, len ); + targetname[len] = 0; + + TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) ); + + p = strchrW( filter, '*' ); + ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, filter, + (p && !p[1]) ? p - filter : -1, targetname, (p && !p[1]) ? p - filter : -1 ) == CSTR_EQUAL; + RtlFreeHeap( GetProcessHeap(), 0, targetname ); + return ret; +} + +static NTSTATUS search_credentials( const WCHAR *filter, struct mountmgr_credential_list *list, SIZE_T *ret_count, SIZE_T *ret_size ) +{ + SecKeychainSearchRef search; + SecKeychainItemRef item; + int status; + ULONG i = 0; + SIZE_T data_offset, data_size = 0, size; + NTSTATUS ret = STATUS_NOT_FOUND; + + status = SecKeychainSearchCreateFromAttributes( NULL, kSecGenericPasswordItemClass, NULL, &search ); + if (status != noErr) + { + ERR( "SecKeychainSearchCreateFromAttributes returned status %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + while (SecKeychainSearchCopyNext( search, &item ) == noErr) + { + SecKeychainAttributeInfo info; + SecKeychainAttributeList *attr_list; + UInt32 info_tags[] = { kSecServiceItemAttr }; + BOOL match; + + info.count = ARRAY_SIZE(info_tags); + info.tag = info_tags; + info.format = NULL; + status = SecKeychainItemCopyAttributesAndData( item, &info, NULL, &attr_list, NULL, NULL ); + if (status != noErr) + { + WARN( "SecKeychainItemCopyAttributesAndData returned status %d\n", status ); + CFRelease( item ); + continue; + } + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) + { + SecKeychainItemFreeAttributesAndData( attr_list, NULL ); + CFRelease( item ); + continue; + } + TRACE( "service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data ); + + match = match_credential( attr_list->attr[0].data, attr_list->attr[0].length, filter ); + SecKeychainItemFreeAttributesAndData( attr_list, NULL ); + if (!match) + { + CFRelease( item ); + continue; + } + + if (!list) ret = fill_credential( item, FALSE, NULL, 0, 0, &size ); + else + { + data_offset = FIELD_OFFSET( struct mountmgr_credential_list, creds[list->count] ) - + FIELD_OFFSET( struct mountmgr_credential_list, creds[i] ) + data_size; + ret = fill_credential( item, FALSE, &list->creds[i], data_offset, list->size - data_offset, &size ); + } + + CFRelease( item ); + if (ret == STATUS_NOT_FOUND) continue; + if (ret != STATUS_SUCCESS) break; + data_size += size - sizeof(struct mountmgr_credential); + i++; + } + + if (ret_count) *ret_count = i; + if (ret_size) *ret_size = FIELD_OFFSET( struct mountmgr_credential_list, creds[i] ) + data_size; + + CFRelease( search ); + return ret; +} + +static NTSTATUS enumerate_credentials( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + struct mountmgr_credential_list *list = buff; + WCHAR *filter; + SIZE_T size, count; + Boolean saved_user_interaction_allowed; + NTSTATUS status; + + if (!check_credential_string( buff, insize, list->filter_size, list->filter_offset )) return STATUS_INVALID_PARAMETER; + if (!(filter = strdupW( (const WCHAR *)((const char *)list + list->filter_offset) ))) return STATUS_NO_MEMORY; + + SecKeychainGetUserInteractionAllowed( &saved_user_interaction_allowed ); + SecKeychainSetUserInteractionAllowed( false ); + + if ((status = search_credentials( filter, NULL, &count, &size )) == STATUS_SUCCESS) + { + + if (size > outsize) + { + if (size >= sizeof(list->size)) list->size = size; + iosb->Information = sizeof(list->size); + status = STATUS_MORE_ENTRIES; + } + else + { + list->size = size; + list->count = count; + iosb->Information = size; + status = search_credentials( filter, list, NULL, NULL ); + } + } + + SecKeychainSetUserInteractionAllowed( saved_user_interaction_allowed ); + RtlFreeHeap( GetProcessHeap(), 0, filter ); + return status; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -937,6 +1068,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential_list)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = enumerate_credentials( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 5fb43119c6a..3e4554c4768 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -36,6 +36,8 @@ extern void initialize_dbus(void) DECLSPEC_HIDDEN; extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; +extern WCHAR *strdupW( const WCHAR * ) DECLSPEC_HIDDEN; + /* device functions */ enum device_type diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index a5aae2a0851..3e4bacbb827 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -77,6 +77,7 @@ struct mountmgr_unix_drive #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_DELETE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 50, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS CTL_CODE(MOUNTMGRCONTROLTYPE, 51, METHOD_BUFFERED, FILE_READ_ACCESS) struct mountmgr_credential { @@ -92,6 +93,15 @@ struct mountmgr_credential FILETIME last_written; }; +struct mountmgr_credential_list +{ + ULONG size; + ULONG count; + ULONG filter_offset; + ULONG filter_size; + struct mountmgr_credential creds[1]; +}; + #define IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS CTL_CODE(MOUNTMGRCONTROLTYPE, 64, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) struct mountmgr_dhcp_request_param -- 2.20.1

1 0

[PATCH 4/6] advapi32: Delete host credentials through mountmgr.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/cred.c | 87 ++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 56 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index c17023959fc..24bcd284145 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -826,59 +826,6 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); return ERROR_SUCCESS; } - -static DWORD mac_delete_credential(LPCWSTR TargetName) -{ - int status; - SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) - { - SecKeychainItemRef item; - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - LPWSTR target_name; - INT str_len; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - CFRelease(item); - continue; - } - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); - /* nul terminate */ - target_name[str_len] = '\0'; - if (strcmpiW(TargetName, target_name)) - { - CFRelease(item); - heap_free(target_name); - continue; - } - heap_free(target_name); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - SecKeychainItemDelete(item); - CFRelease(item); - CFRelease(search); - - return ERROR_SUCCESS; - } - CFRelease(search); - } - return ERROR_NOT_FOUND; -} #endif /****************************************************************************** @@ -1095,6 +1042,36 @@ BOOL WINAPI CredDeleteA(LPCSTR TargetName, DWORD Type, DWORD Flags) return ret; } +static DWORD host_delete_credential( const WCHAR *targetname ) +{ + struct mountmgr_credential *cred; + DWORD size, name_size = (strlenW( targetname ) + 1) * sizeof(WCHAR); + HANDLE mgr; + WCHAR *ptr; + BOOL ret; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = sizeof(*cred) + name_size; + if (!(cred = heap_alloc( size ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + cred->targetname_offset = sizeof(*cred); + cred->targetname_size = name_size; + ptr = (WCHAR *)(cred + 1); + strcpyW( ptr, targetname ); + + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_DELETE_CREDENTIAL, cred, size, NULL, 0, NULL, NULL ); + heap_free( cred ); + CloseHandle( mgr ); + + return ret ? ERROR_SUCCESS : GetLastError(); +} + /****************************************************************************** * CredDeleteW [ADVAPI32.@] */ @@ -1126,14 +1103,12 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags) return FALSE; } -#ifdef __APPLE__ if (Type == CRED_TYPE_DOMAIN_PASSWORD) { - ret = mac_delete_credential(TargetName); + ret = host_delete_credential(TargetName); if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, TRUE); if (ret != ERROR_SUCCESS) -- 2.20.1

1 0

[PATCH 3/6] mountmgr: Add ioctl to delete host credentials on macOS.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/mountmgr.c | 28 ++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 1 + 2 files changed, 29 insertions(+) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index c3b9135ce10..95b11d864ab 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -819,6 +819,23 @@ error: RtlFreeHeap( GetProcessHeap(), 0, password ); return ret; } + +static NTSTATUS delete_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + const struct mountmgr_credential *cred = buff; + const WCHAR *targetname; + SecKeychainItemRef item; + + if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset )) + return STATUS_INVALID_PARAMETER; + targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset); + + if (!(item = find_credential( targetname ))) return STATUS_NOT_FOUND; + + SecKeychainItemDelete( item ); + CFRelease( item ); + return STATUS_SUCCESS; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -909,6 +926,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_DELETE_CREDENTIAL: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = delete_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index 162bbf71076..a5aae2a0851 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -76,6 +76,7 @@ struct mountmgr_unix_drive #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 50, METHOD_BUFFERED, FILE_WRITE_ACCESS) struct mountmgr_credential { -- 2.20.1

1 0

[PATCH 2/6] advapi32: Write host credentials through mountmgr.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/cred.c | 126 +++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 70 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 07f4b9b03a0..c17023959fc 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -497,85 +497,73 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_blob) +static DWORD host_write_credential( const CREDENTIALW *credential, BOOL preserve_blob ) { - int status; - SecKeychainItemRef keychain_item; - char *username, *password, *servername; - UInt32 userlen, pwlen, serverlen; - SecKeychainAttribute attrs[1]; - SecKeychainAttributeList attr_list; + struct mountmgr_credential *cred; + HANDLE mgr; + DWORD size; + WCHAR *ptr; + BOOL ret; if (credential->Flags) - FIXME("Flags 0x%x not written\n", credential->Flags); + FIXME( "flags 0x%x not written\n", credential->Flags ); if (credential->Type != CRED_TYPE_DOMAIN_PASSWORD) - FIXME("credential type of %d not supported\n", credential->Type); + FIXME( "credential type of %d not supported\n", credential->Type ); if (credential->Persist != CRED_PERSIST_LOCAL_MACHINE) - FIXME("persist value of %d not supported\n", credential->Persist); + FIXME( "persist value of %d not supported\n", credential->Persist ); if (credential->AttributeCount) - FIXME("custom attributes not supported\n"); - - userlen = WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, NULL, 0, NULL, NULL); - username = heap_alloc(userlen * sizeof(*username)); - WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, username, userlen, NULL, NULL); - - serverlen = WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, NULL, 0, NULL, NULL); - servername = heap_alloc(serverlen * sizeof(*servername)); - WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, servername, serverlen, NULL, NULL); - pwlen = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), NULL, 0, NULL, NULL); - password = heap_alloc(pwlen * sizeof(*password)); - WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), password, pwlen, NULL, NULL); - - TRACE("adding server %s, username %s using Keychain\n", servername, username); - status = SecKeychainAddGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, strlen(password), password, &keychain_item); - if (status != noErr) - ERR("SecKeychainAddGenericPassword returned %d\n", status); - if (status == errSecDuplicateItem) + FIXME( "custom attributes not supported\n" ); + + if (credential->CredentialBlobSize % sizeof(WCHAR)) return ERROR_NOT_SUPPORTED; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = sizeof(*cred) + (strlenW( credential->TargetName ) + strlenW( credential->UserName ) + 2) * sizeof(WCHAR); + size += credential->CredentialBlobSize; + if (credential->Comment) size += (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + if (!(cred = heap_alloc( size ))) { - status = SecKeychainFindGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, NULL, NULL, &keychain_item); - if (status != noErr) - ERR("SecKeychainFindGenericPassword returned %d\n", status); + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; } - heap_free(username); - heap_free(servername); - if (status != noErr) + ptr = (WCHAR *)(cred + 1); + + cred->targetname_offset = sizeof(*cred); + cred->targetname_size = (strlenW( credential->TargetName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->TargetName ); + ptr += cred->targetname_size / sizeof(WCHAR); + + cred->username_offset = cred->targetname_offset + cred->targetname_size; + cred->username_size = (strlenW( credential->UserName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->UserName ); + ptr += cred->username_size / sizeof(WCHAR); + + cred->blob_offset = cred->username_offset + cred->username_size; + if (credential->CredentialBlob) { - heap_free(password); - return ERROR_GEN_FAILURE; + cred->blob_size = credential->CredentialBlobSize; + memcpy( ptr, credential->CredentialBlob, credential->CredentialBlobSize ); + ptr += cred->blob_size / sizeof(WCHAR); } + else cred->blob_size = 0; + cred->blob_preserve = preserve_blob; + + cred->comment_offset = cred->blob_offset + cred->blob_size; if (credential->Comment) { - attr_list.count = 1; - attr_list.attr = attrs; - attrs[0].tag = kSecCommentItemAttr; - attrs[0].length = WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, NULL, 0, NULL, NULL); - if (attrs[0].length) attrs[0].length--; - attrs[0].data = heap_alloc(attrs[0].length); - WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, attrs[0].data, attrs[0].length, NULL, NULL); - } - else - { - attr_list.count = 0; - attr_list.attr = NULL; + cred->comment_size = (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->Comment ); } - status = SecKeychainItemModifyAttributesAndData(keychain_item, &attr_list, - preserve_blob ? 0 : strlen(password), - preserve_blob ? NULL : password); - if (credential->Comment) - heap_free(attrs[0].data); - heap_free(password); - /* FIXME: set TargetAlias attribute */ - CFRelease(keychain_item); - if (status != noErr) - return ERROR_GEN_FAILURE; - return ERROR_SUCCESS; + else cred->comment_size = 0; + + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_WRITE_CREDENTIAL, cred, size, NULL, 0, NULL, NULL ); + heap_free( cred ); + CloseHandle( mgr ); + + return ret ? ERROR_SUCCESS : GetLastError(); } -#endif static DWORD open_cred_mgr_key(HKEY *hkey, BOOL open_for_write) { @@ -1823,20 +1811,18 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) } } -#ifdef __APPLE__ if (!Credential->AttributeCount && Credential->Type == CRED_TYPE_DOMAIN_PASSWORD && (Credential->Persist == CRED_PERSIST_LOCAL_MACHINE || Credential->Persist == CRED_PERSIST_ENTERPRISE)) { - ret = mac_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); - if (ret != ERROR_SUCCESS) + ret = host_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); + if (ret != ERROR_SUCCESS && ret != ERROR_NOT_SUPPORTED) { SetLastError(ret); return FALSE; } - return TRUE; + if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, FALSE); if (ret != ERROR_SUCCESS) -- 2.20.1

1 0

[PATCH 1/6] mountmgr: Add ioctl to write host credentials on macOS.
by Hans Leidekker 03 Sep '20

03 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/mountmgr.c | 99 ++++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 1 + 2 files changed, 100 insertions(+) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d55ca643018..c3b9135ce10 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -731,6 +731,94 @@ static NTSTATUS read_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO_S iosb->Information = size; return (size > outsize) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; } + +static NTSTATUS write_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + const struct mountmgr_credential *cred = buff; + int status, len, len_password = 0; + const WCHAR *ptr; + SecKeychainItemRef keychain_item; + char *targetname, *username = NULL, *password = NULL; + SecKeychainAttribute attrs[1]; + SecKeychainAttributeList attr_list; + NTSTATUS ret = STATUS_NO_MEMORY; + + if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset ) || + !check_credential_string( buff, insize, cred->username_size, cred->username_offset ) || + ((cred->blob_size && cred->blob_size % sizeof(WCHAR)) || cred->blob_offset + cred->blob_size > insize) || + (cred->comment_size && !check_credential_string( buff, insize, cred->comment_size, cred->comment_offset )) || + sizeof(*cred) + cred->targetname_size + cred->username_size + cred->blob_size + cred->comment_size > insize) + { + return STATUS_INVALID_PARAMETER; + } + + ptr = (const WCHAR *)((const char *)cred + cred->targetname_offset); + len = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); + if (!(targetname = RtlAllocateHeap( GetProcessHeap(), 0, len ))) goto error; + WideCharToMultiByte( CP_UTF8, 0, ptr, -1, targetname, len, NULL, NULL ); + + ptr = (const WCHAR *)((const char *)cred + cred->username_offset); + len = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); + if (!(username = RtlAllocateHeap( GetProcessHeap(), 0, len ))) goto error; + WideCharToMultiByte( CP_UTF8, 0, ptr, -1, username, len, NULL, NULL ); + + if (cred->blob_size) + { + ptr = (const WCHAR *)((const char *)cred + cred->blob_offset); + len_password = WideCharToMultiByte( CP_UTF8, 0, ptr, cred->blob_size / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(password = RtlAllocateHeap( GetProcessHeap(), 0, len_password ))) goto error; + WideCharToMultiByte( CP_UTF8, 0, ptr, cred->blob_size / sizeof(WCHAR), password, len_password, NULL, NULL ); + } + + TRACE("adding target %s, username %s using Keychain\n", targetname, username ); + status = SecKeychainAddGenericPassword( NULL, strlen(targetname), targetname, strlen(username), username, + len_password, password, &keychain_item ); + if (status != noErr) ERR( "SecKeychainAddGenericPassword returned %d\n", status ); + if (status == errSecDuplicateItem) + { + status = SecKeychainFindGenericPassword( NULL, strlen(targetname), targetname, strlen(username), username, NULL, + NULL, &keychain_item ); + if (status != noErr) ERR( "SecKeychainFindGenericPassword returned %d\n", status ); + } + RtlFreeHeap( GetProcessHeap(), 0, username ); + RtlFreeHeap( GetProcessHeap(), 0, targetname ); + if (status != noErr) + { + RtlFreeHeap( GetProcessHeap(), 0, password ); + return STATUS_UNSUCCESSFUL; + } + if (cred->comment_size) + { + attr_list.count = 1; + attr_list.attr = attrs; + attrs[0].tag = kSecCommentItemAttr; + ptr = (const WCHAR *)((const char *)cred + cred->comment_offset); + attrs[0].length = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); + if (attrs[0].length) attrs[0].length--; + if (!(attrs[0].data = RtlAllocateHeap( GetProcessHeap(), 0, attrs[0].length ))) goto error; + WideCharToMultiByte( CP_UTF8, 0, ptr, -1, attrs[0].data, attrs[0].length, NULL, NULL ); + } + else + { + attr_list.count = 0; + attr_list.attr = NULL; + } + status = SecKeychainItemModifyAttributesAndData( keychain_item, &attr_list, cred->blob_preserve ? 0 : len_password, + cred->blob_preserve ? NULL : password ); + + if (cred->comment_size) RtlFreeHeap( GetProcessHeap(), 0, attrs[0].data ); + RtlFreeHeap( GetProcessHeap(), 0, password ); + /* FIXME: set TargetAlias attribute */ + CFRelease( keychain_item ); + if (status != noErr) return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; + +error: + RtlFreeHeap( GetProcessHeap(), 0, username ); + RtlFreeHeap( GetProcessHeap(), 0, targetname ); + RtlFreeHeap( GetProcessHeap(), 0, password ); + return ret; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -810,6 +898,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_WRITE_CREDENTIAL: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = write_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index c3d94078197..162bbf71076 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -75,6 +75,7 @@ struct mountmgr_unix_drive }; #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) struct mountmgr_credential { -- 2.20.1

1 0

[PATCH v3 1/5] widl: Search for known types in current namespace.
by Rémi Bernon 03 Sep '20

03 Sep '20

Fixes the following error with this sample idl: #ifdef __WIDL__ #pragma winrt ns_prefix #endif import "wtypes.idl"; namespace Windows { [object] interface IFoo {} [object] interface IBar { HRESULT DoBar([in] IFoo *foo); } } $ widl -o windows.foo.h windows.foo.idl windows.foo.idl:13: error: type 'IFoo' not found Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: I included sample idl with each patch to better show the use case they cover. The whole series then will allow us to declare WinRT interfaces in the correct idl files, in order to stub several DLLs that are required for Death Stranding and Flight Simulator to start. The DLL stubbing would look like the following patches I intend to send next if this widl series is accepted: * https://gitlab.com/rbernon/wine/-/commit/478b77d3f8.patch * https://gitlab.com/rbernon/wine/-/commit/a2d705e0f5.patch * https://gitlab.com/rbernon/wine/-/commit/cca2304aa1.patch * https://gitlab.com/rbernon/wine/-/commit/03f0f3a9d1.patch * https://gitlab.com/rbernon/wine/-/commit/745b9f01e4.patch tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1c..91c5b809bb3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1959,7 +1959,7 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) static type_t *find_type_or_error(const char *name, int t) { - type_t *type = find_type(name, NULL, t); + type_t *type = find_type(name, current_namespace, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; -- 2.28.0

2 9

[PATCH v2 4/4] include: Add IXMLHTTPRequest2/3 interfaces
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml6.idl | 104 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 1f657a8cde..8fd58cc98e 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -109,6 +109,8 @@ interface ISchemaAny; interface ISchemaIdentityConstraint; interface ISchemaNotation; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") @@ -261,6 +263,35 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +typedef struct tagXHR_COOKIE +{ + [ref, string] WCHAR *url; + [ref, string] WCHAR *name; + [unique, string] WCHAR *value; + [unique, string] WCHAR *p3_policy; + FILETIME expire_time; + DWORD flags; +} XHR_COOKIE; + +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT = 0x0, + XHR_PROP_NO_AUTH = 0x1, + XHR_PROP_TIMEOUT = 0x2, + XHR_PROP_NO_DEFAULT_HEADERS = 0x3, + XHR_PROP_REPORT_REDIRECT_STATUS = 0x4, + XHR_PROP_NO_CACHE = 0x5, + XHR_PROP_EXTENDED_ERROR = 0x6, + XHR_PROP_QUERY_STRING_UTF8 = 0x7, + XHR_PROP_IGNORE_CERT_ERRORS = 0x8, +} XHR_PROPERTY; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1265,6 +1296,68 @@ interface IXMLHTTPRequest : IDispatch HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), + helpstring("IXMLHTTPRequest2 Interface") +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in] const WCHAR *method, [in] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in] const WCHAR *username, [in] const WCHAR *password, + [in] const WCHAR *proxy_username, [in] const WCHAR *proxy_password); + HRESULT Send([in] ISequentialStream *body, [in] ULONGLONG body_size); + HRESULT Abort(); + HRESULT SetCookie([in] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in] const WCHAR *header, [in] const WCHAR *value); + HRESULT GetAllResponseHeaders([out] WCHAR **headers); + HRESULT GetCookie([in] const WCHAR *url, [in] const WCHAR *name, [in] DWORD dwFlags, + [out] ULONG *cookies_count, [out, retval] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in] const WCHAR *header, [out, retval] WCHAR **value); +} + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c), + helpstring("IXMLHttpRequest3 Interface") +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD hash_size, [in] const BYTE *hash, [in] const WCHAR *pin); +}; + +[ + object, + uuid(A44A9299-E321-40DE-8866-341B41669162), + helpstring("IXMLHTTPRequest2Callback Interface"), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *request, [in] const WCHAR* redirect_url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *request, [in] DWORD status, [in] const WCHAR *status_str); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnError([in] IXMLHTTPRequest2 *request, [in] HRESULT error); +} + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb), + helpstring("IXMLHttpRequest3Callback Interface") +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *request, [in] DWORD errors, + [in] DWORD chain_size, [in] const XHR_CERT *chain); + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *request, [in] DWORD issuers_size, + [in] const WCHAR **issuers); +}; + + [ object, dual, @@ -1554,6 +1647,17 @@ coclass XMLHTTP60 [default] interface IXMLHTTPRequest; } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1) ] -- 2.28.0

2 1

[PATCH v4] msvcirt: Implement most of ifstream.
by Arkadiusz Hiler 03 Sep '20

03 Sep '20

Based on semi-stubs by Gijs Vermeulen. Tested with Power Tab Editor and GraphCalc - the crashes are gone and loading saved files seems to work correctly. ifstream::setbuf() is left as a stub - it will need some changes to filebuf::setbuf() first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v4: * add failbit flag to current state instead of overwriting it completely * test for that behavior v3: * constructors now return NULL and print a FIXME in OOM cases * ifstream_open_ctor and ifstream_open now come with implicit OPENMODE_in * IOSTATE is now handled in open, close and attach * test for IOSTATE changes as well as for lack of them * win32: fixed compilation warnings * fixed psb/pfb mixup v2: * use correct mangled symbols in the comment on top of setmode * set p_ifstream_dtor and p_ifstream_vbase_dtor in win32 path dlls/msvcirt/msvcirt.c | 185 ++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 68 +++++----- dlls/msvcirt/tests/msvcirt.c | 251 +++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 68 +++++----- dlls/msvcrt40/msvcrt40.spec | 68 +++++----- 5 files changed, 538 insertions(+), 102 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f76eaf6d7ac..7e1d9977b78 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -192,6 +192,8 @@ extern const vtable_ptr MSVCP_istream_vtable; extern const vtable_ptr MSVCP_istream_withassign_vtable; /* ??_7istrstream@@6B@ */ extern const vtable_ptr MSVCP_istrstream_vtable; +/* ??_7ifstream@@6B@ */ +extern const vtable_ptr MSVCP_ifstream_vtable; /* ??_7iostream@@6B@ */ extern const vtable_ptr MSVCP_iostream_vtable; /* ??_7strstream@@6B@ */ @@ -262,6 +264,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(istrstream, VTABLE_ADD_FUNC(istream_vector_dtor)); + __ASM_VTABLE(ifstream, + VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(iostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(strstream, @@ -280,6 +284,7 @@ const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, v /* ??_8istream@@7B@ */ /* ??_8istream_withassign@@7B@ */ /* ??_8istrstream@@7B@ */ +/* ??_8ifstream@@7B@ */ const int istream_vbtable[] = {0, VBTABLE_ENTRY(istream, FIELD_OFFSET(istream, vbtable), ios)}; /* ??_8iostream@@7Bistream@@@ */ /* ??_8stdiostream@@7Bistream@@@ */ @@ -305,6 +310,8 @@ DEFINE_RTTI_DATA2(istream_withassign, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistream_withassign@@") DEFINE_RTTI_DATA2(istrstream, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistrstream@@") +DEFINE_RTTI_DATA2(ifstream, sizeof(istream), + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVifstream@@") DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") @@ -3113,6 +3120,8 @@ istream* __thiscall istream_copy_ctor(istream *this, const istream *copy, BOOL v /* ??1istream_withassign@@UEAA@XZ */ /* ??1istrstream@@UAE@XZ */ /* ??1istrstream@@UEAA@XZ */ +/* ??1ifstream@@UAE@XZ */ +/* ??1ifstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(istream_dtor, 4) void __thiscall istream_dtor(ios *base) { @@ -3152,6 +3161,8 @@ istream* __thiscall istream_assign_sb(istream *this, streambuf *sb) /* ??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z */ /* ??4istrstream@@QAEAAV0@ABV0@@Z */ /* ??4istrstream@@QEAAAEAV0@AEBV0@@Z */ +/* ??4ifstream@@QAEAAV0@ABV0@@Z */ +/* ??4ifstream@@QEAAAEAV0@AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(istream_assign, 8) istream* __thiscall istream_assign(istream *this, const istream *rhs) { @@ -3164,6 +3175,8 @@ istream* __thiscall istream_assign(istream *this, const istream *rhs) /* ??_Distream_withassign@@QEAAXXZ */ /* ??_Distrstream@@QAEXXZ */ /* ??_Distrstream@@QEAAXXZ */ +/* ??_Difstream@@QAEXXZ */ +/* ??_Difstream@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(istream_vbase_dtor, 4) void __thiscall istream_vbase_dtor(istream *this) { @@ -3178,6 +3191,7 @@ void __thiscall istream_vbase_dtor(istream *this) /* ??_Eistream@@UAEPAXI@Z */ /* ??_Eistream_withassign@@UAEPAXI@Z */ /* ??_Eistrstream@@UAEPAXI@Z */ +/* ??_Eifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_vector_dtor, 8) istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) { @@ -3203,6 +3217,7 @@ istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) /* ??_Gistream@@UAEPAXI@Z */ /* ??_Gistream_withassign@@UAEPAXI@Z */ /* ??_Gistrstream@@UAEPAXI@Z */ +/* ??_Gifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_scalar_dtor, 8) istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags) { @@ -4089,6 +4104,175 @@ char* __thiscall istrstream_str(istream *this) return strstreambuf_str(istrstream_rdbuf(this)); } +/* ??0ifstream@@QAE@ABV0@@Z */ +/* ??0ifstream@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_copy_ctor, 12) +istream* __thiscall ifstream_copy_ctor(istream *this, const istream *copy, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + istream_withassign_copy_ctor(this, copy, virt_init); + istream_get_ios(this)->vtable = &MSVCP_ifstream_vtable; + return this; +} + +/* ??0ifstream@@QAE@HPADH@Z */ +/* ??0ifstream@@QEAA@HPEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_buffer_ctor, 20) +istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_reserve_ctor(fb, fd, buffer, length); + istream_sb_ctor(this, &fb->base, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@H@Z */ +/* ??0ifstream@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_fd_ctor, 12) +istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %d)\n", this, fd, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_ctor(fb, fd); + istream_sb_ctor(this, &fb->base, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@PBDHH@Z */ +/* ??0ifstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open_ctor, 20) +istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_ctor(fb); + istream_sb_ctor(this, &fb->base, virt_init); + filebuf_open(fb, name, mode|OPENMODE_in, protection); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@XZ */ +/* ??0ifstream@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_ctor, 8) +istream* __thiscall ifstream_ctor(istream *this, BOOL virt_init) +{ + return ifstream_fd_ctor(this, -1, virt_init); +} + +/* ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ */ +/* ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_rdbuf, 4) +filebuf* __thiscall ifstream_rdbuf(const istream *this) +{ + TRACE("(%p)\n", this); + return (filebuf*) istream_get_ios(this)->sb; +} + +/* ?fd@ifstream@@QBEHXZ */ +/* ?fd@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_fd, 4) +filedesc __thiscall ifstream_fd(istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_fd(ifstream_rdbuf(this)); +} + +/* ?attach@ifstream@@QAEXH@Z */ +/* ?attach@ifstream@@QEAAXH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_attach, 8) +void __thiscall ifstream_attach(istream *this, filedesc fd) +{ + ios *base = istream_get_ios(this); + TRACE("(%p %d)\n", this, fd); + if (filebuf_attach(ifstream_rdbuf(this), fd) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); +} + +/* ?close@ifstream@@QAEXXZ */ +/* ?close@ifstream@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_close, 4) +void __thiscall ifstream_close(istream *this) +{ + ios *base = istream_get_ios(this); + TRACE("(%p)\n", this); + if (filebuf_close(ifstream_rdbuf(this)) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); + else + ios_clear(base, IOSTATE_goodbit); +} + +/* ?is_open@ifstream@@QBEHXZ */ +/* ?is_open@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_is_open, 4) +int __thiscall ifstream_is_open(const istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_is_open(ifstream_rdbuf(this)); +} + +/* ?open@ifstream@@QAEXPBDHH@Z */ +/* ?open@ifstream@@QEAAXPEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open, 16) +void __thiscall ifstream_open(istream *this, const char *name, ios_open_mode mode, int protection) +{ + ios *base = istream_get_ios(this); + TRACE("(%p %s %d %d)\n", this, name, mode, protection); + if (filebuf_open(ifstream_rdbuf(this), name, mode|OPENMODE_in, protection) == NULL) + ios_clear(base, base->state | IOSTATE_failbit); +} + +/* ?setmode@ifstream@@QAEHH@Z */ +/* ?setmode@ifstream@@QEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setmode, 8) +int __thiscall ifstream_setmode(istream *this, int mode) +{ + TRACE("(%p %d)\n", this, mode); + return filebuf_setmode(ifstream_rdbuf(this), mode); +} + static inline ios* iostream_to_ios(const iostream *this) { return (ios*)((char*)this + iostream_vbtable_istream[1]); @@ -4522,6 +4706,7 @@ static void init_io(void *base) init_istream_rtti(base); init_istream_withassign_rtti(base); init_istrstream_rtti(base); + init_ifstream_rtti(base); init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f2e875695ef..75ae312b486 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -26,16 +26,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z # __thiscall ifstream::ifstream(class ifstream const &) -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z # __thiscall ifstream::ifstream(int) -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z # __thiscall ifstream::ifstream(int,char *,int) -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z # __thiscall ifstream::ifstream(char const *,int,int) -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ # __thiscall ifstream::ifstream(void) -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) ifstream_copy_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) ifstream_fd_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) ifstream_fd_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) ifstream_open_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) ifstream_open_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) ifstream_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) ifstream_ctor @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) ios_copy_ctor @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) ios_copy_ctor @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) ios_ctor @@ -138,8 +138,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor @ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ # virtual __thiscall ifstream::~ifstream(void) -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) ios_dtor @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) iostream_dtor @@ -178,8 +178,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) filebuf_assign @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z # class fstream & __thiscall fstream::operator=(class fstream &) @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z # class ifstream & __thiscall ifstream::operator=(class ifstream const &) -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) istream_assign +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) istream_assign @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) ios_assign @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) ios_assign @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) iostream_assign @@ -305,7 +305,7 @@ @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable # @ extern ??_7fstream@@6B@ # const fstream::`vftable' -# @ extern ??_7ifstream@@6B@ # const ifstream::`vftable' +@ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @ extern ??_7istream@@6B@ MSVCP_istream_vtable @@ -323,7 +323,7 @@ @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable # @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} # @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} -# @ extern ??_8ifstream@@7B@ # const ifstream::`vbtable' +@ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8istream@@7B@ istream_vbtable @@ -339,8 +339,8 @@ @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream @ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ # void __thiscall ifstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) istream_vbase_dtor @@ -364,7 +364,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) istream_vector_dtor @@ -383,7 +383,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @@ -406,8 +406,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) filebuf_attach @ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z # void __thiscall ifstream::attach(int) -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) ifstream_attach +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) ifstream_attach @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z # void __thiscall ofstream::attach(int) @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) ios_bad @@ -428,8 +428,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close @ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void) @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ # void __thiscall ifstream::close(void) -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) ifstream_close +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) ifstream_close @ stub -arch=win32 ?close@ofstream@@QAEXXZ # void __thiscall ofstream::close(void) @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) ios_clrlock @@ -472,8 +472,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) filebuf_fd @ stub -arch=win32 ?fd@fstream@@QBEHXZ # int __thiscall fstream::fd(void)const @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ # int __thiscall ifstream::fd(void)const -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) ifstream_fd +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) ifstream_fd @ stub -arch=win32 ?fd@ofstream@@QBEHXZ # int __thiscall ofstream::fd(void)const @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) ios_fill_set @@ -541,8 +541,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) filebuf_is_open @ stub -arch=win32 ?is_open@fstream@@QBEHXZ # int __thiscall fstream::is_open(void)const @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ # int __thiscall ifstream::is_open(void)const -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) ifstream_is_open +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) ifstream_is_open @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ # int __thiscall ofstream::is_open(void)const @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) istream_isfx @@ -566,8 +566,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) filebuf_open @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z # void __thiscall fstream::open(char const *,int,int) @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z # void __thiscall ifstream::open(char const *,int,int) -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) ifstream_open +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) ifstream_open @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z # void __thiscall ofstream::open(char const *,int,int) @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB filebuf_openprot @@ -615,8 +615,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) ios_pword @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall fstream::rdbuf(void)const @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall ifstream::rdbuf(void)const -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) ifstream_rdbuf +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) ifstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) ios_rdbuf @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) ios_rdbuf @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) istrstream_rdbuf @@ -685,8 +685,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) filebuf_setmode @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z # int __thiscall fstream::setmode(int) @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z # int __thiscall ifstream::setmode(int) -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) ifstream_setmode +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) ifstream_setmode @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z # int __thiscall ofstream::setmode(int) @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) streambuf_setp diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6440bc0dab7..4f9f859a861 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <sys/stat.h> #include "wine/test.h" typedef void (*vtable_ptr)(void); @@ -403,6 +404,22 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* ifstream */ +static istream* (*__thiscall p_ifstream_copy_ctor)(istream*, const istream*, BOOL); +static istream* (*__thiscall p_ifstream_buffer_ctor)(istream*, filedesc, char*, int, BOOL); +static istream* (*__thiscall p_ifstream_fd_ctor)(istream*, filedesc fd, BOOL virt_init); +static istream* (*__thiscall p_ifstream_open_ctor)(istream*, const char *name, ios_open_mode, int, BOOL); +static istream* (*__thiscall p_ifstream_ctor)(istream*, BOOL); +static void (*__thiscall p_ifstream_dtor)(ios*); +static void (*__thiscall p_ifstream_vbase_dtor)(istream*); +static void (*__thiscall p_ifstream_attach)(istream*, filedesc); +static void (*__thiscall p_ifstream_close)(istream*); +static filedesc (*__thiscall p_ifstream_fd)(istream*); +static int (*__thiscall p_ifstream_is_open)(const istream*); +static void (*__thiscall p_ifstream_open)(istream*, const char*, ios_open_mode, int); +static filebuf* (*__thiscall p_ifstream_rdbuf)(const istream*); +static int (*__thiscall p_ifstream_setmode)(istream*, int); + /* strstream */ static iostream* (*__thiscall p_strstream_copy_ctor)(iostream*, const iostream*, BOOL); static iostream* (*__thiscall p_strstream_buffer_ctor)(iostream*, char*, int, int, BOOL); @@ -703,6 +720,21 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0@PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0@AEAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QEAA@AEBV0@@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QEAA@HPEADH@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QEAA@H@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QEAA@PEBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QEAA@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UEAA@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QEAAXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QEAAXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QEAAXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QEBAHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QEBAHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QEAAXPEBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QEAAHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QEAA@AEBV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QEAA@PEADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QEAA@XZ"); @@ -917,6 +949,21 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0@PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0@AAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QAE@ABV0@@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QAE@H@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QAE@HPADH@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QAE@PBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QAE@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UAE@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QAEXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QAEXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QAEXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QBEHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QBEHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QAEXPBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QBEPAVfilebuf@@XZ"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QAEHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QAE@ABV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QAE@PADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QAE@XZ"); @@ -6720,6 +6767,209 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_ifstream(void) +{ + const char *filename = "ifstream_test"; + istream ifs, ifs_copy, *pifs; + filebuf *pfb; + char buffer[64]; + char st[8]; + int fd, ret, i; + + memset(&ifs, 0xab, sizeof(istream)); + + /* constructors/destructors */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.extract_delim == 0, "expected 0 got %d\n", ifs.extract_delim); + ok(ifs.count == 0, "expected 0 got %d\n", ifs.count); + ok(ifs.base_ios.sb != NULL, "expected not %p got %p\n", NULL, ifs.base_ios.sb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.tie == NULL, "expected %p got %p\n", NULL, ifs.base_ios.tie); + ok(ifs.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, ifs.base_ios.flags); + ok(ifs.base_ios.precision == 6, "expected 6 got %d\n", ifs.base_ios.precision); + ok(ifs.base_ios.fill == ' ', "expected 32 got %d\n", ifs.base_ios.fill); + ok(ifs.base_ios.width == 0, "expected 0 got %d\n", ifs.base_ios.width); + ok(ifs.base_ios.do_lock == -1, "expected -1 got %d\n", ifs.base_ios.do_lock); + ok(pfb->fd == -1, "wrong fd, expected -1 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == -1, "wrong fd, expected 0 got %d\n", pfb->fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func3(p_ifstream_fd_ctor, &ifs, 42, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 42, "wrong fd, expected 42 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + + pifs = call_func3(p_ifstream_copy_ctor, &ifs_copy, &ifs, TRUE); + pfb = (filebuf*) ifs_copy.base_ios.sb; + ok(pifs == &ifs_copy, "wrong return, expected %p got %p\n", &ifs_copy, pifs); + ok(ifs_copy.base_ios.sb == ifs.base_ios.sb, "expected shared streambuf\n"); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs_copy.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs_copy.base_ios.state); + + call_func1(p_ifstream_vbase_dtor, &ifs_copy); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 53, buffer, ARRAY_SIZE(buffer), TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pfb->base.base); + ok(pfb->base.ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), pfb->base.ebuf); + ok(pfb->fd == 53, "wrong fd, expected 53 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 64, "wrong fd, expected 64 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_close(fd) == -1, "expected ifstream to close opened file\n"); + + /* attach */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + call_func2(p_ifstream_attach, &ifs, 42); + ok(ifs.base_ios.state == IOSTATE_goodbit, "attaching on vanilla stream set some state bits\n"); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + ok(pfb->close == 0, "wrong close value, expected 0 got %d\n", pfb->close); + ifs.base_ios.state = IOSTATE_eofbit; + call_func2(p_ifstream_attach, &ifs, 53); + ok(ifs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "attaching on already setup stream did not set failbit\n"); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* fd */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(fd == -1, "wrong fd, expected -1 but got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + + /* rdbuf */ + pfb = (filebuf*) call_func1(p_ifstream_rdbuf, &ifs); + ok((streambuf*) pfb == ifs.base_ios.sb, "wrong return, expected %p got %p\n", ifs.base_ios.sb, pfb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + + /* setmode */ + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_text); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + + /* close && is_open */ + ok((int) call_func1(p_ifstream_is_open, &ifs) == 1, "expected ifstream to be open\n"); + ifs.base_ios.state = IOSTATE_eofbit | IOSTATE_failbit; + call_func1(p_ifstream_close, &ifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "close did not clear state = %d\n", ifs.base_ios.state); + ifs.base_ios.state = IOSTATE_eofbit; + call_func1(p_ifstream_close, &ifs); + ok(ifs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "close on a closed stream did not set failbit\n"); + ok((int) call_func1(p_ifstream_is_open, &ifs) == 0, "expected ifstream to not be open\n"); + ok(_close(fd) == -1, "expected close to close the opened file\n"); + + /* open */ + ifs.base_ios.state = IOSTATE_eofbit; + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(fd != -1, "wrong fd, expected not -1 got %d\n", fd); + ok(ifs.base_ios.state == IOSTATE_eofbit, "open did not succeed\n"); + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + ok(ifs.base_ios.state == (IOSTATE_eofbit | IOSTATE_failbit), "second open did not set failbit\n"); + call_func1(p_ifstream_close, &ifs); + + /* write something we can read later */ + fd = _open(filename, _O_TRUNC|_O_CREAT|_O_RDWR, _S_IWRITE); + ok(fd != -1, "_open failed\n"); + ok(_write(fd, "test 12", 7) == 7, "_write failed\n"); + ok(_close(fd) == 0, "_close failed\n"); + + /* integration with parent istream - reading */ + ifs.base_ios.state = IOSTATE_goodbit; /* open doesn't clear the state */ + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_out, filebuf_openprot); /* make sure that OPENMODE_in is implicit */ + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + + i = 12345; + pifs = call_func2(p_istream_read_int, pifs, &i); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(i == 12, "expected 12 got %d\n", i); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* make sure that OPENMODE_in is implicit with open_ctor */ + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_out, filebuf_openprot, TRUE); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); +} + static void test_strstream(void) { iostream ios1, ios2, *pios; @@ -7538,6 +7788,7 @@ START_TEST(msvcirt) test_istream_withassign(); test_istrstream(); test_iostream(); + test_ifstream(); test_strstream(); test_stdiostream(); test_Iostream_init(); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f06a53cc601..96c6c681478 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -20,16 +20,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -124,8 +124,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -164,8 +164,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -288,7 +288,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) msvcirt.??Bios@@QEBAPEAXXZ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -305,7 +305,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -321,8 +321,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -346,7 +346,7 @@ @ stub -arch=win32 ??_EIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -364,7 +364,7 @@ @ stub -arch=win32 ??_GIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -394,8 +394,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -416,8 +416,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -460,8 +460,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -527,8 +527,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -552,8 +552,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -601,8 +601,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0d966acd7c..6a2c9a7e52e 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -38,16 +38,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -154,8 +154,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -206,8 +206,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -340,7 +340,7 @@ @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -358,7 +358,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -374,8 +374,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -403,7 +403,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) msvcrt.??_Eexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -426,7 +426,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) msvcrt.??_Gexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -457,8 +457,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -481,8 +481,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -525,8 +525,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -594,8 +594,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -621,8 +621,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -672,8 +672,8 @@ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -745,8 +745,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z -- 2.28.0

2 1

[PATCH v2 3/4] include: Remove interfaces already define in msxml6.idl
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml2.idl | 109 --------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index cfafc42133..a2d72d2063 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1605,15 +1605,6 @@ coclass FreeThreadedDOMDocument40 [default, source] dispinterface XMLDOMDocumentEvents; } -[ - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - [ helpstring("Free threaded XML DOM Document"), progid("Msxml2.FreeThreadedDOMDocument"), @@ -1655,14 +1646,6 @@ coclass XMLHTTP40 [default] interface IXMLHTTPRequest; } -[ - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - [ helpstring("XML HTTP"), progid("Msxml2.XMLHTTP"), @@ -1695,14 +1678,6 @@ coclass ServerXMLHTTP40 [default] interface IServerXMLHTTPRequest2; } -[ - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - [ helpstring("Server XML HTTP"), progid("Msxml2.ServerXMLHTTP"), @@ -1743,14 +1718,6 @@ coclass XMLSchemaCache40 [default] interface IXMLDOMSchemaCollection2; } -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - [ helpstring("XML Schema Cache"), progid("Msxml2.XMLSchemaCache"), @@ -1791,14 +1758,6 @@ coclass XSLTemplate40 [default] interface IXSLTemplate; } -[ - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - [ helpstring("XSL Template"), progid("Msxml2.XSLTemplate"), @@ -3290,15 +3249,6 @@ coclass SAXXMLReader40 interface ISAXXMLReader; } -[ - uuid(88d96a0c-f192-11d4-a65f-0040963251e5) -] -coclass SAXXMLReader60 -{ - [default] interface IVBSAXXMLReader; - interface ISAXXMLReader; -} - [ helpstring("SAX XML Reader"), progid("Msxml2.SAXXMLReader"), @@ -3373,26 +3323,6 @@ coclass MXHTMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a10-f192-11d4-a65f-0040963251e5) -] -coclass MXHTMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter 3.0"), progid("Msxml2.MXXMLWriter.3.0"), @@ -3437,26 +3367,6 @@ coclass MXXMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a0f-f192-11d4-a65f-0040963251e5) -] -coclass MXXMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter"), progid("Msxml2.MXXMLWriter"), @@ -3499,15 +3409,6 @@ coclass MXNamespaceManager40 interface IMXNamespaceManager; } -[ - uuid(88d96a11-f192-11d4-a65f-0040963251e5) -] -coclass MXNamespaceManager60 -{ - [default] interface IVBMXNamespaceManager; - interface IMXNamespaceManager; -} - [ helpstring("SAXAttributes 3.0"), progid("Msxml2.SAXAttributes.3.0"), @@ -3532,16 +3433,6 @@ coclass SAXAttributes40 interface ISAXAttributes; } -[ - uuid(88d96a0e-f192-11d4-a65f-0040963251e5) -] -coclass SAXAttributes60 -{ - [default] interface IMXAttributes; - interface IVBSAXAttributes; - interface ISAXAttributes; -} - [ helpstring("SAXAttributes"), progid("Msxml2.SAXAttributes"), -- 2.28.0

1 0

[PATCH v2 2/4] msxml3/tests: Use msxml6.h where required
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/tests/saxreader.c | 4 ++-- dlls/msxml3/tests/schema.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 986f429cc1..5c5fa8075d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -28,8 +28,8 @@ #include "windows.h" #include "ole2.h" -#include "msxml2.h" -#include "msxml2did.h" +#include "msxml6.h" +#include "msxml6did.h" #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 4637d62f8b..fc0329bd10 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -26,9 +26,9 @@ #include "initguid.h" #include "windows.h" #include "ole2.h" -#include "msxml2.h" +#include "msxml6.h" #undef CLSID_DOMDocument -#include "msxml2did.h" +#include "msxml6did.h" #include "dispex.h" #include "cguid.h" -- 2.28.0

1 0

[PATCH v2 1/4] msxml3: Use msxml6 header for defining GUIDs.
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/factory.c | 2 +- dlls/msxml3/uuid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 445cfbf730..3be974c58a 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -34,7 +34,7 @@ #include "winuser.h" #include "ole2.h" #include "msxml.h" -#include "msxml2.h" +#include "msxml6.h" #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index 4abbe5e476..7403b27c72 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -39,7 +39,7 @@ /* Now we can initialize the rest of the uuids */ #include "initguid.h" -#include "msxml2.h" +#include "msxml6.h" /* * Note that because of a #define in msxml2.h, we end up initializing -- 2.28.0

1 0

[PATCH] combase: Use typed list iteration macros.
by Nikolay Sivov 03 Sep '20

03 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/apartment.c | 12 ++++-------- dlls/combase/marshal.c | 20 ++++++++------------ dlls/combase/stubmanager.c | 28 ++++++++-------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 125eaff1429..5fbec944eb0 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -629,13 +629,11 @@ struct apartment * apartment_get_current_or_mta(void) /* The given OXID must be local to this process */ struct apartment * apartment_findfromoxid(OXID oxid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->oxid == oxid) { result = apt; @@ -653,13 +651,11 @@ struct apartment * apartment_findfromoxid(OXID oxid) * is no longer required. */ struct apartment * apartment_findfromtid(DWORD tid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->tid == tid) { result = apt; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index bcc78132651..bdfb44bffac 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -1803,12 +1803,11 @@ static HRESULT proxy_manager_create_ifproxy( static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found) { HRESULT hr = E_NOINTERFACE; /* assume not found */ - struct list * cursor; + struct ifproxy *ifproxy; EnterCriticalSection(&This->cs); - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); if (IsEqualIID(riid, &ifproxy->iid)) { *ifproxy_found = ifproxy; @@ -1823,7 +1822,7 @@ static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID ri static void proxy_manager_disconnect(struct proxy_manager * This) { - struct list * cursor; + struct ifproxy *ifproxy; TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), wine_dbgstr_longlong(This->oid)); @@ -1836,9 +1835,8 @@ static void proxy_manager_disconnect(struct proxy_manager * This) * working */ if (!(This->sorflags & SORFP_NOLIFETIMEMGMT)) { - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); ifproxy_disconnect(ifproxy); } } @@ -1963,13 +1961,12 @@ static void proxy_manager_destroy(struct proxy_manager * This) * reference to the proxy_manager when the object is no longer used. */ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) { + struct proxy_manager *proxy; BOOL found = FALSE; - struct list * cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); if ((oxid == proxy->oxid) && (oid == proxy->oid)) { /* be careful of a race with ClientIdentity_Release, which would @@ -1989,11 +1986,10 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc HRESULT apartment_disconnectproxies(struct apartment *apt) { - struct list * cursor; + struct proxy_manager *proxy; - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); proxy_manager_disconnect(proxy); } diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 16b8bb35d00..e9f20962e3b 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -137,14 +137,11 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const IPID *ipid) { - struct list *cursor; - struct ifstub *result = NULL; + struct ifstub *result = NULL, *ifstub; EnterCriticalSection(&m->lock); - LIST_FOR_EACH( cursor, &m->ifstubs ) + LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) { - struct ifstub *ifstub = LIST_ENTRY( cursor, struct ifstub, entry ); - if (IsEqualGUID(ipid, &ifstub->ipid)) { result = ifstub; @@ -337,8 +334,7 @@ ULONG stub_manager_int_release(struct stub_manager *m) * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; IUnknown *object; HRESULT hres; @@ -350,10 +346,8 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno } EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); - if (m->object == object) { result = m; @@ -386,14 +380,11 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if (m->oid == oid) { result = m; @@ -480,14 +471,11 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea * it must also call release on the stub manager when it is no longer needed */ static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, const IPID *ipid, struct ifstub **ifstub) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { result = m; -- 2.28.0

2 1

[PATCH 4/4] include: Add IXMLHTTPRequest2/3 interfaces
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml6.idl | 104 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 1f657a8cde..6e99b36060 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -109,6 +109,8 @@ interface ISchemaAny; interface ISchemaIdentityConstraint; interface ISchemaNotation; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") @@ -261,6 +263,35 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +typedef struct tagXHR_COOKIE +{ + WCHAR *url; + WCHAR *name; + WCHAR *value; + WCHAR *p3_policy; + FILETIME expire_time; + DWORD flags; +} XHR_COOKIE; + +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT = 0x0, + XHR_PROP_NO_AUTH = 0x1, + XHR_PROP_TIMEOUT = 0x2, + XHR_PROP_NO_DEFAULT_HEADERS = 0x3, + XHR_PROP_REPORT_REDIRECT_STATUS = 0x4, + XHR_PROP_NO_CACHE = 0x5, + XHR_PROP_EXTENDED_ERROR = 0x6, + XHR_PROP_QUERY_STRING_UTF8 = 0x7, + XHR_PROP_IGNORE_CERT_ERRORS = 0x8, +} XHR_PROPERTY; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1265,6 +1296,68 @@ interface IXMLHTTPRequest : IDispatch HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), + helpstring("IXMLHTTPRequest2 Interface") +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in] const WCHAR *method, [in] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in] const WCHAR *username, [in] const WCHAR *password, + [in] const WCHAR *proxy_username, [in] const WCHAR *proxy_password); + HRESULT Send([in] ISequentialStream *body, [in] ULONGLONG body_size); + HRESULT Abort(); + HRESULT SetCookie([in] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in] const WCHAR *header, [in] const WCHAR *value); + HRESULT GetAllResponseHeaders([out] WCHAR **headers); + HRESULT GetCookie([in] const WCHAR *url, [in] const WCHAR *name, [in] DWORD dwFlags, + [out] ULONG *cookies_count, [out, retval] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in] const WCHAR *header, [out, retval] WCHAR **value); +} + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c), + helpstring("IXMLHttpRequest3 Interface") +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD hash_size, [in] const BYTE *hash, [in] const WCHAR *pin); +}; + +[ + object, + uuid(A44A9299-E321-40DE-8866-341B41669162), + helpstring("IXMLHTTPRequest2Callback Interface"), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *request, [in] const WCHAR* redirect_url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *request, [in] DWORD status, [in] const WCHAR *status_str); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *request, [in] ISequentialStream *response); + HRESULT OnError([in] IXMLHTTPRequest2 *request, [in] HRESULT error); +} + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb), + helpstring("IXMLHttpRequest3Callback Interface") +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *request, [in] DWORD errors, + [in] DWORD chain_size, [in] const XHR_CERT *chain); + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *request, [in] DWORD issuers_size, + [in] const WCHAR **issuers); +}; + + [ object, dual, @@ -1554,6 +1647,17 @@ coclass XMLHTTP60 [default] interface IXMLHTTPRequest; } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1) ] -- 2.28.0

2 1

[PATCH 3/4] include: Remove interfaces already define in msxml6.idl
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml2.idl | 109 --------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index cfafc42133..a2d72d2063 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1605,15 +1605,6 @@ coclass FreeThreadedDOMDocument40 [default, source] dispinterface XMLDOMDocumentEvents; } -[ - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - [ helpstring("Free threaded XML DOM Document"), progid("Msxml2.FreeThreadedDOMDocument"), @@ -1655,14 +1646,6 @@ coclass XMLHTTP40 [default] interface IXMLHTTPRequest; } -[ - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - [ helpstring("XML HTTP"), progid("Msxml2.XMLHTTP"), @@ -1695,14 +1678,6 @@ coclass ServerXMLHTTP40 [default] interface IServerXMLHTTPRequest2; } -[ - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - [ helpstring("Server XML HTTP"), progid("Msxml2.ServerXMLHTTP"), @@ -1743,14 +1718,6 @@ coclass XMLSchemaCache40 [default] interface IXMLDOMSchemaCollection2; } -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - [ helpstring("XML Schema Cache"), progid("Msxml2.XMLSchemaCache"), @@ -1791,14 +1758,6 @@ coclass XSLTemplate40 [default] interface IXSLTemplate; } -[ - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - [ helpstring("XSL Template"), progid("Msxml2.XSLTemplate"), @@ -3290,15 +3249,6 @@ coclass SAXXMLReader40 interface ISAXXMLReader; } -[ - uuid(88d96a0c-f192-11d4-a65f-0040963251e5) -] -coclass SAXXMLReader60 -{ - [default] interface IVBSAXXMLReader; - interface ISAXXMLReader; -} - [ helpstring("SAX XML Reader"), progid("Msxml2.SAXXMLReader"), @@ -3373,26 +3323,6 @@ coclass MXHTMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a10-f192-11d4-a65f-0040963251e5) -] -coclass MXHTMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter 3.0"), progid("Msxml2.MXXMLWriter.3.0"), @@ -3437,26 +3367,6 @@ coclass MXXMLWriter40 interface IVBSAXLexicalHandler; } -[ - uuid(88d96a0f-f192-11d4-a65f-0040963251e5) -] -coclass MXXMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - [ helpstring("MXXMLWriter"), progid("Msxml2.MXXMLWriter"), @@ -3499,15 +3409,6 @@ coclass MXNamespaceManager40 interface IMXNamespaceManager; } -[ - uuid(88d96a11-f192-11d4-a65f-0040963251e5) -] -coclass MXNamespaceManager60 -{ - [default] interface IVBMXNamespaceManager; - interface IMXNamespaceManager; -} - [ helpstring("SAXAttributes 3.0"), progid("Msxml2.SAXAttributes.3.0"), @@ -3532,16 +3433,6 @@ coclass SAXAttributes40 interface ISAXAttributes; } -[ - uuid(88d96a0e-f192-11d4-a65f-0040963251e5) -] -coclass SAXAttributes60 -{ - [default] interface IMXAttributes; - interface IVBSAXAttributes; - interface ISAXAttributes; -} - [ helpstring("SAXAttributes"), progid("Msxml2.SAXAttributes"), -- 2.28.0

1 0

[PATCH 2/4] msxml3/tests: Use msxml6.h where required
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/tests/saxreader.c | 4 ++-- dlls/msxml3/tests/schema.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 986f429cc1..5c5fa8075d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -28,8 +28,8 @@ #include "windows.h" #include "ole2.h" -#include "msxml2.h" -#include "msxml2did.h" +#include "msxml6.h" +#include "msxml6did.h" #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 4637d62f8b..fc0329bd10 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -26,9 +26,9 @@ #include "initguid.h" #include "windows.h" #include "ole2.h" -#include "msxml2.h" +#include "msxml6.h" #undef CLSID_DOMDocument -#include "msxml2did.h" +#include "msxml6did.h" #include "dispex.h" #include "cguid.h" -- 2.28.0

1 0

[PATCH 1/4] msxml3: Use msxml6 header for defining GUIDs.
by Alistair Leslie-Hughes 03 Sep '20

03 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msxml3/factory.c | 2 +- dlls/msxml3/uuid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 445cfbf730..3be974c58a 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -34,7 +34,7 @@ #include "winuser.h" #include "ole2.h" #include "msxml.h" -#include "msxml2.h" +#include "msxml6.h" #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index 4abbe5e476..7403b27c72 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -39,7 +39,7 @@ /* Now we can initialize the rest of the uuids */ #include "initguid.h" -#include "msxml2.h" +#include "msxml6.h" /* * Note that because of a #define in msxml2.h, we end up initializing -- 2.28.0

1 0

[PATCH 1/2] gdi32: Only trace new faces when they are added.
by Rémi Bernon 03 Sep '20

03 Sep '20

Instead of every time they don't match another face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/freetype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f82a8c1641f..38d59e3fd9b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1574,12 +1574,11 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) return TRUE; } } - else - TRACE("Adding new %s\n", debugstr_w(face->file)); if (style_order( face ) < style_order( cursor )) break; } + TRACE("Adding new %s\n", debugstr_w(face->file)); list_add_before( &cursor->entry, &face->entry ); face->family = family; family->refcount++; -- 2.28.0

3 4

0001-winex11.drv-Fix-window-min-range-limit
by Chao Long 03 Sep '20

03 Sep '20

Limit the min range amount of application window drag and drop. longchao(a)uniontech.com

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel