January 2018 - Wine-Commits

Michael Stefaniuc : dwrite/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 062948f57e1878110bd9fad288217025b18743fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=062948f57e1878110bd9fad2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:04 2018 +0100 dwrite/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 24e8e73..c226dba 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "d2d1.h" +#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -121,16 +122,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0};

1 0

Alexandre Julliard : Revert "testbot: Better wrap the database backend code."
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: tools Branch: master Commit: 376816550c3eaebd246a81fc98aa4ad032500833 URL: https://source.winehq.org/git/tools.git/?a=commit;h=376816550c3eaebd246a81f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 31 20:54:55 2018 +0100 Revert "testbot: Better wrap the database backend code." This reverts commit 831aa5ce66000626f963c50ba37f1ddabb642d3c. It kills the testbot. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 ++------------------------- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++++---- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index d637564..827879c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connections - CloseAllDBBackEnds(); + # Make sure the child process does not inherit the database connection + $ActiveBackEnds{'WineTestBot'}->Close(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 0bb48cf..6c5c813 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT); +use vars qw(@ISA @EXPORT %ActiveBackEnds); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +(a)EXPORT = qw(%ActiveBackEnds); sub new($@) { @@ -51,33 +51,4 @@ sub _initialize($) #my ($self) = @_; } - -my %_ActiveBackEnds; - -sub AddDBBackEnd($$) -{ - my ($Name, $BackEnd) = @_; - $_ActiveBackEnds{$Name} = $BackEnd; -} - -sub GetDBBackEnd($) -{ - my ($Name) = @_; - return $_ActiveBackEnds{$Name}; -} - -sub RemoveDBBackEnd($) -{ - my ($Name) = @_; - delete $_ActiveBackEnds{$Name}; -} - -sub CloseAllDBBackEnds() -{ - foreach my $BackEnd (values %_ActiveBackEnds) - { - $BackEnd->Close(); - } -} - 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index d4b0777..565d4a8 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$$$$$) +sub UseDBIBackEnd($$@) { - my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; + my $class = shift; + my $DbSelector = shift; - my $BackEnd = $class->new(); - $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; - AddDBBackEnd($DbSelector, $BackEnd); + $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); + $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index bb9a832..2ba6b4b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connections - CloseAllDBBackEnds(); + # Make sure the child process will use its own database connection + $self->GetBackEnd()->Close(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index 20ff6b1..b46fa41 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return GetDBBackEnd('WineTestBot'); + return $ActiveBackEnds{'WineTestBot'}; } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return GetDBBackEnd('WineTestBot'); + return $ActiveBackEnds{'WineTestBot'}; } 1;

1 0

Francois Gouget : testbot: Better wrap the database backend code.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: tools Branch: master Commit: 831aa5ce66000626f963c50ba37f1ddabb642d3c URL: https://source.winehq.org/git/tools.git/?a=commit;h=831aa5ce66000626f963c50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 31 03:44:58 2018 +0100 testbot: Better wrap the database backend code. ObjectModel::BackEnd no longer exposes its global active backends variable. Also provide a way to close all database connections so the code does not have to assume we only have the 'WineTestBot' one which would defeat the point of the BackEnd module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 +++++++++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++++---- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 827879c..d637564 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connection - $ActiveBackEnds{'WineTestBot'}->Close(); + # Make sure the child process does not inherit the database connections + CloseAllDBBackEnds(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 6c5c813..0bb48cf 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT %ActiveBackEnds); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(%ActiveBackEnds); +(a)EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); sub new($@) { @@ -51,4 +51,33 @@ sub _initialize($) #my ($self) = @_; } + +my %_ActiveBackEnds; + +sub AddDBBackEnd($$) +{ + my ($Name, $BackEnd) = @_; + $_ActiveBackEnds{$Name} = $BackEnd; +} + +sub GetDBBackEnd($) +{ + my ($Name) = @_; + return $_ActiveBackEnds{$Name}; +} + +sub RemoveDBBackEnd($) +{ + my ($Name) = @_; + delete $_ActiveBackEnds{$Name}; +} + +sub CloseAllDBBackEnds() +{ + foreach my $BackEnd (values %_ActiveBackEnds) + { + $BackEnd->Close(); + } +} + 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 565d4a8..d4b0777 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$@) +sub UseDBIBackEnd($$$$$$) { - my $class = shift; - my $DbSelector = shift; + my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; + my $BackEnd = $class->new(); + $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; + AddDBBackEnd($DbSelector, $BackEnd); } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2ba6b4b..bb9a832 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connection - $self->GetBackEnd()->Close(); + # Make sure the child process will use its own database connections + CloseAllDBBackEnds(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index b46fa41..20ff6b1 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } 1;

1 0

Jeremy Newman : add redirect for old download page to new wiki page
by Jeremy Newman Jan. 31, 2018

Jan. 31, 2018

Module: website Branch: master Commit: bd3b3c533ea986b8e1d79502e4d9f3f0b1bf4731 URL: https://source.winehq.org/git/website.git/?a=commit;h=bd3b3c533ea986b8e1d79… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jan 31 13:26:32 2018 -0600 add redirect for old download page to new wiki page --- include/htaccess.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/include/htaccess.sample b/include/htaccess.sample index 2e25cdf..cb86054 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -36,6 +36,7 @@ RedirectPermanent /dev https://www.winehq.org/getinvolv RedirectPermanent /dev.shtml https://www.winehq.org/getinvolved RedirectPermanent /dev.html https://www.winehq.org/getinvolved RedirectPermanent /devstart.shtml https://www.winehq.org/getinvolved +RedirectPermanent /download https://wiki.winehq.org/Download RedirectPermanent /download/index.php https://wiki.winehq.org/Download RedirectPermanent /download.shtml https://wiki.winehq.org/Download RedirectPermanent /download.html https://wiki.winehq.org/Download

1 0

Rosanne DiMesio : Remove static Download pages and redirect to wiki
by Jeremy Newman Jan. 31, 2018

Jan. 31, 2018

Module: website Branch: master Commit: 9e5df8ce68407443f496d9dac8692320c17a71b4 URL: https://source.winehq.org/git/website.git/?a=commit;h=9e5df8ce68407443f496d… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jan 31 11:34:19 2018 -0600 Remove static Download pages and redirect to wiki The Download page is now on the wiki at https://wiki.winehq.org/Download. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 12 +-- templates/de/download.template | 165 ----------------------------------- templates/de/home.template | 2 +- templates/en/download.template | 159 ---------------------------------- templates/en/home.template | 2 +- templates/es/home.template | 2 +- templates/fr/download.template | 178 -------------------------------------- templates/fr/home.template | 2 +- templates/ko/download.template | 159 ---------------------------------- templates/ko/home.template | 2 +- templates/pl/download.template | 159 ---------------------------------- templates/pl/home.template | 2 +- templates/pt/download.template | 162 ---------------------------------- templates/pt/home.template | 2 +- templates/tr/download.template | 149 ------------------------------- templates/tr/home.template | 2 +- templates/uk/download.template | 153 -------------------------------- templates/uk/home.template | 2 +- templates/zh-cn/download.template | 159 ---------------------------------- templates/zh-cn/home.template | 2 +- 20 files changed, 16 insertions(+), 1459 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=9e5df8ce68407443f…

1 0

Nikolay Sivov : winedbg: Remove some unnecessary pointer casts.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 840ebb98330ef5502d2727e83ef8c46df4e662f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840ebb98330ef5502d2727e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:57:03 2018 +0300 winedbg: Remove some unnecessary pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252..89a2dc4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 11782fe..e0ad4d8 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -425,7 +425,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(hProcess, mod_loader_cb, (void*)&mli); + SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); return imh_mod->BaseOfImage != 0;

1 0

Nikolay Sivov : dbghelp: Make sure returned module info strings are null-terminated.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: da1d075b83cf115c633d17ed5fec5007cbb5f5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=da1d075b83cf115c633d17ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:29 2018 +0300 dbghelp: Make sure returned module info strings are null-terminated. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 765a723..9256a8f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -919,6 +919,12 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, return sz != 0 && i == sz; } +static void dbghelp_str_WtoA(const WCHAR *src, char *dst, int dst_len) +{ + WideCharToMultiByte(CP_ACP, 0, src, -1, dst, dst_len - 1, NULL, NULL); + dst[dst_len - 1] = 0; +} + /****************************************************************** * SymGetModuleInfo (DBGHELP.@) * @@ -941,12 +947,9 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, mi.CheckSum = miw64.CheckSum; mi.NumSyms = miw64.NumSyms; mi.SymType = miw64.SymType; - WideCharToMultiByte(CP_ACP, 0, miw64.ModuleName, -1, - mi.ModuleName, sizeof(mi.ModuleName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.ImageName, -1, - mi.ImageName, sizeof(mi.ImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedImageName, -1, - mi.LoadedImageName, sizeof(mi.LoadedImageName), NULL, NULL); + dbghelp_str_WtoA(miw64.ModuleName, mi.ModuleName, sizeof(mi.ModuleName)); + dbghelp_str_WtoA(miw64.ImageName, mi.ImageName, sizeof(mi.ImageName)); + dbghelp_str_WtoA(miw64.LoadedImageName, mi.LoadedImageName, sizeof(mi.LoadedImageName)); memcpy(ModuleInfo, &mi, ModuleInfo->SizeOfStruct); @@ -1010,18 +1013,13 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.CheckSum = miw64.CheckSum; mi64.NumSyms = miw64.NumSyms; mi64.SymType = miw64.SymType; - WideCharToMultiByte(CP_ACP, 0, miw64.ModuleName, -1, - mi64.ModuleName, sizeof(mi64.ModuleName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.ImageName, -1, - mi64.ImageName, sizeof(mi64.ImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedImageName, -1, - mi64.LoadedImageName, sizeof(mi64.LoadedImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedPdbName, -1, - mi64.LoadedPdbName, sizeof(mi64.LoadedPdbName), NULL, NULL); + dbghelp_str_WtoA(miw64.ModuleName, mi64.ModuleName, sizeof(mi64.ModuleName)); + dbghelp_str_WtoA(miw64.ImageName, mi64.ImageName, sizeof(mi64.ImageName)); + dbghelp_str_WtoA(miw64.LoadedImageName, mi64.LoadedImageName, sizeof(mi64.LoadedImageName)); + dbghelp_str_WtoA(miw64.LoadedPdbName, mi64.LoadedPdbName, sizeof(mi64.LoadedPdbName)); mi64.CVSig = miw64.CVSig; - WideCharToMultiByte(CP_ACP, 0, miw64.CVData, -1, - mi64.CVData, sizeof(mi64.CVData), NULL, NULL); + dbghelp_str_WtoA(miw64.CVData, mi64.CVData, sizeof(mi64.CVData)); mi64.PdbSig = miw64.PdbSig; mi64.PdbSig70 = miw64.PdbSig70; mi64.PdbAge = miw64.PdbAge;

1 0

Józef Kucia : dxgi/tests: Accept higher adapter refcounts in test_create_swapchain().
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: c9d9e5fd239171bbeb4b90b7f1f7df0a6e564de5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9d9e5fd239171bbeb4b90b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:59 2018 +0100 dxgi/tests: Accept higher adapter refcounts in test_create_swapchain(). 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/dxgi/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 140e264..58c3bba 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1126,7 +1126,7 @@ static void test_create_swapchain(void) ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)adapter); - ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); refcount = get_refcount((IUnknown *)factory); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); refcount = get_refcount((IUnknown *)device);

1 0

Józef Kucia : dxgi/tests: Add test for wrapping COM objects.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: f334ab293e474b774527e6888c27d5dd40330b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f334ab293e474b774527e688… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:58 2018 +0100 dxgi/tests: Add test for wrapping COM objects. 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/dxgi/tests/device.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index c4bf826..140e264 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3456,6 +3456,147 @@ static void test_output_desc(void) ok(!refcount, "IDXGIFactory has %u references left.\n", refcount); } +struct dxgi_adapter +{ + IDXGIAdapter IDXGIAdapter_iface; + IDXGIAdapter *wrapped_iface; +}; + +static inline struct dxgi_adapter *impl_from_IDXGIAdapter(IDXGIAdapter *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface, REFIID iid, void **out) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + + if (IsEqualGUID(iid, &IID_IDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IDXGIAdapter_AddRef(adapter->wrapped_iface); + *out = iface; + return S_OK; + } + return IDXGIAdapter_QueryInterface(adapter->wrapped_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_AddRef(adapter->wrapped_iface); +} + +static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_Release(adapter->wrapped_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_SetPrivateData(adapter->wrapped_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter *iface, + REFGUID guid, const IUnknown *object) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_SetPrivateDataInterface(adapter->wrapped_iface, guid, object); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_GetPrivateData(adapter->wrapped_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REFIID iid, void **parent) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_GetParent(adapter->wrapped_iface, iid, parent); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter *iface, + UINT output_idx, IDXGIOutput **output) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_EnumOutputs(adapter->wrapped_iface, output_idx, output); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_GetDesc(adapter->wrapped_iface, desc); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter *iface, + REFGUID guid, LARGE_INTEGER *umd_version) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); + return IDXGIAdapter_CheckInterfaceSupport(adapter->wrapped_iface, guid, umd_version); +} + +static const struct IDXGIAdapterVtbl dxgi_adapter_vtbl = +{ + dxgi_adapter_QueryInterface, + dxgi_adapter_AddRef, + dxgi_adapter_Release, + dxgi_adapter_SetPrivateData, + dxgi_adapter_SetPrivateDataInterface, + dxgi_adapter_GetPrivateData, + dxgi_adapter_GetParent, + dxgi_adapter_EnumOutputs, + dxgi_adapter_GetDesc, + dxgi_adapter_CheckInterfaceSupport, +}; + +static void test_object_wrapping(void) +{ + struct dxgi_adapter wrapper; + DXGI_ADAPTER_DESC desc; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D10Device1 *device; + ULONG refcount; + HRESULT hr; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Could not enumerate adapters.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + + wrapper.IDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; + wrapper.wrapped_iface = adapter; + + hr = D3D10CreateDevice1(&wrapper.IDXGIAdapter_iface, D3D10_DRIVER_TYPE_HARDWARE, NULL, + 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device); + if (SUCCEEDED(hr)) + { + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + hr = IDXGIAdapter_GetDesc(&wrapper.IDXGIAdapter_iface, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + refcount = IDXGIAdapter_Release(&wrapper.IDXGIAdapter_iface); + ok(!refcount, "Adapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(device) { HMODULE dxgi_module = GetModuleHandleA("dxgi.dll"); @@ -3484,4 +3625,5 @@ START_TEST(device) test_swapchain_parameters(); test_maximum_frame_latency(); test_output_desc(); + test_object_wrapping(); }

1 0

Józef Kucia : dxgi: Implement IDXGIOutput4.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 5443a48909a3aa2028bfa7334ab583f47281c2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5443a48909a3aa2028bfa733… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:57 2018 +0100 dxgi: Implement IDXGIOutput4. 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/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 145 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 113 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5443a48909a3aa2028bf…

1 0