October 2012 - Wine-commits

Henri Verbeet : d3dx9: Avoid LPDIRECT3DTEXTURE9.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 32809395630d6ee4c79c7388b14726b04f72b416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32809395630d6ee4c79c7388b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:39 2012 +0200 d3dx9: Avoid LPDIRECT3DTEXTURE9. --- dlls/d3dx9_36/texture.c | 147 +++++++++++------------------------------- include/d3dx9core.h | 12 ++-- include/d3dx9mesh.h | 19 +++--- include/d3dx9tex.h | 162 ++++++++++++----------------------------------- 4 files changed, 96 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32809395630d6ee4c79c7…

1 0

Marcus Meissner : dbghelp: Size of the floating point stack registers is 10 bytes (Coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 6d6b2160020df41b114bd74b0d3f48bf7009d734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6b2160020df41b114bd74b0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 24 23:11:29 2012 +0200 dbghelp: Size of the floating point stack registers is 10 bytes (Coverity). --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index d15afdd..c912a0a 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -575,14 +575,16 @@ static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size case CV_REG_ESP: *size = sizeof(ctx->Esp); return &ctx->Esp; case CV_REG_EIP: *size = sizeof(ctx->Eip); return &ctx->Eip; - case CV_REG_ST0 + 0: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[0*sizeof(long double)]; - case CV_REG_ST0 + 1: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[1*sizeof(long double)]; - case CV_REG_ST0 + 2: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[2*sizeof(long double)]; - case CV_REG_ST0 + 3: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[3*sizeof(long double)]; - case CV_REG_ST0 + 4: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[4*sizeof(long double)]; - case CV_REG_ST0 + 5: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[5*sizeof(long double)]; - case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; - case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + /* These are x87 floating point registers... They do not match a C type in + * the Linux ABI, so hardcode their 80-bitness. */ + case CV_REG_ST0 + 0: *size = 10; return &ctx->FloatSave.RegisterArea[0*10]; + case CV_REG_ST0 + 1: *size = 10; return &ctx->FloatSave.RegisterArea[1*10]; + case CV_REG_ST0 + 2: *size = 10; return &ctx->FloatSave.RegisterArea[2*10]; + case CV_REG_ST0 + 3: *size = 10; return &ctx->FloatSave.RegisterArea[3*10]; + case CV_REG_ST0 + 4: *size = 10; return &ctx->FloatSave.RegisterArea[4*10]; + case CV_REG_ST0 + 5: *size = 10; return &ctx->FloatSave.RegisterArea[5*10]; + case CV_REG_ST0 + 6: *size = 10; return &ctx->FloatSave.RegisterArea[6*10]; + case CV_REG_ST0 + 7: *size = 10; return &ctx->FloatSave.RegisterArea[7*10]; case CV_REG_CTRL: *size = sizeof(DWORD); return &ctx->FloatSave.ControlWord; case CV_REG_STAT: *size = sizeof(DWORD); return &ctx->FloatSave.StatusWord;

1 0

Jörg Höhle : mciseq: Correct MCI_SEEK return codes.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: c3842bc03c92a37fbb237df2f0666977ff99c216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3842bc03c92a37fbb237df2f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Sep 16 00:50:15 2012 +0200 mciseq: Correct MCI_SEEK return codes. --- dlls/mciseq/mcimidi.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 3b544c3..abea412 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1541,32 +1541,32 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp */ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { - DWORD ret = 0; + DWORD position; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); - if (lpParms == NULL) { - ret = MCIERR_NULL_PARAMETER_BLOCK; - } else { - MIDI_mciStop(wmm, MCI_WAIT, 0); - - if (dwFlags & MCI_SEEK_TO_START) { - wmm->dwPositionMS = 0; - } else if (dwFlags & MCI_SEEK_TO_END) { - wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ - } else if (dwFlags & MCI_TO) { - wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - WARN("dwFlag doesn't tell where to seek to...\n"); - return MCIERR_MISSING_PARAMETER; - } + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + position = dwFlags & (MCI_SEEK_TO_START|MCI_SEEK_TO_END|MCI_TO); + if (!position) return MCIERR_MISSING_PARAMETER; + if (position&(position-1)) return MCIERR_FLAGS_NOT_COMPATIBLE; - if (dwFlags & MCI_NOTIFY) - MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); + MIDI_mciStop(wmm, MCI_WAIT, 0); + + if (dwFlags & MCI_TO) { /* FIXME: compare with length */ + wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + } else if (dwFlags & MCI_SEEK_TO_START) { + wmm->dwPositionMS = 0; + } else { + wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ } - return ret; + + TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + + if (dwFlags & MCI_NOTIFY) + MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); + + return 0; } /*======================================================================*

1 0

André Hentschel : ieframe: Check for null before dereferencing it (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 07fd75baddcf2818a8118db35ebc932b00a188b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fd75baddcf2818a8118db35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:55 2012 +0200 ieframe: Check for null before dereferencing it (coverity). --- dlls/ieframe/shellbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 91a3bf6..6e84264 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -663,9 +663,9 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( if(cbPostData) { post_data = SafeArrayCreateVector(VT_UI1, 0, cbPostData); - memcpy(post_data->pvData, pPostData, cbPostData); if(!post_data) return E_OUTOFMEMORY; + memcpy(post_data->pvData, pPostData, cbPostData); }else { post_data = NULL; }

1 0

André Hentschel : gameux: Avoid double free (coverity) .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 97dbccf5f254648fd96e011adeba0136af340658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dbccf5f254648fd96e011ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:57 2012 +0200 gameux: Avoid double free (coverity). --- dlls/gameux/gameexplorer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1f51f12..8f30601 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -783,13 +783,15 @@ HRESULT GAMEUX_FindGameInstanceId( sConfigGDFBinaryPath, &lpValue); if(SUCCEEDED(hr)) + { if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); found = TRUE; } - HeapFree(GetProcessHeap(), 0, lpValue); + HeapFree(GetProcessHeap(), 0, lpValue); + } } }

1 0

André Hentschel : browseui: HeapFree after deleting the cs (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 69f01adf2d9e11055c1f185a673d297f577d63cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f01adf2d9e11055c1f185a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:06 2012 +0200 browseui: HeapFree after deleting the cs (coverity). --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7d478cc..598197b 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -265,9 +265,9 @@ static void ProgressDialog_Destructor(ProgressDialog *This) heap_free(This->lines[2]); heap_free(This->cancelMsg); heap_free(This->title); - heap_free(This); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); + heap_free(This); BROWSEUI_refCount--; }

1 0

André Hentschel : gdiplus: Fix order of GdipFrees ( coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 31eef521e9dfbde80740b05606b2584a77b9d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31eef521e9dfbde80740b0560… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:10 2012 +0200 gdiplus: Fix order of GdipFrees (coverity). --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 47a864b..ca96bda 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1067,9 +1067,9 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) (*clone)->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF)); (*clone)->pathdata.Types = GdipAlloc(path->datalen); if(!(*clone)->pathdata.Points || !(*clone)->pathdata.Types){ - GdipFree(*clone); GdipFree((*clone)->pathdata.Points); GdipFree((*clone)->pathdata.Types); + GdipFree(*clone); return OutOfMemory; }

1 0

André Hentschel : windowscodecs: Fix resource leak ( coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: bbefb29d1cd9fd644946618574ad1aed8ced4925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbefb29d1cd9fd64494661857… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:17 2012 +0200 windowscodecs: Fix resource leak (coverity). --- dlls/windowscodecs/ungif.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 0f55242..c2887ed 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -159,6 +159,7 @@ MakeMapObject(int ColorCount, Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType)); if (Object->Colors == NULL) { + ungif_free(Object); return NULL; }

1 0

Francois Gouget : testbot/Engine: Simplify the client command dispatching.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: 3708ce43194501b05a1d65c316ad16414e535c17 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3708ce43194501b05a1d65c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:13:23 2012 +0200 testbot/Engine: Simplify the client command dispatching. --- testbot/bin/Engine.pl | 66 +++++++++++++----------------------------------- 1 files changed, 18 insertions(+), 48 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f453927..7834619 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -440,57 +440,27 @@ sub HandleGetScreenshot return "1" . $ImageBytes; } +my %Handlers=( + "expectwinetestupdate" => \&HandleExpectWinetestUpdate, + "foundwinetestupdate" => \&HandleFoundWinetestUpdate, + "getscreenshot" => \&HandleGetScreenshot, + "jobcancel" => \&HandleJobCancel, + "jobstatuschange" => \&HandleJobStatusChange, + "jobsubmit" => \&HandleJobSubmit, + "ping" => \&HandlePing, + "taskcomplete" => \&HandleTaskComplete, + "vmstatuschange" => \&HandleVMStatusChange, + "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, + "winepatchwebnotification" => \&HandleWinePatchWebNotification, + "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + ); + sub HandleClientCmd { my $Cmd = shift; - if ($Cmd eq "ping") - { - return HandlePing(@_); - } - if ($Cmd eq "jobsubmit") - { - return HandleJobSubmit(@_); - } - if ($Cmd eq "jobstatuschange") - { - return HandleJobStatusChange(@_); - } - if ($Cmd eq "jobcancel") - { - return HandleJobCancel(@_); - } - if ($Cmd eq "taskcomplete") - { - return HandleTaskComplete(@_); - } - if ($Cmd eq "vmstatuschange") - { - return HandleVMStatusChange(@_); - } - if ($Cmd eq "expectwinetestupdate") - { - return HandleExpectWinetestUpdate(@_); - } - if ($Cmd eq "foundwinetestupdate") - { - return HandleFoundWinetestUpdate(@_); - } - if ($Cmd eq "winepatchmlsubmission") - { - return HandleWinePatchMLSubmission(@_); - } - if ($Cmd eq "winepatchwebnotification") - { - return HandleWinePatchWebNotification(@_); - } - if ($Cmd eq "winepatchwebsubmission") - { - return HandleWinePatchWebSubmission(@_); - } - if ($Cmd eq "getscreenshot") - { - return HandleGetScreenshot(@_); - } + + my $handler = $Handlers{$Cmd}; + return &$handler(@_) if (defined $handler); LogMsg "Unknown command $Cmd\n"; return "0Unknown command $Cmd\n";

1 0

Francois Gouget : testbot/web: Get rid of startup.pl.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: c1d7e86c75382181b12204ce962f3e9ed9006217 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1d7e86c75382181b12204ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:13:49 2012 +0200 testbot/web: Get rid of startup.pl. We can do the setup in the Apache configuration file instead. This way there's one less file containing the installation path. Also CheckWineTestBot.pl does not actually hardcode the installation path these days so remove this INSTALL.txt section altogether. --- testbot/doc/INSTALL.txt | 4 ---- testbot/doc/vhost_winetestbot.conf | 8 +++++++- testbot/lib/startup.pl | 26 -------------------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 76f9aca..1cbfd83 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -45,10 +45,6 @@ General setup for the web site: mkdir jobs latest patches socket staging sudo chown WWWRUN:winehq staging chmod g+w * -- If the installation path is different from the default, then some paths - in the following files will need to be modified: - testbot/lib/startup.pl - testbot/scripts/CheckWineTestBot.pl - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. (typically "chkconfig winetestbot on" or "service winetestbot start") diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index ca55933..9c53876 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -4,8 +4,14 @@ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com - PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + use lib qw(/home/winehq/tools/testbot/lib); + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(\&CreatePageBase); + </Perl> <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl diff --git a/testbot/lib/startup.pl b/testbot/lib/startup.pl deleted file mode 100644 index ca67505..0000000 --- a/testbot/lib/startup.pl +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2009 Ge van Geldorp -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -use lib qw(/home/winehq/tools/testbot/lib); - -use ObjectModel::CGI::Page; -use WineTestBot::CGI::PageBase; - -SetPageBaseCreator(\&CreatePageBase); - -1;

1 0