January 2010 - Wine-Commits

Vincent Povirk : gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 01b32951a55eae139e939af96b6b7a6c18cceba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b32951a55eae139e939af96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 31 16:15:37 2009 -0600 gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf. --- dlls/gdiplus/graphics.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 563e43a..a4f1158 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1217,7 +1217,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, UINT read; BYTE* copy; HENHMETAFILE hemf; - GpStatus retval = GenericError; + GpStatus retval = Ok; TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); @@ -1242,6 +1242,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ ERR("could not make stream\n"); GdipFree(copy); + retval = GenericError; goto err; } @@ -1253,7 +1254,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, (LPVOID*) &((*metafile)->image.picture)) != S_OK) + { + retval = GenericError; goto err; + } (*metafile)->image.type = ImageTypeMetafile; @@ -1277,10 +1281,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, TRACE("<-- %p\n", *metafile); - return Ok; - err: - GdipFree(*metafile); + if (retval != Ok) + GdipFree(*metafile); IStream_Release(stream); return retval; }

1 0

Nikolay Sivov : comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: d7b7f783ab8af0d717c7968a331233917e4c11b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b7f783ab8af0d717c7968a3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 1 18:50:45 2010 +0300 comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT. --- dlls/comdlg32/tests/printdlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4e189ee..61eefa6 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -323,6 +323,8 @@ static void test_abort_proc(void) ok(DeleteFileA(filename), "Failed to delete temporary file\n"); return; } + GlobalFree(pd.hDevMode); + GlobalFree(pd.hDevNames); ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); if (!(print_dc = pd.hDC))

1 0

Andrew Eikum : hlink/tests: Fix some memory leaks (valgrind).
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 4fec073d49ccd2534c04c30e01517410fc138941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fec073d49ccd2534c04c30e0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:30 2009 -0600 hlink/tests: Fix some memory leaks (valgrind). --- dlls/hlink/tests/browse_ctx.c | 3 +++ dlls/hlink/tests/hlink.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 483f604..a9b26e7 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -70,6 +70,9 @@ static void test_SetInitialHlink(void) ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + CoTaskMemFree(exp_name); + CoTaskMemFree(found_name); + IBindCtx_Release(bindctx); IMoniker_Release(found_moniker); IHlink_Release(found_hlink); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 6a67f59..1802196 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1138,6 +1138,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, HLINKSETF_LOCATION, one, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1146,6 +1148,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_LOCATION, two, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1154,6 +1158,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting target */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET, two, three); @@ -1163,6 +1169,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, two), "Found target should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_TARGET, three, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1171,6 +1179,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting both */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET | HLINKSETF_LOCATION, one, two); @@ -1180,6 +1190,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, one), "Found target should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -(HLINKSETF_TARGET | HLINKSETF_LOCATION), three, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1188,6 +1200,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test invalid flags/params */ hres = IHlink_GetStringReference(link, 4, &fnd_tgt, &fnd_loc); @@ -1195,14 +1209,20 @@ static void test_HlinkGetSetStringReference(void) "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(fnd_loc == NULL, "Found location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -2, &fnd_tgt, &fnd_loc); ok(hres == E_INVALIDARG, "IHlink_GetStringReference should have failed " "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, 4, NULL, NULL); ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);

1 0

Andrew Nguyen : wine.inf: Add CommonProgramFiles system environment variable.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: c4ffbade8671d519b7dcf8f8737b670826b61a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ffbade8671d519b7dcf8f87… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 31 07:58:50 2009 -0600 wine.inf: Add CommonProgramFiles system environment variable. --- dlls/userenv/tests/userenv.c | 2 +- tools/wine.inf.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 9003354..39c1bbf 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -95,7 +95,7 @@ static void test_create_env(void) { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, { "TEMP", { 1, 1, 0, 0 } }, { "TMP", { 1, 1, 0, 0 } }, - { "CommonProgramFiles", { 1, 1, 1, 1 } }, + { "CommonProgramFiles", { 1, 1, 0, 0 } }, { "ProgramFiles", { 1, 1, 0, 0 } } }; static const struct profile_item htok_vars[] = { diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cb33038..e03a7e4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -453,6 +453,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"CommonProgramFiles",,"%16427%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH"

1 0

Alexander Nicolaysen Sørnes : bug: Allow admins to only show queued links for versions they maintain
by Alexander Nicolaysen Sørnes Jan. 1, 2010

Jan. 1, 2010

Module: appdb Branch: master Commit: a45cbc01130b5dae9390cea2183a24c3b5bf37cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a45cbc01130b5dae9390cea2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jan 1 15:24:41 2010 +0100 bug: Allow admins to only show queued links for versions they maintain --- include/bugs.php | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 104 insertions(+), 8 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 9f59fa9..b07a3ca 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -406,6 +406,7 @@ class Bug return null; $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show bug links for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show bug links for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; } @@ -413,8 +414,24 @@ class Bug function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oBug = new bug(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oBug->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { @@ -423,24 +440,70 @@ class Bug $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; } - $sLimit = ""; - /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them after an offset given by iStart */ if(!$iRows) $iRows = bug::objectGetEntriesCount($sState, $oFilters); - $sQuery = "select * from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter LIMIT ?, ?"; - $hResult = query_parameters($sQuery, $sState, $iStart, $iRows); + if($bOnlyMyMaintainedEntries) + { + $sQuery = "SELECT buglinks.* FROM buglinks, appVersion, + appMaintainers WHERE + buglinks.versionId = appVersion.versionId + AND + appMaintainers.userId = '?' + AND + ( + ( + appMaintainers.superMaintainer = '1' + AND + appMaintainers.appId = appVersion.appid + ) + OR + ( + appMaintainers.superMaintainer = '0' + AND + appMaintainers.versionId = appVersion.versionId + ) + ) + AND + appMaintainers.state = 'accepted' + AND + buglinks.state = '?'$sWhereFilter LIMIT ?,?"; + + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sState, $iStart, $iRows); + } else + { + $sQuery = "select * from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter LIMIT ?, ?"; + $hResult = query_parameters($sQuery, $sState, $iStart, $iRows); + } + return $hResult; } function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oBug = new bug(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oBug->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { @@ -449,9 +512,42 @@ class Bug $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; } - $sQuery = "select count(*) as cnt from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter"; - $hResult = query_parameters($sQuery, $sState); + if($bOnlyMyMaintainedEntries) + { + $sQuery = "SELECT COUNT(buglinks.linkId) as cnt FROM buglinks, appVersion, + appMaintainers WHERE + buglinks.versionId = appVersion.versionId + AND + appMaintainers.userId = '?' + AND + ( + ( + appMaintainers.superMaintainer = '1' + AND + appMaintainers.appId = appVersion.appid + ) + OR + ( + appMaintainers.superMaintainer = '0' + AND + appMaintainers.versionId = appVersion.versionId + ) + ) + AND + appMaintainers.state = 'accepted' + AND + buglinks.state = '?'$sWhereFilter"; + + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sState); + } else + { + $sQuery = "select count(*) as cnt from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter"; + $hResult = query_parameters($sQuery, $sState); + } + $oRow = mysql_fetch_object($hResult); + return $oRow->cnt; }

1 0