October 2020 - Wine-commits

Huw Davies : riched20: Fix the struct size check in the para fmt retrieval function.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 9908c5d3c44b80552947096c97146609e98430e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9908c5d3c44b80552947096c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:30 2020 +0000 riched20: Fix the struct size check in the para fmt retrieval function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e1b848cf8f9..c7a0e271510 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -928,7 +928,8 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) ME_DisplayItem *para, *para_end; PARAFORMAT2 *curFmt; - if (pFmt->cbSize < sizeof(PARAFORMAT)) { + if (pFmt->cbSize < sizeof(PARAFORMAT)) + { pFmt->dwMask = 0; return; } @@ -951,13 +952,14 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent); CHECK_FIELD(PFM_OFFSET, dxOffset); CHECK_FIELD(PFM_ALIGNMENT, wAlignment); - if (pFmt->dwMask & PFM_TABSTOPS) { + if (pFmt->dwMask & PFM_TABSTOPS) + { if (pFmt->cTabCount != para->member.para.fmt.cTabCount || memcmp(pFmt->rgxTabs, curFmt->rgxTabs, curFmt->cTabCount*sizeof(int))) pFmt->dwMask &= ~PFM_TABSTOPS; } - if (pFmt->dwMask >= sizeof(PARAFORMAT2)) + if (pFmt->cbSize >= sizeof(PARAFORMAT2)) { pFmt->dwMask &= ~((pFmt->wEffects ^ curFmt->wEffects) << 16); CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore);

1 0

Alexandre Julliard : gdi32: Move the loading of system fonts out of freetype.c.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 131d3b1f5d371257af90593f79d1753d6d53e533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131d3b1f5d371257af90593f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:06 2020 +0100 gdi32: Move the loading of system fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 22 ++++++++++++++++++++++ dlls/gdi32/freetype.c | 39 +-------------------------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af87c66498f..d4ed29d7fd9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5375,6 +5375,28 @@ static BOOL remove_font_resource( LPCWSTR file, DWORD flags ) return ret; } +void load_system_bitmap_fonts(void) +{ + static const WCHAR keyW[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR fontsW[] = {'F','O','N','T','S','.','F','O','N',0}; + static const WCHAR oemfontW[] = {'O','E','M','F','O','N','T','.','F','O','N',0}; + static const WCHAR fixedfonW[] = {'F','I','X','E','D','F','O','N','.','F','O','N',0}; + static const WCHAR * const fonts[] = { fontsW, oemfontW, fixedfonW }; + + HKEY hkey; + WCHAR data[MAX_PATH]; + DWORD i, dlen, type; + + if (RegOpenKeyW( HKEY_CURRENT_CONFIG, keyW, &hkey )) return; + for (i = 0; i < ARRAY_SIZE(fonts); i++) + { + dlen = sizeof(data); + if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ed6077443f..0a05f6a701c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -340,18 +340,6 @@ static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'F','o','n','t','s','\0'}; -static const WCHAR system_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F','O','N','\0'}; -static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; -static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; - -static const WCHAR * const SystemFontValues[] = { - System_Value, - OEMFont_Value, - FixedSys_Value, - NULL -}; - static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; @@ -2861,30 +2849,6 @@ static void load_mac_fonts(void) #endif -static void load_system_fonts(void) -{ - HKEY hkey; - WCHAR data[MAX_PATH], pathW[MAX_PATH]; - const WCHAR * const *value; - DWORD dlen, type; - - if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - for(value = SystemFontValues; *value; value++) { - dlen = sizeof(data); - if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && - type == REG_SZ) { - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - } - RegCloseKey(hkey); - } -} - static WCHAR *get_full_path_name(const WCHAR *name) { WCHAR *full_path; @@ -3456,8 +3420,7 @@ static void init_font_list(void) delete_external_font_keys(); - /* load the system bitmap fonts */ - load_system_fonts(); + load_system_bitmap_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ GetWindowsDirectoryW(path, ARRAY_SIZE(path)); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 32cdace5c7d..5c4da5d629d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -392,6 +392,7 @@ struct font_backend_funcs extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; +extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the loading of registry fonts out of freetype.c.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 2c1a42bc675425f9820f05752a9904268a8a610c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a42bc675425f9820f0575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:20 2020 +0100 gdi32: Move the loading of registry fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 49 ++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 53 +----------------------------------------------- dlls/gdi32/gdi_private.h | 3 +-- 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d4ed29d7fd9..3718d73f871 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -109,6 +109,11 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } +static inline BOOL is_win9x(void) +{ + return GetVersion() & 0x80000000; +} + static inline WCHAR *strdupW( const WCHAR *p ) { WCHAR *ret; @@ -375,7 +380,7 @@ void get_font_dir( WCHAR *path ) else path[1] = '\\'; /* change \??\ to \\?\ */ } -void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR slashW[] = {'\\',0}; @@ -384,7 +389,7 @@ void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) strcatW( path, file ); } -void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5397,6 +5402,46 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +void load_registry_fonts(void) +{ + static const WCHAR dot_fonW[] = {'.','f','o','n',0}; + static const WCHAR win9x_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'F','o','n','t','s',0}; + static const WCHAR winnt_key[] = {'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','\\', + 'F','o','n','t','s',0}; + WCHAR value[MAX_PATH], data[MAX_PATH]; + DWORD i = 0, type, dlen, vlen; + HKEY hkey; + + /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts + for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their + full path as the entry. Also look for any .fon fonts, since ReadFontDir + will skip these. */ + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, is_win9x() ? win9x_key : winnt_key, &hkey )) + return; + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen )) + { + dlen /= sizeof(WCHAR); + if (data[0] && data[1] == ':') + add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + else if (dlen >= 6 && !strcmpiW( data + dlen - 5, dot_fonW )) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a05f6a701c..ee628a08304 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -768,10 +768,6 @@ static char **expand_mac_font(const char *path) #endif /* HAVE_CARBON_CARBON_H */ -static inline BOOL is_win9x(void) -{ - return GetVersion() & 0x80000000; -} /* This function builds an FT_Fixed from a double. It fails if the absolute value of the float number is greater than 32768. @@ -3411,10 +3407,8 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; static const WCHAR pathW[] = {'P','a','t','h',0}; HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR path[MAX_PATH]; char *unixname; @@ -3431,52 +3425,7 @@ static void init_font_list(void) get_font_dir( path ); read_font_dir( path, TRUE ); - /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts - for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their - full path as the entry. Also look for any .fon fonts, since ReadFontDir - will skip these. */ - if(RegOpenKeyW(HKEY_LOCAL_MACHINE, - is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, - &hkey) == ERROR_SUCCESS) - { - LPWSTR data, valueW; - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); - if (valueW && data) - { - dlen = datalen * sizeof(WCHAR); - vlen = valuelen; - while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, (LPBYTE)data, - &dlen) == ERROR_SUCCESS) - { - if(data[0] && (data[1] == ':')) - { - freetype_add_font( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - } - else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) - { - WCHAR pathW[MAX_PATH]; - - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, valueW); - RegCloseKey(hkey); - } + load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG load_fontconfig_fonts(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5c4da5d629d..080f53c1b61 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -390,9 +390,8 @@ struct font_backend_funcs }; extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the loading of filesystem fonts out of freetype.c.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 7b291a094d20e315d44ae88a09529581556fd9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b291a094d20e315d44ae88a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:32 2020 +0100 gdi32: Move the loading of filesystem fonts out of freetype.c. The fonts Path value now expects DOS paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 ++++++++++++++++++++++++++++++++++---------- dlls/gdi32/freetype.c | 73 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 58 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3718d73f871..4e1c69d886e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -359,36 +359,26 @@ CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define WINE_FONT_DIR "fonts" #endif -void get_font_dir( WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) { - const char fontdir[] = WINE_FONT_DIR; - strcatW( path, slashW ); + const char fontdir[] = "\\" WINE_FONT_DIR "\\"; MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); } else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) { strcatW( path, fontsW ); } + strcatW( path, file ); if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); else path[1] = '\\'; /* change \??\ to \\?\ */ } -static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\',0}; - - get_font_dir( path ); - strcatW( path, slashW ); - strcatW( path, file ); -} - static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5402,6 +5392,56 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +static void load_directory_fonts( WCHAR *path, UINT flags ) +{ + HANDLE handle; + WIN32_FIND_DATAW data; + WCHAR *p; + + p = path + strlenW(path) - 1; + TRACE( "loading fonts from %s\n", debugstr_w(path) ); + handle = FindFirstFileW( path, &data ); + if (handle == INVALID_HANDLE_VALUE) return; + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + strcpyW( p, data.cFileName ); + font_funcs->add_font( path, flags ); + } while (FindNextFileW( handle, &data )); + FindClose( handle ); +} + +void load_file_system_fonts(void) +{ + static const WCHAR pathW[] = {'P','a','t','h',0}; + static const WCHAR slashstarW[] = {'\\','*',0}; + static const WCHAR starW[] = {'*',0}; + WCHAR *ptr, *next, path[MAX_PATH], value[1024]; + DWORD len = ARRAY_SIZE(value); + + /* Windows directory */ + get_fonts_win_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + + /* Wine data directory */ + get_fonts_data_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + + /* custom paths */ + /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ + if (!RegQueryValueExW( wine_fonts_key, pathW, NULL, NULL, (BYTE *)value, &len )) + { + for (ptr = value; ptr; ptr = next) + { + if ((next = strchrW( ptr, ';' ))) *next++ = 0; + if (next && next - ptr < 2) continue; + lstrcpynW( path, ptr, MAX_PATH - 2 ); + strcatW( path, slashstarW ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + } + } +} + void load_registry_fonts(void) { static const WCHAR dot_fonW[] = {'.','f','o','n',0}; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ee628a08304..0a5f5af491b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -329,7 +329,6 @@ static struct list font_list = LIST_INIT(font_list); static const struct font_backend_funcs font_funcs; -static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -2545,6 +2544,7 @@ skip_internal: list_add_tail(&system_links, &system_font_link->entry); } +#ifdef __ANDROID__ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { DIR *dir; @@ -2585,16 +2585,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) closedir(dir); return TRUE; } - -static void read_font_dir( const WCHAR *dirname, BOOL external_fonts ) -{ - char *unixname = wine_get_unix_file_name( dirname ); - if (unixname) - { - ReadFontDir( unixname, external_fonts ); - HeapFree( GetProcessHeap(), 0, unixname ); - } -} +#endif #ifdef SONAME_LIBFONTCONFIG @@ -3407,24 +3398,9 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR pathW[] = {'P','a','t','h',0}; - HKEY hkey; - WCHAR path[MAX_PATH]; - char *unixname; - delete_external_font_keys(); - load_system_bitmap_fonts(); - - /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - strcatW(path, fontsW); - read_font_dir( path, FALSE ); - - /* load the wine fonts */ - get_font_dir( path ); - read_font_dir( path, TRUE ); - + load_file_system_fonts(); load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG @@ -3434,49 +3410,6 @@ static void init_font_list(void) #elif defined(__ANDROID__) ReadFontDir("/system/fonts", TRUE); #endif - - /* then look in any directories that we've specified in the config file */ - /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) == ERROR_SUCCESS) - { - DWORD len; - LPWSTR valueW; - LPSTR valueA, ptr; - - if (RegQueryValueExW( hkey, pathW, NULL, NULL, NULL, &len ) == ERROR_SUCCESS) - { - len += sizeof(WCHAR); - valueW = HeapAlloc( GetProcessHeap(), 0, len ); - if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) - { - len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); - valueA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, len, NULL, NULL ); - TRACE( "got font path %s\n", debugstr_a(valueA) ); - ptr = valueA; - while (ptr) - { - const char* home; - LPSTR next = strchr( ptr, ':' ); - if (next) *next++ = 0; - if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && - (unixname = HeapAlloc( GetProcessHeap(), 0, strlen(ptr) + strlen(home) ))) - { - strcpy( unixname, home ); - strcat( unixname, ptr + 1 ); - ReadFontDir( unixname, TRUE ); - HeapFree( GetProcessHeap(), 0, unixname ); - } - else - ReadFontDir( ptr, TRUE ); - ptr = next; - } - HeapFree( GetProcessHeap(), 0, valueA ); - } - HeapFree( GetProcessHeap(), 0, valueW ); - } - RegCloseKey(hkey); - } } static BOOL move_to_front(const WCHAR *name) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 080f53c1b61..aa6e6ddcaa9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -389,8 +389,8 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; -extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_file_system_fonts(void) DECLSPEC_HIDDEN; extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN;

1 0

Myah Caron : include: Introduce MEM_EXTENDED_PARAMETER.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 3c8832711ea75f6a2b9d536050d21a6d39f96cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c8832711ea75f6a2b9d5360… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:43:47 2020 +0000 include: Introduce MEM_EXTENDED_PARAMETER. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 10b3253923b..1945ee82eab 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -736,6 +736,35 @@ typedef struct _MEMORY_BASIC_INFORMATION DWORD Type; } MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; +#define MEM_EXTENDED_PARAMETER_TYPE_BITS 8 + +typedef enum MEM_EXTENDED_PARAMETER_TYPE { + MemExtendedParameterInvalidType = 0, + MemExtendedParameterAddressRequirements, + MemExtendedParameterNumaNode, + MemExtendedParameterPartitionHandle, + MemExtendedParameterUserPhysicalHandle, + MemExtendedParameterAttributeFlags, + MemExtendedParameterMax +} MEM_EXTENDED_PARAMETER_TYPE, *PMEM_EXTENDED_PARAMETER_TYPE; + +typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + } DUMMYSTRUCTNAME; + + union + { + DWORD64 ULong64; + PVOID Pointer; + SIZE_T Size; + HANDLE Handle; + DWORD ULong; + } DUMMYUNIONNAME; +} MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; + #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04

1 0

Myah Caron : ntdll: Stub NtAllocateVirtualMemoryEx.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: d453db5ba205fc687f48eae9d9a66afcaa4c5d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d453db5ba205fc687f48eae9… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:44:17 2020 +0000 ntdll: Stub NtAllocateVirtualMemoryEx. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/virtual.c | 21 +++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ include/winternl.h | 1 + 4 files changed, 39 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca427c46c04..dbd2eab1fa1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -141,6 +141,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall -syscall NtAllocateVirtualMemory(long ptr long ptr long long) +@ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) @ stub NtCallbackReturn @@ -1146,6 +1147,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private -syscall ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory +@ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject @ stub ZwCallbackReturn diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7049f234a9f..9c2cf824018 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -34,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, + MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); static SYSTEM_BASIC_INFORMATION sbi; @@ -215,6 +217,24 @@ static void test_NtAllocateVirtualMemory(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); + + if (!pNtAllocateVirtualMemoryEx) + { + win_skip("NtAllocateVirtualMemoryEx() is missing\n"); + return; + } + + /* simple allocation should succeed */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08x\n", status); + + /* specifying a count of >0 with NULL parameters should fail */ + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 1); + ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } static void test_RtlCreateUserStack(void) @@ -648,6 +668,7 @@ START_TEST(virtual) pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); + pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d79e3de662e..614159b7d90 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3452,6 +3452,21 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z return status; } +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + if (count && !parameters) return STATUS_INVALID_PARAMETER; + + if (count) FIXME( "Ignoring %d extended parameters %p\n", count, parameters ); + + return NtAllocateVirtualMemory( process, ret, 0, size_ptr, type, protect ); +} + /*********************************************************************** * NtFreeVirtualMemory (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 89ea58c2d93..fbce63655ba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS);

1 0

Myah Caron : kernelbase: Implement VirtualAlloc2.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: c55349f6c8aa12801666145f0e345fbe3e6e11c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55349f6c8aa12801666145f… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:44:52 2020 +0000 kernelbase: Implement VirtualAlloc2. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 15 +++++++++++++++ include/winbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9c7babde7fd..da35b5e5c6e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1672,6 +1672,7 @@ # @ stub VerifyPackageId # @ stub VerifyPackageRelativeApplicationId # @ stub VerifyScripts +@ stdcall VirtualAlloc2(long ptr long long long ptr long) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4ead38f2bc0..2bfd3893e8e 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -299,6 +299,21 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE } +/*********************************************************************** + * VirtualAlloc2 (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, + MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + LPVOID ret = addr; + + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index f1c3198c21a..82797efc2b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2744,6 +2744,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDL WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG); #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD);

1 0

Derek Lesho : winegstreamer: Insert videoconvert into decoded-video streams.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 528e6870adaa934fdd1cf7d48343e82aeaa06905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528e6870adaa934fdd1cf7d4… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 13 10:26:42 2020 -0500 winegstreamer: Insert videoconvert into decoded-video streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 125 +++++++++++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..3371585328d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,88 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: + https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID *const video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; }

1 0

Derek Lesho : winegstreamer: Insert audioconvert into decoded audio streams.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 93107c08f5aa7f37ad7ece9cd7ca248dba3030ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=93107c08f5aa7f37ad7ece9c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Oct 8 16:49:04 2020 -0500 winegstreamer: Insert audioconvert into decoded audio streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3371585328d..0991710755c 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -410,6 +410,19 @@ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) gst_element_sync_state_with_parent(videoconvert); } + else if (!strcmp(stream_type, "audio/x-raw")) + { + GstElement *audioconvert = gst_element_factory_make("audioconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), audioconvert); + + stream->my_sink = gst_element_get_static_pad(audioconvert, "sink"); + + if (!gst_element_link(audioconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(audioconvert); + } else { stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");

1 0

Alexandre Julliard : gdi32: Move the text metrics cache into the generic font structure.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: e0872b64243d651c35c16b493971d2c785b8d997 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0872b64243d651c35c16b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 11:43:24 2020 +0100 gdi32: Move the text metrics cache into the generic font structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 159 +++++++++++++++- dlls/gdi32/freetype.c | 484 ++++++++++++++--------------------------------- dlls/gdi32/gdi_private.h | 10 +- 3 files changed, 298 insertions(+), 355 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0872b64243d651c35c1…

1 0