wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Andrew Eikum : hlink: Fix copy-paste typo.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 9b164cf6f405385795de1d910ff3b66ac7c233f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b164cf6f405385795de1d910… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:27 2009 -0600 hlink: Fix copy-paste typo. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index f6c4184..1a15c08 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -126,7 +126,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, /*********************************************************************** - * HlinkNavigate (HLINK.@) + * HlinkCreateBrowseContext (HLINK.@) */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) {

1 0

Vincent Povirk : gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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

William Waghorn : wined3d: Added NVidia GT240 detection.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0c582dca3adccc83a34727c0d8979989bd25fbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c582dca3adccc83a34727c0d… Author: William Waghorn <willw(a)litany.me.uk> Date: Wed Dec 30 18:54:30 2009 -0800 wined3d: Added NVidia GT240 detection. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f9bc752..487b435 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -954,6 +954,7 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 }, @@ -1222,6 +1223,12 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * *vidmem = 1024; return CARD_NVIDIA_GEFORCE_GTX260; } + /* Geforce 200 - midend */ + if (strstr(gl_renderer, "GT 240")) + { + *vidmem = 512; + return CARD_NVIDIA_GEFORCE_GT240; + } /* Geforce9 - highend / Geforce 200 - midend (GTS 150/250 are based on the same core) */ if (strstr(gl_renderer, "9800") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47b89c9..361967b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1313,6 +1313,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Andrew Nguyen : wine.inf: Add CommonProgramFiles system environment variable.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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 01 Jan '10

01 Jan '10

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

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 2010