wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : kernel32: Implement registry mapping in WritePrivateProfileSection().
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: d2b83336c7b219b3267035bd6ab9af5480184743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b83336c7b219b3267035bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:11 2020 -0500 kernel32: Implement registry mapping in WritePrivateProfileSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 6d8d64fc81..d4f2b32654 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1674,6 +1674,7 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, { BOOL ret = FALSE; LPWSTR p; + HKEY key, section_key; if (!section && !string) { @@ -1687,6 +1688,44 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } if (!string) return PROFILE_DeleteSection( filename, section ); + if ((key = open_file_mapping_key( filename ))) + { + /* replace existing entries, but only if they are mapped, and do not + * delete any keys */ + + const WCHAR *entry, *p; + + for (entry = string; *entry; entry += strlenW( entry ) + 1) + { + if ((p = strchrW( entry, '=' ))) + { + WCHAR *entry_copy; + p++; + if (!(entry_copy = HeapAlloc( GetProcessHeap(), 0, (p - entry) * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + RegCloseKey( key ); + return FALSE; + } + lstrcpynW( entry_copy, entry, p - entry ); + if (get_mapped_section_key( filename, section, entry_copy, TRUE, &section_key )) + { + LSTATUS res = RegSetValueExW( section_key, entry_copy, 0, REG_SZ, (const BYTE *)p, + (strlenW( p ) + 1) * sizeof(WCHAR) ); + RegCloseKey( section_key ); + if (res) + { + SetLastError( res ); + RegCloseKey( key ); + return FALSE; + } + } + } + } + RegCloseKey( key ); + return TRUE; + } + EnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, TRUE ))

1 0

Zebediah Figura : kernel32: Implement registry mapping in GetPrivateProfileSectionNames().
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 3c1ebfdf82242e28ef697c139e0e94cb5ceb3fcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1ebfdf82242e28ef697c13… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:10 2020 -0500 kernel32: Implement registry mapping in GetPrivateProfileSectionNames(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index abd5429c8d..6d8d64fc81 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1807,11 +1807,26 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, LPCWSTR filename) { DWORD ret = 0; + HKEY key; + + if ((key = open_file_mapping_key( filename ))) + { + WCHAR *section; + DWORD i; + + for (i = 0; (section = enum_key( key, i )); ++i) + { + lstrcpynW( buffer + ret, section, size - ret - 1 ); + ret = min( ret + strlenW( section ) + 1, size - 1 ); + } + + RegCloseKey( key ); + } RtlEnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, FALSE )) - ret = PROFILE_GetSectionNames(buffer, size); + ret += PROFILE_GetSectionNames( buffer + ret, size - ret ); RtlLeaveCriticalSection( &PROFILE_CritSect );

1 0

Zebediah Figura : kernel32: Implement retrieving mapped sections.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 9ed6d24ed83d20796e2c5190365c26426a0c6a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed6d24ed83d20796e2c5190… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:09 2020 -0500 kernel32: Implement retrieving mapped sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 27057e62f7..abd5429c8d 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1040,6 +1040,30 @@ static HKEY open_file_mapping_key( const WCHAR *filename ) return NULL; } +static WCHAR *enum_key( HKEY key, DWORD i ) +{ + WCHAR *value, *new_value; + DWORD max = 256, len; + LSTATUS res; + + if (!(value = HeapAlloc( GetProcessHeap(), 0, max * sizeof(WCHAR) ))) return NULL; + len = max; + while ((res = RegEnumValueW( key, i, value, &len, NULL, NULL, NULL, NULL )) == ERROR_MORE_DATA) + { + max *= 2; + if (!(new_value = HeapReAlloc( GetProcessHeap(), 0, value, max * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, value ); + return NULL; + } + value = new_value; + len = max; + } + if (!res) return value; + HeapFree( GetProcessHeap(), 0, value ); + return NULL; +} + static WCHAR *get_key_value( HKEY key, const WCHAR *value ) { DWORD size = 0; @@ -1142,6 +1166,103 @@ static BOOL get_mapped_section_key( const WCHAR *filename, const WCHAR *section, return TRUE; } +static DWORD get_mapped_section( HKEY key, WCHAR *buffer, DWORD size, BOOL return_values ) +{ + WCHAR *entry, *value; + DWORD i, ret = 0; + + for (i = 0; (entry = enum_key( key, i )); ++i) + { + lstrcpynW( buffer + ret, entry, size - ret - 1 ); + ret = min( ret + strlenW( entry ) + 1, size - 1 ); + if (return_values && ret < size - 1 && (value = get_key_value( key, entry ))) + { + buffer[ret - 1] = '='; + lstrcpynW( buffer + ret, value, size - ret - 1 ); + ret = min( ret + strlenW( value ) + 1, size - 1 ); + HeapFree( GetProcessHeap(), 0, value ); + } + HeapFree( GetProcessHeap(), 0, entry ); + } + + return ret; +} + +static DWORD get_section( const WCHAR *filename, const WCHAR *section, + WCHAR *buffer, DWORD size, BOOL return_values ) +{ + HKEY key, subkey, section_key; + BOOL use_ini = TRUE; + DWORD ret = 0; + WCHAR *path; + + if ((key = open_file_mapping_key( filename ))) + { + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + WCHAR *entry, *value; + HKEY entry_key; + DWORD i; + + for (i = 0; (entry = enum_key( subkey, i )); ++i) + { + if (!(path = get_key_value( subkey, entry ))) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + entry_key = open_mapped_key( path, FALSE ); + HeapFree( GetProcessHeap(), 0, path ); + if (!entry_key) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + if (entry[0]) + { + if ((value = get_key_value( entry_key, entry ))) + { + lstrcpynW( buffer + ret, entry, size - ret - 1 ); + ret = min( ret + strlenW( entry ) + 1, size - 1 ); + if (return_values && ret < size - 1) + { + buffer[ret - 1] = '='; + lstrcpynW( buffer + ret, value, size - ret - 1 ); + ret = min( ret + strlenW( value ) + 1, size - 1 ); + } + HeapFree( GetProcessHeap(), 0, value ); + } + } + else + { + ret = get_mapped_section( entry_key, buffer, size, return_values ); + use_ini = FALSE; + } + + HeapFree( GetProcessHeap(), 0, entry ); + RegCloseKey( entry_key ); + } + + RegCloseKey( subkey ); + } + else if (get_mapped_section_key( filename, section, NULL, FALSE, &section_key )) + { + ret = get_mapped_section( section_key, buffer, size, return_values ); + use_ini = FALSE; + RegCloseKey( section_key ); + } + + RegCloseKey( key ); + } + + if (use_ini) + ret += PROFILE_GetSection( filename, section, buffer + ret, size - ret, return_values ); + + return ret; +} + /********************* API functions **********************************/ @@ -1182,7 +1303,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename ); if (!entry) { - ret = PROFILE_GetSection( filename, section, buffer, len, FALSE ); + ret = get_section( filename, section, buffer, len, FALSE ); if (!buffer[0]) { PROFILE_CopyEntry( buffer, def_val, len ); @@ -1400,7 +1521,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); - return PROFILE_GetSection( filename, section, buffer, len, TRUE ); + return get_section( filename, section, buffer, len, TRUE ); } /***********************************************************************

1 0

Zebediah Figura : kernel32: Implement registry mapping in WritePrivateProfileStringW().
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 73fc0a18a693c179d676d38fe8cf0df8f7679ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73fc0a18a693c179d676d38f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:08 2020 -0500 kernel32: Implement registry mapping in WritePrivateProfileStringW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 3e06543a66..27057e62f7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1473,6 +1473,9 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename ) { BOOL ret = FALSE; + HKEY key; + + TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), debugstr_w(string), debugstr_w(filename)); if (!section && !entry && !string) /* documented "file flush" case */ { @@ -1486,6 +1489,20 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } if (!entry) return PROFILE_DeleteSection( filename, section ); + if (get_mapped_section_key( filename, section, entry, TRUE, &key )) + { + LSTATUS res; + + if (string) + res = RegSetValueExW( key, entry, 0, REG_SZ, (const BYTE *)string, + (strlenW( string ) + 1) * sizeof(WCHAR) ); + else + res = RegDeleteValueW( key, entry ); + RegCloseKey( key ); + if (res) SetLastError( res ); + return !res; + } + EnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, TRUE ))

1 0

Zebediah Figura : kernel32: Implement registry mapping in GetPrivateProfileStringW().
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 7c4f2d5342a8673af994077ed2e586b0f3410583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4f2d5342a8673af994077e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:07 2020 -0500 kernel32: Implement registry mapping in GetPrivateProfileStringW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=4096 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 170 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 2cf0819023..3e06543a66 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -29,7 +29,9 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" +#include "winreg.h" #include "winternl.h" +#include "shlwapi.h" #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -1016,6 +1018,129 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, return TRUE; } +static HKEY open_file_mapping_key( const WCHAR *filename ) +{ + static const WCHAR mapping_pathW[] = {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','i','F','i','l','e','M','a','p','p','i','n','g',0}; + static HKEY mapping_key; + HKEY key; + + EnterCriticalSection( &PROFILE_CritSect ); + + if (!mapping_key && RegOpenKeyExW( HKEY_LOCAL_MACHINE, mapping_pathW, 0, KEY_WOW64_64KEY, &mapping_key )) + mapping_key = NULL; + + LeaveCriticalSection( &PROFILE_CritSect ); + + if (mapping_key && !RegOpenKeyExW( mapping_key, PathFindFileNameW( filename ), 0, KEY_READ, &key )) + return key; + return NULL; +} + +static WCHAR *get_key_value( HKEY key, const WCHAR *value ) +{ + DWORD size = 0; + WCHAR *data; + + if (RegGetValueW( key, NULL, value, RRF_RT_REG_SZ | RRF_NOEXPAND, NULL, NULL, &size )) return NULL; + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!RegGetValueW( key, NULL, value, RRF_RT_REG_SZ | RRF_NOEXPAND, NULL, (BYTE *)data, &size )) return data; + HeapFree( GetProcessHeap(), 0, data ); + return NULL; +} + +static HKEY open_mapped_key( const WCHAR *path, BOOL write ) +{ + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\',0}; + static const WCHAR usrW[] = {'U','S','R',':'}; + static const WCHAR sysW[] = {'S','Y','S',':'}; + WCHAR *combined_path; + const WCHAR *p; + LSTATUS res; + HKEY key; + + TRACE("%s\n", debugstr_w( path )); + + for (p = path; strchr("!#@", *p); p++) + FIXME("ignoring %c modifier\n", *p); + + if (!strncmpW( p, usrW, ARRAY_SIZE( usrW ) )) + { + if (write) + res = RegCreateKeyExW( HKEY_CURRENT_USER, p + 4, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL ); + else + res = RegOpenKeyExW( HKEY_CURRENT_USER, p + 4, 0, KEY_READ, &key ); + return res ? NULL : key; + } + + if (!strncmpW( p, sysW, ARRAY_SIZE( sysW ) )) + { + p += 4; + if (!(combined_path = HeapAlloc( GetProcessHeap(), 0, + (ARRAY_SIZE( softwareW ) + strlenW( p )) * sizeof(WCHAR) ))) + return NULL; + strcpyW( combined_path, softwareW ); + strcatW( combined_path, p ); + if (write) + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, combined_path, 0, NULL, + 0, KEY_READ | KEY_WRITE, NULL, &key, NULL ); + else + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, combined_path, 0, KEY_READ, &key ); + HeapFree( GetProcessHeap(), 0, combined_path ); + return res ? NULL : key; + } + + FIXME("unhandled path syntax %s\n", debugstr_w( path )); + return NULL; +} + +/* returns TRUE if the given section + name is mapped */ +static BOOL get_mapped_section_key( const WCHAR *filename, const WCHAR *section, + const WCHAR *name, BOOL write, HKEY *ret_key ) +{ + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *path = NULL, *combined_path; + HKEY key, subkey = NULL; + + if (!(key = open_file_mapping_key( filename ))) + return FALSE; + + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + if (!(path = get_key_value( subkey, name ))) + path = get_key_value( subkey, NULL ); + RegCloseKey( subkey ); + RegCloseKey( key ); + if (!path) return FALSE; + } + else + { + if (!(path = get_key_value( key, section ))) + { + if ((path = get_key_value( key, NULL ))) + { + if ((combined_path = HeapAlloc( GetProcessHeap(), 0, + (strlenW( path ) + strlenW( section ) + 2) * sizeof(WCHAR) ))) + { + strcpyW( combined_path, path ); + strcatW( combined_path, backslashW ); + strcatW( combined_path, section ); + } + HeapFree( GetProcessHeap(), 0, path ); + path = combined_path; + } + } + RegCloseKey( key ); + if (!path) return FALSE; + } + + *ret_key = open_mapped_key( path, write ); + HeapFree( GetProcessHeap(), 0, path ); + return TRUE; +} /********************* API functions **********************************/ @@ -1047,6 +1172,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, int ret; LPWSTR defval_tmp = NULL; const WCHAR *p; + HKEY key; TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); @@ -1080,22 +1206,46 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, def_val = defval_tmp; } - RtlEnterCriticalSection( &PROFILE_CritSect ); - - if (PROFILE_Open( filename, FALSE )) + if (get_mapped_section_key( filename, section, entry, FALSE, &key )) { - PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); - TRACE("-> %s\n", debugstr_w( buffer )); + if (key) + { + WCHAR *value; + + if ((value = get_key_value( key, entry ))) + { + lstrcpynW( buffer, value, len ); + HeapFree( GetProcessHeap(), 0, value ); + } + else + lstrcpynW( buffer, def_val, len ); + + RegCloseKey( key ); + } + else + lstrcpynW( buffer, def_val, len ); + ret = strlenW( buffer ); } else { - lstrcpynW( buffer, def_val, len ); - ret = strlenW( buffer ); - } + EnterCriticalSection( &PROFILE_CritSect ); - RtlLeaveCriticalSection( &PROFILE_CritSect ); + if (PROFILE_Open( filename, FALSE )) + { + PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); + TRACE("-> %s\n", debugstr_w( buffer )); + ret = strlenW( buffer ); + } + else + { + lstrcpynW( buffer, def_val, len ); + ret = strlenW( buffer ); + } + + LeaveCriticalSection( &PROFILE_CritSect ); + } HeapFree(GetProcessHeap(), 0, defval_tmp);

1 0

Serge Gautherie : crypt32: Check CRYPT_ConstructBitBlob() return value in CRYPT_ExportKeyTrans().
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 3e8b07309c293d00e6b71164373e52c0dd19f29f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8b07309c293d00e6b71164… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 4 22:32:30 2020 +0200 crypt32: Check CRYPT_ConstructBitBlob() return value in CRYPT_ExportKeyTrans(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f591a5e72e..5df03f7c99 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1574,9 +1574,8 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( ret = CRYPT_ConstructAlgorithmId(&keyInfo.Algorithm, &pKeyTransEncodeInfo->KeyEncryptionAlgorithm); if (ret) - CRYPT_ConstructBitBlob(&keyInfo.PublicKey, + ret = CRYPT_ConstructBitBlob(&keyInfo.PublicKey, &pKeyTransEncodeInfo->RecipientPublicKey); - if (ret) ret = CryptImportPublicKeyInfo(pKeyTransEncodeInfo->hCryptProv, X509_ASN_ENCODING, &keyInfo, &expKey);

1 0

Nikolay Sivov : mf/topoloader: Add a structure for iterative branch resolution.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: e308d81a617632fe0fedd243952f79e8d9ec05b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e308d81a617632fe0fedd243… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 15:55:47 2020 +0300 mf/topoloader: Add a structure for iterative branch resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 9 +++- dlls/mf/topology.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 143 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aa2c5199b9..f01385cc46 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1400,6 +1400,7 @@ static void test_topology_loader(void) IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; + IMFStreamSink *stream_sink; unsigned int count, value; IMFMediaType *media_type; IMFStreamDescriptor *sd; @@ -1512,15 +1513,19 @@ todo_wine hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink); + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + IMFStreamSink_Release(stream_sink); + hr = IMFTopology_GetCount(topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology, "Unexpected instance.\n"); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 840f1bd25f..8032e438b7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1935,17 +1935,41 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) struct topoloader_context { + IMFTopology *input_topology; IMFTopology *output_topology; + unsigned int marker; GUID key; }; +static IMFTopologyNode *topology_loader_get_node_for_marker(struct topoloader_context *context, TOPOID *id) +{ + IMFTopologyNode *node; + unsigned short i = 0; + unsigned int value; + + while (SUCCEEDED(IMFTopology_GetNode(context->output_topology, i++, &node))) + { + if (SUCCEEDED(IMFTopologyNode_GetUINT32(node, &context->key, &value)) && value == context->marker) + { + IMFTopologyNode_GetTopoNodeID(node, id); + return node; + } + IMFTopologyNode_Release(node); + } + + *id = 0; + return NULL; +} + static HRESULT topology_loader_clone_node(struct topoloader_context *context, IMFTopologyNode *node, - unsigned int marker) + IMFTopologyNode **ret, unsigned int marker) { IMFTopologyNode *cloned_node; MF_TOPOLOGY_TYPE node_type; HRESULT hr; + if (ret) *ret = NULL; + IMFTopologyNode_GetNodeType(node, &node_type); if (FAILED(hr = MFCreateTopologyNode(node_type, &cloned_node))) @@ -1957,17 +1981,113 @@ static HRESULT topology_loader_clone_node(struct topoloader_context *context, IM if (SUCCEEDED(hr)) hr = IMFTopology_AddNode(context->output_topology, cloned_node); + if (SUCCEEDED(hr) && ret) + { + *ret = cloned_node; + IMFTopologyNode_AddRef(*ret); + } + IMFTopologyNode_Release(cloned_node); return hr; } +typedef HRESULT (*p_topology_loader_connect_func)(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index); + +static HRESULT topology_loader_connect_source_node(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index) +{ + FIXME("Unimplemented.\n"); + + return E_NOTIMPL; +} + +static HRESULT topology_loader_resolve_branch(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int output_index, IMFTopologyNode *downstream_node, unsigned input_index) +{ + static const p_topology_loader_connect_func connectors[MF_TOPOLOGY_TEE_NODE+1][MF_TOPOLOGY_TEE_NODE+1] = + { + /* OUTPUT */ { NULL }, + /* SOURCESTREAM */ { topology_loader_connect_source_node, NULL, NULL, NULL }, + /* TRANSFORM */ { NULL }, + /* TEE */ { NULL }, + }; + MF_TOPOLOGY_TYPE u_type, d_type; + IMFTopologyNode *node; + TOPOID id; + + /* Downstream node might have already been cloned. */ + IMFTopologyNode_GetTopoNodeID(downstream_node, &id); + if (FAILED(IMFTopology_GetNodeByID(context->output_topology, id, &node))) + topology_loader_clone_node(context, downstream_node, &node, context->marker + 1); + + IMFTopologyNode_ConnectOutput(upstream_node, output_index, node, input_index); + + IMFTopologyNode_GetNodeType(upstream_node, &u_type); + IMFTopologyNode_GetNodeType(downstream_node, &d_type); + + if (!connectors[u_type][d_type]) + { + WARN("Unsupported branch kind %d -> %d.\n", u_type, d_type); + return E_FAIL; + } + + return connectors[u_type][d_type](context, upstream_node, output_index, downstream_node, input_index); +} + +static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size) +{ + IMFTopologyNode *downstream_node, *node, *orig_node; + unsigned int input_index, size = 0; + MF_TOPOLOGY_TYPE node_type; + HRESULT hr = S_OK; + TOPOID id; + + while ((node = topology_loader_get_node_for_marker(context, &id))) + { + ++size; + + IMFTopology_GetNodeByID(context->input_topology, id, &orig_node); + + IMFTopologyNode_GetNodeType(node, &node_type); + switch (node_type) + { + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (FAILED(IMFTopologyNode_GetOutput(orig_node, 0, &downstream_node, &input_index))) + { + IMFTopology_RemoveNode(context->output_topology, node); + continue; + } + + hr = topology_loader_resolve_branch(context, node, 0, downstream_node, input_index); + break; + case MF_TOPOLOGY_TRANSFORM_NODE: + case MF_TOPOLOGY_TEE_NODE: + FIXME("Unsupported node type %d.\n", node_type); + break; + default: + WARN("Unexpected node type %d.\n", node_type); + } + + IMFTopologyNode_DeleteItem(node, &context->key); + + if (FAILED(hr)) + break; + } + + *layer_size = size; + + return hr; +} + static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **ret_topology, IMFTopology *current_topology) { struct topoloader_context context = { 0 }; IMFTopology *output_topology; MF_TOPOLOGY_TYPE node_type; + unsigned int layer_size; IMFTopologyNode *node; unsigned short i = 0; IMFStreamSink *sink; @@ -2016,6 +2136,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; + context.input_topology = input_topology; context.output_topology = output_topology; memset(&context.key, 0xff, sizeof(context.key)); @@ -2027,13 +2148,26 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { - if (FAILED(hr = topology_loader_clone_node(&context, node, 0))) + if (FAILED(hr = topology_loader_clone_node(&context, node, NULL, 0))) WARN("Failed to clone source node, hr %#x.\n", hr); } IMFTopologyNode_Release(node); } + for (context.marker = 0;; ++context.marker) + { + if (FAILED(hr = topology_loader_resolve_nodes(&context, &layer_size))) + { + WARN("Failed to resolve for marker %u, hr %#x.\n", context.marker, hr); + break; + } + + /* Reached last marker value. */ + if (!layer_size) + break; + } + /* For now return original topology. */ *ret_topology = output_topology;

1 0

Nikolay Sivov : mf/topoloader: Clone source nodes as a first layer of resulting topology.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 16d44b61d15193905ef40661bc1547cb45e7b019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d44b61d15193905ef40661… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 15:55:46 2020 +0300 mf/topoloader: Clone source nodes as a first layer of resulting topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8522f56969..840f1bd25f 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1933,9 +1933,40 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) return refcount; } +struct topoloader_context +{ + IMFTopology *output_topology; + GUID key; +}; + +static HRESULT topology_loader_clone_node(struct topoloader_context *context, IMFTopologyNode *node, + unsigned int marker) +{ + IMFTopologyNode *cloned_node; + MF_TOPOLOGY_TYPE node_type; + HRESULT hr; + + IMFTopologyNode_GetNodeType(node, &node_type); + + if (FAILED(hr = MFCreateTopologyNode(node_type, &cloned_node))) + return hr; + + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(cloned_node, node))) + hr = IMFTopologyNode_SetUINT32(cloned_node, &context->key, marker); + + if (SUCCEEDED(hr)) + hr = IMFTopology_AddNode(context->output_topology, cloned_node); + + IMFTopologyNode_Release(cloned_node); + + return hr; +} + static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, - IMFTopology **output_topology, IMFTopology *current_topology) + IMFTopology **ret_topology, IMFTopology *current_topology) { + struct topoloader_context context = { 0 }; + IMFTopology *output_topology; MF_TOPOLOGY_TYPE node_type; IMFTopologyNode *node; unsigned short i = 0; @@ -1943,7 +1974,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IUnknown *object; HRESULT hr = E_FAIL; - FIXME("%p, %p, %p, %p.\n", iface, input_topology, output_topology, current_topology); + FIXME("%p, %p, %p, %p.\n", iface, input_topology, ret_topology, current_topology); if (current_topology) FIXME("Current topology instance is ignored.\n"); @@ -1982,10 +2013,32 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in return hr; } - if (FAILED(hr = MFCreateTopology(output_topology))) + if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; - return IMFTopology_CloneFrom(*output_topology, input_topology); + context.output_topology = output_topology; + memset(&context.key, 0xff, sizeof(context.key)); + + /* Clone source nodes, use initial marker value. */ + i = 0; + while (SUCCEEDED(IMFTopology_GetNode(input_topology, i++, &node))) + { + IMFTopologyNode_GetNodeType(node, &node_type); + + if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + if (FAILED(hr = topology_loader_clone_node(&context, node, 0))) + WARN("Failed to clone source node, hr %#x.\n", hr); + } + + IMFTopologyNode_Release(node); + } + + /* For now return original topology. */ + + *ret_topology = output_topology; + + return IMFTopology_CloneFrom(output_topology, input_topology); } static const IMFTopoLoaderVtbl topologyloadervtbl =

1 0

Nikolay Sivov : mf/topoloader: Switch to public interface for initial topology validation.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 8e343024b577892bd4908304ded34b758579698d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e343024b577892bd4908304… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 15:55:45 2020 +0300 mf/topoloader: Switch to public interface for initial topology validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index abe66c45fd..8522f56969 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1936,38 +1936,50 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **output_topology, IMFTopology *current_topology) { - struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + unsigned short i = 0; IMFStreamSink *sink; - HRESULT hr; - size_t i; + IUnknown *object; + HRESULT hr = E_FAIL; FIXME("%p, %p, %p, %p.\n", iface, input_topology, output_topology, current_topology); if (current_topology) FIXME("Current topology instance is ignored.\n"); - for (i = 0; i < topology->nodes.count; ++i) + /* Basic sanity checks for input topology: + + - source nodes must have stream descriptor set; + - sink nodes must be resolved to stream sink objects; + */ + while (SUCCEEDED(IMFTopology_GetNode(input_topology, i++, &node))) { - struct topology_node *node = topology->nodes.nodes[i]; + IMFTopologyNode_GetNodeType(node, &node_type); - switch (node->node_type) + switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (node->object) + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) - return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFStreamSink_Release(sink); + if (FAILED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&sink))) + hr = MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; + else if (sink) + IMFStreamSink_Release(sink); + IUnknown_Release(object); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (FAILED(hr = IMFAttributes_GetItem(node->attributes, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL))) - return hr; + hr = IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL); break; default: ; } + + IMFTopologyNode_Release(node); + if (FAILED(hr)) + return hr; } if (FAILED(hr = MFCreateTopology(output_topology)))

1 0

Shawn M. Chapla : gdiplus: Set font emSize to height minus internal leading.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 04d536267e35cc7f3d30667971e1c6dbd5a298f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d536267e35cc7f3d306679… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jul 14 21:24:57 2020 -0400 gdiplus: Set font emSize to height minus internal leading. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codewevers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a7719a9458..eb0b6c0836 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -219,7 +219,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, if (!*font) return OutOfMemory; (*font)->unit = UnitWorld; - (*font)->emSize = otm.otmTextMetrics.tmAscent; + (*font)->emSize = otm.otmTextMetrics.tmHeight - otm.otmTextMetrics.tmInternalLeading; (*font)->otm = otm; stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 74cf451e36..b762f7c45f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -344,7 +344,7 @@ static void test_logfont(void) stat = GdipGetFontSize(font, &rval); expect(Ok, stat); - todo_wine expectf(test_sizes[i].expected, rval); + expectf(test_sizes[i].expected, rval); GdipDeleteFont(font); font = NULL;

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
83
Older →

Jump to page:

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-commits July 2020