Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 36874: - SMP SYNCH_LEVEL for x86 is IPI_LEVEL - 2 since 2K3
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 11:23:06 2008 New Revision: 36874 URL: http://svn.reactos.org/svn/reactos?rev=36874&view=rev Log: - SMP SYNCH_LEVEL for x86 is IPI_LEVEL - 2 since 2K3 Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Tue Oct 21 11:23:06 2008 @@ -142,7 +142,11 @@ #ifndef CONFIG_SMP #define SYNCH_LEVEL DISPATCH_LEVEL #else +#if (NTDDI_VERSION < NTDDI_WS03) #define SYNCH_LEVEL (IPI_LEVEL - 1) +#else +#define SYNCH_LEVEL (IPI_LEVEL - 2) +#endif #endif //

1 0

[sginsberg] 36873: - Add missing KPCR_PRCB_IDLE_SCHEDULE offset
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 10:32:49 2008 New Revision: 36873 URL: http://svn.reactos.org/svn/reactos?rev=36873&view=rev Log: - Add missing KPCR_PRCB_IDLE_SCHEDULE offset Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3687… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Tue Oct 21 10:32:49 2008 @@ -220,6 +220,7 @@ #define KPCR_PRCB_DPC_LAST_COUNT 0xA80 #define KPCR_PRCB_TIMER_REQUEST 0xA88 #define KPCR_PRCB_QUANTUM_END 0xAA1 +#define KPCR_PRCB_IDLE_SCHEDULE 0xAA3 #define KPCR_PRCB_DEFERRED_READY_LIST_HEAD 0xC10 #define KPCR_PRCB_POWER_STATE_IDLE_FUNCTION 0xEC0 Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Tue Oct 21 10:32:49 2008 @@ -273,6 +273,7 @@ C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PowerState) == KPCR_PRCB_POWER_STATE_IDLE_FUNCTION); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PrcbLock) == KPCR_PRCB_PRCB_LOCK); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, IdleSchedule) == KPCR_PRCB_IDLE_SCHEDULE); C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); /* Platform specific checks */

1 0

[jimtabor] 36872: - Fix NtUserCreateWindowEx.
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Tue Oct 21 09:51:14 2008 New Revision: 36872 URL: http://svn.reactos.org/svn/reactos?rev=36872&view=rev Log: - Fix NtUserCreateWindowEx. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 21 09:51:14 2008 @@ -1060,6 +1060,26 @@ DWORD dwShowMode, BOOL bUnicodeWindow, DWORD dwUnknown); +#if 0 +HWND +NTAPI +NtUserCreateWindowEx( + DWORD dwExStyle, + PLARGE_UNICODE_STRING plustrClassName, + PLARGE_UNICODE_STRING plustrClsVesrion, + PLARGE_UNICODE_STRING plustrWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam, + DWORD dwFlags, + BOOL InfoActive); +#endif HWINSTA NTAPI

1 0

[sginsberg] 36871: - Add missing Cm (de)reference trace
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 09:47:20 2008 New Revision: 36871 URL: http://svn.reactos.org/svn/reactos?rev=36871&view=rev Log: - Add missing Cm (de)reference trace Modified: trunk/reactos/ntoskrnl/config/cmdelay.c Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Tue Oct 21 09:47:20 2008 @@ -284,6 +284,8 @@ LARGE_INTEGER Timeout; PCM_DELAY_DEREF_KCB_ITEM Entry; PAGED_CODE(); + CMTRACE(CM_REFERENCE_DEBUG, + "%s - Dereferencing KCB: %p\n", __FUNCTION__, Kcb); /* Get the previous reference count */ OldRefCount = *(PLONG)&Kcb->RefCount;

1 0

[jimtabor] 36869: - Plug in GetDeviceCaps for gdi.
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Mon Oct 20 21:56:36 2008 New Revision: 36869 URL: http://svn.reactos.org/svn/reactos?rev=36869&view=rev Log: - Plug in GetDeviceCaps for gdi. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Oct 20 21:56:36 2008 @@ -2004,20 +2004,6 @@ return FALSE; } - -/* - * @implemented - * - */ -int -STDCALL -GetDeviceCaps(HDC hdc, - int i) -{ - /* FIXME some part need be done in user mode */ - return NtGdiGetDeviceCaps(hdc,i); -} - /* * @implemented * Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Oct 20 21:56:36 2008 @@ -465,6 +465,179 @@ return GetDCObject(hdc, uObjectType); } +/* + * @implemented + * + */ +int +STDCALL +GetDeviceCaps(HDC hDC, + int i) +{ + PDC_ATTR Dc_Attr; + PLDC pLDC; + PDEVCAPS pDevCaps = GdiDevCaps; // Primary display device capabilities. + DPRINT("Device CAPS1\n"); + + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + { + if ( i == TECHNOLOGY) return DT_METAFILE; + return 0; + } + else + { + pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (!(pLDC->Flags & LDC_DEVCAPS)) + { + if (!NtGdiGetDeviceCapsAll(hDC, &pLDC->DevCaps)) + SetLastError(ERROR_INVALID_PARAMETER); + pLDC->Flags |= LDC_DEVCAPS; + } + pDevCaps = &pLDC->DevCaps; + } + } + else + { + // HAX!!!! + // Due to winlogon process/thread mapping issues we have this hax! + // + return NtGdiGetDeviceCaps(hDC,i); + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) + return 0; + if (!(Dc_Attr->ulDirty_ & DC_PRIMARY_DISPLAY) ) + return NtGdiGetDeviceCaps(hDC,i); + } + DPRINT("Device CAPS2\n"); + + switch (i) + { + case DRIVERVERSION: + return pDevCaps->ulVersion; + + case TECHNOLOGY: + return pDevCaps->ulTechnology; + + case HORZSIZE: + return pDevCaps->ulHorzSize; + + case VERTSIZE: + return pDevCaps->ulVertSize; + + case HORZRES: + return pDevCaps->ulHorzRes; + + case VERTRES: + return pDevCaps->ulVertRes; + + case LOGPIXELSX: + return pDevCaps->ulLogPixelsX; + + case LOGPIXELSY: + return pDevCaps->ulLogPixelsY; + + case BITSPIXEL: + return pDevCaps->ulBitsPixel; + + case PLANES: + return pDevCaps->ulPlanes; + + case NUMBRUSHES: + return -1; + + case NUMPENS: + return pDevCaps->ulNumPens; + + case NUMFONTS: + return pDevCaps->ulNumFonts; + + case NUMCOLORS: + return pDevCaps->ulNumColors; + + case ASPECTX: + return pDevCaps->ulAspectX; + + case ASPECTY: + return pDevCaps->ulAspectY; + + case ASPECTXY: + return pDevCaps->ulAspectXY; + + case CLIPCAPS: + return CP_RECTANGLE; + + case SIZEPALETTE: + return pDevCaps->ulSizePalette; + + case NUMRESERVED: + return 20; + + case COLORRES: + return pDevCaps->ulColorRes; + + case DESKTOPVERTRES: + return pDevCaps->ulVertRes; + + case DESKTOPHORZRES: + return pDevCaps->ulHorzRes; + + case BLTALIGNMENT: + return pDevCaps->ulBltAlignment; + + case SHADEBLENDCAPS: + return pDevCaps->ulShadeBlend; + + case COLORMGMTCAPS: + return pDevCaps->ulColorMgmtCaps; + + case PHYSICALWIDTH: + return pDevCaps->ulPhysicalWidth; + + case PHYSICALHEIGHT: + return pDevCaps->ulPhysicalHeight; + + case PHYSICALOFFSETX: + return pDevCaps->ulPhysicalOffsetX; + + case PHYSICALOFFSETY: + return pDevCaps->ulPhysicalOffsetY; + + case VREFRESH: + return pDevCaps->ulVRefresh; + + case RASTERCAPS: + return pDevCaps->ulRasterCaps; + + case CURVECAPS: + return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | + CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); + + case LINECAPS: + return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | + LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); + + case POLYGONALCAPS: + return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | + PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); + + case TEXTCAPS: + return pDevCaps->ulTextCaps; + + case PDEVICESIZE: + case SCALINGFACTORX: + case SCALINGFACTORY: + default: + return 0; + } + return 0; +} /* * @implemented

1 0

[jimtabor] 36868: - Finish shared info based on XP and update user connect.
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Mon Oct 20 19:23:49 2008 New Revision: 36868 URL: http://svn.reactos.org/svn/reactos?rev=36868&view=rev Log: - Finish shared info based on XP and update user connect. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Oct 20 19:23:49 2008 @@ -414,17 +414,29 @@ PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); +typedef struct _WNDMSG +{ + DWORD maxMsgs; + DWORD abMsgs; +} WNDMSG, *PWNDMSG; + typedef struct _SHAREDINFO { PSERVERINFO psi; // global Server Info PVOID aheList; // Handle Entry List PVOID pDispInfo; // global PDISPLAYINFO pointer ULONG_PTR ulSharedDelta; // Heap delta + WNDMSG awmControl[31]; + WNDMSG DefWindowMsgs; + WNDMSG DefWindowSpecMsgs; } SHAREDINFO, *PSHAREDINFO; typedef struct _USERCONNECT { - SHAREDINFO ShareInfo; + DWORD Unknown0; + DWORD Unknown1; + DWORD Unknown2; + SHAREDINFO ShareInfo; } USERCONNECT, *PUSERCONNECT; //

1 0

[jimtabor] 36867: - Quick setup for NtUserProcessConnect.
by jimtabor＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: jimtabor Date: Mon Oct 20 18:43:11 2008 New Revision: 36867 URL: http://svn.reactos.org/svn/reactos?rev=36867&view=rev Log: - Quick setup for NtUserProcessConnect. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Oct 20 18:43:11 2008 @@ -413,6 +413,19 @@ PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); + +typedef struct _SHAREDINFO +{ + PSERVERINFO psi; // global Server Info + PVOID aheList; // Handle Entry List + PVOID pDispInfo; // global PDISPLAYINFO pointer + ULONG_PTR ulSharedDelta; // Heap delta +} SHAREDINFO, *PSHAREDINFO; + +typedef struct _USERCONNECT +{ + SHAREDINFO ShareInfo; +} USERCONNECT, *PUSERCONNECT; // // Non SDK Window Message types. @@ -1916,12 +1929,12 @@ HDC hdcBlt, UINT nFlags); -DWORD +NTSTATUS NTAPI NtUserProcessConnect( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + IN HANDLE Process, + OUT PUSERCONNECT pUserConnect, + IN DWORD dwSize); // sizeof(USERCONNECT) DWORD NTAPI

1 0

[jimtabor] 36866: - Quick setup for NtUserProcessConnect.
by jimtabor＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: jimtabor Date: Mon Oct 20 18:42:53 2008 New Revision: 36866 URL: http://svn.reactos.org/svn/reactos?rev=36866&view=rev Log: - Quick setup for NtUserProcessConnect. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Mon Oct 20 18:42:53 2008 @@ -850,12 +850,12 @@ return 0; } -DWORD +NTSTATUS NTAPI NtUserProcessConnect( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) + HANDLE Process, + PUSERCONNECT pUserConnect, + DWORD Size) { UNIMPLEMENTED; return 0;

1 0

[tkreuzer] 36865: revert rtl build changes
by tkreuzer＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: tkreuzer Date: Mon Oct 20 18:40:10 2008 New Revision: 36865 URL: http://svn.reactos.org/svn/reactos?rev=36865&view=rev Log: revert rtl build changes Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Mon Oct 20 18:40:10 2008 @@ -11,7 +11,7 @@ <library>freeldr_main</library> <library>rossym</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>libcntpr</library> <linkerflag>-static</linkerflag> <linkerflag>-lgcc</linkerflag> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Mon Oct 20 18:40:10 2008 @@ -9,7 +9,7 @@ <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>libcntpr</library> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Mon Oct 20 18:40:10 2008 @@ -1,15 +1,105 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="rtl" type="staticlibrary"> + <define name="_NTOSKRNL_" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="NO_RTL_INLINES" /> + <define name="_NTSYSTEM_" /> + <define name="_NTDLLBUILD_" /> + <include base="rtl">.</include> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>debug_asm.S</file> + <file>except_asm.s</file> + <file>except.c</file> + <file>random_asm.S</file> + <file>rtlswap.S</file> + <file>rtlmem.s</file> + <file>res_asm.s</file> + <file>thread.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>debug.c</file> + <file>except.c</file> + <file>interlocked.c</file> + <file>rtlmem.s</file> + <file>rtlswap.s</file> + <file>thread.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>debug_asm.S</file> + </directory> + <file>mem.c</file> + <file>memgen.c</file> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>debug_asm.S</file> + </directory> + </if> + <directory name="austin"> + <file>avl.c</file> + <file>tree.c</file> + </directory> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="rtl_umode" type="staticlibrary"> - <xi:include href="rtl-common.rbuild" /> - </module> - - <module name="rtl_kmode" type="staticlibrary"> - <xi:include href="rtl-common.rbuild" /> - </module> - -  - <module name="rtl" type="staticlibrary" /> -</group> + <file>access.c</file> + <file>acl.c</file> + <file>actctx.c</file> + <file>atom.c</file> + <file>bitmap.c</file> + <file>bootdata.c</file> + <file>compress.c</file> + <file>condvar.c</file> + <file>crc32.c</file> + <file>critical.c</file> + <file>dbgbuffer.c</file> + <file>debug.c</file> + <file>dos8dot3.c</file> + <file>encode.c</file> + <file>env.c</file> + <file>error.c</file> + <file>exception.c</file> + <file>generictable.c</file> + <file>handle.c</file> + <file>heap.c</file> + <file>image.c</file> + <file>interlck.c</file> + <file>message.c</file> + <file>largeint.c</file> + <file>luid.c</file> + <file>network.c</file> + <file>nls.c</file> + <file>path.c</file> + <file>ppb.c</file> + <file>process.c</file> + <file>propvar.c</file> + <file>qsort.c</file> + <file>random.c</file> + <file>rangelist.c</file> + <file>registry.c</file> + <file>res.c</file> + <file>resource.c</file> + <file>sd.c</file> + <file>security.c</file> + <file>slist.c</file> + <file>sid.c</file> + <file>sprintf.c</file> + <file>srw.c</file> + <file>swprintf.c</file> + <file>splaytree.c</file> + <file>thread.c</file> + <file>time.c</file> + <file>timezone.c</file> + <file>timerqueue.c</file> + <file>unicode.c</file> + <file>unicodeprefix.c</file> + <file>vectoreh.c</file> + <file>version.c</file> + <file>wait.c</file> + <file>workitem.c</file> + <pch>rtl.h</pch> +</module> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Oct 20 18:40:10 2008 @@ -26,7 +26,7 @@ <library>hal</library> <library>pseh</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>rossym</library> <library>libcntpr</library> <library>kdcom</library>

1 0

[cgutman] 36864: - Merge aicom-network-fixes up to r36861
by cgutman＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: cgutman Date: Mon Oct 20 16:57:06 2008 New Revision: 36864 URL: http://svn.reactos.org/svn/reactos?rev=36864&view=rev Log: - Merge aicom-network-fixes up to r36861 Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/ports.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/network/transmit.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -163,6 +163,12 @@ NTAPI MiniportWorker(IN PVOID WorkItem); +VOID NTAPI +MiniSendComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN PNDIS_PACKET Packet, + IN NDIS_STATUS Status); + #endif /* __MINIPORT_H */ /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -265,11 +265,29 @@ IN BOOLEAN AddressingReset) { PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; - NDIS_DbgPrint(MIN_TRACE, ("FIXME: MiniResetComplete is partially implemented\n")); + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.ResetCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + Status); + + CurrentEntry = CurrentEntry->Flink; + } + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -296,7 +296,66 @@ IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets) { - UNIMPLEMENTED + PADAPTER_BINDING AdapterBinding = NdisBindingHandle; + PLOGICAL_ADAPTER Adapter = AdapterBinding->Adapter; + KIRQL RaiseOldIrql; + NDIS_STATUS NdisStatus; + UINT i; + + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); + for (i = 0; i < NumberOfPackets; i++) + { + NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniSendComplete(Adapter, PacketArray[i], NdisStatus); + } + } + else + { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); + KeLowerIrql(RaiseOldIrql); + for (i = 0; i < NumberOfPackets; i++) + { + NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniSendComplete(Adapter, PacketArray[i], NdisStatus); + } + } + } + else + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + for (i = 0; i < NumberOfPackets; i++) + { + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], 0); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniSendComplete(Adapter, PacketArray[i], NdisStatus); + } + } + else + { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + for (i = 0; i < NumberOfPackets; i++) + { + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], 0); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniSendComplete(Adapter, PacketArray[i], NdisStatus); + } + KeLowerIrql(RaiseOldIrql); + } + } } Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -76,7 +76,7 @@ ASSERT_KM_POINTER(Packet->Complete); Packet->Complete( Packet->Context, Packet->Packet, - NDIS_STATUS_REQUEST_ABORTED ); + ErrorCode ); } PoolFreeBuffer( Packet ); Modified: trunk/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/por… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -44,6 +44,7 @@ Port = htons(Port); ASSERT(Port >= PortSet->StartingPort); + ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -67,7 +68,7 @@ Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; @@ -76,6 +77,9 @@ ExReleaseFastMutex( &PortSet->Mutex ); AllocatedPort = htons(AllocatedPort); + + ASSERT(AllocatedPort >= PortSet->StartingPort); + ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); return AllocatedPort; } @@ -109,5 +113,8 @@ AllocatedPort = htons(AllocatedPort); + ASSERT(AllocatedPort >= PortSet->StartingPort); + ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); + return AllocatedPort; } Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -390,7 +390,7 @@ TI_DbgPrint(DEBUG_ROUTER, ("Leaving\n")); - return Found ? STATUS_NO_SUCH_FILE : STATUS_SUCCESS; + return Found ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Oct 20 16:57:06 2008 @@ -28,6 +28,7 @@ */ { PIPFRAGMENT_CONTEXT IFC = (PIPFRAGMENT_CONTEXT)Context; + NTSTATUS Status; TI_DbgPrint (MAX_TRACE, @@ -35,8 +36,14 @@ Context, NdisPacket, NdisStatus)); if (NT_SUCCESS(NdisStatus) && PrepareNextFragment(IFC)) { - /* A fragment was prepared for transmission, so send it */ - IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); + /* A fragment was prepared for transmission, so send it */ + Status = IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); + if (!NT_SUCCESS(Status)) + { + FreeNdisPacket(IFC->NdisPacket); + IFC->Complete(IFC->Context, IFC->Datagram, Status); + exFreePool(IFC); + } } else { TI_DbgPrint(MAX_TRACE, ("Calling completion handler.\n")); @@ -87,7 +94,7 @@ TI_DbgPrint(MAX_TRACE, ("Called. IFC (0x%X)\n", IFC)); - if (IFC->BytesLeft != 0) { + if (IFC->BytesLeft > 0) { TI_DbgPrint(MAX_TRACE, ("Preparing 1 fragment.\n")); @@ -203,7 +210,12 @@ /* Prepare next fragment for transmission and send it */ - PrepareNextFragment(IFC); + if (!PrepareNextFragment(IFC)) { + FreeNdisPacket(IFC->NdisPacket); + ExFreePool(IFC); + return NDIS_STATUS_FAILURE; + } + return IPSendFragment(IFC->NdisPacket, NCE, IFC); }

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