Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19742: - Implement RtlPrefectMemoryNonTemporal. Patch by Patrick Baggett <baggett.patrick@gmail.com> and myself.

by ion＠svn.reactos.com

- Implement RtlPrefectMemoryNonTemporal. Patch by Patrick Baggett <baggett.patrick(a)gmail.com> and myself. Modified: trunk/reactos/lib/rtl/i386/mem_asm.S Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/lib/rtl/i386/mem_asm.S --- trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 02:40:18 UTC (rev 19742) @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: mem.asm + * FILE: mem_asm.S * PURPOSE: Memory functions - * PROGRAMMER: Magnus Olsen (magnusolsen(a)greatlord.com) - * UPDATE HISTORY: - * Created 27/07/2005 + * PROGRAMMERS: Patrick Baggett (baggett.patrick(a)gmail.com) + * Alex Ionescu (alex(a)relsoft.net) + * Magnus Olsen (magnusolsen(a)greatlord.com) */ .intel_syntax noprefix @@ -17,6 +17,7 @@ .globl _RtlFillMemory@12 // [4] (no bug) .globl _RtlCompareMemoryUlong@12 // [5] (no bug) .globl _RtlCompareMemory@12 // [4] (no bug) +.globl @RtlPrefetchMemoryNonTemporal@8 /* FUNCTIONS ***************************************************************/ @@ -145,3 +146,18 @@ pop edi 3: ret 12 // return count + + +@RtlPrefetchMemoryNonTemporal@8: + ret /* Overwritten by ntoskrnl/ke/i386/kernel.c if SSE is supported (see Ki386SetProcessorFeatures() ) */ + + mov eax, [_Ke386CacheGranularity] // Get cache line size + + // This is fastcall, so ecx = address, edx = size + fetch_next_line: + prefetchnta byte ptr [ecx] // prefechnta(address) + sub edx, eax // count = count - cache_line_size + add ecx, eax // address = address + cache_line_size + cmp edx, 0 // if(count) <= 0 + ja fetch_next_line // goto fetch_next_line + ret _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/lib/rtl/mem.c 2005-11-29 02:40:18 UTC (rev 19742) @@ -140,7 +140,7 @@ } /* -* @unimplemented +* @implemented */ VOID FASTCALL @@ -149,7 +149,9 @@ IN SIZE_T Length ) { - UNIMPLEMENTED; + /* By nature of prefetch, this is non-portable. */ + (void)Source; + (void)Length; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 02:40:18 UTC (rev 19742) @@ -22,6 +22,7 @@ ULONG Ke386CacheAlignment; CHAR Ke386CpuidModel[49] = {0,}; ULONG Ke386L1CacheSize; +ULONG Ke386CacheGranularity = 0x40; /* FIXME: Default to 64 bytes for RtlPrefetchMemoryNonTemporal(), need real size */ BOOLEAN Ke386NoExecute = FALSE; BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; @@ -476,6 +477,7 @@ DPRINT("Ke386CacheAlignment: %d\n", Ke386CacheAlignment); if (Ke386L1CacheSize) { + DPRINT("Ke386L1CacheSize: %dkB\n", Ke386L1CacheSize); } if (Pcr->L2CacheSize) @@ -497,7 +499,7 @@ KEY_VALUE_PARTIAL_INFORMATION ValueData; NTSTATUS Status; ULONG FastSystemCallDisable = 0; - + SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = @@ -516,6 +518,13 @@ SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2); + /* Does the CPU Support 'prefetchnta' (SSE) */ + if(Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE) + { + /* Replace the ret by a nop */ + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + } + /* Does the CPU Support Fast System Call? */ if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) {

18 years, 9 months

[cwittich] 19741: fix warning

by cwittich＠svn.reactos.com

fix warning Modified: trunk/reactos/subsys/system/sc/sc.c _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-29 01:48:25 UTC (rev 19740) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-29 01:54:33 UTC (rev 19741) @@ -130,7 +130,7 @@ else if (_tcsicmp(Command, _T("control")) == 0) { if (ServiceName) - Control((DWORD)NULL, ServiceName, ServiceArgs); + Control(0, ServiceName, ServiceArgs); else ContinueUsage(); }

18 years, 9 months

[cwittich] 19740: fixed some warnings when compiling with msvc

by cwittich＠svn.reactos.com

fixed some warnings when compiling with msvc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/listview.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -287,8 +287,8 @@ _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; pChildWnd->hWnd = hWnd; - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, TREE_WINDOW); - pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, pChildWnd->szPath*/); + pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); + pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); break; } _____ Modified: trunk/reactos/subsys/system/regedit/edit.c --- trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -248,7 +248,7 @@ { WNDPROC oldwndproc; - oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWL_USERDATA); + oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA); switch (uMsg) { @@ -301,7 +301,7 @@ /* subclass the edit control */ hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); - oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWL_WNDPROC); + oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwndValue, GWL_WNDPROC); SetWindowLongPtr(hwndValue, GWL_USERDATA, (DWORD_PTR)oldproc); SetWindowLongPtr(hwndValue, GWL_WNDPROC, (DWORD_PTR)DwordEditSubclassProc); _____ Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -867,7 +867,7 @@ { PHEXEDIT_DATA hed; - hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0); + hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0); switch(uMsg) { case WM_ERASEBKGND: _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -474,7 +474,7 @@ } -HWND CreateListView(HWND hwndParent, int id) +HWND CreateListView(HWND hwndParent, HMENU id) { RECT rcClient; HWND hwndLV; @@ -484,7 +484,7 @@ hwndLV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, _T("List View"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, id, hInst, NULL); if (!hwndLV) return NULL; /* Initialize the image list, and add items to the control. */ _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -144,7 +144,7 @@ DWORD dwError = GetLastError(); } */ - hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(int)hFrameWndClass, szTitle, + hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(UlongToPtr(hFrameWndClass)), szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:48:25 UTC (rev 19740) @@ -99,14 +99,14 @@ extern BOOL ExportRegistryFile(HWND hWnd); /* listview.c */ -extern HWND CreateListView(HWND hwndParent, int id); +extern HWND CreateListView(HWND hwndParent, HMENU id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath); extern LPCTSTR GetValueName(HWND hwndLV, int iStartAt); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); +extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id); extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -572,7 +572,7 @@ * Returns the handle to the new control if successful, or NULL otherwise. * hwndParent - handle to the control's parent window. */ -HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id) +HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id) { RECT rcClient; HWND hwndTV; @@ -582,7 +582,7 @@ hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, id, hInst, NULL); /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) { DestroyWindow(hwndTV);

18 years, 9 months

[weiden] 19739: another hack to get reactos to build again

by weiden＠svn.reactos.com

another hack to get reactos to build again Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h _____ Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-11-29 00:33:22 UTC (rev 19738) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-11-29 01:35:32 UTC (rev 19739) @@ -21,12 +21,18 @@ #ifndef FRAMEBUF_H #define FRAMEBUF_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> #include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT typedef struct _PDEV

18 years, 9 months

[ion] 19738: - Fix the build (patch by Thomas Weidenmueller)

by ion＠svn.reactos.com

- Fix the build (patch by Thomas Weidenmueller) Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,11 @@ -#include <ntddk.h> -#define NDEBUG -#include <debug.h> #include "../vgaddi.h" #include "../vgavideo/vgavideo.h" #include "brush.h" #include "bitblt.h" +#define NDEBUG +#include <debug.h> + typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c --- trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,11 @@ -#include <ntddk.h> -#define NDEBUG -#include <debug.h> #include "../vgaddi.h" #include "../vgavideo/vgavideo.h" #include "brush.h" #include "bitblt.h" +#define NDEBUG +#include <debug.h> + BOOL STDCALL DrvTransparentBlt(SURFOBJ* Dest, SURFOBJ* Source, _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,62 @@ #define _WINBASE_ #define _WINDOWS_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> #include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> +/* FIXME - what a headers mess.... */ + +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl + +ULONG DbgPrint(PCH Format,...); +VOID DDKAPI DbgBreakPoint(VOID); +VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); +VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value); +UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register); + +static __inline BOOLEAN +RemoveEntryList( + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (OldFlink == OldBlink); +} + +static __inline VOID +InsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + OldFlink = ListHead->Flink; + Entry->Flink = OldFlink; + Entry->Blink = ListHead; + OldFlink->Blink = Entry; + ListHead->Flink = Entry; +} + +static __inline VOID +InitializeListHead( + IN PLIST_ENTRY ListHead) +{ + ListHead->Flink = ListHead->Blink = ListHead; +} + +/***********************************************************/ + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define DS_SOLIDBRUSH 0x00000001 _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,23 @@ +#define _WINBASE_ +#define _WINDOWS_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> +#include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> -#include <ddk/winddi.h> #include <stdlib.h> #include "vgavideo.h" +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl + +VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); +VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value); + UCHAR PreCalcReverseByte[256]; int maskbit[640]; int y80[480];

18 years, 9 months

[npwoods] 19737: Regedit: Implemented accelerator keys

by npwoods＠svn.reactos.com

Regedit: Implemented accelerator keys Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-28 23:58:49 UTC (rev 19737) @@ -242,11 +242,11 @@ if (!InitInstance(hInstance, nCmdShow)) { return FALSE; } - hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT); + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL)); /* Main message loop */ while (GetMessage(&msg, (HWND)NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccel, &msg) + if (!TranslateAccelerator(hFrameWnd, hAccel, &msg) && !TranslateChildTabMessage(&msg)) { TranslateMessage(&msg); DispatchMessage(&msg); _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-28 23:58:49 UTC (rev 19737) @@ -206,4 +206,6 @@ #define ID_FAVORITES_MIN 2100 #define ID_FAVORITES_MAX 2999 +#define ID_ACCEL 3000 + #define IDC_STATIC -1 _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-28 23:58:49 UTC (rev 19737) @@ -21,6 +21,15 @@ #include "windows.h" #include "resource.h" +ID_ACCEL ACCELERATORS +{ + VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT + "^F", ID_EDIT_FIND + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT +} + /* define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

18 years, 9 months

[weiden] 19736: oops, I didn't mean to commit that...

by weiden＠svn.reactos.com

oops, I didn't mean to commit that... Modified: trunk/reactos/apps/utils/ps/ps.c _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-11-28 23:43:40 UTC (rev 19735) +++ trunk/reactos/apps/utils/ps/ps.c 2005-11-28 23:54:06 UTC (rev 19736) @@ -273,8 +273,7 @@ (WNDENUMPROC) EnumThreadProc, (LPARAM)(LPTSTR) szWindowName ); } -typedef __attribute__((mode (__pointer__))) unsigned long ULONG_PTRX; -CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTRX)CurrentProcess + 1); + CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTR)CurrentProcess + (ULONG_PTR)CurrentProcess->NextEntryOffset); }

18 years, 9 months

[weiden] 19735: fixed some prototypes

by weiden＠svn.reactos.com

fixed some prototypes Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/lib/kernel32/file/copy.c Modified: trunk/reactos/lib/kernel32/mem/virtual.c Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/region.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/windef.h _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/apps/utils/ps/ps.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -269,12 +269,14 @@ statt->desc , waitt->desc); WriteFile(stdout, buf1, lstrlen(buf1), &r, NULL); - EnumThreadWindows((DWORD)CurrentProcess->Threads[ti].ClientId.UniqueThre ad, + EnumThreadWindows(PtrToUlong(CurrentProcess->Threads[ti].ClientId.Unique Thread), (WNDENUMPROC) EnumThreadProc, (LPARAM)(LPTSTR) szWindowName ); } +typedef __attribute__((mode (__pointer__))) unsigned long ULONG_PTRX; +CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTRX)CurrentProcess + 1); CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTR)CurrentProcess + - CurrentProcess->NextEntryOffset); + (ULONG_PTR)CurrentProcess->NextEntryOffset); } return (0); } _____ Modified: trunk/reactos/include/ndk/mmfuncs.h --- trunk/reactos/include/ndk/mmfuncs.h 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/include/ndk/mmfuncs.h 2005-11-28 23:43:40 UTC (rev 19735) @@ -48,7 +48,7 @@ IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, IN ULONG ZeroBits, - IN OUT PULONG RegionSize, + IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect ); @@ -97,7 +97,7 @@ NtFreeVirtualMemory( IN HANDLE ProcessHandle, IN PVOID *BaseAddress, - IN PULONG RegionSize, + IN PSIZE_T RegionSize, IN ULONG FreeType ); @@ -119,7 +119,7 @@ IN ULONG ZeroBits, IN ULONG CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, + IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, IN ULONG AccessProtection @@ -207,7 +207,7 @@ IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, IN ULONG ZeroBits, - IN OUT PULONG RegionSize, + IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect ); @@ -247,7 +247,7 @@ ZwFreeVirtualMemory( IN HANDLE ProcessHandle, IN PVOID *BaseAddress, - IN PULONG RegionSize, + IN PSIZE_T RegionSize, IN ULONG FreeType ); @@ -270,7 +270,7 @@ IN ULONG ZeroBits, IN ULONG CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, + IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, IN ULONG AccessProtection _____ Modified: trunk/reactos/lib/kernel32/file/copy.c --- trunk/reactos/lib/kernel32/file/copy.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/kernel32/file/copy.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -35,7 +35,7 @@ NTSTATUS errCode; IO_STATUS_BLOCK IoStatusBlock; UCHAR *lpBuffer = NULL; - ULONG RegionSize = 0x10000; + SIZE_T RegionSize = 0x10000; LARGE_INTEGER BytesCopied; DWORD CallbackReason; DWORD ProgressResult; _____ Modified: trunk/reactos/lib/kernel32/mem/virtual.c --- trunk/reactos/lib/kernel32/mem/virtual.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/kernel32/mem/virtual.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -22,7 +22,7 @@ LPVOID STDCALL VirtualAllocEx(HANDLE hProcess, LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) { @@ -31,7 +31,7 @@ Status = NtAllocateVirtualMemory(hProcess, (PVOID *)&lpAddress, 0, - (PULONG)&dwSize, + &dwSize, flAllocationType, flProtect); if (!NT_SUCCESS(Status)) @@ -48,7 +48,7 @@ */ LPVOID STDCALL VirtualAlloc(LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) { @@ -66,7 +66,7 @@ BOOL STDCALL VirtualFreeEx(HANDLE hProcess, LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD dwFreeType) { NTSTATUS Status; @@ -89,7 +89,7 @@ */ BOOL STDCALL VirtualFree(LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD dwFreeType) { return(VirtualFreeEx(GetCurrentProcess(), @@ -104,7 +104,7 @@ */ BOOL STDCALL VirtualProtect(LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect) { @@ -122,7 +122,7 @@ BOOL STDCALL VirtualProtectEx(HANDLE hProcess, LPVOID lpAddress, - DWORD dwSize, + SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect) { @@ -147,7 +147,7 @@ */ BOOL STDCALL VirtualLock(LPVOID lpAddress, - DWORD dwSize) + SIZE_T dwSize) { ULONG BytesLocked; NTSTATUS Status; @@ -171,7 +171,7 @@ DWORD STDCALL VirtualQuery(LPCVOID lpAddress, PMEMORY_BASIC_INFORMATION lpBuffer, - DWORD dwLength) + SIZE_T dwLength) { return(VirtualQueryEx(NtCurrentProcess(), lpAddress, @@ -187,7 +187,7 @@ VirtualQueryEx(HANDLE hProcess, LPCVOID lpAddress, PMEMORY_BASIC_INFORMATION lpBuffer, - DWORD dwLength) + SIZE_T dwLength) { NTSTATUS Status; ULONG ResultLength; @@ -212,7 +212,7 @@ */ BOOL STDCALL VirtualUnlock(LPVOID lpAddress, - DWORD dwSize) + SIZE_T dwSize) { ULONG BytesLocked; NTSTATUS Status; _____ Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c --- trunk/reactos/lib/kernel32/misc/toolhelp.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/kernel32/misc/toolhelp.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -95,7 +95,7 @@ TH32FreeAllocatedResources(PRTL_DEBUG_BUFFER HeapDebug, PRTL_DEBUG_BUFFER ModuleDebug, PVOID ProcThrdInfo, - ULONG ProcThrdInfoSize) + SIZE_T ProcThrdInfoSize) { if(HeapDebug != NULL) { @@ -121,7 +121,7 @@ PRTL_DEBUG_BUFFER *HeapDebug, PRTL_DEBUG_BUFFER *ModuleDebug, PVOID *ProcThrdInfo, - ULONG *ProcThrdInfoSize) + SIZE_T *ProcThrdInfoSize) { NTSTATUS Status = STATUS_SUCCESS; @@ -1115,7 +1115,7 @@ { PRTL_DEBUG_BUFFER HeapDebug, ModuleDebug; PVOID ProcThrdInfo; - ULONG ProcThrdInfoSize; + SIZE_T ProcThrdInfoSize; NTSTATUS Status; HANDLE hSnapShotSection = NULL; _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/kernel32/process/create.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -366,7 +366,7 @@ NTSTATUS Status; PWCHAR ScanChar; ULONG EnviroSize; - ULONG Size; + SIZE_T Size; UNICODE_STRING Desktop, Shell, Runtime, Title; PPEB OurPeb = NtCurrentPeb(); LPVOID Environment = lpEnvironment; _____ Modified: trunk/reactos/lib/rtl/dbgbuffer.c --- trunk/reactos/lib/rtl/dbgbuffer.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/rtl/dbgbuffer.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -22,12 +22,12 @@ { NTSTATUS Status; PRTL_DEBUG_BUFFER Buf = NULL; - ULONG SectionSize = 100 * PAGE_SIZE; + SIZE_T SectionSize = 100 * PAGE_SIZE; Status = NtAllocateVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, + (PVOID*)&Buf, 0, - &SectionSize, + &SectionSize, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/lib/rtl/heap.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -291,10 +291,10 @@ PVOID ptr, ULONG flags) { - ULONG size = (ULONG)((char *)ptr - (char *)subheap); + SIZE_T size = (SIZE_T)((char *)ptr - (char *)subheap); NTSTATUS Status; PVOID address; - ULONG commitsize; + SIZE_T commitsize; size = (size + COMMIT_MASK) & ~COMMIT_MASK; if (size > subheap->size) @@ -516,7 +516,7 @@ * HEAP_InitSubHeap */ static BOOLEAN HEAP_InitSubHeap( HEAP *heap, PVOID address, ULONG flags, - ULONG commitSize, ULONG totalSize, + SIZE_T commitSize, ULONG totalSize, PRTL_HEAP_PARAMETERS Parameters ) { SUBHEAP *subheap = (SUBHEAP *)address; @@ -611,7 +611,7 @@ static PSUBHEAP HEAP_CreateSubHeap(PVOID BaseAddress, HEAP *heap, ULONG flags, - ULONG commitSize, ULONG totalSize, + SIZE_T commitSize, ULONG totalSize, PRTL_HEAP_PARAMETERS Parameters ) { PVOID address; @@ -671,7 +671,7 @@ * Find a free block at least as large as the requested size, and make sure * the requested size is committed. */ -static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, ULONG size, +static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, SUBHEAP **ppSubHeap ) { SUBHEAP *subheap; _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-11-28 23:43:40 UTC (rev 19735) @@ -1277,9 +1277,9 @@ VOID NTAPI -MmInitialiseRegion( +MmInitializeRegion( PLIST_ENTRY RegionListHead, - ULONG Length, + SIZE_T Length, ULONG Type, ULONG Protect ); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-28 23:43:40 UTC (rev 19735) @@ -114,6 +114,7 @@ #define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) #define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) #define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) +#define ProbeForWriteSize_t(Ptr) ProbeForWriteGenericType(Ptr, SIZE_T) #define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) #define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) #define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType(Ptr, UNICODE_STRING) @@ -138,6 +139,7 @@ #define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) +#define ProbeForReadSize_t(Ptr) ProbeForReadGenericType(Ptr, SIZE_T, 0) #define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType(Ptr, LARGE_INTEGER, __emptyLargeInteger) #define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType(Ptr, ULARGE_INTEGER, __emptyULargeInteger) #define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -747,7 +747,7 @@ MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, + MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -61,7 +61,7 @@ } while (Status != STATUS_SUCCESS); /* Initialize the Region */ - MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, + MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, PAGE_SIZE, MEM_COMMIT, PAGE_READWRITE); @@ -194,7 +194,7 @@ { PPEB Peb = NULL; LARGE_INTEGER SectionOffset; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; PVOID TableBase = NULL; PIMAGE_NT_HEADERS NtHeaders; PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; @@ -385,7 +385,7 @@ PVOID BaseAddress; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; PVOID ImageBase = 0; BoundaryAddressMultiple.QuadPart = 0; _____ Modified: trunk/reactos/ntoskrnl/mm/region.c --- trunk/reactos/ntoskrnl/mm/region.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/mm/region.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -239,7 +239,7 @@ VOID NTAPI -MmInitialiseRegion(PLIST_ENTRY RegionListHead, ULONG Length, ULONG Type, +MmInitializeRegion(PLIST_ENTRY RegionListHead, ULONG Length, ULONG Type, ULONG Protect) { PMM_REGION Region; _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -3488,7 +3488,7 @@ PSECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, PVOID* BaseAddress, - ULONG ViewSize, + SIZE_T ViewSize, ULONG Protect, ULONG ViewOffset, ULONG AllocationType) @@ -3521,7 +3521,7 @@ MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset = ViewOffset; MArea->Data.SectionData.WriteCopyView = FALSE; - MmInitialiseRegion(&MArea->Data.SectionData.RegionListHead, + MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect); return(STATUS_SUCCESS); @@ -3584,14 +3584,14 @@ IN ULONG ZeroBits OPTIONAL, IN ULONG CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, + IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType OPTIONAL, IN ULONG Protect) { PVOID SafeBaseAddress; LARGE_INTEGER SafeSectionOffset; - ULONG SafeViewSize; + SIZE_T SafeViewSize; PSECTION_OBJECT Section; PEPROCESS Process; KPROCESSOR_MODE PreviousMode; @@ -3642,7 +3642,7 @@ ProbeForWriteLargeInteger(SectionOffset); SafeSectionOffset = *SectionOffset; } - ProbeForWriteUlong(ViewSize); + ProbeForWriteSize_t(ViewSize); SafeViewSize = *ViewSize; } _SEH_HANDLE @@ -4404,7 +4404,7 @@ IN ULONG ZeroBits, IN ULONG CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, + IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, IN ULONG Protect) _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-11-28 23:43:40 UTC (rev 19735) @@ -400,7 +400,7 @@ PVOID *DllBase) { NTSTATUS Status; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; PVOID ImageBase = 0; /* Map the System DLL */ _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/w32api/include/winbase.h 2005-11-28 23:43:40 UTC (rev 19735) @@ -1898,16 +1898,16 @@ BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD); BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG); BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG); -PVOID WINAPI VirtualAlloc(PVOID,DWORD,DWORD,DWORD); -PVOID WINAPI VirtualAllocEx(HANDLE,PVOID,DWORD,DWORD,DWORD); -BOOL WINAPI VirtualFree(PVOID,DWORD,DWORD); -BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,DWORD,DWORD); -BOOL WINAPI VirtualLock(PVOID,DWORD); -BOOL WINAPI VirtualProtect(PVOID,DWORD,DWORD,PDWORD); -BOOL WINAPI VirtualProtectEx(HANDLE,PVOID,DWORD,DWORD,PDWORD); -DWORD WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,DWORD); -DWORD WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,DWORD); -BOOL WINAPI VirtualUnlock(PVOID,DWORD); +PVOID WINAPI VirtualAlloc(PVOID,SIZE_T,DWORD,DWORD); +PVOID WINAPI VirtualAllocEx(HANDLE,PVOID,SIZE_T,DWORD,DWORD); +BOOL WINAPI VirtualFree(PVOID,SIZE_T,DWORD); +BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,SIZE_T,DWORD); +BOOL WINAPI VirtualLock(PVOID,SIZE_T); +BOOL WINAPI VirtualProtect(PVOID,SIZE_T,DWORD,PDWORD); +BOOL WINAPI VirtualProtectEx(HANDLE,PVOID,SIZE_T,DWORD,PDWORD); +DWORD WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); +DWORD WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); +BOOL WINAPI VirtualUnlock(PVOID,SIZE_T); BOOL WINAPI WaitCommEvent(HANDLE,PDWORD,LPOVERLAPPED); BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD); DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD); _____ Modified: trunk/reactos/w32api/include/windef.h --- trunk/reactos/w32api/include/windef.h 2005-11-28 23:35:35 UTC (rev 19734) +++ trunk/reactos/w32api/include/windef.h 2005-11-28 23:43:40 UTC (rev 19735) @@ -249,7 +249,9 @@ typedef int INT; typedef unsigned int UINT,*PUINT,*LPUINT; +#ifndef NT_INCLUDED #include <winnt.h> +#endif typedef UINT_PTR WPARAM; typedef LONG_PTR LPARAM;

18 years, 9 months

[royce] 19734: inline -> __inline

by royce＠svn.reactos.com

inline -> __inline patch by Brezenbak - small modifications by me Modified: trunk/reactos/apps/utils/pice/module/shell.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/math/libgcc2.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/lib/oskittcp/include/memtrack.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/drivers/lib/undis/include/ndishack.h Modified: trunk/reactos/drivers/lib/undis/ndis/compat.c Modified: trunk/reactos/drivers/net/tcpip/include/memtrack.h Modified: trunk/reactos/drivers/net/tcpip/include/tcpcore.h Modified: trunk/reactos/hal/halx86/include/apic.h Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/include/win32k/float.h Modified: trunk/reactos/lib/adns/src/internal.h Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/advapi32/sec/sid.c Modified: trunk/reactos/lib/dbghelp/path.c Modified: trunk/reactos/lib/dbghelp/stabs.c Modified: trunk/reactos/lib/dbghelp/stackframe.h Modified: trunk/reactos/lib/dbghelp/symbol.c Modified: trunk/reactos/lib/devenum/devenum_private.h Modified: trunk/reactos/lib/kjs/include/jsint.h Modified: trunk/reactos/lib/kjs/ksrc/alloc.c Modified: trunk/reactos/lib/kjs/ksrc/main.c Modified: trunk/reactos/lib/kjs/src/alloc.c Modified: trunk/reactos/lib/kjs/src/heap.c Modified: trunk/reactos/lib/kjs/src/main.c Modified: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/regtests/shared/regtests.h Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/clip.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/apps/utils/pice/module/shell.c --- trunk/reactos/apps/utils/pice/module/shell.c 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/apps/utils/pice/module/shell.c 2005-11-28 23:35:35 UTC (rev 19734) @@ -293,7 +293,7 @@ // bNoCtrlKeys() // //********************************************************************** *** -BOOLEAN inline bNoCtrlKeys(void) +BOOLEAN __inline bNoCtrlKeys(void) { return (!bControl && !bAlt && !bShift); } _____ Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-28 23:35:35 UTC (rev 19734) @@ -387,7 +387,7 @@ /* push the current state on the parser stack */ -inline static void push_state( struct parser *parser, enum parser_state state ) +__inline static void push_state( struct parser *parser, enum parser_state state ) { // assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); parser->stack[parser->stack_pos++] = state; @@ -395,7 +395,7 @@ /* pop the current state */ -inline static void pop_state( struct parser *parser ) +__inline static void pop_state( struct parser *parser ) { // assert( parser->stack_pos ); parser->state = parser->stack[--parser->stack_pos]; @@ -403,7 +403,7 @@ /* set the parser state and return the previous one */ -inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) +__inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) { enum parser_state ret = parser->state; parser->state = state; @@ -412,14 +412,14 @@ /* check if the pointer points to an end of file */ -inline static int is_eof( struct parser *parser, const CHAR *ptr ) +__inline static int is_eof( struct parser *parser, const CHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -inline static int is_eol( struct parser *parser, const CHAR *ptr ) +__inline static int is_eol( struct parser *parser, const CHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || _____ Modified: trunk/reactos/boot/freeldr/freeldr/math/libgcc2.c --- trunk/reactos/boot/freeldr/freeldr/math/libgcc2.c 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/boot/freeldr/freeldr/math/libgcc2.c 2005-11-28 23:35:35 UTC (rev 19734) @@ -60,7 +60,7 @@ #if defined (L_negdi2) || defined (L_divdi3) || defined (L_moddi3) #if defined (L_divdi3) || defined (L_moddi3) -static inline +static __inline #endif DWtype __negdi2 (DWtype u) @@ -514,7 +514,7 @@ #if (defined (L_udivdi3) || defined (L_divdi3) || \ defined (L_umoddi3) || defined (L_moddi3)) -static inline +static __inline #endif UDWtype __udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp) _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-11-28 23:35:35 UTC (rev 19734) @@ -35,7 +35,7 @@ /* FUNCTIONS ****************************************************************/ -static inline +static __inline int msf_to_lba (BYTE m, BYTE s, BYTE f) { return (((m * 60) + s) * 75 + f) - 150; _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/memtrack.h --- trunk/reactos/drivers/lib/oskittcp/include/memtrack.h 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/lib/oskittcp/include/memtrack.h 2005-11-28 23:35:35 UTC (rev 19734) @@ -49,12 +49,12 @@ #define TrackDump() TrackDumpFL(__FILE__,__LINE__) VOID TrackTag( DWORD Tag ); -static inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { +static __inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { PVOID Out = ExAllocatePool( type, size ); if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line ); return Out; } -static inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { +static __inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { UntrackFL(File, Line, Data); ExFreePool(Data); } _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h --- trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2005-11-28 23:35:35 UTC (rev 19734) @@ -16,7 +16,7 @@ #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER -static inline void panic ( const char* fmt, ... ) +static __inline void panic ( const char* fmt, ... ) { va_list arg; va_start(arg, fmt); _____ Modified: trunk/reactos/drivers/lib/undis/include/ndishack.h --- trunk/reactos/drivers/lib/undis/include/ndishack.h 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/lib/undis/include/ndishack.h 2005-11-28 23:35:35 UTC (rev 19734) @@ -27,7 +27,7 @@ * Entry = Pointer to the entry that is inserted in the lookaside list */ static -inline +__inline VOID ExFreeToNPagedLookasideList ( IN PNPAGED_LOOKASIDE_LIST Lookaside, @@ -54,7 +54,7 @@ * Address of the allocated list entry */ static -inline +__inline PVOID ExAllocateFromNPagedLookasideList ( IN PNPAGED_LOOKASIDE_LIST Lookaside _____ Modified: trunk/reactos/drivers/lib/undis/ndis/compat.c --- trunk/reactos/drivers/lib/undis/ndis/compat.c 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/lib/undis/ndis/compat.c 2005-11-28 23:35:35 UTC (rev 19734) @@ -73,7 +73,7 @@ } static -inline +__inline PSINGLE_LIST_ENTRY PopEntrySList( PSLIST_HEADER ListHead @@ -93,7 +93,7 @@ static -inline +__inline VOID PushEntrySList ( PSLIST_HEADER ListHead, _____ Modified: trunk/reactos/drivers/net/tcpip/include/memtrack.h --- trunk/reactos/drivers/net/tcpip/include/memtrack.h 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/net/tcpip/include/memtrack.h 2005-11-28 23:35:35 UTC (rev 19734) @@ -40,12 +40,12 @@ #define TrackDump() TrackDumpFL(__FILE__,__LINE__) VOID TrackTag( DWORD Tag ); -static inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { +static __inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { PVOID Out = PoolAllocateBuffer( size ); if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line ); return Out; } -static inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { +static __inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { UntrackFL(File, Line, Data); PoolFreeBuffer(Data); } _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcpcore.h --- trunk/reactos/drivers/net/tcpip/include/tcpcore.h 2005-11-28 23:27:16 UTC (rev 19733) +++ trunk/reactos/drivers/net/tcpip/include/tcpcore.h 2005-11-28 23:35:35 UTC (rev 19734) @@ -262,7 +262,7 @@ * Returns true if the queue is empty, false otherwise. */ -static inline int skb_queue_empty(struct sk_buff_head *list) +static __inline int skb_queue_empty(struct sk_buff_head *list) { return (list->next == (struct sk_buff *) list); } @@ -275,7 +275,7 @@ * to the buffer. */ -static inline struct sk_buff *skb_get(struct sk_buff *skb) +static __inline struct sk_buff *skb_get(struct sk_buff *skb) { atomic_inc(&skb->users); return skb; @@ -294,14 +294,14 @@ * hit zero. */ -static inline void kfree_skb(struct sk_buff *skb) +static __inline void kfree_skb(struct sk_buff *skb) { if (atomic_read(&skb->users) == 1 || atomic_dec_and_test(&skb->users)) __kfree_skb(skb); } /* Use this if you didn't touch the skb state [for fast switching] */ -static inline void kfree_skb_fast(struct sk_buff *skb) +static __inline void kfree_skb_fast(struct sk_buff *skb) { if (atomic_read(&skb->users) == 1 || atomic_dec_and_test(&skb->users)) kfree_skbmem(skb); @@ -316,7 +316,7 @@ * shared data so must not be written to under normal circumstances. */ -static inline int skb_cloned(struct sk_buff *skb) +static __inline int skb_cloned(struct sk_buff *skb) { return skb->cloned && atomic_read(&skb_shinfo(skb)->dataref) != 1; } @@ -329,7 +329,7 @@ * buffer. */ -static inline int skb_shared(struct sk_buff *skb) +static __inline int skb_shared(struct sk_buff *skb) { return (atomic_read(&skb->users) != 1); } @@ -348,7 +348,7 @@ * NULL is returned on a memory allocation failure. */ -static inline struct sk_buff *skb_share_check(struct sk_buff *skb, int pri) +static __inline struct sk_buff *skb_share_check(struct sk_buff *skb, int pri) { if (skb_shared(skb)) { struct sk_buff *nskb; @@ -381,7 +381,7 @@ * %NULL is returned on a memory allocation failure. */ -static inline struct sk_buff *skb_unshare(struct sk_buff *skb, int pri) +static __inline struct sk_buff *skb_unshare(struct sk_buff *skb, int pri) { struct sk_buff *nskb; if(!skb_cloned(skb)) @@ -405,7 +405,7 @@ * volatile. Use with caution. */ -static inline struct sk_buff *skb_peek(struct sk_buff_head *list_) +static __inline struct sk_buff *skb_peek(struct sk_buff_head *list_) { struct sk_buff *list = ((struct sk_buff *)list_)->next; if (list == (struct sk_buff *)list_) @@ -427,7 +427,7 @@ * volatile. Use with caution. */ -static inline struct sk_buff *skb_peek_tail(struct sk_buff_head *list_) +static __inline struct sk_buff *skb_peek_tail(struct sk_buff_head *list_) { struct sk_buff *list = ((struct sk_buff *)list_)->prev; if (list == (struct sk_buff *)list_) @@ -442,12 +442,12 @@ * Return the length of an &sk_buff queue. */ -static inline __u32 skb_queue_len(struct sk_buff_head *list_) +static __inline __u32 skb_queue_len(struct sk_buff_head *list_) { return(list_->qlen); } -static inline void skb_queue_head_init(struct sk_buff_head *list) +static __inline void skb_queue_head_init(struct sk_buff_head *list) { spin_lock_init(&list->lock); list->prev = (struct sk_buff *)list; @@ -473,7 +473,7 @@ * A buffer cannot be placed on two lists at the same time. */ -static inline void __skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk) +static __inline void __skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk) { struct sk_buff *prev, *next; @@ -500,7 +500,7 @@ * A buffer cannot be placed on two lists at the same time. */ -static inline void skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk) +static __inline void skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk) { unsigned long flags; @@ -521,7 +521,7 @@ */ -static inline void __skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk) +static __inline void __skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk) { struct sk_buff *prev, *next; @@ -547,7 +547,7 @@ * A buffer cannot be placed on two lists at the same time. */ -static inline void skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk) +static __inline void skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk) { unsigned long flags; @@ -565,7 +565,7 @@ * returned or %NULL if the list is empty. */ -static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list) +static __inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list) { struct sk_buff *next, *prev, *result; @@ -594,7 +594,7 @@ * returned or %NULL if the list is empty. */ -static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list) +static __inline struct sk_buff *skb_dequeue(struct sk_buff_head *list) { unsigned long flags; struct sk_buff *result; @@ -609,7 +609,7 @@ * Insert a packet on a list. */ -static inline void __skb_insert(struct sk_buff *newsk, +static __inline void __skb_insert(struct sk_buff *newsk, struct sk_buff * prev, struct sk_buff *next, struct sk_buff_head * list) { @@ -631,7 +631,7 @@ * A buffer cannot be placed on two lists at the same time. */ -static inline void skb_insert(struct sk_buff *old, struct sk_buff *newsk) +static __inline void skb_insert(struct sk_buff *old, struct sk_buff *newsk) { unsigned long flags; @@ -644,7 +644,7 @@ * Place a packet after a given packet in a list. */ -static inline void __skb_append(struct sk_buff *old, struct sk_buff *newsk) +static __inline void __skb_append(struct sk_buff *old, struct sk_buff *newsk) { __skb_insert(newsk, old, old->next, old->list); } @@ -660,7 +660,7 @@ */ -static inline void skb_append(struct sk_buff *old, struct sk_buff *newsk) +static __inline void skb_append(struct sk_buff *old, struct sk_buff *newsk) { unsigned long flags; @@ -674,7 +674,7 @@ * the list known.. */ -static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list) +static __inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list) { struct sk_buff * next, * prev; @@ -701,7 +701,7 @@ * destroyed. */ -static inline void skb_unlink(struct sk_buff *skb) +static __inline void skb_unlink(struct sk_buff *skb) { struct sk_buff_head *list = skb->list; @@ -726,7 +726,7 @@ * returned or %NULL if the list is empty. */ -static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list) +static __inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list) { struct sk_buff *skb = skb_peek_tail(list); if (skb) @@ -743,7 +743,7 @@ * returned or %NULL if the list is empty. */ -static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list) +static __inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list) { unsigned long flags; struct sk_buff *result; @@ -754,12 +754,12 @@ return result; } -static inline int skb_is_nonlinear(const struct sk_buff *skb) +static __inline int skb_is_nonlinear(const struct sk_buff *skb) { return skb->data_len; } -static inline int skb_headlen(const struct sk_buff *skb) +static __inline int skb_headlen(const struct sk_buff *skb) { return skb->len - skb->data_len; } @@ -772,7 +772,7 @@ * Add data to an sk_buff */ -static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len) +static __inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len) { unsigned char *tmp=skb->tail; SKB_LINEAR_ASSERT(skb); @@ -791,7 +791,7 @@ * first byte of the extra data is returned. */ -static inline unsigned char *skb_put(struct sk_buff *skb, unsigned int len) +static __inline unsigned char *skb_put(struct sk_buff *skb, unsigned int len) { #if 0 unsigned char *tmp=skb->tail; @@ -807,7 +807,7 @@ #endif } -static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len) +static __inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len) { skb->data-=len; skb->len+=len; @@ -824,7 +824,7 @@ * panic. A pointer to the first byte of the extra data is returned. */ -static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len) +static __inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len) { #if 0 skb->data-=len; @@ -838,7 +838,7 @@ #endif } -static inline char *__skb_pull(struct sk_buff *skb, unsigned int len) +static __inline char *__skb_pull(struct sk_buff *skb, unsigned int len) { skb->len-=len; if (skb->len < skb->data_len) @@ -857,7 +857,7 @@ * the old data. */ -static inline unsigned char * skb_pull(struct sk_buff *skb, unsigned int len) +static __inline unsigned char * skb_pull(struct sk_buff *skb, unsigned int len) { if (len > skb->len) return NULL; @@ -866,7 +866,7 @@ extern unsigned char * __pskb_pull_tail(struct sk_buff *skb, int delta); -static inline char *__pskb_pull(struct sk_buff *skb, unsigned int len) +static __inline char *__pskb_pull(struct sk_buff *skb, unsigned int len) { if (len > skb_headlen(skb) && __pskb_pull_tail(skb, len-skb_headlen(skb)) == NULL) @@ -875,14 +875,14 @@ return skb->data += len; } -static inline unsigned char * pskb_pull(struct sk_buff *skb, unsigned int len) +static __inline unsigned char * pskb_pull(struct sk_buff *skb, unsigned int len) { if (len > skb->len) return NULL; return __pskb_pull(skb,len); } -static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len) +static __inline int pskb_may_pull(struct sk_buff *skb, unsigned int len) { if (len <= skb_headlen(skb)) return 1; @@ -898,7 +898,7 @@ * Return the number of bytes of free space at the head of an &sk_buff. */ -static inline int skb_headroom(const struct sk_buff *skb) +static __inline int skb_headroom(const struct sk_buff *skb) { return skb->data-skb->head; } @@ -910,7 +910,7 @@ * Return the number of bytes of free space at the tail of an sk_buff */ -static inline int skb_tailroom(const struct sk_buff *skb) +static __inline int skb_tailroom(const struct sk_buff *skb) { return skb_is_nonlinear(skb) ? 0 : skb->end-skb->tail; } @@ -924,7 +924,7 @@ * room. This is only allowed for an empty buffer. */ -static inline void skb_reserve(struct sk_buff *skb, unsigned int len) +static __inline void skb_reserve(struct sk_buff *skb, unsigned int len) { skb->data+=len; skb->tail+=len; @@ -932,7 +932,7 @@ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc); -static inline void __skb_trim(struct sk_buff *skb, unsigned int len) +static __inline void __skb_trim(struct sk_buff *skb, unsigned int len) { if (!skb->data_len) { skb->len = len; @@ -951,7 +951,7 @@ * the buffer is already under the length specified it is not modified. */ -static inline void skb_trim(struct sk_buff *skb, unsigned int len) +static __inline void skb_trim(struct sk_buff *skb, unsigned int len) { if (skb->len > len) { __skb_trim(skb, len); @@ -959,7 +959,7 @@ } -static inline int __pskb_trim(struct sk_buff *skb, unsigned int len) +static __inline int __pskb_trim(struct sk_buff *skb, unsigned int len) { if (!skb->data_len) { skb->len = len; @@ -970,7 +970,7 @@ } } -static inline int pskb_trim(struct sk_buff *skb, unsigned int len) +static __inline int pskb_trim(struct sk_buff *skb, unsigned int len) { if (len < skb->len) return __pskb_trim(skb, len); @@ -987,7 +987,7 @@ */ -static inline void skb_orphan(struct sk_buff *skb) +static __inline void skb_orphan(struct sk_buff *skb) { if (skb->destructor) skb->destructor(skb); @@ -1005,7 +1005,7 @@ */ -static inline void skb_queue_purge(struct sk_buff_head *list) +static __inline void skb_queue_purge(struct sk_buff_head *list) { struct sk_buff *skb; while ((skb=skb_dequeue(list))!=NULL) @@ -1022,7 +1022,7 @@ */ -static inline void __skb_queue_purge(struct sk_buff_head *list) +static __inline void __skb_queue_purge(struct sk_buff_head *list) { struct sk_buff *skb; while ((skb=__skb_dequeue(list))!=NULL) @@ -1042,7 +1042,7 @@ * %NULL is returned in there is no free memory. */ -static inline struct sk_buff *__dev_alloc_skb(unsigned int length, +static __inline struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask) { struct sk_buff *skb; @@ -1066,7 +1066,7 @@ * allocates memory it can be called from an interrupt. */ -static inline struct sk_buff *dev_alloc_skb(unsigned int length) +static __inline struct sk_buff *dev_alloc_skb(unsigned int length) { #if 0 return __dev_alloc_skb(length, GFP_ATOMIC); @@ -1088,7 +1088,7 @@ * and at least @headroom of space at head. */ -static inline int +static __inline int skb_cow(struct sk_buff *skb, unsigned int headroom) { #if 0 @@ -1114,7 +1114,7 @@ * is returned and the old skb data released. */ int skb_linearize(struct sk_buff *skb, int gfp); -static inline void *kmap_skb_frag(const skb_frag_t *frag) +static __inline void *kmap_skb_frag(const skb_frag_t *frag) { #if 0 #ifdef CONFIG_HIGHMEM @@ -1129,7 +1129,7 @@ #endif } -static inline void kunmap_skb_frag(void *vaddr) +static __inline void kunmap_skb_frag(void *vaddr) { #if 0 kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); @@ -1162,13 +1162,13 @@ extern void skb_add_mtu(int mtu); #ifdef CONFIG_NETFILTER -static inline void +static __inline void nf_conntrack_put(struct nf_ct_info *nfct) { if (nfct && atomic_dec_and_test(&nfct->master->use)) nfct->master->destroy(nfct->master); } -static inline void +static __inline void nf_conntrack_get(struct nf_ct_info *nfct) { if (nfct) @@ -1733,12 +1733,12 @@ #ifdef __KERNEL__ -static inline void dst_hold(struct dst_entry * dst) +static __inline void dst_hold(struct dst_entry * dst) { atomic_inc(&dst->__refcnt); } -static inline +static __inline struct dst_entry * dst_clone(struct dst_entry * dst) { if (dst) @@ -1746,7 +1746,7 @@ return dst; } -static inline +static __inline void dst_release(struct dst_entry * dst) { if (dst) @@ -1757,7 +1757,7 @@ extern void __dst_free(struct dst_entry * dst); extern void dst_destroy(struct dst_entry * dst); -static inline +static __inline void dst_free(struct dst_entry * dst) { if (dst->obsolete > 1) @@ -1769,27 +1769,27 @@ __dst_free(dst); } -static inline void dst_confirm(struct dst_entry *dst) +static __inline void dst_confirm(struct dst_entry *dst) { if (dst) neigh_confirm(dst->neighbour); } -static inline void dst_negative_advice(struct dst_entry **dst_p) +static __inline void dst_negative_advice(struct dst_entry **dst_p) { struct dst_entry * dst = *dst_p; if (dst && dst->ops->negative_advice) *dst_p = dst->ops->negative_advice(dst); } -static inline void dst_link_failure(struct sk_buff *skb) +static __inline void dst_link_failure(struct sk_buff *skb) { struct dst_entry * dst = skb->dst; if (dst && dst->ops && dst->ops->link_failure) dst->ops->link_failure(skb); } -static inline void dst_set_expires(struct dst_entry *dst, int timeout) +static __inline void dst_set_expires(struct dst_entry *dst, int timeout) { unsigned long expires = jiffies + timeout; @@ -1940,7 +1940,7 @@ extern struct sock *tcp_v4_lookup_listener(u32 addr, unsigned short hnum, int dif); /* These are AF independent. */ -static __inline__ int tcp_bhashfn(__u16 lport) +static __inline int tcp_bhashfn(__u16 lport) { return (lport & (tcp_bhash_size - 1)); } @@ -1992,7 +1992,7 @@ extern kmem_cache_t *tcp_timewait_cachep; -static inline void tcp_tw_put(struct tcp_tw_bucket *tw) +static __inline void tcp_tw_put(struct tcp_tw_bucket *tw) { if (atomic_dec_and_test(&tw->refcnt)) { #ifdef INET_REFCNT_DEBUG @@ -2048,7 +2048,7 @@ (!((__sk)->bound_dev_if) || ((__sk)->bound_dev_if == (__dif)))) /* These can have wildcards, don't try too hard. */ -static __inline__ int tcp_lhashfn(unsigned short num) +static __inline int tcp_lhashfn(unsigned short num) { #if 0 return num & (TCP_LHTABLE_SIZE - 1); @@ -2057,7 +2057,7 @@ #endif } -static __inline__ int tcp_sk_listen_hashfn(struct sock *sk) +static __inline int tcp_sk_listen_hashfn(struct sock *sk) { #if 0 return tcp_lhashfn(sk->num); @@ -2341,7 +2341,7 @@ #define tcp_openreq_alloc() kmem_cache_alloc(tcp_openreq_cachep, SLAB_ATOMIC) #define tcp_openreq_fastfree(req) kmem_cache_free(tcp_openreq_cachep, req) -static inline void tcp_openreq_free(struct open_request *req) +static __inline void tcp_openreq_free(struct open_request *req) { req->class->destructor(req); tcp_openreq_fastfree(req); @@ -2477,17 +2477,17 @@ TCP_ACK_PUSHED= 4 }; -static inline void tcp_schedule_ack(struct tcp_opt *tp) +static __inline void tcp_schedule_ack(struct tcp_opt *tp) { tp->ack.pending |= TCP_ACK_SCHED; } -static inline int tcp_ack_scheduled(struct tcp_opt *tp) +static __inline int tcp_ack_scheduled(struct tcp_opt *tp) { return tp->ack.pending&TCP_ACK_SCHED; } -static __inline__ void tcp_dec_quickack_mode(struct tcp_opt *tp) +static __inline void tcp_dec_quickack_mode(struct tcp_opt *tp) { if (tp->ack.quick && --tp->ack.quick == 0) { /* Leaving quickack mode we deflate ATO. */ @@ -2497,12 +2497,12 @@ extern void tcp_enter_quickack_mode(struct tcp_opt *tp); -static __inline__ void tcp_delack_init(struct tcp_opt *tp) +static __inline void tcp_delack_init(struct tcp_opt *tp) { memset(&tp->ack, 0, sizeof(tp->ack)); } -static inline void tcp_clear_options(struct tcp_opt *tp) +static __inline void tcp_clear_options(struct tcp_opt *tp) { tp->tstamp_ok = tp->sack_ok = tp->wscale_ok = tp->snd_wscale = 0; } @@ -2641,7 +2641,7 @@ extern int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, sk_read_actor_t recv_actor); -static inline void tcp_clear_xmit_timer(struct sock *sk, int what) +static __inline void tcp_clear_xmit_timer(struct sock *sk, int what) { #if 0 struct tcp_opt *tp = &sk->tp_pinfo.af_tcp; @@ -2677,7 +2677,7 @@ /* * Reset the retransmission timer */ -static inline void tcp_reset_xmit_timer(struct sock *sk, int what, unsigned long when) +static __inline void tcp_reset_xmit_timer(struct sock *sk, int what, unsigned long when) { #if 0 struct tcp_opt *tp = &sk->tp_pinfo.af_tcp; @@ -2715,7 +2715,7 @@ * and even PMTU discovery events into account. */ -static __inline__ unsigned int tcp_current_mss(struct sock *sk) +static __inline unsigned int tcp_current_mss(struct sock *sk) { #if 0 struct tcp_opt *tp = &sk->tp_pinfo.af_tcp; @@ -2742,7 +2742,7 @@ * Underestimations are more easy to detect and fix by tcp_measure_rcv_mss(). */ -static inline void tcp_initialize_rcv_mss(struct sock *sk) +static __inline void tcp_initialize_rcv_mss(struct sock *sk) { #if 0 struct tcp_opt *tp = &sk->tp_pinfo.af_tcp; @@ -2756,7 +2756,7 @@ #endif } -static __inline__ void __tcp_fast_path_on(struct tcp_opt *tp, u32 snd_wnd) +static __inline void __tcp_fast_path_on(struct tcp_opt *tp, u32 snd_wnd) { #if 0 tp->pred_flags = htonl((tp->tcp_header_len << 26) | @@ -2765,14 +2765,14 @@ #endif } -static __inline__ void tcp_fast_path_on(struct tcp_opt *tp) +static __inline void tcp_fast_path_on(struct tcp_opt *tp) { #if 0 __tcp_fast_path_on(tp, tp->snd_wnd>>tp->snd_wscale); #endif } -static inline void tcp_fast_path_check(struct sock *sk, struct tcp_opt *tp) +static __inline void tcp_fast_path_check(struct sock *sk, struct tcp_opt *tp) { #if 0 if (skb_queue_len(&tp->out_of_order_queue) == 0 && @@ -2787,7 +2787,7 @@ * Rcv_nxt can be after the window if our peer push more data * than the offered window. */ -static __inline__ u32 tcp_receive_window(struct tcp_opt *tp) +static __inline u32 tcp_receive_window(struct tcp_opt *tp) { #if 0 s32 win = tp->rcv_wup + tp->rcv_wnd - tp->rcv_nxt; @@ -2879,7 +2879,7 @@ /* * Compute minimal free write space needed to queue new packets. */ -static inline int tcp_min_write_space(struct sock *sk) +static __inline int tcp_min_write_space(struct sock *sk) { #if 0 return sk->wmem_queued/2; @@ -2888,7 +2888,7 @@ #endif } -static inline int tcp_wspace(struct sock *sk) +static __inline int tcp_wspace(struct sock *sk) { #if 0 return sk->sndbuf - sk->wmem_queued; @@ -2912,7 +2912,7 @@ * "Packets left network, but not honestly ACKed yet" PLUS * "Packets fast retransmitted" */ -static __inline__ unsigned int tcp_packets_in_flight(struct tcp_opt *tp) +static __inline unsigned int tcp_packets_in_flight(struct tcp_opt *tp) { #if 0 return tp->packets_out - tp->left_out + tp->retrans_out; @@ -2926,7 +2926,7 @@ * one half the current congestion window, but no * less than two segments */ -static inline __u32 tcp_recalc_ssthresh(struct tcp_opt *tp) +static __inline __u32 tcp_recalc_ssthresh(struct tcp_opt *tp) { #if 0 return max(tp->snd_cwnd >> 1U, 2U); @@ -2939,7 +2939,7 @@ * The exception is rate halving phase, when cwnd is decreasing towards * ssthresh. */ -static inline __u32 tcp_current_ssthresh(struct tcp_opt *tp) +static __inline __u32 tcp_current_ssthresh(struct tcp_opt *tp) { #if 0 if ((1<<tp->ca_state)&(TCPF_CA_CWR|TCPF_CA_Recovery)) @@ -2953,7 +2953,7 @@ #endif } -static inline void tcp_sync_left_out(struct tcp_opt *tp) +static __inline void tcp_sync_left_out(struct tcp_opt *tp) { #if 0 if (tp->sack_ok && tp->sacked_out >= tp->packets_out - tp->lost_out) @@ -2966,7 +2966,7 @@ /* Congestion window validation. (RFC2861) */ -static inline void tcp_cwnd_validate(struct sock *sk, struct tcp_opt *tp) +static __inline void tcp_cwnd_validate(struct sock *sk, struct tcp_opt *tp) { #if 0 if (tp->packets_out >= tp->snd_cwnd) { @@ -2985,7 +2985,7 @@ } /* Set slow start threshould and cwnd not falling to slow start */ -static inline void __tcp_enter_cwr(struct tcp_opt *tp) +static __inline void __tcp_enter_cwr(struct tcp_opt *tp) { #if 0 tp->undo_marker = 0; @@ -2999,7 +2999,7 @@ #endif } -static inline void tcp_enter_cwr(struct tcp_opt *tp) +static __inline void tcp_enter_cwr(struct tcp_opt *tp) { #if 0 tp->prior_ssthresh = 0; @@ -3015,7 +3015,7 @@ /* Slow start with delack produces 3 packets of burst, so that * it is safe "de facto". */ -static __inline__ __u32 tcp_max_burst(struct tcp_opt *tp) +static __inline __u32 tcp_max_burst(struct tcp_opt *tp) { return 3; } @@ -3030,7 +3030,7 @@ #endif } -static __inline__ void tcp_minshall_update(struct tcp_opt *tp, int mss, struct sk_buff *skb) +static __inline void tcp_minshall_update(struct tcp_opt *tp, int mss, struct sk_buff *skb) { #if 0 if (skb->len < mss) @@ -3046,7 +3046,7 @@ With Minshall's modification: all sent small packets are ACKed. */ -static __inline__ int +static __inline int tcp_nagle_check(struct tcp_opt *tp, struct sk_buff *skb, unsigned mss_now, int nonagle) { #if 0 @@ -3064,7 +3064,7 @@ /* This checks if the data bearing packet SKB (usually tp->send_head) * should be put on the wire right now. */ [truncated at 1000 lines; 1316 more skipped]

18 years, 9 months

[weiden] 19733: don't include the ddk

by weiden＠svn.reactos.com

don't include the ddk Modified: trunk/rosapps/tests/mutex/mutex.c _____ Modified: trunk/rosapps/tests/mutex/mutex.c --- trunk/rosapps/tests/mutex/mutex.c 2005-11-28 23:25:31 UTC (rev 19732) +++ trunk/rosapps/tests/mutex/mutex.c 2005-11-28 23:27:16 UTC (rev 19733) @@ -1,4 +1,3 @@ -#include <ddk/ntddk.h> #include <windows.h> #include <string.h> #include <stdio.h>

18 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005