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

appdb/include comment.php
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30995 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 13:36:44 Modified files: include : comment.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Link usernames in comments to the contact form instead of exposing email addresses Patch: http://cvs.winehq.org/patch.py?id=30995 Old revision New revision Changes Path 1.32 1.33 +2 -1 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.32 appdb/include/comment.php:1.33 --- appdb/include/comment.php:1.32 24 Mar 2007 18:36:44 -0000 +++ appdb/include/comment.php 24 Mar 2007 18:36:44 -0000 @@ -454,7 +454,8 @@ function forum_lookup_user($iUserId) { $oUser = new User($iUserId); if($_SESSION['current']->isLoggedIn()) - $sMailto = '<a href="mailto:' . $oUser->sEmail . '">' . $oUser->sRealname . '</a>'; + $sMailto = '<a href="'.BASE.'contact.php?iRecipientId='. + $oUser->iUserId.'">' .$oUser->sRealname . '</a>'; else $sMailto = $oUser->sRealname; }

1 0

appdb/ ./appdbStats.php ./objectManager.php ./ ...
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30994 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 13:30:16 Modified files: . : appdbStats.php objectManager.php viewScreenshots.php admin : adminScreenshots.php include : appData.php application.php distribution.php maintainer.php objectManager.php screenshot.php sidebar.php sidebar_admin.php sidebar_maintainer_admin.php testData.php vendor.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> objectManager, add rejection support. Add support in objectManager for handling rejected data. Patch: http://cvs.winehq.org/patch.py?id=30994 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/appdbStats.php 1.1 1.2 +11 -2 appdb/objectManager.php 1.10 1.11 +3 -2 appdb/viewScreenshots.php 1.18 1.19 +2 -1 appdb/admin/adminScreenshots.php 1.11 1.12 +18 -4 appdb/include/appData.php 1.94 1.95 +5 -3 appdb/include/application.php 1.18 1.19 +11 -3 appdb/include/distribution.php 1.33 1.34 +10 -2 appdb/include/maintainer.php 1.7 1.8 +26 -13 appdb/include/objectManager.php 1.61 1.62 +3 -2 appdb/include/screenshot.php 1.28 1.29 +1 -1 appdb/include/sidebar.php 1.33 1.34 +5 -4 appdb/include/sidebar_admin.php 1.5 1.6 +2 -2 appdb/include/sidebar_maintainer_admin.php 1.26 1.27 +8 -6 appdb/include/testData.php 1.17 1.18 +6 -2 appdb/include/vendor.php 1.5 1.6 +1 -1 appdb/unit_test/test_om_objects.php

1 0

appdb/include testData.php
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30993 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/23 21:12:05 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Let objectmanager handle testData queue Patch: http://cvs.winehq.org/patch.py?id=30993 Old revision New revision Changes Path 1.25 1.26 +24 -10 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.25 appdb/include/testData.php:1.26 --- appdb/include/testData.php:1.25 24 Mar 2007 2:12: 5 -0000 +++ appdb/include/testData.php 24 Mar 2007 2:12: 5 -0000 @@ -170,6 +170,8 @@ class testData{ if($this->iSubmitterId && ($this->iSubmitterId != $_SESSION['current']->iUserId)) $this->mailSubmitter("delete"); + + return TRUE; } @@ -455,7 +457,9 @@ class testData{ echo ' <td>'.$sStatus.'&nbsp</td>',"\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { - echo '<td><a href="'.BASE.'admin/adminTestResults.php?sSub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; + $oObject = new objectManager("testData"); + echo '<td><a href="'.$oObject->makeUrl("edit", $oTest->iTestingId, + "Edit Test Results").'">',"\n"; echo 'Edit</a></td>',"\n"; } echo '</tr>',"\n"; @@ -545,6 +549,7 @@ class testData{ echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" >'; echo '<input type="hidden" name="iTestingId" value="'.$this->iTestingId.'" >'; + echo '<input type="hidden" name="iTestDataId" value="'.$this->iTestingId.'" >'; echo "</table>\n"; @@ -751,9 +756,10 @@ class testData{ function objectGetEntriesCount($bQueued) { - if($bQueued && !testData::canEdit()) + $oTest = new testData(); + if($bQueued && !$oTest->canEdit()) { - if(testData::canEditSome()) + if($oTest->canEditSome()) { $sQuery = "SELECT COUNT(testingId) AS count FROM testResults, appVersion, appMaintainers WHERE @@ -796,9 +802,10 @@ class testData{ function objectGetEntries($bQueued) { - if($bQueued && !testData::canEdit()) + $oTest = new testData(); + if($bQueued && !$oTest->canEdit()) { - if(testData::canEditSome()) + if($oTest->canEditSome()) { $sQuery = "SELECT testResults.* FROM testResults, appVersion, appMaintainers WHERE @@ -865,16 +872,16 @@ class testData{ $this->sTestedRelease, $this->sTestedRating); - if(testData::canEditSome()) - $aCells[] = "[ <a href=\"".BASE."admin/adminTestResults.php?sSub=view&". - "iTestingId=$this->iTestingId\">$sEditLinkLabel</a> ]"; + if($this->canEditSome()) + $aCells[] = "[ <a href=\"".$oObject->makeUrl("edit", + $this->iTestingId)."\">$sEditLinkLabel</a> ]"; echo html_tr($aCells, $this->sTestedRating); } function canEditSome() { - if(testData::canEdit() || maintainer::isUserMaintainer($_SESSION['current'])) + if($this->canEdit() || maintainer::isUserMaintainer($_SESSION['current'])) return TRUE; else return FALSE; @@ -884,7 +891,14 @@ class testData{ { if($_SESSION['current']->hasPriv("admin")) return TRUE; - else + else if($this->iTestingId) + { + $oVersion = new version($this->iVersionId); + if($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) + return TRUE; + else + return FALSE; + } else return FALSE; }

1 0

appdb/include testData.php
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30992 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/23 21:10:49 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix accidental mention of $oTest that should have been $this Patch: http://cvs.winehq.org/patch.py?id=30992 Old revision New revision Changes Path 1.24 1.25 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.24 appdb/include/testData.php:1.25 --- appdb/include/testData.php:1.24 24 Mar 2007 2:10:49 -0000 +++ appdb/include/testData.php 24 Mar 2007 2:10:49 -0000 @@ -64,7 +64,7 @@ class testData{ function create() { // Security, if we are not an administrator or a maintainer the test result must be queued. - $oVersion = new Version($oTest->iVersionId); + $oVersion = new Version($this->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) $this->sQueued = 'true';

1 0

appdb/ include/application.php include/screens ...
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30991 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/23 21:04:16 Modified files: include : application.php screenshot.php testData.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Test more classes with objectManager Patch: http://cvs.winehq.org/patch.py?id=30991 Old revision New revision Changes Path 1.93 1.94 +7 -1 appdb/include/application.php 1.60 1.61 +18 -0 appdb/include/screenshot.php 1.23 1.24 +20 -1 appdb/include/testData.php 1.4 1.5 +36 -50 appdb/unit_test/test_om_objects.php

1 0

Alexandre Julliard : server: A named pipe wait can be satisfied by an idle pipe server too.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 73e0e8bf17988f9efab4a52be8a6a7f988407c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0e8bf17988f9efab4a52be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 14:03:23 2007 +0100 server: A named pipe wait can be satisfied by an idle pipe server too. --- server/named_pipe.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index d28915a..49d319a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -666,25 +666,13 @@ static struct pipe_client *create_pipe_client( unsigned int flags ) return client; } -static inline struct pipe_server *find_server( struct named_pipe *pipe, enum pipe_state state ) +static struct pipe_server *find_available_server( struct named_pipe *pipe ) { struct pipe_server *server; LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) { - if (server->state == state) return (struct pipe_server *)grab_object( server ); - } - return NULL; -} - -static inline struct pipe_server *find_server2( struct named_pipe *pipe, - enum pipe_state state1, enum pipe_state state2 ) -{ - struct pipe_server *server; - - LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) - { - if (server->state == state1 || server->state == state2) + if (server->state == ps_idle_server || server->state == ps_wait_open) return (struct pipe_server *)grab_object( server ); } return NULL; @@ -698,7 +686,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc struct pipe_client *client; int fds[2]; - if (!(server = find_server2( pipe, ps_idle_server, ps_wait_open ))) + if (!(server = find_available_server( pipe ))) { set_error( STATUS_PIPE_NOT_AVAILABLE ); return NULL; @@ -867,7 +855,7 @@ DECL_HANDLER(wait_named_pipe) set_error( STATUS_PIPE_NOT_AVAILABLE ); return; } - server = find_server( pipe, ps_wait_open ); + server = find_available_server( pipe ); if (!server) { if (req->timeout == NMPWAIT_WAIT_FOREVER)

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 94ebade2c3de4f64ddf35ba130c98850803574ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ebade2c3de4f64ddf35ba13… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 23:02:31 2007 +0000 comctl32: Constify some variables. --- dlls/comctl32/commctrl.c | 19 ++++++++++--------- include/commctrl.h | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 7e44e03..bd0563f 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -378,10 +378,10 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo) */ VOID WINAPI -GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo) +GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo) { RECT rcCtrl; - INT *lpRun; + const INT *lpRun; HWND hwndCtrl; TRACE("(%p %p %p)\n", @@ -426,7 +426,7 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo) * (will be written ...) */ -void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style) +void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) { RECT r = *lprc; UINT border = BDR_SUNKENOUTER; @@ -475,7 +475,7 @@ void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style) * No return value. */ -void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style) +void WINAPI DrawStatusTextA (HDC hdc, LPCRECT lprc, LPCSTR text, UINT style) { INT len; LPWSTR textW = NULL; @@ -743,7 +743,8 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, { HGLOBAL hglb; HRSRC hRsrc; - LPBITMAPINFOHEADER lpBitmap, lpBitmapInfo; + const BITMAPINFOHEADER *lpBitmap; + LPBITMAPINFOHEADER lpBitmapInfo; UINT nSize, nColorTableSize, iColor; RGBQUAD *pColorTable; INT i, iMaps, nWidth, nHeight; @@ -819,7 +820,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, if (hbm) { HDC hdcDst = CreateCompatibleDC (hdcScreen); HBITMAP hbmOld = SelectObject (hdcDst, hbm); - LPBYTE lpBits = (LPBYTE)(lpBitmap + 1); + const BYTE *lpBits = (const BYTE *)(lpBitmap + 1); lpBits += nColorTableSize * sizeof(RGBQUAD); StretchDIBits (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight, lpBits, (LPBITMAPINFO)lpBitmapInfo, DIB_RGB_COLORS, @@ -1087,8 +1088,8 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR uID, DWORD_PTR *pdwRef) { - LPSUBCLASS_INFO stack; - LPSUBCLASSPROCS proc; + const SUBCLASS_INFO *stack; + const SUBCLASSPROCS *proc; TRACE ("(%p, %p, %x, %p)\n", hWnd, pfnSubclass, uID, pdwRef); @@ -1254,7 +1255,7 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar else ret = CallWindowProcA (stack->origproc, hWnd, uMsg, wParam, lParam); } else { - LPSUBCLASSPROCS proc = stack->stackpos; + const SUBCLASSPROCS *proc = stack->stackpos; stack->stackpos = stack->stackpos->next; /* call the Subclass procedure from the stack */ ret = proc->subproc (hWnd, uMsg, wParam, lParam, diff --git a/include/commctrl.h b/include/commctrl.h index 3225e1b..2a49e00 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -28,7 +28,7 @@ extern "C" { #endif BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT); -VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, LPINT); +VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, const INT*); VOID WINAPI InitCommonControls (VOID); typedef struct tagINITCOMMONCONTROLSEX { @@ -340,8 +340,8 @@ static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_', HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT); HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT); #define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow) -VOID WINAPI DrawStatusTextA (HDC, LPRECT, LPCSTR, UINT); -VOID WINAPI DrawStatusTextW (HDC, LPRECT, LPCWSTR, UINT); +VOID WINAPI DrawStatusTextA (HDC, LPCRECT, LPCSTR, UINT); +VOID WINAPI DrawStatusTextW (HDC, LPCRECT, LPCWSTR, UINT); #define DrawStatusText WINELIB_NAME_AW(DrawStatusText) VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU, HINSTANCE, HWND, UINT*);

1 0

Alexandre Julliard : kernel32: Fixed timeout calculation in WaitNamedPipe.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: ad3faa829c755852559f178a768ec37db8d2d686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3faa829c755852559f178a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 13:06:44 2007 +0100 kernel32: Fixed timeout calculation in WaitNamedPipe. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a58d983..8ee0e71 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1287,7 +1287,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) } pipe_wait->TimeoutSpecified = !(nTimeOut == NMPWAIT_USE_DEFAULT_WAIT); - pipe_wait->Timeout.QuadPart = nTimeOut * -10000L; + pipe_wait->Timeout.QuadPart = (ULONGLONG)nTimeOut * -10000; pipe_wait->NameLength = nt_name.Length - sizeof(leadin); memcpy(pipe_wait->Name, nt_name.Buffer + sizeof(leadin)/sizeof(WCHAR), pipe_wait->NameLength);

1 0

Alexandre Julliard : ntdll: Avoid overwriting the result of the async I/ O callback in NtFsControlFile.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: c0fca0a186acc004afcdad74e9c7b3e453a0140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fca0a186acc004afcdad74e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 14:02:13 2007 +0100 ntdll: Avoid overwriting the result of the async I/O callback in NtFsControlFile. --- dlls/ntdll/file.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dafe7aa..45786b0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -941,9 +941,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!event && io->u.Status == STATUS_PENDING) { - do - io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); - while(io->u.Status == STATUS_USER_APC); + while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } if (internal_event) NtClose(internal_event); } @@ -975,9 +973,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!event && io->u.Status == STATUS_PENDING) { - do - io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); - while(io->u.Status == STATUS_USER_APC); + while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } if (internal_event) NtClose(internal_event); }

1 0

Louis Lenders : kernel32: Add stub for AttachConsole.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: eafbf45fce84395fdb566dc3c5cf45810cbf7a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafbf45fce84395fdb566dc3c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 22 20:32:36 2007 +0000 kernel32: Add stub for AttachConsole. --- dlls/kernel32/console.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 98baebd..66bc796 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2405,6 +2405,15 @@ BOOL WINAPI ScrollConsoleScreenBufferW(HANDLE hConsoleOutput, LPSMALL_RECT lpScr return TRUE; } +/****************************************************************** + * AttachConsole (KERNEL32.@) + */ +BOOL WINAPI AttachConsole(DWORD dwProcessId) +{ + FIXME("stub %x\n",dwProcessId); + return TRUE; +} + /* ==================================================================== * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1e79df6..a675386 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -148,7 +148,7 @@ @ stub AllocateUserPhysicalPages @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) -# @ stub AttachConsole +@ stdcall AttachConsole(long) @ stdcall BackupRead(ptr ptr long ptr long long ptr) @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr)

1 0