September 2013 - Wine-commits

Marcus Meissner : xcopy: Allocate more space for the W buffer (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: a6550abee5d690b4d7c0e6ac039d0f240e954d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6550abee5d690b4d7c0e6ac0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 14:23:04 2013 +0200 xcopy: Allocate more space for the W buffer (Coverity). --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f894b0e..e3312db 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -114,7 +114,7 @@ static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0;

1 0

Marcus Meissner : view: Free the data on error exit (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 8953e8d7eeecca278ced44a172c31bb6d31c10b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8953e8d7eeecca278ced44a17… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 19:33:57 2013 +0200 view: Free the data on error exit (Coverity). --- programs/view/view.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 9e60824..0adade7 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -166,8 +166,10 @@ static HMETAFILE GetPlaceableMetaFile( LPCWSTR szFileName ) } CloseHandle( handle ); - if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) + if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) { + GlobalFree(lpData); return 0; + } width = APMHeader.bbox.Right - APMHeader.bbox.Left; @@ -181,6 +183,7 @@ static HMETAFILE GetPlaceableMetaFile( LPCWSTR szFileName ) deltax = 0; deltay = 0 ; + GlobalFree(lpData); return hmf; }

1 0

Marcus Meissner : msvcrt: Restore a stack mark on error (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e9358909f8bc940da4bd614dd68d5142b599f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9358909f8bc940da4bd614dd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 23:08:38 2013 +0200 msvcrt: Restore a stack mark on error (Coverity). --- dlls/msvcrt/undname.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ec974a0..057d40a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -539,8 +539,10 @@ static char* get_template_name(struct parsed_symbol* sym) struct array array_pmt; sym->names.start = sym->names.num; - if (!(name = get_literal_string(sym))) + if (!(name = get_literal_string(sym))) { + sym->names.start = start_mark; return FALSE; + } str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args != NULL)

1 0

Marcus Meissner : wintrust: Fixed some memory leaks (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: a090b46f727b9ccd0efd97cce0f870d56ad31519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a090b46f727b9ccd0efd97cce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 14:17:45 2013 +0200 wintrust: Fixed some memory leaks (Coverity). --- dlls/wintrust/crypt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 341f45b..0ed45d3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -909,6 +909,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } sum += size; @@ -916,6 +917,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); SetLastError(ERROR_OUTOFMEMORY); return INVALID_HANDLE_VALUE; } @@ -926,12 +928,14 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } p += size; @@ -948,6 +952,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h cc->magic = CRYPTCAT_MAGIC; return cc; } + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; }

1 0

Nikolay Sivov : xmllite: Reset resume state when text node is parsed.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 249b45786f209f902bbfbcfecd8ade18a75bb7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b45786f209f902bbfbcfec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 29 18:52:47 2013 +0400 xmllite: Reset resume state when text node is parsed. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e193e9d..325a7a5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2226,6 +2226,8 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader_init_strvalue(start, ptr-start, &value); reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d7400bc..04761cb 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -944,7 +944,9 @@ static const char misc_test_xml[] = "" "<a>" "" + "text" "" + "text2" "<?pi pibody ?>" "</a>" ; @@ -960,7 +962,9 @@ static struct nodes_test misc_test = { XmlNodeType_Comment, XmlNodeType_Element, XmlNodeType_Element, + XmlNodeType_Text, XmlNodeType_Comment, + XmlNodeType_Text, XmlNodeType_ProcessingInstruction, XmlNodeType_EndElement, XmlNodeType_None

1 0

Lucas Zawacki : Portuguese translation for release 1.7.3
by Jeremy Newman 30 Sep '13

30 Sep '13

Module: website Branch: master Commit: d11b74335ff5d135318be6648af7c4df4913ed22 URL: http://source.winehq.org/git/website.git/?a=commit;h=d11b74335ff5d135318be6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Sep 30 13:00:44 2013 -0300 Portuguese translation for release 1.7.3 --- news/pt/2013092701.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013092701.xml b/news/pt/2013092701.xml new file mode 100644 index 0000000..377d512 --- /dev/null +++ b/news/pt/2013092701.xml @@ -0,0 +1,15 @@ +<news> +<date>27 de Setembro de 2013</date> +<title>Wine 1.7.3 lançado</title> +<body> + A versão de desenvolvimento 1.7.3 já está disponível agora. + <a href="{$root}/announce/1.7.3">Novidades</a> desta versão: +<ul> + <li>Nova versão do motor Gecko baseado no Firefox 24.</li> + <li>Trabalho de preparação para o stream de comandos do Direct3D.</li> + <li>Correções no gerenciamento de janelas no driver de Mac.</li> + <li>Suporte para funções IPHLPAPI no Android.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Francois Gouget : testbot: Log the task pids.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: tools Branch: master Commit: 392d2725a12296a04e687b6e2de82eb58e060c0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=392d2725a12296a04e687b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:57:03 2013 +0200 testbot: Log the task pids. This makes it easier to analyze the logs as multiple instances of a given task can be running in parallel. --- testbot/lib/WineTestBot/Log.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index b88ba6f..99bc03b 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -54,7 +54,7 @@ sub LogMsg(@) $| = 1; select($tmp); } - print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile); + print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } sub SetupRedirects()

1 0

Francois Gouget : testbot/VMs: Import WineTestBot::Log before using it!.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: tools Branch: master Commit: b2e2bb56adf74492305973122627fa38677bbd01 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b2e2bb56adf7449230597312… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:57:16 2013 +0200 testbot/VMs: Import WineTestBot::Log before using it!. --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 04aeb3c..2cfeb54 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -521,9 +521,9 @@ sub RunRevert { $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; + require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); exec("$BinDir/RevertVM.pl", $self->GetKey()) or - require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot/VMs: Turn VM:: Hypervisors into a singleton so we maintain a single connection per hypervisor as was intended .
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: tools Branch: master Commit: b9435d67f2b924d1d3e66e052a6375c3155b74e9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b9435d67f2b924d1d3e66e05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 19:58:26 2013 +0200 testbot/VMs: Turn VM::Hypervisors into a singleton so we maintain a single connection per hypervisor as was intended. --- testbot/lib/WineTestBot/VMs.pm | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2cfeb54..c92b534 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -48,13 +48,17 @@ require Exporter; @EXPORT_OK = qw(new); +my $Singleton; sub new($) { my ($class) = @_; - my $self = {}; - $self = bless $self, $class; - return $self; + if (!defined $Singleton) + { + $Singleton = {}; + $Singleton = bless $Singleton, $class; + } + return $Singleton; } =pod @@ -75,8 +79,8 @@ sub GetHypervisor($$) my $Key = $URI || ""; if (!defined $self->{$Key}) { - eval { $self->{$Key} = Sys::Virt->new(uri => $URI); }; - return ($@->message(), undef) if ($@); + eval { $self->{$Key} = Sys::Virt->new(uri => $URI); }; + return ($@->message(), undef) if ($@); } return (undef, $self->{$Key});

1 0

Francois Gouget : testbot/VMs: Shut down VMs before reverting them.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: tools Branch: master Commit: d07df9daf9e3e2bc1ec27bd5140f9c99245f6088 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d07df9daf9e3e2bc1ec27bd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 20:01:22 2013 +0200 testbot/VMs: Shut down VMs before reverting them. This is a workaround for a bug in some QEmu/KVM versions. --- testbot/bin/RevertVM.pl | 11 +++++++++++ testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index acd3b5b..5f98191 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -97,6 +97,17 @@ if (defined($ErrMessage)) FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM; } +if ($VM->IsPoweredOn()) +{ + # Some QEmu/KVM versions are buggy and cannot revert a running VM + $ErrMessage = $VM->PowerOff(1); + if (defined $ErrMessage) + { + LogMsg "Could not shut down $VMKey: $ErrMessage\n"; + LogMsg "Trying the revert anyway\n"; + } +} + $ErrMessage = $VM->RevertToSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c92b534..37d1c4f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -362,9 +362,9 @@ sub PowerOn return $self->UpdateStatus($Domain); } -sub PowerOff +sub PowerOff($$) { - my ($self) = @_; + my ($self, $NoStatus) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); @@ -372,7 +372,8 @@ sub PowerOff eval { $Domain->destroy() }; return $@->message() if ($@); - return $self->UpdateStatus($Domain); + return $self->UpdateStatus($Domain) if (!$NoStatus); + return undef; } sub GetAgent($)

1 0