Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[navaraf] 16661: Get rid of windows.h include in win32k. Fixes bug #666.

by navaraf＠svn.reactos.com

Get rid of windows.h include in win32k. Fixes bug #666. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/w32api/include/basetyps.h Modified: trunk/reactos/w32api/include/ddk/ddrawi.h Modified: trunk/reactos/w32api/include/ddk/ddrawint.h Modified: trunk/reactos/w32api/include/ddraw.h Modified: trunk/reactos/w32api/include/oleacc.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/include/ndk/extypes.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -20,10 +20,7 @@ /* CONSTANTS *****************************************************************/ -/* FIXME: Win32k uses windows.h! */ -#ifndef __WIN32K__ #define INVALID_HANDLE_VALUE (HANDLE)-1 -#endif /* Callback Object Access Rights */ #define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -115,8 +115,6 @@ USHORT Reserved9; } KTRAP_FRAME, *PKTRAP_FRAME; -/* FIXME: Win32k uses windows.h! */ -#ifndef __WIN32K__ typedef struct _LDT_ENTRY { WORD LimitLow; @@ -145,7 +143,6 @@ } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; -#endif typedef struct _KGDTENTRY { _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -1,7 +1,6 @@ #ifndef __INCLUDE_CSRSS_CSRSS_H #define __INCLUDE_CSRSS_CSRSS_H -#include <windows.h> #include <blue/ntddblue.h> #define CSR_NATIVE 0x0000 _____ Modified: trunk/reactos/subsys/win32k/eng/xlate.c --- trunk/reactos/subsys/win32k/eng/xlate.c 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/subsys/win32k/eng/xlate.c 2005-07-20 07:27:09 UTC (rev 16661) @@ -313,6 +313,7 @@ XlateGDI->SourcePal = PaletteSource; XlateObj->flXlate = XO_TO_MONO; + XlateObj->pulXlate = &XlateGDI->BackgroundColor; switch (SourcePalType) { case PAL_INDEXED: @@ -478,11 +479,11 @@ if (XlateObj->flXlate & XO_TABLE) return XlateObj->pulXlate[Color]; + if (XlateObj->flXlate & XO_TO_MONO) + return Color == XlateObj->pulXlate[0]; + XlateGDI = ObjToGDI(XlateObj, XLATE); - if (XlateObj->flXlate & XO_TO_MONO) - return Color == XlateGDI->BackgroundColor; - if (XlateGDI->UseShiftAndMask) return ShiftAndMask(XlateGDI, Color); _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-20 07:27:09 UTC (rev 16661) @@ -800,8 +800,8 @@ if (!bInitialized) { - ZeroMemory(&IconFont, sizeof(LOGFONTW)); - ZeroMemory(&pMetrics, sizeof(NONCLIENTMETRICSW)); + RtlZeroMemory(&IconFont, sizeof(LOGFONTW)); + RtlZeroMemory(&pMetrics, sizeof(NONCLIENTMETRICSW)); IntGetFontMetricSetting(L"CaptionFont", &pMetrics.lfCaptionFont); IntGetFontMetricSetting(L"SmCaptionFont", &pMetrics.lfSmCaptionFont); _____ Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c --- trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-20 07:27:09 UTC (rev 16661) @@ -31,10 +31,6 @@ #include <w32k.h> -#ifdef __USE_W32API -#include <oleacc.h> -#endif - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-07-20 07:27:09 UTC (rev 16661) @@ -114,7 +114,7 @@ { DEFAULT_CHARSET, 0, FS(0)}, /* reserved for system */ { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, CP_SYMBOL, FS(31)}, + { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)}, }; VOID FASTCALL @@ -1044,7 +1044,7 @@ TEXTMETRICW *TM; NEWTEXTMETRICW *Ntm; - ZeroMemory(Info, sizeof(FONTFAMILYINFO)); + RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); if (NULL == Otm) _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/subsys/win32k/w32k.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -8,17 +8,26 @@ /* INCLUDES ******************************************************************/ -/* We are Win32K */ -#define __WIN32K__ - /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> +#include <ddk/ntddmou.h> #include <ddk/ntifs.h> -#include <ddk/winddi.h> -#include <ddk/ntddmou.h> -#include <windows.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 <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <dde.h> +#include <wincon.h> + /* SEH Support with PSEH */ #include <pseh/pseh.h> _____ Modified: trunk/reactos/w32api/include/basetyps.h --- trunk/reactos/w32api/include/basetyps.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/basetyps.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -10,23 +10,25 @@ # else # define EXTERN_C extern # endif /* __cplusplus */ -# ifndef __int64 -# define __int64 long long +# ifndef _MSC_VER +# ifndef __int64 +# define __int64 long long +# endif +# ifndef __int32 +# define __int32 long +# endif +# ifndef __int16 +# define __int16 int +# endif +# ifndef __int8 +# define __int8 char +# endif # endif -# ifndef __int32 -# define __int32 long -# endif -# ifndef __int16 -# define __int16 int -# endif -# ifndef __int8 -# define __int8 char -# endif # ifndef __small # define __small char # endif # ifndef __hyper -# define __hyper long long +# define __hyper __int64 # endif # define STDMETHODCALLTYPE __stdcall # define STDMETHODVCALLTYPE __cdecl _____ Modified: trunk/reactos/w32api/include/ddk/ddrawi.h --- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -616,14 +616,13 @@ /*********************************************************************** ****** * high-level ddraw implementation structures */ -#ifndef __USE_W32API -typedef DWORD IUnknown; /* FIXME: implement proper definition */ -#endif +#ifndef _NO_COM typedef struct _IUNKNOWN_LIST { struct _IUNKNOWN_LIST * lpLink; LPGUID lpGuid; IUnknown * lpIUnknown; } IUNKNOWN_LIST,*LPIUNKNOWN_LIST; +#endif /* _NO_COM */ typedef struct _PROCESS_LIST { struct _PROCESS_LIST * lpLink; @@ -669,6 +668,7 @@ DWORD dwIntRefCnt; } DDRAWI_DIRECTDRAW_INT; +#ifndef _NO_COM typedef struct _DDRAWI_DIRECTDRAW_LCL { DWORD lpDDMore; LPDDRAWI_DIRECTDRAW_GBL lpGbl; @@ -701,6 +701,7 @@ ULONG_PTR hGammaCalibrator; LPDDGAMMACALIBRATORPROC lpGammaCalibrator; } DDRAWI_DIRECTDRAW_LCL; +#endif /* _NO_COM */ #define DDRAWILCL_HASEXCLUSIVEMODE 0x00000001 #define DDRAWILCL_ISFULLSCREEN 0x00000002 @@ -896,6 +897,7 @@ #define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \ (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1)) +#ifndef _NO_COM typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD dwSize; IUNKNOWN_LIST * lpIUnknowns; @@ -930,6 +932,7 @@ DWORD dwFVF; LPVOID lpVB; } DDRAWI_DDRAWSURFACE_MORE; +#endif /* _NO_COM */ typedef struct _DDRAWI_DDRAWSURFACE_LCL { LPDDRAWI_DDRAWSURFACE_MORE lpSurfMore; @@ -1031,6 +1034,7 @@ #define DDRAWIPAL_STORED_8INDEX 0x00001000 #define DDRAWIPAL_ALPHA 0x00002000 +#ifndef _NO_COM typedef struct _DDRAWI_DDRAWPALETTE_LCL { DWORD lpPalMore; LPDDRAWI_DDRAWPALETTE_GBL lpGbl; @@ -1044,6 +1048,7 @@ ULONG_PTR dwDDRAWReserved2; ULONG_PTR dwDDRAWReserved3; } DDRAWI_DDRAWPALETTE_LCL; +#endif /* _NO_COM */ typedef struct _DDHAL_GETMOCOMPGUIDSDATA FAR *LPDDHAL_GETMOCOMPGUIDSDATA; typedef struct _DDHAL_GETMOCOMPFORMATSDATA FAR *LPDDHAL_GETMOCOMPFORMATSDATA; _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -5,8 +5,20 @@ #ifndef __DD_INCLUDED__ #define __DD_INCLUDED__ +#ifndef _NO_DDRAWINT_NO_COM +#ifndef _NO_COM +#define _NO_COM #include <ddraw.h> -#include <ddk/ddrawi.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#undef _NO_COM +#else +#include <ddraw.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#endif +#else +#include <ddraw.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#endif #ifdef __cplusplus extern "C" { _____ Modified: trunk/reactos/w32api/include/ddraw.h --- trunk/reactos/w32api/include/ddraw.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/ddraw.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -43,7 +43,9 @@ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H +#ifndef _NO_COM #include <objbase.h> +#endif #ifdef __cplusplus extern "C" { @@ -56,6 +58,7 @@ /*********************************************************************** ****** * Predeclare the interfaces */ +#ifndef _NO_COM #ifndef __DDRAW_GUID_DEFINED__ DEFINE_GUID( CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 ); DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 ); @@ -74,6 +77,7 @@ DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0 ,0xC9,0x03,0xA3,0xB8 ); DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0 ,0x4F,0xC2,0x9B,0x4E ); #endif +#endif typedef struct IDirectDraw *LPDIRECTDRAW; typedef struct IDirectDraw2 *LPDIRECTDRAW2; @@ -1069,16 +1073,17 @@ WORD blue[256]; } DDGAMMARAMP,*LPDDGAMMARAMP; -typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID); -typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID); -DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) - typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID); +#ifndef _NO_COM +typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID); +typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID); +DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) + typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR); typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR); DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX) @@ -1090,6 +1095,7 @@ typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags); typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags); DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX) +#endif /* _NO_COM */ /* flags for DirectDrawEnumerateEx */ #define DDENUM_ATTACHEDSECONDARYDEVICES 0x00000001 @@ -1229,6 +1235,7 @@ DWORD dwWHQLLevel; /* Windows Hardware Quality Lab certification level */ } DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2; +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawPalette interface */ @@ -1268,8 +1275,10 @@ #define IDirectDrawPalette_Initialize(p,a,b,c) (p)->Initialize(a,b,c) #define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->SetEntries(a,b,c,d) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawClipper interface */ @@ -1315,8 +1324,10 @@ #define IDirectDrawClipper_SetClipList(p,a,b) (p)->SetClipList(a,b) #define IDirectDrawClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDraw interface */ @@ -1404,6 +1415,7 @@ #define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->SetDisplayMode(a,b,c) #define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b) #endif +#endif /* _NO_COM */ /* flags for Lock() */ @@ -1417,6 +1429,7 @@ #define DDLOCK_DISCARDCONTENTS 0x00002000 +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDraw2 interface */ @@ -1513,8 +1526,10 @@ /*** IDirectDraw2 methods ***/ #define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDraw4 interface */ @@ -1623,8 +1638,10 @@ #define IDirectDraw4_TestCooperativeLevel(p) (p)->TestCooperativeLevel() #define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDraw7 interface */ @@ -1745,8 +1762,10 @@ #define IDirectDraw7_StartModeTest(p,a,b,c) (p)->StartModeTest(a,b,c) #define IDirectDraw7_EvaluateMode(p,a,b) (p)->EvaluateMode(a,b) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawSurface interface */ @@ -1873,8 +1892,10 @@ #define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a) #define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawSurface2 interface */ @@ -2016,8 +2037,10 @@ #define IDirectDrawSurface2_PageLock(p,a) (p)->PageLock(a) #define IDirectDrawSurface2_PageUnlock(p,a) (p)->PageUnlock(a) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawSurface3 interface */ @@ -2165,8 +2188,10 @@ /*** IDirectDrawSurface3 methods ***/ #define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawSurface4 interface */ @@ -2331,8 +2356,10 @@ #define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a) #define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue() #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawSurface7 interface */ @@ -2510,7 +2537,9 @@ #define IDirectDrawSurface7_SetLOD(p,a) (p)->SetLOD(a) #define IDirectDrawSurface7_GetLOD(p,a) (p)->GetLOD(a) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawColorControl interface */ @@ -2544,7 +2573,9 @@ #define IDirectDrawColorControl_GetColorControls(p,a) (p)->GetColorControls(a) #define IDirectDrawColorControl_SetColorControls(p,a) (p)->SetColorControls(a) #endif +#endif /* _NO_COM */ +#ifndef _NO_COM /*********************************************************************** ****** * IDirectDrawGammaControl interface */ @@ -2578,14 +2609,16 @@ #define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->GetGammaRamp(a,b) #define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->SetGammaRamp(a,b) #endif +#endif /* _NO_COM */ - +#ifndef _NO_COM HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN); HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN); HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID); HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID); #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN); +#endif /* _NO_COM */ #ifdef __cplusplus } /* extern "C" */ _____ Modified: trunk/reactos/w32api/include/oleacc.h --- trunk/reactos/w32api/include/oleacc.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/oleacc.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -101,6 +101,7 @@ #define ROLE_SYSTEM_WHITESPACE 59 #define ROLE_SYSTEM_WINDOW 9 +#ifndef STATE_SYSTEM_UNAVAILABLE #define STATE_SYSTEM_UNAVAILABLE 0x00000001 #define STATE_SYSTEM_SELECTED 0x00000002 #define STATE_SYSTEM_FOCUSED 0x00000004 @@ -131,6 +132,7 @@ #define STATE_SYSTEM_ALERT_MEDIUM 0x08000000 #define STATE_SYSTEM_ALERT_HIGH 0x10000000 #define STATE_SYSTEM_VALID 0x1fffffff +#endif typedef enum tagSELFLAG { _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-07-20 04:43:12 UTC (rev 16660) +++ trunk/reactos/w32api/include/winuser.h 2005-07-20 07:27:09 UTC (rev 16661) @@ -2414,6 +2414,36 @@ #define RIDEV_NOHOTKEYS 0x00000200 #define RIDEV_APPKEYS 0x00000400 #endif +#define STATE_SYSTEM_UNAVAILABLE 0x00000001 +#define STATE_SYSTEM_SELECTED 0x00000002 +#define STATE_SYSTEM_FOCUSED 0x00000004 +#define STATE_SYSTEM_PRESSED 0x00000008 +#define STATE_SYSTEM_CHECKED 0x00000010 +#define STATE_SYSTEM_MIXED 0x00000020 +#define STATE_SYSTEM_READONLY 0x00000040 +#define STATE_SYSTEM_HOTTRACKED 0x00000080 +#define STATE_SYSTEM_DEFAULT 0x00000100 +#define STATE_SYSTEM_EXPANDED 0x00000200 +#define STATE_SYSTEM_COLLAPSED 0x00000400 +#define STATE_SYSTEM_BUSY 0x00000800 +#define STATE_SYSTEM_FLOATING 0x00001000 +#define STATE_SYSTEM_MARQUEED 0x00002000 +#define STATE_SYSTEM_ANIMATED 0x00004000 +#define STATE_SYSTEM_INVISIBLE 0x00008000 +#define STATE_SYSTEM_OFFSCREEN 0x00010000 +#define STATE_SYSTEM_SIZEABLE 0x00020000 +#define STATE_SYSTEM_MOVEABLE 0x00040000 +#define STATE_SYSTEM_SELFVOICING 0x00080000 +#define STATE_SYSTEM_FOCUSABLE 0x00100000 +#define STATE_SYSTEM_SELECTABLE 0x00200000 +#define STATE_SYSTEM_LINKED 0x00400000 +#define STATE_SYSTEM_TRAVERSED 0x00800000 +#define STATE_SYSTEM_MULTISELECTABLE 0x01000000 +#define STATE_SYSTEM_EXTSELECTABLE 0x02000000 +#define STATE_SYSTEM_ALERT_LOW 0x04000000 +#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000 +#define STATE_SYSTEM_ALERT_HIGH 0x10000000 +#define STATE_SYSTEM_VALID 0x1fffffff #ifndef RC_INVOKED typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);

19 years, 3 months

[ion] 16660: Dmitry Philippov <shedon@mail.ru>:

by ion＠svn.reactos.com

Dmitry Philippov <shedon(a)mail.ru>: - Implemented FindFirstFileExW() and have removed InternalFindFirstFile() in /lib/kernel32/file/find.c, now FindFirstFileA (), FindFirstFileExA () and FindFirstFileW called FindFirstFileExW () NOTE: Filip has asked revision "16661" (the next one) to be done by him... sorry if this sounds silly, but please respect his wish :) Modified: trunk/reactos/lib/kernel32/file/find.c _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2005-07-20 03:50:50 UTC (rev 16659) +++ trunk/reactos/lib/kernel32/file/find.c 2005-07-20 04:43:12 UTC (rev 16660) @@ -4,9 +4,11 @@ * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/find.c * PURPOSE: Find functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne ( ariadne(a)xs4all.nl) + Dmitry Philippov ( shedon(a)mail.ru ) * UPDATE HISTORY: * Created 01/11/98 + * DP (18/06/2005) remove InternalFindFirstFile, implemented FindFirstFileExW */ /* INCLUDES *****************************************************************/ @@ -80,332 +82,9 @@ return TRUE; } - /* * @implemented */ -HANDLE -STDCALL -InternalFindFirstFile ( - LPCWSTR lpFileName - ) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - PKERNEL32_FIND_FILE_DATA IData; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - UNICODE_STRING PatternStr = RTL_CONSTANT_STRING(L"*"); - NTSTATUS Status; - PWSTR e1, e2; - WCHAR CurrentDir[256]; - PWCHAR SlashlessFileName; - PWSTR SearchPath; - PWCHAR SearchPattern; - ULONG Length; - BOOLEAN bResult; - - DPRINT("FindFirstFileW(lpFileName %S)\n", - lpFileName); - - Length = wcslen(lpFileName); - if (L'\\' == lpFileName[Length - 1]) - { - SlashlessFileName = RtlAllocateHeap(hProcessHeap, - 0, - Length * sizeof(WCHAR)); - if (NULL == SlashlessFileName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - memcpy(SlashlessFileName, lpFileName, (Length - 1) * sizeof(WCHAR)); - SlashlessFileName[Length - 1] = L'\0'; - lpFileName = SlashlessFileName; - } - else - { - SlashlessFileName = NULL; - } - - e1 = wcsrchr(lpFileName, L'/'); - e2 = wcsrchr(lpFileName, L'\\'); - SearchPattern = max(e1, e2); - SearchPath = CurrentDir; - - if (NULL == SearchPattern) - { - CHECKPOINT; - SearchPattern = (PWCHAR)lpFileName; - Length = GetCurrentDirectoryW(sizeof(CurrentDir) / sizeof(WCHAR), SearchPath); - if (0 == Length) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - return NULL; - } - if (Length > sizeof(CurrentDir) / sizeof(WCHAR)) - { - SearchPath = RtlAllocateHeap(hProcessHeap, - HEAP_ZERO_MEMORY, - Length * sizeof(WCHAR)); - if (NULL == SearchPath) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - GetCurrentDirectoryW(Length, SearchPath); - } - } - else - { - CHECKPOINT; - SearchPattern++; - Length = SearchPattern - lpFileName; - if (Length + 1 > sizeof(CurrentDir) / sizeof(WCHAR)) - { - SearchPath = RtlAllocateHeap(hProcessHeap, - HEAP_ZERO_MEMORY, - (Length + 1) * sizeof(WCHAR)); - if (NULL == SearchPath) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - } - memcpy(SearchPath, lpFileName, Length * sizeof(WCHAR)); - SearchPath[Length] = 0; - } - - bResult = RtlDosPathNameToNtPathName_U ((LPWSTR)SearchPath, - &NtPathU, - NULL, - NULL); - if (SearchPath != CurrentDir) - { - RtlFreeHeap(hProcessHeap, - 0, - SearchPath); - } - if (FALSE == bResult) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - return NULL; - } - - DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); - - IData = RtlAllocateHeap (hProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); - if (NULL == IData) - { - RtlFreeHeap (hProcessHeap, - 0, - NtPathU.Buffer); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - /* change pattern: "*.*" --> "*" */ - if (wcscmp (SearchPattern, L"*.*")) - { - RtlInitUnicodeString(&PatternStr, SearchPattern); - } - - DPRINT("NtPathU \'%S\' Pattern \'%S\'\n", - NtPathU.Buffer, PatternStr.Buffer); - - InitializeObjectAttributes (&ObjectAttributes, - &NtPathU, - 0, - NULL, - NULL); - - Status = NtOpenFile (&IData->DirectoryHandle, - FILE_LIST_DIRECTORY, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE); - - RtlFreeHeap (hProcessHeap, - 0, - NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap (hProcessHeap, 0, IData); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastErrorByStatus (Status); - return(NULL); - } - IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - IData->pFileInfo->FileIndex = 0; - - Status = NtQueryDirectoryFile (IData->DirectoryHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - (PVOID)IData->pFileInfo, - FIND_DATA_SIZE, - FileBothDirectoryInformation, - TRUE, - &PatternStr, - TRUE); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("Status %lx\n", Status); - CloseHandle (IData->DirectoryHandle); - RtlFreeHeap (hProcessHeap, 0, IData); - SetLastErrorByStatus (Status); - return NULL; - } - DPRINT("Found %.*S\n",IData->pFileInfo->FileNameLength/sizeof(WCHAR), IData->pFileInfo->FileName); - - return IData; -} - - -/* - * @implemented - */ -HANDLE -STDCALL -FindFirstFileA ( - LPCSTR lpFileName, - LPWIN32_FIND_DATAA lpFindFileData - ) -{ - PKERNEL32_FIND_FILE_DATA IData; - UNICODE_STRING FileNameU; - ANSI_STRING FileName; - - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - else - RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - - IData = InternalFindFirstFile (FileNameU.Buffer); - - RtlFreeUnicodeString (&FileNameU); - - if (IData == NULL) - { - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } - - DPRINT("IData->pFileInfo->FileNameLength %d\n", - IData->pFileInfo->FileNameLength); - - /* copy data into WIN32_FIND_DATA structure */ - lpFindFileData->dwFileAttributes = IData->pFileInfo->FileAttributes; - - lpFindFileData->ftCreationTime.dwHighDateTime = IData->pFileInfo->CreationTime.u.HighPart; - lpFindFileData->ftCreationTime.dwLowDateTime = IData->pFileInfo->CreationTime.u.LowPart; - - lpFindFileData->ftLastAccessTime.dwHighDateTime = IData->pFileInfo->LastAccessTime.u.HighPart; - lpFindFileData->ftLastAccessTime.dwLowDateTime = IData->pFileInfo->LastAccessTime.u.LowPart; - - lpFindFileData->ftLastWriteTime.dwHighDateTime = IData->pFileInfo->LastWriteTime.u.HighPart; - lpFindFileData->ftLastWriteTime.dwLowDateTime = IData->pFileInfo->LastWriteTime.u.LowPart; - - lpFindFileData->nFileSizeHigh = IData->pFileInfo->EndOfFile.u.HighPart; - lpFindFileData->nFileSizeLow = IData->pFileInfo->EndOfFile.u.LowPart; - - FileNameU.Length = IData->pFileInfo->FileNameLength; - FileNameU.MaximumLength = FileNameU.Length + sizeof(WCHAR); - FileNameU.Buffer = IData->pFileInfo->FileName; - - FileName.Length = 0; - FileName.MaximumLength = MAX_PATH; - FileName.Buffer = lpFindFileData->cFileName; - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&FileName, - &FileNameU, - FALSE); - else - RtlUnicodeStringToOemString (&FileName, - &FileNameU, - FALSE); - - DPRINT("IData->pFileInfo->ShortNameLength %d\n", - IData->pFileInfo->ShortNameLength); - - FileNameU.Length = IData->pFileInfo->ShortNameLength; - FileNameU.MaximumLength = FileNameU.Length + sizeof(WCHAR); - FileNameU.Buffer = IData->pFileInfo->ShortName; - - FileName.Length = 0; - FileName.MaximumLength = 14; - FileName.Buffer = lpFindFileData->cAlternateFileName; - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&FileName, - &FileNameU, - FALSE); - else - RtlUnicodeStringToOemString (&FileName, - &FileNameU, - FALSE); - - return (HANDLE)IData; -} - - -/* - * @implemented - */ BOOL STDCALL FindNextFileA ( @@ -518,53 +197,86 @@ return TRUE; } - /* * @implemented */ HANDLE STDCALL -FindFirstFileW ( - LPCWSTR lpFileName, - LPWIN32_FIND_DATAW lpFindFileData +FindFirstFileA ( + LPCSTR lpFileName, + LPWIN32_FIND_DATAA lpFindFileData ) { PKERNEL32_FIND_FILE_DATA IData; + UNICODE_STRING FileNameU; + ANSI_STRING FileName; + WIN32_FIND_DATAW FindFileData; - IData = InternalFindFirstFile (lpFileName); - if (IData == NULL) - { - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } + RtlInitAnsiString (&FileName, + (LPSTR)lpFileName); - /* copy data into WIN32_FIND_DATA structure */ - lpFindFileData->dwFileAttributes = IData->pFileInfo->FileAttributes; + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + RtlAnsiStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + else + RtlOemStringToUnicodeString (&FileNameU, + &FileName, + TRUE); - lpFindFileData->ftCreationTime.dwHighDateTime = IData->pFileInfo->CreationTime.u.HighPart; - lpFindFileData->ftCreationTime.dwLowDateTime = IData->pFileInfo->CreationTime.u.LowPart; + IData = FindFirstFileExW(FileNameU.Buffer, + FindExInfoStandard, + &FindFileData, + FindExSearchNameMatch, + NULL, + 0); - lpFindFileData->ftLastAccessTime.dwHighDateTime = IData->pFileInfo->LastAccessTime.u.HighPart; - lpFindFileData->ftLastAccessTime.dwLowDateTime = IData->pFileInfo->LastAccessTime.u.LowPart; + RtlFreeUnicodeString(&FileNameU); - lpFindFileData->ftLastWriteTime.dwHighDateTime = IData->pFileInfo->LastWriteTime.u.HighPart; - lpFindFileData->ftLastWriteTime.dwLowDateTime = IData->pFileInfo->LastWriteTime.u.LowPart; + if(INVALID_HANDLE_VALUE != IData) + { + RtlInitUnicodeString(&FileNameU, (PWSTR)FindFileData.cFileName); + FileName.Buffer = lpFindFileData->cFileName; + FileName.MaximumLength = MAX_PATH; + if (bIsFileApiAnsi) { + RtlUnicodeStringToAnsiString (&FileName, + &FileNameU, + FALSE); + } + else + { + RtlUnicodeStringToOemString (&FileName, + &FileNameU, + FALSE); + } + } - lpFindFileData->nFileSizeHigh = IData->pFileInfo->EndOfFile.u.HighPart; - lpFindFileData->nFileSizeLow = IData->pFileInfo->EndOfFile.u.LowPart; - memcpy (lpFindFileData->cFileName, - IData->pFileInfo->FileName, - IData->pFileInfo->FileNameLength); - lpFindFileData->cFileName[IData->pFileInfo->FileNameLength / sizeof(WCHAR)] = 0; - memcpy (lpFindFileData->cAlternateFileName, - IData->pFileInfo->ShortName, - IData->pFileInfo->ShortNameLength); - lpFindFileData->cAlternateFileName[IData->pFileInfo->ShortNameLength / sizeof(WCHAR)] = 0; - return IData; + return (HANDLE)IData; } +/* + * @implemented + */ +HANDLE +STDCALL +FindFirstFileW ( + LPCWSTR lpFileName, + LPWIN32_FIND_DATAW lpFindFileData + ) +{ + return FindFirstFileExW( + lpFileName, + FindExInfoStandard, + lpFindFileData, + FindExSearchNameMatch, + NULL, + 0 + ); +} + /* * @implemented */ @@ -609,7 +321,7 @@ lpFindFileData->nFileSizeHigh = IData->pFileInfo->EndOfFile.u.HighPart; lpFindFileData->nFileSizeLow = IData->pFileInfo->EndOfFile.u.LowPart; - memcpy (lpFindFileData->cFileName, + memcpy (lpFindFileData->cFileName, IData->pFileInfo->FileName, IData->pFileInfo->FileNameLength); lpFindFileData->cFileName[IData->pFileInfo->FileNameLength / sizeof(WCHAR)] = 0; @@ -622,40 +334,326 @@ /* - * @unimplemented + * @implemented */ HANDLE STDCALL FindFirstFileExW ( - LPCWSTR lpFileName, - FINDEX_INFO_LEVELS fInfoLevelId, - LPVOID lpFindFileData, - FINDEX_SEARCH_OPS fSearchOp, - LPVOID lpSearchFilter, - DWORD dwAdditionalFlags + LPCWSTR lpFileName, + FINDEX_INFO_LEVELS fInfoLevelId, + LPVOID lpFindFileData, + FINDEX_SEARCH_OPS fSearchOp, + LPVOID lpSearchFilter, + DWORD dwAdditionalFlags ) { - /* FIXME */ - return (HANDLE) 0; + PKERNEL32_FIND_FILE_DATA IData; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DosFilePath; + UNICODE_STRING NtName; + UNICODE_STRING FileNameU; + UNICODE_STRING NtFilePath; + PWSTR e1, e2; + WCHAR CurrentDir[256]; + PWCHAR SlashlessFileName; + PWSTR SearchPath; + PWCHAR SearchPattern; + ULONG Length; + +/* +..... +..... +..... +*/ + DPRINT("FindFirstFileExW(%S, %p, %p, %X, %p %d)\n", + lpFileName, + fInfoLevelId, + lpFindFileData, + fSearchOp, + lpSearchFilter, + dwAdditionalFlags); + + RtlInitUnicodeString(&FileNameU, lpFileName); + + Length = wcslen(lpFileName); + if (L'\\' == lpFileName[Length - 1]) + { + SlashlessFileName = RtlAllocateHeap(hProcessHeap, 0, Length * sizeof(WCHAR)); + if (NULL == SlashlessFileName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return (INVALID_HANDLE_VALUE); + } + memcpy(SlashlessFileName, lpFileName, (Length - 1) * sizeof(WCHAR)); + SlashlessFileName[Length - 1] = L'\0'; + lpFileName = SlashlessFileName; + } + else + { + SlashlessFileName = NULL; + } + + e1 = wcsrchr(lpFileName, L'/'); + e2 = wcsrchr(lpFileName, L'\\'); + SearchPattern = max(e1, e2); + SearchPath = CurrentDir; + + if (NULL == SearchPattern) + { + CHECKPOINT; + SearchPattern = (PWCHAR)lpFileName; + Length = GetCurrentDirectoryW(sizeof(CurrentDir) / sizeof(WCHAR), SearchPath); + if (0 == Length) + { + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + return (INVALID_HANDLE_VALUE); + } + if (Length > sizeof(CurrentDir) / sizeof(WCHAR)) + { + SearchPath = RtlAllocateHeap(hProcessHeap, HEAP_ZERO_MEMORY, Length * sizeof(WCHAR)); + if (NULL == SearchPath) + { + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return (INVALID_HANDLE_VALUE); + } + GetCurrentDirectoryW(Length, SearchPath); + } + } + else + { + CHECKPOINT; + SearchPattern++; + Length = SearchPattern - lpFileName; + if (Length + 1 > sizeof(CurrentDir) / sizeof(WCHAR)) + { + SearchPath = RtlAllocateHeap(hProcessHeap, HEAP_ZERO_MEMORY, (Length + 1) * sizeof(WCHAR)); + if (NULL == SearchPath) { + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return (INVALID_HANDLE_VALUE); + } + } + memcpy(SearchPath, lpFileName, Length * sizeof(WCHAR)); + SearchPath[Length] = 0; + } + + if( FALSE == RtlDosPathNameToNtPathName_U( + (PWSTR)SearchPath, + &NtName, + &DosFilePath.Buffer, + (PCURDIR)&NtFilePath + ) ) + { + RtlFreeHeap(hProcessHeap, 0, SearchPath); + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + SetLastError(ERROR_PATH_NOT_FOUND); + return (INVALID_HANDLE_VALUE); + } + + + if (SearchPath != CurrentDir) { + RtlFreeHeap(hProcessHeap, 0, SearchPath); + } + + DPRINT("NtName \'%S\'\n", NtName.Buffer); + + IData = RtlAllocateHeap (hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); + if (NULL == IData) + { + RtlFreeHeap (hProcessHeap, 0, NtName.Buffer); + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return (INVALID_HANDLE_VALUE); + } + + /* change pattern: "*.*" --> "*" */ + if (!wcscmp (SearchPattern, L"*.*")) { + RtlInitUnicodeString(&DosFilePath, L"*"); + } else { + RtlInitUnicodeString(&DosFilePath, SearchPattern); + } + + DPRINT("NtName \'%S\' DosFilePath \'%S\'\n", + NtName.Buffer, DosFilePath.Buffer); + + InitializeObjectAttributes( &ObjectAttributes, + &NtName, + dwAdditionalFlags, + NtFilePath.Buffer, + NULL ); + + Status = + NtOpenFile( + &IData->DirectoryHandle, + SYNCHRONIZE | FILE_LIST_DIRECTORY, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT + ); + + if( !NT_SUCCESS(Status) ) + { + DPRINT1("NtOpenFile() - failed (Status %lx)\n", Status); + SetLastError( Status ); + return (INVALID_HANDLE_VALUE); + } + + RtlFreeHeap(hProcessHeap, 0, NtName.Buffer); + + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap (hProcessHeap, 0, IData); + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + SetLastErrorByStatus (Status); + return (INVALID_HANDLE_VALUE); + } + + if ( 0 == DosFilePath.Length ) { + DPRINT1("0 == DosFilePath.Length\n"); + NtClose(IData->DirectoryHandle); + SetLastError(ERROR_FILE_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); + IData->pFileInfo->FileIndex = 0; + + Status = + NtQueryDirectoryFile( + IData->DirectoryHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + (PVOID)IData->pFileInfo, + FIND_DATA_SIZE, + FileBothDirectoryInformation, + TRUE, + &DosFilePath, + FALSE + ); + + if (NULL != SlashlessFileName) { + RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + } + + if( !NT_SUCCESS(Status) ) { + DPRINT1("NtQueryDirectoryFile() - failed (Status %lx)\n", Status); + RtlFreeHeap(hProcessHeap, 0, IData); + NtClose(IData->DirectoryHandle); + SetLastError(Status); + return (INVALID_HANDLE_VALUE); + } + + DPRINT("Found %.*S\n",IData->pFileInfo->FileNameLength/sizeof(WCHAR), IData->pFileInfo->FileName); + + /* copy data into WIN32_FIND_DATA structure */ + ((LPWIN32_FIND_DATAW)lpFindFileData)->dwFileAttributes = IData->pFileInfo->FileAttributes; + + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftCreationTime.dwHighDateTime = IData->pFileInfo->CreationTime.u.HighPart; + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftCreationTime.dwLowDateTime = IData->pFileInfo->CreationTime.u.LowPart; + + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftLastAccessTime.dwHighDateTime = IData->pFileInfo->LastAccessTime.u.HighPart; + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftLastAccessTime.dwLowDateTime = IData->pFileInfo->LastAccessTime.u.LowPart; + + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftLastWriteTime.dwHighDateTime = IData->pFileInfo->LastWriteTime.u.HighPart; + ((LPWIN32_FIND_DATAW)lpFindFileData)->ftLastWriteTime.dwLowDateTime = IData->pFileInfo->LastWriteTime.u.LowPart; + + ((LPWIN32_FIND_DATAW)lpFindFileData)->nFileSizeHigh = IData->pFileInfo->EndOfFile.u.HighPart; + ((LPWIN32_FIND_DATAW)lpFindFileData)->nFileSizeLow = IData->pFileInfo->EndOfFile.u.LowPart; + + memcpy (((LPWIN32_FIND_DATAW)lpFindFileData)->cFileName, + IData->pFileInfo->FileName, + IData->pFileInfo->FileNameLength); + ((LPWIN32_FIND_DATAW)lpFindFileData)->cFileName[IData->pFileInfo->FileNa meLength / sizeof(WCHAR)] = 0; + memcpy (((LPWIN32_FIND_DATAW)lpFindFileData)->cAlternateFileName, + IData->pFileInfo->ShortName, + IData->pFileInfo->ShortNameLength); + ((LPWIN32_FIND_DATAW)lpFindFileData)->cAlternateFileName[IData->pFileInf o->ShortNameLength / sizeof(WCHAR)] = 0; + + + return (HANDLE)IData; } /* - * @unimplemented + * @implemented */ HANDLE STDCALL FindFirstFileExA ( - LPCSTR lpFileName, - FINDEX_INFO_LEVELS fInfoLevelId, - LPVOID lpFindFileData, - FINDEX_SEARCH_OPS fSearchOp, - LPVOID lpSearchFilter, - DWORD dwAdditionalFlags + LPCSTR lpFileName, + FINDEX_INFO_LEVELS fInfoLevelId, + LPVOID lpFindFileData, + FINDEX_SEARCH_OPS fSearchOp, + LPVOID lpSearchFilter, + DWORD dwAdditionalFlags ) { - /* FIXME */ - return (HANDLE) 0; + PKERNEL32_FIND_FILE_DATA IData; + UNICODE_STRING FileNameU; + ANSI_STRING FileNameA; + + RtlInitAnsiString (&FileNameA, + (LPSTR)lpFileName); + + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + RtlAnsiStringToUnicodeString (&FileNameU, + &FileNameA, + TRUE); + else + RtlOemStringToUnicodeString (&FileNameU, + &FileNameA, + TRUE); + + IData = FindFirstFileExW( + (LPCWSTR)FileNameU.Buffer, + fInfoLevelId, + lpFindFileData, + fSearchOp, + lpSearchFilter, + dwAdditionalFlags + ); + + RtlFreeUnicodeString(&FileNameU); + + if(INVALID_HANDLE_VALUE != IData) + { + RtlInitUnicodeString(&FileNameU, (PWSTR)((LPWIN32_FIND_DATAW)lpFindFileData)->cFileName); + FileNameU.Buffer = ((LPWIN32_FIND_DATAW)lpFindFileData)->cFileName; + FileNameU.MaximumLength = MAX_PATH; + + /* convert unicode string to ansi (or oem) */ + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString (&FileNameA, + &FileNameU, + FALSE); + else + RtlUnicodeStringToOemString (&FileNameA, + &FileNameU, + FALSE); + } + + return (HANDLE)IData; }

19 years, 3 months

[ion] 16659: - Move rosdhcp_public.h to dhcp library include directory.

by ion＠svn.reactos.com

- Move rosdhcp_public.h to dhcp library include directory. Added: trunk/reactos/include/libs/dhcp/ Added: trunk/reactos/include/libs/dhcp/rosdhcp_public.h Deleted: trunk/reactos/include/rosdhcp_public.h Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h _____ Copied: trunk/reactos/include/libs/dhcp/rosdhcp_public.h (from rev 16657, trunk/reactos/include/rosdhcp_public.h) _____ Deleted: trunk/reactos/include/rosdhcp_public.h --- trunk/reactos/include/rosdhcp_public.h 2005-07-20 03:43:20 UTC (rev 16658) +++ trunk/reactos/include/rosdhcp_public.h 2005-07-20 03:50:50 UTC (rev 16659) @@ -1,46 +0,0 @@ -#ifndef ROSDHCP_PUBLIC_H -#define ROSDHCP_PUBLIC_H - -enum { - DhcpReqLeaseIpAddress, - DhcpReqQueryHWInfo, - DhcpReqReleaseIpAddress, - DhcpReqRenewIpAddress, - DhcpReqStaticRefreshParams, -}; - -typedef struct _COMM_DHCP_REQ { - UINT Type; - DWORD AdapterIndex; - union { - struct { - BOOL Inserted; - } PnpEvent; - struct { - LPWSTR AdapterName; - DHCPCAPI_PARAMS_ARRAY Params; - } RegisterParamChange; - struct { - LPWSTR AdapterName; - LPWSTR RequestId; - } RequestParams, UndoRequestParams; - struct { - DWORD IPAddress; - DWORD Netmask; - } StaticRefreshParams; - } Body; -} COMM_DHCP_REQ; - -typedef union _COMM_DHCP_REPLY { - DWORD Reply; - struct { - DWORD AdapterIndex; - DWORD MediaType; - DWORD Mtu; - DWORD Speed; - } QueryHWInfo; -} COMM_DHCP_REPLY; - -#define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient" - -#endif/*ROSDHCP_PUBLIC_H*/ _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c --- trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-07-20 03:43:20 UTC (rev 16658) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-07-20 03:50:50 UTC (rev 16659) @@ -12,7 +12,7 @@ #include <roscfg.h> #include <winsock2.h> #include <dhcpcsdk.h> -#include <rosdhcp_public.h> +#include <dhcp/rosdhcp_public.h> #define DHCP_TIMEOUT 1000 _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-07-20 03:43:20 UTC (rev 16658) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-07-20 03:50:50 UTC (rev 16659) @@ -12,6 +12,7 @@ #include <setjmp.h> #include "stdint.h" #include "predec.h" +#include <dhcp/rosdhcp_public.h> #include "debug.h" #define IFNAMSIZ MAX_INTERFACE_NAME_LEN #undef interface /* wine/objbase.h -- Grrr */ @@ -50,8 +51,6 @@ unsigned char recv_buf[1]; } DHCP_ADAPTER, *PDHCP_ADAPTER; -#include <rosdhcp_public.h> - typedef DWORD (*PipeSendFunc)( COMM_DHCP_REPLY *Reply ); #define random rand

19 years, 3 months

[ion] 16658: - Deleted ddk folder

by ion＠svn.reactos.com

- Deleted ddk folder - Moved afd headers to driver include directory Deleted: trunk/reactos/include/afd/ Deleted: trunk/reactos/include/ddk/ Added: trunk/reactos/include/drivers/afd/ _____ Copied: trunk/reactos/include/drivers/afd (from rev 16657, trunk/reactos/include/afd)

19 years, 3 months

[ion] 16657: - Created include/libs and moved all library headers there.

by ion＠svn.reactos.com

- Created include/libs and moved all library headers there. - Created include/drivers and moved driver headers there. - Brought back core.h as diskdump.h, and re-enabled diskdump...it seems even though I was told it doesn't work, it's still very much used. Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/drivers/storage/directory.xml Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml Deleted: trunk/reactos/include/csrss/ Deleted: trunk/reactos/include/ddk/ntddblue.h Added: trunk/reactos/include/drivers/ Added: trunk/reactos/include/drivers/blue/ Added: trunk/reactos/include/drivers/blue/ntddblue.h Added: trunk/reactos/include/drivers/diskdump/ Added: trunk/reactos/include/drivers/diskdump/diskdump.h Deleted: trunk/reactos/include/epsapi/ Deleted: trunk/reactos/include/expat/ Deleted: trunk/reactos/include/fmifs/ Deleted: trunk/reactos/include/fslib/ Added: trunk/reactos/include/libs/ Added: trunk/reactos/include/libs/epsapi/ Added: trunk/reactos/include/libs/expat/ Added: trunk/reactos/include/libs/fmifs/ Added: trunk/reactos/include/libs/fslib/ Added: trunk/reactos/include/libs/pseh/ Added: trunk/reactos/include/libs/samlib/ Added: trunk/reactos/include/libs/sm/ Added: trunk/reactos/include/libs/syssetup/ Added: trunk/reactos/include/libs/syssetup/syssetup.h Deleted: trunk/reactos/include/lsass/ Deleted: trunk/reactos/include/pseh/ Deleted: trunk/reactos/include/samlib/ Deleted: trunk/reactos/include/sm/ Added: trunk/reactos/include/subsys/ Added: trunk/reactos/include/subsys/csrss/ Modified: trunk/reactos/include/subsys/csrss/csrss.h Added: trunk/reactos/include/subsys/lsass/ Deleted: trunk/reactos/include/syssetup.h Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/logfile.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/subsys/csrss/win32csr/w32csr.h Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/ReactOS.xml 2005-07-20 03:42:05 UTC (rev 16657) @@ -32,6 +32,9 @@ <include>include</include> <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> <include>w32api/include</include> <include>w32api/include/ddk</include> _____ Modified: trunk/reactos/drivers/storage/directory.xml --- trunk/reactos/drivers/storage/directory.xml 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/drivers/storage/directory.xml 2005-07-20 03:42:05 UTC (rev 16657) @@ -16,3 +16,6 @@ <directory name="scsiport"> <xi:include href="scsiport/scsiport.xml" /> </directory> +<directory name="diskdump"> + <xi:include href="diskdump/diskdump.xml" /> +</directory> \ No newline at end of file _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-20 03:42:05 UTC (rev 16657) @@ -31,8 +31,8 @@ #include <ddk/scsi.h> #include <ddk/ntdddisk.h> #include <ddk/ntddscsi.h> -#include <ddk/class2.h> -#include <ddk/core.h> +#include <include/class2.h> +#include <diskdump/diskdump.h> #include <ndk/extypes.h> #include <ndk/rtlfuncs.h> _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml --- trunk/reactos/drivers/storage/diskdump/diskdump.xml 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/drivers/storage/diskdump/diskdump.xml 2005-07-20 03:42:05 UTC (rev 16657) @@ -5,6 +5,7 @@ <library>ntoskrnl</library> <library>hal</library> <library>class2</library> + <include base="diskdump">..</include> <file>diskdump.c</file> <file>diskdump_helper.S</file> <file>diskdump.rc</file> _____ Deleted: trunk/reactos/include/ddk/ntddblue.h --- trunk/reactos/include/ddk/ntddblue.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/include/ddk/ntddblue.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -1,64 +0,0 @@ -#ifndef _NTDDBLUE_H_INCLUDED_ -#define _NTDDBLUE_H_INCLUDED_ - -#define IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x802, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONSOLE_GET_CURSOR_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONSOLE_SET_CURSOR_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x804, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONSOLE_GET_MODE CTL_CODE(FILE_DEVICE_SCREEN, 0x805, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONSOLE_SET_MODE CTL_CODE(FILE_DEVICE_SCREEN, 0x806, METHOD_BUFFERED, FILE_WRITE_ACCESS) - - -#define IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x810, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x811, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) -#define IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x812, METHOD_IN_DIRECT, FILE_ANY_ACCESS) -#define IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x813, METHOD_BUFFERED, FILE_WRITE_ACCESS) - - -#define IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x820, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONSOLE_READ_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x821, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) -#define IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x822, METHOD_IN_DIRECT, FILE_ANY_ACCESS) - -#define IOCTL_CONSOLE_DRAW CTL_CODE(FILE_DEVICE_SCREEN, 0x830, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) - - -/* TYPEDEFS **************************************************************/ - - -typedef struct tagCONSOLE_MODE -{ - DWORD dwMode; -} CONSOLE_MODE, *PCONSOLE_MODE; - - -typedef struct tagOUTPUT_ATTRIBUTE -{ - WORD wAttribute; - DWORD nLength; - COORD dwCoord; - DWORD dwTransfered; -} OUTPUT_ATTRIBUTE, *POUTPUT_ATTRIBUTE; - - -typedef struct tagOUTPUT_CHARACTER -{ - CHAR cCharacter; - DWORD nLength; - COORD dwCoord; - DWORD dwTransfered; -} OUTPUT_CHARACTER, *POUTPUT_CHARACTER; - - -typedef struct tagCONSOLE_DRAW -{ - UINT X; /* Origin */ - UINT Y; - UINT SizeX; /* Size of the screen buffer (chars) */ - UINT SizeY; - UINT CursorX; /* New cursor position (screen-relative) */ - UINT CursorY; - /* Followed by screen buffer in char/attrib format */ -} CONSOLE_DRAW, *PCONSOLE_DRAW; - - -#endif /* _NTDDBLUE_H_INCLUDED_ */ _____ Copied: trunk/reactos/include/drivers/blue/ntddblue.h (from rev 16628, trunk/reactos/include/ddk/ntddblue.h) _____ Added: trunk/reactos/include/drivers/diskdump/diskdump.h --- trunk/reactos/include/drivers/diskdump/diskdump.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/include/drivers/diskdump/diskdump.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -0,0 +1,31 @@ +#ifndef __DISKDUMP_H +#define __DISKDUMP_H + +#include <ddk/ntddscsi.h> +#include <ndk/ketypes.h> + +#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) +#define MM_CORE_DUMP_HEADER_VERSION (0x1) + +typedef struct _MM_CORE_DUMP_HEADER +{ + ULONG Magic; + ULONG Version; + ULONG Type; + KTRAP_FRAME TrapFrame; + ULONG BugCheckCode; + ULONG BugCheckParameters[4]; + PVOID FaultingStackBase; + ULONG FaultingStackSize; + ULONG PhysicalMemorySize; +} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER; + +typedef struct MM_CORE_DUMP_FUNCTIONS +{ + NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); + NTSTATUS (STDCALL *DumpInit)(VOID); + NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); + NTSTATUS (STDCALL *DumpFinish)(VOID); +} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; + +#endif /* __DISKDUMP_H */ _____ Copied: trunk/reactos/include/libs/epsapi (from rev 16628, trunk/reactos/include/epsapi) _____ Copied: trunk/reactos/include/libs/expat (from rev 16628, trunk/reactos/include/expat) _____ Copied: trunk/reactos/include/libs/fmifs (from rev 16628, trunk/reactos/include/fmifs) _____ Copied: trunk/reactos/include/libs/fslib (from rev 16628, trunk/reactos/include/fslib) _____ Copied: trunk/reactos/include/libs/pseh (from rev 16628, trunk/reactos/include/pseh) _____ Copied: trunk/reactos/include/libs/samlib (from rev 16628, trunk/reactos/include/samlib) _____ Copied: trunk/reactos/include/libs/sm (from rev 16628, trunk/reactos/include/sm) _____ Copied: trunk/reactos/include/libs/syssetup/syssetup.h (from rev 16628, trunk/reactos/include/syssetup.h) _____ Copied: trunk/reactos/include/subsys/csrss (from rev 16628, trunk/reactos/include/csrss) _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/csrss/csrss.h 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -2,7 +2,7 @@ #define __INCLUDE_CSRSS_CSRSS_H #include <windows.h> -#include <ddk/ntddblue.h> +#include <blue/ntddblue.h> #define CSR_NATIVE 0x0000 #define CSR_CONSOLE 0x0001 _____ Copied: trunk/reactos/include/subsys/lsass (from rev 16628, trunk/reactos/include/lsass) _____ Deleted: trunk/reactos/include/syssetup.h --- trunk/reactos/include/syssetup.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/include/syssetup.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -1,55 +0,0 @@ -/* $Id$ -*/ -/* - * syssetup.h - * - * System setup API, native interface - * - * This file is part of the ReactOS Operating System. - * - * Contributors: - * Created by Eric Kohl <ekohl(a)rz-online.de> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __SYSSETUP_H_INCLUDED__ -#define __SYSSETUP_H_INCLUDED__ - -/* System setup APIs */ - -DWORD STDCALL -InstallReactOS (HINSTANCE hInstance); - - -/* Log File APIs */ - -#define SYSSETUP_SEVERITY_INFORMATION 0 -#define SYSSETUP_SEVERITY_WARNING 1 -#define SYSSETUP_SEVERITY_ERROR 2 -#define SYSSETUP_SEVERITY_FATAL_ERROR 3 - - -BOOL STDCALL -InitializeSetupActionLog (BOOL bDeleteOldLogFile); - -VOID STDCALL -TerminateSetupActionLog (VOID); - -BOOL STDCALL -LogItem (DWORD dwSeverity, - LPWSTR lpMessageText); - - -#endif /* __SYSSETUP_H_INCLUDED__ */ - -/* EOF */ _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/lib/syssetup/install.c 2005-07-20 03:42:05 UTC (rev 16657) @@ -37,7 +37,7 @@ #include <stdlib.h> #include <samlib/samlib.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> #include <userenv.h> #include <setupapi.h> _____ Modified: trunk/reactos/lib/syssetup/logfile.c --- trunk/reactos/lib/syssetup/logfile.c 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/lib/syssetup/logfile.c 2005-07-20 03:42:05 UTC (rev 16657) @@ -31,7 +31,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -24,12 +24,18 @@ #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ +/* FIXME: Temporary until CC Ros is gone */ +#include <ccros.h> + /* ReactOS Headers */ #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> #include <reactos/rossym.h> +/* Disk Dump Driver Header */ +#include <diskdump/diskdump.h> + /* C Headers */ #include <malloc.h> #include <wchar.h> _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-07-20 03:42:05 UTC (rev 16657) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <ddk/core.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/w32csr.h --- trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -4,7 +4,7 @@ #include <ndk/ntndk.h> /* Our own BLUE.SYS Driver for Console Output */ -#include <ddk/ntddblue.h> +#include <blue/ntddblue.h> /* External Winlogon Header */ #include <winlogon.h> _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-07-20 02:52:52 UTC (rev 16656) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-07-20 03:42:05 UTC (rev 16657) @@ -39,8 +39,8 @@ /* DDK Disk Headers */ #include <ddk/ntddscsi.h> -/* FIXME: Put outside of DDK */ -#include <ddk/ntddblue.h> +/* Blue Driver Header */ +#include <blue/ntddblue.h> /* Helper Header */ #include <reactos/helper.h>

19 years, 3 months

[ion] 16656: - Build cdfs, ntfs, vfatfs with PCH

by ion＠svn.reactos.com

- Build cdfs, ntfs, vfatfs with PCH - Remove core.h and disable diskdump driver (never worked, was told it's an abandonned, obsolete driver and I tend to agree.) - Rename ROS ntifs.h to ccros.h and moved to root include directory (where all the "temporary" includes are for now). - Moved ROS class2.h to drivers/storage/include, per my own and other's recommendation, to make it clear that it's a ros-intenral file only useful for low-level storage drivers (no 3rd party driver needs this, which is why MS doesn't export it). Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/finfo.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/misc.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/cdfs/volinfo.c Modified: trunk/reactos/drivers/fs/ntfs/attrib.c Modified: trunk/reactos/drivers/fs/ntfs/blockdev.c Modified: trunk/reactos/drivers/fs/ntfs/close.c Modified: trunk/reactos/drivers/fs/ntfs/create.c Modified: trunk/reactos/drivers/fs/ntfs/dirctl.c Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/finfo.c Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml Modified: trunk/reactos/drivers/fs/vfat/fat.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/drivers/fs/vfat/vfatfs.xml Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml Modified: trunk/reactos/drivers/storage/class2/class2.c Modified: trunk/reactos/drivers/storage/class2/class2.xml Modified: trunk/reactos/drivers/storage/directory.xml Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.xml Added: trunk/reactos/drivers/storage/include/ Added: trunk/reactos/drivers/storage/include/class2.h Added: trunk/reactos/include/ccros.h Deleted: trunk/reactos/include/ddk/class2.h Deleted: trunk/reactos/include/ddk/core.h Deleted: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c --- trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" +/* FUNCTIONS ****************************************************************/ - -/* GLOBALS *****************************************************************/ - PCDFS_GLOBAL_DATA CdfsGlobalData; _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,7 +1,10 @@ #ifndef CDFS_H #define CDFS_H +#include <ddk/ntddk.h> #include <ddk/ntifs.h> +#include <ntddcdrm.h> +#include <ccros.h> #define USE_ROS_CC_AND_FS _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml --- trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,4 +17,5 @@ <file>rw.c</file> <file>volinfo.c</file> <file>cdfs.rc</file> + <pch>cdfs.h</pch> </module> _____ Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c --- trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ static NTSTATUS _____ Modified: trunk/reactos/drivers/fs/cdfs/close.c --- trunk/reactos/drivers/fs/cdfs/close.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/close.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ NTSTATUS _____ Modified: trunk/reactos/drivers/fs/cdfs/common.c --- trunk/reactos/drivers/fs/cdfs/common.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/common.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ NTSTATUS _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,15 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntddcdrm.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ static NTSTATUS _____ Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c --- trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,15 +29,13 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" +/* FUNCTIONS ****************************************************************/ -/* DEFINES ******************************************************************/ - #define ROUND_DOWN(N, S) (((N) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) _____ Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" +/* FUNCTIONS ****************************************************************/ - -/* MACROS *******************************************************************/ - #define TAG_FCB TAG('I', 'F', 'C', 'B') #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) _____ Modified: trunk/reactos/drivers/fs/cdfs/finfo.c --- trunk/reactos/drivers/fs/cdfs/finfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/finfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,14 +29,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,15 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntddcdrm.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ static inline _____ Modified: trunk/reactos/drivers/fs/cdfs/misc.c --- trunk/reactos/drivers/fs/cdfs/misc.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/misc.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ VOID _____ Modified: trunk/reactos/drivers/fs/cdfs/rw.c --- trunk/reactos/drivers/fs/cdfs/rw.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/rw.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" +/* FUNCTIONS ****************************************************************/ - -/* GLOBALS *******************************************************************/ - #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) _____ Modified: trunk/reactos/drivers/fs/cdfs/volinfo.c --- trunk/reactos/drivers/fs/cdfs/volinfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/volinfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "cdfs.h" #define NDEBUG #include <debug.h> -#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/ static NTSTATUS _____ Modified: trunk/reactos/drivers/fs/ntfs/attrib.c --- trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,13 +28,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" - #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/blockdev.c --- trunk/reactos/drivers/fs/ntfs/blockdev.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/blockdev.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/close.c --- trunk/reactos/drivers/fs/ntfs/close.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/close.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,12 +28,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/create.c --- trunk/reactos/drivers/fs/ntfs/create.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/create.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/dirctl.c --- trunk/reactos/drivers/fs/ntfs/dirctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/dirctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -32,8 +32,10 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *****************************************************************/ + /* MACROS *******************************************************************/ #define TAG_FCB TAG('I', 'F', 'C', 'B') _____ Modified: trunk/reactos/drivers/fs/ntfs/finfo.c --- trunk/reactos/drivers/fs/ntfs/finfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/finfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c --- trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,11 +29,12 @@ /* INCLUDES *****************************************************************/ #include "ntfs.h" -#include <ntdddisk.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> +/* GLOBALS *****************************************************************/ + /* FUNCTIONS ****************************************************************/ static NTSTATUS _____ Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,17 +28,14 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" +/* GLOBALS *****************************************************************/ -//#define __min(a,b) (((a) < (b)) ? (a) : (b)) - - /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.c --- trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,14 +27,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" - - /* GLOBALS *****************************************************************/ PNTFS_GLOBAL_DATA NtfsGlobalData; _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,7 +1,10 @@ #ifndef NTFS_H #define NTFS_H +#include <ddk/ntddk.h> #include <ddk/ntifs.h> +#include <ddk/ntdddisk.h> +#include <ccros.h> #define USE_ROS_CC_AND_FS _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml --- trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,4 +17,5 @@ <file>rw.c</file> <file>volinfo.c</file> <file>ntfs.rc</file> + <pch>ntfs.h</pch> </module> _____ Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fat.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,8 +17,6 @@ /* GLOBALS ******************************************************************/ -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -22,8 +22,6 @@ #define TAG_FCB TAG('V', 'F', 'C', 'B') -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - /* -------------------------------------------------------- PUBLICS */ ULONG vfatNameHash(ULONG hash, PUNICODE_STRING NameU) _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -34,6 +34,7 @@ #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) +#define VOLUME_IS_DIRTY 0x00000001 static NTSTATUS VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount, _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -2,32 +2,14 @@ #include <ddk/ntifs.h> #include <ddk/ntdddisk.h> +#include <ndk/ntndk.h> +#include <reactos/helper.h> +#include <ccros.h> #include <limits.h> #include <debug.h> #define USE_ROS_CC_AND_FS -/* FIXME */ -#ifdef __USE_W32API -NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN); -NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); -NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); -#undef DeleteFile /* FIXME */ -#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */ -#endif - -#ifdef USE_ROS_CC_AND_FS -#ifndef __INCLUDE_DDK_NTIFS_H -NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG); -NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT); -#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; -#endif -#endif - -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #include <pshpack1.h> struct _BootSector { _____ Modified: trunk/reactos/drivers/fs/vfat/vfatfs.xml --- trunk/reactos/drivers/fs/vfat/vfatfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/vfatfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -26,4 +26,5 @@ <file>string.c</file> <file>volume.c</file> <file>vfatfs.rc</file> + <pch>vfat.h</pch> </module> _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -38,7 +38,7 @@ #include <ddk/ntddscsi.h> #include <ddk/ntdddisk.h> #include <ddk/ntddcdrm.h> -#include <ddk/class2.h> +#include <include/class2.h> #include <stdio.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml --- trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -4,6 +4,7 @@ <library>ntoskrnl</library> <library>hal</library> <library>class2</library> + <include base="cdrom">..</include> <file>cdrom.c</file> <file>cdrom.rc</file> </module> _____ Modified: trunk/reactos/drivers/storage/class2/class2.c --- trunk/reactos/drivers/storage/class2/class2.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/class2/class2.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -35,7 +35,7 @@ #include <ddk/ntddk.h> #include <ddk/ntdddisk.h> #include <ddk/scsi.h> -#include <ddk/class2.h> +#include <include/class2.h> #include <stdio.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/storage/class2/class2.xml --- trunk/reactos/drivers/storage/class2/class2.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/class2/class2.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -4,6 +4,7 @@ <importlibrary definition="class2.def" /> <library>ntoskrnl</library> <library>hal</library> + <include base="class2">..</include> <file>class2.c</file> <file>class2.rc</file> </module> _____ Modified: trunk/reactos/drivers/storage/directory.xml --- trunk/reactos/drivers/storage/directory.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/directory.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -10,9 +10,6 @@ <directory name="disk"> <xi:include href="disk/disk.xml" /> </directory> -<directory name="diskdump"> - <xi:include href="diskdump/diskdump.xml" /> -</directory> <directory name="floppy"> <xi:include href="floppy/floppy.xml" /> </directory> _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -30,8 +30,8 @@ #include <ddk/ntddk.h> #include <ddk/ntdddisk.h> #include <ddk/scsi.h> -#include <ddk/class2.h> #include <ddk/ntddscsi.h> +#include <include/class2.h> #include <stdio.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/storage/disk/disk.xml --- trunk/reactos/drivers/storage/disk/disk.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/disk/disk.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -5,6 +5,7 @@ <library>ntoskrnl</library> <library>hal</library> <library>class2</library> + <include base="disk">..</include> <file>disk.c</file> <file>disk.rc</file> </module> _____ Copied: trunk/reactos/drivers/storage/include/class2.h (from rev 16628, trunk/reactos/include/ddk/class2.h) _____ Added: trunk/reactos/include/ccros.h --- trunk/reactos/include/ccros.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ccros.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -0,0 +1,18 @@ +#ifndef __INCLUDE_DDK_NTIFS_H +#define __INCLUDE_DDK_NTIFS_H + +NTSTATUS STDCALL +CcRosInitializeFileCache (PFILE_OBJECT FileObject, + ULONG CacheSegmentSize); +NTSTATUS STDCALL +CcRosReleaseFileCache (PFILE_OBJECT FileObject); + +#define FSCTL_ROS_QUERY_LCN_MAPPING \ + CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _ROS_QUERY_LCN_MAPPING +{ + LARGE_INTEGER LcnDiskOffset; +} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; + +#endif /* __INCLUDE_DDK_NTIFS_H */ _____ Deleted: trunk/reactos/include/ddk/class2.h --- trunk/reactos/include/ddk/class2.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/class2.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,233 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/storage/include/class2.h - * PURPOSE: SCSI class driver definitions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -#ifndef __INCLUDE_DDK_CLASS2_H -#define __INCLUDE_DDK_CLASS2_H - -#include "ntddscsi.h" -#include "srb.h" - -#define MAXIMUM_RETRIES 15 -#define RETRY_WAIT 2000000 /* 200 ms in units of 100 ns */ - -struct _CLASS_INIT_DATA; - -typedef VOID STDCALL -(*PCLASS_ERROR)(IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_REQUEST_BLOCK Srb, - IN OUT NTSTATUS *Status, - IN OUT BOOLEAN *Retry); - -typedef BOOLEAN STDCALL -(*PCLASS_DEVICE_CALLBACK)(IN PINQUIRYDATA); - -typedef NTSTATUS STDCALL -(*PCLASS_READ_WRITE)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef BOOLEAN STDCALL -(*PCLASS_FIND_DEVICES)(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN struct _CLASS_INIT_DATA *InitializationData, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber); - -typedef NTSTATUS STDCALL -(*PCLASS_DEVICE_CONTROL)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef NTSTATUS STDCALL -(*PCLASS_SHUTDOWN_FLUSH)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef NTSTATUS STDCALL -(*PCLASS_CREATE_CLOSE)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - -typedef struct _CLASS_INIT_DATA -{ - ULONG InitializationDataSize; - ULONG DeviceExtensionSize; - DEVICE_TYPE DeviceType; - ULONG DeviceCharacteristics; - PCLASS_ERROR ClassError; - PCLASS_READ_WRITE ClassReadWriteVerification; - PCLASS_DEVICE_CALLBACK ClassFindDeviceCallBack; - PCLASS_FIND_DEVICES ClassFindDevices; - PCLASS_DEVICE_CONTROL ClassDeviceControl; - PCLASS_SHUTDOWN_FLUSH ClassShutdownFlush; - PCLASS_CREATE_CLOSE ClassCreateClose; - PDRIVER_STARTIO ClassStartIo; -} CLASS_INIT_DATA, *PCLASS_INIT_DATA; - - -typedef struct _DEVICE_EXTENSION -{ - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT PortDeviceObject; - LARGE_INTEGER PartitionLength; - LARGE_INTEGER StartingOffset; - ULONG DMByteSkew; - ULONG DMSkew; - BOOLEAN DMActive; - PCLASS_ERROR ClassError; - PCLASS_READ_WRITE ClassReadWriteVerification; - PCLASS_FIND_DEVICES ClassFindDevices; - PCLASS_DEVICE_CONTROL ClassDeviceControl; - PCLASS_SHUTDOWN_FLUSH ClassShutdownFlush; - PCLASS_CREATE_CLOSE ClassCreateClose; - PDRIVER_STARTIO ClassStartIo; - PIO_SCSI_CAPABILITIES PortCapabilities; - PDISK_GEOMETRY DiskGeometry; - PDEVICE_OBJECT PhysicalDevice; - PSENSE_DATA SenseData; - ULONG TimeOutValue; - ULONG DeviceNumber; - ULONG SrbFlags; - ULONG ErrorCount; - KSPIN_LOCK SplitRequestSpinLock; - NPAGED_LOOKASIDE_LIST SrbLookasideListHead; - LONG LockCount; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR SectorShift; - UCHAR ReservedByte; - USHORT DeviceFlags; - PKEVENT MediaChangeEvent; - HANDLE MediaChangeEventHandle; - BOOLEAN MediaChangeNoMedia; - ULONG MediaChangeCount; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; - - -typedef struct _COMPLETION_CONTEXT -{ - PDEVICE_OBJECT DeviceObject; - SCSI_REQUEST_BLOCK Srb; -} COMPLETION_CONTEXT, *PCOMPLETION_CONTEXT; - - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS STDCALL -ScsiClassAsynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -VOID STDCALL -ScsiClassBuildRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS STDCALL -ScsiClassClaimDevice(IN PDEVICE_OBJECT PortDeviceObject, - IN PSCSI_INQUIRY_DATA LunInfo, - IN BOOLEAN Release, - OUT PDEVICE_OBJECT *NewPortDeviceObject OPTIONAL); - -NTSTATUS STDCALL -ScsiClassCreateDeviceObject(IN PDRIVER_OBJECT DriverObject, - IN PCCHAR ObjectNameBuffer, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *DeviceObject, - IN PCLASS_INIT_DATA InitializationData); - -NTSTATUS STDCALL -ScsiClassDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -PVOID STDCALL -ScsiClassFindModePage(IN PCHAR ModeSenseBuffer, - IN ULONG Length, - IN UCHAR PageMode, - IN BOOLEAN Use6Byte); - -ULONG STDCALL -ScsiClassFindUnclaimedDevices(IN PCLASS_INIT_DATA InitializationData, - OUT PSCSI_ADAPTER_BUS_INFO AdapterInformation); - -NTSTATUS STDCALL -ScsiClassGetCapabilities(IN PDEVICE_OBJECT PortDeviceObject, - OUT PIO_SCSI_CAPABILITIES *PortCapabilities); - -NTSTATUS STDCALL -ScsiClassGetInquiryData(IN PDEVICE_OBJECT PortDeviceObject, - OUT PSCSI_ADAPTER_BUS_INFO *ConfigInfo); - -ULONG STDCALL -ScsiClassInitialize(IN PVOID Argument1, - IN PVOID Argument2, - IN PCLASS_INIT_DATA InitializationData); - -VOID STDCALL -ScsiClassInitializeSrbLookasideList(IN PDEVICE_EXTENSION DeviceExtension, - IN ULONG NumberElements); - -NTSTATUS STDCALL -ScsiClassInternalIoControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -BOOLEAN STDCALL -ScsiClassInterpretSenseInfo(IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_REQUEST_BLOCK Srb, - IN UCHAR MajorFunctionCode, - IN ULONG IoDeviceCode, - IN ULONG RetryCount, - OUT NTSTATUS *Status); - -NTSTATUS STDCALL -ScsiClassIoComplete(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -NTSTATUS STDCALL -ScsiClassIoCompleteAssociated(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -ULONG STDCALL -ScsiClassModeSense(IN PDEVICE_OBJECT DeviceObject, - IN PCHAR ModeSenseBuffer, - IN ULONG Length, - IN UCHAR PageMode); - -ULONG STDCALL -ScsiClassQueryTimeOutRegistryValue(IN PUNICODE_STRING RegistryPath); - -NTSTATUS STDCALL -ScsiClassReadDriveCapacity(IN PDEVICE_OBJECT DeviceObject); - -VOID STDCALL -ScsiClassReleaseQueue(IN PDEVICE_OBJECT DeviceObject); - -NTSTATUS STDCALL -ScsiClassSendSrbAsynchronous(PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - PIRP Irp, - PVOID BufferAddress, - ULONG BufferLength, - BOOLEAN WriteToDevice); - -NTSTATUS STDCALL -ScsiClassSendSrbSynchronous(PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - PVOID BufferAddress, - ULONG BufferLength, - BOOLEAN WriteToDevice); - -VOID STDCALL -ScsiClassSplitRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN ULONG MaximumBytes); - -#endif /* __INCLUDE_DDK_CLASS2_H */ - -/* EOF */ _____ Deleted: trunk/reactos/include/ddk/core.h --- trunk/reactos/include/ddk/core.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/core.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,30 +0,0 @@ -#ifndef __INCLUDE_NAPI_CORE_H -#define __INCLUDE_NAPI_CORE_H - -#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) -#define MM_CORE_DUMP_HEADER_VERSION (0x1) - -#include <ddk/ntddscsi.h> -#include <ndk/ketypes.h> -typedef struct _MM_CORE_DUMP_HEADER -{ - ULONG Magic; - ULONG Version; - ULONG Type; - KTRAP_FRAME TrapFrame; - ULONG BugCheckCode; - ULONG BugCheckParameters[4]; - PVOID FaultingStackBase; - ULONG FaultingStackSize; - ULONG PhysicalMemorySize; -} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER; - -typedef struct MM_CORE_DUMP_FUNCTIONS -{ - NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); - NTSTATUS (STDCALL *DumpInit)(VOID); - NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); - NTSTATUS (STDCALL *DumpFinish)(VOID); -} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; - -#endif /* __INCLUDE_NAPI_CORE_H */ _____ Deleted: trunk/reactos/include/ddk/ntifs.h --- trunk/reactos/include/ddk/ntifs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/ntifs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,20 +0,0 @@ -#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H - -#include_next <ddk/ntifs.h> - -NTSTATUS STDCALL -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); -NTSTATUS STDCALL -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - -#define FSCTL_ROS_QUERY_LCN_MAPPING \ - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _ROS_QUERY_LCN_MAPPING -{ - LARGE_INTEGER LcnDiskOffset; -} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; - -#endif /* __INCLUDE_DDK_NTIFS_H */ _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-20 02:52:52 UTC (rev 16656) [truncated at 1000 lines; 82 more skipped]

19 years, 3 months

[ion] 16655: - Move asm.h to NDK.

by ion＠svn.reactos.com

- Move asm.h to NDK. Added: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/lib/kernel32/thread/i386/fiber.S Deleted: trunk/reactos/ntoskrnl/include/internal/asm.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/main.S Modified: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S Modified: trunk/reactos/tools/nci/ncitool.c _____ Copied: trunk/reactos/include/ndk/asm.h (from rev 16649, trunk/reactos/ntoskrnl/include/internal/asm.h) --- trunk/reactos/ntoskrnl/include/internal/asm.h 2005-07-19 20:56:38 UTC (rev 16649) +++ trunk/reactos/include/ndk/asm.h 2005-07-20 00:33:06 UTC (rev 16655) @@ -0,0 +1,194 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/asm.h + * PURPOSE: Defintions for Structures used in Assembly Code + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 07/19/05 + */ +#ifndef _ASM_H +#define _ASM_H + +/* DEPENDENCIES **************************************************************/ + +/* EXPORTED DATA *************************************************************/ + +/* CONSTANTS *****************************************************************/ + +/* + * Definitions for the offsets of members in the KV86M_REGISTERS + */ +#define KV86M_REGISTERS_EBP 0x0 +#define KV86M_REGISTERS_EDI 0x4 +#define KV86M_REGISTERS_ESI 0x8 +#define KV86M_REGISTERS_EDX 0xC +#define KV86M_REGISTERS_ECX 0x10 +#define KV86M_REGISTERS_EBX 0x14 +#define KV86M_REGISTERS_EAX 0x18 +#define KV86M_REGISTERS_DS 0x1C +#define KV86M_REGISTERS_ES 0x20 +#define KV86M_REGISTERS_FS 0x24 +#define KV86M_REGISTERS_GS 0x28 +#define KV86M_REGISTERS_EIP 0x2C +#define KV86M_REGISTERS_CS 0x30 +#define KV86M_REGISTERS_EFLAGS 0x34 +#define KV86M_REGISTERS_ESP 0x38 +#define KV86M_REGISTERS_SS 0x3C + +#define TF_SAVED_EXCEPTION_STACK 0x8C +#define TF_REGS 0x90 +#define TF_ORIG_EBP 0x94 + +/* TSS Offsets */ +#define KTSS_ESP0 0x4 +#define KTSS_CR3 0x1C +#define KTSS_EFLAGS 0x24 +#define KTSS_IOMAPBASE 0x66 + +/* + * Defines for accessing KPCR and KTHREAD structure members + */ +#define KTHREAD_INITIAL_STACK 0x18 +#define KTHREAD_STACK_LIMIT 0x1C +#define KTHREAD_TEB 0x20 +#define KTHREAD_KERNEL_STACK 0x28 +#define KTHREAD_NPX_STATE 0x31 +#define KTHREAD_STATE 0x2D +#define KTHREAD_APCSTATE_PROCESS 0x34 + 0x10 +#define KTHREAD_PENDING_USER_APC 0x34 + 0x16 +#define KTHREAD_PENDING_KERNEL_APC 0x34 + 0x15 +#define KTHREAD_CONTEXT_SWITCHES 0x4C +#define KTHREAD_WAIT_IRQL 0x54 +#define KTHREAD_SERVICE_TABLE 0xDC +#define KTHREAD_PREVIOUS_MODE 0x137 +#define KTHREAD_TRAP_FRAME 0x128 +#define KTHREAD_CALLBACK_STACK 0x120 + +#define KPROCESS_DIRECTORY_TABLE_BASE 0x18 +#define KPROCESS_LDT_DESCRIPTOR0 0x20 +#define KPROCESS_LDT_DESCRIPTOR1 0x24 +#define KPROCESS_IOPM_OFFSET 0x30 + +#define KPCR_EXCEPTION_LIST 0x0 +#define KPCR_INITIAL_STACK 0x4 +#define KPCR_STACK_LIMIT 0x8 +#define KPCR_SELF 0x1C +#define KPCR_GDT 0x3C +#define KPCR_TSS 0x40 +#define KPCR_CURRENT_THREAD 0x124 +#define KPCR_NPX_THREAD 0x2F4 + +/* FPU Save Area Offsets */ +#define FN_CONTROL_WORD 0x0 +#define FN_STATUS_WORD 0x4 +#define FN_TAG_WORD 0x8 +#define FN_DATA_SELECTOR 0x18 +#define FN_CR0_NPX_STATE 0x20C +#define SIZEOF_FX_SAVE_AREA 528 + +/* Trap Frame Offsets */ +#define KTRAP_FRAME_DEBUGEBP 0x0 +#define KTRAP_FRAME_DEBUGEIP 0x4 +#define KTRAP_FRAME_DEBUGARGMARK 0x8 +#define KTRAP_FRAME_DEBUGPOINTER 0xC +#define KTRAP_FRAME_TEMPSS 0x10 +#define KTRAP_FRAME_TEMPESP 0x14 +#define KTRAP_FRAME_DR0 0x18 +#define KTRAP_FRAME_DR1 0x1C +#define KTRAP_FRAME_DR2 0x20 +#define KTRAP_FRAME_DR3 0x24 +#define KTRAP_FRAME_DR6 0x28 +#define KTRAP_FRAME_DR7 0x2C +#define KTRAP_FRAME_GS 0x30 +#define KTRAP_FRAME_RESERVED1 0x32 +#define KTRAP_FRAME_ES 0x34 +#define KTRAP_FRAME_RESERVED2 0x36 +#define KTRAP_FRAME_DS 0x38 +#define KTRAP_FRAME_RESERVED3 0x3A +#define KTRAP_FRAME_EDX 0x3C +#define KTRAP_FRAME_ECX 0x40 +#define KTRAP_FRAME_EAX 0x44 +#define KTRAP_FRAME_PREVIOUS_MODE 0x48 +#define KTRAP_FRAME_EXCEPTION_LIST 0x4C +#define KTRAP_FRAME_FS 0x50 +#define KTRAP_FRAME_RESERVED4 0x52 +#define KTRAP_FRAME_EDI 0x54 +#define KTRAP_FRAME_ESI 0x58 +#define KTRAP_FRAME_EBX 0x5C +#define KTRAP_FRAME_EBP 0x60 +#define KTRAP_FRAME_ERROR_CODE 0x64 +#define KTRAP_FRAME_EIP 0x68 +#define KTRAP_FRAME_CS 0x6C +#define KTRAP_FRAME_EFLAGS 0x70 +#define KTRAP_FRAME_ESP 0x74 +#define KTRAP_FRAME_SS 0x78 +#define KTRAP_FRAME_RESERVED5 0x7A +#define KTRAP_FRAME_V86_ES 0x7C +#define KTRAP_FRAME_RESERVED6 0x7E +#define KTRAP_FRAME_V86_DS 0x80 +#define KTRAP_FRAME_RESERVED7 0x82 +#define KTRAP_FRAME_V86_FS 0x84 +#define KTRAP_FRAME_RESERVED8 0x86 +#define KTRAP_FRAME_V86_GS 0x88 +#define KTRAP_FRAME_RESERVED9 0x8A +#define KTRAP_FRAME_SIZE 0x8C + +/* User Shared Data */ +#define KERNEL_USER_SHARED_DATA 0x7FFE0000 +#define KUSER_SHARED_PROCESSOR_FEATURES KERNEL_USER_SHARED_DATA + 0x274 +#define KUSER_SHARED_SYSCALL KERNEL_USER_SHARED_DATA + 0x300 +#define KUSER_SHARED_SYSCALL_RET KERNEL_USER_SHARED_DATA + 0x304 +#define PROCESSOR_FEATURE_FXSR KUSER_SHARED_PROCESSOR_FEATURES + 0x4 + +/* CONTEXT CONSTANTS */ +#define CONTEXT_FLAGS 0x0 +#define CONTEXT_DR6 0x14 +#define CONTEXT_FLOAT_SAVE 0x1C +#define CONTEXT_EDI 0x9C +#define CONTEXT_ESI 0xA0 +#define CONTEXT_EBX 0xA4 +#define CONTEXT_EDX 0xA8 +#define CONTEXT_ECX 0xAC +#define CONTEXT_EAX 0xB0 +#define CONTEXT_EBP 0xB4 +#define CONTEXT_EIP 0xB8 +#define CONTEXT_ESP 0xC4 +#define CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FN_CONTROL_WORD +#define CONTEXT_FLOAT_SAVE_STATUS_WORD CONTEXT_FLOAT_SAVE + FN_STATUS_WORD +#define CONTEXT_FLOAT_SAVE_TAG_WORD CONTEXT_FLOAT_SAVE + FN_TAG_WORD + +/* TEB CONSTANTS */ +#define TEB_EXCEPTION_LIST 0x0 +#define TEB_STACK_BASE 0x4 +#define TEB_STACK_LIMIT 0x8 +#define TEB_FIBER_DATA 0x10 +#define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 +#define TEB_DEALLOCATION_STACK 0xE0C +#define TEB_GUARANTEED_STACK_BYTES 0xF78 +#define TEB_FLS_DATA 0xFB4 + +/* FIBER CONSTANTS */ +#define FIBER_PARAMETER 0x0 +#define FIBER_EXCEPTION_LIST 0x4 +#define FIBER_STACK_BASE 0x8 +#define FIBER_STACK_LIMIT 0xC +#define FIBER_DEALLOCATION_STACK 0x10 +#define FIBER_CONTEXT 0x14 +#define FIBER_GUARANTEED_STACK_BYTES 0x2E0 +#define FIBER_FLS_DATA 0x2E4 +#define FIBER_ACTIVATION_CONTEXT_STACK 0x2E8 +#define FIBER_CONTEXT_FLAGS FIBER_CONTEXT + CONTEXT_FLAGS +#define FIBER_CONTEXT_EAX FIBER_CONTEXT + CONTEXT_EAX +#define FIBER_CONTEXT_EBX FIBER_CONTEXT + CONTEXT_EBX +#define FIBER_CONTEXT_ECX FIBER_CONTEXT + CONTEXT_ECX +#define FIBER_CONTEXT_EDX FIBER_CONTEXT + CONTEXT_EDX +#define FIBER_CONTEXT_ESI FIBER_CONTEXT + CONTEXT_ESI +#define FIBER_CONTEXT_EDI FIBER_CONTEXT + CONTEXT_EDI +#define FIBER_CONTEXT_EBP FIBER_CONTEXT + CONTEXT_EBP +#define FIBER_CONTEXT_ESP FIBER_CONTEXT + CONTEXT_ESP +#define FIBER_CONTEXT_DR6 FIBER_CONTEXT + CONTEXT_DR6 +#define FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_STATUS_WORD +#define FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_CONTROL_WORD +#define FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_TAG_WORD +#endif + _____ Modified: trunk/reactos/lib/kernel32/thread/i386/fiber.S --- trunk/reactos/lib/kernel32/thread/i386/fiber.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/lib/kernel32/thread/i386/fiber.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -8,13 +8,10 @@ */ #include <ndk/i386/segment.h> +#include <ndk/asm.h> -/* - * FIXME: When ntoskrnl header changes are complete, move asm.h out of ntoskrnl - * so that we can use it here as well - */ -//#include <ndk/asm.h> -#include <../ntoskrnl/include/internal/asm.h> +#define CONTEXT_FULL 0x10007 +#define CONTEXT_FLOATING_POINT 0xF .globl _SwitchToFiber@4 .intel_syntax noprefix _____ Deleted: trunk/reactos/ntoskrnl/include/internal/asm.h --- trunk/reactos/ntoskrnl/include/internal/asm.h 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/include/internal/asm.h 2005-07-20 00:33:06 UTC (rev 16655) @@ -1,182 +0,0 @@ -/* - * FIXME: Will be moved to main include directory soon - */ - -/* - * Definitions for the offsets of members in the KV86M_REGISTERS - */ -#define KV86M_REGISTERS_EBP (0x0) -#define KV86M_REGISTERS_EDI (0x4) -#define KV86M_REGISTERS_ESI (0x8) -#define KV86M_REGISTERS_EDX (0xC) -#define KV86M_REGISTERS_ECX (0x10) -#define KV86M_REGISTERS_EBX (0x14) -#define KV86M_REGISTERS_EAX (0x18) -#define KV86M_REGISTERS_DS (0x1C) -#define KV86M_REGISTERS_ES (0x20) -#define KV86M_REGISTERS_FS (0x24) -#define KV86M_REGISTERS_GS (0x28) -#define KV86M_REGISTERS_EIP (0x2C) -#define KV86M_REGISTERS_CS (0x30) -#define KV86M_REGISTERS_EFLAGS (0x34) -#define KV86M_REGISTERS_ESP (0x38) -#define KV86M_REGISTERS_SS (0x3C) - -#define TF_SAVED_EXCEPTION_STACK (0x8C) -#define TF_REGS (0x90) -#define TF_ORIG_EBP (0x94) - - -/* TSS Offsets */ -#define KTSS_ESP0 (0x4) -#define KTSS_CR3 (0x1C) -#define KTSS_EFLAGS (0x24) -#define KTSS_IOMAPBASE (0x66) - -/* - * Defines for accessing KPCR and KTHREAD structure members - */ -#define KTHREAD_INITIAL_STACK 0x18 -#define KTHREAD_STACK_LIMIT 0x1C -#define KTHREAD_TEB 0x20 -#define KTHREAD_KERNEL_STACK 0x28 -#define KTHREAD_NPX_STATE 0x31 -#define KTHREAD_STATE 0x2D -#define KTHREAD_APCSTATE_PROCESS 0x34 + 0x10 -#define KTHREAD_PENDING_USER_APC 0x34 + 0x16 -#define KTHREAD_PENDING_KERNEL_APC 0x34 + 0x15 -#define KTHREAD_CONTEXT_SWITCHES 0x4C -#define KTHREAD_WAIT_IRQL 0x54 -#define KTHREAD_SERVICE_TABLE 0xDC -#define KTHREAD_PREVIOUS_MODE 0x137 -#define KTHREAD_TRAP_FRAME 0x128 -#define KTHREAD_CALLBACK_STACK 0x120 - -#define KPROCESS_DIRECTORY_TABLE_BASE 0x18 -#define KPROCESS_LDT_DESCRIPTOR0 0x20 -#define KPROCESS_LDT_DESCRIPTOR1 0x24 -#define KPROCESS_IOPM_OFFSET 0x30 - -#define KPCR_EXCEPTION_LIST 0x0 -#define KPCR_INITIAL_STACK 0x4 -#define KPCR_STACK_LIMIT 0x8 -#define KPCR_SELF 0x1C -#define KPCR_GDT 0x3C -#define KPCR_TSS 0x40 -#define KPCR_CURRENT_THREAD 0x124 -#define KPCR_NPX_THREAD 0x2F4 - -/* FPU Save Area Offsets */ -#define FN_CONTROL_WORD 0x0 -#define FN_STATUS_WORD 0x4 -#define FN_TAG_WORD 0x8 -#define FN_DATA_SELECTOR 0x18 -#define FN_CR0_NPX_STATE 0x20C -#define SIZEOF_FX_SAVE_AREA 528 - -/* Trap Frame Offsets */ -#define KTRAP_FRAME_DEBUGEBP (0x0) -#define KTRAP_FRAME_DEBUGEIP (0x4) -#define KTRAP_FRAME_DEBUGARGMARK (0x8) -#define KTRAP_FRAME_DEBUGPOINTER (0xC) -#define KTRAP_FRAME_TEMPSS (0x10) -#define KTRAP_FRAME_TEMPESP (0x14) -#define KTRAP_FRAME_DR0 (0x18) -#define KTRAP_FRAME_DR1 (0x1C) -#define KTRAP_FRAME_DR2 (0x20) -#define KTRAP_FRAME_DR3 (0x24) -#define KTRAP_FRAME_DR6 (0x28) -#define KTRAP_FRAME_DR7 (0x2C) -#define KTRAP_FRAME_GS (0x30) -#define KTRAP_FRAME_RESERVED1 (0x32) -#define KTRAP_FRAME_ES (0x34) -#define KTRAP_FRAME_RESERVED2 (0x36) -#define KTRAP_FRAME_DS (0x38) -#define KTRAP_FRAME_RESERVED3 (0x3A) -#define KTRAP_FRAME_EDX (0x3C) -#define KTRAP_FRAME_ECX (0x40) -#define KTRAP_FRAME_EAX (0x44) -#define KTRAP_FRAME_PREVIOUS_MODE (0x48) -#define KTRAP_FRAME_EXCEPTION_LIST (0x4C) -#define KTRAP_FRAME_FS (0x50) -#define KTRAP_FRAME_RESERVED4 (0x52) -#define KTRAP_FRAME_EDI (0x54) -#define KTRAP_FRAME_ESI (0x58) -#define KTRAP_FRAME_EBX (0x5C) -#define KTRAP_FRAME_EBP (0x60) -#define KTRAP_FRAME_ERROR_CODE (0x64) -#define KTRAP_FRAME_EIP (0x68) -#define KTRAP_FRAME_CS (0x6C) -#define KTRAP_FRAME_EFLAGS (0x70) -#define KTRAP_FRAME_ESP (0x74) -#define KTRAP_FRAME_SS (0x78) -#define KTRAP_FRAME_RESERVED5 (0x7A) -#define KTRAP_FRAME_V86_ES (0x7C) -#define KTRAP_FRAME_RESERVED6 (0x7E) -#define KTRAP_FRAME_V86_DS (0x80) -#define KTRAP_FRAME_RESERVED7 (0x82) -#define KTRAP_FRAME_V86_FS (0x84) -#define KTRAP_FRAME_RESERVED8 (0x86) -#define KTRAP_FRAME_V86_GS (0x88) -#define KTRAP_FRAME_RESERVED9 (0x8A) -#define KTRAP_FRAME_SIZE (0x8C) - -/* User Shared Data */ -#define KUSER_SHARED_DATA 0x7FFE0000 -#define KUSER_SHARED_PROCESSOR_FEATURES KUSER_SHARED_DATA + 0x274 -#define KUSER_SHARED_SYSCALL KUSER_SHARED_DATA + 0x300 -#define KUSER_SHARED_SYSCALL_RET KUSER_SHARED_DATA + 0x304 -#define PROCESSOR_FEATURE_FXSR KUSER_SHARED_PROCESSOR_FEATURES + 0x4 - -/* CONTEXT CONSTANTS */ -#define CONTEXT_FULL 0x10007 -#define CONTEXT_FLOATING_POINT 0xF -#define CONTEXT_FLAGS 0x0 -#define CONTEXT_DR6 0x14 -#define CONTEXT_FLOAT_SAVE 0x1C -#define CONTEXT_EDI 0x9C -#define CONTEXT_ESI 0xA0 -#define CONTEXT_EBX 0xA4 -#define CONTEXT_EDX 0xA8 -#define CONTEXT_ECX 0xAC -#define CONTEXT_EAX 0xB0 -#define CONTEXT_EBP 0xB4 -#define CONTEXT_EIP 0xB8 -#define CONTEXT_ESP 0xC4 -#define CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FN_CONTROL_WORD -#define CONTEXT_FLOAT_SAVE_STATUS_WORD CONTEXT_FLOAT_SAVE + FN_STATUS_WORD -#define CONTEXT_FLOAT_SAVE_TAG_WORD CONTEXT_FLOAT_SAVE + FN_TAG_WORD - -/* TEB CONSTANTS */ -#define TEB_EXCEPTION_LIST 0x0 -#define TEB_STACK_BASE 0x4 -#define TEB_STACK_LIMIT 0x8 -#define TEB_FIBER_DATA 0x10 -#define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 -#define TEB_DEALLOCATION_STACK 0xE0C -#define TEB_GUARANTEED_STACK_BYTES 0xF78 -#define TEB_FLS_DATA 0xFB4 - -/* FIBER CONSTANTS */ -#define FIBER_PARAMETER 0x0 -#define FIBER_EXCEPTION_LIST 0x4 -#define FIBER_STACK_BASE 0x8 -#define FIBER_STACK_LIMIT 0xC -#define FIBER_DEALLOCATION_STACK 0x10 -#define FIBER_CONTEXT 0x14 -#define FIBER_GUARANTEED_STACK_BYTES 0x2E0 -#define FIBER_FLS_DATA 0x2E4 -#define FIBER_ACTIVATION_CONTEXT_STACK 0x2E8 -#define FIBER_CONTEXT_FLAGS FIBER_CONTEXT + CONTEXT_FLAGS -#define FIBER_CONTEXT_EAX FIBER_CONTEXT + CONTEXT_EAX -#define FIBER_CONTEXT_EBX FIBER_CONTEXT + CONTEXT_EBX -#define FIBER_CONTEXT_ECX FIBER_CONTEXT + CONTEXT_ECX -#define FIBER_CONTEXT_EDX FIBER_CONTEXT + CONTEXT_EDX -#define FIBER_CONTEXT_ESI FIBER_CONTEXT + CONTEXT_ESI -#define FIBER_CONTEXT_EDI FIBER_CONTEXT + CONTEXT_EDI -#define FIBER_CONTEXT_EBP FIBER_CONTEXT + CONTEXT_EBP -#define FIBER_CONTEXT_ESP FIBER_CONTEXT + CONTEXT_ESP -#define FIBER_CONTEXT_DR6 FIBER_CONTEXT + CONTEXT_DR6 -#define FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_STATUS_WORD -#define FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_CONTROL_WORD -#define FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_TAG_WORD _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-07-20 00:33:06 UTC (rev 16655) @@ -11,7 +11,6 @@ #ifdef _NTOSKRNL_ -#include "asm.h" #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-20 00:33:06 UTC (rev 16655) @@ -18,8 +18,9 @@ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/wdmguid.h> +#include <ndk/ntndk.h> #include <ndk/sysguid.h> -#include <ndk/ntndk.h> +#include <ndk/asm.h> #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -12,7 +12,7 @@ #include <roscfg.h> #include <internal/i386/ke.h> -#include <internal/asm.h> +#include <ndk/asm.h> #include <ndk/i386/segment.h> .intel_syntax noprefix _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main.S --- trunk/reactos/ntoskrnl/ke/i386/main.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/main.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -1,5 +1,5 @@ #include <roscfg.h> -#include <internal/asm.h> +#include <ndk/asm.h> #include <ndk/i386/segment.h> #define AP_MAGIC (0x12481020) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S --- trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -7,7 +7,8 @@ */ /* INCLUDES ******************************************************************/ -#include <internal/asm.h> +#include <ndk/asm.h> + /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -12,7 +12,7 @@ #include <roscfg.h> #include <internal/i386/ke.h> -#include <internal/asm.h> +#include <ndk/asm.h> #include <ndk/i386/segment.h> #define UserMode (1) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-07-20 00:33:06 UTC (rev 16655) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <roscfg.h> -#include <internal/asm.h> +#include <ndk/asm.h> #include <ndk/i386/segment.h> #define KernelMode 0 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S --- trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S 2005-07-20 00:33:06 UTC (rev 16655) @@ -6,7 +6,7 @@ * Created 09/10/00 */ -#include <internal/asm.h> +#include <ndk/asm.h> .globl _Ki386RetToV86Mode .globl _KiV86Complete _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-07-19 23:44:22 UTC (rev 16654) +++ trunk/reactos/tools/nci/ncitool.c 2005-07-20 00:33:06 UTC (rev 16655) @@ -130,7 +130,7 @@ " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" " */\n\n\n" - "#define KUSER_SHARED_SYSCALL 0x7FFE0300\n\n", + "#include <ndk/asm.h>\n\n", FileDescription, FileLocation); }

19 years, 3 months

[greatlrd] 16654: fixing bug copy file c: by Brandon Turner

by greatlrd＠svn.reactos.com

fixing bug copy file c: by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-19 23:36:59 UTC (rev 16653) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-19 23:44:22 UTC (rev 16654) @@ -37,7 +37,7 @@ COPY_ASCII = 0x001, /* /A */ COPY_DECRYPT = 0x004, /* /D */ COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ - COPY_SHORTNAME = 0x010, /* /N : Not Impleneted */ + COPY_SHORTNAME = 0x010, /* /N : Dummy, Never will be Impleneted */ COPY_NO_PROMPT = 0x020, /* /Y */ COPY_PROMPT = 0x040, /* /-Y */ COPY_RESTART = 0x080, /* /Z */ @@ -526,15 +526,9 @@ /* Set up the string that is the path to the destination */ if(nDes != -1) { - /* Check to make sure if they entered c:, if they do then GFPN - return current directory even though msdn says it will return c:\ */ - if(_tcslen(arg[nDes]) == 2) + if(_tcslen(arg[nDes]) == 2 && arg[nDes][1] == _T(':')) { - if(arg[nDes][1] == _T(':')) - { - _tcscpy (szDestPath, arg[nDes]); - _tcscat (szDestPath, _T("\\")); - } + GetRootPath(arg[nDes],szDestPath,MAX_PATH); } else /* If the user entered two file names then form the full string path*/ @@ -552,7 +546,6 @@ /* Get the full string of the path to the source file*/ if(_tcschr (arg[nSrc], _T('+')) != NULL) { - _tcscpy(tmpName,_T("\0")); /* Loop through the source file name and copy all the chars one at a time until it gets too + */ @@ -572,14 +565,13 @@ } /* Finish the string off with a null char */ _tcsncat(tmpName,_T("\0"),1); - /* Check to make sure if they entered c:, if they do then GFPN - return current directory even though msdn says it will return c:\ */ + if(_tcslen(tmpName) == 2) { if(tmpName[1] == _T(':')) { - _tcscpy (szSrcPath, tmpName); - _tcscat (szSrcPath, _T("\\")); + + GetRootPath(tmpName,szSrcPath,MAX_PATH); } } else @@ -588,15 +580,9 @@ } else { - /* Check to make sure if they entered c:, if they do then GFPN - return current directory even though msdn says it will return c:\ */ - if(_tcslen(arg[nSrc]) == 2) + if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':')) { - if(arg[nSrc][1] == _T(':')) - { - _tcscpy (szSrcPath, arg[nSrc]); - _tcscat (szSrcPath, _T("\\")); - } + GetRootPath(arg[nSrc],szSrcPath,MAX_PATH); } else /* Get the full path of the source file */

19 years, 3 months

[greatlrd] 16653: Make CMD rember startpath when you change from start drive to another drive.

by greatlrd＠svn.reactos.com

Make CMD rember startpath when you change from start drive to another drive. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-19 23:25:50 UTC (rev 16652) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-19 23:36:59 UTC (rev 16653) @@ -1533,6 +1533,7 @@ int _main (int argc, char *argv[]) #endif { + TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; INT nExitCode; #ifdef _UNICODE @@ -1544,7 +1545,9 @@ argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif #endif - + + GetCurrentDirectory(MAX_PATH,startPath); + _tchdir(startPath); SetFileApisToOEM(); InputCodePage= 0;

19 years, 3 months

[greatlrd] 16652: Fix some pipe and revirt one erly change as harumt sugest. and add alot errorlevel most command handle the errorlevel right but it is alot work todo

by greatlrd＠svn.reactos.com

Fix some pipe and revirt one erly change as harumt sugest. and add alot errorlevel most command handle the errorlevel right but it is alot work todo Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/error.c _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-07-19 22:48:35 UTC (rev 16651) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-07-19 23:25:50 UTC (rev 16652) @@ -113,7 +113,7 @@ { s = (LPTSTR)malloc ((_tcslen (subst) + 1)*sizeof(TCHAR)); if (!s) - { + { error_out_of_memory (); return; } @@ -312,6 +312,8 @@ return 0; } + nErrorLevel = 0; + if (param[0] == _T('\0')) { PrintAlias (); _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-07-19 22:48:35 UTC (rev 16651) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-07-19 23:25:50 UTC (rev 16652) @@ -135,6 +135,7 @@ if (hFind == INVALID_HANDLE_VALUE) { ErrorMessage (GetLastError (), pszFile); + nErrorLevel = 1; return; } @@ -164,6 +165,7 @@ if (hFind == INVALID_HANDLE_VALUE) { ErrorMessage (GetLastError (), pszFile); + nErrorLevel = 1; return; } @@ -209,6 +211,8 @@ return 0; } + nErrorLevel = 0; + /* build parameter array */ arg = split (param, &argc, FALSE); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-19 22:48:35 UTC (rev 16651) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-19 23:25:50 UTC (rev 16652) @@ -1555,7 +1555,7 @@ OPEN_EXISTING, 0, NULL); if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) { - ConOutFormatMessage(GetLastError()); + ConErrFormatMessage(GetLastError()); return(1); } wColor = Info.wAttributes; _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-19 22:48:35 UTC (rev 16651) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-19 23:25:50 UTC (rev 16652) @@ -185,7 +185,7 @@ if (hFileDest == INVALID_HANDLE_VALUE) { CloseHandle (hFileSrc); - error_path_not_found (); + ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; return 0; } @@ -194,7 +194,7 @@ { CloseHandle (hFileDest); CloseHandle (hFileSrc); - error_out_of_memory (); + ConOutResPuts(STRING_ERROR_OUT_OF_MEMORY); nErrorLevel = 1; return 0; } @@ -466,7 +466,9 @@ default: /* invaild switch */ - error_invalid_switch(_totupper(arg[i][1])); + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, _totupper(arg[i][1])); + return 1; break; } @@ -488,14 +490,15 @@ if(nFiles < 1) { /* There is not enough files, there has to be at least 1 */ - error_req_param_missing(); + ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); return 1; } if(nFiles > 2) { /* there is too many file names in command */ - error_too_many_parameters(""); + LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg,_T("")); nErrorLevel = 1; return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-07-19 22:48:35 UTC (rev 16651) +++ trunk/reactos/subsys/system/cmd/error.c 2005-07-19 23:25:50 UTC (rev 16652) @@ -36,6 +36,8 @@ if (dwErrorCode == ERROR_SUCCESS) return; + nErrorLevel = 1; + if (szFormat) { va_start (arg_ptr, szFormat); @@ -49,14 +51,14 @@ NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&szError, 0, NULL)) { - ConOutPrintf (_T("%s %s\n"), szError, szMessage); + ConErrPrintf (_T("%s %s\n"), szError, szMessage); LocalFree (szError); return; } else { LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, dwErrorCode); + ConErrPrintf(szMsg, dwErrorCode); return; } @@ -94,7 +96,8 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, ch); + ConErrPrintf(szMsg, ch); + nErrorLevel = 1; } @@ -103,7 +106,8 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, ch); + ConErrPrintf(szMsg, ch); + nErrorLevel = 1; } @@ -112,20 +116,21 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, s); + ConErrPrintf(szMsg, s); + nErrorLevel = 1; } VOID error_path_not_found (VOID) { - ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); + ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; } VOID error_file_not_found (VOID) { - ConOutResPuts(STRING_ERROR_FILE_NOT_FOUND); + ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND); nErrorLevel = 1; } @@ -135,20 +140,22 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(_T("%s - %s\n"), szMsg, f); + ConErrPrintf(_T("%s - %s\n"), szMsg, f); nErrorLevel = 1; } VOID error_req_param_missing (VOID) { - ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); + ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); + nErrorLevel = 1; } VOID error_invalid_drive (VOID) { - ConOutResPuts(STRING_ERROR_INVALID_DRIVE); + ConErrResPuts(STRING_ERROR_INVALID_DRIVE); + nErrorLevel = 1; } @@ -162,18 +169,21 @@ VOID error_no_pipe (VOID) { ConErrResPuts(STRING_ERROR_CANNOTPIPE); + nErrorLevel = 1; } VOID error_out_of_memory (VOID) { ConErrResPuts(STRING_ERROR_OUT_OF_MEMORY); + nErrorLevel = 1; } VOID error_invalid_parameter_format (LPTSTR s) { - ConOutResPuts(STRING_ERROR_INVALID_PARAM_FORMAT); + ConErrResPuts(STRING_ERROR_INVALID_PARAM_FORMAT); + nErrorLevel = 1; } @@ -187,6 +197,8 @@ ConErrPrintf(_T("%s - %s\n"), szMsg, s); else ConErrPrintf(_T("%s.\n"), szMsg); + + nErrorLevel = 1; }

19 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
...
57
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 July 2005