Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16668: fix one bug with cmd goto so WBAT will work bit more now. thx gasmann to report it.
by greatlrd＠svn.reactos.com 20 Jul '05

20 Jul '05

fix one bug with cmd goto so WBAT will work bit more now. thx gasmann to report it. Modified: trunk/reactos/subsys/system/cmd/goto.c _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 15:56:24 UTC (rev 16667) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 17:06:53 UTC (rev 16668) @@ -71,6 +71,7 @@ while (*tmp && !_istspace (*tmp)) tmp++; *tmp = _T('\0'); + /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; @@ -78,26 +79,40 @@ while (FileGetString (bc->hBatchFile, textline, sizeof(textline))) { + int pos; + int size; + /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; - while (_istcntrl (*tmp) || _istspace (*tmp)) + + + while (_istcntrl (*tmp) || _istspace (*tmp)) tmp--; *(tmp + 1) = _T('\0'); - + /* Then leading spaces... */ - tmp = textline; + tmp = textline; while (_istspace (*tmp)) tmp++; - /* use only 1st 8 chars of label */ - if ((*tmp == _T(':')) && (_tcsncmp (++tmp, param, 8) == 0)) + /* All space after leading space terminate the string */ + size = _tcslen(tmp) -1; + pos=0; + while (tmp+pos < tmp+size) + { + if (_istspace(tmp[pos])) + tmp[pos]=_T('\0'); + pos++; + } + + /* use whole label name */ + if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) return 0; } LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); ExitBatch(NULL); - return 1; }

1 0

[ion] 16667: - Final fix.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Final fix. Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-07-20 15:21:52 UTC (rev 16666) +++ trunk/reactos/subsys/system/setup/setup.c 2005-07-20 15:56:24 UTC (rev 16667) @@ -26,7 +26,7 @@ #include <windows.h> #include <tchar.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> #include <userenv.h> #define NDEBUG

1 0

[ion] 16666: - Fix one more breakage (funny, the thing built without it for me?!)
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix one more breakage (funny, the thing built without it for me?!) Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-07-20 14:46:24 UTC (rev 16665) +++ trunk/reactos/lib/syssetup/wizard.c 2005-07-20 15:21:52 UTC (rev 16666) @@ -33,7 +33,7 @@ #include <string.h> #include <setupapi.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> #include "globals.h" #include "resource.h"

1 0

[ion] 16665: - Fix afd build for real (sorry...rbuild...)
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix afd build for real (sorry...rbuild...) Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-07-20 14:45:33 UTC (rev 16664) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-07-20 14:46:24 UTC (rev 16665) @@ -18,7 +18,7 @@ #include <tdiinfo.h> #include <string.h> #include <winsock2.h> -#include <shared.h> +#include <afd/shared.h> #ifndef MIN #define MIN(x,y) (((x)<(y))?(x):(y))

1 0

[ion] 16664: - Fix AFD Build.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix AFD Build. Modified: trunk/reactos/drivers/net/afd/afd.xml _____ Modified: trunk/reactos/drivers/net/afd/afd.xml --- trunk/reactos/drivers/net/afd/afd.xml 2005-07-20 14:40:20 UTC (rev 16663) +++ trunk/reactos/drivers/net/afd/afd.xml 2005-07-20 14:45:33 UTC (rev 16664) @@ -1,6 +1,5 @@ <module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys"> <include base="afd">include</include> - <include base="ReactOS">include/afd</include> <define name="__USE_W32API" /> <library>pseh</library> <library>ntoskrnl</library>

1 0

[ion] 16663: Fix build; sorry, I was waiting for Filip.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

Fix build; sorry, I was waiting for Filip. Modified: trunk/reactos/drivers/dd/blue/blue.c _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2005-07-20 07:48:10 UTC (rev 16662) +++ trunk/reactos/drivers/dd/blue/blue.c 2005-07-20 14:40:20 UTC (rev 16663) @@ -13,7 +13,7 @@ #include <ddk/ntddk.h> #include <wincon.h> -#include <ddk/ntddblue.h> +#include <blue/ntddblue.h> #include <ndk/halfuncs.h> #define NDEBUG

1 0

[navaraf] 16662: Build fixes.
by navaraf＠svn.reactos.com 20 Jul '05

20 Jul '05

Build fixes. Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-07-20 07:27:09 UTC (rev 16661) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-07-20 07:48:10 UTC (rev 16662) @@ -1,3 +1,5 @@ +#include <windef.h> +#include <wingdi.h> #include <ddk/ntddk.h> #include <ddk/winddi.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-20 07:27:09 UTC (rev 16661) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-20 07:48:10 UTC (rev 16662) @@ -1,3 +1,5 @@ +#include <windef.h> +#include <wingdi.h> #include <ddk/ntddk.h> #include <ddk/ntddvdeo.h> #include <ddk/winddi.h>

1 0

[navaraf] 16661: Get rid of windows.h include in win32k. Fixes bug #666.
by navaraf＠svn.reactos.com 20 Jul '05

20 Jul '05

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);

1 0

[ion] 16660: Dmitry Philippov <shedon@mail.ru>:
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

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; }

1 0

[ion] 16659: - Move rosdhcp_public.h to dhcp library include directory.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- 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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs