September 2007 - Wine-commits

Alexander Nicolaysen Sørnes : screenshot : Use accessor instead of modifying OM property directly
by Chris Morgan 30 Sep '07

30 Sep '07

Module: appdb Branch: master Commit: 3e2029a3540640a73614f50ed8dc4e82ec409108 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3e2029a3540640a73614f50e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 29 20:18:16 2007 +0200 screenshot: Use accessor instead of modifying OM property directly --- screenshots.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/screenshots.php b/screenshots.php index ca23e53..ffa33ca 100644 --- a/screenshots.php +++ b/screenshots.php @@ -108,7 +108,7 @@ if($hResult && query_num_rows($hResult)) ) { $oM = new objectManager("screenshot"); - $oM->sReturnTo = "screenshots.php?iAppId=".$oScreenshot->iAppId."&iVersionId=".$oScreenshot->iVersionId; + $oM->setReturnTo("screenshots.php?iAppId=".$oScreenshot->iAppId."&iVersionId=".$oScreenshot->iVersionId); echo '<br />[<a href="'.$oM->makeUrl("delete", $oScreenshot->iScreenshotId, "Delete Screenshot").'">Delete</a>]'; }

1 0

Alexander Nicolaysen Sørnes : objectManager: Display reply text when editing another user's entry
by Chris Morgan 30 Sep '07

30 Sep '07

Module: appdb Branch: master Commit: 5875da01a70acc421a9dd62d2b17d14f81b29853 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5875da01a70acc421a9dd62d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 29 22:12:40 2007 +0200 objectManager: Display reply text when editing another user's entry --- include/objectManager.php | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 549d675..807824b 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -287,7 +287,7 @@ class ObjectManager /* if this is a queue add a dialog for replying to the submitter of the queued entry */ - if($this->bIsQueue) + if($this->bIsQueue || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) { /* If it isn't implemented, that means there is no default text */ if(method_exists(new $this->sClass, "getDefaultReply")) @@ -299,27 +299,29 @@ class ObjectManager echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; - - ///////////////////////////////////////////////// - // output radio buttons for some common responses - echo '<tr valign=top><td class="color0"></td><td class="color0">'. - '<b>Common replies</b><br/> Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. - APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n"; - - // NOTE: We use the label tag so the user can click anywhere in - // the text of the radio button to select the radio button. - // Otherwise the user has to click on the very small circle portion - // of the button to select it - foreach($this->aCommonResponses as $iIndex => $sReply) + if($this->bIsQueue) { - echo '<tr valign=top><td class="color0"></td>',"\n"; - echo '<td class="color0"><label for="'.$iIndex.'"><input'. - ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'"/>'. - $sReply.'</label></td>',"\n"; - echo '</tr>',"\n"; + ///////////////////////////////////////////////// + // output radio buttons for some common responses + echo '<tr valign=top><td class="color0"></td><td class="color0">'. + '<b>Common replies</b><br/> Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. + APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n"; + + // NOTE: We use the label tag so the user can click anywhere in + // the text of the radio button to select the radio button. + // Otherwise the user has to click on the very small circle portion + // of the button to select it + foreach($this->aCommonResponses as $iIndex => $sReply) + { + echo '<tr valign=top><td class="color0"></td>',"\n"; + echo '<td class="color0"><label for="'.$iIndex.'"><input'. + ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'"/>'. + $sReply.'</label></td>',"\n"; + echo '</tr>',"\n"; + } + // end output radio buttons for common responses + ///////////////////////////////////////////////// } - // end output radio buttons for common responses - ///////////////////////////////////////////////// /* buttons for operations we can perform on this entry */

1 0

Chris Morgan : Switch to accessor to set objectManager::sReturnTo. Fixes a fatal error due to bugs class accessing a private member of objectManager .
by Chris Morgan 28 Sep '07

28 Sep '07

Module: appdb Branch: master Commit: 05070e6a3a92b375ad5d3a60b4daa0b893f19c10 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=05070e6a3a92b375ad5d3a60… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Fri Sep 28 23:00:42 2007 -0400 Switch to accessor to set objectManager::sReturnTo. Fixes a fatal error due to bugs class accessing a private member of objectManager. --- include/bugs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index a7d712b..7e87f0d 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -565,7 +565,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) if($bCanEdit == true) { $oM = new objectManager("bug"); - $oM->sReturnTo = $oVersion->objectMakeUrl(); + $oM->setReturnTo($oVersion->objectMakeUrl()); echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n"; if ($oBuglink->bQueued) {

1 0

Chris Morgan : Add php5 scope keywords to the objectcManager class
by Chris Morgan 28 Sep '07

28 Sep '07

Module: appdb Branch: master Commit: 75e6f9dcc3d43962c5798e2b309b42e6003a7048 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=75e6f9dcc3d43962c5798e2b… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Fri Sep 28 21:25:33 2007 -0400 Add php5 scope keywords to the objectcManager class --- include/objectManager.php | 112 +++++++++++++++++++++++++++-------------- objectManager.php | 25 +++++---- unit_test/test_om_objects.php | 7 +-- 3 files changed, 90 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=75e6f9dcc3d43962c579…

1 0

Alexander Nicolaysen Sørnes : Remove unused deletecomment.php
by Chris Morgan 28 Sep '07

28 Sep '07

Module: appdb Branch: master Commit: f377690a63d33eb83a2217eff27d45ba4f476e96 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f377690a63d33eb83a2217ef… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 29 01:37:44 2007 +0200 Remove unused deletecomment.php --- deletecomment.php | 61 ----------------------------------------------------- 1 files changed, 0 insertions(+), 61 deletions(-) diff --git a/deletecomment.php b/deletecomment.php deleted file mode 100644 index 468cf4d..0000000 --- a/deletecomment.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/** - * Deletes a comment. - * - * Mandatory parameters: - * - iCommentId, comment identifier - * - * Optional parameters: - * - sReplyText, reason for deleting the comment - * - iDeleteIt, 1 if the deletion has been confirmed - */ - -// application environment -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE.'include/comment.php'); - -$oComment = new Comment($aClean['iCommentId']); - -/** - * if we aren't an admin or the maintainer of this app we shouldn't be - * allowed to delete any comments - */ -if (!$_SESSION['current']->hasPriv("admin") - && !$_SESSION['current']->isMaintainer($oComment->iVersionId) - && !$_SESSION['current']->isSuperMaintainer($oComment->iAppId)) -{ - util_show_error_page_and_exit("You don't have sufficient privileges to delete this comment."); -} - -// let's show the deletion form if the user want's to explain why he deleted the comment -if($_SESSION['current']->getPref("confirm_comment_deletion") != "no" && !isset($aClean['iDeleteIt'])) -{ - apidb_header("Delete Comment"); - $sMessageTitle = "<b>Please state why you are deleting the following comment</b>"; - echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">\n"; - echo html_frame_start($sMessageTitle,500,"",0); - echo "<br />"; - echo html_frame_start($oComment->sSubject,500); - echo htmlify_urls($oComment->sBody), "<br /><br />\n"; - echo html_frame_end(); - echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; - echo "<tr class=color1><td colspan=2><textarea name=\"sReplyText\" cols=\"70\" rows=\"15\" wrap=\"virtual\"></textarea></td></tr>\n"; - echo "<tr class=color1><td colspan=2 align=center>\n"; - echo " <input type=\"submit\" value=\"Delete Comment\" class=\"button\" />\n"; - echo "</td></tr>\n"; - echo "</table>\n"; - echo html_frame_end(); - echo "<input type=\"hidden\" name=\"iDeleteIt\" value=\"1\" />\n"; - echo "<input type=\"hidden\" name=\"iCommentId\" value=\"".$oComment->iCommentId."\" />"; - echo "</form>"; - - apidb_footer(); -// otherwise, just delete the comment -} else -{ - $oComment->delete(true); - $oVersion = new version($oComment->iVersionId); - util_redirect_and_exit($oVersion->objectMakeUrl()); -} -?>

1 0

Alexandre Julliard : Wine release 0.9.46
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: website Branch: master Commit: 6917ba26a84f9b1b500cf743debe6be2ff86e07d URL: http://source.winehq.org/git/website.git/?a=commit;h=6917ba26a84f9b1b500cf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 17:35:35 2007 +0200 Wine release 0.9.46 --- include/winehq.conf | 2 +- news/2007092801.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index 9862561..fe1e29d 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.45 +snapshot_date: 0.9.46 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007092801.xml b/news/2007092801.xml new file mode 100644 index 0000000..712a8e6 --- /dev/null +++ b/news/2007092801.xml @@ -0,0 +1,26 @@ +<news> +<date>September 28, 2007</date> +<title>Wine 0.9.46 Released</title> +<body> +<p>Wine 0.9.46 was released today, with the following main changes:</p> + +<ul> +<li>A variety of fixes to improve Photoshop CS2 support.</li> +<li>More complete support for device installation in setupapi.</li> +<li>New Bidi text implementation that doesn't depend on libicu.</li> +<li>The usual assortment of Direct3D improvements.</li> +<li>Beginning of I/O completion ports support.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.46.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.46">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.46.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 9a2eebf24d181375b6f4e9f3f2253acef48bab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2eebf24d181375b6f4e9f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 17:25:19 2007 +0200 Release 0.9.46. --- ANNOUNCE | 1040 +++++++++++++++++---------------- ChangeLog | 1957 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2492 insertions(+), 525 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a2eebf24d181375b6f4e…

1 0

Tag wine-0.9.46 : Alexandre Julliard : Release 0.9.46
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: refs/tags/wine-0.9.46 Tag: 17a4124a5fe4a96a2fef52687bb2210a7098dab5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=17a4124a5fe4a96a2fef52687bb2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 17:25:19 2007 +0200 Release 0.9.46

1 0

Andrey Turkin : kernel32: Pass completion value to ntdll layer.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 308f73c06db03853153885c22b74e9210e3275c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308f73c06db03853153885c22… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Sep 28 00:04:07 2007 +0400 kernel32: Pass completion value to ntdll layer. --- dlls/kernel32/change.c | 6 +++++- dlls/kernel32/file.c | 23 +++++++++++++++-------- dlls/kernel32/sync.c | 4 +++- dlls/kernel32/vxd.c | 5 +++-- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index 4bba474..0505ca9 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -155,6 +155,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL IO_STATUS_BLOCK *ios; NTSTATUS status; BOOL ret = TRUE; + LPVOID cvalue = NULL; TRACE("%p %p %08x %d %08x %p %p %p\n", handle, buffer, len, subtree, filter, returned, overlapped, completion ); @@ -166,12 +167,15 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL pov = &ov; } else + { pov = overlapped; + if (!completion && ((ULONG_PTR)overlapped->hEvent & 1) == 0) cvalue = overlapped; + } ios = (PIO_STATUS_BLOCK) pov; ios->u.Status = STATUS_PENDING; - status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, NULL, + status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, cvalue, ios, buffer, len, filter, subtree ); if (status == STATUS_PENDING) { diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 90280ad..f36196b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -402,6 +402,7 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, PIO_STATUS_BLOCK io_status = &iosb; HANDLE hEvent = 0; NTSTATUS status; + LPVOID cvalue = NULL; TRACE("%p %p %d %p %p\n", hFile, buffer, bytesToRead, bytesRead, overlapped ); @@ -419,11 +420,12 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, poffset = &offset; hEvent = overlapped->hEvent; io_status = (PIO_STATUS_BLOCK)overlapped; + if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } io_status->u.Status = STATUS_PENDING; io_status->Information = 0; - status = NtReadFile(hFile, hEvent, NULL, NULL, io_status, buffer, bytesToRead, poffset, NULL); + status = NtReadFile(hFile, hEvent, NULL, cvalue, io_status, buffer, bytesToRead, poffset, NULL); if (status == STATUS_PENDING && !overlapped) { @@ -488,6 +490,7 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, NTSTATUS status; IO_STATUS_BLOCK iosb; PIO_STATUS_BLOCK piosb = &iosb; + LPVOID cvalue = NULL; TRACE("%p %p %d %p %p\n", hFile, buffer, bytesToWrite, bytesWritten, overlapped ); @@ -501,17 +504,18 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, poffset = &offset; hEvent = overlapped->hEvent; piosb = (PIO_STATUS_BLOCK)overlapped; + if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } piosb->u.Status = STATUS_PENDING; piosb->Information = 0; - status = NtWriteFile(hFile, hEvent, NULL, NULL, piosb, + status = NtWriteFile(hFile, hEvent, NULL, cvalue, piosb, buffer, bytesToWrite, poffset, NULL); /* FIXME: NtWriteFile does not always cause page faults, generate them now */ if (status == STATUS_INVALID_USER_BUFFER && !IsBadReadPtr( buffer, bytesToWrite )) { - status = NtWriteFile(hFile, hEvent, NULL, NULL, piosb, + status = NtWriteFile(hFile, hEvent, NULL, cvalue, piosb, buffer, bytesToWrite, poffset, NULL); if (status != STATUS_INVALID_USER_BUFFER) FIXME("Could not access memory (%p,%d) at first, now OK. Protected by DIBSection code?\n", @@ -1052,9 +1056,9 @@ BOOL WINAPI LockFile( HANDLE hFile, DWORD offset_low, DWORD offset_high, offset.u.LowPart = offset_low; offset.u.HighPart = offset_high; - status = NtLockFile( hFile, 0, NULL, NULL, + status = NtLockFile( hFile, 0, NULL, NULL, NULL, &offset, &count, NULL, TRUE, TRUE ); - + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); return !status; } @@ -1077,6 +1081,7 @@ BOOL WINAPI LockFileEx( HANDLE hFile, DWORD flags, DWORD reserved, { NTSTATUS status; LARGE_INTEGER count, offset; + LPVOID cvalue = NULL; if (reserved) { @@ -1093,11 +1098,13 @@ BOOL WINAPI LockFileEx( HANDLE hFile, DWORD flags, DWORD reserved, offset.u.LowPart = overlapped->u.s.Offset; offset.u.HighPart = overlapped->u.s.OffsetHigh; - status = NtLockFile( hFile, overlapped->hEvent, NULL, NULL, - NULL, &offset, &count, NULL, + if (((ULONG_PTR)overlapped->hEvent & 1) == 0) cvalue = overlapped; + + status = NtLockFile( hFile, overlapped->hEvent, NULL, cvalue, + NULL, &offset, &count, NULL, flags & LOCKFILE_FAIL_IMMEDIATELY, flags & LOCKFILE_EXCLUSIVE_LOCK ); - + if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d53ab38..08385f1 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1328,6 +1328,7 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) { NTSTATUS status; IO_STATUS_BLOCK status_block; + LPVOID cvalue = NULL; TRACE("(%p,%p)\n", hPipe, overlapped); @@ -1335,9 +1336,10 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) { overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; + if (((ULONG_PTR)overlapped->hEvent & 1) == 0) cvalue = overlapped; } - status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, NULL, + status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, cvalue, overlapped ? (IO_STATUS_BLOCK *)overlapped : &status_block, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 0a4e771..43d4c4d 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -351,16 +351,17 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, if (lpOverlapped) { + LPVOID cvalue = ((ULONG_PTR)lpOverlapped->hEvent & 1) ? NULL : lpOverlapped; lpOverlapped->Internal = STATUS_PENDING; lpOverlapped->InternalHigh = 0; if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) status = NtFsControlFile(hDevice, lpOverlapped->hEvent, - NULL, NULL, (PIO_STATUS_BLOCK)lpOverlapped, + NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, dwIoControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer); else status = NtDeviceIoControlFile(hDevice, lpOverlapped->hEvent, - NULL, NULL, (PIO_STATUS_BLOCK)lpOverlapped, + NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, dwIoControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer); if (lpcbBytesReturned) *lpcbBytesReturned = lpOverlapped->InternalHigh;

1 0

Andrey Turkin : server: Allow completion object to be attached to an fd object.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: d1a8155882e83378add14a5d0785477ad8fccb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a8155882e83378add14a5d0… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Sep 28 00:03:39 2007 +0400 server: Allow completion object to be attached to an fd object. --- dlls/ntdll/file.c | 17 +++++++++++++++++ include/wine/server_protocol.h | 19 ++++++++++++++++++- server/completion.c | 3 ++- server/fd.c | 22 ++++++++++++++++++++++ server/file.h | 5 +++++ server/protocol.def | 8 ++++++++ server/request.h | 2 ++ server/trace.c | 10 ++++++++++ 8 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bf35a47..bbb071b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1658,6 +1658,23 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, } break; + case FileCompletionInformation: + if (len >= sizeof(FILE_COMPLETION_INFORMATION)) + { + FILE_COMPLETION_INFORMATION *info = (FILE_COMPLETION_INFORMATION *)ptr; + + SERVER_START_REQ( set_completion_info ) + { + req->handle = handle; + req->chandle = info->CompletionPort; + req->ckey = info->CompletionKey; + io->u.Status = wine_server_call( req ); + } + SERVER_END_REQ; + } else + io->u.Status = STATUS_INVALID_PARAMETER_3; + break; + default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e37f25c..314a3a6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4156,6 +4156,20 @@ struct query_completion_reply }; + +struct set_completion_info_request +{ + struct request_header __header; + obj_handle_t handle; + obj_handle_t chandle; + unsigned long ckey; +}; +struct set_completion_info_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -4383,6 +4397,7 @@ enum request REQ_add_completion, REQ_remove_completion, REQ_query_completion, + REQ_set_completion_info, REQ_NB_REQUESTS }; @@ -4615,6 +4630,7 @@ union generic_request struct add_completion_request add_completion_request; struct remove_completion_request remove_completion_request; struct query_completion_request query_completion_request; + struct set_completion_info_request set_completion_info_request; }; union generic_reply { @@ -4845,8 +4861,9 @@ union generic_reply struct add_completion_reply add_completion_reply; struct remove_completion_reply remove_completion_reply; struct query_completion_reply query_completion_reply; + struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 314 +#define SERVER_PROTOCOL_VERSION 315 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/completion.c b/server/completion.c index 1282bb4..13f5939 100644 --- a/server/completion.c +++ b/server/completion.c @@ -39,6 +39,7 @@ #include "wine/unicode.h" #include "object.h" +#include "file.h" #include "handle.h" #include "request.h" @@ -124,7 +125,7 @@ static struct completion *create_completion( struct directory *root, const struc return completion; } -static struct completion *get_completion_obj( struct process *process, obj_handle_t handle, unsigned int access ) +struct completion *get_completion_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct completion *) get_handle_obj( process, handle, access, &completion_ops ); } diff --git a/server/fd.c b/server/fd.c index 31e1c9f..d671a1c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -180,6 +180,8 @@ struct fd struct async_queue *read_q; /* async readers of this fd */ struct async_queue *write_q; /* async writers of this fd */ struct async_queue *wait_q; /* other async waiters of this fd */ + struct completion *completion; /* completion object attached to this fd */ + unsigned long comp_key; /* completion key to set in completion events */ }; static void fd_dump( struct object *obj, int verbose ); @@ -1329,6 +1331,7 @@ static void fd_destroy( struct object *obj ) free_async_queue( fd->write_q ); free_async_queue( fd->wait_q ); + if (fd->completion) release_object( fd->completion ); remove_fd_locks( fd ); list_remove( &fd->inode_entry ); if (fd->poll_index != -1) remove_poll_user( fd, fd->poll_index ); @@ -1406,6 +1409,7 @@ static struct fd *alloc_fd_object(void) fd->read_q = NULL; fd->write_q = NULL; fd->wait_q = NULL; + fd->completion = NULL; list_init( &fd->inode_entry ); list_init( &fd->locks ); @@ -1438,6 +1442,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->read_q = NULL; fd->write_q = NULL; fd->wait_q = NULL; + fd->completion = NULL; fd->no_fd_status = STATUS_BAD_DEVICE_TYPE; list_init( &fd->inode_entry ); list_init( &fd->locks ); @@ -2009,3 +2014,20 @@ DECL_HANDLER(cancel_async) release_object( fd ); } } + +/* attach completion object to a fd */ +DECL_HANDLER(set_completion_info) +{ + struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + + if (fd) + { + if (!fd->completion) + { + fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); + fd->comp_key = req->ckey; + } + else set_error( STATUS_INVALID_PARAMETER ); + release_object( fd ); + } +} diff --git a/server/file.h b/server/file.h index c84f0b8..d56aad0 100644 --- a/server/file.h +++ b/server/file.h @@ -25,6 +25,7 @@ struct fd; struct async_queue; +struct completion; typedef unsigned __int64 file_pos_t; @@ -120,6 +121,10 @@ extern void do_change_notify( int unix_fd ); extern void sigio_callback(void); extern struct object *create_dir_obj( struct fd *fd ); +/* completion */ + +struct completion *get_completion_obj( struct process *process, obj_handle_t handle, unsigned int access ); + /* serial port functions */ extern int is_serial_fd( struct fd *fd ); diff --git a/server/protocol.def b/server/protocol.def index 8eec8a7..2e83c12 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2983,3 +2983,11 @@ enum message_type @REPLY unsigned int depth; /* completion queue depth */ @END + + +/* associate object with completion port */ +(a)REQ(set_completion_info) + obj_handle_t handle; /* object handle */ + obj_handle_t chandle; /* port handle */ + unsigned long ckey; /* completion key */ +(a)END diff --git a/server/request.h b/server/request.h index 7411565..0a013ab 100644 --- a/server/request.h +++ b/server/request.h @@ -335,6 +335,7 @@ DECL_HANDLER(open_completion); DECL_HANDLER(add_completion); DECL_HANDLER(remove_completion); DECL_HANDLER(query_completion); +DECL_HANDLER(set_completion_info); #ifdef WANT_REQUEST_HANDLERS @@ -566,6 +567,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_add_completion, (req_handler)req_remove_completion, (req_handler)req_query_completion, + (req_handler)req_set_completion_info, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index b431413..d1575e1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3628,6 +3628,13 @@ static void dump_query_completion_reply( const struct query_completion_reply *re fprintf( stderr, " depth=%08x", req->depth ); } +static void dump_set_completion_info_request( const struct set_completion_info_request *req ) +{ + fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " chandle=%p,", req->chandle ); + fprintf( stderr, " ckey=%lx", req->ckey ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3854,6 +3861,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_add_completion_request, (dump_func)dump_remove_completion_request, (dump_func)dump_query_completion_request, + (dump_func)dump_set_completion_info_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4082,6 +4090,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)0, (dump_func)dump_remove_completion_reply, (dump_func)dump_query_completion_reply, + (dump_func)0, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4310,6 +4319,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "add_completion", "remove_completion", "query_completion", + "set_completion_info", }; static const struct

1 0