Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 73063: [WIN32SS/USER32] Mask exceptions from WndProc, essentially reverting r72495. CORE-11915
by akhaldi＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: akhaldi Date: Sat Oct 29 17:57:53 2016 New Revision: 73063 URL: http://svn.reactos.org/svn/reactos?rev=73063&view=rev Log: [WIN32SS/USER32] Mask exceptions from WndProc, essentially reverting r72495. CORE-11915 Removed: branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/wndproc_fixup.S Modified: branches/ros-branch-0_4_3/reactos/win32ss/user/user32/CMakeLists.txt branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/message.c Modified: branches/ros-branch-0_4_3/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_3/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sat Oct 29 17:57:53 2016 @@ -64,16 +64,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c include/user32.h) -if(ARCH STREQUAL "i386") - list(APPEND ASM_SOURCE - windows/wndproc_fixup.S) -endif() - -add_asm_files(user32_asm ${ASM_SOURCE}) - add_library(user32 SHARED ${SOURCE} - ${user32_asm} user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) Modified: branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sat Oct 29 17:57:53 2016 @@ -13,21 +13,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -#ifdef __i386__ -/* For bad applications which provide bad (non stdcall) WndProc */ -extern -LRESULT -__cdecl -CALL_EXTERN_WNDPROC( - WNDPROC WndProc, - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -#else -# define CALL_EXTERN_WNDPROC(proc, h, m, w, l) proc(h, m, w, l) -#endif /* From wine: */ /* flag for messages that contain pointers */ @@ -1463,7 +1448,15 @@ if (PreResult) goto Exit; - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); + _SEH2_TRY // wine does this. + { + Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; if (Hook && MsgOverride) { @@ -1504,7 +1497,15 @@ if (PreResult) goto Exit; - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + _SEH2_TRY + { + Result = WndProc(hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; if (Hook && MsgOverride) { @@ -1584,7 +1585,15 @@ if (PreResult) goto Exit; - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + _SEH2_TRY + { + Result = WndProc(hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; if (Hook && MsgOverride) { @@ -1632,7 +1641,16 @@ if (PreResult) goto Exit; - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); + _SEH2_TRY + { + Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message, + UnicodeMsg.wParam, UnicodeMsg.lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; if (Hook && MsgOverride) { Removed: branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/wndproc_fixup.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/win32ss/user/user32/windows/wndproc_fixup.S (removed) @@ -1,58 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: win32ss/user/user32/windows/wndproc_fixup.S - * PURPOSE: Messages - * PROGRAMMER: JÃ©rÃ´me Gardou jerome.gardou(a)reactos.org - * LICENCE : LGPL, copyright Alexandre Julliard - */ - -#include <asm.inc> -#include <ks386.inc> - -/* Some applications provide invalid callbacks which don't follow the stdcall convention */ - -.code - -/* - * LRESULT - * __cdecl - * CALL_EXTERN_WNDPROC( - * WNDPROC WndProc, - * HWND hWnd, - * UINT Msg, - * WPARAM wParam, - * LPARAM lParam); - */ -PUBLIC _CALL_EXTERN_WNDPROC -FUNC _CALL_EXTERN_WNDPROC - FPO 0, 0, 0, 0, 0, FRAME_FPO - - push ebp - mov ebp, esp - - push edi - push esi - push ebp - - sub esp, 12 - - push dword ptr [ebp + 24] - push dword ptr [ebp + 20] - push dword ptr [ebp + 16] - push dword ptr [ebp + 12] - mov eax, dword ptr [ebp + 8] - - call eax - - lea esp, dword ptr [ebp - 12] - pop ebx - pop esi - pop edi - - leave - ret - -ENDFUNC - -END

1 0

[pschweitzer] 73062: [BTRFS] Sync btrfs to 0.7. CORE-12223
by pschweitzer＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: pschweitzer Date: Sat Oct 29 17:05:10 2016 New Revision: 73062 URL: http://svn.reactos.org/svn/reactos?rev=73062&view=rev Log: [BTRFS] Sync btrfs to 0.7. CORE-12223 Added: trunk/reactos/drivers/filesystems/btrfs/devctrl.c (with props) trunk/reactos/drivers/filesystems/btrfs/galois.c (with props) Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/drivers/filesystems/btrfs/btrfs.c trunk/reactos/drivers/filesystems/btrfs/btrfs.h trunk/reactos/drivers/filesystems/btrfs/btrfs.rc trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h trunk/reactos/drivers/filesystems/btrfs/compress.c trunk/reactos/drivers/filesystems/btrfs/crc32c.c trunk/reactos/drivers/filesystems/btrfs/create.c trunk/reactos/drivers/filesystems/btrfs/dirctrl.c trunk/reactos/drivers/filesystems/btrfs/extent-tree.c trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/drivers/filesystems/btrfs/flushthread.c trunk/reactos/drivers/filesystems/btrfs/free-space.c trunk/reactos/drivers/filesystems/btrfs/fsctl.c trunk/reactos/drivers/filesystems/btrfs/pnp.c trunk/reactos/drivers/filesystems/btrfs/read.c trunk/reactos/drivers/filesystems/btrfs/registry.c trunk/reactos/drivers/filesystems/btrfs/reparse.c trunk/reactos/drivers/filesystems/btrfs/search.c trunk/reactos/drivers/filesystems/btrfs/security.c trunk/reactos/drivers/filesystems/btrfs/treefuncs.c trunk/reactos/drivers/filesystems/btrfs/worker-thread.c trunk/reactos/drivers/filesystems/btrfs/write.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/crc32c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/extent-tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/flushthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/free-space.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/galois.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/reparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/treefuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/worker-thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…

1 0

[pschweitzer] 73061: [DDK] Define IDENTIFY_DEVICE_DATA (from MSDN). CORE-12223
by pschweitzer＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: pschweitzer Date: Sat Oct 29 16:53:45 2016 New Revision: 73061 URL: http://svn.reactos.org/svn/reactos?rev=73061&view=rev Log: [DDK] Define IDENTIFY_DEVICE_DATA (from MSDN). CORE-12223 Added: trunk/reactos/sdk/include/ddk/ata.h (with props) Added: trunk/reactos/sdk/include/ddk/ata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ata.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/ata.h (added) +++ trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] Sat Oct 29 16:53:45 2016 @@ -0,0 +1,255 @@ +#ifndef _NTATA_ +#define _NTATA_ + +#include <pshpack1.h> +typedef struct _IDENTIFY_DEVICE_DATA { + struct { + USHORT Reserved1 :1; + USHORT Retired3 :1; + USHORT ResponseIncomplete :1; + USHORT Retired2 :3; + USHORT FixedDevice :1; + USHORT RemovableMedia :1; + USHORT Retired1 :7; + USHORT DeviceType :1; + } GeneralConfiguration; + USHORT NumCylinders; + USHORT ReservedWord2; + USHORT NumHeads; + USHORT Retired1[2]; + USHORT NumSectorsPerTrack; + USHORT VendorUnique1[3]; + UCHAR SerialNumber[20]; + USHORT Retired2[2]; + USHORT Obsolete1; + UCHAR FirmwareRevision[8]; + UCHAR ModelNumber[40]; + UCHAR MaximumBlockTransfer; + UCHAR VendorUnique2; + USHORT ReservedWord48; + struct { + UCHAR ReservedByte49; + UCHAR DmaSupported :1; + UCHAR LbaSupported :1; + UCHAR IordyDisable :1; + UCHAR IordySupported :1; + UCHAR Reserved1 :1; + UCHAR StandybyTimerSupport :1; + UCHAR Reserved2 :2; + USHORT ReservedWord50; + } Capabilities; + USHORT ObsoleteWords51[2]; + USHORT TranslationFieldsValid :3; + USHORT Reserved3 :13; + USHORT NumberOfCurrentCylinders; + USHORT NumberOfCurrentHeads; + USHORT CurrentSectorsPerTrack; + ULONG CurrentSectorCapacity; + UCHAR CurrentMultiSectorSetting; + UCHAR MultiSectorSettingValid :1; + UCHAR ReservedByte59 :7; + ULONG UserAddressableSectors; + USHORT ObsoleteWord62; + USHORT MultiWordDMASupport :8; + USHORT MultiWordDMAActive :8; + USHORT AdvancedPIOModes :8; + USHORT ReservedByte64 :8; + USHORT MinimumMWXferCycleTime; + USHORT RecommendedMWXferCycleTime; + USHORT MinimumPIOCycleTime; + USHORT MinimumPIOCycleTimeIORDY; + USHORT ReservedWords69[6]; + USHORT QueueDepth :5; + USHORT ReservedWord75 :11; + USHORT ReservedWords76[4]; + USHORT MajorRevision; + USHORT MinorRevision; + struct { + USHORT SmartCommands :1; + USHORT SecurityMode :1; + USHORT RemovableMediaFeature :1; + USHORT PowerManagement :1; + USHORT Reserved1 :1; + USHORT WriteCache :1; + USHORT LookAhead :1; + USHORT ReleaseInterrupt :1; + USHORT ServiceInterrupt :1; + USHORT DeviceReset :1; + USHORT HostProtectedArea :1; + USHORT Obsolete1 :1; + USHORT WriteBuffer :1; + USHORT ReadBuffer :1; + USHORT Nop :1; + USHORT Obsolete2 :1; + USHORT DownloadMicrocode :1; + USHORT DmaQueued :1; + USHORT Cfa :1; + USHORT AdvancedPm :1; + USHORT Msn :1; + USHORT PowerUpInStandby :1; + USHORT ManualPowerUp :1; + USHORT Reserved2 :1; + USHORT SetMax :1; + USHORT Acoustics :1; + USHORT BigLba :1; + USHORT DeviceConfigOverlay :1; + USHORT FlushCache :1; + USHORT FlushCacheExt :1; + USHORT Resrved3 :2; + USHORT SmartErrorLog :1; + USHORT SmartSelfTest :1; + USHORT MediaSerialNumber :1; + USHORT MediaCardPassThrough :1; + USHORT StreamingFeature :1; + USHORT GpLogging :1; + USHORT WriteFua :1; + USHORT WriteQueuedFua :1; + USHORT WWN64Bit :1; + USHORT URGReadStream :1; + USHORT URGWriteStream :1; + USHORT ReservedForTechReport :2; + USHORT IdleWithUnloadFeature :1; + USHORT Reserved4 :2; + } CommandSetSupport; + struct { + USHORT SmartCommands :1; + USHORT SecurityMode :1; + USHORT RemovableMediaFeature :1; + USHORT PowerManagement :1; + USHORT Reserved1 :1; + USHORT WriteCache :1; + USHORT LookAhead :1; + USHORT ReleaseInterrupt :1; + USHORT ServiceInterrupt :1; + USHORT DeviceReset :1; + USHORT HostProtectedArea :1; + USHORT Obsolete1 :1; + USHORT WriteBuffer :1; + USHORT ReadBuffer :1; + USHORT Nop :1; + USHORT Obsolete2 :1; + USHORT DownloadMicrocode :1; + USHORT DmaQueued :1; + USHORT Cfa :1; + USHORT AdvancedPm :1; + USHORT Msn :1; + USHORT PowerUpInStandby :1; + USHORT ManualPowerUp :1; + USHORT Reserved2 :1; + USHORT SetMax :1; + USHORT Acoustics :1; + USHORT BigLba :1; + USHORT DeviceConfigOverlay :1; + USHORT FlushCache :1; + USHORT FlushCacheExt :1; + USHORT Resrved3 :2; + USHORT SmartErrorLog :1; + USHORT SmartSelfTest :1; + USHORT MediaSerialNumber :1; + USHORT MediaCardPassThrough :1; + USHORT StreamingFeature :1; + USHORT GpLogging :1; + USHORT WriteFua :1; + USHORT WriteQueuedFua :1; + USHORT WWN64Bit :1; + USHORT URGReadStream :1; + USHORT URGWriteStream :1; + USHORT ReservedForTechReport :2; + USHORT IdleWithUnloadFeature :1; + USHORT Reserved4 :2; + } CommandSetActive; + USHORT UltraDMASupport :8; + USHORT UltraDMAActive :8; + USHORT ReservedWord89[4]; + USHORT HardwareResetResult; + USHORT CurrentAcousticValue :8; + USHORT RecommendedAcousticValue :8; + USHORT ReservedWord95[5]; + ULONG Max48BitLBA[2]; + USHORT StreamingTransferTime; + USHORT ReservedWord105; + struct { + USHORT LogicalSectorsPerPhysicalSector :4; + USHORT Reserved0 :8; + USHORT LogicalSectorLongerThan256Words :1; + USHORT MultipleLogicalSectorsPerPhysicalSector :1; + USHORT Reserved1 :2; + } PhysicalLogicalSectorSize; + USHORT InterSeekDelay; + USHORT WorldWideName[4]; + USHORT ReservedForWorldWideName128[4]; + USHORT ReservedForTlcTechnicalReport; + USHORT WordsPerLogicalSector[2]; + struct { + USHORT ReservedForDrqTechnicalReport :1; + USHORT WriteReadVerifySupported :1; + USHORT Reserved01 :11; + USHORT Reserved1 :2; + } CommandSetSupportExt; + struct { + USHORT ReservedForDrqTechnicalReport :1; + USHORT WriteReadVerifyEnabled :1; + USHORT Reserved01 :11; + USHORT Reserved1 :2; + } CommandSetActiveExt; + USHORT ReservedForExpandedSupportandActive[6]; + USHORT MsnSupport :2; + USHORT ReservedWord1274 :14; + struct { + USHORT SecuritySupported :1; + USHORT SecurityEnabled :1; + USHORT SecurityLocked :1; + USHORT SecurityFrozen :1; + USHORT SecurityCountExpired :1; + USHORT EnhancedSecurityEraseSupported :1; + USHORT Reserved0 :2; + USHORT SecurityLevel :1; + USHORT Reserved1 :7; + } SecurityStatus; + USHORT ReservedWord129[31]; + struct { + USHORT MaximumCurrentInMA2 :12; + USHORT CfaPowerMode1Disabled :1; + USHORT CfaPowerMode1Required :1; + USHORT Reserved0 :1; + USHORT Word160Supported :1; + } CfaPowerModel; + USHORT ReservedForCfaWord161[8]; + struct { + USHORT SupportsTrim :1; + USHORT Reserved0 :15; + } DataSetManagementFeature; + USHORT ReservedForCfaWord170[6]; + USHORT CurrentMediaSerialNumber[30]; + USHORT ReservedWord206; + USHORT ReservedWord207[2]; + struct { + USHORT AlignmentOfLogicalWithinPhysical :14; + USHORT Word209Supported :1; + USHORT Reserved0 :1; + } BlockAlignment; + USHORT WriteReadVerifySectorCountMode3Only[2]; + USHORT WriteReadVerifySectorCountMode2Only[2]; + struct { + USHORT NVCachePowerModeEnabled :1; + USHORT Reserved0 :3; + USHORT NVCacheFeatureSetEnabled :1; + USHORT Reserved1 :3; + USHORT NVCachePowerModeVersion :4; + USHORT NVCacheFeatureSetVersion :4; + } NVCacheCapabilities; + USHORT NVCacheSizeLSW; + USHORT NVCacheSizeMSW; + USHORT NominalMediaRotationRate; + USHORT ReservedWord218; + struct { + UCHAR NVCacheEstimatedTimeToSpinUpInSeconds; + UCHAR Reserved; + } NVCacheOptions; + USHORT ReservedWord220[35]; + USHORT Signature :8; + USHORT CheckSum :8; +} IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA; +#include <poppack.h> + +#endif Propchange: trunk/reactos/sdk/include/ddk/ata.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 73060: [MKISOFS] - Fix VS 2015 build CORE-11988
by tfaber＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: tfaber Date: Sat Oct 29 11:54:19 2016 New Revision: 73060 URL: http://svn.reactos.org/svn/reactos?rev=73060&view=rev Log: [MKISOFS] - Fix VS 2015 build CORE-11988 Modified: trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h Modified: trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/reactos/… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h [iso-8859-1] Sat Oct 29 11:54:19 2016 @@ -85,7 +85,7 @@ #define HAVE_C99_ISNAN 1 #define HAVE_SNPRINTF 1 -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif

1 0

[tfaber] 73059: [NTDLL_APITEST] - Add tests for NtWriteFile with buffer sizes larger than an MDL can describe. CORE-12132
by tfaber＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: tfaber Date: Sat Oct 29 11:39:07 2016 New Revision: 73059 URL: http://svn.reactos.org/svn/reactos?rev=73059&view=rev Log: [NTDLL_APITEST] - Add tests for NtWriteFile with buffer sizes larger than an MDL can describe. CORE-12132 Added: trunk/rostests/apitests/ntdll/NtWriteFile.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 29 11:39:07 2016 @@ -20,6 +20,7 @@ NtQueryVolumeInformationFile.c NtSaveKey.c NtSetValueKey.c + NtWriteFile.c RtlAllocateHeap.c RtlBitmap.c RtlCopyMappedMemory.c Added: trunk/rostests/apitests/ntdll/NtWriteFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtWriteFil… ============================================================================== --- trunk/rostests/apitests/ntdll/NtWriteFile.c (added) +++ trunk/rostests/apitests/ntdll/NtWriteFile.c [iso-8859-1] Sat Oct 29 11:39:07 2016 @@ -0,0 +1,223 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtWriteFile + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <winreg.h> +#include <ndk/cmfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> + +static +BOOL +Is64BitSystem(VOID) +{ +#ifdef _WIN64 + return TRUE; +#else + NTSTATUS Status; + ULONG_PTR IsWow64; + + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWow64Information, + &IsWow64, + sizeof(IsWow64), + NULL); + if (NT_SUCCESS(Status)) + { + return IsWow64 != 0; + } + + return FALSE; +#endif +} + +static +ULONG +SizeOfMdl(VOID) +{ + return Is64BitSystem() ? 48 : 28; +} + +START_TEST(NtWriteFile) +{ + NTSTATUS Status; + HANDLE FileHandle; + UNICODE_STRING FileName = RTL_CONSTANT_STRING(L"\\SystemRoot\\ntdll-apitest-NtWriteFile-test.bin"); + PVOID Buffer; + SIZE_T BufferSize; + LARGE_INTEGER ByteOffset; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatus; + FILE_DISPOSITION_INFORMATION DispositionInfo; + ULONG TooLargeDataSize = (MAXUSHORT + 1 - SizeOfMdl()) / sizeof(ULONG_PTR) * PAGE_SIZE; // 0x3FF9000 on x86 + ULONG LargeMdlMaxDataSize = TooLargeDataSize - PAGE_SIZE; + + trace("System is %d bits, Size of MDL: %lu\n", Is64BitSystem() ? 64 : 32, SizeOfMdl()); + trace("Max MDL data size: 0x%lx bytes\n", LargeMdlMaxDataSize); + + ByteOffset.QuadPart = 0; + + Buffer = NULL; + BufferSize = TooLargeDataSize; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Buffer, + 0, + &BufferSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + skip("Failed to allocate memory, status %lx\n", Status); + return; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateFile(&FileHandle, + FILE_WRITE_DATA | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatus, + NULL, + 0, + 0, + FILE_SUPERSEDE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_NO_INTERMEDIATE_BUFFERING, + NULL, + 0); + ok_hex(Status, STATUS_SUCCESS); + + /* non-cached, max size -- succeeds */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize - PAGE_SIZE, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + /* non-cached, max size -- succeeds */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + /* non-cached, too large -- fails to allocate MDL + * Note: this returns STATUS_SUCCESS on Win7 -- higher MDL size limit */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize + PAGE_SIZE, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_INSUFFICIENT_RESOURCES); + + /* non-cached, unaligned -- fails with invalid parameter */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize + 1, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + DispositionInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatus, + &DispositionInfo, + sizeof(DispositionInfo), + FileDispositionInformation); + ok_hex(Status, STATUS_SUCCESS); + Status = NtClose(FileHandle); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtCreateFile(&FileHandle, + FILE_WRITE_DATA | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatus, + NULL, + 0, + 0, + FILE_SUPERSEDE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + ok_hex(Status, STATUS_SUCCESS); + + /* cached: succeeds with arbitrary length */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + LargeMdlMaxDataSize + 1, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + TooLargeDataSize, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + DispositionInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatus, + &DispositionInfo, + sizeof(DispositionInfo), + FileDispositionInformation); + ok_hex(Status, STATUS_SUCCESS); + Status = NtClose(FileHandle); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Buffer, + &BufferSize, + MEM_RELEASE); + ok_hex(Status, STATUS_SUCCESS); +} Propchange: trunk/rostests/apitests/ntdll/NtWriteFile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Oct 29 11:39:07 2016 @@ -24,6 +24,7 @@ extern void func_NtSaveKey(void); extern void func_NtSetValueKey(void); extern void func_NtSystemInformation(void); +extern void func_NtWriteFile(void); extern void func_RtlAllocateHeap(void); extern void func_RtlBitmap(void); extern void func_RtlCopyMappedMemory(void); @@ -70,6 +71,7 @@ { "NtSaveKey", func_NtSaveKey}, { "NtSetValueKey", func_NtSetValueKey}, { "NtSystemInformation", func_NtSystemInformation }, + { "NtWriteFile", func_NtWriteFile }, { "RtlAllocateHeap", func_RtlAllocateHeap }, { "RtlBitmapApi", func_RtlBitmap }, { "RtlCopyMappedMemory", func_RtlCopyMappedMemory },

1 0

[tfaber] 73058: [KMTESTS:IO] - Add a test case for trying to open a file "inside" a file to IoFilesystem ROSTESTS-135
by tfaber＠svn.reactos.org 29 Oct '16

29 Oct '16

Author: tfaber Date: Sat Oct 29 11:20:58 2016 New Revision: 73058 URL: http://svn.reactos.org/svn/reactos?rev=73058&view=rev Log: [KMTESTS:IO] - Add a test case for trying to open a file "inside" a file to IoFilesystem ROSTESTS-135 Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoFilesys… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] Sat Oct 29 11:20:58 2016 @@ -292,6 +292,7 @@ { NULL, L"C:\\ReactOS\\explorer.exe", FALSE, STATUS_SUCCESS }, { NULL, L"C:\\ReactOS\\\\explorer.exe", FALSE, STATUS_OBJECT_NAME_INVALID }, { NULL, L"C:\\ReactOS\\explorer.exe\\", FALSE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\ReactOS\\explorer.exe\\file", FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"C:\\ReactOS\\explorer.exe\\\\", FALSE, STATUS_OBJECT_NAME_INVALID }, /* This will never return STATUS_NOT_A_DIRECTORY. IsDirectory=TRUE is a little hacky but achieves that without special handling */ { NULL, L"C:\\ReactOS\\explorer.exe\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID },

1 0

[akhaldi] 73057: [0.4.3] Update the version number.
by akhaldi＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: akhaldi Date: Fri Oct 28 21:32:23 2016 New Revision: 73057 URL: http://svn.reactos.org/svn/reactos?rev=73057&view=rev Log: [0.4.3] Update the version number. Modified: branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Fri Oct 28 21:32:23 2016 @@ -17,12 +17,12 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "3") set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) set(KERNEL_VERSION_RELEASE_TYPE "RC1")

1 0

[zguo] 73056: [0.4.3] Mark branch builds as release candidates.
by zguo＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: zguo Date: Fri Oct 28 21:06:03 2016 New Revision: 73056 URL: http://svn.reactos.org/svn/reactos?rev=73056&view=rev Log: [0.4.3] Mark branch builds as release candidates. Modified: branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Fri Oct 28 21:06:03 2016 @@ -25,7 +25,7 @@ set(KERNEL_VERSION_BUILD_TYPE "SVN") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC1") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[bfreisen] 73055: [MSPAINT] refactor RegistrySettings::SetWallpaper, also changing its signature to make it more usable
by bfreisen＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: bfreisen Date: Fri Oct 28 19:48:25 2016 New Revision: 73055 URL: http://svn.reactos.org/svn/reactos?rev=73055&view=rev Log: [MSPAINT] refactor RegistrySettings::SetWallpaper, also changing its signature to make it more usable Modified: trunk/reactos/base/applications/mspaint/registry.cpp trunk/reactos/base/applications/mspaint/registry.h trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] Fri Oct 28 19:48:25 2016 @@ -35,23 +35,15 @@ strFile.ReleaseBuffer(); } -void RegistrySettings::SetWallpaper(LPCTSTR szFileName, DWORD dwStyle, DWORD dwTile) +void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::WallpaperStyle style) { - if ((dwStyle > 2) || (dwTile > 2)) - return; - CRegKey desktop; if (desktop.Open(HKEY_CURRENT_USER, _T("Control Panel\\Desktop")) == ERROR_SUCCESS) { - CString strStyle, strTile; - desktop.SetStringValue(_T("Wallpaper"), szFileName); - strStyle.Format(_T("%lu"), dwStyle); - strTile.Format(_T("%lu"), dwTile); - - desktop.SetStringValue(_T("WallpaperStyle"), strStyle); - desktop.SetStringValue(_T("TileWallpaper"), strTile); + desktop.SetStringValue(_T("WallpaperStyle"), (style == RegistrySettings::STRETCHED) ? _T("2") : _T("1")); + desktop.SetStringValue(_T("TileWallpaper"), (style == RegistrySettings::TILED) ? _T("1") : _T("0")); } SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE); Modified: trunk/reactos/base/applications/mspaint/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.h [iso-8859-1] Fri Oct 28 19:48:25 2016 @@ -30,7 +30,13 @@ CString strFile3; CString strFile4; - static void SetWallpaper(LPCTSTR szFileName, DWORD dwStyle, DWORD dwTile); + enum WallpaperStyle { + TILED, + CENTERED, + STRETCHED + }; + + static void SetWallpaper(LPCTSTR szFileName, WallpaperStyle style); void Load(); void Store(); Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Fri Oct 28 19:48:25 2016 @@ -451,13 +451,13 @@ GlobalFree(pd.hDevNames); break; case IDM_FILEASWALLPAPERPLANE: - RegistrySettings::SetWallpaper(filepathname, 1, 1); + RegistrySettings::SetWallpaper(filepathname, RegistrySettings::TILED); break; case IDM_FILEASWALLPAPERCENTERED: - RegistrySettings::SetWallpaper(filepathname, 1, 0); + RegistrySettings::SetWallpaper(filepathname, RegistrySettings::CENTERED); break; case IDM_FILEASWALLPAPERSTRETCHED: - RegistrySettings::SetWallpaper(filepathname, 2, 0); + RegistrySettings::SetWallpaper(filepathname, RegistrySettings::STRETCHED); break; case IDM_FILE1: {

1 0

[phater] 73054: [MSAFD] Fix handle counting in WSPSelect and improve TDI request according to MSDN. CORE-12104
by phater＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: phater Date: Fri Oct 28 16:37:39 2016 New Revision: 73054 URL: http://svn.reactos.org/svn/reactos?rev=73054&view=rev Log: [MSAFD] Fix handle counting in WSPSelect and improve TDI request according to MSDN. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Oct 28 16:37:39 2016 @@ -1031,13 +1031,14 @@ PAFD_POLL_INFO PollInfo; NTSTATUS Status; ULONG HandleCount; - LONG OutCount = 0; ULONG PollBufferSize; PVOID PollBuffer; ULONG i, j = 0, x; HANDLE SockEvent; - BOOL HandleCounted; LARGE_INTEGER Timeout; + PSOCKET_INFORMATION Socket; + SOCKET Handle; + ULONG Events; /* Find out how many sockets we have, and how large the buffer needs * to be */ @@ -1119,28 +1120,68 @@ if (readfds != NULL) { for (i = 0; i < readfds->fd_count; i++, j++) { + Socket = GetSocketStructure(readfds->fd_array[i]); + if (!Socket) + { + ERR("Invalid socket handle provided in readfds %d\n", readfds->fd_array[i]); + if (lpErrno) *lpErrno = WSAENOTSOCK; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } PollInfo->Handles[j].Handle = readfds->fd_array[i]; PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE | AFD_EVENT_ACCEPT; + if (Socket->SharedData->OobInline != 0) + PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; } } if (writefds != NULL) { for (i = 0; i < writefds->fd_count; i++, j++) { + Socket = GetSocketStructure(writefds->fd_array[i]); + if (!Socket) + { + ERR("Invalid socket handle provided in writefds %d\n", writefds->fd_array[i]); + if (lpErrno) *lpErrno = WSAENOTSOCK; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } PollInfo->Handles[j].Handle = writefds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_SEND | AFD_EVENT_CONNECT; + PollInfo->Handles[j].Events = AFD_EVENT_SEND; + if (Socket->SharedData->NonBlocking != 0) + PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT; } } if (exceptfds != NULL) { for (i = 0; i < exceptfds->fd_count; i++, j++) { + Socket = GetSocketStructure(exceptfds->fd_array[i]); + if (!Socket) + { + TRACE("Invalid socket handle provided in exceptfds %d\n", exceptfds->fd_array[i]); + if (lpErrno) *lpErrno = WSAENOTSOCK; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } PollInfo->Handles[j].Handle = exceptfds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_OOB_RECEIVE | AFD_EVENT_CONNECT_FAIL; + PollInfo->Handles[j].Events = 0; + if (Socket->SharedData->OobInline == 0) + PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; + if (Socket->SharedData->NonBlocking != 0) + PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT_FAIL; + if (PollInfo->Handles[j].Events == 0) + { + TRACE("No events can be checked for exceptfds %d. It is nonblocking and OOB line is disabled. Skipping it.", exceptfds->fd_array[i]); + j--; + } } } @@ -1182,10 +1223,20 @@ /* Return in FDSET Format */ for (i = 0; i < HandleCount; i++) { - HandleCounted = FALSE; + Events = PollInfo->Handles[i].Events; + Handle = PollInfo->Handles[i].Handle; for(x = 1; x; x<<=1) { - switch (PollInfo->Handles[i].Events & x) + Socket = GetSocketStructure(Handle); + if (!Socket) + { + TRACE("Invalid socket handle found %d\n", Handle); + if (lpErrno) *lpErrno = WSAENOTSOCK; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } + switch (Events & x) { case AFD_EVENT_RECEIVE: case AFD_EVENT_DISCONNECT: @@ -1193,41 +1244,40 @@ case AFD_EVENT_ACCEPT: case AFD_EVENT_CLOSE: TRACE("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle); - if (! HandleCounted) - { - OutCount++; - HandleCounted = TRUE; - } + Events, + Handle); if( readfds ) - FD_SET(PollInfo->Handles[i].Handle, readfds); + FD_SET(Handle, readfds); break; case AFD_EVENT_SEND: + TRACE("Event %x on handle %x\n", + Events, + Handle); + if (writefds) + FD_SET(Handle, writefds); + break; case AFD_EVENT_CONNECT: TRACE("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle); - if (! HandleCounted) - { - OutCount++; - HandleCounted = TRUE; - } - if( writefds ) - FD_SET(PollInfo->Handles[i].Handle, writefds); + Events, + Handle); + if( writefds && Socket->SharedData->NonBlocking != 0 ) + FD_SET(Handle, writefds); break; case AFD_EVENT_OOB_RECEIVE: + TRACE("Event %x on handle %x\n", + Events, + Handle); + if( readfds && Socket->SharedData->OobInline != 0 ) + FD_SET(Handle, readfds); + if( exceptfds && Socket->SharedData->OobInline == 0 ) + FD_SET(Handle, exceptfds); + break; case AFD_EVENT_CONNECT_FAIL: TRACE("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle); - if (! HandleCounted) - { - OutCount++; - HandleCounted = TRUE; - } - if( exceptfds ) - FD_SET(PollInfo->Handles[i].Handle, exceptfds); + Events, + Handle); + if( exceptfds && Socket->SharedData->NonBlocking != 0 ) + FD_SET(Handle, exceptfds); break; } } @@ -1251,9 +1301,13 @@ TRACE("*lpErrno = %x\n", *lpErrno); } - TRACE("%d events\n", OutCount); - - return OutCount; + HandleCount = (readfds ? readfds->fd_count : 0) + + (writefds && writefds != readfds ? writefds->fd_count : 0) + + (exceptfds && exceptfds != readfds && exceptfds != writefds ? exceptfds->fd_count : 0); + + TRACE("%d events\n", HandleCount); + + return HandleCount; } SOCKET

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