August 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : user32/tests: Add tests for window rectangles and DPI scaling.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: f49227db6094be917057f7f9d54b832dc3743bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f49227db6094be917057f7f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:45:58 2018 +0200 user32/tests: Add tests for window rectangles and DPI scaling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 191 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 171 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f49227db6094be917057…

1 0

Alexandre Julliard : gdi32: Fall back to GetSystemMetrics() for the screen size.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 6d395fcca4ae825afa481890b148ca73fd0db375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d395fcca4ae825afa481890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:21:05 2018 +0200 gdi32: Fall back to GetSystemMetrics() for the screen size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index c81a2e1..4a5058e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "ddrawgdi.h" #include "wine/winbase16.h" +#include "winuser.h" #include "winternl.h" #include "gdi_private.h" @@ -60,6 +61,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static typeof(GetDesktopWindow) *pGetDesktopWindow; +static typeof(GetSystemMetrics) *pGetSystemMetrics; + /********************************************************************** * create_driver * @@ -97,7 +101,7 @@ static const struct gdi_dc_funcs *get_display_driver(void) if (!display_driver) { HMODULE user32 = LoadLibraryA( "user32.dll" ); - HWND (WINAPI *pGetDesktopWindow)(void) = (void *)GetProcAddress( user32, "GetDesktopWindow" ); + pGetDesktopWindow = (void *)GetProcAddress( user32, "GetDesktopWindow" ); if (!pGetDesktopWindow() || !display_driver) { @@ -166,6 +170,7 @@ done: void CDECL __wine_set_display_driver( HMODULE module ) { struct graphics_driver *driver; + HMODULE user32; if (!(driver = create_driver( module ))) { @@ -174,6 +179,9 @@ void CDECL __wine_set_display_driver( HMODULE module ) } if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) HeapFree( GetProcessHeap(), 0, driver ); + + user32 = LoadLibraryA( "user32.dll" ); + pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); } @@ -308,8 +316,8 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); - case HORZRES: return 640; - case VERTRES: return 480; + case HORZRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; + case VERTRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; case BITSPIXEL: return 32; case PLANES: return 1; case NUMBRUSHES: return -1;

1 0

Alexandre Julliard : gdi32: Fall back to GetSystemMetrics() for the virtual desktop size.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: d0579649c1fb725b2bc1d15b7dbee866ffb44ebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0579649c1fb725b2bc1d15b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 12:56:53 2018 +0200 gdi32: Fall back to GetSystemMetrics() for the virtual desktop size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4a5058e..6580008 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -63,6 +63,7 @@ static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static typeof(GetDesktopWindow) *pGetDesktopWindow; static typeof(GetSystemMetrics) *pGetSystemMetrics; +static typeof(SetThreadDpiAwarenessContext) *pSetThreadDpiAwarenessContext; /********************************************************************** * create_driver @@ -182,6 +183,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) user32 = LoadLibraryA( "user32.dll" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); + pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } @@ -352,8 +354,28 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; - case DESKTOPVERTRES: return GetDeviceCaps( dev->hdc, VERTRES ); - case DESKTOPHORZRES: return GetDeviceCaps( dev->hdc, HORZRES ); + case DESKTOPHORZRES: + if (pGetSystemMetrics) + { + DPI_AWARENESS_CONTEXT context; + UINT ret; + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + ret = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + pSetThreadDpiAwarenessContext( context ); + return ret; + } + return GetDeviceCaps( dev->hdc, HORZRES ); + case DESKTOPVERTRES: + if (pGetSystemMetrics) + { + DPI_AWARENESS_CONTEXT context; + UINT ret; + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + ret = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + pSetThreadDpiAwarenessContext( context ); + return ret; + } + return GetDeviceCaps( dev->hdc, VERTRES ); case BLTALIGNMENT: return 0; case SHADEBLENDCAPS: return 0; case COLORMGMTCAPS: return 0;

1 0

Alexandre Julliard : winex11: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 0cbb08634781048c46d0b7348b12edfa15427d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbb08634781048c46d0b734… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:42:43 2018 +0200 winex11: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index fc7972c..3268733 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,26 +162,6 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case HORZRES: - { - RECT primary_rect = get_primary_monitor_rect(); - return primary_rect.right - primary_rect.left; - } - case VERTRES: - { - RECT primary_rect = get_primary_monitor_rect(); - return primary_rect.bottom - primary_rect.top; - } - case DESKTOPHORZRES: - { - RECT virtual_rect = get_virtual_screen_rect(); - return virtual_rect.right - virtual_rect.left; - } - case DESKTOPVERTRES: - { - RECT virtual_rect = get_virtual_screen_rect(); - return virtual_rect.bottom - virtual_rect.top; - } case BITSPIXEL: return screen_bpp; case SIZEPALETTE:

1 0

Francois Gouget : testbot: Add helpers to build and sanitize the WineTest tag.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: tools Branch: master Commit: 214a97ec36c7cfa79d8445ae9cc569d0fb5b8a28 URL: https://source.winehq.org/git/tools.git/?a=commit;h=214a97ec36c7cfa79d8445a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 22 10:17:15 2018 +0200 testbot: Add helpers to build and sanitize the WineTest tag. Also fix the sanitation: WineTest allows dots and dashes in the tag. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 16 ++++++---------- testbot/bin/WineRunWineTest.pl | 6 ++---- testbot/bin/build/WineTest.pl | 3 ++- testbot/lib/WineTestBot/Utils.pm | 24 +++++++++++++++++++++++- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 27dd8e7..c602979 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -41,11 +41,12 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; -use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; -use WineTestBot::Engine::Notify; +use WineTestBot::Utils; +use WineTestBot::VMs; # @@ -455,18 +456,13 @@ elsif ($Step->Type eq "suite") { $Keepalive = 60; $Script .= "$FileName "; - my $Tag = lc($VM->Name); - $Tag =~ s/^$TagPrefix//; - $Tag =~ s/[^a-zA-Z0-9]/-/g; - if ($VM->Type eq "win64") - { - $Tag .= "-" . ($Step->FileType eq "exe64" ? "64" : "32"); - } if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; } + my $Tag = $VM->Type ne "win64" ? "" : $Step->FileType eq "exe64" ? "64" : "32"; + $Tag = BuildTag($VM->Name, $Tag); my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) { @@ -481,7 +477,7 @@ elsif ($Step->Type eq "suite") $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $TagPrefix-$Tag -m \"$EMail\" -i \"$Info\"\r\n". + $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n". "$FileName -q -s $RptFileName\r\n"; } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ac55946..2168111 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -425,10 +425,8 @@ my $Script = "#!/bin/sh\n". " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { - my $Tag = lc($VM->Name); - $Tag =~ s/^$TagPrefix//; - $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; + my $BaseTag = BuildTag($VM->Name); + $Script .= "--winetest ". $Task->CmdLineArg ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3310b4c..b29440e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -181,8 +181,9 @@ sub DailyWineTest($$$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $Tag = SanitizeTag("$BaseTag-$Build"); RunWine($Build, "./programs/winetest/winetest.exe.so", - "-c -o '../$Build.report' -t $BaseTag-$Build ". ShArgv2Cmd(@$Args)); + "-c -o '../$Build.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$Build.report") { LogMsg "WineTest did not produce a report file\n"; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index f64310b..6fa0ccc 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -1,5 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp +# Copyright 2012-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,7 +30,7 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - ShQuote ShArgv2Cmd); + BuildTag SanitizeTag ShQuote ShArgv2Cmd); use Fcntl; @@ -176,6 +177,27 @@ sub CreateNewDir($$) # +# WineTest helpers +# + +sub SanitizeTag($) +{ + my ($Tag) = @_; + $Tag =~ s/[^a-zA-Z0-9.-]/-/g; + return substr($Tag, 0, 30); +} + +sub BuildTag($;$) +{ + my ($VMName, $Tag) = @_; + + $Tag = $Tag ? "$VMName-$Tag" : $VMName; + $Tag =~ s/^$TagPrefix//; + return SanitizeTag("$TagPrefix-$Tag"); +} + + +# # Shell helpers #

1 0

Francois Gouget : testbot/build: Move the common build functions to Build: :Utils.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: tools Branch: master Commit: f0bf350b420d1f521a1ff47b8e78217bda023590 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f0bf350b420d1f521a1ff47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 22 10:18:58 2018 +0200 testbot/build: Move the common build functions to Build::Utils. This reduces the build scripts code duplication. A side-effect is that the status lines now all start with the 'Task:' prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 89 +--------- testbot/bin/build/Reconfig.pl | 113 +----------- testbot/bin/build/WineReconfig.pl | 247 +++----------------------- testbot/bin/build/WineTest.pl | 111 ++---------- testbot/lib/Build/Utils.pm | 363 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 409 insertions(+), 514 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=f0bf350b420d1f521a1…

1 0

Francois Gouget : testbot/web: Fix some HTML closing tags.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: tools Branch: master Commit: 5860a0d1e71dff0c918d6519cdb18be043b4a622 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5860a0d1e71dff0c918d651… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 22 10:56:27 2018 +0200 testbot/web: Fix some HTML closing tags. Also call the parent GenerateFooter() method in the Activity page so the HTML page is terminated correctly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Stats.pl | 1 + testbot/web/Submit.pl | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5124017..fa842d9 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -94,7 +94,7 @@ sub GenerateBody($) # Generate a custom form to let the user specify the Hours field. $self->GenerateFormStart(); - print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</div>\n"; + print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</label></div>\n"; $self->GenerateFormEnd(); print "<h1>${ProjectName} Test Bot activity</h1>\n"; @@ -267,6 +267,7 @@ EOF ### Generate the table footer print "</tbody></table></div>\n"; + print "</div>\n"; } sub GenerateFooter($) @@ -294,8 +295,9 @@ sub GenerateFooter($) print "<span class='Record-deleted'>deletion</span>.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + $self->SUPER::GenerateFooter(); } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 64f29bd..ccabb32 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -335,6 +335,7 @@ sub GenerateBody($) print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + print "</div>\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 926fcb7..440bd8e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -237,7 +237,7 @@ sub GenerateFields($) print "<thead><tr><th class='Record'></th>\n"; print "<th class='Record'>VM Name</th>\n"; print "<th class='Record'>Description</th>\n"; - print "</th><tbody>\n"; + print "</thead><tbody>\n"; my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64") @@ -296,6 +296,7 @@ sub GenerateFields($) print "</tr>\n"; } print "</tbody></table>\n"; + print "</div>\n"; } else {

1 0

Francois Gouget : testbot/web: Add some </div> comments identifying the corresponding <div>.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: tools Branch: master Commit: a0078ae5726a27ec5b701b18edfcd7a4883293ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=a0078ae5726a27ec5b701b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 22 10:58:50 2018 +0200 testbot/web: Add some </div> comments identifying the corresponding <div>. This helps debug HTML tag balancing errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index b3861dd..3a41fe0 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -128,8 +128,8 @@ sub GenerateBody($) { print "<p>$Text</p>\n"; } - print "</div>\n"; - print "</div>\n"; + print "</div>\n"; + print "</div>\n"; } sub GenerateFormStart($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 67e8fc8..e5b2f2d 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -327,10 +327,10 @@ sub GenerateFooter($) my ($self) = @_; print <<EOF; - </div> + </div> <b class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> </div> -</div> +</div> </body> </html>

1 0

Józef Kucia : wined3d: Get gl_info from context in query_issue() functions.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: bd398e319cc12673f7c96bfeb99ba8d2cf8756c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd398e319cc12673f7c96bfe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 10:24:29 2018 +0200 wined3d: Get gl_info from context in query_issue() functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9828fc2..01e6bcb 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -526,7 +526,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -540,6 +540,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); } @@ -558,6 +559,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_occlusion_query(context, oq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); @@ -574,6 +576,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); @@ -713,7 +716,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -725,6 +728,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); } @@ -743,6 +747,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D context = context_acquire(device, NULL, 0); context_alloc_so_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx, pq->u.query.written)); @@ -759,6 +764,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); checkGLcall("end query"); @@ -846,7 +852,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -875,6 +881,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_pipeline_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_VERTICES_SUBMITTED_ARB, pq->u.query.vertices)); GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_SUBMITTED_ARB, pq->u.query.primitives));

1 0

Józef Kucia : wined3d: Use local gl_info variable in wined3d_get_device_caps().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 760b0de7f4510cddc91f347828151ad78482c890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=760b0de7f4510cddc91f3478… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 10:24:30 2018 +0200 wined3d: Use local gl_info variable in wined3d_get_device_caps(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a5c7b97..a6f190c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2205,9 +2205,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MAGFLINEAR; caps->VertexTextureFilterCaps = 0; - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->vertex_pipe->vp_get_caps(&adapter->gl_info, &vertex_caps); + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; @@ -2243,19 +2243,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(32, gl_info->limits.arb_vs_temps); /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ - caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->MaxVertexShader30InstructionSlots = max(512, gl_info->limits.arb_vs_instructions); caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) { caps->VS20Caps.caps = 0; caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(12, gl_info->limits.arb_vs_temps); caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; @@ -2289,7 +2289,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(32, gl_info->limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ @@ -2297,14 +2297,14 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, - adapter->gl_info.limits.arb_ps_instructions); + gl_info->limits.arb_ps_instructions); } else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ caps->PS20Caps.caps = 0; caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(12, gl_info->limits.arb_ps_temps); caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS;

1 0