Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 47842: [WDMAUD.DRV] - Fix initialization of mmixer library
by janderwald＠svn.reactos.org 24 Jun '10

24 Jun '10

Author: janderwald Date: Thu Jun 24 11:18:16 2010 New Revision: 47842 URL: http://svn.reactos.org/svn/reactos?rev=47842&view=rev Log: [WDMAUD.DRV] - Fix initialization of mmixer library Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Thu Jun 24 11:18:16 2010 @@ -282,7 +282,7 @@ HeapFree(GetProcessHeap(), 0, DetailData); return MM_STATUS_NO_MEMORY; } - + DPRINT1("DeviceName %S\n", DetailData->DevicePath); wcscpy(*DeviceName, DetailData->DevicePath); HeapFree(GetProcessHeap(), 0, DetailData); @@ -519,7 +519,10 @@ IN struct _SOUND_DEVICE* SoundDevice, OUT PVOID* Handle) { - return WdmAudInitUserModeMixer(); + if (WdmAudInitUserModeMixer()) + return MMSYSERR_NOERROR; + else + return MMSYSERR_ERROR; } MMRESULT

1 0

[janderwald] 47841: [WDMAUD.DRV] - Fix compilation when using USE_MMIXER_LIB #2
by janderwald＠svn.reactos.org 24 Jun '10

24 Jun '10

Author: janderwald Date: Thu Jun 24 10:54:58 2010 New Revision: 47841 URL: http://svn.reactos.org/svn/reactos?rev=47841&view=rev Log: [WDMAUD.DRV] - Fix compilation when using USE_MMIXER_LIB #2 Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Thu Jun 24 10:54:58 2010 @@ -354,10 +354,11 @@ return TRUE; } -VOID -WdmAudCleanupMMixer() +MMRESULT +WdmAudCleanupByMMixer() { /* TODO */ + return MMSYSERR_NOERROR; } MMRESULT

1 0

[janderwald] 47840: [WDMAUD.DRV] - Fix compilation when using USE_MMIXER_LIB
by janderwald＠svn.reactos.org 24 Jun '10

24 Jun '10

Author: janderwald Date: Thu Jun 24 10:52:46 2010 New Revision: 47840 URL: http://svn.reactos.org/svn/reactos?rev=47840&view=rev Log: [WDMAUD.DRV] - Fix compilation when using USE_MMIXER_LIB Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Thu Jun 24 10:52:46 2010 @@ -444,7 +444,7 @@ } MMRESULT -WdmAudSetWdmWaveDeviceFormatByMMixer( +WdmAudSetWaveDeviceFormatByMMixer( IN PSOUND_DEVICE_INSTANCE Instance, IN DWORD DeviceId, IN PWAVEFORMATEX WaveFormat, @@ -561,7 +561,7 @@ } MMRESULT -WdmAudGetNumDevsByMMixer( +WdmAudGetNumWdmDevsByMMixer( IN MMDEVICE_TYPE DeviceType, OUT DWORD* DeviceCount) { @@ -647,7 +647,7 @@ } MMRESULT -WdmAudSetWdmWaveStateByMMixer( +WdmAudSetWaveStateByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN BOOL bStart) { @@ -678,7 +678,7 @@ } MMRESULT -WdmAudGetWdmPositionByMMixer( +WdmAudGetWavePositionByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN MMTIME* Time) { Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Thu Jun 24 10:52:46 2010 @@ -30,7 +30,7 @@ WdmAudOpenSoundDeviceByLegacy(); MMRESULT -WdmAudGetNumDevsByMMixer( +WdmAudGetNumWdmDevsByMMixer( IN MMDEVICE_TYPE DeviceType, OUT DWORD* DeviceCount); @@ -92,7 +92,7 @@ IN ULONG Flags); MMRESULT -WdmAudSetWdmWaveDeviceFormatByMMixer( +WdmAudSetWaveDeviceFormatByMMixer( IN PSOUND_DEVICE_INSTANCE Instance, IN DWORD DeviceId, IN PWAVEFORMATEX WaveFormat, @@ -121,7 +121,7 @@ IN DWORD Flags); MMRESULT -WdmAudSetWdmWaveStateByMMixer( +WdmAudSetWaveStateByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN BOOL bStart); @@ -132,7 +132,7 @@ IN BOOLEAN bStartReset); MMRESULT -WdmAudGetWdmPositionByMMixer( +WdmAudGetWavePositionByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN MMTIME* Time);

1 0

[dreimer] 47839: Ukrainian translation updates for usetup by Igor Paliychuk.
by dreimer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: dreimer Date: Wed Jun 23 22:38:12 2010 New Revision: 47839 URL: http://svn.reactos.org/svn/reactos?rev=47839&view=rev Log: Ukrainian translation updates for usetup by Igor Paliychuk. Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Jun 23 22:38:12 2010 @@ -422,13 +422,13 @@ { 6, 23, - "®«¨ ¢ái ¯ à ¬¥âà¨ ¡ã¤ãâì ¢¨§ ç¥i, ¢¨¡¥àiâì \" áâ®áã¢ â¨ ¤ i ¯ à ¬¥âà¨ ¯à¨áâà®õ¢\"", + "®«¨ ¢ái ¯ à ¬¥âà¨ ¡ã¤ãâì ¢¨§ ç¥i, ¢¨¡¥àiâì", TEXT_STYLE_NORMAL }, { 6, 24, - "i â¨áiâì ENTER.", + "\" áâ®áã¢ â¨ ¤ i ¯ à ¬¥âà¨ ¯à¨áâà®õ¢\" i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { @@ -525,7 +525,7 @@ { 8, 10, - "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã â¨¯ã è®£® ª®¬¯'îâ¥à .", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã â¨¯ã è®£® ª®¬¯'îâ¥à ", TEXT_STYLE_NORMAL }, { @@ -662,7 +662,7 @@ }, { 8, 10, - "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã ¬®iâ®àã.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã ¬®iâ®àã", TEXT_STYLE_NORMAL }, { @@ -720,7 +720,7 @@ { 10, 9, - "¢áiå CD-ROM § CD-¯à¨¢®¤i¢.", + "¢ái CD-ROM § CD-¯à¨¢®¤i¢.", TEXT_STYLE_NORMAL }, { @@ -837,7 +837,7 @@ { 0, 0, - "ã¤ì-« áª § ç¥ª ©â¥...", + "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1037,13 +1037,13 @@ { 8, 10, - "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã ª« ¢i âãà¨.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã", TEXT_STYLE_NORMAL }, { 8, 11, - " i â¨áiâì ENTER.", + " ª« ¢i âãà¨ i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { @@ -1485,8 +1485,8 @@ }, { //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" - " * Press any key to continue.", + "¥¤®áâ âì® ¢i«ì®£® ¬iáæï ®¡à ®¬ã à®§¤i«i.\n" + " * â¨áiâì ¡ã¤ì-ïªã ª« ¢ièã ¤«ï ¯à®¤®¢¦¥ï.", NULL }, {

1 0

[pschweitzer] 47837: [IOEVENT] Added a library containing GUIDs for PnP notifications [BUGCODES] Added missing bugcheck code for PnP manager [NTOSKRNL] - Implemented FsRtlNotifyVolumeEvent() - Implemented IoReportTargetDeviceChange(), IoReportTargetDeviceChangeAsynchronous() - Craplemented PpSetCustomTargetEvent() to match our actual PnP manager notifications system. This is to be rewritten - Added support for custom notifications in IopNotifyPlugPlayNotification() - Added use of FsRtlNotifyVolu
by pschweitzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: pschweitzer Date: Wed Jun 23 19:37:22 2010 New Revision: 47837 URL: http://svn.reactos.org/svn/reactos?rev=47837&view=rev Log: [IOEVENT] Added a library containing GUIDs for PnP notifications [BUGCODES] Added missing bugcheck code for PnP manager [NTOSKRNL] - Implemented FsRtlNotifyVolumeEvent() - Implemented IoReportTargetDeviceChange(), IoReportTargetDeviceChangeAsynchronous() - Craplemented PpSetCustomTargetEvent() to match our actual PnP manager notifications system. This is to be rewritten - Added support for custom notifications in IopNotifyPlugPlayNotification() - Added use of FsRtlNotifyVolumeEvent() in RawUserFsCtrl() to notify volume state changes - Added use of IoEvent library to ntoskrnl [FASTFAT] - Added use of FsRtlNotifyVolumeEvent() when successfully mounting a volume Finally, purpose of that patch is to implement volumes events notifications. Behaviour and implementation is correct till PpSetCustomTargetEvent(). The PnP notifications manager should be rewritten to match Microsoft's one. Furthermore, it appears that in Windows, those notifications are asynchronous. Added: trunk/reactos/include/psdk/ioevent.h (with props) trunk/reactos/lib/sdk/ioevent/ trunk/reactos/lib/sdk/ioevent/ioevent.c (with props) trunk/reactos/lib/sdk/ioevent/ioevent.rbuild (with props) Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/lib/sdk/sdk.rbuild trunk/reactos/ntoskrnl/fsrtl/pnp.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -585,6 +585,8 @@ } VolumeFcb->Flags |= VCB_IS_DIRTY; + FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); + Status = STATUS_SUCCESS; ByeBye: Added: trunk/reactos/include/psdk/ioevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ioevent.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ioevent.h (added) +++ trunk/reactos/include/psdk/ioevent.h [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -1,0 +1,78 @@ +/* + * ioevent.h + * + * PnP Event Notification GUIDs + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef _IOEVENT_H +#define _IOEVENT_H + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(GUID_IO_VOLUME_CHANGE, + 0x7373654AL, 0x812A, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_IO_VOLUME_DISMOUNT, + 0xD16A55E8L, 0x1059, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_DISMOUNT_FAILED, + 0xE3C5B178L, 0x105D, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_MOUNT, + 0xB5804878L, 0x1A96, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_LOCK, + 0x50708874L, 0xC9AF, 0x11D1, 0x8F, 0xEF, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_LOCK_FAILED, + 0xAE2EED10L, 0x0BA8, 0x11D2, 0x8F, 0xFB, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_UNLOCK, + 0x9A8C3D68L, 0xD0CB, 0x11D1, 0x8F, 0xEF, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_NAME_CHANGE, + 0x2DE97F83, 0x4C06, 0x11D2, 0xA5, 0x32, 0x00, 0x60, 0x97, 0x13, 0x05, 0x5A); +DEFINE_GUID(GUID_IO_VOLUME_PREPARING_EJECT, + 0xC79EB16E, 0x0DAC, 0x4E7A, 0xA8, 0x6C, 0xB2, 0x5C, 0xEE, 0xAA, 0x88, 0xF6); +DEFINE_GUID(GUID_IO_VOLUME_PHYSICAL_CONFIGURATION_CHANGE, + 0x2DE97F84, 0x4C06, 0x11D2, 0xA5, 0x32, 0x00, 0x60, 0x97, 0x13, 0x05, 0x5A); +DEFINE_GUID(GUID_IO_VOLUME_FVE_STATUS_CHANGE, + 0x062998B2, 0xEE1F, 0x4B6A, 0xB8, 0x57, 0xE7, 0x6C, 0xBB, 0xE9, 0xA6, 0xDA); +DEFINE_GUID(GUID_IO_VOLUME_DEVICE_INTERFACE, + 0x53F5630D, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B); +DEFINE_GUID(GUID_IO_VOLUME_CHANGE_SIZE, + 0x3A1625BE, 0xAD03, 0x49F1, 0x8E, 0xF8, 0x6B, 0xBA, 0xC1, 0x82, 0xD1, 0xFD); +DEFINE_GUID(GUID_IO_MEDIA_ARRIVAL, + 0xD07433C0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_MEDIA_REMOVAL, + 0xD07433C1, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_CDROM_EXCLUSIVE_LOCK, + 0xBC56C139, 0x7A10, 0x47EE, 0xA2, 0x94, 0x4C, 0x6A, 0x38, 0xF0, 0x14, 0x9A); +DEFINE_GUID(GUID_IO_CDROM_EXCLUSIVE_UNLOCK, + 0xA3B6D27D, 0x5E35, 0x4885, 0x81, 0xE5, 0xEE, 0x18, 0xC0, 0x0E, 0xD7, 0x79); +DEFINE_GUID(GUID_IO_DEVICE_BECOMING_READY, + 0xD07433F0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_DEVICE_EXTERNAL_REQUEST, + 0xD07433D0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_MEDIA_EJECT_REQUEST, + 0xD07433D1, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_DRIVE_REQUIRES_CLEANING, + 0x7207877C, 0x90ED, 0x44E5, 0xA0, 0x00, 0x81, 0x42, 0x8D, 0x4C, 0x79, 0xBB); +DEFINE_GUID(GUID_IO_TAPE_ERASE, + 0x852D11EB, 0x4BB8, 0x4507, 0x9D, 0x9B, 0x41, 0x7C, 0xC2, 0xB1, 0xB4, 0x38); +DEFINE_GUID(GUID_IO_DISK_CLONE_ARRIVAL, + 0x6A61885B, 0x7C39, 0x43DD, 0x9B, 0x56, 0xB8, 0xAC, 0x22, 0xA5, 0x49, 0xAA); +DEFINE_GUID(GUID_IO_DISK_LAYOUT_CHANGE, + 0x11DFF54C, 0x8469, 0x41F9, 0xB3, 0xDE, 0xEF, 0x83, 0x64, 0x87, 0xC5, 0x4A); + +#ifdef __cplusplus +} +#endif + +#endif /* _IOEVENT_H */ Propchange: trunk/reactos/include/psdk/ioevent.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -1265,6 +1265,14 @@ it has finished its task. . +MessageId=0xCA +Severity=Success +Facility=System +SymbolicName=PNP_DETECTED_FATAL_ERROR +Language=English +PNP_DETECTED_FATAL_ERROR +. + MessageId=0xCB Severity=Success Facility=System Added: trunk/reactos/lib/sdk/ioevent/ioevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/ioevent/ioevent.c?… ============================================================================== --- trunk/reactos/lib/sdk/ioevent/ioevent.c (added) +++ trunk/reactos/lib/sdk/ioevent/ioevent.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -1,0 +1,8 @@ +#include <stdarg.h> + +#define COM_NO_WINDOWS_H +#include "initguid.h" + +#include <ioevent.h> + +/* EOF */ Propchange: trunk/reactos/lib/sdk/ioevent/ioevent.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/ioevent/ioevent.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/ioevent/ioevent.rb… ============================================================================== --- trunk/reactos/lib/sdk/ioevent/ioevent.rbuild (added) +++ trunk/reactos/lib/sdk/ioevent/ioevent.rbuild [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ioevent" type="staticlibrary"> + <file>ioevent.c</file> +</module> Propchange: trunk/reactos/lib/sdk/ioevent/ioevent.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=478… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -10,6 +10,9 @@ </directory> <directory name="dxguid"> <xi:include href="dxguid/dxguid.rbuild" /> + </directory> + <directory name="ioevent"> + <xi:include href="ioevent/ioevent.rbuild" /> </directory> <directory name="nt"> <xi:include href="nt/nt.rbuild" /> Modified: trunk/reactos/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/pnp.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -3,12 +3,13 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/pnp.c * PURPOSE: Manages PnP support routines for file system drivers. - * PROGRAMMERS: None. + * PROGRAMMERS: Pierre Schweitzer */ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include <ioevent.h> #define NDEBUG #include <debug.h> @@ -16,17 +17,18 @@ /*++ * @name FsRtlNotifyVolumeEvent - * @unimplemented + * @implemented * - * FILLME + * Notifies system (and applications) that something changed on volume. + * FSD should call it each time volume status changes. * * @param FileObject - * FILLME + * FileObject for the volume * * @param EventCode - * FILLME + * Event that occurs one the volume * - * @return None + * @return STATUS_SUCCESS if notification went well * * @remarks Only present in NT 5+. * @@ -36,7 +38,80 @@ FsRtlNotifyVolumeEvent(IN PFILE_OBJECT FileObject, IN ULONG EventCode) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + LPGUID Guid = NULL; + PDEVICE_OBJECT DeviceObject = NULL; + TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; + + Status = IoGetRelatedTargetDevice(FileObject, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = STATUS_INVALID_PARAMETER; + + Notification.Version = 1; + Notification.Size = sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION); + /* MSDN says that FileObject must be null + when calling IoReportTargetDeviceChangeAsynchronous */ + Notification.FileObject = NULL; + Notification.NameBufferOffset = -1; + /* Find the good GUID associated with the event */ + switch (EventCode) + { + case FSRTL_VOLUME_DISMOUNT: + { + Guid = (LPGUID)&GUID_IO_VOLUME_DISMOUNT; + break; + } + case FSRTL_VOLUME_DISMOUNT_FAILED: + { + Guid = (LPGUID)&GUID_IO_VOLUME_DISMOUNT_FAILED; + break; + } + case FSRTL_VOLUME_LOCK: + { + Guid = (LPGUID)&GUID_IO_VOLUME_LOCK; + break; + } + case FSRTL_VOLUME_LOCK_FAILED: + { + Guid = (LPGUID)&GUID_IO_VOLUME_LOCK_FAILED; + break; + } + case FSRTL_VOLUME_MOUNT: + { + Guid = (LPGUID)&GUID_IO_VOLUME_MOUNT; + break; + } + case FSRTL_VOLUME_UNLOCK: + { + Guid = (LPGUID)&GUID_IO_VOLUME_UNLOCK; + break; + } + } + if (Guid) + { + /* Copy GUID to notification structure and then report the change */ + RtlCopyMemory(&(Notification.Event), Guid, sizeof(GUID)); + + if (EventCode == FSRTL_VOLUME_MOUNT) + { + IoReportTargetDeviceChangeAsynchronous(DeviceObject, + &Notification, + NULL, + NULL); + } + else + { + IoReportTargetDeviceChange(DeviceObject, + &Notification); + } + + Status = STATUS_SUCCESS; + } + ObfDereferenceObject(DeviceObject); + + return Status; } Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -439,8 +439,26 @@ break; } - /* Unlock device and return */ + /* Unlock device */ KeReleaseMutex(&Vcb->Mutex, FALSE); + + /* In case of status change, notify */ + switch (IoStackLocation->Parameters.FileSystemControl.FsControlCode) + { + case FSCTL_LOCK_VOLUME: + FsRtlNotifyVolumeEvent(IoStackLocation->FileObject, (NT_SUCCESS(Status) ? FSRTL_VOLUME_LOCK : FSRTL_VOLUME_LOCK_FAILED)); + break; + case FSCTL_UNLOCK_VOLUME: + if (NT_SUCCESS(Status)) + { + FsRtlNotifyVolumeEvent(IoStackLocation->FileObject, FSRTL_VOLUME_UNLOCK); + } + break; + case FSCTL_DISMOUNT_VOLUME: + FsRtlNotifyVolumeEvent(IoStackLocation->FileObject, (NT_SUCCESS(Status) ? FSRTL_VOLUME_DISMOUNT : FSRTL_VOLUME_DISMOUNT_FAILED)); + break; + } + return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -5,6 +5,7 @@ * PURPOSE: Plug & Play notification functions * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) * Hervé Poussineau (hpoussin(a)reactos.org) + * Pierre Schweitzer */ /* INCLUDES ******************************************************************/ @@ -44,6 +45,7 @@ BOOLEAN CallCurrentEntry; UNICODE_STRING GuidString; NTSTATUS Status; + PDEVICE_OBJECT EntryDeviceObject = NULL; ASSERT(DeviceObject); @@ -101,20 +103,37 @@ } case EventCategoryTargetDeviceChange: { - PTARGET_DEVICE_REMOVAL_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - NotificationInfos->FileObject = (PFILE_OBJECT)EventCategoryData1; + if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) + { + PTARGET_DEVICE_REMOVAL_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + NotificationInfos->Version = 1; + NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); + RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); + NotificationInfos->FileObject = (PFILE_OBJECT)EventCategoryData1; + } + else + { + PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + RtlCopyMemory(NotificationInfos, EventCategoryData1, sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION)); + } break; } default: @@ -157,8 +176,23 @@ } case EventCategoryTargetDeviceChange: { - if (ChangeEntry->FileObject == (PFILE_OBJECT)EventCategoryData1) - CallCurrentEntry = TRUE; + if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) + { + if (ChangeEntry->FileObject == (PFILE_OBJECT)EventCategoryData1) + CallCurrentEntry = TRUE; + } + else + { + Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); + if (NT_SUCCESS(Status)) + { + if (DeviceObject == EntryDeviceObject) + { + ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + CallCurrentEntry = TRUE; + } + } + } } default: { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/io/pnpmgr/pnpreport.c * PURPOSE: Device Changes Reporting Functions * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + * Pierre Schweitzer */ /* INCLUDES ******************************************************************/ @@ -12,6 +13,17 @@ #define NDEBUG #include <debug.h> +/* TYPES *******************************************************************/ + +typedef struct _INTERNAL_WORK_QUEUE_ITEM +{ + WORK_QUEUE_ITEM WorkItem; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_CHANGE_COMPLETE_CALLBACK Callback; + PVOID Context; + PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure; +} INTERNAL_WORK_QUEUE_ITEM, *PINTERNAL_WORK_QUEUE_ITEM; + NTSTATUS NTAPI IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, @@ -27,8 +39,15 @@ PVOID Context); NTSTATUS -IopDetectResourceConflict( - IN PCM_RESOURCE_LIST ResourceList); +IopDetectResourceConflict(IN PCM_RESOURCE_LIST ResourceList); + +NTSTATUS +PpSetCustomTargetEvent(IN PDEVICE_OBJECT DeviceObject, + IN OUT PKEVENT SyncEvent OPTIONAL, + IN OUT PNTSTATUS SyncStatus OPTIONAL, + IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback OPTIONAL, + IN PVOID Context OPTIONAL, + IN PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure); /* PRIVATE FUNCTIONS *********************************************************/ @@ -89,6 +108,37 @@ DPRINT1("Invalid bus type: %d\n", IfType); return NULL; } +} + +VOID +IopReportTargetDeviceChangeAsyncWorker(PVOID Context) +{ + PINTERNAL_WORK_QUEUE_ITEM Item; + + Item = (PINTERNAL_WORK_QUEUE_ITEM)Context; + PpSetCustomTargetEvent(Item->PhysicalDeviceObject, NULL, NULL, Item->Callback, Item->Context, Item->NotificationStructure); + ObDereferenceObject(Item->PhysicalDeviceObject); + ExFreePoolWithTag(Context, ' pP'); +} + +NTSTATUS +PpSetCustomTargetEvent(IN PDEVICE_OBJECT DeviceObject, + IN OUT PKEVENT SyncEvent OPTIONAL, + IN OUT PNTSTATUS SyncStatus OPTIONAL, + IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback OPTIONAL, + IN PVOID Context OPTIONAL, + IN PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure) +{ + ASSERT(NotificationStructure != NULL); + ASSERT(DeviceObject != NULL); + + /* That call is totally wrong but notifications handler must be fixed first */ + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_PNP_CUSTOM_NOTIFICATION, + NotificationStructure, + NULL); + return STATUS_SUCCESS; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -343,19 +393,57 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoReportTargetDeviceChange(IN PDEVICE_OBJECT PhysicalDeviceObject, IN PVOID NotificationStructure) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KEVENT NotifyEvent; + NTSTATUS Status, NotifyStatus; + PTARGET_DEVICE_CUSTOM_NOTIFICATION notifyStruct = (PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure; + + ASSERT(notifyStruct); + + /* Check for valid PDO */ + if (!IopIsValidPhysicalDeviceObject(PhysicalDeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG)PhysicalDeviceObject, 0, 0); + } + + /* FileObject must be null. PnP will fill in it */ + ASSERT(notifyStruct->FileObject == NULL); + + /* Do not handle system PnP events */ + if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + if (notifyStruct->Version != 1) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* Initialize even that will let us know when PnP will have finished notify */ + KeInitializeEvent(&NotifyEvent, NotificationEvent, FALSE); + + Status = PpSetCustomTargetEvent(PhysicalDeviceObject, &NotifyEvent, &NotifyStatus, NULL, NULL, notifyStruct); + /* If no error, wait for the notify to end and return the status of the notify and not of the event */ + if (NT_SUCCESS(Status)) + { + KeWaitForSingleObject(&NotifyEvent, Executive, KernelMode, FALSE, NULL); + Status = NotifyStatus; + } + + return Status; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -364,6 +452,47 @@ IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback OPTIONAL, IN PVOID Context OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PINTERNAL_WORK_QUEUE_ITEM Item = NULL; + PTARGET_DEVICE_CUSTOM_NOTIFICATION notifyStruct = (PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure; + + ASSERT(notifyStruct); + + /* Check for valid PDO */ + if (!IopIsValidPhysicalDeviceObject(PhysicalDeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG)PhysicalDeviceObject, 0, 0); + } + + /* FileObject must be null. PnP will fill in it */ + ASSERT(notifyStruct->FileObject == NULL); + + /* Do not handle system PnP events */ + if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + if (notifyStruct->Version != 1) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* We need to store all the data given by the caller with the WorkItem, so use our own struct */ + Item = ExAllocatePoolWithTag(NonPagedPool, sizeof(INTERNAL_WORK_QUEUE_ITEM), ' pP'); + if (!Item) return STATUS_INSUFFICIENT_RESOURCES; + + /* Initialize all stuff */ + ObReferenceObject(PhysicalDeviceObject); + Item->NotificationStructure = notifyStruct; + Item->PhysicalDeviceObject = PhysicalDeviceObject; + Item->Callback = Callback; + Item->Context = Context; + ExInitializeWorkItem(&(Item->WorkItem), (PWORKER_THREAD_ROUTINE)IopReportTargetDeviceChangeAsyncWorker, Item); + + /* Finally, queue the item, our work here is done */ + ExQueueWorkItem(&(Item->WorkItem), DelayedWorkQueue); + + return STATUS_PENDING; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Jun 23 19:37:22 2010 @@ -30,6 +30,7 @@ <library>kdcom</library> <library>bootvid</library> <library>wdmguid</library> + <library>ioevent</library> <dependency>bugcodes</dependency> <directory name="include"> <pch>ntoskrnl.h</pch>

1 0

[tkreuzer] 47836: Rename a macro
by tkreuzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: tkreuzer Date: Wed Jun 23 19:24:07 2010 New Revision: 47836 URL: http://svn.reactos.org/svn/reactos?rev=47836&view=rev Log: Rename a macro Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec [iso-8859-1] Wed Jun 23 19:24:07 2010 @@ -1,13 +1,13 @@ #ifdef __x86_64__ -#define MAYBEFWD(x) +#define FORWARD(x) #else -#define MAYBEFWD(x) x +#define FORWARD(x) x #endif @ cdecl ScsiDebugPrint() @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger) +@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) FORWARD(NTOSKRNL.RtlConvertUlongToLargeInteger) @ stdcall ScsiPortFlushDma(ptr) @ stdcall ScsiPortFreeDeviceBase(ptr ptr) @ stdcall ScsiPortGetBusData(ptr long long long ptr long) @@ -22,30 +22,30 @@ @ stdcall ScsiPortLogError(ptr ptr long long long long long) @ stdcall ScsiPortMoveMemory(ptr ptr long) @ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT) -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG) -@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR) -@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT) -@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG) -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR) -@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT) -@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG) +@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) FORWARD(HAL.READ_PORT_BUFFER_UCHAR) +@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) FORWARD(HAL.READ_PORT_BUFFER_USHORT) +@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) FORWARD(HAL.READ_PORT_BUFFER_ULONG) +@ stdcall ScsiPortReadPortUchar(ptr) FORWARD(HAL.READ_PORT_UCHAR) +@ stdcall ScsiPortReadPortUshort(ptr) FORWARD(HAL.READ_PORT_USHORT) +@ stdcall ScsiPortReadPortUlong(ptr) FORWARD(HAL.READ_PORT_ULONG) +@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) FORWARD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) +@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) FORWARD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) +@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) FORWARD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) +@ stdcall ScsiPortReadRegisterUchar(ptr) FORWARD(NTOSKRNL.READ_REGISTER_UCHAR) +@ stdcall ScsiPortReadRegisterUshort(ptr) FORWARD(NTOSKRNL.READ_REGISTER_USHORT) +@ stdcall ScsiPortReadRegisterUlong(ptr) FORWARD(NTOSKRNL.READ_REGISTER_ULONG) @ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) @ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor @ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT) -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG) -@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR) -@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT) -@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG) -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR) -@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT) -@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG) +@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) FORWARD(HAL.WRITE_PORT_BUFFER_UCHAR) +@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) FORWARD(HAL.WRITE_PORT_BUFFER_USHORT) +@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) FORWARD(HAL.WRITE_PORT_BUFFER_ULONG) +@ stdcall ScsiPortWritePortUchar(ptr long) FORWARD(HAL.WRITE_PORT_UCHAR) +@ stdcall ScsiPortWritePortUshort(ptr long) FORWARD(HAL.WRITE_PORT_USHORT) +@ stdcall ScsiPortWritePortUlong(ptr long) FORWARD(HAL.WRITE_PORT_ULONG) +@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) +@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) +@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) +@ stdcall ScsiPortWriteRegisterUchar(ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_UCHAR) +@ stdcall ScsiPortWriteRegisterUshort(ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_USHORT) +@ stdcall ScsiPortWriteRegisterUlong(ptr long) FORWARD(NTOSKRNL.WRITE_REGISTER_ULONG)

1 0

[tkreuzer] 47835: Leftover from the recent syncs
by tkreuzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: tkreuzer Date: Wed Jun 23 19:08:31 2010 New Revision: 47835 URL: http://svn.reactos.org/svn/reactos?rev=47835&view=rev Log: Leftover from the recent syncs Added: branches/reactos-yarotows/base/applications/paint/paint.exe.amd64.manifest (with props) branches/reactos-yarotows/dll/win32/mshtml/ros_diff.patch (with props) Modified: branches/reactos-yarotows/base/shell/explorer/utility/window.cpp branches/reactos-yarotows/dll/win32/opengl32/opengl32.h branches/reactos-yarotows/include/dxsdk/bdatif.idl Added: branches/reactos-yarotows/base/applications/paint/paint.exe.amd64.manifest URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… ============================================================================== --- branches/reactos-yarotows/base/applications/paint/paint.exe.amd64.manifest (added) +++ branches/reactos-yarotows/base/applications/paint/paint.exe.amd64.manifest [iso-8859-1] Wed Jun 23 19:08:31 2010 @@ -1,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="DevCpp.Apps.Paint" + processorArchitecture="amd64" + version="1.0.0.0" + type="win32"/> +<description>Paint</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="amd64" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: branches/reactos-yarotows/base/applications/paint/paint.exe.amd64.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactos-yarotows/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/exp… ============================================================================== --- branches/reactos-yarotows/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ branches/reactos-yarotows/base/shell/explorer/utility/window.cpp [iso-8859-1] Wed Jun 23 19:08:31 2010 @@ -268,7 +268,7 @@ case WM_CREATE: return pThis->Init((LPCREATESTRUCT)lparam); - case WM_NCDESTROY: + case WM_NCDESTROY: delete pThis; return 0; Added: branches/reactos-yarotows/dll/win32/mshtml/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msht… ============================================================================== --- branches/reactos-yarotows/dll/win32/mshtml/ros_diff.patch (added) +++ branches/reactos-yarotows/dll/win32/mshtml/ros_diff.patch [iso-8859-1] Wed Jun 23 19:08:31 2010 @@ -1,0 +1,43 @@ +--- C:/Users/CHRIST~1/AppData/Local/Temp/install.-rev47414.svn001.tmp.c Sa Mai 29 16:46:40 2010 ++++ C:/Users/Christoph/Desktop/Projekte/ReactOS/dll/win32/mshtml/install.c Sa Mai 29 16:43:49 2010 +@@ -60,6 +60,11 @@ + '\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + ++static const CHAR mshtml_keyA[] = ++ {'S','o','f','t','w','a','r','e', ++ '\\','W','i','n','e', ++ '\\','M','S','H','T','M','L',0}; ++ + static HWND install_dialog = NULL; + static LPWSTR tmp_file_name = NULL; + static HANDLE tmp_file = INVALID_HANDLE_VALUE; +@@ -225,23 +230,18 @@ + static BOOL install_from_registered_dir(void) + { + char *file_name; +- HKEY hkey; + DWORD res, type, size = MAX_PATH; + BOOL ret; + ++ file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ +- res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); +- if(res != ERROR_SUCCESS) +- return FALSE; +- +- file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); +- res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); ++ res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + if(res == ERROR_MORE_DATA) { + file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); +- res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); ++ res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + } +- RegCloseKey(hkey); +- if(res != ERROR_SUCCESS || type != REG_SZ) { ++ ++ if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { + heap_free(file_name); + return FALSE; + } Propchange: branches/reactos-yarotows/dll/win32/mshtml/ros_diff.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactos-yarotows/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… ============================================================================== --- branches/reactos-yarotows/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/opengl32/opengl32.h [iso-8859-1] Wed Jun 23 19:08:31 2010 @@ -191,7 +191,6 @@ GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver ); BOOL OPENGL32_UnloadICD( GLDRIVERDATA *icd ); BOOL APIENTRY rosglMakeCurrent( HDC hdc, HGLRC hglrc ); -int APIENTRY rosglGetPixelFormat( HDC ); BOOL APIENTRY IntUseFontBitmapsA( HDC hDC, DWORD first, DWORD count, DWORD listBase ); BOOL APIENTRY IntUseFontBitmapsW( HDC hDC, DWORD first, DWORD count, DWORD listBase ); BOOL APIENTRY IntUseFontOutlinesA( HDC hDC, DWORD first, DWORD count, DWORD listBase, Modified: branches/reactos-yarotows/include/dxsdk/bdatif.idl URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/dxsdk/… ============================================================================== --- branches/reactos-yarotows/include/dxsdk/bdatif.idl [iso-8859-1] (original) +++ branches/reactos-yarotows/include/dxsdk/bdatif.idl [iso-8859-1] Wed Jun 23 19:08:31 2010 @@ -1,270 +1,270 @@ -#ifndef DO_NO_IMPORTS -import "unknwn.idl"; -import "strmif.idl"; -import "tuner.idl"; -import "bdaiface.idl"; -#endif - -interface IMPEG2_TIF_CONTROL; -interface IATSCChannelInfo; -interface IMPEG2PIDMap; - -[ - object, - uuid(DFEF4A68-EE61-415f-9CCB-CD95F2F98A3A), - pointer_default(unique) -] -interface IBDA_TIF_REGISTRATION : IUnknown -{ - HRESULT - RegisterTIFEx( - [in] IPin * pTIFInputPin, - [in, out] ULONG * ppvRegistrationContext, - [in, out] IUnknown ** ppMpeg2DataControl); - - HRESULT - UnregisterTIF( - [in] ULONG pvRegistrationContext); -} - -[ - object, - uuid(F9BAC2F9-4149-4916-B2EF-FAA202326862), - pointer_default(unique) -] -interface IMPEG2_TIF_CONTROL : IUnknown -{ - HRESULT - RegisterTIF( - [in] IUnknown * pUnkTIF, - [in, out] ULONG * ppvRegistrationContext); - - HRESULT - UnregisterTIF( - [in] ULONG pvRegistrationContext); - - HRESULT - AddPIDs( - [in] ULONG ulcPIDs, - [in] ULONG * pulPIDs); - - HRESULT - DeletePIDs( - [in] ULONG ulcPIDs, - [in] ULONG * pulPIDs); - - HRESULT - GetPIDCount( - [out] ULONG * pulcPIDs); - - HRESULT - GetPIDs( - [out] ULONG * pulcPIDs, - [out] ULONG * pulPIDs); -} - -[ - object, - uuid(A3B152DF-7A90-4218-AC54-9830BEE8C0B6), - pointer_default(unique) -] -interface ITuneRequestInfo : IUnknown -{ - HRESULT - GetLocatorData( - [in] ITuneRequest *Request); - - HRESULT - GetComponentData( - [in] ITuneRequest *CurrentRequest); - - HRESULT - CreateComponentList( - [in] ITuneRequest *CurrentRequest); - - HRESULT - GetNextProgram ( - [in] ITuneRequest *CurrentRequest, - [out, retval] ITuneRequest **TuneRequest); - - HRESULT - GetPreviousProgram( - [in] ITuneRequest *CurrentRequest, - [out, retval] ITuneRequest **TuneRequest); - - HRESULT - GetNextLocator( - [in] ITuneRequest *CurrentRequest, - [out, retval] ITuneRequest **TuneRequest); - - HRESULT - GetPreviousLocator( - [in] ITuneRequest *CurrentRequest, - [out, retval] ITuneRequest **TuneRequest); -} - -[ - object, - uuid(EFDA0C80-F395-42c3-9B3C-56B37DEC7BB7), - pointer_default(unique) -] -interface IGuideDataEvent : IUnknown -{ - HRESULT - GuideDataAcquired(); - - HRESULT ProgramChanged( - [in] VARIANT varProgramDescriptionID); - - HRESULT ServiceChanged( - [in] VARIANT varServiceDescriptionID); - - HRESULT ScheduleEntryChanged( - [in] VARIANT varScheduleEntryDescriptionID); - - HRESULT ProgramDeleted( - [in] VARIANT varProgramDescriptionID); - - HRESULT ServiceDeleted( - [in] VARIANT varServiceDescriptionID); - - HRESULT ScheduleDeleted( - [in] VARIANT varScheduleEntryDescriptionID); -} - -[ - object, - uuid(88EC5E58-BB73-41d6-99CE-66C524B8B591), - pointer_default(unique) -] -interface IGuideDataProperty : IUnknown -{ - HRESULT - get_Name( - [out] BSTR *pbstrName); - - HRESULT - get_Language( - [out] long *idLang); - - HRESULT - get_Value( - [out] VARIANT *pvar); -} - -[ - object, - uuid(AE44423B-4571-475c-AD2C-F40A771D80EF), - pointer_default(unique) -] -interface IEnumGuideDataProperties : IUnknown -{ - HRESULT - Next( - [in] unsigned long celt, - [out] IGuideDataProperty **ppprop, - [out] unsigned long *pcelt); - - HRESULT - Skip( - [in] unsigned long celt); - - HRESULT - Reset(); - - HRESULT - Clone( - [out] IEnumGuideDataProperties **ppenum); -} - -[ - object, - uuid(1993299C-CED6-4788-87A3-420067DCE0C7), - pointer_default(unique) -] -interface IEnumTuneRequests : IUnknown -{ - HRESULT - Next( - [in] unsigned long celt, - [out] ITuneRequest **ppprop, - [out] unsigned long *pcelt); - - HRESULT - Skip( - [in] unsigned long celt); - - HRESULT - Reset(); - - HRESULT - Clone( - [out] IEnumTuneRequests **ppenum); -} - -[ - object, - uuid(61571138-5B01-43cd-AEAF-60B784A0BF93), - pointer_default(unique) -] -interface IGuideData : IUnknown -{ - HRESULT - GetServices( - [out, retval] IEnumTuneRequests ** ppEnumTuneRequests); - - HRESULT - GetServiceProperties( - [in] ITuneRequest * pTuneRequest, - [out, retval] IEnumGuideDataProperties ** ppEnumProperties); - - HRESULT - GetGuideProgramIDs( - [out, retval] IEnumVARIANT ** pEnumPrograms); - - HRESULT - GetProgramProperties( - [in] VARIANT varProgramDescriptionID, - [out, retval] IEnumGuideDataProperties ** ppEnumProperties); - - HRESULT - GetScheduleEntryIDs( - [out, retval] IEnumVARIANT ** pEnumScheduleEntries); - - HRESULT - GetScheduleEntryProperties( - [in] VARIANT varScheduleEntryDescriptionID, - [out, retval] IEnumGuideDataProperties ** ppEnumProperties); -} - -[ - object, - uuid(4764ff7c-fa95-4525-af4d-d32236db9e38), - pointer_default(unique) -] -interface IGuideDataLoader : IUnknown -{ - HRESULT Init([in] IGuideData *pGuideStore); - HRESULT Terminate(); -}; - -[ - uuid(8224A083-7F8C-432D-B83E-3C5E9BDE3528), - version(1.0), -] -library PSISLOADLib -{ - importlib("stdole32.tlb"); - importlib("stdole2.tlb"); - - [ - uuid(14EB8748-1753-4393-95AE-4F7E7A87AAD6), - helpstring("TIFLoad Class") - ] - coclass TIFLoad - { - interface IGuideDataLoader; - interface IGuideDataEvent; - }; -}; - +#ifndef DO_NO_IMPORTS +import "unknwn.idl"; +import "strmif.idl"; +import "tuner.idl"; +import "bdaiface.idl"; +#endif + +interface IMPEG2_TIF_CONTROL; +interface IATSCChannelInfo; +interface IMPEG2PIDMap; + +[ + object, + uuid(DFEF4A68-EE61-415f-9CCB-CD95F2F98A3A), + pointer_default(unique) +] +interface IBDA_TIF_REGISTRATION : IUnknown +{ + HRESULT + RegisterTIFEx( + [in] IPin * pTIFInputPin, + [in, out] ULONG * ppvRegistrationContext, + [in, out] IUnknown ** ppMpeg2DataControl); + + HRESULT + UnregisterTIF( + [in] ULONG pvRegistrationContext); +} + +[ + object, + uuid(F9BAC2F9-4149-4916-B2EF-FAA202326862), + pointer_default(unique) +] +interface IMPEG2_TIF_CONTROL : IUnknown +{ + HRESULT + RegisterTIF( + [in] IUnknown * pUnkTIF, + [in, out] ULONG * ppvRegistrationContext); + + HRESULT + UnregisterTIF( + [in] ULONG pvRegistrationContext); + + HRESULT + AddPIDs( + [in] ULONG ulcPIDs, + [in] ULONG * pulPIDs); + + HRESULT + DeletePIDs( + [in] ULONG ulcPIDs, + [in] ULONG * pulPIDs); + + HRESULT + GetPIDCount( + [out] ULONG * pulcPIDs); + + HRESULT + GetPIDs( + [out] ULONG * pulcPIDs, + [out] ULONG * pulPIDs); +} + +[ + object, + uuid(A3B152DF-7A90-4218-AC54-9830BEE8C0B6), + pointer_default(unique) +] +interface ITuneRequestInfo : IUnknown +{ + HRESULT + GetLocatorData( + [in] ITuneRequest *Request); + + HRESULT + GetComponentData( + [in] ITuneRequest *CurrentRequest); + + HRESULT + CreateComponentList( + [in] ITuneRequest *CurrentRequest); + + HRESULT + GetNextProgram ( + [in] ITuneRequest *CurrentRequest, + [out, retval] ITuneRequest **TuneRequest); + + HRESULT + GetPreviousProgram( + [in] ITuneRequest *CurrentRequest, + [out, retval] ITuneRequest **TuneRequest); + + HRESULT + GetNextLocator( + [in] ITuneRequest *CurrentRequest, + [out, retval] ITuneRequest **TuneRequest); + + HRESULT + GetPreviousLocator( + [in] ITuneRequest *CurrentRequest, + [out, retval] ITuneRequest **TuneRequest); +} + +[ + object, + uuid(EFDA0C80-F395-42c3-9B3C-56B37DEC7BB7), + pointer_default(unique) +] +interface IGuideDataEvent : IUnknown +{ + HRESULT + GuideDataAcquired(); + + HRESULT ProgramChanged( + [in] VARIANT varProgramDescriptionID); + + HRESULT ServiceChanged( + [in] VARIANT varServiceDescriptionID); + + HRESULT ScheduleEntryChanged( + [in] VARIANT varScheduleEntryDescriptionID); + + HRESULT ProgramDeleted( + [in] VARIANT varProgramDescriptionID); + + HRESULT ServiceDeleted( + [in] VARIANT varServiceDescriptionID); + + HRESULT ScheduleDeleted( + [in] VARIANT varScheduleEntryDescriptionID); +} + +[ + object, + uuid(88EC5E58-BB73-41d6-99CE-66C524B8B591), + pointer_default(unique) +] +interface IGuideDataProperty : IUnknown +{ + HRESULT + get_Name( + [out] BSTR *pbstrName); + + HRESULT + get_Language( + [out] long *idLang); + + HRESULT + get_Value( + [out] VARIANT *pvar); +} + +[ + object, + uuid(AE44423B-4571-475c-AD2C-F40A771D80EF), + pointer_default(unique) +] +interface IEnumGuideDataProperties : IUnknown +{ + HRESULT + Next( + [in] unsigned long celt, + [out] IGuideDataProperty **ppprop, + [out] unsigned long *pcelt); + + HRESULT + Skip( + [in] unsigned long celt); + + HRESULT + Reset(); + + HRESULT + Clone( + [out] IEnumGuideDataProperties **ppenum); +} + +[ + object, + uuid(1993299C-CED6-4788-87A3-420067DCE0C7), + pointer_default(unique) +] +interface IEnumTuneRequests : IUnknown +{ + HRESULT + Next( + [in] unsigned long celt, + [out] ITuneRequest **ppprop, + [out] unsigned long *pcelt); + + HRESULT + Skip( + [in] unsigned long celt); + + HRESULT + Reset(); + + HRESULT + Clone( + [out] IEnumTuneRequests **ppenum); +} + +[ + object, + uuid(61571138-5B01-43cd-AEAF-60B784A0BF93), + pointer_default(unique) +] +interface IGuideData : IUnknown +{ + HRESULT + GetServices( + [out, retval] IEnumTuneRequests ** ppEnumTuneRequests); + + HRESULT + GetServiceProperties( + [in] ITuneRequest * pTuneRequest, + [out, retval] IEnumGuideDataProperties ** ppEnumProperties); + + HRESULT + GetGuideProgramIDs( + [out, retval] IEnumVARIANT ** pEnumPrograms); + + HRESULT + GetProgramProperties( + [in] VARIANT varProgramDescriptionID, + [out, retval] IEnumGuideDataProperties ** ppEnumProperties); + + HRESULT + GetScheduleEntryIDs( + [out, retval] IEnumVARIANT ** pEnumScheduleEntries); + + HRESULT + GetScheduleEntryProperties( + [in] VARIANT varScheduleEntryDescriptionID, + [out, retval] IEnumGuideDataProperties ** ppEnumProperties); +} + +[ + object, + uuid(4764ff7c-fa95-4525-af4d-d32236db9e38), + pointer_default(unique) +] +interface IGuideDataLoader : IUnknown +{ + HRESULT Init([in] IGuideData *pGuideStore); + HRESULT Terminate(); +}; + +[ + uuid(8224A083-7F8C-432D-B83E-3C5E9BDE3528), + version(1.0), +] +library PSISLOADLib +{ + importlib("stdole32.tlb"); + importlib("stdole2.tlb"); + + [ + uuid(14EB8748-1753-4393-95AE-4F7E7A87AAD6), + helpstring("TIFLoad Class") + ] + coclass TIFLoad + { + interface IGuideDataLoader; + interface IGuideDataEvent; + }; +}; +

1 0

[spetreolle] 47834: Add leftover from sync, fixes build.
by spetreolle＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: spetreolle Date: Wed Jun 23 17:46:22 2010 New Revision: 47834 URL: http://svn.reactos.org/svn/reactos?rev=47834&view=rev Log: Add leftover from sync, fixes build. Added: branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc (props changed) - copied unchanged from r47833, trunk/reactos/dll/win32/jscript/jscript_Si.rc Propchange: branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jun 23 17:46:22 2010 @@ -1,0 +1,4 @@ +/branches/header-work/dll/win32/jscript/jscript_Si.rc:45691-47721 +/branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc:46848,46966,47800 +/branches/ros-amd64-bringup/dll/win32/jscript/jscript_Si.rc:36852 +/branches/ros-amd64-bringup/reactos/dll/win32/jscript/jscript_Si.rc:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805

1 0

[tkreuzer] 47833: Sync to trunk (r47832)
by tkreuzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: tkreuzer Date: Wed Jun 23 16:21:41 2010 New Revision: 47833 URL: http://svn.reactos.org/svn/reactos?rev=47833&view=rev Log: Sync to trunk (r47832) Added: branches/reactos-yarotows/base/applications/rapps/rapps/abiword28x.txt (with props) branches/reactos-yarotows/base/applications/rapps/rapps/comctl32ocx.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt branches/reactos-yarotows/base/applications/rapps/rapps/firefox36.txt (with props) branches/reactos-yarotows/base/applications/rapps/rapps/kdewin.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/kdewin.txt branches/reactos-yarotows/base/applications/rapps/rapps/mono2.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/mono2.txt branches/reactos-yarotows/base/applications/rapps/rapps/mpc.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/mpc.txt branches/reactos-yarotows/base/applications/rapps/rapps/net11.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/net11.txt branches/reactos-yarotows/base/applications/rapps/rapps/net20.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/net20.txt branches/reactos-yarotows/base/applications/rapps/rapps/net20sp2.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/net20sp2.txt branches/reactos-yarotows/base/applications/rapps/rapps/opera9.txt (with props) branches/reactos-yarotows/base/applications/rapps/rapps/python.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/python.txt branches/reactos-yarotows/base/applications/rapps/rapps/steam.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/steam.txt branches/reactos-yarotows/base/applications/rapps/rapps/tahoma.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/tahoma.txt branches/reactos-yarotows/base/applications/rapps/rapps/wme9.txt - copied unchanged from r47832, trunk/reactos/base/applications/rapps/rapps/wme9.txt branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.spec - copied unchanged from r47832, trunk/reactos/dll/win32/msvcrt/msvcrt.spec branches/reactos-yarotows/dll/win32/netevent/ (props changed) - copied from r47832, trunk/reactos/dll/win32/netevent/ branches/reactos-yarotows/dll/win32/odbc32/odbc32_ros.diff - copied unchanged from r47832, trunk/reactos/dll/win32/odbc32/odbc32_ros.diff branches/reactos-yarotows/include/reactos/mc/netevent.mc - copied unchanged from r47832, trunk/reactos/include/reactos/mc/netevent.mc Removed: branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.def Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/rapps/rapps/7zip.txt branches/reactos-yarotows/base/applications/rapps/rapps/abiword.txt branches/reactos-yarotows/base/applications/rapps/rapps/abyss.txt branches/reactos-yarotows/base/applications/rapps/rapps/ac97forvirtualbox.txt branches/reactos-yarotows/base/applications/rapps/rapps/audiograbber.txt branches/reactos-yarotows/base/applications/rapps/rapps/diablo2.txt branches/reactos-yarotows/base/applications/rapps/rapps/dosblaster.txt branches/reactos-yarotows/base/applications/rapps/rapps/dosbox.txt branches/reactos-yarotows/base/applications/rapps/rapps/firefox2.txt branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt branches/reactos-yarotows/base/applications/rapps/rapps/freebasic.txt branches/reactos-yarotows/base/applications/rapps/rapps/glidewrapzbag.txt branches/reactos-yarotows/base/applications/rapps/rapps/irfanview.txt branches/reactos-yarotows/base/applications/rapps/rapps/irfanviewplugins.txt branches/reactos-yarotows/base/applications/rapps/rapps/lbreakout2.txt branches/reactos-yarotows/base/applications/rapps/rapps/lgeneral.txt branches/reactos-yarotows/base/applications/rapps/rapps/lmarbles.txt branches/reactos-yarotows/base/applications/rapps/rapps/mfc40.txt branches/reactos-yarotows/base/applications/rapps/rapps/mingw.txt branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt branches/reactos-yarotows/base/applications/rapps/rapps/mirc.txt branches/reactos-yarotows/base/applications/rapps/rapps/msxml3.txt branches/reactos-yarotows/base/applications/rapps/rapps/offbyone.txt branches/reactos-yarotows/base/applications/rapps/rapps/openoffice2.4.txt branches/reactos-yarotows/base/applications/rapps/rapps/openoffice3.0.txt branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt branches/reactos-yarotows/base/applications/rapps/rapps/putty.txt branches/reactos-yarotows/base/applications/rapps/rapps/remood.txt branches/reactos-yarotows/base/applications/rapps/rapps/rosbe.txt branches/reactos-yarotows/base/applications/rapps/rapps/rosbeamd64.txt branches/reactos-yarotows/base/applications/rapps/rapps/rosbearm.txt branches/reactos-yarotows/base/applications/rapps/rapps/sambatng.txt branches/reactos-yarotows/base/applications/rapps/rapps/scite.txt branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt branches/reactos-yarotows/base/applications/rapps/rapps/sdl_mixer.txt branches/reactos-yarotows/base/applications/rapps/rapps/sdl_runtime.txt branches/reactos-yarotows/base/applications/rapps/rapps/seamonkey.txt branches/reactos-yarotows/base/applications/rapps/rapps/smplayer.txt branches/reactos-yarotows/base/applications/rapps/rapps/thunderbird.txt branches/reactos-yarotows/base/applications/rapps/rapps/tileworld.txt branches/reactos-yarotows/base/applications/rapps/rapps/tuxpaint.txt branches/reactos-yarotows/base/applications/rapps/rapps/ultravnc.txt branches/reactos-yarotows/base/applications/rapps/rapps/utorrent.txt branches/reactos-yarotows/base/applications/rapps/rapps/vb5run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vb6run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vc2005run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vc2005sp1run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vc2008run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vc6run.txt branches/reactos-yarotows/base/applications/rapps/rapps/vlc.txt branches/reactos-yarotows/base/applications/rapps/rapps/winboard.txt branches/reactos-yarotows/baseaddress.rbuild branches/reactos-yarotows/boot/bootdata/packages/reactos.dff branches/reactos-yarotows/dll/3rdparty/mesa32/mesa32.rbuild branches/reactos-yarotows/dll/win32/msafd/misc/dllmain.c branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.rbuild branches/reactos-yarotows/dll/win32/odbc32/odbc32.rbuild branches/reactos-yarotows/dll/win32/odbc32/odbc32.spec branches/reactos-yarotows/dll/win32/odbc32/proxyodbc.c branches/reactos-yarotows/dll/win32/odbc32/proxyodbc.h branches/reactos-yarotows/dll/win32/win32.rbuild branches/reactos-yarotows/drivers/network/ndis/ndis/time.c branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/api.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/connection.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interrupt.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/resource.cpp branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/dispatcher.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h branches/reactos-yarotows/include/reactos/mc/mc.rbuild branches/reactos-yarotows/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h branches/reactos-yarotows/lib/sdk/crt/crt.rbuild branches/reactos-yarotows/lib/sdk/crt/float/i386/cntrlfp.c branches/reactos-yarotows/lib/sdk/crt/math/rand.c branches/reactos-yarotows/lib/sdk/crt/misc/stubs.c branches/reactos-yarotows/lib/sdk/crt/stdlib/errno.c branches/reactos-yarotows/lib/sdk/crt/wine/heap.c branches/reactos-yarotows/ntoskrnl/fstub/disksup.c branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h branches/reactos-yarotows/ntoskrnl/include/internal/io.h branches/reactos-yarotows/ntoskrnl/io/iomgr/deviface.c branches/reactos-yarotows/ntoskrnl/io/pnpmgr/pnpmgr.c branches/reactos-yarotows/ntoskrnl/io/pnpmgr/pnpres.c branches/reactos-yarotows/ntoskrnl/mm/freelist.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ (props changed) branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Added: branches/reactos-yarotows/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Added: branches/reactos-yarotows/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Added: branches/reactos-yarotows/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/baseaddress.rb… Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/m… Modified: branches/reactos-yarotows/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msaf… Removed: branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msvc… Modified: branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msvc… Modified: branches/reactos-yarotows/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/odbc… Modified: branches/reactos-yarotows/dll/win32/odbc32/odbc32.spec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/odbc… Modified: branches/reactos-yarotows/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/odbc… Modified: branches/reactos-yarotows/dll/win32/odbc32/proxyodbc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/odbc… Modified: branches/reactos-yarotows/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/win3… Modified: branches/reactos-yarotows/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/api.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/drivers/os… Modified: branches/reactos-yarotows/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/cr… Modified: branches/reactos-yarotows/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/fl… Modified: branches/reactos-yarotows/lib/sdk/crt/math/rand.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/ma… Modified: branches/reactos-yarotows/lib/sdk/crt/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/mi… Modified: branches/reactos-yarotows/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/st… Modified: branches/reactos-yarotows/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/wi… Modified: branches/reactos-yarotows/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/fstub… Modified: branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… Modified: branches/reactos-yarotows/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… Modified: branches/reactos-yarotows/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/io/io… Modified: branches/reactos-yarotows/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/io/pn… Modified: branches/reactos-yarotows/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/io/pn… Modified: branches/reactos-yarotows/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/fr… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

1 0

[tkreuzer] 47832: [PRIMITIVES] - use pointer sized integers when converting handles
by tkreuzer＠svn.reactos.org 23 Jun '10

23 Jun '10

Author: tkreuzer Date: Wed Jun 23 12:40:55 2010 New Revision: 47832 URL: http://svn.reactos.org/svn/reactos?rev=47832&view=rev Log: [PRIMITIVES] - use pointer sized integers when converting handles Modified: trunk/rostests/tests/primitives/primitives.cpp Modified: trunk/rostests/tests/primitives/primitives.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/primitives/primitiv… ============================================================================== --- trunk/rostests/tests/primitives/primitives.cpp [iso-8859-1] (original) +++ trunk/rostests/tests/primitives/primitives.cpp [iso-8859-1] Wed Jun 23 12:40:55 2010 @@ -186,8 +186,8 @@ ); assert(hListBox != NULL); - SetWindowLong( - hListBox, GWL_ID, reinterpret_cast<LONG>(hListBox) + SetWindowLongPtr( + hListBox, GWL_ID, reinterpret_cast<LONG_PTR>(hListBox) ); SNDMSG(hListBox, LB_ADDSTRING, 0, @@ -238,7 +238,7 @@ reinterpret_cast<LPMEASUREITEMSTRUCT>(lParam); assert(lpmis != NULL); - if (lpmis->CtlID == reinterpret_cast<UINT>(hListBox)) + if (lpmis->CtlID == reinterpret_cast<UINT_PTR>(hListBox)) { lpmis->itemHeight = 150; return TRUE; @@ -251,7 +251,7 @@ reinterpret_cast<LPDRAWITEMSTRUCT>(lParam); assert(lpdis != NULL); - if (lpdis->CtlID == reinterpret_cast<UINT>(hListBox)) + if (lpdis->CtlID == reinterpret_cast<UINT_PTR>(hListBox)) { SaveDC(lpdis->hDC); #if 0

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs