January 2008 - Wine-commits

Alexandre Julliard : mountmgr.sys: Create a hard disk device for PhysicalDrive0.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 07e92a7dad0c881efda10b5f3c914c178b0bbcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e92a7dad0c881efda10b5f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:21:27 2008 +0100 mountmgr.sys: Create a hard disk device for PhysicalDrive0. --- dlls/mountmgr.sys/mountmgr.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3bc9534..f6c0f20 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -58,11 +58,58 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) return irp->IoStatus.u.Status; } +/* handler for ioctls on the harddisk device */ +static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + + TRACE( "ioctl %x insize %u outsize %u\n", + irpsp->Parameters.DeviceIoControl.IoControlCode, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + switch(irpsp->Parameters.DeviceIoControl.IoControlCode) + { + default: + FIXME( "unsupported ioctl %x\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } + return irp->IoStatus.u.Status; +} + +/* driver entry point for the harddisk driver */ +static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + static const WCHAR harddisk0W[] = {'\\','D','e','v','i','c','e', + '\\','H','a','r','d','d','i','s','k','0',0}; + static const WCHAR physdrive0W[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','0',0}; + + UNICODE_STRING nameW, linkW; + DEVICE_OBJECT *device; + NTSTATUS status; + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; + + RtlInitUnicodeString( &nameW, harddisk0W ); + RtlInitUnicodeString( &linkW, physdrive0W ); + if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) + status = IoCreateSymbolicLink( &linkW, &nameW ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return status; + } + + return status; +} + /* main entry point for the mount point manager driver */ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR device_mountmgrW[] = {'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; static const WCHAR link_mountmgrW[] = {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; + static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; @@ -82,5 +129,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) return status; } + RtlInitUnicodeString( &nameW, harddiskW ); + status = IoCreateDriver( &nameW, harddisk_driver_entry ); + return status; }

1 0

Alexander Nicolaysen Sørnes : Split freeware licence in two
by Chris Morgan 06 Jan '08

06 Jan '08

Module: appdb Branch: master Commit: 04057ee34b027abd5479645f4d7e90e83083ddee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=04057ee34b027abd5479645f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 6 13:20:40 2008 +0100 Split freeware licence in two --- include/version.php | 11 ++++++----- tables/appdb_tables.sql | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/version.php b/include/version.php index d3ebff3..6c25c68 100644 --- a/include/version.php +++ b/include/version.php @@ -15,10 +15,11 @@ require_once(BASE."include/monitor.php"); require_once(BASE."include/vote.php"); define("LICENSE_OPENSOURCE", "Open Source"); -define("LICENSE_FREEWARE", "Freeware"); define("LICENSE_SHAREWARE", "Shareware"); define("LICENSE_DEMO", "Demo"); define("LICENSE_RETAIL", "Retail"); +define('LICENSE_FREETOUSE', 'Free to use'); +define('LICENSE_FREETOSHARE', 'Free to use and share'); /** * Version class for handling versions. @@ -1366,8 +1367,8 @@ class version { $sReturn = "<select name=\"sLicense\">\n"; $sReturn .= "<option value=\"\">Choose . . .</option>\n"; - $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREEWARE, - LICENSE_DEMO, LICENSE_SHAREWARE); + $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); $iMax = count($aLicense); for($i = 0; $i < $iMax; $i++) @@ -1389,8 +1390,8 @@ class version { /* In order to prevent MySQL injections. Returns matched license */ public static function checkLicense($sLicense) { - $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREEWARE, - LICENSE_DEMO, LICENSE_SHAREWARE); + $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); foreach($aLicense as $sElement) { diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 5f486e7..2b3a479 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -58,7 +58,7 @@ create table appVersion ( ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - license enum('Retail','Open Source','Freeware','Demo','Shareware'), + license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', key(versionId),

1 0

Alexander Nicolaysen Sørnes : queued items: Fix display of test report dates
by Chris Morgan 05 Jan '08

05 Jan '08

Module: appdb Branch: master Commit: 47f150b4ce2305184ac2e923f06809113b574b65 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=47f150b4ce2305184ac2e923… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 2 18:19:13 2008 +0100 queued items: Fix display of test report dates --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index e3a3c29..7fd0e31 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1106,7 +1106,7 @@ class testData{ $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId)); $oTableRow->AddTextCell($oRow->testedRating); $oTableRow->AddTextCell($oRow->testedRelease); - $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTim))); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))); if($bQueued) {

1 0

Alexander Nicolaysen Sørnes : objectManager: Get rid of bIsQueue and bIsRejected members
by Chris Morgan 05 Jan '08

05 Jan '08

Module: appdb Branch: master Commit: 93f59469f891dd5ee7cef082e38730e9d7cd219c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=93f59469f891dd5ee7cef082… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 3 15:50:29 2008 +0100 objectManager: Get rid of bIsQueue and bIsRejected members --- include/objectManager.php | 48 +++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 25 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 2dbfdf2..e296b1d 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -8,10 +8,8 @@ define("PREVIEW_ENTRY", 2); class ObjectManager { private $sClass; - private $bIsQueue; private $sTitle; private $iId; - private $bIsRejected; private $sState; private $sReturnTo; private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */ @@ -72,7 +70,7 @@ class ObjectManager public function getIsQueue() { - return $this->bIsQueue; + return $this->sState != 'accepted'; } public function setReturnTo($sReturnTo) @@ -212,7 +210,7 @@ class ObjectManager $oTableRowClick->SetHighlight($oTableRowHighlight); } - $sEditLinkLabel = $this->bIsQueue ? "process" : "edit"; + $sEditLinkLabel = $this->getIsQueue() ? 'process' : 'edit'; /* We add some action links */ if($oObject->canEdit()) @@ -242,9 +240,9 @@ class ObjectManager "objectGetTableRow", "objectGetId", "canEdit")); /* We cannot process a queue if we are not logged in */ - if(!$_SESSION['current']->isLoggedIn() && $this->bIsQueue) + if(!$_SESSION['current']->isLoggedIn() && $this->getIsQueue()) { - $sQueueText = $this->bIsRejected ? "rejected" : "queued"; + $sQueueText = $this->sState == 'rejected' ? "rejected" : "queued"; echo '<div align="center">You need to '; echo "log in in order to process $sQueueText entries</div>\n"; login_form(false); @@ -265,7 +263,7 @@ class ObjectManager $this->setSortInfo($aClean); /* query the class for its entries */ - /* We pass in $this->bIsQueue to tell the object */ + /* We pass in queue states to tell the object */ /* if we are requesting a list of its queued objects or */ /* all of its objects */ if($this->oMultiPage->bEnabled) @@ -273,14 +271,14 @@ class ObjectManager /* Has the user chosen a particular field to sort by? If not we want to use the default */ if($this->oSortInfo->sCurrentSort) { - $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, + $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected', $this->oMultiPage->iItemsPerPage, $this->oMultiPage->iLowerLimit, $this->oSortInfo->sCurrentSort, $this->oSortInfo->bAscending); } else { - $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, + $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected', $this->oMultiPage->iItemsPerPage, $this->oMultiPage->iLowerLimit); } @@ -289,19 +287,19 @@ class ObjectManager /* Has the user chosen a particular field to sort by? If not we want to use the default */ if($this->oSortInfo->sCurrentSort) { - $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, + $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected', $this->oSortInfo->sCurrentSort, $this->oSortInfo->bAscending); } else { - $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected); + $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected'); } } /* did we get any entries? */ if(!$hResult || query_num_rows($hResult) == 0) { - switch($this->getQueueString($this->bIsQueue, $this->bIsRejected)) + switch($this->getQueueString($this->getIsQueue(), $this->sState == 'rejected')) { case "true": echo "<center>The queue for '$this->sClass' is empty</center>"; @@ -334,7 +332,7 @@ class ObjectManager echo '</div>'; } - $sQueued = $this->getQueueString($this->bIsQueue, $this->bIsRejected); + $sQueued = $this->getQueueString($this->getIsQueue(), $this->sState == 'rejected'); /* Should we let the class draw its own custom table? */ if(method_exists($this->sClass, 'objectWantCustomDraw') && @@ -411,7 +409,7 @@ class ObjectManager /* if this is a queue add a dialog for replying to the submitter of the queued entry */ - if($this->bIsQueue || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) + if($this->getIsQueue() || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) { /* If it isn't implemented, that means there is no default text */ $sDefaultReply = $this->getOptionalSetting("getDefaultReply", ""); @@ -422,7 +420,7 @@ class ObjectManager echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; - if($this->bIsQueue) + if($this->getIsQueue()) { ///////////////////////////////////////////////// // output radio buttons for some common responses @@ -457,7 +455,7 @@ class ObjectManager 'class="button" />',"\n"; } - if(!$this->bIsRejected && !$this->getOptionalSetting("objectHideReject", FALSE)) + if($this->sState != 'rejected' && !$this->getOptionalSetting("objectHideReject", FALSE)) { echo '<input name="sSubmit" type="submit" value="Reject" class="button" '. '/>',"\n"; @@ -1162,10 +1160,10 @@ class ObjectManager if(!$oOriginalObject->canEdit()) return FALSE; - if($this->bIsRejected) + if($this->sState == 'rejected') $oObject->ReQueue(); - if($this->bIsQueue && !$oOriginalObject->mustBeQueued()) + if($this->getIsQueue() && !$oOriginalObject->mustBeQueued()) $oObject->unQueue(); $oObject->update(); @@ -1202,7 +1200,7 @@ class ObjectManager /* Displaying the entire un-queued list for a class is not a good idea, so only do so for queued data */ - if($this->bIsQueue) + if($this->getIsQueue()) $sRedirectLink = $this->makeUrl("view", false, $this->sReturnToTitle ? $this->sReturnToTitle : "$this->sClass list"); else $sRedirectLink = APPDB_ROOT; @@ -1217,9 +1215,9 @@ class ObjectManager { $sUrl = APPDB_ROOT."objectManager.php?"; - $sIsQueue = $this->bIsQueue ? "true" : "false"; + $sIsQueue = $this->getIsQueue() ? "true" : "false"; $sUrl .= "bIsQueue=$sIsQueue"; - $sIsRejected = $this->bIsRejected ? "true" : "false"; + $sIsRejected = $this->sState == 'rejected' ? "true" : "false"; $sUrl .= "&bIsRejected=$sIsRejected"; $sUrl .= "&sClass=".$this->sClass; @@ -1259,8 +1257,8 @@ class ObjectManager is preserved when submitting forms */ public function makeUrlFormData() { - $sIsQueue = $this->bIsQueue ? "true" : "false"; - $sIsRejected = $this->bIsRejected ? "true" : "false"; + $sIsQueue = $this->getIsQueue() ? "true" : "false"; + $sIsRejected = $this->sState == 'rejected' ? "true" : "false"; $sReturn = "<input type=\"hidden\" name=\"bIsQueue\" value=\"$sIsQueue\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"bIsRejected\" value=\"$sIsRejected\" />\n"; @@ -1306,7 +1304,7 @@ class ObjectManager /* Add an action column if the user can edit this class, or if it is a queue. Even though a user annot process items, he can edit his queued submissions */ - if($oObject->canEdit() || $this->bIsQueue) + if($oObject->canEdit() || $this->getIsQueue()) { $oTableRow->AddTextCell("Action"); } @@ -1371,7 +1369,7 @@ class ObjectManager $sControls .= "</form></p>"; } - $iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected); + $iTotalEntries = $oObject->objectGetEntriesCount($this->getIsQueue(), $this->sState == 'rejected'); $iNumPages = ceil($iTotalEntries / $iItemsPerPage); if($iNumPages == 0) $iNumPages = 1;

1 0

Peter Dons Tychsen : ddraw: Add missing pitch in callback from EnumDisplayModes().
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 6e8b7c4cef5f0b03cf1e35a76d7919513e54b087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8b7c4cef5f0b03cf1e35a76… Author: Peter Dons Tychsen <donpedro(a)dhcppc4> Date: Tue Jan 1 21:33:32 2008 +0100 ddraw: Add missing pitch in callback from EnumDisplayModes(). --- dlls/ddraw/ddraw.c | 7 ++++++- dlls/ddraw/tests/ddrawmodes.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 15e8edc..e87043a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1289,7 +1289,12 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, PixelFormat_WineD3DtoDD(&callback_sd.u4.ddpfPixelFormat, mode.Format); - TRACE("Enumerating %dx%d@%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount); + /* Calc pitch and DWORD align like MSDN says */ + callback_sd.u1.lPitch = (callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount / 8) * mode.Width; + callback_sd.u1.lPitch = (callback_sd.u1.lPitch + 3) & ~3; + + TRACE("Enumerating %dx%dx%d @%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount, + callback_sd.u2.dwRefreshRate); if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) { diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 4db0856..5af8ba4 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -108,9 +108,22 @@ static void flushdisplaymodes(void) static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) { - trace("Width = %i, Height = %i, Refresh Rate = %i\r\n", + trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\r\n", lpddsd->dwWidth, lpddsd->dwHeight, - U2(*lpddsd).dwRefreshRate); + U2(*lpddsd).dwRefreshRate, lpddsd->lPitch, lpddsd->dwFlags); + + /* Check that the pitch is valid if applicable */ + if(lpddsd->dwFlags & DDSD_PITCH) + { + ok(lpddsd->lPitch != 0, "EnumDisplayModes callback with bad pitch\n"); + } + + /* Check that frequency is valid if applicable */ + if(lpddsd->dwFlags & DDSD_REFRESHRATE) + { + ok(lpddsd->dwRefreshRate != 0, "EnumDisplayModes callback with bad refresh rate\n"); + } + adddisplaymode(lpddsd); return DDENUMRET_OK;

1 0

Alexandre Julliard : mountmgr.sys: Added initial stub for the mount point manager device.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 43dc80e623d00781c726892ef0eddce7b03c9db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dc80e623d00781c726892ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 13:07:05 2008 +0100 mountmgr.sys: Added initial stub for the mount point manager device. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/mountmgr.sys/Makefile.in | 14 ++++++ dlls/mountmgr.sys/mountmgr.c | 86 +++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.sys.spec | 1 + 7 files changed, 108 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index fc4d43a..5be823d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,6 +288,7 @@ ALL_MAKEFILES = \ dlls/mlang/tests/Makefile \ dlls/mmdevldr.vxd/Makefile \ dlls/monodebg.vxd/Makefile \ + dlls/mountmgr.sys/Makefile \ dlls/mpr/Makefile \ dlls/mprapi/Makefile \ dlls/msacm32.drv/Makefile \ @@ -672,6 +673,7 @@ dlls/mlang/Makefile: dlls/mlang/Makefile.in dlls/Makedll.rules dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules +dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules dlls/mpr/Makefile: dlls/mpr/Makefile.in dlls/Makedll.rules dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules dlls/msacm32.drv/Makefile: dlls/msacm32.drv/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 3b59e50..0c99eae 100755 --- a/configure +++ b/configure @@ -20868,6 +20868,8 @@ ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile" ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile" +ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile" + ac_config_files="$ac_config_files dlls/mpr/Makefile" ac_config_files="$ac_config_files dlls/mprapi/Makefile" @@ -22042,6 +22044,7 @@ do "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; + "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;; "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3ca94d4..4694904 100644 --- a/configure.ac +++ b/configure.ac @@ -1714,6 +1714,7 @@ AC_CONFIG_FILES([dlls/mlang/Makefile]) AC_CONFIG_FILES([dlls/mlang/tests/Makefile]) AC_CONFIG_FILES([dlls/mmdevldr.vxd/Makefile]) AC_CONFIG_FILES([dlls/monodebg.vxd/Makefile]) +AC_CONFIG_FILES([dlls/mountmgr.sys/Makefile]) AC_CONFIG_FILES([dlls/mpr/Makefile]) AC_CONFIG_FILES([dlls/mprapi/Makefile]) AC_CONFIG_FILES([dlls/msacm32.drv/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index cfb3247..907bceb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -110,6 +110,7 @@ BASEDIRS = \ mlang \ mmdevldr.vxd \ monodebg.vxd \ + mountmgr.sys \ mpr \ mprapi \ msacm32 \ diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in new file mode 100644 index 0000000..f73e4d4 --- /dev/null +++ b/dlls/mountmgr.sys/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mountmgr.sys +IMPORTS = advapi32 ntoskrnl.exe kernel32 ntdll +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + mountmgr.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c new file mode 100644 index 0000000..3bc9534 --- /dev/null +++ b/dlls/mountmgr.sys/mountmgr.c @@ -0,0 +1,86 @@ +/* + * Mount manager service implementation + * + * Copyright 2008 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <unistd.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "ddk/mountmgr.h" +#include "wine/library.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); + +/* handler for ioctls on the mount manager device */ +static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + + TRACE( "ioctl %x insize %u outsize %u\n", + irpsp->Parameters.DeviceIoControl.IoControlCode, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + switch(irpsp->Parameters.DeviceIoControl.IoControlCode) + { + default: + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } + return irp->IoStatus.u.Status; +} + +/* main entry point for the mount point manager driver */ +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + static const WCHAR device_mountmgrW[] = {'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; + static const WCHAR link_mountmgrW[] = {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; + + UNICODE_STRING nameW, linkW; + DEVICE_OBJECT *device; + NTSTATUS status; + + TRACE( "%s\n", debugstr_w(path->Buffer) ); + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; + + RtlInitUnicodeString( &nameW, device_mountmgrW ); + RtlInitUnicodeString( &linkW, link_mountmgrW ); + if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) + status = IoCreateSymbolicLink( &linkW, &nameW ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return status; + } + + return status; +} diff --git a/dlls/mountmgr.sys/mountmgr.sys.spec b/dlls/mountmgr.sys/mountmgr.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/mountmgr.sys/mountmgr.sys.spec @@ -0,0 +1 @@ +# nothing to export

1 0

Kirill K. Smirnov : kernel32: Convert newborn wineserver handle to kernel32 console handle.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 24f78d736616b6dfab959bda446d6ae3f1513d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f78d736616b6dfab959bda4… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 29 20:19:43 2007 +0300 kernel32: Convert newborn wineserver handle to kernel32 console handle. --- dlls/kernel32/console.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 446e882..b14b9c0 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1792,7 +1792,7 @@ HANDLE WINAPI CreateConsoleScreenBuffer(DWORD dwDesiredAccess, DWORD dwShareMode req->access = dwDesiredAccess; req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0; req->share = dwShareMode; - if (!wine_server_call_err( req )) ret = reply->handle_out; + if (!wine_server_call_err( req )) ret = console_handle_map(reply->handle_out); } SERVER_END_REQ;

1 0

Alexandre Julliard : advapi32: Don' t wait for 20 seconds if a service fails to start.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 3133280d08538ac68b4d49aeecc1327f2eb15ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3133280d08538ac68b4d49aee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 12:50:11 2008 +0100 advapi32: Don't wait for 20 seconds if a service fails to start. --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 8a775ad..594d607 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -455,6 +455,7 @@ static BOOL service_handle_start(HANDLE pipe, service_data *service, DWORD count HeapFree(GetProcessHeap(), 0, service->args); service->args = args; args = NULL; + service->status.dwCurrentState = SERVICE_START_PENDING; service->thread = CreateThread( NULL, 0, service_thread, service, 0, NULL ); SetEvent( service_event ); /* notify the main loop */ @@ -1625,6 +1626,7 @@ static BOOL service_wait_for_startup(SC_HANDLE hService) break; } r = FALSE; + if (status.dwCurrentState != SERVICE_START_PENDING) break; Sleep(100 * i); } return r;

1 0

Alexandre Julliard : kernel32: Launch wineboot on first startup of a wine process.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: d55b2de5747da90666065b5ed2fdeb8049282419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55b2de5747da90666065b5ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 12:51:04 2008 +0100 kernel32: Launch wineboot on first startup of a wine process. --- dlls/kernel32/process.c | 47 +++++++++++++++++++++++++++++++++++++++++ programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 13 +++++++++++ 3 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 84291c3..39e3665 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -774,6 +774,45 @@ static BOOL process_init(void) /*********************************************************************** + * start_wineboot + * + * Start the wineboot process if necessary. Return the event to wait on. + */ +static HANDLE start_wineboot(void) +{ + static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0}; + HANDLE event; + + if (!(event = CreateEventW( NULL, TRUE, FALSE, wineboot_eventW ))) + { + ERR( "failed to create wineboot event, expect trouble\n" ); + return 0; + } + if (GetLastError() != ERROR_ALREADY_EXISTS) /* we created it */ + { + static const WCHAR command_line[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',0}; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetSystemDirectoryW( cmdline, MAX_PATH ); + lstrcatW( cmdline, command_line ); + if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) + { + TRACE( "started wineboot pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + + } + else ERR( "failed to start wineboot, err %u\n", GetLastError() ); + } + return event; +} + + +/*********************************************************************** * init_stack * * Allocate the stack of new process. @@ -894,6 +933,7 @@ void __wine_kernel_init(void) WCHAR *p, main_exe_name[MAX_PATH+1]; PEB *peb = NtCurrentTeb()->Peb; + HANDLE boot_event = 0; /* Initialize everything */ if (!process_init()) exit(1); @@ -913,6 +953,7 @@ void __wine_kernel_init(void) ExitProcess( GetLastError() ); } if (!build_command_line( __wine_main_wargv )) goto error; + boot_event = start_wineboot(); } /* if there's no extension, append a dot to prevent LoadLibrary from appending .dll */ @@ -944,6 +985,12 @@ void __wine_kernel_init(void) ExitProcess( error ); } + if (boot_event) + { + if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); + CloseHandle( boot_event ); + } + /* switch to the new stack */ wine_switch_to_stack( start_process, NULL, init_stack() ); diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 1f751ce..8d69026 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = shell32 shlwapi version user32 advapi32 kernel32 +IMPORTS = shell32 shlwapi version user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid C_SRCS = \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 99ba1b4..1552330 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -716,9 +716,13 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { + extern HANDLE __wine_make_process_system(void); + static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0}; + /* First, set the current directory to SystemRoot */ int optc; int end_session = 0, force = 0, kill = 0, restart = 0, shutdown = 0; + HANDLE event; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) @@ -750,6 +754,9 @@ int main( int argc, char *argv[] ) if (shutdown) return 0; + event = CreateEventW( NULL, TRUE, FALSE, wineboot_eventW ); + ResetEvent( event ); /* in case this is a restart */ + wininit(); pendingRename(); @@ -769,5 +776,11 @@ int main( int argc, char *argv[] ) } WINE_TRACE("Operation done\n"); + + SetEvent( event ); + + /* FIXME: the wait is needed to keep services running */ + /* it should be removed once we have a proper services.exe */ + WaitForSingleObject( __wine_make_process_system(), INFINITE ); return 0; }

1 0

Jonathan Ernst : server: New French man page for wineserver.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 4cf157d20ba46acb5ece097b964b36bba80e492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf157d20ba46acb5ece097b9… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Jan 3 16:40:30 2008 +0100 server: New French man page for wineserver. --- .gitignore | 1 + server/Makefile.in | 9 +++- server/wineserver.fr.man.in | 114 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 77c6829..fdcfa30 100644 --- a/.gitignore +++ b/.gitignore @@ -807,6 +807,7 @@ programs/xcopy/rsrc.res programs/xcopy/xcopy server/wineserver server/wineserver-installed +server/wineserver.fr.man server/wineserver.man tools/fnt2bdf tools/fnt2fon diff --git a/server/Makefile.in b/server/Makefile.in index 4853b65..e51a48e 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -57,9 +57,12 @@ C_SRCS = \ winstation.c PROGRAMS = wineserver wineserver-installed -MANPAGES = wineserver.man +MANPAGES = wineserver.man wineserver.fr.man -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) +INSTALLDIRS = \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(mandir)/man$(prog_manext) \ + $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) all: $(PROGRAMS) $(MANPAGES) @@ -74,8 +77,10 @@ wineserver-installed: $(OBJS) install:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver $(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in new file mode 100644 index 0000000..83770e0 --- /dev/null +++ b/server/wineserver.fr.man.in @@ -0,0 +1,114 @@ +.\" -*- nroff -*- +.TH WINESERVER 1 "Décembre 2007" "@PACKAGE_STRING@" "Windows sur Unix" +.SH NAME +wineserver \- le serveur Wine +.SH SYNOPSIS +.BI wineserver\ [options] +.SH DESCRIPTION +.B wineserver +est un démon qui fournit à Wine à peut près les mêmes services +que le noyau de Windows fournit sous Windows. +.PP +.B wineserver +est normalement exécuté automatiquement lorsque \fBwine(1)\fR est démarré, +vous ne devriez donc pas vous en préoccuper. Néanmoins, dans certains cas, il +peut être utile de démarrer \fBwineserver\fR explicitement avec des options différentes, +comme expliqué ci-dessous. +.SH OPTIONS +.TP +.BI \-d [n] +Défini le niveau de déboguage à +.I n. +0 signifie aucune information de déboguage, 1 est le niveau normal et 2 est +pour un déboguage plus important. Si +.I n +n'est pas spécifié, la valeur par défaut est 1. La sortie de déboguage sera +stderr. \fBwine(1)\fR définit automatiquement le niveau de déboguage lorsqu'il +démarre \fBwineserver\fR si l'option +server est indiquée dans la variable +WINEDEBUG. +.TP +.B \-f +Laisse le serveur au premier plan pour un déboguage plus aisé, par +exemple lorsqu'il est exécuté dans un débogueur. +.TP +.B \-h +Affiche un message d'aide. +.TP +.BI \-k [n] +Termine le +.B wineserver +actuellement exécuté en envoyant optionnellement un signal \fIn\fR. Si +aucun signal n'est spécifié, un signal SIGINT est envoyé en premier, +puis un signal SIGKILL. L'instance de \fBwineserver\fR qui est +terminée est sélectionnée en fonction de la variable d'environnement +WINEPREFIX. +.TP +.BI \-p [n] +Spécifie le délai de persistance de \fBwineserver\fR ; c'est-à-dire le +temps pendant lequel le serveur continuera de tourner après que tous les +processus clients auront été terminés. Ceci évite le coût inhérent à l'arrêt +puis au redémarrage du serveur lorsque des programmes sont lancés successivement. +Le délai d'attente \fIn\fR est exprimé en secondes, la valeur par défaut est +3 secondes. Si \fIn\fR n'est pas spécifié, le serveur reste en permanence. +.TP +.B \-v +Affiche les informations sur la version et quitte. +.TP +.B \-w +Attend que le +.B wineserver +actuellement exécuté se termine. +.SH VARIABLES D'ENVIRONNEMENT +.TP +.I WINEPREFIX +Si défini, le contenu de cette variable est pris comme le nom du répertoire où +.B wineserver +stocke ses données (la valeur par défaut est \fI$HOME/.wine\fR). Tous les processus +.B wine +utilisent le même +.B wineserver +(c'est-à-dire le même utilisateur) et partages certains éléments comme la base de registre, +la mémoire partagée et les objets du noyau. +En définissant +.I WINEPREFIX +à une valeur différente pour différent processus Wine, il est possible d'exécuter plusieurs +sessions de Wine indépendantes. +.TP +.I WINESERVER +Spécifie le chemin et le nom de l'exécutable +.B wineserver +qui sera lancé automatiquement par \fBwine\fR. S'il n'est pas défini, +\fBwine\fR essaiera de charger +.I @bindir@/wineserver, +et, s'il n'existe pas, il cherchera alors un fichier nommé +\fIwineserver\fR dans le chemin et dans quelques autres emplacements potentiels. +.SH FICHIERS +.TP +.B ~/.wine +Répertoire contenant les données utilisateur gérées par +.B wine. +.TP +.BI /tmp/.wine- uid +Le répertoire contenant le connecteur Unix et le fichier cadenas. +Ces fichiers sont créés dans un sous-répertoire généré depuis le répertoire +WINEPREFIX et des numéros inode. +.SH AUTEURS +L'auteur originel de +.B wineserver +est Alexandre Julliard. Beaucoup d'autres personnes ont contribué de nouvelles fonctionnalités +et des correction d'anomalies. Référez-vous au fichier Changelog dans la distribution de Wine +pour les détails complets. +.SH ANOMALIES +Si vous rencontrez une anomalie, veuillez soumettre à rapport d'anomalie sur +.UR http://bugs.winehq.org +.B http://bugs.winehq.org. +.UE +.SH DISPONIBILITÉ +.B wineserver +fait partie de la distribution de Wine qui est dispobible depuis WineHQ, +le quartier général des développeurs de Wine, sur +.UR http://www.winehq.org/ +.B http://www.winehq.org/. +.UE +.SH "VOIR AUSSI" +.BR wine (1).

1 0