Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[tkreuzer] 47846: [UNIATA] Remove all the byteswap "optimisations" and use portable RTL byteswap functions
by tkreuzer＠svn.reactos.org 25 Jun '10

25 Jun '10

Author: tkreuzer Date: Fri Jun 25 23:58:57 2010 New Revision: 47846 URL: http://svn.reactos.org/svn/reactos?rev=47846&view=rev Log: [UNIATA] Remove all the byteswap "optimisations" and use portable RTL byteswap functions Removed: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/inc/misc.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/tools.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] Fri Jun 25 23:58:57 2010 @@ -1,132 +1,10 @@ #ifndef __CROSSNT_MISC__H__ #define __CROSSNT_MISC__H__ -#if defined(_M_X86_) -extern "C" -void -__fastcall -_MOV_DD_SWP( - void* a, // ECX - void* b // EDX - ); - -#define MOV_DD_SWP(a,b) _MOV_DD_SWP(&(a),&(b)) - -/********************/ - -extern "C" -void -__fastcall -_MOV_DW_SWP( - void* a, // ECX - void* b // EDX - ); - -#define MOV_DW_SWP(a,b) _MOV_DW_SWP(&(a),&(b)) - -/********************/ - -typedef void -(__fastcall *ptrREVERSE_DD)( - void* a // ECX - ); -extern "C" ptrREVERSE_DD _REVERSE_DD; - -void -__fastcall -_REVERSE_DD_i486( - void* a // ECX - ); - -void -__fastcall -_REVERSE_DD_i386( - void* a // ECX - ); -#define REVERSE_DD(a,b) _REVERSE_DD(&(a),&(b)) - -/********************/ - -extern "C" -void -__fastcall -_REVERSE_DW( - void* a // ECX - ); - -#define REVERSE_DW(a) _REVERSE_DW(&(a)) - -/********************/ - -extern "C" -void -__fastcall -_MOV_DW2DD_SWP( - void* a, // ECX - void* b // EDX - ); - -#define MOV_DW2DD_SWP(a,b) _MOV_DW2DD_SWP(&(a),&(b)) - -/********************/ - -extern "C" -void -__fastcall -_MOV_SWP_DW2DD( - void* a, // ECX - void* b // EDX - ); - -#define MOV_SWP_DW2DD(a,b) _MOV_SWP_DW2DD(&(a),&(b)) - -/********************/ - -extern "C" -void -__fastcall -_MOV_MSF( - void* a, // ECX - void* b // EDX - ); -#define MOV_MSF(a,b) _MOV_MSF(&(a),&(b)) - -/********************/ - -typedef void -(__fastcall *ptrMOV_MSF_SWP)( - void* a, // ECX - void* b // EDX - ); -extern "C" ptrMOV_MSF_SWP _MOV_MSF_SWP; - -extern "C" -void -__fastcall -_MOV_MSF_SWP_i486( - void* a, // ECX - void* b // EDX - ); - -extern "C" -void -__fastcall -_MOV_MSF_SWP_i386( - void* a, // ECX - void* b // EDX - ); -#define MOV_MSF_SWP(a,b) _MOV_MSF_SWP(&(a),&(b)) - -/********************/ - -extern "C" -void -__fastcall -_XCHG_DD( - void* a, // ECX - void* b // EDX - ); -#define XCHG_DD(a,b) _XCHG_DD(&(a),&(b)) -#endif +/* The definitions look so crappy, because the code doesn't care + whether the source is an array or an integer */ +#define MOV_DD_SWP(a,b) ((a) = RtlUlongByteSwap(*(PULONG)&(b))) +#define MOV_DW_SWP(a,b) ((a) = RtlUshortByteSwap(*(PULONG)&(b))) +#define MOV_SWP_DW2DD(a,b) ((a) = RtlUshortByteSwap(*(PULONG)&(b))) #endif // __CROSSNT_MISC__H__ Removed: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s (removed) @@ -1,30 +1,0 @@ -.intel_syntax noprefix - -.globl @_MOV_DD_SWP@8 -.globl @_MOV_DW_SWP@8 -.globl @_MOV_SWP_DW2DD@8 - -.func @_MOV_DD_SWP@8, @_MOV_DD_SWP@8 -@_MOV_DD_SWP@8: - mov eax,[edx] - bswap eax - mov [ecx],eax - ret -.endfunc - -.func @_MOV_DW_SWP@8, @_MOV_DW_SWP@8 -@_MOV_DW_SWP@8: - mov ax,[edx] - rol ax,8 - mov [ecx],ax - ret -.endfunc - -.func @_MOV_SWP_DW2DD@8, @_MOV_SWP_DW2DD@8 -@_MOV_SWP_DW2DD@8: - xor eax,eax - mov ax,[edx] - rol ax,8 - mov [ecx],eax - ret -.endfunc Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/tools.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/tools.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/tools.h [iso-8859-1] Fri Jun 25 23:58:57 2010 @@ -94,9 +94,9 @@ } #define DEC_TO_BCD(x) (((x / 10) << 4) + (x % 10)) - - -#if defined(_M_X86_) && defined(_MSC_VER) +/* + +#if defined _X86_ && !defined(__GNUC__) #define MOV_DD_SWP(a,b) \ { \ @@ -203,7 +203,7 @@ __asm mov [ebx],eax \ } -#elif !defined(_M_X86_) // NO X86 optimization , use generic C/C++ +#else // NO X86 optimization , use generic C/C++ #define MOV_DD_SWP(a,b) \ { \ @@ -246,17 +246,6 @@ _to_->Byte2 = _from_->Byte1; \ _to_->Byte3 = _from_->Byte0; \ } - -#define MOV_SWP_DW2DD(a,b) \ -{ \ - PFOUR_BYTE _from_, _to_; \ - _from_ = ((PFOUR_BYTE)&(b)); \ - _to_ = ((PFOUR_BYTE)&(a)); \ - *((PUSHORT)_to_) = 0; \ - _to_->Byte0 = _from_->Byte1; \ - _to_->Byte1 = _from_->Byte0; \ -} - #define MOV_MSF(a,b) \ { \ @@ -293,7 +282,7 @@ #define MOV_3B_SWP(a,b) MOV_MSF_SWP(a,b) - +*/ #ifdef DBG Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Fri Jun 25 23:58:57 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys" allowwarnings="true"> +<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> @@ -23,8 +23,5 @@ <directory name="ros_glue"> <file>ros_glue.cpp</file> - <if property="ARCH" value="i386"> - <file>ros_glue_asm.s</file> - </if> </directory> </module>

1 0

[mjmartin] 47845: [usbehci] - Use the correct offset of ROOTHUB2_CONFIGURATION_DESCRIPTOR and ROOTHUB2_INTERFACE_DESCRIPTOR to calculate needed buffer sizes. Fixes a buffer overflow crash.
by mjmartin＠svn.reactos.org 25 Jun '10

25 Jun '10

Author: mjmartin Date: Fri Jun 25 15:50:26 2010 New Revision: 47845 URL: http://svn.reactos.org/svn/reactos?rev=47845&view=rev Log: [usbehci] - Use the correct offset of ROOTHUB2_CONFIGURATION_DESCRIPTOR and ROOTHUB2_INTERFACE_DESCRIPTOR to calculate needed buffer sizes. Fixes a buffer overflow crash. Modified: trunk/reactos/drivers/usb/usbehci/pdo.c Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Fri Jun 25 15:50:26 2010 @@ -394,11 +394,11 @@ USB_POOL_TAG); RootHubDevice->Configs[0] = ExAllocatePoolWithTag(NonPagedPool, - sizeof(USB_CONFIGURATION) + sizeof(PVOID) * ROOTHUB2_CONFIGURATION_DESCRIPTOR[5], + sizeof(USB_CONFIGURATION) + sizeof(PVOID) * ROOTHUB2_CONFIGURATION_DESCRIPTOR[4], USB_POOL_TAG); RootHubDevice->Configs[0]->Interfaces[0] = ExAllocatePoolWithTag(NonPagedPool, - sizeof(USB_INTERFACE) + sizeof(PVOID) * ROOTHUB2_INTERFACE_DESCRIPTOR[3], + sizeof(USB_INTERFACE) + sizeof(PVOID) * ROOTHUB2_INTERFACE_DESCRIPTOR[4], USB_POOL_TAG); RootHubDevice->Configs[0]->Interfaces[0]->EndPoints[0] = ExAllocatePoolWithTag(NonPagedPool,

1 0

[tkreuzer] 47844: [SUSPEND] Fix compilation for amd64
by tkreuzer＠svn.reactos.org 25 Jun '10

25 Jun '10

Author: tkreuzer Date: Fri Jun 25 01:37:58 2010 New Revision: 47844 URL: http://svn.reactos.org/svn/reactos?rev=47844&view=rev Log: [SUSPEND] Fix compilation for amd64 Modified: trunk/rostests/tests/suspend/suspend.c Modified: trunk/rostests/tests/suspend/suspend.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/suspend/suspend.c?r… ============================================================================== --- trunk/rostests/tests/suspend/suspend.c [iso-8859-1] (original) +++ trunk/rostests/tests/suspend/suspend.c [iso-8859-1] Fri Jun 25 01:37:58 2010 @@ -62,7 +62,11 @@ Sleep(100);x++; if(x>100 && GetThreadContext(thread, &context)) { +#if defined(_M_IX86) printf("EIP: %lx\n", context.Eip); +#elif defined(_M_AMD64) + printf("RIP: %p\n", context.Rip); +#endif printf("Calling resumethread ... \n"); ResumeThread(thread); }

1 0

[akhaldi] 47843: [PSDK] - Add several missing VER_* definitions.
by akhaldi＠svn.reactos.org 24 Jun '10

24 Jun '10

Author: akhaldi Date: Thu Jun 24 22:23:02 2010 New Revision: 47843 URL: http://svn.reactos.org/svn/reactos?rev=47843&view=rev Log: [PSDK] - Add several missing VER_* definitions. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Thu Jun 24 22:23:02 2010 @@ -766,4 +766,24 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 +#define VER_WORKSTATION_NT 0x40000000 +#define VER_SERVER_NT 0x80000000 + +#define VER_SUITE_SMALLBUSINESS 1 +#define VER_SUITE_ENTERPRISE 2 +#define VER_SUITE_BACKOFFICE 4 +#define VER_SUITE_COMMUNICATIONS 8 +#define VER_SUITE_TERMINAL 16 +#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 +#define VER_SUITE_EMBEDDEDNT 64 +#define VER_SUITE_DATACENTER 128 +#define VER_SUITE_SINGLEUSERTS 256 +#define VER_SUITE_PERSONAL 512 +#define VER_SUITE_BLADE 1024 +#define VER_SUITE_EMBEDDED_RESTRICTED 2048 +#define VER_SUITE_SECURITY_APPLIANCE 4096 +#define VER_SUITE_STORAGE_SERVER 8192 +#define VER_SUITE_COMPUTE_SERVER 16384 +#define VER_SUITE_WH_SERVER 32768 + #endif /* _NTDEF_ */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Jun 24 22:23:02 2010 @@ -1804,6 +1804,8 @@ #define VER_AND 6 #define VER_OR 7 #endif +#define VER_SERVER_NT 0x80000000 +#define VER_WORKSTATION_NT 0x40000000 #define VER_PLATFORM_WIN32s 0 #define VER_PLATFORM_WIN32_WINDOWS 1 #define VER_PLATFORM_WIN32_NT 2 @@ -1813,6 +1815,7 @@ #define VER_SUITE_SMALLBUSINESS 1 #define VER_SUITE_ENTERPRISE 2 #define VER_SUITE_BACKOFFICE 4 +#define VER_SUITE_COMMUNICATIONS 8 #define VER_SUITE_TERMINAL 16 #define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 #define VER_SUITE_EMBEDDEDNT 64 @@ -1820,6 +1823,11 @@ #define VER_SUITE_SINGLEUSERTS 256 #define VER_SUITE_PERSONAL 512 #define VER_SUITE_BLADE 1024 +#define VER_SUITE_EMBEDDED_RESTRICTED 2048 +#define VER_SUITE_SECURITY_APPLIANCE 4096 +#define VER_SUITE_STORAGE_SERVER 8192 +#define VER_SUITE_COMPUTE_SERVER 16384 +#define VER_SUITE_WH_SERVER 32768 #define WT_EXECUTEDEFAULT 0x00000000 #define WT_EXECUTEINIOTHREAD 0x00000001 #define WT_EXECUTEINUITHREAD 0x00000002

1 0

[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

← Newer
1
...
5
6
7
8
9
10
11
...
41
Older →

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 June 2010