wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

appdb/include testData.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31168 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 19:14:03 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Sort testData by id Patch: http://cvs.winehq.org/patch.py?id=31168 Old revision New revision Changes Path 1.55 1.56 +6 -6 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.55 appdb/include/testData.php:1.56 --- appdb/include/testData.php:1.55 10 Jun 2007 0:14: 3 -0000 +++ appdb/include/testData.php 10 Jun 2007 0:14: 3 -0000 @@ -828,7 +828,7 @@ class testData{ return $oRow->count; } - function objectGetEntries($bQueued, $bRejected) + function objectGetEntries($bQueued, $bRejected, $sOrderBy = "testingId") { $oTest = new testData(); $sQueued = objectManager::getQueueString($bQueued, $bRejected); @@ -843,7 +843,7 @@ class testData{ AND testResults.submitterId = '?' AND - testResults.queued = '?'"; + testResults.queued = '?' ORDER BY '?'"; } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, @@ -868,10 +868,10 @@ class testData{ ) ) AND - testResults.queued = '?'"; + testResults.queued = '?' ORDER BY '?'"; } $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, - $sQueued); + $sQueued, $sOrderBy); } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE @@ -879,8 +879,8 @@ class testData{ AND appVersion.queued = 'false' AND - testResults.queued = '?' ORDER by testingId"; - $hResult = query_parameters($sQuery, $sQueued); + testResults.queued = '?' ORDER by '?'"; + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); } if(!$hResult)

1 0

appdb/include image.php screenshot.php
by WineHQ 09 Jun '07

09 Jun '07

ChangeSet ID: 31167 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 17:17:32 Modified files: include : image.php screenshot.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Screenshot::delete() and Image::delete() should check if the file exists before attempting to call unlink() on it. Fixes three php errors that occur during the unit tests. Patch: http://cvs.winehq.org/patch.py?id=31167 Old revision New revision Changes Path 1.9 1.10 +3 -1 appdb/include/image.php 1.67 1.68 +6 -1 appdb/include/screenshot.php Index: appdb/include/image.php diff -u -p appdb/include/image.php:1.9 appdb/include/image.php:1.10 --- appdb/include/image.php:1.9 9 Jun 2007 22:17:32 -0000 +++ appdb/include/image.php 9 Jun 2007 22:17:32 -0000 @@ -391,7 +391,9 @@ class Image { */ function delete() { - unlink($this->sFile); + // if the file exists, delete it + if(is_file($this->sFile)) + unlink($this->sFile); } Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.67 appdb/include/screenshot.php:1.68 --- appdb/include/screenshot.php:1.67 9 Jun 2007 22:17:32 -0000 +++ appdb/include/screenshot.php 9 Jun 2007 22:17:32 -0000 @@ -139,7 +139,12 @@ class Screenshot { $this->oScreenshotImage->delete(); $this->oThumbnailImage->delete(); - unlink(appdb_fullpath("/data/screenshots/originals/".$this->iScreenshotId)); + + // if the original file exists, delete it + $sOriginalFilename = appdb_fullpath("/data/screenshots/originals/".$this->iScreenshotId); + if(is_file($sOriginalFilename)) + unlink($sOriginalFilename); + if(!$bSilent) $this->mailMaintainers(true); }

1 0

appdb/. addcomment.php
by WineHQ 09 Jun '07

09 Jun '07

ChangeSet ID: 31166 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 17:13:27 Modified files: . : addcomment.php Log message: Ben Hodgetts <ben(a)atomnet.co.uk> Add a note to not post terminal outputs to comments Patch: http://cvs.winehq.org/patch.py?id=31166 Old revision New revision Changes Path 1.36 1.37 +3 -0 appdb/addcomment.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.36 appdb/addcomment.php:1.37 --- appdb/addcomment.php:1.36 9 Jun 2007 22:13:27 -0000 +++ appdb/addcomment.php 9 Jun 2007 22:13:27 -0000 @@ -58,6 +58,9 @@ if(!empty($aClean['sBody'])) } } + echo "<p align=\"center\">Enter your comment in the box below."; + echo "</br>Please do not paste large terminal or debug outputs here.</p>"; + echo "<form method=\"post\" action=\"addcomment.php\">\n"; echo html_frame_start($mesTitle,500,"",0);

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ 09 Jun '07

09 Jun '07

ChangeSet ID: 31165 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 12:07:02 Modified files: . : objectManager.php include : objectManager.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add multi-page support to objectManager, use it for the vendor class Patch: http://cvs.winehq.org/patch.py?id=31165 Old revision New revision Changes Path 1.12 1.13 +2 -2 appdb/objectManager.php 1.21 1.22 +109 -2 appdb/include/objectManager.php 1.28 1.29 +7 -0 appdb/include/vendor.php

1 0

appdb/ include/appData.php include/downloadurl ...
by WineHQ 09 Jun '07

09 Jun '07

ChangeSet ID: 31164 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 10:44:46 Modified files: include : appData.php downloadurl.php version_queue.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix app/version rejection. Version queue requeue wasn't requeueing its downloadurl, downloadurl class was missing objectManager functionality. Rejected appData wasn't being accounted for. Patch: http://cvs.winehq.org/patch.py?id=31164 Old revision New revision Changes Path 1.21 1.22 +32 -2 appdb/include/appData.php 1.16 1.17 +21 -2 appdb/include/downloadurl.php 1.11 1.12 +8 -1 appdb/include/version_queue.php 1.32 1.33 +1 -1 appdb/tables/appdb_tables.sql Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.21 appdb/include/appData.php:1.22 --- appdb/include/appData.php:1.21 9 Jun 2007 15:44:46 -0000 +++ appdb/include/appData.php 9 Jun 2007 15:44:46 -0000 @@ -52,6 +52,34 @@ class appData return $hResult; } + function reQueue() + { + if(!$this->canEdit()) + return FALSE; + + $sQuery = "UPDATE appData SET queued = '?' WHERE id = '?'"; + $hResult = query_parameters($sQuery, "true", $this->iId); + + if(!$hResult) + return FALSE; + else + return TRUE; + } + + function reject() + { + if(!$this->canEdit()) + return FALSE; + + $sQuery = "UPDATE appData SET queued = '?' WHERE id = '?'"; + $hResult = query_parameters($sQuery, "rejected", $this->iId); + + if(!$hResult) + return FALSE; + else + return TRUE; + } + function update($bSilent = FALSE) { if(!$this->canEdit()) @@ -122,7 +150,7 @@ class appData } /* Get appData for a given version/application, optionally filter by type */ - function getData($iId, $sType, $bIsVersion = TRUE, $bQueued = FALSE) + function getData($iId, $sType, $bIsVersion = TRUE, $bQueued = FALSE, $bRejected = FALSE) { $iAppId = 0; $iVersionId = 0; @@ -132,9 +160,11 @@ class appData else $iAppId = $iId; + $sQueued = objectManager::getQueueString($bQueued, $bRejected); + $hResult = query_parameters("SELECT * FROM appData WHERE appId = '?' AND versionId = '?' AND TYPE = '?' AND queued = '?'", - $iAppId, $iVersionId, $sType, $bQueued ? "true" : "false"); + $iAppId, $iVersionId, $sType, $sQueued); if(!$hResult || !mysql_num_rows($hResult)) return FALSE; Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.16 appdb/include/downloadurl.php:1.17 --- appdb/include/downloadurl.php:1.16 9 Jun 2007 15:44:46 -0000 +++ appdb/include/downloadurl.php 9 Jun 2007 15:44:46 -0000 @@ -244,8 +244,13 @@ class downloadurl $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"]; } else if($iVersionId) { - if($hResult = appData::getData($iVersionId, "downloadurl", - TRUE, TRUE)) + /* This illustrates the importance of converting downloadurl completely + to the objectManager model. If we don't get a match searching for + a queued entry, try finding a rejected one. */ + if(($hResult = appData::getData($iVersionId, "downloadurl", + TRUE, TRUE, FALSE)) || + $hResult = appData::getData($iVersionId, "downloadurl", + TRUE, TRUE, TRUE)) { $oRow = mysql_fetch_object($hResult); $sDownloadUrlUrl = $oRow->url; @@ -370,6 +375,20 @@ class downloadurl return TRUE; } + function reQueue() + { + $oAppData = new AppData($this->iId); + + return $oAppData->reQueue(); + } + + function reject() + { + $oAppData = new AppData($this->iId); + + return $oAppData->reject(); + } + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) { return appData::objectGetEntries($bQueued, $bRejected, $iRows, $iStart, Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.11 appdb/include/version_queue.php:1.12 --- appdb/include/version_queue.php:1.11 9 Jun 2007 15:44:46 -0000 +++ appdb/include/version_queue.php 9 Jun 2007 15:44:46 -0000 @@ -16,7 +16,13 @@ class version_queue { $iTestingId = testData::getNewestTestIdFromVersionId($iVersionId, $this->oVersion->sQueued); - if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) + /* This illustrates the importance of converting downloadurl completely + to the objectManager model. If we don't get a match searching for + a queued entry, try finding a rejected one. */ + if(($hResult = appData::getData($iVersionId, "downloadurl", + TRUE, TRUE, FALSE)) || + $hResult = appData::getData($iVersionId, "downloadurl", + TRUE, TRUE, TRUE)) { if($oRow = mysql_fetch_object($hResult)) $iDownloadUrlId = $oRow->id; @@ -46,6 +52,7 @@ class version_queue { $this->oVersion->reQueue(); $this->oTestDataQueue->reQueue(); + $this->oDownloadUrl->reQueue(); } function reject() Index: appdb/tables/appdb_tables.sql diff -u -p appdb/tables/appdb_tables.sql:1.32 appdb/tables/appdb_tables.sql:1.33 --- appdb/tables/appdb_tables.sql:1.32 9 Jun 2007 15:44:46 -0000 +++ appdb/tables/appdb_tables.sql 9 Jun 2007 15:44:46 -0000 @@ -140,7 +140,7 @@ create table appData ( url varchar(255) default NULL, submitTime timestamp(14) NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false') NOT NULL default 'false', + queued enum('true','false','rejected') NOT NULL default 'false', KEY id (id), KEY versionId (versionId) );

1 0

Andrey Turkin : kernel32: Implement IO completion functions on top of the NT IoCompletion API.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: 6310819afb0ac294573551c2117f636ed8367ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6310819afb0ac294573551c21… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jun 2 02:32:07 2007 +0400 kernel32: Implement IO completion functions on top of the NT IoCompletion API. --- dlls/kernel32/sync.c | 75 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index be536a4..07bd9b0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1811,12 +1811,45 @@ BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout) HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle, HANDLE hExistingCompletionPort, ULONG_PTR CompletionKey, DWORD dwNumberOfConcurrentThreads) { - FIXME("(%p, %p, %08lx, %08x): stub.\n", + NTSTATUS status; + HANDLE ret = 0; + + TRACE("(%p, %p, %08lx, %08x)\n", hFileHandle, hExistingCompletionPort, CompletionKey, dwNumberOfConcurrentThreads); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; -} + if (hExistingCompletionPort && hFileHandle == INVALID_HANDLE_VALUE) + { + SetLastError( ERROR_INVALID_PARAMETER); + return NULL; + } + + if (hExistingCompletionPort) + ret = hExistingCompletionPort; + else + { + status = NtCreateIoCompletion( &ret, IO_COMPLETION_ALL_ACCESS, NULL, dwNumberOfConcurrentThreads ); + if (status != STATUS_SUCCESS) goto fail; + } + + if (hFileHandle != INVALID_HANDLE_VALUE) + { + FILE_COMPLETION_INFORMATION info; + IO_STATUS_BLOCK iosb; + + info.CompletionPort = ret; + info.CompletionKey = CompletionKey; + status = NtSetInformationFile( hFileHandle, &iosb, &info, sizeof(info), FileCompletionInformation ); + if (status != STATUS_SUCCESS) goto fail; + } + + return ret; + +fail: + if (ret && !hExistingCompletionPort) + CloseHandle( ret ); + SetLastError( RtlNtStatusToDosError(status) ); + return 0; +} /****************************************************************************** * GetQueuedCompletionStatus (KERNEL32.@) @@ -1825,17 +1858,43 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf PULONG_PTR pCompletionKey, LPOVERLAPPED *lpOverlapped, DWORD dwMilliseconds ) { - FIXME("(%p,%p,%p,%p,%d), stub!\n", + NTSTATUS status; + IO_STATUS_BLOCK iosb; + LARGE_INTEGER wait_time; + + TRACE("(%p,%p,%p,%p,%d)\n", CompletionPort,lpNumberOfBytesTransferred,pCompletionKey,lpOverlapped,dwMilliseconds); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + *lpOverlapped = NULL; + + status = NtRemoveIoCompletion( CompletionPort, pCompletionKey, (PULONG_PTR)lpOverlapped, + &iosb, get_nt_timeout( &wait_time, dwMilliseconds ) ); + if (status == STATUS_SUCCESS) + { + *lpNumberOfBytesTransferred = iosb.Information; + return TRUE; + } + + SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } + +/****************************************************************************** + * PostQueuedCompletionStatus (KERNEL32.@) + */ BOOL WINAPI PostQueuedCompletionStatus( HANDLE CompletionPort, DWORD dwNumberOfBytes, ULONG_PTR dwCompletionKey, LPOVERLAPPED lpOverlapped) { - FIXME("%p %d %08lx %p\n", CompletionPort, dwNumberOfBytes, dwCompletionKey, lpOverlapped ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + NTSTATUS status; + + TRACE("%p %d %08lx %p\n", CompletionPort, dwNumberOfBytes, dwCompletionKey, lpOverlapped ); + + status = NtSetIoCompletion( CompletionPort, dwCompletionKey, (ULONG_PTR)lpOverlapped, + STATUS_SUCCESS, dwNumberOfBytes ); + + if (status == STATUS_SUCCESS) return TRUE; + SetLastError( RtlNtStatusToDosError(status) ); return FALSE; }

1 0

Andrey Turkin : kernel32: Factor out all kernel32 timeout-conversion snippets to one helper functions .
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: dd49801752e5f7aa5f47fff8bd49a89e27c698a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd49801752e5f7aa5f47fff8b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jun 2 02:30:01 2007 +0400 kernel32: Factor out all kernel32 timeout-conversion snippets to one helper functions. --- dlls/kernel32/sync.c | 51 +++++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ff987c3..be536a4 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -82,6 +82,14 @@ HANDLE get_BaseNamedObjects_handle(void) return handle; } +/* helper for kernel32->ntdll timeout format conversion */ +static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout ) +{ + if (timeout == INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + /*********************************************************************** * Sleep (KERNEL32.@) */ @@ -96,18 +104,11 @@ VOID WINAPI Sleep( DWORD timeout ) DWORD WINAPI SleepEx( DWORD timeout, BOOL alertable ) { NTSTATUS status; + LARGE_INTEGER time; - if (timeout == INFINITE) status = NtDelayExecution( alertable, NULL ); - else - { - LARGE_INTEGER time; - - time.QuadPart = timeout * (ULONGLONG)10000; - time.QuadPart = -time.QuadPart; - status = NtDelayExecution( alertable, &time ); - } - if (status != STATUS_USER_APC) status = STATUS_SUCCESS; - return status; + status = NtDelayExecution( alertable, get_nt_timeout( &time, timeout ) ); + if (status == STATUS_USER_APC) return WAIT_IO_COMPLETION; + return 0; } @@ -158,6 +159,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, { NTSTATUS status; HANDLE hloc[MAXIMUM_WAIT_OBJECTS]; + LARGE_INTEGER time; unsigned int i; if (count > MAXIMUM_WAIT_OBJECTS) @@ -187,18 +189,8 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, } } - if (timeout == INFINITE) - { - status = NtWaitForMultipleObjects( count, hloc, wait_all, alertable, NULL ); - } - else - { - LARGE_INTEGER time; - - time.QuadPart = timeout * (ULONGLONG)10000; - time.QuadPart = -time.QuadPart; - status = NtWaitForMultipleObjects( count, hloc, wait_all, alertable, &time ); - } + status = NtWaitForMultipleObjects( count, hloc, wait_all, alertable, + get_nt_timeout( &time, timeout ) ); if (HIWORD(status)) /* is it an error code? */ { @@ -302,20 +294,13 @@ DWORD WINAPI SignalObjectAndWait( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn DWORD dwMilliseconds, BOOL bAlertable ) { NTSTATUS status; - LARGE_INTEGER timeout, *ptimeout = NULL; + LARGE_INTEGER timeout; TRACE("%p %p %d %d\n", hObjectToSignal, hObjectToWaitOn, dwMilliseconds, bAlertable); - if (dwMilliseconds != INFINITE) - { - timeout.QuadPart = dwMilliseconds * (ULONGLONG)10000; - timeout.QuadPart = -timeout.QuadPart; - ptimeout = &timeout; - } - - status = NtSignalAndWaitForSingleObject( hObjectToSignal, hObjectToWaitOn, - bAlertable, ptimeout ); + status = NtSignalAndWaitForSingleObject( hObjectToSignal, hObjectToWaitOn, bAlertable, + get_nt_timeout( &timeout, dwMilliseconds ) ); if (HIWORD(status)) { SetLastError( RtlNtStatusToDosError(status) );

1 0

Andrey Turkin : ntdll: Stub and document IoCompletion APIs.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: ad5f94d0f729102115a540adf0a123c29af22f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5f94d0f729102115a540adf… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jun 2 02:30:14 2007 +0400 ntdll: Stub and document IoCompletion APIs. --- dlls/ntdll/ntdll.spec | 14 ++++---- dlls/ntdll/sync.c | 90 +++++++++++++++++++++++++++++++++++++++++++++--- include/winternl.h | 19 ++++++---- 3 files changed, 102 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad5f94d0f729102115a54…

1 0

Alexandre Julliard : msvcrt: Set the correct ebp value before calling the local unwind handler.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: 72bc7429e496b3d9a45806eb95f1be2461731604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bc7429e496b3d9a45806eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 12:56:19 2007 +0200 msvcrt: Set the correct ebp value before calling the local unwind handler. --- dlls/msvcrt/except.c | 73 ++++++++++++++++++++++++++++------------------ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index c924088..aef5133 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -71,15 +71,26 @@ static inline void call_finally_block( void *code_block, void *base_ptr ) : : "a" (code_block), "g" (base_ptr)); } -static inline DWORD call_filter( void *func, void *arg, void *ebp ) +static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) { - DWORD ret; + int ret; __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp" : "=a" (ret) : "0" (func), "r" (ebp), "r" (arg) : "ecx", "edx", "memory" ); return ret; } + +static inline int call_unwind_func( int (*func)(void), void *ebp ) +{ + int ret; + __asm__ __volatile__ ("pushl %%ebp; movl %2,%%ebp; call *%0; popl %%ebp" + : "=a" (ret) + : "0" (func), "r" (ebp) + : "ecx", "edx", "memory" ); + return ret; +} + #endif static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, @@ -109,21 +120,8 @@ __ASM_GLOBAL_FUNC(_EH_prolog, "leal 12(%esp), %ebp\n\t" "pushl %eax\n\t" "ret") -#endif -/******************************************************************* - * _global_unwind2 (MSVCRT.@) - */ -void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame) -{ - TRACE("(%p)\n",frame); - RtlUnwind( frame, 0, 0, 0 ); -} - -/******************************************************************* - * _local_unwind2 (MSVCRT.@) - */ -void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel) +static void msvcrt_local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel, void *ebp) { EXCEPTION_REGISTRATION_RECORD reg; @@ -140,16 +138,34 @@ void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel) frame->trylevel = frame->scopetable[level].previousTryLevel; if (!frame->scopetable[level].lpfnFilter) { - FIXME( "__try block cleanup level %d handler %p not fully implemented\n", - level, frame->scopetable[level].lpfnHandler ); - /* FIXME: should probably set ebp to frame->_ebp */ - frame->scopetable[level].lpfnHandler(); + TRACE( "__try block cleanup level %d handler %p ebp %p\n", + level, frame->scopetable[level].lpfnHandler, ebp ); + call_unwind_func( frame->scopetable[level].lpfnHandler, ebp ); } } __wine_pop_frame(&reg); TRACE("unwound OK\n"); } +/******************************************************************* + * _local_unwind2 (MSVCRT.@) + */ +void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel) +{ + msvcrt_local_unwind2( frame, trylevel, &frame->_ebp ); +} + +#endif /* __i386__ */ + +/******************************************************************* + * _global_unwind2 (MSVCRT.@) + */ +void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame) +{ + TRACE("(%p)\n",frame); + RtlUnwind( frame, 0, 0, 0 ); +} + /********************************************************************* * _except_handler2 (MSVCRT.@) */ @@ -172,8 +188,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, PCONTEXT context, void* dispatcher) { #if defined(__GNUC__) && defined(__i386__) - long retval; - int trylevel; + int retval, trylevel; EXCEPTION_POINTERS exceptPtrs; PSCOPETABLE pScopeTable; @@ -186,7 +201,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { /* Unwinding the current frame */ - _local_unwind2(frame, TRYLEVEL_END); + msvcrt_local_unwind2(frame, TRYLEVEL_END, &frame->_ebp); TRACE("unwound current frame, returning ExceptionContinueSearch\n"); return ExceptionContinueSearch; } @@ -218,7 +233,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, { /* Unwind all higher frames, this one will handle the exception */ _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); - _local_unwind2(frame, trylevel); + msvcrt_local_unwind2(frame, trylevel, &frame->_ebp); /* Set our trylevel to the enclosing block, and call the __finally * code, which won't return @@ -298,7 +313,7 @@ DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp) int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) { jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; - if (jmp->Registration == TRYLEVEL_END) + if (jmp->Registration == ~0UL) jmp->TryLevel = TRYLEVEL_END; else jmp->TryLevel = ((MSVCRT_EXCEPTION_FRAME*)jmp->Registration)->trylevel; @@ -317,7 +332,7 @@ int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; - if (jmp->Registration == TRYLEVEL_END) + if (jmp->Registration == ~0UL) { jmp->TryLevel = TRYLEVEL_END; } @@ -367,8 +382,8 @@ int CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) unwind_func(jmp); } else - _local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, - jmp->TryLevel); + msvcrt_local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, + jmp->TryLevel, (void *)jmp->Ebp); } if (!retval) @@ -382,7 +397,7 @@ int CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) */ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) { - _local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel ); + msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); } #endif /* i386 */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 66f2ede..cb427ab 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -323,7 +323,7 @@ @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _loaddll(str) -@ cdecl _local_unwind2(ptr long) +@ cdecl -i386 _local_unwind2(ptr long) @ cdecl _lock(long) @ cdecl _locking(long long long) @ cdecl _logb( double )

1 0

Alexandre Julliard : cmd.exe: Silence a FIXME.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: abc5fefadaee3bd9436cf81edbccc42beeac3e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc5fefadaee3bd9436cf81ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 12:54:21 2007 +0200 cmd.exe: Silence a FIXME. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f5310b7..a7cc2b1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1469,7 +1469,7 @@ void WCMD_setshow_default (WCHAR *command) { strcpyW(env, equalW); memcpy(env+1, string, 2 * sizeof(WCHAR)); env[3] = 0x00; - WINE_FIXME("Setting '%s' to '%s'\n", wine_dbgstr_w(env), wine_dbgstr_w(string)); + WINE_TRACE("Setting '%s' to '%s'\n", wine_dbgstr_w(env), wine_dbgstr_w(string)); SetEnvironmentVariable(env, string); }

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
86
Older →

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 June 2007