Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36513: set eol-style:native
by cwittich＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: cwittich Date: Thu Sep 25 12:53:05 2008 New Revision: 36513 URL: http://svn.reactos.org/svn/reactos?rev=36513&view=rev Log: set eol-style:native Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c (contents, props changed) Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] Thu Sep 25 12:53:05 2008 @@ -1,57 +1,57 @@ -#include "precomp.h" - -BOOL -WINAPI -Arc( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXStartArc, - int nYStartArc, - int nXEndArc, - int nYEndArc -) -{ -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) -// Call Wine (rewrite of) MFDRV_MetaParam8 - return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { -// Call Wine (rewrite of) EMFDRV_ArcChordPie - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC); - return Ret; - } - return FALSE; - } - } -#endif - return NtGdiArcInternal(GdiTypeArc, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXStartArc, - nYStartArc, - nXEndArc, - nYEndArc); -} - - +#include "precomp.h" + +BOOL +WINAPI +Arc( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXStartArc, + int nYStartArc, + int nXEndArc, + int nYEndArc +) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) +// Call Wine (rewrite of) MFDRV_MetaParam8 + return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { +// Call Wine (rewrite of) EMFDRV_ArcChordPie + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeArc, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXStartArc, + nYStartArc, + nXEndArc, + nYEndArc); +} + + /* * @implemented */ @@ -64,175 +64,175 @@ FLOAT StartAngle, FLOAT SweepAngle) { - gxf_long worker, worker1; - - worker.f = StartAngle; - worker1.f = SweepAngle; - -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; //No meta support for AngleArc - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_AngleArc( hDC, X, Y, Radius, StartAngle, SweepAngle); - return Ret; - } - return FALSE; - } - } -#endif - return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)worker.l, (DWORD)worker1.l); -} - -BOOL -WINAPI -ArcTo( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXRadial1, - int nYRadial1, - int nXRadial2, - int nYRadial2) -{ -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; //No meta support for ArcTo - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO); - return Ret; - } - return FALSE; - } - } -#endif - return NtGdiArcInternal(GdiTypeArcTo, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXRadial1, - nYRadial1, - nXRadial2, - nYRadial2); -} - -BOOL -WINAPI -Chord( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXRadial1, - int nYRadial1, - int nXRadial2, - int nYRadial2) -{ -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD); - return Ret; - } - return FALSE; - } - } -#endif - return NtGdiArcInternal(GdiTypeChord, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXRadial1, - nYRadial1, - nXRadial2, - nYRadial2); -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -Pie( - HDC hDC, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 - ) -{ -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE); - return Ret; - } - return FALSE; - } - } -#endif - return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); -} - - + gxf_long worker, worker1; + + worker.f = StartAngle; + worker1.f = SweepAngle; + +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; //No meta support for AngleArc + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_AngleArc( hDC, X, Y, Radius, StartAngle, SweepAngle); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)worker.l, (DWORD)worker1.l); +} + +BOOL +WINAPI +ArcTo( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; //No meta support for ArcTo + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeArcTo, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + +BOOL +WINAPI +Chord( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeChord, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +Pie( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} + + Propchange: trunk/reactos/dll/win32/gdi32/objects/arc.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 36512: Get back recursive FsRtlIsNameInExpresion and leave non recursive one commented out. This fixes pierre-fsd branch
by pschweitzer＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: pschweitzer Date: Thu Sep 25 10:57:29 2008 New Revision: 36512 URL: http://svn.reactos.org/svn/reactos?rev=36512&view=rev Log: Get back recursive FsRtlIsNameInExpresion and leave non recursive one commented out. This fixes pierre-fsd branch Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Thu Sep 25 10:57:29 2008 @@ -268,7 +268,8 @@ * rewritten to avoid recursion and better wildcard handling * should be implemented (see FsRtlDoesNameContainWildCards). * - *--*/ + *--*/ +#if 0 BOOLEAN NTAPI FsRtlIsNameInExpression(IN PUNICODE_STRING Expression, @@ -316,4 +317,95 @@ return FALSE; } - +#endif +BOOLEAN +NTAPI +FsRtlIsNameInExpression(IN PUNICODE_STRING Expression, + IN PUNICODE_STRING Name, + IN BOOLEAN IgnoreCase, + IN PWCHAR UpcaseTable OPTIONAL) +{ + USHORT ExpressionPosition, NamePosition; + UNICODE_STRING TempExpression, TempName; + + ExpressionPosition = 0; + NamePosition = 0; + while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + NamePosition < (Name->Length / sizeof(WCHAR))) + { + if (Expression->Buffer[ExpressionPosition] == L'*') + { + ExpressionPosition++; + if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) + { + return TRUE; + } + while (NamePosition < (Name->Length / sizeof(WCHAR))) + { + TempExpression.Length = + TempExpression.MaximumLength = + Expression->Length - (ExpressionPosition * sizeof(WCHAR)); + TempExpression.Buffer = Expression->Buffer + ExpressionPosition; + TempName.Length = + TempName.MaximumLength = + Name->Length - (NamePosition * sizeof(WCHAR)); + TempName.Buffer = Name->Buffer + NamePosition; + /* FIXME: Rewrite to get rid of recursion */ + if (FsRtlIsNameInExpression(&TempExpression, &TempName, + IgnoreCase, UpcaseTable)) + { + return TRUE; + } + NamePosition++; + } + } + else + { + if (Expression->Buffer[ExpressionPosition] == L'?' || ( + IgnoreCase && !UpcaseTable && + RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == + RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || + (!IgnoreCase && Expression->Buffer[ExpressionPosition] == + Name->Buffer[NamePosition])) + { + NamePosition++; + + ExpressionPosition++; + } + else if (IgnoreCase && UpcaseTable) + { + if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == + UpcaseTable[Name->Buffer[NamePosition]]) + { + NamePosition++; + ExpressionPosition++; + } + } + else + { + return FALSE; + } + } + } + + /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ + if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + Expression->Buffer[ExpressionPosition] == L'.') + { + while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + (Expression->Buffer[ExpressionPosition] == L'.' || + Expression->Buffer[ExpressionPosition] == L'*' || + Expression->Buffer[ExpressionPosition] == L'?')) + { + ExpressionPosition++; + } + } + + if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && + NamePosition == (Name->Length / sizeof(WCHAR))) + { + return TRUE; + } + + return FALSE; +}

1 0

[tkreuzer] 36511: Fix the "fix".
by tkreuzer＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: tkreuzer Date: Thu Sep 25 10:56:14 2008 New Revision: 36511 URL: http://svn.reactos.org/svn/reactos?rev=36511&view=rev Log: Fix the "fix". Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Thu Sep 25 10:56:14 2008 @@ -504,7 +504,7 @@ } cleanup: - hThread = (HANDLE)(ULONG_PTR)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread);

1 0

[jimtabor] 36510: - Add Defer Window Position Handle type for multiple-window ? position structure.
by jimtabor＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: jimtabor Date: Thu Sep 25 10:39:33 2008 New Revision: 36510 URL: http://svn.reactos.org/svn/reactos?rev=36510&view=rev Log: - Add Defer Window Position Handle type for multiple-window ? position structure. Modified: trunk/reactos/subsystems/win32/win32k/include/object.h Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Thu Sep 25 10:39:33 2008 @@ -47,7 +47,8 @@ otWindow, otMenu, otCursorIcon, - otHook = 5, + otDWP, + otHook, otCallProc = 7, otAccel, otMonitor = 12,

1 0

[sginsberg] 36509: - Implement and export PsIsSystemProcess and add it to the NDK
by sginsberg＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sginsberg Date: Thu Sep 25 09:39:38 2008 New Revision: 36509 URL: http://svn.reactos.org/svn/reactos?rev=36509&view=rev Log: - Implement and export PsIsSystemProcess and add it to the NDK Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Thu Sep 25 09:39:38 2008 @@ -133,6 +133,13 @@ BOOLEAN NTAPI PsIsProtectedProcess( + IN PEPROCESS Process +); + +NTKERNELAPI +BOOLEAN +NTAPI +PsIsSystemProcess( IN PEPROCESS Process ); Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Thu Sep 25 09:39:38 2008 @@ -988,7 +988,7 @@ @ stdcall PsImpersonateClient(ptr ptr long long long) @ extern PsInitialSystemProcess @ stdcall PsIsProcessBeingDebugged(ptr) -;PsIsSystemProcess +@ stdcall PsIsSystemProcess(ptr) @ stdcall PsIsSystemThread(ptr) @ stdcall PsIsThreadImpersonating(ptr) @ stdcall PsIsThreadTerminating(ptr) Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Sep 25 09:39:38 2008 @@ -1158,6 +1158,17 @@ /* * @implemented */ +BOOLEAN +NTAPI +PsIsSystemProcess(IN PEPROCESS Process) +{ + /* Return if this is the System Process */ + return Process == PsInitialSystemProcess; +} + +/* + * @implemented + */ VOID NTAPI PsSetProcessPriorityClass(PEPROCESS Process,

1 0

[sginsberg] 36508: - Implement IoGetPagingIoPriority and fix its export
by sginsberg＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sginsberg Date: Thu Sep 25 09:29:11 2008 New Revision: 36508 URL: http://svn.reactos.org/svn/reactos?rev=36508&view=rev Log: - Implement IoGetPagingIoPriority and fix its export Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu Sep 25 09:29:11 2008 @@ -1535,16 +1535,37 @@ } /* - * @unimplemented + * @implemented */ IO_PAGING_PRIORITY -NTAPI +FASTCALL IoGetPagingIoPriority(IN PIRP Irp) { - UNIMPLEMENTED; - - /* Lie and say this isn't a paging IRP -- FIXME! */ - return IoPagingPriorityInvalid; + IO_PAGING_PRIORITY Priority; + ULONG Flags; + + /* Get the flags */ + Flags = Irp->Flags; + + /* Check what priority it has */ + if (Flags & 0x8000) // FIXME: Undocumented flag + { + /* High priority */ + Priority = IoPagingPriorityHigh; + } + else if (Flags & IRP_PAGING_IO) + { + /* Normal priority */ + Priority = IoPagingPriorityNormal; + } + else + { + /* Invalid -- not a paging IRP */ + Priority = IoPagingPriorityInvalid; + } + + /* Return the priority */ + return Priority; } /* Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Thu Sep 25 09:29:11 2008 @@ -415,7 +415,7 @@ @ stdcall IoGetFileObjectGenericMapping() @ stdcall IoGetInitialStack() @ stdcall IoGetLowerDeviceObject(ptr) -@ stdcall IoGetPagingIoPriority(ptr) +@ fastcall IoGetPagingIoPriority(ptr) @ stdcall IoGetRelatedDeviceObject(ptr) @ stdcall IoGetRequestorProcess(ptr) @ stdcall IoGetRequestorProcessId(ptr)

1 0

[sginsberg] 36507: - Add WmiQueryTraceInformation, WmiTraceMessage and WmiTraceMessageVa stubs and exports
by sginsberg＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sginsberg Date: Thu Sep 25 09:25:22 2008 New Revision: 36507 URL: http://svn.reactos.org/svn/reactos?rev=36507&view=rev Log: - Add WmiQueryTraceInformation, WmiTraceMessage and WmiTraceMessageVa stubs and exports Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Thu Sep 25 09:25:22 2008 @@ -1380,12 +1380,12 @@ ;WmiFlushTrace ;WmiGetClock ;WmiQueryTrace -;WmiQueryTraceInformation +@ stdcall WmiQueryTraceInformation(long ptr long ptr ptr) ;WmiStartTrace ;WmiStopTrace ;WmiTraceFastEvent -;WmiTraceMessage -;WmiTraceMessageVa +@ cdecl WmiTraceMessage() +@ stdcall WmiTraceMessageVa(ptr long ptr long long) ;WmiUpdateTrace ;XIPDispatch @ stdcall ZwAccessCheckAndAuditAlarm(ptr ptr ptr ptr ptr long ptr long ptr ptr ptr) Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=365… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Thu Sep 25 09:25:22 2008 @@ -232,6 +232,51 @@ */ NTSTATUS NTAPI +WmiQueryTraceInformation(IN TRACE_INFORMATION_CLASS TraceInformationClass, + OUT PVOID TraceInformation, + IN ULONG TraceInformationLength, + OUT PULONG RequiredLength OPTIONAL, + IN PVOID Buffer OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +__cdecl +WmiTraceMessage(IN TRACEHANDLE LoggerHandle, + IN ULONG MessageFlags, + IN LPGUID MessageGuid, + IN USHORT MessageNumber, + IN ...) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +WmiTraceMessageVa(IN TRACEHANDLE LoggerHandle, + IN ULONG MessageFlags, + IN LPGUID MessageGuid, + IN USHORT MessageNumber, + IN va_list MessageArgList) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI NtTraceEvent(IN ULONG TraceHandle, IN ULONG Flags, IN ULONG TraceHeaderLength,

1 0

[fireball] 36506: - Fix one more totally "out of ideas how to create sections" MmCreateSection usage. Not only the MaximumSize is mandatory for file-backed sections, but an allocation type must be specified (SEC_COMMIT, and it's not the same as some humble "0" passed there as a value). - Fix ReactOS's MmCreateDataFileSection to ignore 0 value in the MaximumSize (it has an additional check for MaximumSize being non-NULL, but this should be removed in future).
by fireball＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: fireball Date: Thu Sep 25 06:24:51 2008 New Revision: 36506 URL: http://svn.reactos.org/svn/reactos?rev=36506&view=rev Log: - Fix one more totally "out of ideas how to create sections" MmCreateSection usage. Not only the MaximumSize is mandatory for file-backed sections, but an allocation type must be specified (SEC_COMMIT, and it's not the same as some humble "0" passed there as a value). - Fix ReactOS's MmCreateDataFileSection to ignore 0 value in the MaximumSize (it has an additional check for MaximumSize being non-NULL, but this should be removed in future). Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Sep 25 06:24:51 2008 @@ -2455,9 +2455,9 @@ * FIXME: Revise this once a locking order for file size changes is * decided */ - if (UMaximumSize != NULL) - { - MaximumSize = *UMaximumSize; + if ((UMaximumSize != NULL) && (UMaximumSize->QuadPart != 0)) + { + MaximumSize = *UMaximumSize; } else { @@ -3383,7 +3383,7 @@ ImageSectionObject, NULL)) { /* - * An other thread has initialized the some image in the background + * An other thread has initialized the same image in the background */ ExFreePool(ImageSectionObject->Segments); ExFreePool(ImageSectionObject); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Thu Sep 25 06:24:51 2008 @@ -278,6 +278,7 @@ PFONT_ENTRY Entry; PSECTION_OBJECT SectionObject; ULONG ViewSize = 0; + LARGE_INTEGER SectionSize; FT_Fixed XScale, YScale; UNICODE_STRING FontRegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); @@ -294,13 +295,14 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Could not font file: %wZ\n", FileName); + DPRINT("Could not load font file: %wZ\n", FileName); return 0; } + SectionSize.QuadPart = 0LL; Status = MmCreateSection((PVOID)&SectionObject, SECTION_ALL_ACCESS, - NULL, NULL, PAGE_READONLY, - 0, FileHandle, NULL); + NULL, &SectionSize, PAGE_READONLY, + SEC_COMMIT, FileHandle, NULL); if (!NT_SUCCESS(Status)) { DPRINT("Could not map file: %wZ\n", FileName);

1 0

[sserapion] 36505: Convert to spec. Protect _WIN32_WINNT from redefinition warning.
by sserapion＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sserapion Date: Thu Sep 25 00:43:26 2008 New Revision: 36505 URL: http://svn.reactos.org/svn/reactos?rev=36505&view=rev Log: Convert to spec. Protect _WIN32_WINNT from redefinition warning. Added: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec (contents, props changed) - copied, changed from r36479, branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h Removed: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def (removed) @@ -1,60 +1,0 @@ -EXPORTS -gluBeginCurve@4 -gluBeginPolygon@4 -gluBeginSurface@4 -gluBeginTrim@4 -gluBuild1DMipmapLevels@36 -gluBuild1DMipmaps@24 -gluBuild2DMipmapLevels@40 -gluBuild2DMipmaps@28 -gluBuild3DMipmapLevels@44 -gluBuild3DMipmaps@32 -gluCheckExtension@8 -gluCylinder@36 -gluDeleteNurbsRenderer@4 -gluDeleteQuadric@4 -gluDeleteTess@4 -gluDisk@28 -gluEndCurve@4 -gluEndPolygon@4 -gluEndSurface@4 -gluEndTrim@4 -gluErrorString@4 -gluGetNurbsProperty@12 -gluGetString@4 -gluGetTessProperty@12 -gluLoadSamplingMatrices@16 -gluLookAt@72 -gluNewNurbsRenderer@0 -gluNewQuadric@0 -gluNewTess@0 -gluNextContour@8 -gluNurbsCallback@12 -gluNurbsCallbackData@8 -gluNurbsCallbackDataEXT@8 -gluNurbsCurve@28 -gluNurbsProperty@12 -gluNurbsSurface@44 -gluOrtho2D@32 -gluPartialDisk@44 -gluPerspective@32 -gluPickMatrix@36 -gluProject@48 -gluPwlCurve@20 -gluQuadricCallback@12 -gluQuadricDrawStyle@8 -gluQuadricNormals@8 -gluQuadricOrientation@8 -gluQuadricTexture@8 -gluScaleImage@36 -gluSphere@20 -gluTessBeginContour@4 -gluTessBeginPolygon@8 -gluTessCallback@12 -gluTessEndContour@4 -gluTessEndPolygon@4 -gluTessNormal@28 -gluTessProperty@16 -gluTessVertex@12 -gluUnProject@48 -gluUnProject4@76 Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Thu Sep 25 00:43:26 2008 @@ -1,5 +1,5 @@ <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true"> - <importlibrary definition="glu32.def" /> + <importlibrary definition="glu32.spec.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> <include base="glu32">libnurbs/interface</include> @@ -14,6 +14,7 @@ <library>opengl32</library> <library>kernel32</library> <library>gdi32</library> + <file>glu32.spec</file> <directory name="libnurbs"> <directory name="interface"> <file>bezierEval.cc</file> Copied: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec (from r36479, branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] Thu Sep 25 00:43:26 2008 @@ -1,60 +1,53 @@ -EXPORTS -gluBeginCurve@4 -gluBeginPolygon@4 -gluBeginSurface@4 -gluBeginTrim@4 -gluBuild1DMipmapLevels@36 -gluBuild1DMipmaps@24 -gluBuild2DMipmapLevels@40 -gluBuild2DMipmaps@28 -gluBuild3DMipmapLevels@44 -gluBuild3DMipmaps@32 -gluCheckExtension@8 -gluCylinder@36 -gluDeleteNurbsRenderer@4 -gluDeleteQuadric@4 -gluDeleteTess@4 -gluDisk@28 -gluEndCurve@4 -gluEndPolygon@4 -gluEndSurface@4 -gluEndTrim@4 -gluErrorString@4 -gluGetNurbsProperty@12 -gluGetString@4 -gluGetTessProperty@12 -gluLoadSamplingMatrices@16 -gluLookAt@72 -gluNewNurbsRenderer@0 -gluNewQuadric@0 -gluNewTess@0 -gluNextContour@8 -gluNurbsCallback@12 -gluNurbsCallbackData@8 -gluNurbsCallbackDataEXT@8 -gluNurbsCurve@28 -gluNurbsProperty@12 -gluNurbsSurface@44 -gluOrtho2D@32 -gluPartialDisk@44 -gluPerspective@32 -gluPickMatrix@36 -gluProject@48 -gluPwlCurve@20 -gluQuadricCallback@12 -gluQuadricDrawStyle@8 -gluQuadricNormals@8 -gluQuadricOrientation@8 -gluQuadricTexture@8 -gluScaleImage@36 -gluSphere@20 -gluTessBeginContour@4 -gluTessBeginPolygon@8 -gluTessCallback@12 -gluTessEndContour@4 -gluTessEndPolygon@4 -gluTessNormal@28 -gluTessProperty@16 -gluTessVertex@12 -gluUnProject@48 -gluUnProject4@76 +@ stdcall gluBeginCurve(ptr) +@ stdcall gluBeginPolygon(ptr) +@ stdcall gluBeginSurface(ptr) +@ stdcall gluBeginTrim(ptr) +@ stdcall gluBuild1DMipmaps(long long long long long ptr) +@ stdcall gluBuild2DMipmaps(long long long long long long ptr) +@ stdcall gluCheckExtension(str ptr) +@ stdcall gluCylinder(ptr double double double long long) +@ stdcall gluDeleteNurbsRenderer(ptr) +@ stdcall gluDeleteQuadric(ptr) +@ stdcall gluDeleteTess(ptr) +@ stdcall gluDisk(ptr double double long long) +@ stdcall gluEndCurve(ptr) +@ stdcall gluEndPolygon(ptr) +@ stdcall gluEndSurface(ptr) +@ stdcall gluEndTrim(ptr) +@ stdcall gluErrorString(long) +@ stub gluErrorUnicodeStringEXT +@ stdcall gluGetNurbsProperty(ptr long ptr) +@ stdcall gluGetString(long) +@ stdcall gluGetTessProperty(ptr long double) +@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) +@ stdcall gluLookAt(double double double double double double double double double) +@ stdcall gluNewNurbsRenderer() +@ stdcall gluNewQuadric() +@ stdcall gluNewTess() +@ stdcall gluNextContour(ptr long) +@ stdcall gluNurbsCallback(ptr long ptr) +@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) +@ stdcall gluNurbsProperty(ptr long long) +@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) +@ stdcall gluOrtho2D(double double double double) +@ stdcall gluPartialDisk(ptr double double long long double double) +@ stdcall gluPerspective(double double double double) +@ stdcall gluPickMatrix(double double double double ptr) +@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluPwlCurve(ptr long ptr long long) +@ stdcall gluQuadricCallback(ptr long ptr) +@ stdcall gluQuadricDrawStyle(ptr long) +@ stdcall gluQuadricNormals(ptr long) +@ stdcall gluQuadricOrientation(ptr long) +@ stdcall gluQuadricTexture(ptr long) +@ stdcall gluScaleImage(long long long long ptr long long long ptr) +@ stdcall gluSphere(ptr double long long) +@ stdcall gluTessBeginContour(ptr) +@ stdcall gluTessBeginPolygon(ptr ptr) +@ stdcall gluTessCallback(ptr long ptr) +@ stdcall gluTessEndContour(ptr) +@ stdcall gluTessEndPolygon(ptr) +@ stdcall gluTessNormal(ptr double double double) +@ stdcall gluTessProperty(ptr long double) +@ stdcall gluTessVertex(ptr ptr ptr) +@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Thu Sep 25 00:43:26 2008 @@ -40,7 +40,11 @@ #define NOIME #define NOMINMAX +#ifdef _WIN32_WINNT +#undef _WIN32_WINNT +#endif #define _WIN32_WINNT 0x0400 + #ifndef STRICT #define STRICT 1 #endif

1 0

[sserapion] 36504: Fix redefinition warning.
by sserapion＠svn.reactos.org 25 Sep '08

25 Sep '08

Author: sserapion Date: Thu Sep 25 00:15:16 2008 New Revision: 36504 URL: http://svn.reactos.org/svn/reactos?rev=36504&view=rev Log: Fix redefinition warning. Modified: branches/ros-amd64-bringup/reactos/include/host/typedefs.h Modified: branches/ros-amd64-bringup/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/host/typedefs.h [iso-8859-1] Thu Sep 25 00:15:16 2008 @@ -40,7 +40,7 @@ #define OPTIONAL #define FALSE 0 -#define TRUE (!(FALSE)) +#define TRUE 1 /* FIXME: this value is target specific, host tools MUST not use it * and this line has to be removed */

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