Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[jimtabor] 37128: - Update NtGdiGetGlyphOutline and NtGdiGetGlyphIndicesW.
by jimtabor＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: jimtabor Date: Sat Nov 1 07:08:07 2008 New Revision: 37128 URL: http://svn.reactos.org/svn/reactos?rev=37128&view=rev Log: - Update NtGdiGetGlyphOutline and NtGdiGetGlyphIndicesW. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sat Nov 1 07:08:07 2008 @@ -149,22 +149,75 @@ IN LPMAT2 pmat2, IN BOOL bIgnoreRotation) { - ULONG Ret; + ULONG Ret = GDI_ERROR; PDC dc; + PVOID pvBuf = NULL; + GLYPHMETRICS gm; + NTSTATUS Status = STATUS_SUCCESS; + dc = DC_LockDc(hdc); if (!dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } + + if (UnsafeBuf && cjBuf) + { + pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); + if (!pvBuf) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto Exit; + } + } + Ret = ftGdiGetGlyphOutline( dc, wch, iFormat, - pgm, + pgm ? &gm : NULL, cjBuf, - UnsafeBuf, + pvBuf, pmat2, bIgnoreRotation); + + if (pvBuf) + { + _SEH_TRY + { + ProbeForWrite(UnsafeBuf, cjBuf, 1); + RtlCopyMemory(UnsafeBuf, pvBuf, cjBuf); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + ExFreePoolWithTag(pvBuf, TAG_GDITEXT); + } + + if (pgm) + { + _SEH_TRY + { + ProbeForWrite(pgm, sizeof(GLYPHMETRICS), 1); + RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } + + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = GDI_ERROR; + } + +Exit: DC_UnlockDc(dc); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sat Nov 1 07:08:07 2008 @@ -2377,7 +2377,7 @@ OUTLINETEXTMETRICW *potm; INT i; FT_Face face; - WCHAR DefChar = 0; + WCHAR DefChar = 0xffff; PWSTR Buffer = NULL; ULONG Size; @@ -2444,8 +2444,17 @@ for (i = 0; i < cwc; i++) { - Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); - if (Buffer[i] == 0) Buffer[i] = DefChar; + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + if (Buffer[i] == 0) + { + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + Buffer[i] = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + else + Buffer[i] = DefChar; + } } IntUnLockFreeType; @@ -2518,7 +2527,7 @@ UINT iFormat, LPGLYPHMETRICS pgm, ULONG cjBuf, - OPTIONAL PVOID UnsafeBuf, + PVOID pvBuf, LPMAT2 pmat2, BOOL bIgnoreRotation) { @@ -2527,7 +2536,6 @@ PTEXTOBJ TextObj; PFONTGDI FontGDI; HFONT hFont = 0; - NTSTATUS Status; GLYPHMETRICS gm; ULONG Size; FT_Face ft_face; @@ -2545,13 +2553,12 @@ LONG aveWidth; INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ OUTLINETEXTMETRICW *potm; - PVOID pvBuf = NULL; int n = 0; FT_CharMap found = 0, charmap; XFORM xForm; DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, - cjBuf, UnsafeBuf, pmat2); + cjBuf, pvBuf, pmat2); Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; @@ -2561,7 +2568,7 @@ hFont = Dc_Attr->hlfntNew; TextObj = TEXTOBJ_LockText(hFont); -// DC_UnlockDc(dc); + if (!TextObj) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -2590,8 +2597,6 @@ { DPRINT("WARNING: No charmap selected!\n"); DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); - - for (n = 0; n < ft_face->num_charmaps; n++) { @@ -2643,7 +2648,7 @@ { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); IntUnLockFreeType; - if (potm) ExFreePool(potm); + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); return GDI_ERROR; } IntUnLockFreeType; @@ -2721,7 +2726,7 @@ needsTransform = TRUE; } - if (potm) ExFreePool(potm); /* It looks like we are finished with potm ATM.*/ + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); /* It looks like we are finished with potm ATM.*/ if (!needsTransform) { @@ -2784,16 +2789,7 @@ IntUnLockFreeType; - if (pgm) - { - Status = MmCopyToCaller(pgm, &gm, sizeof(GLYPHMETRICS)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return GDI_ERROR; - } - DPRINT("Copied GLYPHMETRICS to User!\n"); - } + if (pgm) RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); if (iFormat == GGO_METRICS) { @@ -2806,18 +2802,6 @@ DPRINT1("loaded a bitmap\n"); return GDI_ERROR; } - - if (UnsafeBuf && cjBuf) - { - pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); - if (pvBuf == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return GDI_ERROR; - } - RtlZeroMemory(pvBuf, cjBuf); - } - switch(iFormat) { @@ -2866,7 +2850,6 @@ default: DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); - if(pvBuf) ExFreePool(pvBuf); return GDI_ERROR; } break; @@ -2885,34 +2868,60 @@ if(!pvBuf || !cjBuf) break; - ft_bitmap.width = width; - ft_bitmap.rows = height; - ft_bitmap.pitch = pitch; - ft_bitmap.pixel_mode = ft_pixel_mode_grays; - ft_bitmap.buffer = pvBuf; - - IntLockFreeType; - if(needsTransform) + switch(ft_face->glyph->format) { - FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; + INT h = ft_face->glyph->bitmap.rows; + INT x; + while(h--) + { + for(x = 0; x < pitch; x++) + { + if(x < ft_face->glyph->bitmap.width) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + else + dst[x] = 0; + } + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + return needed; + } + case ft_glyph_format_outline: + { + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_grays; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if (needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + RtlZeroMemory(ft_bitmap.buffer, cjBuf); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + + if (iFormat == GGO_GRAY2_BITMAP) + mult = 4; + else if (iFormat == GGO_GRAY4_BITMAP) + mult = 16; + else if (iFormat == GGO_GRAY8_BITMAP) + mult = 64; + else + { + return GDI_ERROR; + } + } + default: + DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); + return GDI_ERROR; } - FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); - RtlZeroMemory(ft_bitmap.buffer, cjBuf); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; - - if(iFormat == GGO_GRAY2_BITMAP) - mult = 4; - else if(iFormat == GGO_GRAY4_BITMAP) - mult = 16; - else if(iFormat == GGO_GRAY8_BITMAP) - mult = 64; - else - { - ASSERT(0); - break; - } - start = pvBuf; for(row = 0; row < height; row++) { @@ -3132,24 +3141,10 @@ default: DPRINT1("Unsupported format %d\n", iFormat); - if(pvBuf) ExFreePool(pvBuf); return GDI_ERROR; } - if (pvBuf) - { - Status = MmCopyToCaller(UnsafeBuf, pvBuf, cjBuf); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(pvBuf); - return GDI_ERROR; - } - DPRINT("NtGdiGetGlyphOutline K -> U worked!\n"); - ExFreePool(pvBuf); - } - - DPRINT("NtGdiGetGlyphOutline END and needed %d\n", needed); + DPRINT("ftGdiGetGlyphOutline END and needed %d\n", needed); return needed; }

1 0

[sginsberg] 37127: - Implement most of SMP KeFlushEntireTb (currently unused though) - Update KiTbFlushTimeStamp on both UP and MP after flushing
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 07:01:58 2008 New Revision: 37127 URL: http://svn.reactos.org/svn/reactos?rev=37127&view=rev Log: - Implement most of SMP KeFlushEntireTb (currently unused though) - Update KiTbFlushTimeStamp on both UP and MP after flushing Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Nov 1 07:01:58 2008 @@ -994,6 +994,20 @@ return KeLargestCacheLine; } +VOID +NTAPI +KiFlushTargetEntireTb(IN PKIPI_CONTEXT PacketContext, + IN PVOID Ignored1, + IN PVOID Ignored2, + IN PVOID Ignored3) +{ + /* Signal this packet as done */ + KiIpiSignalPacketDone(PacketContext); + + /* Flush the TB for the Current CPU */ + KeFlushCurrentTb(); +} + /* * @implemented */ @@ -1003,19 +1017,50 @@ IN BOOLEAN AllProcessors) { KIRQL OldIrql; +#ifdef CONFIG_SMP + KAFFINITY TargetAffinity; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise the IRQL for the TB Flush */ OldIrql = KeRaiseIrqlToSynchLevel(); #ifdef CONFIG_SMP - /* FIXME: Support IPI Flush */ -#error Not yet implemented! + /* FIXME: Use KiTbFlushTimeStamp to synchronize TB flush */ + + /* Get the current processor affinity, and exclude ourselves */ + TargetAffinity = KeActiveProcessors; + TargetAffinity &= ~KeGetCurrentPrcb()->SetMember; + + /* Make sure this is MP */ + if (TargetAffinity) + { + /* Send an IPI TB flush to the other processors */ + KiIpiSendPacket(TargetAffinity, + KiFlushTargetEntireTb, + NULL, + 0, + NULL); + } #endif - /* Flush the TB for the Current CPU */ + /* Flush the TB for the Current CPU, and update the flush stamp */ KeFlushCurrentTb(); - /* Return to Original IRQL */ +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (TargetAffinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + + /* Update the flush stamp and return to original IRQL */ + InterlockedExchangeAdd(&KiTbFlushTimeStamp, 1); KeLowerIrql(OldIrql); }

1 0

[sginsberg] 37126: - Disable old and unused IPI code, add new NT compatible stubs - KiIpiSendRequest should be a fastcall named KiIpiSend, fix this and fix callers - Implement most of SMP KeIpiGenericCall. Also use KiReverseStallIpiLock instead of an uninitialized "KiIpiLock" - Fix KiIpiServiceRoutine -- 2nd argument should be PKEXCEPTION_FRAME
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 06:44:04 2008 New Revision: 37126 URL: http://svn.reactos.org/svn/reactos?rev=37126&view=rev Log: - Disable old and unused IPI code, add new NT compatible stubs - KiIpiSendRequest should be a fastcall named KiIpiSend, fix this and fix callers - Implement most of SMP KeIpiGenericCall. Also use KiReverseStallIpiLock instead of an uninitialized "KiIpiLock" - Fix KiIpiServiceRoutine -- 2nd argument should be PKEXCEPTION_FRAME Modified: trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -205,7 +205,7 @@ NTAPI KiIpiServiceRoutine( IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame + IN PKEXCEPTION_FRAME ExceptionFrame ); // Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -190,7 +190,7 @@ KeInitializeDpc(Dpc, KiHaltProcessorDpcRoutine, (PVOID)Dpc); KeSetTargetProcessorDpc(Dpc, i); KeInsertQueueDpc(Dpc, NULL, NULL); - KiIpiSendRequest(1 << i, IPI_DPC); + KiIpiSend(1 << i, IPI_DPC); } } KeLowerIrql(OldIrql); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -327,10 +327,33 @@ /* ipi.c ********************************************************************/ VOID -NTAPI -KiIpiSendRequest( +FASTCALL +KiIpiSend( KAFFINITY TargetSet, ULONG IpiRequest +); + +VOID +NTAPI +KiIpiSendPacket( + IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count +); + +VOID +FASTCALL +KiIpiSignalPacketDone( + IN PKIPI_CONTEXT PacketContext +); + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall( + IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall ); /* next file ***************************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -594,7 +594,7 @@ if ((NewThread) && !(KeGetPcr()->Number == Cpu)) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } } @@ -751,7 +751,7 @@ if (KeGetPcr()->Number != Processor) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_APC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_APC); } else { Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -1130,7 +1130,7 @@ if (i != (LONG)KeGetCurrentProcessorNumber()) { /* Send the IPI and give them one second to catch up */ - KiIpiSendRequest(1 << i, IPI_FREEZE); + KiIpiSend(1 << i, IPI_FREEZE); KeStallExecutionProcessor(1000000); } } Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -683,7 +683,7 @@ if (Prcb != CurrentPrcb) { /* It was, request and IPI */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } else { Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -14,10 +14,60 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK KiIpiLock; +extern KSPIN_LOCK KiReverseStallIpiLock; /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +KiIpiGenericCallTarget(IN PKIPI_CONTEXT PacketContext, + IN PVOID BroadcastFunction, + IN PVOID Argument, + IN PVOID Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSend(IN KAFFINITY TargetProcessors, + IN ULONG IpiRequest) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +NTAPI +KiIpiSendPacket(IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDone(IN PKIPI_CONTEXT PacketContext) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall(IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +#if 0 VOID NTAPI KiIpiSendRequest(IN KAFFINITY TargetSet, @@ -86,6 +136,7 @@ } #endif } +#endif /* PUBLIC FUNCTIONS **********************************************************/ @@ -95,7 +146,7 @@ BOOLEAN NTAPI KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame) + IN PKEXCEPTION_FRAME ExceptionFrame) { #ifdef CONFIG_SMP PKPRCB Prcb; @@ -141,32 +192,73 @@ KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, IN ULONG_PTR Argument) { -#ifdef CONFIG_SMP -#error Not yet implemented! -#else ULONG_PTR Status; KIRQL OldIrql, OldIrql2; +#ifdef CONFIG_SMP + KAFFINITY Affinity; + ULONG Count; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); if (OldIrql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); +#ifdef CONFIG_SMP + /* Get current processor count and affinity */ + Count = KeNumberProcessors; + Affinity = KeActiveProcessors; + + /* Exclude ourselves */ + Affinity &= ~KeGetCurrentPrcb()->SetMember; +#endif + /* Acquire the IPI lock */ - KefAcquireSpinLockAtDpcLevel(&KiIpiLock); + KeAcquireSpinLockAtDpcLevel(&KiReverseStallIpiLock); + +#ifdef CONFIG_SMP + /* Make sure this is MP */ + if (Affinity) + { + /* Send an IPI */ + KiIpiSendPacket(Affinity, + KiIpiGenericCallTarget, + Function, + Argument, + &Count); + + /* Spin until the other processors are ready */ + while ((volatile ULONG)Count != 1) YieldProcessor(); + } +#endif /* Raise to IPI level */ KeRaiseIrql(IPI_LEVEL, &OldIrql2); +#ifdef CONFIG_SMP + /* Let the other processors know it is time */ + Count = 0; +#endif + /* Call the function */ Status = Function(Argument); +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (Affinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + /* Release the lock */ - KefReleaseSpinLockFromDpcLevel(&KiIpiLock); + KeReleaseSpinLockFromDpcLevel(&KiReverseStallIpiLock); /* Lower IRQL back */ KeLowerIrql(OldIrql); return Status; -#endif -} - -/* EOF */ +} Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -253,7 +253,7 @@ if (KeGetCurrentProcessorNumber() != Thread->NextProcessor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); } return; } @@ -612,7 +612,7 @@ if (KeGetCurrentProcessorNumber() != Processor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_DPC); } } }

1 0

[cgutman] 37125: - Make sure ThunkTable is not NULL before attempting to free it - It gets set to NULL when the thunk is successfully added - I have no idea how this ever worked without this fix
by cgutman＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: cgutman Date: Fri Oct 31 20:00:08 2008 New Revision: 37125 URL: http://svn.reactos.org/svn/reactos?rev=37125&view=rev Log: - Make sure ThunkTable is not NULL before attempting to free it - It gets set to NULL when the thunk is successfully added - I have no idea how this ever worked without this fix Modified: trunk/reactos/ntoskrnl/mm/verifier.c Modified: trunk/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] Fri Oct 31 20:00:08 2008 @@ -146,7 +146,7 @@ KeLeaveCriticalRegion(); /* Free the table if we failed and return status */ - ExFreePool(ThunkTable); + if (ThunkTable) ExFreePool(ThunkTable); return Status; }

1 0

[cgutman] 37124: - Release the guarded mutex before we return
by cgutman＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: cgutman Date: Fri Oct 31 19:36:24 2008 New Revision: 37124 URL: http://svn.reactos.org/svn/reactos?rev=37124&view=rev Log: - Release the guarded mutex before we return Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c 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] Fri Oct 31 19:36:24 2008 @@ -96,6 +96,7 @@ default: { DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); + KeReleaseGuardedMutex(&PnpNotifyListLock); return; } }

1 0

[sserapion] 37123: Fix explorer build a bit more.
by sserapion＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sserapion Date: Fri Oct 31 19:31:10 2008 New Revision: 37123 URL: http://svn.reactos.org/svn/reactos?rev=37123&view=rev Log: Fix explorer build a bit more. Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] Fri Oct 31 19:31:10 2008 @@ -119,10 +119,10 @@ #define CLOCKS_PER_SEC 1000 - _CRTIMP int _daylight; - _CRTIMP long _dstbias; - _CRTIMP long _timezone; - _CRTIMP char * _tzname[2]; + __MINGW_IMPORT int _daylight; + __MINGW_IMPORT long _dstbias; + __MINGW_IMPORT long _timezone; + __MINGW_IMPORT char * _tzname[2]; _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight); _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias);

1 0

[sserapion] 37122: Fix explorer build a bit.
by sserapion＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sserapion Date: Fri Oct 31 19:30:48 2008 New Revision: 37122 URL: http://svn.reactos.org/svn/reactos?rev=37122&view=rev Log: Fix explorer build a bit. Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] Fri Oct 31 19:30:48 2008 @@ -148,8 +148,8 @@ w32fd.nFileSizeLow = e.size; // convert date/time attribute into FILETIME - const fdate& date = e.date; - const ftime& time = e.time; + const filedate& date = e.date; + const filetime& time = e.time; SYSTEMTIME stime; FILETIME ftime; Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h [iso-8859-1] Fri Oct 31 19:30:48 2008 @@ -118,13 +118,13 @@ }; -struct ftime { +struct filetime { WORD sec2 : 5; WORD min : 6; WORD hour : 5; }; -struct fdate { +struct filedate { WORD day : 5; WORD month : 4; WORD year : 7; @@ -150,15 +150,15 @@ char ext[3]; char attr; char rsrvd[10]; - struct ftime time; - struct fdate date; + struct filetime time; + struct filedate date; WORD fclus; DWORD size; }; union DEntry { DEntry_E E; - BYTE B[8+3+1+10+sizeof(struct ftime)+sizeof(struct fdate)+sizeof(WORD)+sizeof(DWORD)]; + BYTE B[8+3+1+10+sizeof(struct filetime)+sizeof(struct filedate)+sizeof(WORD)+sizeof(DWORD)]; }; #pragma pack(pop)

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 November 2008