wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Michael Stefaniuc : explorerframe: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 31 Jan '18

31 Jan '18

Module: wine Branch: master Commit: fdcd7e8fbe2c0996a1164ed91b67bea9cefb6db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdcd7e8fbe2c0996a1164ed9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:40:57 2018 +0100 explorerframe: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b363..14e551c 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -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); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a..a50f8a9 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe);

1 0

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

31 Jan '18

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); -@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +@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 31 Jan '18

31 Jan '18

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); -@EXPORT = qw(%ActiveBackEnds); +@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 31 Jan '18

31 Jan '18

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 31 Jan '18

31 Jan '18

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 30 Jan '18

30 Jan '18

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: Use correct destination buffer length when initializing module data.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 1d3c14d2d1ae9361bb3f1645c1ae19d9683d5e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3c14d2d1ae9361bb3f1645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:30 2018 +0300 dbghelp: Use correct destination buffer length when initializing module data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9256a8f..6c7f2dc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -100,7 +100,8 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) void module_set_module(struct module* module, const WCHAR* name) { - module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName)); + module_fill_module(name, module->module.ModuleName, + sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); } const WCHAR *get_wine_loader_name(void) @@ -910,7 +911,7 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) || !GetModuleBaseNameW(hProcess, hMods[i], baseW, sizeof(baseW) / sizeof(WCHAR))) continue; - module_fill_module(baseW, modW, sizeof(modW) / sizeof(CHAR)); + module_fill_module(baseW, modW, sizeof(modW) / sizeof(modW[0])); EnumLoadedModulesCallback(modW, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, UserContext); }

1 0

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

30 Jan '18

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

Nikolay Sivov : dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: aae9700accdcb5526d5d7092442737a5437c8c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae9700accdcb5526d5d7092… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:28 2018 +0300 dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c6c9d5e..765a723 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -934,7 +934,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi.SizeOfStruct = miw64.SizeOfStruct; + mi.SizeOfStruct = ModuleInfo->SizeOfStruct; mi.BaseOfImage = miw64.BaseOfImage; mi.ImageSize = miw64.ImageSize; mi.TimeDateStamp = miw64.TimeDateStamp; @@ -968,7 +968,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - miw.SizeOfStruct = miw64.SizeOfStruct; + miw.SizeOfStruct = ModuleInfo->SizeOfStruct; miw.BaseOfImage = miw64.BaseOfImage; miw.ImageSize = miw64.ImageSize; miw.TimeDateStamp = miw64.TimeDateStamp; @@ -1003,7 +1003,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi64.SizeOfStruct = miw64.SizeOfStruct; + mi64.SizeOfStruct = ModuleInfo->SizeOfStruct; mi64.BaseOfImage = miw64.BaseOfImage; mi64.ImageSize = miw64.ImageSize; mi64.TimeDateStamp = miw64.TimeDateStamp;

1 0

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

30 Jan '18

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018