Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 37759: fix a bug reported by aicom: get peer name fails running xitami web server
by arty＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: arty Date: Sun Nov 30 02:26:52 2008 New Revision: 37759 URL: http://svn.reactos.org/svn/reactos?rev=37759&view=rev Log: fix a bug reported by aicom: get peer name fails running xitami web server Modified: trunk/reactos/drivers/network/afd/afd.rbuild trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rb… ============================================================================== --- trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] Sun Nov 30 02:26:52 2008 @@ -3,6 +3,7 @@ <module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys"> <include base="afd">include</include> <include base="ReactOS">include/reactos/drivers</include> + <include base="ReactOS">include/ndk</include> <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Nov 30 02:26:52 2008 @@ -78,6 +78,10 @@ PMDL Mdl = NULL, SysMdl = NULL; PTDI_CONNECTION_INFORMATION ConnInfo = NULL; PTRANSPORT_ADDRESS TransAddr = NULL; + HANDLE ProcHandle = NULL; + BOOLEAN UnlockSysMdl = FALSE; + PVOID UserSpace = NULL; + ULONG Length, InOutLength; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -110,28 +114,67 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + // what follows is fucked up shit. + // i'm not sure how to avoid it + // sorry + // -- arty + if( FCB->Connection.Object == NULL || (FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CONNECTED) ) { return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); } - + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, - FCB->LocalAddress->Address[0].AddressType ) ) ) { - SysMdl = IoAllocateMdl - ( ConnInfo, - sizeof( TDI_CONNECTION_INFORMATION ) + - TaLengthOfTransportAddress - ( ConnInfo->RemoteAddress ), - FALSE, - FALSE, - NULL ); - } - + FCB->RemoteAddress->Address[0].AddressType ) ) ) { + + Length = TaLengthOfTransportAddress + (ConnInfo->RemoteAddress); + + if (NT_SUCCESS(Status)) + Status = ObOpenObjectByPointer + (PsGetCurrentProcess(), + 0, + NULL, + PROCESS_ALL_ACCESS, + PsProcessType, + KernelMode, + &ProcHandle); + + if (NT_SUCCESS(Status)) + { + InOutLength = + PAGE_ROUND_UP(sizeof(TDI_CONNECTION_INFO)); + + Status = NtAllocateVirtualMemory + (ProcHandle, + (PVOID*)&UserSpace, + PAGE_SHIFT, + &InOutLength, + MEM_COMMIT, + PAGE_READWRITE); + } + + if (NT_SUCCESS(Status)) + { + ExFreePool(ConnInfo); + ConnInfo = (PTDI_CONNECTION_INFORMATION)UserSpace; + + SysMdl = IoAllocateMdl + ( UserSpace, Length, FALSE, FALSE, NULL ); + } + else + { + ExFreePool(ConnInfo); + ConnInfo = NULL; + } + } + if( SysMdl ) { _SEH_TRY { MmProbeAndLockPages( SysMdl, Irp->RequestorMode, IoModifyAccess ); + UnlockSysMdl = TRUE; } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); Status = _SEH_GetExceptionCode(); @@ -156,8 +199,17 @@ else Status = STATUS_INSUFFICIENT_RESOURCES; } - if( ConnInfo ) ExFreePool( ConnInfo ); + if (UnlockSysMdl) + MmUnlockPages( SysMdl ); + if( SysMdl ) IoFreeMdl( SysMdl ); + if( ConnInfo ) + NtFreeVirtualMemory + ( ProcHandle, + (PVOID)ConnInfo, + &InOutLength, + MEM_RELEASE ); + if( ProcHandle ) NtClose(ProcHandle); if( TransAddr ) MmUnmapLockedPages( TransAddr, Mdl ); MmUnlockPages( Mdl ); IoFreeMdl( Mdl ); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sun Nov 30 02:26:52 2008 @@ -13,6 +13,12 @@ #define _AFD_H #include <ntddk.h> +#include <winddk.h> +#include <ntifs.h> +#include <ndk/obtypes.h> +#include <ndk/obfuncs.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> #include <tdi.h> #include <tdikrnl.h> #include <tdiinfo.h>

1 0

[hyperion] 37758: Left out of the previous commit by mistake
by hyperion＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: hyperion Date: Sun Nov 30 00:00:58 2008 New Revision: 37758 URL: http://svn.reactos.org/svn/reactos?rev=37758&view=rev Log: Left out of the previous commit by mistake Added: trunk/reactos/ntoskrnl/include/internal/probe.h (with props) Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Added: trunk/reactos/ntoskrnl/include/internal/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/probe.h (added) +++ trunk/reactos/ntoskrnl/include/internal/probe.h [iso-8859-1] Sun Nov 30 00:00:58 2008 @@ -1,0 +1,468 @@ +#ifndef __INCLUDE_INTERNAL_PROBE_H +#define __INCLUDE_INTERNAL_PROBE_H + +#include <reactos/probe.h> + +static +__inline +NTSTATUS +DefaultSetInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_SET)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeSET > 0 && + BufferLength != ClassList[Class].RequiredSizeSET) + { + if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentSET); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +static +__inline +NTSTATUS +DefaultQueryInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_QUERY)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeQUERY > 0 && + BufferLength != ClassList[Class].RequiredSizeQUERY) + { + if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (Buffer != NULL) + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +#endif +#ifndef __INCLUDE_INTERNAL_PROBE_H +#define __INCLUDE_INTERNAL_PROBE_H + +#include <reactos/probe.h> + +static +__inline +NTSTATUS +DefaultSetInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_SET)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeSET > 0 && + BufferLength != ClassList[Class].RequiredSizeSET) + { + if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentSET); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +static +__inline +NTSTATUS +DefaultQueryInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_QUERY)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeQUERY > 0 && + BufferLength != ClassList[Class].RequiredSizeQUERY) + { + if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (Buffer != NULL) + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +#endif +#ifndef __INCLUDE_INTERNAL_PROBE_H +#define __INCLUDE_INTERNAL_PROBE_H + +#include <reactos/probe.h> + +static +__inline +NTSTATUS +DefaultSetInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_SET)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeSET > 0 && + BufferLength != ClassList[Class].RequiredSizeSET) + { + if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentSET); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +static +__inline +NTSTATUS +DefaultQueryInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_QUERY)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeQUERY > 0 && + BufferLength != ClassList[Class].RequiredSizeQUERY) + { + if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (Buffer != NULL) + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +#endif +#ifndef __INCLUDE_INTERNAL_PROBE_H +#define __INCLUDE_INTERNAL_PROBE_H + +#include <reactos/probe.h> + +static +__inline +NTSTATUS +DefaultSetInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_SET)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeSET > 0 && + BufferLength != ClassList[Class].RequiredSizeSET) + { + if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentSET); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +static +__inline +NTSTATUS +DefaultQueryInfoBufferCheck(ULONG Class, + const INFORMATION_CLASS_INFO *ClassList, + ULONG ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_QUERY)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeQUERY > 0 && + BufferLength != ClassList[Class].RequiredSizeQUERY) + { + if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (Buffer != NULL) + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +#endif Propchange: trunk/reactos/ntoskrnl/include/internal/probe.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sun Nov 30 00:00:58 2008 @@ -2,3 +2,4 @@ /* Headers that shouldn't be precompiled due to GCC bugs */ #include <reactos/probe.h> +#include "internal/probe.h"

1 0

[hyperion] 37757: modified base/shell/explorer/explorer.rbuild The TDM build of gcc 4.3.2 is affected by PR 27067 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27067), apparently due to a missing MinGW-only patch - work around it in the linker modified dll/directx/ddraw/d3d/DirectD3D_main.c modified dll/directx/ddraw/Ddraw/ddraw_displaymode.c modified dll/directx/ddraw/Ddraw/ddraw_main.c modified dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c modified dll/directx/ddraw/Ddraw/GetCaps.c modifi
by hyperion＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: hyperion Date: Sat Nov 29 23:49:18 2008 New Revision: 37757 URL: http://svn.reactos.org/svn/reactos?rev=37757&view=rev Log: modified base/shell/explorer/explorer.rbuild The TDM build of gcc 4.3.2 is affected by PR 27067 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27067), apparently due to a missing MinGW-only patch - work around it in the linker modified dll/directx/ddraw/d3d/DirectD3D_main.c modified dll/directx/ddraw/Ddraw/ddraw_displaymode.c modified dll/directx/ddraw/Ddraw/ddraw_main.c modified dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c modified dll/directx/ddraw/Ddraw/GetCaps.c modified dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c modified dll/directx/ddraw/main.c modified dll/directx/ddraw/Surface/createsurface.c <pseh/pseh.h> already included in rosdraw.h modified dll/win32/advapi32/misc/trace.c Silence a warning reported by gcc 4.3.2 (possibly incorrectly, but it's just a stub anyway) modified ntoskrnl/include/internal/ntoskrnl.h added ntoskrnl/include/internal/probe.h replaced ntoskrnl/include/ntoskrnl.h added ntoskrnl/include/precomp.h modified ntoskrnl/ntoskrnl-generic.rbuild added subsystems/win32/win32k/pch.h replaced subsystems/win32/win32k/w32k.h modified subsystems/win32/win32k/win32k.rbuild gcc 4.3.2-tdm-1 doesn't like PSEH in precompiled headers. Shuffle things around a bit to remove PSEH from precompiled headers Added: trunk/reactos/ntoskrnl/include/precomp.h (with props) trunk/reactos/subsystems/win32/win32k/pch.h (with props) Modified: trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/win32/advapi32/misc/trace.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/subsystems/win32/win32k/w32k.h trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -63,6 +63,7 @@ <file>explorer.cpp</file> <file>i386-stub-win32.c</file> <file>explorer.rc</file> + <linkerflag>--enable-stdcall-fixup</linkerflag> </module> <installfile installbase=".">explorer-cfg-template.xml</installfile> <directory name="notifyhook"> Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -20,10 +20,6 @@ #include <string.h> -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - - HRESULT WINAPI Main_DirectDraw_GetCaps( LPDDRAWI_DIRECTDRAW_INT This, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -21,8 +21,6 @@ #include <string.h> -/* PSEH for SEH Support */ -#include <pseh/pseh.h> /* For DirectDraw 4 - 6 */ HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDDRAWI_DIRECTDRAW_INT This, Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -10,9 +10,6 @@ #include "rosdraw.h" - -/* PSEH for SEH Support */ -#include <pseh/pseh.h> HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -20,11 +20,6 @@ #include <string.h> -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - - - LPDDRAWI_DIRECTDRAW_INT internal_directdraw_int_alloc(LPDDRAWI_DIRECTDRAW_INT This) { Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -10,9 +10,6 @@ #include "rosdraw.h" -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDDRAWI_DIRECTDRAW_INT This, HWND hwnd, DWORD cooplevel) { Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -9,10 +9,6 @@ */ #include "rosdraw.h" -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - - /* * All parameters must have been checked if they are valid before they are passed to Internal_CreateSurface. * If not please fix the code in the functions which call Internal_CreateSurface. @@ -77,8 +73,8 @@ } /* - * program does not need set the DDSD_LPSURFACE, - * if they forget set it, the ddraw will autoamtic + * program does not need set the DDSD_LPSURFACE, + * if they forget set it, the ddraw will autoamtic * set it for system memory. */ if ( ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) && @@ -285,28 +281,28 @@ DxHeapMemFree(slist_gbl); *ppSurf = (LPDDRAWI_DDRAWSURFACE_INT) &slist_int[0]->lpVtbl; - + return DD_OK; cleanup: for(count = 0; count < num_of_surf; count++) { - if (slist_more[count] != NULL) + if (slist_more[count] != NULL) DxHeapMemFree(slist_more[count]); - if (slist_gbl[count] != NULL) + if (slist_gbl[count] != NULL) DxHeapMemFree(slist_gbl[count]); - if (slist_lcl[count] != NULL) + if (slist_lcl[count] != NULL) DxHeapMemFree(slist_lcl[count]); - if (slist_int[count] != NULL) + if (slist_int[count] != NULL) DxHeapMemFree(slist_int[count]); } - if (slist_more != NULL) + if (slist_more != NULL) DxHeapMemFree(slist_more); - if (slist_gbl != NULL) + if (slist_gbl != NULL) DxHeapMemFree(slist_gbl); - if (slist_lcl != NULL) + if (slist_lcl != NULL) DxHeapMemFree(slist_lcl); - if (slist_int != NULL) + if (slist_int != NULL) DxHeapMemFree(slist_int); return ret; Modified: trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/d3d/Dire… ============================================================================== --- trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -2,24 +2,21 @@ #include <string.h> -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - -HRESULT WINAPI +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D iface, REFIID riid, LPVOID * ppvObj) { DX_WINDBG_trace(); DX_STUB; } -ULONG WINAPI +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D iface) { DX_WINDBG_trace(); DX_STUB; } -ULONG WINAPI +ULONG WINAPI Main_D3D_Release(LPDIRECT3D iface) { DX_WINDBG_trace(); @@ -33,35 +30,35 @@ DX_STUB; } -HRESULT WINAPI +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D iface, LPD3DENUMDEVICESCALLBACK Callback, LPVOID Context) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI +HRESULT WINAPI Main_D3D_CreateLight(LPDIRECT3D iface, LPDIRECT3DLIGHT* Light,IUnknown* pUnkOuter) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI +HRESULT WINAPI Main_D3D_CreateMaterial(LPDIRECT3D iface,LPDIRECT3DMATERIAL* Direct3DLight,IUnknown* pUnkOuter) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI +HRESULT WINAPI Main_D3D_CreateViewport(LPDIRECT3D iface, LPDIRECT3DVIEWPORT* Viewport,IUnknown* pUnkOuter) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI +HRESULT WINAPI Main_D3D_FindDevice(LPDIRECT3D iface, LPD3DFINDDEVICESEARCH D3DDFS, LPD3DFINDDEVICERESULT D3DFDR) { DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -13,9 +13,6 @@ #include "rosdraw.h" HMODULE hDllModule = 0; -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - CRITICAL_SECTION ddcs; // This function is exported by the dll @@ -26,8 +23,8 @@ LPVOID lpContext; } DirectDrawEnumerateProcData; -BOOL -CALLBACK +BOOL +CALLBACK TranslateCallbackA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, @@ -180,8 +177,8 @@ return retVal; } -HRESULT -WINAPI +HRESULT +WINAPI DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, LPVOID lpContext) { @@ -297,7 +294,7 @@ for more info about this command see msdn documentation - The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or + The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or no struct at at all example for command D3DDP2OP_VIEWPORTINFO Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -27,7 +27,7 @@ ) { DPRINT1("GetTraceLoggerHandle stub()\n"); - return (TRACEHANDLE)INVALID_HANDLE_VALUE; + return HandleToUlong(INVALID_HANDLE_VALUE); /* BUGBUG: should we use HandleToLong instead? */ } 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] Sat Nov 29 23:49:18 2008 @@ -106,117 +106,6 @@ #define IQS(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ { sizeof(TypeQuery), sizeof(TypeSet), sizeof(AlignmentQuery), sizeof(AlignmentSet), Flags } -static -__inline -NTSTATUS -DefaultSetInfoBufferCheck(ULONG Class, - const INFORMATION_CLASS_INFO *ClassList, - ULONG ClassListEntries, - PVOID Buffer, - ULONG BufferLength, - KPROCESSOR_MODE PreviousMode) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (Class < ClassListEntries) - { - if (!(ClassList[Class].Flags & ICIF_SET)) - { - Status = STATUS_INVALID_INFO_CLASS; - } - else if (ClassList[Class].RequiredSizeSET > 0 && - BufferLength != ClassList[Class].RequiredSizeSET) - { - if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - } - - if (NT_SUCCESS(Status)) - { - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - ProbeForRead(Buffer, - BufferLength, - ClassList[Class].AlignmentSET); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - } - } - else - Status = STATUS_INVALID_INFO_CLASS; - - return Status; -} - -static -__inline -NTSTATUS -DefaultQueryInfoBufferCheck(ULONG Class, - const INFORMATION_CLASS_INFO *ClassList, - ULONG ClassListEntries, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength, - KPROCESSOR_MODE PreviousMode) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (Class < ClassListEntries) - { - if (!(ClassList[Class].Flags & ICIF_QUERY)) - { - Status = STATUS_INVALID_INFO_CLASS; - } - else if (ClassList[Class].RequiredSizeQUERY > 0 && - BufferLength != ClassList[Class].RequiredSizeQUERY) - { - if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - } - - if (NT_SUCCESS(Status)) - { - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - if (Buffer != NULL) - { - ProbeForWrite(Buffer, - BufferLength, - ClassList[Class].AlignmentQUERY); - } - - if (ReturnLength != NULL) - { - ProbeForWriteUlong(ReturnLength); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - } - } - else - Status = STATUS_INVALID_INFO_CLASS; - - return Status; -} - /* * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer @@ -250,6 +139,7 @@ C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); + C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); #ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -1,101 +1,4 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/include/ntoskrnl.h - * PURPOSE: Main Kernel Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ +#include "precomp.h" -/* INCLUDES ******************************************************************/ - -/* Version Data */ -#undef __MSVCRT__ -#include <psdk/ntverp.h> - -/* DDK/IFS/NDK Headers */ -#ifdef _MSC_VER -#include <excpt.h> -#include <ntdef.h> -#undef DECLSPEC_IMPORT -#define DECLSPEC_IMPORT -#endif -#include <ntifs.h> -#include <wdmguid.h> -#include <arc/arc.h> -#include <ntndk.h> -#undef TEXT -#define TEXT(s) L##s -#include <regstr.h> - -/* FIXME: Temporary until CC Ros is gone */ -#include <ccros.h> -#include <rosldr.h> - -/* Disk Dump Driver Header */ -#include <diskdump/diskdump.h> - -/* C Headers */ -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> -#include <malloc.h> -#include <wchar.h> - -/* SEH support with PSEH */ -#include <pseh/pseh.h> -#include <pseh/pseh2.h> - -/* ReactOS Headers */ -#include <reactos/buildno.h> -#include <reactos/bugcodes.h> -#define ExRaiseStatus RtlRaiseStatus +/* Headers that shouldn't be precompiled due to GCC bugs */ #include <reactos/probe.h> - -/* SetupLDR Support */ -#include <arc/setupblk.h> - -/* KD Support */ -#define NOEXTAPI -#include <windbgkd.h> -#include <wdbgexts.h> -#include <kddll.h> -#ifndef _WINKD_ -#include <reactos/rossym.h> -#endif - -/* PNP GUIDs */ -#include <umpnpmgr/sysguid.h> - -/* Helper Header */ -#include <reactos/helper.h> - -/* Internal Headers */ -#include "internal/ntoskrnl.h" -#include "config.h" - -// -// Define the internal versions of external and public global data -// -#define IoFileObjectType _IoFileObjectType -#define PsThreadType _PsThreadType -#define PsProcessType _PsProcessType -#define ExEventObjectType _ExEventObjectType -#define ExSemaphoreObjectType _ExSemaphoreObjectType -#define KdDebuggerEnabled _KdDebuggerEnabled -#define KdDebuggerNotPresent _KdDebuggerNotPresent -#define NlsOemLeadByteInfo _NlsOemLeadByteInfo -extern PUSHORT _NlsOemLeadByteInfo; -#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray -#undef LEGAL_ANSI_CHARACTER_ARRAY -#undef NLS_MB_CODE_PAGE_TAG -#undef NLS_OEM_LEAD_BYTE_INFO -#define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray -#define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag -#define NLS_OEM_LEAD_BYTE_INFO _NlsOemLeadByteInfo -#undef KD_DEBUGGER_ENABLED -#undef KD_DEBUGGER_NOT_PRESENT -#define KD_DEBUGGER_ENABLED KdDebuggerEnabled -#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent -#define HalDispatchTable _HalDispatchTable -#undef HALDISPATCH -#define HALDISPATCH (&HalDispatchTable) Added: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… ============================================================================== --- trunk/reactos/ntoskrnl/include/precomp.h (added) +++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -1,0 +1,100 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/ntoskrnl.h + * PURPOSE: Main Kernel Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* Version Data */ +#undef __MSVCRT__ +#include <psdk/ntverp.h> + +/* DDK/IFS/NDK Headers */ +#ifdef _MSC_VER +#include <excpt.h> +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#endif +#include <ntifs.h> +#include <wdmguid.h> +#include <arc/arc.h> +#include <ntndk.h> +#undef TEXT +#define TEXT(s) L##s +#include <regstr.h> + +/* FIXME: Temporary until CC Ros is gone */ +#include <ccros.h> +#include <rosldr.h> + +/* Disk Dump Driver Header */ +#include <diskdump/diskdump.h> + +/* C Headers */ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include <malloc.h> +#include <wchar.h> + +/* SEH support with PSEH */ +#include <pseh/pseh.h> +#include <pseh/pseh2.h> + +/* ReactOS Headers */ +#include <reactos/buildno.h> +#include <reactos/bugcodes.h> + +/* SetupLDR Support */ +#include <arc/setupblk.h> + +/* KD Support */ +#define NOEXTAPI +#include <windbgkd.h> +#include <wdbgexts.h> +#include <kddll.h> +#ifndef _WINKD_ +#include <reactos/rossym.h> +#endif + +/* PNP GUIDs */ +#include <umpnpmgr/sysguid.h> + +/* Helper Header */ +#include <reactos/helper.h> + +/* Internal Headers */ +#include "internal/ntoskrnl.h" +#include "config.h" + +// +// Define the internal versions of external and public global data +// +#define IoFileObjectType _IoFileObjectType +#define PsThreadType _PsThreadType +#define PsProcessType _PsProcessType +#define ExEventObjectType _ExEventObjectType +#define ExSemaphoreObjectType _ExSemaphoreObjectType +#define KdDebuggerEnabled _KdDebuggerEnabled +#define KdDebuggerNotPresent _KdDebuggerNotPresent +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo +extern PUSHORT _NlsOemLeadByteInfo; +#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray +#undef LEGAL_ANSI_CHARACTER_ARRAY +#undef NLS_MB_CODE_PAGE_TAG +#undef NLS_OEM_LEAD_BYTE_INFO +#define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray +#define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag +#define NLS_OEM_LEAD_BYTE_INFO _NlsOemLeadByteInfo +#undef KD_DEBUGGER_ENABLED +#undef KD_DEBUGGER_NOT_PRESENT +#define KD_DEBUGGER_ENABLED KdDebuggerEnabled +#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent +#define HalDispatchTable _HalDispatchTable +#undef HALDISPATCH +#define HALDISPATCH (&HalDispatchTable) +#define ExRaiseStatus RtlRaiseStatus Propchange: trunk/reactos/ntoskrnl/include/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -35,7 +35,7 @@ <dependency>bugcodes</dependency>  <directory name="ke"> Added: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h (added) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -1,0 +1,142 @@ +#ifndef __W32K_H +#define __W32K_H +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Graphics Subsystem + * FILE: subsys/win32k/w32k.h + * PURPOSE: Main Win32K Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#define _NO_COM + +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> +#include <ddk/ntddmou.h> +#include <ddk/ntifs.h> +#include <ddk/tvout.h> +#include <ndk/ntndk.h> + +/* Win32 Headers */ +/* FIXME: Defines in winbase.h that we need... */ +typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#define WINBASEAPI +#define STARTF_USESIZE 2 +#define STARTF_USEPOSITION 4 +#include <stdarg.h> +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <prntfont.h> +#include <dde.h> +#include <wincon.h> +#define _NOCSECT_TYPE +#include <ddrawi.h> + +/* SEH Support with PSEH */ +#include <pseh/pseh.h> + +/* CSRSS Header */ +#include <csrss/csrss.h> + +/* Helper Header */ +#include <reactos/helper.h> + +/* Public Win32K Headers */ +#include <win32k/callback.h> +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> +#include <win32k/ntgdityp.h> +#include <win32k/ntgdibad.h> +#include <ntgdi.h> + +/* Internal Win32K Header */ +#include "include/win32k.h" + +/* Undocumented stuff */ +typedef DRIVEROBJ *PDRIVEROBJ; +#define WM_SYSTIMER 280 +#ifndef M_PI +#define M_PI 3.14159265358979323846f +#define M_PI_2 1.57079632679489661923 +#endif + +/* User heap */ +extern HANDLE GlobalUserHeap; + +PWIN32HEAP +UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, + IN OUT PVOID *SystemBase, + IN SIZE_T HeapSize); + +static __inline PVOID +UserHeapAlloc(SIZE_T Bytes) +{ + return RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); +} + +static __inline BOOL +UserHeapFree(PVOID lpMem) +{ + return RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); +} + +static __inline PVOID +UserHeapReAlloc(PVOID lpMem, + SIZE_T Bytes) +{ +#if 0 + /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ + return RtlReAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem, + Bytes); +#else + SIZE_T PrevSize; + PVOID pNew; + + PrevSize = RtlSizeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + + if (PrevSize == Bytes) + return lpMem; + + pNew = RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); + if (pNew != NULL) + { + if (PrevSize < Bytes) + Bytes = PrevSize; + + RtlCopyMemory(pNew, + lpMem, + Bytes); + + RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + } + + return pNew; +#endif +} + +static __inline PVOID +UserHeapAddressToUser(PVOID lpMem) +{ + PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + + (ULONG_PTR)W32Process->HeapMappings.UserMapping); +} + +#endif /* __W32K_H */ Propchange: trunk/reactos/subsystems/win32/win32k/pch.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/w32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -1,145 +1,5 @@ -#ifndef __W32K_H -#define __W32K_H -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Graphics Subsystem - * FILE: subsys/win32k/w32k.h - * PURPOSE: Main Win32K Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ +#include "pch.h" -/* INCLUDES ******************************************************************/ - -#define _NO_COM - -/* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> - -/* Win32 Headers */ -/* FIXME: Defines in winbase.h that we need... */ -typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; -#define WINBASEAPI -#define STARTF_USESIZE 2 -#define STARTF_USEPOSITION 4 -#include <stdarg.h> -#include <windef.h> -#include <winerror.h> -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <prntfont.h> -#include <dde.h> -#include <wincon.h> -#define _NOCSECT_TYPE -#include <ddrawi.h> - -/* SEH Support with PSEH */ -#include <pseh/pseh.h> - -/* CSRSS Header */ -#include <csrss/csrss.h> - -/* Helper Header */ -#include <reactos/helper.h> - +/* Headers that shouldn't be precompiled due to GCC bugs */ /* Probe and capture */ #include <reactos/probe.h> - -/* Public Win32K Headers */ -#include <win32k/callback.h> -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/ntgdityp.h> -#include <win32k/ntgdibad.h> -#include <ntgdi.h> - -/* Internal Win32K Header */ -#include "include/win32k.h" - -/* Undocumented stuff */ -typedef DRIVEROBJ *PDRIVEROBJ; -#define WM_SYSTIMER 280 -#ifndef M_PI -#define M_PI 3.14159265358979323846f -#define M_PI_2 1.57079632679489661923 -#endif - -/* User heap */ -extern HANDLE GlobalUserHeap; - -PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, - IN OUT PVOID *SystemBase, - IN SIZE_T HeapSize); - -static __inline PVOID -UserHeapAlloc(SIZE_T Bytes) -{ - return RtlAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - Bytes); -} - -static __inline BOOL -UserHeapFree(PVOID lpMem) -{ - return RtlFreeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); -} - -static __inline PVOID -UserHeapReAlloc(PVOID lpMem, - SIZE_T Bytes) -{ -#if 0 - /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ - return RtlReAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem, - Bytes); -#else - SIZE_T PrevSize; - PVOID pNew; - - PrevSize = RtlSizeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); - - if (PrevSize == Bytes) - return lpMem; - - pNew = RtlAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - Bytes); - if (pNew != NULL) - { - if (PrevSize < Bytes) - Bytes = PrevSize; - - RtlCopyMemory(pNew, - lpMem, - Bytes); - - RtlFreeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); - } - - return pNew; -#endif -} - -static __inline PVOID -UserHeapAddressToUser(PVOID lpMem) -{ - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + - (ULONG_PTR)W32Process->HeapMappings.UserMapping); -} - -#endif /* __W32K_H */ Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Nov 29 23:49:18 2008 @@ -11,7 +11,7 @@ <include base="ReactOS">include/reactos/drivers</include> <define name="LANGPACK" /> <define name="_WIN32K_" /> - <pch>w32k.h</pch> + <pch>pch.h</pch> <directory name="dib" root="intermediate"> <file>dib8gen.c</file>

1 0

[sginsberg] 37756: - Relying on includers to define certain macros is an awesome idea -- sustain this practice for a little while
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 17:34:39 2008 New Revision: 37756 URL: http://svn.reactos.org/svn/reactos?rev=37756&view=rev Log: - Relying on includers to define certain macros is an awesome idea -- sustain this practice for a little while Modified: trunk/reactos/dll/win32/hid/precomp.h Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] Sat Nov 29 17:34:39 2008 @@ -10,6 +10,7 @@ typedef VOID (WINAPI *PINTERFACE_DEREFERENCE)( PVOID Context); +#define DDKAPI __stdcall // FIXME #include <ntndk.h> #include <hidusage.h> #include <hidclass.h>

1 0

[sginsberg] 37755: - Deprecate STDCALL from HAL
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 17:16:39 2008 New Revision: 37755 URL: http://svn.reactos.org/svn/reactos?rev=37755&view=rev Log: - Deprecate STDCALL from HAL Modified: trunk/reactos/hal/halppc/generic/beep.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halppc/generic/isa.c trunk/reactos/hal/halppc/generic/portio.c trunk/reactos/hal/halppc/generic/processor.c trunk/reactos/hal/halppc/generic/reboot.c trunk/reactos/hal/halppc/include/haldma.h trunk/reactos/hal/halppc/include/halp.h trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/include/haldma.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/ipi_mp.c trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/hal/halx86/mp/processor_mp.c trunk/reactos/hal/halx86/mp/spinlock.c Modified: trunk/reactos/hal/halppc/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -32,7 +32,7 @@ */ BOOLEAN -STDCALL +NTAPI HalMakeBeep ( ULONG Frequency ) Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -250,7 +250,7 @@ /* PUBLIC FUNCTIONS *********************************************************/ -VOID STDCALL +VOID NTAPI HalReleaseDisplayOwnership(VOID) /* * FUNCTION: Release ownership of display back to HAL @@ -267,7 +267,7 @@ } -VOID STDCALL +VOID NTAPI HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) /* * FUNCTION: @@ -280,7 +280,7 @@ HalResetDisplayParameters = ResetDisplayParameters; } -VOID STDCALL +VOID NTAPI HalDisplayString(IN PCH String) /* * FUNCTION: Switches the screen to HAL console mode (BSOD) if not there @@ -350,7 +350,7 @@ KeLowerIrql(OldIrql); } -VOID STDCALL +VOID NTAPI HalQueryDisplayParameters(OUT PULONG DispSizeX, OUT PULONG DispSizeY, OUT PULONG CursorPosX, @@ -367,7 +367,7 @@ } -VOID STDCALL +VOID NTAPI HalSetDisplayParameters(IN ULONG CursorPosX, IN ULONG CursorPosY) { @@ -376,7 +376,7 @@ } -BOOLEAN STDCALL +BOOLEAN NTAPI HalQueryDisplayOwnership(VOID) { return !HalOwnsDisplay; Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -164,7 +164,7 @@ * by the passed DMA adapter. */ -PHYSICAL_ADDRESS STDCALL +PHYSICAL_ADDRESS NTAPI HalpGetAdapterMaximumPhysicalAddress( IN PADAPTER_OBJECT AdapterObject) { @@ -200,7 +200,7 @@ * already allocated). */ -BOOLEAN STDCALL +BOOLEAN NTAPI HalpGrowMapBuffers( IN PADAPTER_OBJECT AdapterObject, IN ULONG SizeOfMapBuffers) @@ -329,7 +329,7 @@ * @see HalpInitDma */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateMasterAdapter(VOID) { PADAPTER_OBJECT MasterAdapter; @@ -388,7 +388,7 @@ * @see HalGetAdapter */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateChildAdapter( ULONG NumberOfMapRegisters, PDEVICE_DESCRIPTION DeviceDescription) @@ -458,7 +458,7 @@ * Setup DMA modes and extended modes for (E)ISA DMA adapter object. */ -BOOLEAN STDCALL +BOOLEAN NTAPI HalpDmaInitializeEisaAdapter( PADAPTER_OBJECT AdapterObject, PDEVICE_DESCRIPTION DeviceDescription) @@ -588,7 +588,7 @@ * @implemented */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalGetAdapter( PDEVICE_DESCRIPTION DeviceDescription, PULONG NumberOfMapRegisters) @@ -787,7 +787,7 @@ * @see HalGetAdapter */ -PDMA_ADAPTER STDCALL +PDMA_ADAPTER NTAPI HalpGetDmaAdapter( IN PVOID Context, IN PDEVICE_DESCRIPTION DeviceDescription, @@ -805,7 +805,7 @@ * @see HalGetAdapter */ -VOID STDCALL +VOID NTAPI HalPutDmaAdapter( PADAPTER_OBJECT AdapterObject) { @@ -846,7 +846,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI HalAllocateCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -895,7 +895,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI HalFreeCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -915,7 +915,7 @@ * @see HalGetAdapter */ -ULONG STDCALL +ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject) { @@ -930,7 +930,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI HalReadDmaCounter( PADAPTER_OBJECT AdapterObject) { @@ -1002,7 +1002,7 @@ * at PASSIVE_LEVEL in work item. */ -VOID STDCALL +VOID NTAPI HalpGrowMapBufferWorker(PVOID DeferredContext) { PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext; @@ -1064,7 +1064,7 @@ * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI HalAllocateAdapterChannel( PADAPTER_OBJECT AdapterObject, PWAIT_CONTEXT_BLOCK WaitContextBlock, @@ -1235,7 +1235,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI IoFreeAdapterChannel( PADAPTER_OBJECT AdapterObject) { @@ -1359,7 +1359,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI IoFreeMapRegisters( IN PADAPTER_OBJECT AdapterObject, IN PVOID MapRegisterBase, @@ -1465,7 +1465,7 @@ * @see IoFlushAdapterBuffers, IoMapTransfer */ -VOID STDCALL +VOID NTAPI HalpCopyBufferMap( PMDL Mdl, PROS_MAP_REGISTER_ENTRY MapRegisterBase, @@ -1554,7 +1554,7 @@ * @unimplemented. */ -BOOLEAN STDCALL +BOOLEAN NTAPI IoFlushAdapterBuffers( PADAPTER_OBJECT AdapterObject, PMDL Mdl, @@ -1661,7 +1661,7 @@ * @implemented */ -PHYSICAL_ADDRESS STDCALL +PHYSICAL_ADDRESS NTAPI IoMapTransfer( IN PADAPTER_OBJECT AdapterObject, IN PMDL Mdl, Modified: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -61,7 +61,7 @@ #else -VOID STDCALL +VOID NTAPI KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); #endif @@ -69,7 +69,7 @@ /* FUNCTIONS ****************************************************************/ #undef KeGetCurrentIrql -KIRQL STDCALL KeGetCurrentIrql (VOID) +KIRQL NTAPI KeGetCurrentIrql (VOID) /* * PURPOSE: Returns the current irq level * RETURNS: The current irq level @@ -277,7 +277,7 @@ * Calls KfRaiseIrql */ -KIRQL STDCALL +KIRQL NTAPI KeRaiseIrqlToDpcLevel (VOID) { return KfRaiseIrql (DISPATCH_LEVEL); @@ -301,14 +301,14 @@ * Calls KfRaiseIrql */ -KIRQL STDCALL +KIRQL NTAPI KeRaiseIrqlToSynchLevel (VOID) { return KfRaiseIrql (DISPATCH_LEVEL); } -BOOLEAN STDCALL +BOOLEAN NTAPI HalBeginSystemInterrupt (KIRQL Irql, ULONG Vector, PKIRQL OldIrql) @@ -347,7 +347,7 @@ } -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) +VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) /* * FUNCTION: Finish a system interrupt and restore the specified irq level. */ @@ -357,7 +357,7 @@ } BOOLEAN -STDCALL +NTAPI HalDisableSystemInterrupt( ULONG Vector, KIRQL Irql) @@ -383,7 +383,7 @@ BOOLEAN -STDCALL +NTAPI HalEnableSystemInterrupt( ULONG Vector, KIRQL Irql, Modified: trunk/reactos/hal/halppc/generic/isa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/isa.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -34,7 +34,7 @@ } -BOOLEAN STDCALL +BOOLEAN NTAPI HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, @@ -59,7 +59,7 @@ return Result; } -ULONG STDCALL +ULONG NTAPI HalpGetIsaInterruptVector(PVOID BusHandler, ULONG BusNumber, ULONG BusInterruptLevel, Modified: trunk/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/portio.… ============================================================================== --- trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -193,7 +193,7 @@ "blr" ); -VOID STDCALL +VOID NTAPI READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -201,7 +201,7 @@ while(Count--) { *Buffer++ = GetPhysByte((ULONG)Port); } } -VOID STDCALL +VOID NTAPI READ_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Buffer, ULONG Count) @@ -209,7 +209,7 @@ while(Count--) { *Buffer++ = GetPhysWord((ULONG)Port); } } -VOID STDCALL +VOID NTAPI READ_PORT_BUFFER_ULONG (PULONG Port, PULONG Buffer, ULONG Count) @@ -217,25 +217,25 @@ while(Count--) { *Buffer++ = GetPhys((ULONG)Port); } } -UCHAR STDCALL +UCHAR NTAPI READ_PORT_UCHAR (PUCHAR Port) { return GetPhys((ULONG)Port); } -USHORT STDCALL +USHORT NTAPI READ_PORT_USHORT (PUSHORT Port) { return GetPhysWord((ULONG)Port); } -ULONG STDCALL +ULONG NTAPI READ_PORT_ULONG (PULONG Port) { return GetPhys((ULONG)Port); } -VOID STDCALL +VOID NTAPI WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -243,7 +243,7 @@ while(Count--) { SetPhysByte((ULONG)Port, *Buffer++); } } -VOID STDCALL +VOID NTAPI WRITE_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Buffer, ULONG Count) @@ -251,7 +251,7 @@ while(Count--) { SetPhysWord((ULONG)Port, *Buffer++); } } -VOID STDCALL +VOID NTAPI WRITE_PORT_BUFFER_ULONG (PULONG Port, PULONG Buffer, ULONG Count) @@ -259,21 +259,21 @@ while(Count--) { SetPhys((ULONG)Port, *Buffer++); } } -VOID STDCALL +VOID NTAPI WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value) { SetPhysByte((ULONG)Port, Value); } -VOID STDCALL +VOID NTAPI WRITE_PORT_USHORT (PUSHORT Port, USHORT Value) { SetPhysWord((ULONG)Port, Value); } -VOID STDCALL +VOID NTAPI WRITE_PORT_ULONG (PULONG Port, ULONG Value) { Modified: trunk/reactos/hal/halppc/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/process… ============================================================================== --- trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -22,7 +22,7 @@ #define INITIAL_STALL_COUNT 0x10000 -VOID STDCALL +VOID NTAPI HalInitializeProcessor(ULONG ProcessorNumber, PLOADER_PARAMETER_BLOCK LoaderBlock) { @@ -30,7 +30,7 @@ KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; } -BOOLEAN STDCALL +BOOLEAN NTAPI HalAllProcessorsStarted (VOID) { DPRINT("HalAllProcessorsStarted()\n"); Modified: trunk/reactos/hal/halppc/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -22,7 +22,7 @@ } -VOID STDCALL +VOID NTAPI HalReturnToFirmware ( FIRMWARE_REENTRY Action ) Modified: trunk/reactos/hal/halppc/include/haldma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/haldma.… ============================================================================== --- trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -367,16 +367,16 @@ #define MAP_BASE_SW_SG 1 -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateMasterAdapter(VOID); -PDMA_ADAPTER STDCALL +PDMA_ADAPTER NTAPI HalpGetDmaAdapter( IN PVOID Context, IN PDEVICE_DESCRIPTION DeviceDescription, OUT PULONG NumberOfMapRegisters); -ULONG STDCALL +ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject); Modified: trunk/reactos/hal/halppc/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -36,7 +36,7 @@ (UCHAR)(((int / 10) << 4) + (int % 10)) /* adapter.c */ -PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); +PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); /* bus.c */ VOID NTAPI HalpInitNonBusHandler (VOID); Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -164,7 +164,7 @@ * by the passed DMA adapter. */ -PHYSICAL_ADDRESS STDCALL +PHYSICAL_ADDRESS NTAPI HalpGetAdapterMaximumPhysicalAddress( IN PADAPTER_OBJECT AdapterObject) { @@ -200,7 +200,7 @@ * already allocated). */ -BOOLEAN STDCALL +BOOLEAN NTAPI HalpGrowMapBuffers( IN PADAPTER_OBJECT AdapterObject, IN ULONG SizeOfMapBuffers) @@ -329,7 +329,7 @@ * @see HalpInitDma */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateMasterAdapter(VOID) { PADAPTER_OBJECT MasterAdapter; @@ -388,7 +388,7 @@ * @see HalGetAdapter */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateChildAdapter( ULONG NumberOfMapRegisters, PDEVICE_DESCRIPTION DeviceDescription) @@ -458,7 +458,7 @@ * Setup DMA modes and extended modes for (E)ISA DMA adapter object. */ -BOOLEAN STDCALL +BOOLEAN NTAPI HalpDmaInitializeEisaAdapter( PADAPTER_OBJECT AdapterObject, PDEVICE_DESCRIPTION DeviceDescription) @@ -588,7 +588,7 @@ * @implemented */ -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalGetAdapter( PDEVICE_DESCRIPTION DeviceDescription, PULONG NumberOfMapRegisters) @@ -787,7 +787,7 @@ * @see HalGetAdapter */ -PDMA_ADAPTER STDCALL +PDMA_ADAPTER NTAPI HalpGetDmaAdapter( IN PVOID Context, IN PDEVICE_DESCRIPTION DeviceDescription, @@ -805,7 +805,7 @@ * @see HalGetAdapter */ -VOID STDCALL +VOID NTAPI HalPutDmaAdapter( PADAPTER_OBJECT AdapterObject) { @@ -846,7 +846,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI HalAllocateCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -895,7 +895,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI HalFreeCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -915,7 +915,7 @@ * @see HalGetAdapter */ -ULONG STDCALL +ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject) { @@ -930,7 +930,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI HalReadDmaCounter( PADAPTER_OBJECT AdapterObject) { @@ -1002,7 +1002,7 @@ * at PASSIVE_LEVEL in work item. */ -VOID STDCALL +VOID NTAPI HalpGrowMapBufferWorker(PVOID DeferredContext) { PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext; @@ -1064,7 +1064,7 @@ * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI HalAllocateAdapterChannel( PADAPTER_OBJECT AdapterObject, PWAIT_CONTEXT_BLOCK WaitContextBlock, @@ -1235,7 +1235,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI IoFreeAdapterChannel( PADAPTER_OBJECT AdapterObject) { @@ -1359,7 +1359,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI IoFreeMapRegisters( IN PADAPTER_OBJECT AdapterObject, IN PVOID MapRegisterBase, @@ -1465,7 +1465,7 @@ * @see IoFlushAdapterBuffers, IoMapTransfer */ -VOID STDCALL +VOID NTAPI HalpCopyBufferMap( PMDL Mdl, PROS_MAP_REGISTER_ENTRY MapRegisterBase, @@ -1554,7 +1554,7 @@ * @unimplemented. */ -BOOLEAN STDCALL +BOOLEAN NTAPI IoFlushAdapterBuffers( PADAPTER_OBJECT AdapterObject, PMDL Mdl, @@ -1663,7 +1663,7 @@ * @implemented */ -PHYSICAL_ADDRESS STDCALL +PHYSICAL_ADDRESS NTAPI IoMapTransfer( IN PADAPTER_OBJECT AdapterObject, IN PMDL Mdl, Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -520,7 +520,7 @@ return STATUS_NOT_IMPLEMENTED; } -static ULONG STDCALL +static ULONG NTAPI PciSize(ULONG Base, ULONG Mask) { ULONG Size = Mask & Base; /* Find the significant bits */ Modified: trunk/reactos/hal/halx86/include/haldma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/haldma.… ============================================================================== --- trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -367,16 +367,16 @@ #define MAP_BASE_SW_SG 1 -PADAPTER_OBJECT STDCALL +PADAPTER_OBJECT NTAPI HalpDmaAllocateMasterAdapter(VOID); -PDMA_ADAPTER STDCALL +PDMA_ADAPTER NTAPI HalpGetDmaAdapter( IN PVOID Context, IN PDEVICE_DESCRIPTION DeviceDescription, OUT PULONG NumberOfMapRegisters); -ULONG STDCALL +ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject); Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -30,7 +30,7 @@ (UCHAR)(((int / 10) << 4) + (int % 10)) /* adapter.c */ -PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); +PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); /* bus.c */ VOID NTAPI HalpInitNonBusHandler (VOID); Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ipi_mp.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -15,7 +15,7 @@ /* FUNCTIONS ****************************************************************/ -VOID STDCALL +VOID NTAPI HalRequestIpi(KAFFINITY TargetProcessors) { /* FIXME: SMP HAL is...very broken */ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -21,7 +21,7 @@ /* FUNCTIONS ****************************************************************/ #undef KeGetCurrentIrql -KIRQL STDCALL KeGetCurrentIrql (VOID) +KIRQL NTAPI KeGetCurrentIrql (VOID) /* * PURPOSE: Returns the current irq level * RETURNS: The current irq level @@ -160,7 +160,7 @@ * NOTES */ #undef KeLowerIrql -VOID STDCALL +VOID NTAPI KeLowerIrql (KIRQL NewIrql) { KfLowerIrql (NewIrql); @@ -234,7 +234,7 @@ * Calls KfRaiseIrql */ #undef KeRaiseIrql -VOID STDCALL +VOID NTAPI KeRaiseIrql (KIRQL NewIrql, PKIRQL OldIrql) { @@ -259,7 +259,7 @@ * Calls KfRaiseIrql */ -KIRQL STDCALL +KIRQL NTAPI KeRaiseIrqlToDpcLevel (VOID) { return KfRaiseIrql (DISPATCH_LEVEL); @@ -283,14 +283,14 @@ * Calls KfRaiseIrql */ -KIRQL STDCALL +KIRQL NTAPI KeRaiseIrqlToSynchLevel (VOID) { return KfRaiseIrql (CLOCK2_LEVEL); } -BOOLEAN STDCALL +BOOLEAN NTAPI HalBeginSystemInterrupt (KIRQL Irql, ULONG Vector, PKIRQL OldIrql) @@ -317,7 +317,7 @@ } -VOID STDCALL +VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) /* @@ -336,7 +336,7 @@ HalpLowerIrql (Irql, TRUE); } -BOOLEAN STDCALL +BOOLEAN NTAPI HalDisableSystemInterrupt (ULONG Vector, KIRQL Irql) { @@ -358,7 +358,7 @@ } -BOOLEAN STDCALL +BOOLEAN NTAPI HalEnableSystemInterrupt (ULONG Vector, KIRQL Irql, KINTERRUPT_MODE InterruptMode) Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -20,7 +20,7 @@ /* FUNCTIONS *****************************************************************/ -VOID STDCALL +VOID NTAPI HalInitializeProcessor(ULONG ProcessorNumber, PLOADER_PARAMETER_BLOCK LoaderBlock) { @@ -55,7 +55,7 @@ //HalpCalibrateStallExecution(); } -BOOLEAN STDCALL +BOOLEAN NTAPI HalAllProcessorsStarted (VOID) { ULONG CPUs = 0, i; Modified: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] Sat Nov 29 17:16:39 2008 @@ -26,7 +26,7 @@ /* FUNCTIONS ***************************************************************/ #undef KeAcquireSpinLock -VOID STDCALL +VOID NTAPI KeAcquireSpinLock ( PKSPIN_LOCK SpinLock, PKIRQL OldIrql @@ -55,7 +55,7 @@ } #undef KeReleaseSpinLock -VOID STDCALL +VOID NTAPI KeReleaseSpinLock ( PKSPIN_LOCK SpinLock, KIRQL NewIrql

1 0

[sginsberg] 37754: - Don't use DDKAPI either
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 17:15:54 2008 New Revision: 37754 URL: http://svn.reactos.org/svn/reactos?rev=37754&view=rev Log: - Don't use DDKAPI either Modified: trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/hid/stubs.c trunk/reactos/drivers/bus/isapnp/isapnp.h trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/video/displays/framebuf/ddenable.c trunk/reactos/drivers/video/displays/framebufacc/ddenable.c trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=37… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -63,7 +63,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_FlushQueue(IN HANDLE HidDeviceObject) { DWORD RetLen; @@ -80,7 +80,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_FreePreparsedData(IN PHIDP_PREPARSED_DATA PreparsedData) { return (LocalFree((HLOCAL)PreparsedData) == NULL); @@ -93,7 +93,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetAttributes(IN HANDLE HidDeviceObject, OUT PHIDD_ATTRIBUTES Attributes) { @@ -124,7 +124,7 @@ * @implemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_BUTTON_CAPS ButtonCaps, IN OUT PULONG ButtonCapsLength, @@ -141,7 +141,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetFeature(IN HANDLE HidDeviceObject, OUT PVOID ReportBuffer, IN ULONG ReportBufferLength) @@ -160,7 +160,7 @@ * @implemented */ HIDAPI -VOID DDKAPI +VOID WINAPI HidD_GetHidGuid(OUT LPGUID HidGuid) { *HidGuid = HidClassGuid; @@ -173,7 +173,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetInputReport(IN HANDLE HidDeviceObject, IN OUT PVOID ReportBuffer, IN ULONG ReportBufferLength) @@ -192,7 +192,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetManufacturerString(IN HANDLE HidDeviceObject, OUT PVOID Buffer, IN ULONG BufferLength) @@ -211,7 +211,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetNumInputBuffers(IN HANDLE HidDeviceObject, OUT PULONG NumberBuffers) { @@ -229,7 +229,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(IN HANDLE HidDeviceObject, OUT PVOID Buffer, IN ULONG BufferLength) @@ -248,7 +248,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetPreparsedData(IN HANDLE HidDeviceObject, OUT PHIDP_PREPARSED_DATA *PreparsedData) { @@ -303,7 +303,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetProductString(IN HANDLE HidDeviceObject, OUT PVOID Buffer, IN ULONG BufferLength) @@ -322,7 +322,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetSerialNumberString(IN HANDLE HidDeviceObject, OUT PVOID Buffer, IN ULONG BufferLength) @@ -341,7 +341,7 @@ * @implemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_VALUE_CAPS ValueCaps, IN OUT PULONG ValueCapsLength, @@ -364,7 +364,7 @@ * @implemented */ HIDAPI -ULONG DDKAPI +ULONG WINAPI HidD_Hello(OUT PCHAR Buffer, IN ULONG BufferLength) { @@ -385,7 +385,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_SetFeature(IN HANDLE HidDeviceObject, IN PVOID ReportBuffer, IN ULONG ReportBufferLength) @@ -404,7 +404,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_SetNumInputBuffers(IN HANDLE HidDeviceObject, IN ULONG NumberBuffers) { @@ -422,7 +422,7 @@ * @implemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_SetOutputReport(IN HANDLE HidDeviceObject, IN PVOID ReportBuffer, IN ULONG ReportBufferLength) Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -2,14 +2,13 @@ #include <windows.h> #include <debug.h> -#define DDKAPI __stdcall #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ typedef VOID -(DDKAPI *PINTERFACE_REFERENCE)( +(WINAPI *PINTERFACE_REFERENCE)( PVOID Context); typedef VOID -(DDKAPI *PINTERFACE_DEREFERENCE)( +(WINAPI *PINTERFACE_DEREFERENCE)( PVOID Context); #include <ntndk.h> #include <hidusage.h> Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -15,7 +15,7 @@ * @unimplemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetConfiguration(IN HANDLE HidDeviceObject, OUT PHIDD_CONFIGURATION Configuration, IN ULONG ConfigurationLength) @@ -29,7 +29,7 @@ * @unimplemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetIndexedString(IN HANDLE HidDeviceObject, IN ULONG StringIndex, OUT PVOID Buffer, @@ -44,7 +44,7 @@ * @unimplemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject, OUT PVOID Buffer, IN ULONG BufferLength) @@ -58,7 +58,7 @@ * @unimplemented */ HIDAPI -BOOLEAN DDKAPI +BOOLEAN WINAPI HidD_SetConfiguration(IN HANDLE HidDeviceObject, IN PHIDD_CONFIGURATION Configuration, IN ULONG ConfigurationLength) @@ -72,7 +72,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData, OUT PHIDP_CAPS Capabilities) { @@ -85,7 +85,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetData(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -102,7 +102,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetExtendedAttributes(IN HIDP_REPORT_TYPE ReportType, IN USHORT DataIndex, IN PHIDP_PREPARSED_DATA PreparsedData, @@ -118,7 +118,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, IN OUT PULONG LinkCollectionNodesLength, IN PHIDP_PREPARSED_DATA PreparsedData) @@ -132,7 +132,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -151,7 +151,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetSpecificButtonCaps(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -169,7 +169,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetSpecificValueCaps(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -187,7 +187,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetUsageValue(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -206,7 +206,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetUsageValueArray(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -226,7 +226,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetUsages(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -245,7 +245,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType, IN USHORT LinkCollection, OUT PUSAGE_AND_PAGE ButtonList, @@ -263,7 +263,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType, IN UCHAR ReportID, IN PHIDP_PREPARSED_DATA PreparsedData, @@ -279,7 +279,7 @@ * @unimplemented */ HIDAPI -ULONG DDKAPI +ULONG WINAPI HidP_MaxDataListLength(IN HIDP_REPORT_TYPE ReportType, IN PHIDP_PREPARSED_DATA PreparsedData) { @@ -292,7 +292,7 @@ * @unimplemented */ HIDAPI -ULONG DDKAPI +ULONG WINAPI HidP_MaxUsageListLength(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage OPTIONAL, IN PHIDP_PREPARSED_DATA PreparsedData) @@ -306,7 +306,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_SetData(IN HIDP_REPORT_TYPE ReportType, IN PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -323,7 +323,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_SetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -342,7 +342,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_SetUsageValue(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -361,7 +361,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_SetUsageValueArray(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -381,7 +381,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_SetUsages(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -400,7 +400,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(IN PUSAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction, @@ -417,7 +417,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_UnsetUsages(IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -436,7 +436,7 @@ * @unimplemented */ HIDAPI -NTSTATUS DDKAPI +NTSTATUS WINAPI HidP_UsageListDifference(IN PUSAGE PreviousUsageList, IN PUSAGE CurrentUsageList, OUT PUSAGE BreakUsageList, Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -5,7 +5,6 @@ #ifdef _MSC_VER #define STDCALL - #define DDKAPI #endif #ifdef __cplusplus Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -8,7 +8,6 @@ #ifdef _MSC_VER #define STDCALL - #define DDKAPI #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -20,7 +20,7 @@ #include "framebuf.h" -VOID DDKAPI +VOID APIENTRY DrvDisableDirectDraw( IN DHPDEV dhpdev) { PPDEV ppdev = (PPDEV)dhpdev; @@ -29,7 +29,7 @@ when we shout down directx interface */ } -BOOL DDKAPI +BOOL APIENTRY DrvEnableDirectDraw( IN DHPDEV dhpdev, OUT DD_CALLBACKS *pCallBacks, @@ -127,7 +127,7 @@ return ppdev->bDDInitialized; } -BOOL DDKAPI +BOOL APIENTRY DrvGetDirectDrawInfo( IN DHPDEV dhpdev, OUT DD_HALINFO *pHalInfo, Modified: trunk/reactos/drivers/video/displays/framebufacc/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/ddenable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/ddenable.c [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -20,7 +20,7 @@ #include "framebuf.h" -VOID DDKAPI +VOID APIENTRY DrvDisableDirectDraw( IN DHPDEV dhpdev) { PPDEV ppdev = (PPDEV)dhpdev; @@ -29,7 +29,7 @@ when we shout down directx interface */ } -BOOL DDKAPI +BOOL APIENTRY DrvEnableDirectDraw( IN DHPDEV dhpdev, OUT DD_CALLBACKS *pCallBacks, @@ -127,7 +127,7 @@ return ppdev->bDDInitialized; } -BOOL DDKAPI +BOOL APIENTRY DrvGetDirectDrawInfo( IN DHPDEV dhpdev, OUT DD_HALINFO *pHalInfo, Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] Sat Nov 29 17:15:54 2008 @@ -25,7 +25,6 @@ /* FIXME - what a headers mess.... */ -#define DDKAPI __stdcall #define DDKFASTAPI __fastcall #define FASTCALL __fastcall #define DDKCDECLAPI __cdecl

1 0

[spetreolle] 37753: add missing parenthesis in utf16le
by spetreolle＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: spetreolle Date: Sat Nov 29 17:11:14 2008 New Revision: 37753 URL: http://svn.reactos.org/svn/reactos?rev=37753&view=rev Log: add missing parenthesis in utf16le Modified: trunk/reactos/tools/utf16le/utf16le.cpp Modified: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] Sat Nov 29 17:11:14 2008 @@ -184,7 +184,7 @@ // upper 5 bits: data filled with 0 if (tmp & 0x80) { - if (tmp & 0xc0 != 0xc0) + if ((tmp & 0xc0) != 0xc0) { cerr << "UTF-8 Error: invalid data byte" << endl; return ret;

1 0

[sginsberg] 37752: - Less STDCALL, more WINAPI/NTAPI/APIENTRY
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 16:48:58 2008 New Revision: 37752 URL: http://svn.reactos.org/svn/reactos?rev=37752&view=rev Log: - Less STDCALL, more WINAPI/NTAPI/APIENTRY Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/main.c trunk/reactos/subsystems/win/basesrv/server.c trunk/reactos/subsystems/win/winsrv/dllmain.c trunk/reactos/subsystems/win/winsrv/init.c trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/print.c trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/debug.c trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/error.c trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/eng/gradient.c trunk/reactos/subsystems/win32/win32k/eng/lineto.c trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/eng/misc.h trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/eng/paint.c trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/eng/sort.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/transblt.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/color.h trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/dib.h trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/subsystems/win32/win32k/include/focus.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/paint.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/rect.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/win32k.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ldr/loader.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/misc/err.c trunk/reactos/subsystems/win32/win32k/misc/math.c trunk/reactos/subsystems/win32/win32k/misc/usrheap.c trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bezier.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/polyfill.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c trunk/reactos/subsystems/win32/win32k/objects/xformobj.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… Modified: trunk/reactos/subsystems/win/basesrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/mai… Modified: trunk/reactos/subsystems/win/basesrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ser… Modified: trunk/reactos/subsystems/win/winsrv/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/winsrv/dllm… Modified: trunk/reactos/subsystems/win/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/winsrv/init… Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… Modified: trunk/reactos/subsystems/win32/csrss/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/pri… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/focus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/paint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bezier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/xformobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st…

1 0

[sginsberg] 37751: - STDCALL strikes back
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 15:42:41 2008 New Revision: 37751 URL: http://svn.reactos.org/svn/reactos?rev=37751&view=rev Log: - STDCALL strikes back Modified: trunk/rostests/tests/polytest/polytest.cpp Modified: trunk/rostests/tests/polytest/polytest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/polytest/polytest.c… ============================================================================== --- trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] (original) +++ trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] Sat Nov 29 15:42:41 2008 @@ -500,7 +500,6 @@ */ static void -WINAPI POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead ) { int i; @@ -525,7 +524,6 @@ */ static void -WINAPI POLYGONFILL_FillScanLineAlternate( PDC dc, int ScanLine, @@ -573,7 +571,6 @@ static void -WINAPI POLYGONFILL_FillScanLineWinding( PDC dc, int ScanLine, @@ -673,7 +670,6 @@ //The direction of each edge of the polygon is important. BOOL -WINAPI FillPolygon( PDC dc, SURFOBJ *SurfObj, @@ -688,7 +684,6 @@ int ScanLine; void - WINAPI (*FillScanLine)( PDC dc, int ScanLine,

1 0

[sginsberg] 37750: - Hey STDCALL, you just got deprecated from rostests
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 15:37:54 2008 New Revision: 37750 URL: http://svn.reactos.org/svn/reactos?rev=37750&view=rev Log: - Hey STDCALL, you just got deprecated from rostests Modified: trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/regtests_by_casper/regtests/regtests.c trunk/rostests/regtests_by_casper/shared/regtests.c trunk/rostests/regtests_by_casper/shared/regtests.h trunk/rostests/tests/apc/apc.c trunk/rostests/tests/button/buttontst.c trunk/rostests/tests/capclock/capclock.c trunk/rostests/tests/lantst/lantest.cpp trunk/rostests/tests/lpctst/conport.c trunk/rostests/tests/lpctst/creport.c trunk/rostests/tests/lpctst/dumpinfo.c trunk/rostests/tests/polytest/polytest.cpp trunk/rostests/tests/statst/statst.c trunk/rostests/tests/suspend/suspend.c trunk/rostests/tests/terminate/terminate.c trunk/rostests/win32/kernel32/tests/CreateFile.c trunk/rostests/win32/user32/drawcaption/drawcap.c Modified: trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -1,4 +1,4 @@ -LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); +LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); INT Test_GdiGetCharDimensions(PTESTINFO pti) Modified: trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -27,7 +27,7 @@ int Count_myLpkPSMTextOut = 0; int Count_myLpkDrawTextEx = 0; -DWORD STDCALL myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, +DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12) { Count_myLpkTabbedTextOut++; @@ -55,7 +55,7 @@ PLPK_LPEDITCONTROL_LIST fpListLpkEditControl; } USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS; -VOID STDCALL InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); +VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); INT Test_InitializeLpkHooks(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -1,5 +1,5 @@ /* First the call stub */ -DWORD STDCALL +DWORD WINAPI NtUserCountClipboardFormats(VOID) { DWORD p; Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -13,7 +13,7 @@ return pPeb->GdiSharedHandleTable; } -static DWORD STDCALL +static DWORD WINAPI IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) { DWORD ret; Modified: trunk/rostests/regtests_by_casper/regtests/regtests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/regtes… ============================================================================== --- trunk/rostests/regtests_by_casper/regtests/regtests.c [iso-8859-1] (original) +++ trunk/rostests/regtests_by_casper/regtests/regtests.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -8,32 +8,32 @@ */ #include <windows.h> -HMODULE STDCALL +HMODULE WINAPI _GetModuleHandleA(LPCSTR lpModuleName) { return GetModuleHandleA(lpModuleName); } -FARPROC STDCALL +FARPROC WINAPI _GetProcAddress(HMODULE hModule, LPCSTR lpProcName) { return GetProcAddress(hModule, lpProcName); } -HINSTANCE STDCALL +HINSTANCE WINAPI _LoadLibraryA(LPCSTR lpLibFileName) { return LoadLibraryA(lpLibFileName); } -VOID STDCALL +VOID WINAPI _ExitProcess(UINT uExitCode) { ExitProcess(uExitCode); } -HANDLE STDCALL +HANDLE WINAPI _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId) @@ -42,31 +42,31 @@ lpParameter, dwCreationFlags, lpThreadId); } -WINBOOL STDCALL +WINBOOL WINAPI _TerminateThread(HANDLE hThread, DWORD dwExitCode) { return TerminateThread(hThread, dwExitCode); } -DWORD STDCALL +DWORD WINAPI _WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) { return WaitForSingleObject(hHandle, dwMilliseconds); } -DWORD STDCALL +DWORD WINAPI _GetLastError() { return GetLastError(); } -VOID STDCALL +VOID WINAPI _CloseHandle(HANDLE handle) { CloseHandle (handle); } -BOOL STDCALL +BOOL WINAPI _GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime) @@ -75,31 +75,31 @@ lpKernelTime, lpUserTime); } -BOOL STDCALL +BOOL WINAPI _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass) { return SetPriorityClass(hProcess, dwPriorityClass); } -BOOL STDCALL +BOOL WINAPI _SetThreadPriority(HANDLE hThread, int nPriority) { return SetThreadPriority(hThread, nPriority); } -HANDLE STDCALL +HANDLE WINAPI _GetCurrentProcess() { return GetCurrentProcess(); } -HANDLE STDCALL +HANDLE WINAPI _GetCurrentThread() { return GetCurrentThread(); } -VOID STDCALL +VOID WINAPI _Sleep(DWORD dwMilliseconds) { return Sleep(dwMilliseconds); Modified: trunk/rostests/regtests_by_casper/shared/regtests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/shared… ============================================================================== --- trunk/rostests/regtests_by_casper/shared/regtests.c [iso-8859-1] (original) +++ trunk/rostests/regtests_by_casper/shared/regtests.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -227,7 +227,7 @@ InsertTailList(&AllTests, &Test->ListEntry); } -PVOID STDCALL +PVOID WINAPI FrameworkGetHook(ULONG index) { return FrameworkGetHookInternal(index); Modified: trunk/rostests/regtests_by_casper/shared/regtests.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/shared… ============================================================================== --- trunk/rostests/regtests_by_casper/shared/regtests.h [iso-8859-1] (original) +++ trunk/rostests/regtests_by_casper/shared/regtests.h [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> -typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter); +typedef DWORD (WINAPI _LPTHREAD_START_ROUTINE)(LPVOID lpParameter); typedef struct __FILETIME { @@ -164,7 +164,7 @@ * OutputRoutine - Output routine. * TestName - If NULL all tests are run. If non-NULL specifies the test to be run */ -typedef void (STDCALL *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName); +typedef void (WINAPI *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName); typedef struct __TEST { @@ -189,56 +189,56 @@ extern _API_DESCRIPTION ExternalDependencies[]; extern ULONG MaxExternalDependency; -HANDLE STDCALL +HANDLE WINAPI _GetModuleHandleA(LPCSTR lpModuleName); -PVOID STDCALL +PVOID WINAPI _GetProcAddress(HANDLE hModule, LPCSTR lpProcName); -HANDLE STDCALL +HANDLE WINAPI _LoadLibraryA(LPCSTR lpLibFileName); -VOID STDCALL +VOID WINAPI _ExitProcess(UINT uExitCode); -HANDLE STDCALL +HANDLE WINAPI _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize, _LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId); -BOOL STDCALL +BOOL WINAPI _TerminateThread(HANDLE hThread, DWORD dwExitCode); -DWORD STDCALL +DWORD WINAPI _WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds); -DWORD STDCALL +DWORD WINAPI _GetLastError(); -VOID STDCALL +VOID WINAPI _CloseHandle(HANDLE handle); -BOOL STDCALL +BOOL WINAPI _GetThreadTimes(HANDLE hThread, _LPFILETIME lpCreationTime, _LPFILETIME lpExitTime, _LPFILETIME lpKernelTime, _LPFILETIME lpUserTime); -BOOL STDCALL +BOOL WINAPI _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass); -BOOL STDCALL +BOOL WINAPI _SetThreadPriority(HANDLE hThread, int nPriority); -HANDLE STDCALL +HANDLE WINAPI _GetCurrentProcess(); -HANDLE STDCALL +HANDLE WINAPI _GetCurrentThread(); -VOID STDCALL +VOID WINAPI _Sleep(DWORD dwMilliseconds); Modified: trunk/rostests/tests/apc/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/apc/apc.c?rev=37750… ============================================================================== --- trunk/rostests/tests/apc/apc.c [iso-8859-1] (original) +++ trunk/rostests/tests/apc/apc.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -8,7 +8,7 @@ HANDLE OutputHandle; HANDLE InputHandle; -VOID STDCALL +VOID WINAPI ApcRoutine(PVOID Context, PIO_STATUS_BLOCK IoStatus, ULONG Reserved) Modified: trunk/rostests/tests/button/buttontst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/button/buttontst.c?… ============================================================================== --- trunk/rostests/tests/button/buttontst.c [iso-8859-1] (original) +++ trunk/rostests/tests/button/buttontst.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -50,7 +50,7 @@ } } -int STDCALL WinMain( +int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, Modified: trunk/rostests/tests/capclock/capclock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/capclock/capclock.c… ============================================================================== --- trunk/rostests/tests/capclock/capclock.c [iso-8859-1] (original) +++ trunk/rostests/tests/capclock/capclock.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -15,7 +15,7 @@ static VOID CALLBACK TimerProc(HWND,UINT,UINT,DWORD); -INT STDCALL WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT nCmdShow) +INT WINAPI WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT nCmdShow) { WNDCLASS wc; Modified: trunk/rostests/tests/lantst/lantest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lantst/lantest.cpp?… ============================================================================== --- trunk/rostests/tests/lantst/lantest.cpp [iso-8859-1] (original) +++ trunk/rostests/tests/lantst/lantest.cpp [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -59,7 +59,7 @@ #define ETYPE_ARP WH2N(0x0806) extern "C" -NTSTATUS STDCALL NtCreateFile( +NTSTATUS NTAPI NtCreateFile( PHANDLE FileHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, Modified: trunk/rostests/tests/lpctst/conport.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/conport.c?re… ============================================================================== --- trunk/rostests/tests/lpctst/conport.c [iso-8859-1] (original) +++ trunk/rostests/tests/lpctst/conport.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -31,7 +31,7 @@ #define LPC_CONNECT_FLAG5 0x00010000 NTSTATUS -(STDCALL * ConnectPort)( +(WINAPI * ConnectPort)( OUT PHANDLE PortHandle, IN PUNICODE_STRING PortName, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -43,7 +43,7 @@ ); NTSTATUS -(STDCALL * QueryObject)( +(WINAPI * QueryObject)( IN HANDLE ObjectHandle, IN CINT ObjectInformationClass, OUT PVOID ObjectInformation, @@ -52,7 +52,7 @@ ); NTSTATUS -(STDCALL * YieldExecution)(VOID); +(WINAPI * YieldExecution)(VOID); #define BUF_SIZE 1024 #define MAXARG 1000000 Modified: trunk/rostests/tests/lpctst/creport.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/creport.c?re… ============================================================================== --- trunk/rostests/tests/lpctst/creport.c [iso-8859-1] (original) +++ trunk/rostests/tests/lpctst/creport.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -23,7 +23,7 @@ #define LPC_CONNECT_FLAG5 0x00010000 NTSTATUS -(STDCALL * CreatePort)( +(WINAPI * CreatePort)( /*OUT PHANDLE PortHandle,*/ PVOID Buffer, IN POBJECT_ATTRIBUTES PortAttributes OPTIONAL, @@ -33,7 +33,7 @@ ); NTSTATUS -(STDCALL * QueryObject)( +(WINAPI * QueryObject)( IN HANDLE ObjectHandle, IN CINT ObjectInformationClass, OUT PVOID ObjectInformation, @@ -42,7 +42,7 @@ ); NTSTATUS -(STDCALL * YieldExecution)(VOID); +(WINAPI * YieldExecution)(VOID); #define BUF_SIZE 1024 #define MAXARG 5000000 Modified: trunk/rostests/tests/lpctst/dumpinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/dumpinfo.c?r… ============================================================================== --- trunk/rostests/tests/lpctst/dumpinfo.c [iso-8859-1] (original) +++ trunk/rostests/tests/lpctst/dumpinfo.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -25,7 +25,7 @@ extern NTSTATUS -(STDCALL * QueryObject)( +(WINAPI * QueryObject)( IN HANDLE ObjectHandle, IN CINT ObjectInformationClass, OUT PVOID ObjectInformation, @@ -35,7 +35,7 @@ extern NTSTATUS -(STDCALL * QueryInformationPort)( +(WINAPI * QueryInformationPort)( IN HANDLE PortHandle, IN CINT PortInformationClass, /* guess */ OUT PVOID PortInformation, /* guess */ Modified: trunk/rostests/tests/polytest/polytest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/polytest/polytest.c… ============================================================================== --- trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] (original) +++ trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -17,7 +17,6 @@ #include <assert.h> #define FASTCALL -#define STDCALL #define INT int #define CLIPOBJ int #define SURFOBJ int @@ -501,7 +500,7 @@ */ static void -STDCALL +WINAPI POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead ) { int i; @@ -526,7 +525,7 @@ */ static void -STDCALL +WINAPI POLYGONFILL_FillScanLineAlternate( PDC dc, int ScanLine, @@ -574,7 +573,7 @@ static void -STDCALL +WINAPI POLYGONFILL_FillScanLineWinding( PDC dc, int ScanLine, @@ -674,7 +673,7 @@ //The direction of each edge of the polygon is important. BOOL -STDCALL +WINAPI FillPolygon( PDC dc, SURFOBJ *SurfObj, @@ -689,7 +688,7 @@ int ScanLine; void - STDCALL + WINAPI (*FillScanLine)( PDC dc, int ScanLine, Modified: trunk/rostests/tests/statst/statst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/statst/statst.c?rev… ============================================================================== --- trunk/rostests/tests/statst/statst.c [iso-8859-1] (original) +++ trunk/rostests/tests/statst/statst.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -108,7 +108,7 @@ } } -int STDCALL WinMain( +int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, Modified: trunk/rostests/tests/suspend/suspend.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/suspend/suspend.c?r… ============================================================================== --- trunk/rostests/tests/suspend/suspend.c [iso-8859-1] (original) +++ trunk/rostests/tests/suspend/suspend.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -11,7 +11,7 @@ static volatile DWORD z; static volatile DWORD x=0; -static NTSTATUS STDCALL +static NTSTATUS WINAPI thread_1(PVOID Param) { DWORD y=0; Modified: trunk/rostests/tests/terminate/terminate.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/terminate/terminate… ============================================================================== --- trunk/rostests/tests/terminate/terminate.c [iso-8859-1] (original) +++ trunk/rostests/tests/terminate/terminate.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -11,7 +11,7 @@ static volatile DWORD z; static volatile DWORD x=0; -static NTSTATUS STDCALL +static NTSTATUS WINAPI thread_1(PVOID Param) { DWORD y=0; Modified: trunk/rostests/win32/kernel32/tests/CreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/tests/Crea… ============================================================================== --- trunk/rostests/win32/kernel32/tests/CreateFile.c [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/tests/CreateFile.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -67,7 +67,7 @@ static CreateFileTest_Parameters *CurrentTest; -static NTSTATUS STDCALL +static NTSTATUS WINAPI MockNtCreateFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, Modified: trunk/rostests/win32/user32/drawcaption/drawcap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/drawcaption/… ============================================================================== --- trunk/rostests/win32/user32/drawcaption/drawcap.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/drawcaption/drawcap.c [iso-8859-1] Sat Nov 29 15:37:54 2008 @@ -25,7 +25,7 @@ HINSTANCE hInst; INT testnum = 0; -//BOOL STDCALL (*DrawCaptionTemp) ( +//BOOL WINAPI (*DrawCaptionTemp) ( // HWND hwnd, // HDC hdc, // const RECT *rect,

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