March 2020 - Wine-Devel - list.winehq.org

[PATCH 2/2] dbghelp: Search also real path location in path_find_symbol_file.
by Jacek Caban March 10, 2020

March 10, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/path.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/2] dbghelp: Try loading builtin modules from unix installation.
by Jacek Caban March 10, 2020

March 10, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Remapping itself helps in situations when prefix and actual installation version is out of sync. This patch does not take into account forcing builtin PE to be loaded as native, but there is not much we can do about it. It also allows symbol lookup to be done using real path like in patch 2. I also plan to add that to GNU debug links, but it needs more work to handle PE files anyway. dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 1 + dlls/dbghelp/pe_module.c | 84 ++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+)

1 0

[PATCH rebase 4/4] gdi32: Load Wine builtin TrueType fonts from %WINDIR%\fonts first.
by Jactry Zeng March 10, 2020

March 10, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdi32/freetype.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 72e6f35fc1..ef80bdd9c0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3093,6 +3093,20 @@ static void load_font_from_fonts_dir(const WCHAR *filename, DWORD flags) static void load_system_fonts(void) { + static const WCHAR marlett_ttf[] = {'m','a','r','l','e','t','t','.','t','t','f',0}; + static const WCHAR symbol_ttf[] = {'s','y','m','b','o','l','.','t','t','f',0}; + static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0}; + static const WCHAR tahomabd_ttf[] = {'t','a','h','o','m','a','b','d','.','t','t','f',0}; + static const WCHAR wingding_ttf[] = {'w','i','n','g','d','i','n','g','.','t','t','f',0}; + static const WCHAR *builtin_fonts[] = + { + marlett_ttf, + symbol_ttf, + tahoma_ttf, + tahomabd_ttf, + wingding_ttf + }; + int i; HKEY hkey; WCHAR data[MAX_PATH]; const WCHAR * const *value; @@ -3107,6 +3121,9 @@ static void load_system_fonts(void) } RegCloseKey(hkey); } + + for (i = 0; i < ARRAY_SIZE(builtin_fonts); i++) + load_font_from_fonts_dir(builtin_fonts[i], ADDFONT_ADD_TO_CACHE); } static WCHAR *get_full_path_name(const WCHAR *name) @@ -4247,7 +4264,7 @@ static void init_font_list(void) delete_external_font_keys(); - /* load the system bitmap fonts */ + /* load the system bitmap fonts and other builtin fonts */ load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ @@ -4259,13 +4276,6 @@ static void init_font_list(void) HeapFree(GetProcessHeap(), 0, unixname); } - /* load the wine fonts */ - if ((unixname = get_font_dir())) - { - ReadFontDir(unixname, TRUE); - HeapFree(GetProcessHeap(), 0, unixname); - } - /* 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 -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH rebase 3/4] gdi32: Add a helper for trying to load fonts from %WINDIR%\fonts first.
by Jactry Zeng March 10, 2020

March 10, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdi32/freetype.c | 52 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ed093701d..72e6f35fc1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3049,7 +3049,7 @@ static char *get_data_dir_path( LPCWSTR file ) return unix_name; } -static BOOL load_font_from_data_dir(LPCWSTR file) +static BOOL load_font_from_data_dir(LPCWSTR file, DWORD flags) { BOOL ret = FALSE; char *unix_name = get_data_dir_path( file ); @@ -3057,7 +3057,7 @@ static BOOL load_font_from_data_dir(LPCWSTR file) if (unix_name) { EnterCriticalSection( &freetype_cs ); - ret = AddFontToList(unix_name, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); + ret = AddFontToList(unix_name, NULL, 0, flags); LeaveCriticalSection( &freetype_cs ); HeapFree(GetProcessHeap(), 0, unix_name); } @@ -3076,32 +3076,34 @@ static char *get_winfonts_dir_path(LPCWSTR file) return wine_get_unix_file_name( windowsdir ); } +static void load_font_from_fonts_dir(const WCHAR *filename, DWORD flags) +{ + BOOL added = FALSE; + char *unixname; + + unixname = get_winfonts_dir_path(filename); + if (unixname) + { + added = AddFontToList(unixname, NULL, 0, flags); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!added) + load_font_from_data_dir(filename, flags); +} + static void load_system_fonts(void) { HKEY hkey; - WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; + WCHAR data[MAX_PATH]; const WCHAR * const *value; DWORD dlen, type; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; - char *unixname; if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); - strcatW(windowsdir, fontsW); for(value = SystemFontValues; *value; value++) { dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && - type == REG_SZ) { - BOOL added = FALSE; - - sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) { - added = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - HeapFree(GetProcessHeap(), 0, unixname); - } - if (!added) - load_font_from_data_dir(data); - } + type == REG_SZ) + load_font_from_fonts_dir(data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); } RegCloseKey(hkey); } @@ -4295,20 +4297,8 @@ static void init_font_list(void) } } else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) - { - WCHAR pathW[MAX_PATH]; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; - BOOL added = FALSE; + load_font_from_fonts_dir(data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) - { - added = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - HeapFree(GetProcessHeap(), 0, unixname); - } - if (!added) - load_font_from_data_dir(data); - } /* reset dlen and vlen */ dlen = datalen; vlen = valuelen; -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH rebase 2/4] wine.inf: Add registry entries for builtin TrueType fonts.
by Jactry Zeng March 10, 2020

March 10, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- loader/wine.inf.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ffe3a04309..3fbbdefe3a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -220,6 +220,8 @@ MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" +Fonts="Software\Microsoft\Windows\CurrentVersion\Fonts" +FontsNT="Software\Microsoft\Windows NT\CurrentVersion\Fonts" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" @@ -635,6 +637,16 @@ HKLM,%Control%\Session Manager\Memory Management,PagingFiles,,"%24%\pagefile.sys HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1 [Fonts] +HKLM,%Fonts%,"Marlett (TrueType)",,"marlett.ttf" +HKLM,%Fonts%,"Symbol (TrueType)",,"symbol.ttf" +HKLM,%Fonts%,"Tahoma (TrueType)",,"tahoma.ttf" +HKLM,%Fonts%,"Tahoma Bold (TrueType)",,"tahomabd.ttf" +HKLM,%Fonts%,"Wingdings (TrueType)",,"wingding.ttf" +HKLM,%FontsNT%,"Marlett (TrueType)",,"marlett.ttf" +HKLM,%FontsNT%,"Symbol (TrueType)",,"symbol.ttf" +HKLM,%FontsNT%,"Tahoma (TrueType)",,"tahoma.ttf" +HKLM,%FontsNT%,"Tahoma Bold (TrueType)",,"tahomabd.ttf" +HKLM,%FontsNT%,"Wingdings (TrueType)",,"wingding.ttf" HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186" HKLM,%FontSubStr%,"Arial CE,238",,"Arial,238" HKLM,%FontSubStr%,"Arial CYR,204",,"Arial,204" -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH rebase 1/4] wine.inf: Add "FontFiles" section for copying builtin fonts to %WINDIR%\fonts.
by Jactry Zeng March 10, 2020

March 10, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- loader/wine.inf.in | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bca478e6d7..ffe3a04309 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=FontFiles,InfFiles,NlsFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=FontFiles,InfFiles,NlsFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=FontFiles,InfFiles,NlsFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=FontFiles,InfFiles,NlsFiles AddReg=\ Classes,\ ContentIndex,\ @@ -3887,6 +3887,63 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[FontFiles] +coue1255.fon +coue1256.fon +coue1257.fon +couree.fon +coure.fon +coureg.fon +courer.fon +couret.fon +cvgasys.fon +hvgasys.fon +jsmalle.fon +jvgafix.fon +jvgasys.fon +marlett.ttf +smae1255.fon +smae1256.fon +smae1257.fon +smallee.fon +smalle.fon +smalleg.fon +smaller.fon +smallet.fon +ssee1255.fon +ssee1256.fon +ssee1257.fon +ssee874.fon +ssef1255.fon +ssef1256.fon +ssef1257.fon +ssef874.fon +sserifee.fon +sserife.fon +sserifeg.fon +sserifer.fon +sserifet.fon +sseriffe.fon +sseriff.fon +sseriffg.fon +sseriffr.fon +sserifft.fon +svgasys.fon +symbol.ttf +tahomabd.ttf +tahoma.ttf +vgafix.fon +vgas1255.fon +vgas1256.fon +vgas1257.fon +vgas874.fon +vgasyse.fon +vgasys.fon +vgasysg.fon +vgasysr.fon +vgasyst.fon +wingding.ttf + [InfFiles] winebus.inf winehid.inf @@ -3965,8 +4022,10 @@ normnfkc.nls normnfkd.nls [WineSourceDirs] +FontFiles=fonts NlsFiles=nls [DestinationDirs] -InfFiles = 17 -NlsFiles = 11 +FontFiles = 20 +InfFiles = 17 +NlsFiles = 11 -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 1/4] mfplat: Implement CopyToBuffer().
by Nikolay Sivov March 10, 2020

March 10, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 81 +++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 90 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8e54a538f6..07c2517788 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -771,22 +771,29 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) return S_OK; } -static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) +static DWORD sample_get_total_length(struct sample *sample) { - struct sample *sample = impl_from_IMFSample(iface); - DWORD length; + DWORD total_length = 0, length; size_t i; - TRACE("%p, %p.\n", iface, total_length); - - *total_length = 0; - - EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) { + length = 0; if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - *total_length += length; + total_length += length; } + + return total_length; +} + +static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, total_length); + + EnterCriticalSection(&sample->attributes.cs); + *total_length = sample_get_total_length(sample); LeaveCriticalSection(&sample->attributes.cs); return S_OK; @@ -794,9 +801,61 @@ static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_lengt static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) { - FIXME("%p, %p.\n", iface, buffer); + struct sample *sample = impl_from_IMFSample(iface); + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->attributes.cs); + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; } static const IMFSampleVtbl samplevtbl = diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 36fe9dc831..38713a4f44 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1760,12 +1760,14 @@ static void test_system_memory_buffer(void) static void test_sample(void) { + static const DWORD test_pattern = 0x22222222; IMFMediaBuffer *buffer, *buffer2; DWORD count, flags, length; IMFAttributes *attributes; IMFSample *sample; LONGLONG time; HRESULT hr; + BYTE *data; hr = MFCreateSample( &sample ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1868,6 +1870,94 @@ static void test_sample(void) IMFAttributes_Release(attributes); IMFSample_Release(sample); + /* CopyToBuffer() */ + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = MFCreateMemoryBuffer(16, &buffer2); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + /* Sample with no buffers. */ + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 1); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get current length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + /* Single buffer, larger destination. */ + hr = MFCreateMemoryBuffer(8, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + *(DWORD *)data = 0x11111111; + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 4); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + /* Existing content is overwritten. */ + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 8); + ok(hr == S_OK, "Failed to set length, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to copy to buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 4, "Unexpected buffer length %u.\n", length); + + /* Multiple buffers, matching total size. */ + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 8); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to copy to buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 16, "Unexpected buffer length %u.\n", length); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 1); + ok(hr == S_OK, "Failed to set buffer length, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer2, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + *(DWORD *)data = test_pattern; + hr = IMFMediaBuffer_Unlock(buffer2); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == MF_E_BUFFERTOOSMALL, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer2, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + ok(!memcmp(data, &test_pattern, sizeof(test_pattern)), "Unexpected contents, %#x\n", *(DWORD *)data); + hr = IMFMediaBuffer_Unlock(buffer2); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected buffer length %u.\n", length); + + IMFMediaBuffer_Release(buffer2); + IMFSample_Release(sample); + /* ConvertToContiguousBuffer() */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); -- 2.25.1

2 5

[PATCH 1/7] opengl32: Introduce WGL_WINE_fullscreen_exclusive extension.
by Rémi Bernon March 10, 2020

March 10, 2020

This wine-specific extension will allow us to correctly implement fullscreen-exclusive windows without manipulating the window styles. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/winegl.xml | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f91796ee3af..2e7e35ee626 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -391,6 +391,7 @@ my %supported_wgl_extensions = "WGL_NV_render_depth_texture" => 1, "WGL_NV_render_texture_rectangle" => 1, "WGL_NV_vertex_array_range" => 1, + "WGL_WINE_fullscreen_exclusive" => 1, "WGL_WINE_pixel_format_passthrough" => 1, "WGL_WINE_query_renderer" => 1, ); diff --git a/dlls/opengl32/winegl.xml b/dlls/opengl32/winegl.xml index 7918c3ff894..c046bc033ce 100644 --- a/dlls/opengl32/winegl.xml +++ b/dlls/opengl32/winegl.xml @@ -301,6 +301,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA  <param><ptype>PIXELFORMATDESCRIPTOR</ptype> *<name>ppfd</name></param> </command> + <command> + <proto>BOOL <name>wglSetFullscreenExclusiveWINE</name></proto> + <param><ptype>HWND</ptype> <name>hwnd</name></param> + <param>int <name>fullscreen_exclusive</name></param> + </command> <command> <proto>BOOL <name>wglSetPixelFormatWINE</name></proto> <param><ptype>HDC</ptype> <name>hdc</name></param> @@ -413,6 +418,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA <command name="glDeleteObjectBufferATI"/> </require> </extension> + <extension name="WGL_WINE_fullscreen_exclusive" supported="wgl"> + <require> + <command name="wglSetFullscreenExclusiveWINE"/> + </require> + </extension> <extension name="WGL_WINE_pixel_format_passthrough" supported="wgl"> <require> <command name="wglSetPixelFormatWINE"/> -- 2.25.0

5 16

[v3 PATCH 3/3] wined3d: Use EXT_framebuffer_multisample_blit_scaled extension.
by Paul Gofman March 10, 2020

March 10, 2020

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - don't use resolve filter in case of no scaling in texture2d_blt_fbo(). dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/surface.c | 16 ++++++++++++---- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6e60c5323e..ee091a9b77 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -206,6 +206,8 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, + {"GL_EXT_framebuffer_multisample_blit_scaled", + EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED}, {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_EXT_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1e47f47841..d12a320fef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -150,6 +150,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; unsigned int restore_idx; + BOOL use_resolve_filter; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -160,10 +161,14 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); + use_resolve_filter = wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), + src_location) && (abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) + || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left)); + switch (filter) { case WINED3D_TEXF_LINEAR: - gl_filter = GL_LINEAR; + gl_filter = use_resolve_filter ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; break; default: @@ -171,7 +176,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co /* fall through */ case WINED3D_TEXF_NONE: case WINED3D_TEXF_POINT: - gl_filter = GL_NEAREST; + gl_filter = use_resolve_filter ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; break; } @@ -896,6 +901,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *src_resource, *dst_resource; enum wined3d_blit_op blit_op = op; struct wined3d_device *device; @@ -920,7 +926,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(blit_op, context_gl->gl_info, + if (!fbo_blitter_supported(blit_op, gl_info, src_resource, src_location, dst_resource, dst_location)) { if (!(next = blitter->next)) @@ -946,7 +952,9 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(dst_texture), dst_location)) dst_location = WINED3D_LOCATION_RB_RESOLVED; - if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location)) + if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) + && (src_texture->resource.format->id != dst_texture->resource.format->id + || !gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED])) src_location = WINED3D_LOCATION_RB_RESOLVED; } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3372b4b6be..2d838d7f84 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -185,6 +185,7 @@ enum wined3d_gl_extension EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, + EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED, /* NVIDIA */ NV_FENCE, NV_FOG_DISTANCE, -- 2.24.1

2 1

[tools] testbot: Detect when make_opengl needs to be run.
by Francois Gouget March 10, 2020

March 10, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a8e5a0e0e4..13f969920a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeOpenGL}) + { + InfoMsg "\nRunning make_opengl\n"; + system("cd '$DataDir/$Dir/dlls/opengl32' && set -x && ./make_opengl"); + if ($? != 0) + { + LogMsg "make_opengl failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 3c2f670119..07e61225e0 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; -- 2.20.1

1 0