January 2007 - Wine-commits

Alexandre Julliard : ntdll: Avoid inter-process APCs when called for the process itself.
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: f3cb4f7d9419d25f3b430cbf935f61bc214c00aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3cb4f7d9419d25f3b430cbf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 15:41:05 2007 +0100 ntdll: Avoid inter-process APCs when called for the process itself. --- dlls/ntdll/sync.c | 313 +++++++++++++++++++++------------------- include/wine/server_protocol.h | 3 +- server/protocol.def | 1 + server/thread.c | 26 ++-- server/trace.c | 3 +- 5 files changed, 188 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3cb4f7d9419d25f3b430…

1 0

Dmitry Timoshkov : user32: Some apps pass a color bitmap as a mask to CreateIconIndirect, convert it to b/w.
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: 64f1d97a5435df2f8275c304145635bce290db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f1d97a5435df2f8275c3041… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 18 19:21:05 2007 +0800 user32: Some apps pass a color bitmap as a mask to CreateIconIndirect, convert it to b/w. --- dlls/user32/cursoricon.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index c287009..26adfde 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1823,16 +1823,31 @@ HICON WINAPI CreateIconIndirect(PICONINF HICON16 hObj; int sizeXor,sizeAnd; - if (iconinfo->hbmColor) GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); - GetObjectA( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); + TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", + iconinfo->hbmColor, iconinfo->hbmMask, + iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); + + if (iconinfo->hbmColor) + { + GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); + TRACE("color: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, + bmpXor.bmPlanes, bmpXor.bmBitsPixel); + } + GetObjectW( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); + TRACE("mask: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpAnd.bmWidth, bmpAnd.bmHeight, bmpAnd.bmWidthBytes, + bmpAnd.bmPlanes, bmpAnd.bmBitsPixel); sizeXor = iconinfo->hbmColor ? (bmpXor.bmHeight * bmpXor.bmWidthBytes) : 0; - sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes; + sizeAnd = bmpAnd.bmHeight * get_bitmap_width_bytes(bmpAnd.bmWidth, 1); hObj = GlobalAlloc16( GMEM_MOVEABLE, sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { + HDC hdc; + BITMAPINFO bi; CURSORICONINFO *info; info = (CURSORICONINFO *)GlobalLock16( hObj ); @@ -1860,15 +1875,27 @@ HICON WINAPI CreateIconIndirect(PICONINF else { info->nWidth = bmpAnd.bmWidth; - info->nHeight = bmpAnd.bmHeight / 2; - info->nWidthBytes = bmpAnd.bmWidthBytes; - info->bPlanes = bmpAnd.bmPlanes; - info->bBitsPerPixel = bmpAnd.bmBitsPixel; + info->nHeight = bmpAnd.bmHeight * 2; + info->nWidthBytes = get_bitmap_width_bytes(bmpAnd.bmWidth, 1); + info->bPlanes = 1; + info->bBitsPerPixel = 1; } /* Transfer the bitmap bits to the CURSORICONINFO structure */ - GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + /* Some apps pass a color bitmap as a mask, convert it to b/w */ + hdc = GetDC( 0 ); + memset(&bi, 0, sizeof(bi) ); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = bmpAnd.bmWidth; + bi.bmiHeader.biHeight = bmpAnd.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 1; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = sizeAnd; + GetDIBits( hdc, iconinfo->hbmMask, 0, bmpAnd.bmHeight, (char*)(info + 1), &bi, DIB_RGB_COLORS ); + ReleaseDC( 0, hdc ); + if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); }

1 0

Alexandre Julliard : ntdll: Implementation of inter-process RtlCreateUserThread.
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: 8025f79ce1f787813aa92cd19c999e171e18cf13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8025f79ce1f787813aa92cd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 15:02:55 2007 +0100 ntdll: Implementation of inter-process RtlCreateUserThread. --- dlls/kernel32/tests/thread.c | 28 ++++++--------- dlls/ntdll/sync.c | 14 +++++++ dlls/ntdll/thread.c | 23 ++++++++++-- include/wine/server_protocol.h | 21 ++++++++++- server/protocol.def | 19 +++++++++- server/thread.c | 78 +++++++++++++++++++++++++++------------- server/trace.c | 11 ++++++ 7 files changed, 146 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8025f79ce1f787813aa92…

1 0

Alexandre Julliard : ntdll: Implementation of inter-process NtMapViewOfSection and NtUnmapViewOfSection .
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: 02e2fa77985b1e4994a13c79e58d7d8ec209c6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e2fa77985b1e4994a13c79e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 15:17:51 2007 +0100 ntdll: Implementation of inter-process NtMapViewOfSection and NtUnmapViewOfSection. --- dlls/kernel32/tests/virtual.c | 60 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sync.c | 20 +++++++++++++ dlls/ntdll/virtual.c | 44 +++++++++++++++++++++++------ include/wine/server_protocol.h | 33 +++++++++++++++++++++- server/protocol.def | 31 ++++++++++++++++++++ server/thread.c | 16 ++++++++++ server/trace.c | 18 ++++++++++++ 7 files changed, 212 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02e2fa77985b1e4994a13…

1 0

Alexandre Julliard : ntdll: Move the LDT section to ntdll and make it an uninterruptible section.
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: 21d631e2708649fabca672ed450cc15f1eca6dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d631e2708649fabca672ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 15:01:45 2007 +0100 ntdll: Move the LDT section to ntdll and make it an uninterruptible section. --- dlls/kernel32/kernel_main.c | 26 -------------------------- dlls/ntdll/thread.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index f6eeba9..9f6b311 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -43,29 +43,6 @@ extern int __wine_set_signal_handler(unsigned, int (*)(unsigned)); -static CRITICAL_SECTION ldt_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &ldt_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": ldt_section") } -}; -static CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/*********************************************************************** - * locking for LDT routines - */ -static void ldt_lock(void) -{ - RtlEnterCriticalSection( &ldt_section ); -} - -static void ldt_unlock(void) -{ - RtlLeaveCriticalSection( &ldt_section ); -} - - /*********************************************************************** * KERNEL thread initialisation routine */ @@ -141,9 +118,6 @@ static BOOL process_attach(void) } #endif - /* initialize LDT locking */ - wine_ldt_init_locking( ldt_lock, ldt_unlock ); - /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 356ba11..4d99195 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -63,6 +63,41 @@ static ULONG sigstack_zero_bits; struct wine_pthread_functions pthread_functions = { NULL }; + +static RTL_CRITICAL_SECTION ldt_section; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &ldt_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": ldt_section") } +}; +static RTL_CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static sigset_t ldt_sigset; + +/*********************************************************************** + * locking for LDT routines + */ +static void ldt_lock(void) +{ + sigset_t sigset; + + pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &sigset ); + RtlEnterCriticalSection( &ldt_section ); + if (ldt_section.RecursionCount == 1) ldt_sigset = sigset; +} + +static void ldt_unlock(void) +{ + if (ldt_section.RecursionCount == 1) + { + sigset_t sigset = ldt_sigset; + RtlLeaveCriticalSection( &ldt_section ); + pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); + } + else RtlLeaveCriticalSection( &ldt_section ); +} + + /*********************************************************************** * init_teb */ @@ -285,6 +320,10 @@ HANDLE thread_init(void) wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); } + + /* initialize LDT locking */ + wine_ldt_init_locking( ldt_lock, ldt_unlock ); + return exe_file; }

1 0

Alexandre Julliard : ntdll: Abuse RtlCreateUserThread to call the thread function for CreateThread directly .
by Alexandre Julliard 19 Jan '07

19 Jan '07

Module: wine Branch: master Commit: 7a383cf83f1f2896f67352a76c07b13510baff1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a383cf83f1f2896f67352a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 15:02:11 2007 +0100 ntdll: Abuse RtlCreateUserThread to call the thread function for CreateThread directly. --- dlls/kernel32/thread.c | 49 +----------------------------------------------- dlls/ntdll/thread.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 52 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 4f2594c..cdbe1e1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -45,42 +45,6 @@ #include "kernel_private.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); -WINE_DECLARE_DEBUG_CHANNEL(relay); - - -struct new_thread_info -{ - LPTHREAD_START_ROUTINE func; - void *arg; -}; - - -/*********************************************************************** - * THREAD_Start - * - * Start execution of a newly created thread. Does not return. - */ -static void CALLBACK THREAD_Start( void *ptr ) -{ - struct new_thread_info *info = ptr; - LPTHREAD_START_ROUTINE func = info->func; - void *arg = info->arg; - - RtlFreeHeap( GetProcessHeap(), 0, info ); - - if (TRACE_ON(relay)) - DPRINTF("%04x:Starting thread (entryproc=%p)\n", GetCurrentThreadId(), func ); - - __TRY - { - ExitThread( func( arg ) ); - } - __EXCEPT(UnhandledExceptionFilter) - { - TerminateThread( GetCurrentThread(), GetExceptionCode() ); - } - __ENDTRY -} /*********************************************************************** @@ -120,22 +84,13 @@ HANDLE WINAPI CreateRemoteThread( HANDLE CLIENT_ID client_id; NTSTATUS status; SIZE_T stack_reserve = 0, stack_commit = 0; - struct new_thread_info *info; - - if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*info) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - info->func = start; - info->arg = param; if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; else stack_commit = stack; status = RtlCreateUserThread( hProcess, NULL, TRUE, NULL, stack_reserve, stack_commit, - THREAD_Start, info, &handle, &client_id ); + (PRTL_THREAD_START_ROUTINE)start, param, &handle, &client_id ); if (status == STATUS_SUCCESS) { if (id) *id = (DWORD)client_id.UniqueThread; @@ -147,7 +102,6 @@ HANDLE WINAPI CreateRemoteThread( HANDLE if (NtResumeThread( handle, &ret )) { NtClose( handle ); - RtlFreeHeap( GetProcessHeap(), 0, info ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); handle = 0; } @@ -155,7 +109,6 @@ HANDLE WINAPI CreateRemoteThread( HANDLE } else { - RtlFreeHeap( GetProcessHeap(), 0, info ); SetLastError( RtlNtStatusToDosError(status) ); handle = 0; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4d99195..b06d1a3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -43,6 +43,7 @@ #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(relay); /* info passed to a starting thread */ struct startup_info @@ -349,6 +350,47 @@ static PUNHANDLED_EXCEPTION_FILTER get_u } /*********************************************************************** + * call_thread_func + * + * Hack to make things compatible with the thread procedures used by kernel32.CreateThread. + */ +static void DECLSPEC_NORETURN call_thread_func( PRTL_THREAD_START_ROUTINE rtl_func, void *arg ) +{ + LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; + DWORD exit_code; + BOOL last; + + MODULE_DllThreadAttach( NULL ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + exit_code = func( arg ); + + /* send the exit code to the server */ + SERVER_START_REQ( terminate_thread ) + { + req->handle = GetCurrentThread(); + req->exit_code = exit_code; + wine_server_call( req ); + last = reply->last; + } + SERVER_END_REQ; + + if (last) + { + LdrShutdownProcess(); + exit( exit_code ); + } + else + { + LdrShutdownThread(); + server_exit_thread( exit_code ); + } +} + + +/*********************************************************************** * start_thread * * Startup routine for a newly created thread. @@ -397,7 +439,7 @@ static void start_thread( struct wine_pt { __TRY { - MODULE_DllThreadAttach( NULL ); + call_thread_func( func, arg ); } __EXCEPT(get_unhandled_exception_filter()) { @@ -406,9 +448,7 @@ static void start_thread( struct wine_pt __ENDTRY } else - MODULE_DllThreadAttach( NULL ); - - func( arg ); + call_thread_func( func, arg ); }

1 0

appdb/include application.php
by WineHQ 19 Jan '07

19 Jan '07

ChangeSet ID: 30893 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/18 19:42:56 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display url links using url::display() Patch: http://cvs.winehq.org/patch.py?id=30893 Old revision New revision Changes Path 1.86 1.87 +3 -12 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.86 appdb/include/application.php:1.87 --- appdb/include/application.php:1.86 19 Jan 2007 1:42:56 -0000 +++ appdb/include/application.php 19 Jan 2007 1:42:56 -0000 @@ -631,22 +631,13 @@ class Application { echo " <tr class=\"color1\"><td>URL</td><td>".$appLinkURL."</td></tr>\n"; // optional links - $result = query_parameters("SELECT * FROM appData WHERE appId = '?' AND versionID = 0 AND type = 'url'", - $this->iAppId); - if($result && mysql_num_rows($result) > 0) - { - echo " <tr class=\"color1\"><td> Links</td><td>\n"; - while($oRow = mysql_fetch_object($result)) - { - echo " <a href='$oRow->url'>".substr(stripslashes($oRow->description),0,30)."</a> \n"; - } - echo " </td></tr>\n"; - } + if($sUrls = url::display(NULL, $this->iAppId)) + echo $sUrls; // image $img = Screenshot::get_random_screenshot_img($this->iAppId, null, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; - + echo " </table>\n"; /* close of name/vendor/bugs/url table */ echo " </td></tr>\n";

1 0

appdb/unit_test run_tests.php test_url.php
by WineHQ 19 Jan '07

19 Jan '07

ChangeSet ID: 30892 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/18 19:41:01 Modified files: unit_test : run_tests.php Added files: unit_test : test_url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Unit test for url::update() Patch: http://cvs.winehq.org/patch.py?id=30892 Old revision New revision Changes Path 1.9 1.10 +2 -0 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_url.php Index: appdb/unit_test/run_tests.php diff -u -p appdb/unit_test/run_tests.php:1.9 appdb/unit_test/run_tests.php:1.10 --- appdb/unit_test/run_tests.php:1.9 19 Jan 2007 1:41: 1 -0000 +++ appdb/unit_test/run_tests.php 19 Jan 2007 1:41: 1 -0000 @@ -22,4 +22,6 @@ echo "\n"; include_once("test_error_log.php"); echo "\n"; include_once("test_filter.php"); +echo "\n"; +include_once("test_url.php"); ?> Index: appdb/unit_test/test_url.php diff -u -p /dev/null appdb/unit_test/test_url.php:1.1 --- /dev/null 19 Jan 2007 1:41: 1 -0000 +++ appdb/unit_test/test_url.php 19 Jan 2007 1:41: 1 -0000 @@ -0,0 +1,73 @@ +<?php + +/* Unit tests for functions in include/url.php */ + +require_once("path.php"); +require_once("test_common.php"); + +function test_url_update() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + + $bSuccess = true; // default to success until we detect failure + + /* Log in */ + $oUser = new User(); + if($retval = $oUser->login($test_email, $test_password) != SUCCESS) + { + echo "Received '$retval' instead of SUCCESS('".SUCCESS."')."; + return FALSE; + } + + $iAppId = 655000; + $iVersionId = 655000; + + $oUser->addPriv("admin"); + + $oUrl = new Url(); + $oUrl->create("Bad description", "http://www.badurl.com/", $iVersionId, $iAppId, TRUE); + + $sDescriptionNew = "Good description"; + $sUrlNew = "http://www.goodurl.com/"; + $iAppIdNew = $iAppId + 1; + $iVersionIdNew = $iVersionId + 1; + + $oUrl->update($sDescriptionNew, $sUrlNew, $iVersionIdNew, $iAppIdNew, TRUE); + + if($oUrl->sDescription != $sDescriptionNew) + { + echo "Description is '$oUrl->sDescription' instead of '$sDescriptionNew'\n"; + $bSuccess = false; + } + + if($oUrl->sUrl != $sUrlNew) + { + echo "Url is '$oUrl->sUrl' instead of '$sUrlNew'\n"; + $bSuccess = false; + } + + if($oUrl->iVersionId != $iVersionIdNew) + { + echo "VersionId is '$oUrl->iVersionId' instead of '$iVersionIdNew'\n"; + $bSuccess = false; + } + + if($oUrl->iAppId != $iAppIdNew) + { + echo "AppId is '$oUrl->iAppId' instead of '$iAppIdNew'\n"; + $bSuccess = false; + } + + $oUrl->delete(TRUE); + + return $bSuccess; +} + +if(!test_url_update()) + echo "test_url_update() failed!\n"; +else + echo "test_url_update() passed\n"; + +?>

1 0

appdb/include url.php
by WineHQ 19 Jan '07

19 Jan '07

ChangeSet ID: 30891 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/18 19:40:17 Modified files: include : url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Various small fixes for url class. Add silent parameters for create() and update(). Add and use canEdit(). Fix queue status on create(). Patch: http://cvs.winehq.org/patch.py?id=30891 Old revision New revision Changes Path 1.12 1.13 +54 -28 appdb/include/url.php Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.12 appdb/include/url.php:1.13 --- appdb/include/url.php:1.12 19 Jan 2007 1:40:17 -0000 +++ appdb/include/url.php 19 Jan 2007 1:40:17 -0000 @@ -49,32 +49,35 @@ class Url { /** * Creates a new url. */ - function create($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null) + function create($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null, $bSilent = false) { global $aClean; // Security, if we are not an administrator or a maintainer, the url must be queued. - if(!($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($aClean['iVersionId']) || $_SESSION['current']->isSupermaintainer($aClean['iAppId']))) - { + if(($iAppId && !url::canEdit(NULL, $iAppId)) || + ($iVersionId && !url::canEdit($iVersionId))) $this->bQueued = true; - } - $hResult = query_parameters("INSERT INTO appData (appId, versionId, type, description,". - "queued, submitterId) VALUES ('?', '?', '?', '?', '?', '?')", - $iAppId, $iVersionId, "url", $sDescription, $this->bQueued, - $_SESSION['current']->iUserId); - if($hResult) - { - $this->iUrlId = mysql_insert_id(); - $this->url($this->iUrlId,$this->bQueued); - $this->SendNotificationMail(); - return true; - } - else + $hResult = query_parameters("INSERT INTO appData (appId, versionId, type, + description, queued, submitterId, url) + VALUES ('?', '?', '?', '?', '?', '?', '?')", + $iAppId, $iVersionId, "url", $sDescription, + $this->bQueued ? "true" : "false", + $_SESSION['current']->iUserId, $sUrl); + + if(!$hResult) { addmsg("Error while creating a new url.", "red"); return false; } + + $this->iUrlId = mysql_insert_id(); + $this->url($this->iUrlId,$this->bQueued); + + if(!$bSilent) + $this->SendNotificationMail(); + + return true; } @@ -88,15 +91,19 @@ class Url { WHERE id = '?' AND type = 'url' LIMIT 1"; - if($hResult = query_parameters($sQuery, $this->iUrlId)) - { - if(!$bSilent) - $this->SendNotificationMail(true); - } - if($this->iSubmitterId) + if(!$hResult = query_parameters($sQuery, $this->iUrlId)) + return false; + + if(!$bSilent) + $this->SendNotificationMail(true); + + if($this->iSubmitterId && + $this->iSubmitterId != $_SESSION['current']->iUserId) { $this->mailSubmitter(true); } + + return true; } @@ -125,8 +132,12 @@ class Url { * Update url. * Returns true on success and false on failure. */ - function update($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null) + function update($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null, $bSilent = false) { + if(!$this->iUrlId) + return FALSE; + + $sWhatChanged = ""; if ($sDescription && $sDescription!=$this->sDescription) @@ -140,8 +151,8 @@ class Url { if ($sUrl && $sUrl!=$this->sUrl) { - if (!query_parameters("UPDATE appData SET noteDesc = '?' WHERE id = '?'", - $sDescription, $this->iUrlId)) + if (!query_parameters("UPDATE appData SET url = '?' WHERE id = '?'", + $sUrl, $this->iUrlId)) return false; $sWhatChanged .= "Url was changed from ".$this->sUrl." to ".$sUrl.".\n\n"; $this->sUrl = $sUrl; @@ -169,7 +180,7 @@ class Url { $sWhatChanged .= "Application was changed from ".$oAppBefore->sName." to ".$oAppAfter->sName.".\n\n"; $this->iAppId = $iAppId; } - if($sWhatChanged) + if($sWhatChanged && !$bSilent) $this->SendNotificationMail("edit",$sWhatChanged); return true; } @@ -181,7 +192,7 @@ class Url { if($this->iSubmitterId) { - $sAppName = Application::lookup_name($this->appId)." ".Version::lookup_name($this->versionId); + $sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId); $oSubmitter = new User($this->iSubmitterId); if(!$bRejected) { @@ -202,7 +213,7 @@ class Url { function SendNotificationMail($bDeleted=false) { - $sAppName = Application::lookup_name($this->appId)." ".Version::lookup_name($this->versionId); + $sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId); if(!$bDeleted) { if(!$this->bQueued) @@ -236,6 +247,21 @@ class Url { mail_appdb($sEmail, $sSubject ,$sMsg); } + function canEdit($iVersionId, $iAppId = NULL) + { + $oUser = new User($_SESSION['current']->iUserId); + + if($oUser->hasPriv("admin") || ($iVersionId && + maintainer::isUserMaintainer($oUser, $iVersionId)) || ($iAppId && + maintainer::isSuperMaintainer($oUser, $iAppId))) + { + return TRUE; + } else + { + return FALSE; + } + } + /* Display links for a given version/application */ function display($iVersionId, $iAppId = NULL) {

1 0

appdb/. updatevote.php
by WineHQ 19 Jan '07

19 Jan '07

ChangeSet ID: 30890 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/18 18:54:13 Modified files: . : updatevote.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix voting to use $aClean and not $_POST Patch: http://cvs.winehq.org/patch.py?id=30890 Old revision New revision Changes Path 1.7 1.8 +1 -1 appdb/updatevote.php Index: appdb/updatevote.php diff -u -p appdb/updatevote.php:1.7 appdb/updatevote.php:1.8 --- appdb/updatevote.php:1.7 19 Jan 2007 0:54:13 -0000 +++ appdb/updatevote.php 19 Jan 2007 0:54:13 -0000 @@ -10,7 +10,7 @@ require("path.php"); require(BASE."include/incl.php"); require(BASE."include/vote.php"); -vote_update($_POST); +vote_update($aClean); apidb_footer(); ?>

1 0