March 2007 - Wine-Commits - list.winehq.org

appdb/ ./appdbStats.php ./viewScreenshots.php ...
by WineHQ March 13, 2007

March 13, 2007

ChangeSet ID: 30958 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/12 19:13:51 Modified files: . : appdbStats.php viewScreenshots.php include : appData.php screenshot.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix screenshot counting and browsing. Make sure to specify the 'screenshot' tpe and use appData functions for both counting and listing on the screenshots page, ensuring consistent results. Patch: http://cvs.winehq.org/patch.py?id=30958 Old revision New revision Changes Path 1.13 1.14 +1 -1 appdb/appdbStats.php 1.9 1.10 +2 -8 appdb/viewScreenshots.php 1.6 1.7 +29 -6 appdb/include/appData.php 1.56 1.57 +2 -2 appdb/include/screenshot.php Index: appdb/appdbStats.php diff -u -p appdb/appdbStats.php:1.13 appdb/appdbStats.php:1.14 --- appdb/appdbStats.php:1.13 13 Mar 2007 0:13:51 -0000 +++ appdb/appdbStats.php 13 Mar 2007 0:13:51 -0000 @@ -74,7 +74,7 @@ echo "</tr>\n\n"; /* Display the number of images */ echo "<tr class=color4>\n"; echo " <td>Screenshots:</td>\n"; -echo " <td>".appData::objectGetEntriesCount(false)."</td>\n"; +echo " <td>".appData::objectGetEntriesCount("false", "screenshot")."</td>\n"; echo "</tr>\n\n"; echo "</table>\n\n"; Index: appdb/viewScreenshots.php diff -u -p appdb/viewScreenshots.php:1.9 appdb/viewScreenshots.php:1.10 --- appdb/viewScreenshots.php:1.9 13 Mar 2007 0:13:51 -0000 +++ appdb/viewScreenshots.php 13 Mar 2007 0:13:51 -0000 @@ -22,7 +22,7 @@ if($aClean['iPage']) $currentPage = $aClean['iPage']; $ItemsPerPage = min($ItemsPerPage,100); -$totalPages = ceil(appData::objectGetEntriesCount(false)/$ItemsPerPage); +$totalPages = ceil(appData::objectGetEntriesCount("false", "screenshot")/$ItemsPerPage); $currentPage = min($currentPage,$totalPages); $offset = (($currentPage-1) * $ItemsPerPage); @@ -57,13 +57,7 @@ echo "</form>"; echo "</center>"; /* query for all of the Screenshots in assending order */ -$Ids = query_parameters("SELECT * from appData - WHERE - type = 'screenshot' - AND - queued = 'false' - ORDER BY id ASC LIMIT ?, ?", - $offset, $ItemsPerPage); +$Ids = appData::objectGetEntries(false, $ItemsPerPage, $offset, "screenshot"); $c = 1; echo "<div align=center><table><tr>\n"; while ($oRow = mysql_fetch_object($Ids)) Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.6 appdb/include/appData.php:1.7 --- appdb/include/appData.php:1.6 13 Mar 2007 0:13:51 -0000 +++ appdb/include/appData.php 13 Mar 2007 0:13:51 -0000 @@ -108,8 +108,8 @@ class appData if(($sQueued == "true" || $sQueued == "all") && !$_SESSION['current']->hasPriv("admin")) { - $sQuery = "SELECT COUNT(DISTINCT id) as count FROM appData, appMaintainers, - appVersion, appFamily WHERE + $sQuery = "SELECT COUNT(DISTINCT appData.id) as count FROM appData, + appMaintainers, appVersion, appFamily WHERE appFamily.appId = appVersion.appId AND appMaintainers.userId = '?' @@ -159,7 +159,7 @@ class appData } } else { - $sQuery = "SELECT COUNT(DISTINCT id) as count FROM appData, + $sQuery = "SELECT COUNT(DISTINCT appData.id) as count FROM appData, appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND @@ -209,7 +209,7 @@ class appData echo html_tr($aCells, $sClass); } - function objectGetEntries($bQueued, $sType) + function objectGetEntries($bQueued, $iRows = 0, $iStart = 0, $sType) { if($bQueued && !appData::canEdit($sType)) return FALSE; @@ -259,8 +259,20 @@ class appData appData.queued = '?' AND appData.type = '?'"; - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + if(!$iRows && !$iStarts) + { + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $bQueued ? "true" : "false", $sType); + } else + { + if(!$iRows) + $iRows = appData::objectGetEntriesCount($bQueued ? "true" : "false", + $sType); + $sQuery .= " LIMIT ?,?"; + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $bQueued ? "true" : "false", $sType, + $iStart, $iRows); + } } else { $sQuery = "SELECT DISTINCT appData.* FROM appData, appFamily, appVersion @@ -280,7 +292,18 @@ class appData appData.queued = '?' AND appData.type = '?'"; - $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType); + if(!$iRows && !$iStart) + { + $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType); + } else + { + if(!$iRows) + $iRows = appData::objectGetEntriesCount($bQueued ? "true" : "false", + $sType); + $sQuery .= " LIMIT ?,?"; + $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType, + $iStart, $iRows); + } } if(!$hResult) Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.56 appdb/include/screenshot.php:1.57 --- appdb/include/screenshot.php:1.56 13 Mar 2007 0:13:51 -0000 +++ appdb/include/screenshot.php 13 Mar 2007 0:13:51 -0000 @@ -509,9 +509,9 @@ class Screenshot { return $shImg; } - function objectGetEntries($bQueued) + function objectGetEntries($bQueued, $iRows = 0, $iStart = 0) { - return appData::objectGetEntries($bQueued, "screenshot"); + return appData::objectGetEntries($bQueued, $iRows, $iStart, "screenshot"); } function objectOutputHeader($sClass)

1 0

lostwages/ news/2007031201.xml wwn/wn20070312_ ...
by WineHQ March 12, 2007

March 12, 2007

ChangeSet ID: 30957 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/03/12 18:10:36 Added files: news : 2007031201.xml wwn : wn20070312_325.xml Log message: WWN #325 Patch: http://cvs.winehq.org/patch.py?id=30957 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007031201.xml Added 1.1 +0 -0 lostwages/wwn/wn20070312_325.xml

1 0

Jan Zerebecki : ole32: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 0f7a3811b4cdf818c04e5debd89390522410b43d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7a3811b4cdf818c04e5debd… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sun Mar 11 00:21:23 2007 +0100 ole32: Add DebugInfo to critical sections. Also add missing DeleteCriticalSection. --- dlls/ole32/moniker.c | 4 ++++ dlls/ole32/stg_prop.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index c899918..0cb35fa 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -279,6 +279,9 @@ RunningObjectTableImpl_Destroy(void) rot_entry_delete(rot_entry); } + DEBUG_CLEAR_CRITSEC_NAME(&runningObjectTableInstance->lock); + DeleteCriticalSection(&runningObjectTableInstance->lock); + /* free the ROT structure memory */ HeapFree(GetProcessHeap(),0,runningObjectTableInstance); runningObjectTableInstance = NULL; @@ -824,6 +827,7 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize(void) list_init(&runningObjectTableInstance->rot); InitializeCriticalSection(&runningObjectTableInstance->lock); + DEBUG_SET_CRITSEC_NAME(&runningObjectTableInstance->lock, "RunningObjectTableImpl.lock"); return S_OK; } diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a4be7b7..45c760e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -233,6 +233,7 @@ static ULONG WINAPI IPropertyStorage_fnRelease( if (This->dirty) IPropertyStorage_Commit(iface, STGC_DEFAULT); IStream_Release(This->stm); + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); PropertyStorage_DestroyDictionaries(This); HeapFree(GetProcessHeap(), 0, This); @@ -1978,6 +1979,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, (*pps)->vtbl = &IPropertyStorage_Vtbl; (*pps)->ref = 1; InitializeCriticalSection(&(*pps)->cs); + (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); (*pps)->stm = stm; memcpy(&(*pps)->fmtid, rfmtid, sizeof((*pps)->fmtid)); (*pps)->grfMode = grfMode; @@ -1986,6 +1988,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, if (FAILED(hr)) { IStream_Release(stm); + (*pps)->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&(*pps)->cs); HeapFree(GetProcessHeap(), 0, *pps); *pps = NULL;

1 0

Jan Zerebecki : winenas.drv: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 826321bc606ac6bf74b3760a21a32946c8c0dfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=826321bc606ac6bf74b3760a2… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:40 2007 +0100 winenas.drv: Add DebugInfo to critical sections. --- dlls/winenas.drv/audio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 73b6b88..ad2bfe7 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -461,6 +461,7 @@ static int NAS_InitRingMessage(MSG_RING* mr) mr->ring_buffer_size = NAS_RING_BUFFER_INCREMENT; mr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,mr->ring_buffer_size * sizeof(RING_MSG)); InitializeCriticalSection(&mr->msg_crst); + mr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MSG_RING.msg_crst"); return 0; } @@ -472,6 +473,7 @@ static int NAS_DestroyRingMessage(MSG_RING* mr) { CloseHandle(mr->msg_event); HeapFree(GetProcessHeap(),0,mr->messages); + mr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mr->msg_crst); return 0; }

1 0

Fabian Bieler : wined3d: Height of rectangle is bottom - top, not vice versa.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: a2808903b184be88c445173cd713a24f2f1ab58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2808903b184be88c445173cd… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Sat Mar 10 04:16:44 2007 +0100 wined3d: Height of rectangle is bottom - top, not vice versa. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13d0fa5..10b03bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4755,7 +4755,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; - srcHeight = pSourceRect ? pSourceRect->top - pSourceRect->bottom : srcSurfaceHeight; + srcHeight = pSourceRect ? pSourceRect->bottom - pSourceRect->top : srcSurfaceHeight; srcLeft = pSourceRect ? pSourceRect->left : 0; destLeft = pDestPoint ? pDestPoint->x : 0; destTop = pDestPoint ? pDestPoint->y : 0;

1 0

Jan Zerebecki : dmloader: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 70f6afdc9c9053d8f53557b63fe73650d904ad52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f6afdc9c9053d8f53557b63… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:08:12 2007 +0100 dmloader: Add DebugInfo to critical sections. --- dlls/dmloader/loader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index f453221..c89e5e7 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -805,7 +805,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob obj->dwRef = 0; /* will be inited with QueryInterface */ /* init critical section */ /* init cache/alias list */ - /*InitializeCriticalSection (&obj->CritSect); */ + /*InitializeCriticalSection (&obj->CritSect); + obj->CritSect.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicLoaderImpl.CritSect"); */ obj->pObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); list_init (obj->pObjects); /* init settings */ @@ -846,7 +847,8 @@ HRESULT WINAPI DMUSIC_DestroyDirectMusicLoaderImpl (LPDIRECTMUSICLOADER8 iface) IDirectMusicLoader8_ClearCache (iface, &GUID_DirectMusicAllTypes); /* FIXME: release all allocated entries */ /* destroy critical section */ - /*DeleteCriticalSection (&This->CritSect); */ + /*This->CritSect.DebugInfo->Spare[0] = 0; + DeleteCriticalSection (&This->CritSect); */ /* decrease number of instances */ InterlockedDecrement (&dwDirectMusicLoader);

1 0

Jan Zerebecki : winearts.drv: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: a771bce36a8a317e56a986b5a8c76db21e9f8c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a771bce36a8a317e56a986b5a… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:18 2007 +0100 winearts.drv: Add DebugInfo to critical sections. --- dlls/winearts.drv/audio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winearts.drv/audio.c b/dlls/winearts.drv/audio.c index 3e11a97..1e9675a 100644 --- a/dlls/winearts.drv/audio.c +++ b/dlls/winearts.drv/audio.c @@ -502,6 +502,7 @@ static int ARTS_InitRingMessage(ARTS_MSG_RING* mr) mr->ring_buffer_size = ARTS_RING_BUFFER_INCREMENT; mr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,mr->ring_buffer_size * sizeof(RING_MSG)); InitializeCriticalSection(&mr->msg_crst); + mr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ARTS_MSG_RING.msg_crst"); return 0; } @@ -514,6 +515,7 @@ static int ARTS_DestroyRingMessage(ARTS_MSG_RING* mr) CloseHandle(mr->msg_event); HeapFree(GetProcessHeap(),0,mr->messages); mr->messages=NULL; + mr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mr->msg_crst); return 0; }

1 0

Jan Zerebecki : wineoss.drv: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: bab5279d3884af58caeb6c569b8cf593c0b04871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab5279d3884af58caeb6c569… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:51 2007 +0100 wineoss.drv: Add DebugInfo to critical sections. --- dlls/wineoss.drv/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 36f5cd9..98f5a70 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1230,7 +1230,7 @@ static int OSS_InitRingMessage(OSS_MSG_RING* omr) omr->ring_buffer_size = OSS_RING_BUFFER_INCREMENT; omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(OSS_MSG)); InitializeCriticalSection(&omr->msg_crst); - omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)"WINEOSS_msg_crst"; + omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OSS_MSG_RING.msg_crst"); return 0; } @@ -1247,6 +1247,7 @@ static int OSS_DestroyRingMessage(OSS_MSG_RING* omr) CloseHandle(omr->msg_event); #endif HeapFree(GetProcessHeap(),0,omr->messages); + omr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&omr->msg_crst); return 0; }

1 0

Jan Zerebecki : winmm: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: ca350ad2b1c2aba1d7a4ece5bf226d7ad56c5bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca350ad2b1c2aba1d7a4ece5b… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:59 2007 +0100 winmm: Add DebugInfo to critical sections. --- dlls/winmm/winmm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 7499f60..7613277 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -76,7 +76,7 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) WINMM_IData.hWinMM32Instance = hInstDLL; InitializeCriticalSection(&WINMM_IData.cs); - WINMM_IData.cs.DebugInfo->Spare[0] = (DWORD_PTR)"WINMM_IData"; + WINMM_IData.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MM_IDATA.cs"); WINMM_IData.psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); WINMM_IData.psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Initialized IData (%p)\n", &WINMM_IData); @@ -94,6 +94,7 @@ static void WINMM_DeleteIData(void) * inside WINMM_IData */ CloseHandle(WINMM_IData.psStopEvent); CloseHandle(WINMM_IData.psLastEvent); + WINMM_IData.cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&WINMM_IData.cs); }

1 0

Jan Zerebecki : wineaudioio.drv: Add DebugInfo to critical sections.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 8629c53d3f67731417b59db109040fedb7630f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8629c53d3f67731417b59db10… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:26 2007 +0100 wineaudioio.drv: Add DebugInfo to critical sections. Also add missing DeleteCriticalSection. --- dlls/wineaudioio.drv/audio.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wineaudioio.drv/audio.c b/dlls/wineaudioio.drv/audio.c index 06fbb26..8225527 100644 --- a/dlls/wineaudioio.drv/audio.c +++ b/dlls/wineaudioio.drv/audio.c @@ -901,6 +901,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); memset(wwo->messages, 0, sizeof(WWO_MSG)*WWO_RING_BUFFER_SIZE); InitializeCriticalSection(&wwo->msg_crst); + wwo->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_WAVEOUT.msg_crst"); if (!(dwFlags & WAVE_DIRECTSOUND)) { TRACE("Starting wodPlayer Thread\n"); @@ -953,6 +954,10 @@ static DWORD wodClose(WORD wDevID) ret = WAVERR_STILLPLAYING; } else { TRACE("imhere[3-close]\n"); + + wwo->msg_crst.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&wwo->msg_crst); + if (wwo->hEvent != INVALID_HANDLE_VALUE) { wodPlayer_Message(wwo, WINE_WM_CLOSING, 0); WaitForSingleObject(wwo->hEvent, INFINITE);

1 0