Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[sedwards] 13374: forward stubs for Escape and GetSystemPaletteUse. Working on a real patch.

by sedwards＠svn.reactos.com

forward stubs for Escape and GetSystemPaletteUse. Working on a real patch. Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-01-31 23:33:34 UTC (rev 13373) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-01-31 23:58:10 UTC (rev 13374) @@ -150,26 +150,16 @@ return 0; } - /* * @unimplemented */ int STDCALL -Escape( - HDC a0, - int a1, - int a2, - LPCSTR a3, - LPVOID a4 - ) +Escape(HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out_data) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiEscape(hdc,escape,in_count,in_data,out_data); } - /* * @unimplemented */ @@ -273,13 +263,9 @@ */ UINT STDCALL -GetSystemPaletteUse( - HDC hDc - ) +GetSystemPaletteUse(HDC hDc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiGetSystemPaletteUse(hDc); }

19 years, 10 months

[jimtabor] 13373: Remove building of Advpack for now.

by jimtabor＠svn.reactos.com

Remove building of Advpack for now. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-31 22:13:43 UTC (rev 13372) +++ trunk/reactos/Makefile 2005-01-31 23:33:34 UTC (rev 13373) @@ -54,8 +54,8 @@ DLLS_SHELLEXT = shellext # User mode libraries -# libpcap packet epsapi -DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ +# advpack libpcap packet epsapi +DLLS = acledit aclui advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \

19 years, 10 months

[gdalsnes] 13372: remove obvious duplicates

by gdalsnes＠svn.reactos.com

remove obvious duplicates Deleted: trunk/reactos/lib/crtdll/conio/ Deleted: trunk/reactos/lib/crtdll/ctype/ Deleted: trunk/reactos/lib/crtdll/direct/getdfree.c Deleted: trunk/reactos/lib/crtdll/direct/getdrive.c Deleted: trunk/reactos/lib/crtdll/direct/mkdir.c Deleted: trunk/reactos/lib/crtdll/except/ Deleted: trunk/reactos/lib/crtdll/float/clearfp.c Deleted: trunk/reactos/lib/crtdll/float/cntrlfp.c Deleted: trunk/reactos/lib/crtdll/float/fpreset.c Deleted: trunk/reactos/lib/crtdll/float/logb.c Deleted: trunk/reactos/lib/crtdll/float/nafter.c Deleted: trunk/reactos/lib/crtdll/float/statfp.c Deleted: trunk/reactos/lib/crtdll/io/chsize.c Deleted: trunk/reactos/lib/crtdll/io/close.c Deleted: trunk/reactos/lib/crtdll/io/commit.c Deleted: trunk/reactos/lib/crtdll/io/dup2.c Deleted: trunk/reactos/lib/crtdll/io/isatty.c Deleted: trunk/reactos/lib/crtdll/io/mktemp.c Deleted: trunk/reactos/lib/crtdll/io/setmode.c Deleted: trunk/reactos/lib/crtdll/io/sopen.c Deleted: trunk/reactos/lib/crtdll/io/tell.c Deleted: trunk/reactos/lib/crtdll/io/umask.c Deleted: trunk/reactos/lib/crtdll/io/utime.c Deleted: trunk/reactos/lib/crtdll/math/acos.c Deleted: trunk/reactos/lib/crtdll/math/asin.c Deleted: trunk/reactos/lib/crtdll/math/atan.c Deleted: trunk/reactos/lib/crtdll/math/atan2.c Deleted: trunk/reactos/lib/crtdll/math/cabs.c Deleted: trunk/reactos/lib/crtdll/math/cos.c Deleted: trunk/reactos/lib/crtdll/math/cosh.c Deleted: trunk/reactos/lib/crtdll/math/exp.c Deleted: trunk/reactos/lib/crtdll/math/fabs.c Deleted: trunk/reactos/lib/crtdll/math/fmod.c Deleted: trunk/reactos/lib/crtdll/math/hypot.c Deleted: trunk/reactos/lib/crtdll/math/j0_y0.c Deleted: trunk/reactos/lib/crtdll/math/j1_y1.c Deleted: trunk/reactos/lib/crtdll/math/jn_yn.c Deleted: trunk/reactos/lib/crtdll/math/ldexp.c Deleted: trunk/reactos/lib/crtdll/math/log.c Deleted: trunk/reactos/lib/crtdll/math/log10.c Deleted: trunk/reactos/lib/crtdll/math/pow.c Deleted: trunk/reactos/lib/crtdll/math/sin.c Deleted: trunk/reactos/lib/crtdll/math/sinh.c Deleted: trunk/reactos/lib/crtdll/math/sqrt.c Deleted: trunk/reactos/lib/crtdll/math/stubs.c Deleted: trunk/reactos/lib/crtdll/math/tan.c Deleted: trunk/reactos/lib/crtdll/math/tanh.c Deleted: trunk/reactos/lib/crtdll/mbstring/hanzen.c Deleted: trunk/reactos/lib/crtdll/mbstring/ischira.c Deleted: trunk/reactos/lib/crtdll/mbstring/iskana.c Deleted: trunk/reactos/lib/crtdll/mbstring/iskmoji.c Deleted: trunk/reactos/lib/crtdll/mbstring/iskpun.c Deleted: trunk/reactos/lib/crtdll/mbstring/islwr.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbal.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbaln.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbc.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbgra.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbkaln.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismblead.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbpri.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbpun.c Deleted: trunk/reactos/lib/crtdll/mbstring/ismbtrl.c Deleted: trunk/reactos/lib/crtdll/mbstring/isuppr.c Deleted: trunk/reactos/lib/crtdll/mbstring/jistojms.c Deleted: trunk/reactos/lib/crtdll/mbstring/jmstojis.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbbtype.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbccpy.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbscoll.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsdec.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsicmp.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsicoll.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsinc.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbslen.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbslwr.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsnccnt.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsncmp.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsncoll.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsncpy.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsnextc.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsnicmp.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsnicoll.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsninc.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsnset.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsset.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbstrlen.c Deleted: trunk/reactos/lib/crtdll/mbstring/mbsupr.c Deleted: trunk/reactos/lib/crtdll/process/dll.c Deleted: trunk/reactos/lib/crtdll/process/procid.c Deleted: trunk/reactos/lib/crtdll/process/threadid.c Deleted: trunk/reactos/lib/crtdll/search/ Deleted: trunk/reactos/lib/crtdll/signal/ Deleted: trunk/reactos/lib/crtdll/stdio/allocfil.c Deleted: trunk/reactos/lib/crtdll/stdio/clearerr.c Deleted: trunk/reactos/lib/crtdll/stdio/fclose.c Deleted: trunk/reactos/lib/crtdll/stdio/fdopen.c Deleted: trunk/reactos/lib/crtdll/stdio/feof.c Deleted: trunk/reactos/lib/crtdll/stdio/ferror.c Deleted: trunk/reactos/lib/crtdll/stdio/fflush.c Deleted: trunk/reactos/lib/crtdll/stdio/fgetc.c Deleted: trunk/reactos/lib/crtdll/stdio/fgetchar.c [truncated at 100 lines; 69 more skipped] _____ Deleted: trunk/reactos/lib/crtdll/direct/getdfree.c --- trunk/reactos/lib/crtdll/direct/getdfree.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/direct/getdfree.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,23 +0,0 @@ -#include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> - - -/* - * @implemented - */ -unsigned int _getdiskfree(unsigned int _drive, struct _diskfree_t* _diskspace) -{ - char RootPathName[10]; - - RootPathName[0] = toupper(_drive +'@'); - RootPathName[1] = ':'; - RootPathName[2] = '\\'; - RootPathName[3] = 0; - if (_diskspace == NULL) - return 0; - if (!GetDiskFreeSpaceA(RootPathName,(LPDWORD)&_diskspace->sectors_per_clust er,(LPDWORD)&_diskspace->bytes_per_sector, - (LPDWORD )&_diskspace->avail_clusters,(LPDWORD )&_diskspace->total_clusters)) - return 0; - return _diskspace->avail_clusters; -} _____ Deleted: trunk/reactos/lib/crtdll/direct/getdrive.c --- trunk/reactos/lib/crtdll/direct/getdrive.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/direct/getdrive.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,30 +0,0 @@ -#include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> - - -extern int cur_drive; - -/* - * @implemented - */ -int _getdrive(void) -{ - char Buffer[MAX_PATH]; - - if (cur_drive == 0) { - GetCurrentDirectoryA(MAX_PATH, Buffer); - cur_drive = toupper(Buffer[0] - '@'); - } - return cur_drive; -} - -/* - * @unimplemented - */ -unsigned long _getdrives(void) -{ - //fixme get logical drives - //return GetLogicalDrives(); - return 5; // drive A and C -} _____ Deleted: trunk/reactos/lib/crtdll/direct/mkdir.c --- trunk/reactos/lib/crtdll/direct/mkdir.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/direct/mkdir.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,13 +0,0 @@ -#include "precomp.h" -#include <msvcrt/direct.h> - - -/* - * @implemented - */ -int _mkdir(const char* _path) -{ - if (!CreateDirectoryA(_path, NULL)) - return -1; - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/float/clearfp.c --- trunk/reactos/lib/crtdll/float/clearfp.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/clearfp.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,17 +0,0 @@ -#include <msvcrt/float.h> - -/* - * @implemented - */ -unsigned int _clearfp (void) -{ -unsigned short __res = _statusfp(); -#ifdef __GNUC__ -__asm__ __volatile__ ( - "fclex \n\t" - ); -#else -#endif /*__GNUC__*/ - return __res; -} - _____ Deleted: trunk/reactos/lib/crtdll/float/cntrlfp.c --- trunk/reactos/lib/crtdll/float/cntrlfp.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/cntrlfp.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,174 +0,0 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - -#include <msvcrt/float.h> - -#define X87_CW_IM (1<<0) /* Invalid operation mask */ -#define X87_CW_DM (1<<1) /* Denormal operand mask */ -#define X87_CW_ZM (1<<2) /* Zero divide mask */ -#define X87_CW_OM (1<<3) /* Overflow mask */ -#define X87_CW_UM (1<<4) /* Underflow mask */ -#define X87_CW_PM (1<<5) /* Precision mask */ - -#define X87_CW_PC_MASK (3<<8) /* precision control mask */ -#define X87_CW_PC24 (0<<8) /* 24 bit precision */ -#define X87_CW_PC53 (2<<8) /* 53 bit precision */ -#define X87_CW_PC64 (3<<8) /* 64 bit precision */ - -#define X87_CW_RC_MASK (3<<10) /* rounding control mask */ -#define X87_CW_RC_NEAREST (0<<10) /* round to nearest */ -#define X87_CW_RC_DOWN (1<<10) /* round down */ -#define X87_CW_RC_UP (2<<10) /* round up */ -#define X87_CW_RC_ZERO (3<<10) /* round toward zero (chop) */ - -#define X87_CW_IC (1<<12) /* infinity control flag */ - -/* - * @implemented - */ -unsigned int _controlfp(unsigned int unNew, unsigned int unMask) -{ - return _control87(unNew,unMask); -} - -/* - * @implemented - */ -unsigned int _control87(unsigned int unNew, unsigned int unMask) -{ - unsigned int FpuCw; - unsigned int DummyCw = 0; - - /* get the controlword */ - asm volatile("fstcw %0\n\t" : "=m"(FpuCw)); - FpuCw &= 0x0000ffff; - - /* translate it into _control87 format */ - if (FpuCw & X87_CW_IM) - DummyCw |= _EM_INVALID; - if (FpuCw & X87_CW_DM) - DummyCw |= _EM_DENORMAL; - if (FpuCw & X87_CW_ZM) - DummyCw |= _EM_ZERODIVIDE; - if (FpuCw & X87_CW_OM) - DummyCw |= _EM_OVERFLOW; - if (FpuCw & X87_CW_UM) - DummyCw |= _EM_UNDERFLOW; - if (FpuCw & X87_CW_PM) - DummyCw |= _EM_INEXACT; - - switch (FpuCw & X87_CW_PC_MASK) - { - case X87_CW_PC24: - DummyCw |= _PC_24; - break; - case X87_CW_PC53: - DummyCw |= _PC_53; - break; - case X87_CW_PC64: - DummyCw |= _PC_64; - break; - } - - switch (FpuCw & X87_CW_RC_MASK) - { - case X87_CW_RC_NEAREST: - DummyCw |= _RC_NEAR; - break; - case X87_CW_RC_DOWN: - DummyCw |= _RC_DOWN; - break; - case X87_CW_RC_UP: - DummyCw |= _RC_UP; - break; - case X87_CW_RC_ZERO: - DummyCw |= _RC_CHOP; - break; - } - - /* unset (un)masked bits */ - DummyCw &= ~unMask; - unNew &= unMask; - - /* set new bits */ - DummyCw |= unNew; - - /* translate back into x87 format - * FIXME: translate infinity control! - */ - FpuCw = 0; - if (DummyCw & _EM_INVALID) - FpuCw |= X87_CW_IM; - if (DummyCw & _EM_DENORMAL) - FpuCw |= X87_CW_DM; - if (DummyCw & _EM_ZERODIVIDE) - FpuCw |= X87_CW_ZM; - if (DummyCw & _EM_OVERFLOW) - FpuCw |= X87_CW_OM; - if (DummyCw & _EM_UNDERFLOW) - FpuCw |= X87_CW_UM; - if (DummyCw & _EM_INEXACT) - FpuCw |= X87_CW_PM; - - switch (DummyCw & _MCW_PC) - { - case _PC_24: - FpuCw |= X87_CW_PC24; - break; - case _PC_53: - FpuCw |= X87_CW_PC53; - break; - case _PC_64: - default: - FpuCw |= X87_CW_PC64; - break; - } - - switch (DummyCw & _MCW_RC) - { - case _RC_NEAR: - FpuCw |= X87_CW_RC_NEAREST; - break; - case _RC_DOWN: - FpuCw |= X87_CW_RC_DOWN; - break; - case _RC_UP: - FpuCw |= X87_CW_RC_UP; - break; - case _RC_CHOP: - FpuCw |= X87_CW_RC_ZERO; - break; - } - - /* set controlword */ - asm volatile("fldcw %0" : : "m"(FpuCw)); - - return DummyCw; - -#if 0 /* The follwing is the original code, broken I think! -blight */ -register unsigned int __res; -#ifdef __GNUC__ -__asm__ __volatile__ ( - "pushl %%eax \n\t" /* make room on stack */ - "fstcw (%%esp) \n\t" - "fwait \n\t" - "popl %%eax \n\t" - "andl $0xffff, %%eax \n\t" /* OK; we have the old value ready */ - - "movl %1, %%ecx \n\t" - "notl %%ecx \n\t" - "andl %%eax, %%ecx \n\t" /* the bits we want to keep */ - - "movl %2, %%edx \n\t" - "andl %1, %%edx \n\t" /* the bits we want to change */ - - "orl %%ecx, %%edx\n\t" /* the new value */ - "pushl %%edx \n\t" - "fldcw (%%esp) \n\t" - "popl %%edx \n\t" - - :"=a" (__res):"r" (unNew),"r" (unMask): "dx", "cx"); -#else -#endif /*__GNUC__*/ - return __res; -#endif -} _____ Deleted: trunk/reactos/lib/crtdll/float/fpreset.c --- trunk/reactos/lib/crtdll/float/fpreset.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/fpreset.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,12 +0,0 @@ -#include <msvcrt/float.h> - - -/* - * @unimplemented - */ -void _fpreset(void) -{ - /* FIXME: This causes an exception */ -// __asm__ __volatile__("fninit\n\t"); - return; -} _____ Deleted: trunk/reactos/lib/crtdll/float/logb.c --- trunk/reactos/lib/crtdll/float/logb.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/logb.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,34 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/float.h> - -double _logb (double __x) -{ - register double __value; -#ifdef __GNUC__ - register double __junk; - __asm __volatile__ - ("fxtract\n\t" - : "=t" (__junk), "=u" (__value) : "0" (__x)); -#else -#endif /*__GNUC__*/ - return __value; -} _____ Deleted: trunk/reactos/lib/crtdll/float/nafter.c --- trunk/reactos/lib/crtdll/float/nafter.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/nafter.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,16 +0,0 @@ -#include <msvcrt/float.h> - - -/* - * @implemented - */ -double _nextafter(double x, double y) -{ - if (x == y) - return x; - - if (isnan(x) || isnan(y)) - return x; - - return x; -} _____ Deleted: trunk/reactos/lib/crtdll/float/statfp.c --- trunk/reactos/lib/crtdll/float/statfp.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/float/statfp.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,19 +0,0 @@ -#include <msvcrt/float.h> - -/* - * @implemented - */ -unsigned int _statusfp (void) -{ - -register unsigned short __res; -#ifdef __GNUC__ -__asm__ __volatile__ ( - "fstsw %0 \n\t" -// "movzwl %ax, %eax" - :"=a" (__res) - ); -#else -#endif /*__GNUC__*/ - return __res; -} _____ Deleted: trunk/reactos/lib/crtdll/io/chsize.c --- trunk/reactos/lib/crtdll/io/chsize.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/chsize.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,18 +0,0 @@ -/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/io.h> - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - -/* - * @implemented - */ -int _chsize(int _fd, long size) -{ - DPRINT("_chsize(fd %d, size %d)\n", _fd, size); - if (lseek(_fd, size, 0) == -1) - return -1; - if (_write(_fd, 0, 0) < 0) - return -1; - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/io/close.c --- trunk/reactos/lib/crtdll/io/close.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/close.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,19 +0,0 @@ -#include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/internal/file.h> - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - -/* - * @implemented - */ -int _close(int _fd) -{ - DPRINT("_close(fd %d)\n", _fd); - if (_fd == -1) - return -1; - if (CloseHandle(_get_osfhandle(_fd)) == FALSE) - return -1; - return __fileno_close(_fd); -} _____ Deleted: trunk/reactos/lib/crtdll/io/commit.c --- trunk/reactos/lib/crtdll/io/commit.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/commit.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,18 +0,0 @@ -#include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/errno.h> -#include <msvcrt/internal/file.h> - - -/* - * @implemented - */ -int _commit(int _fd) -{ - if (! FlushFileBuffers(_get_osfhandle(_fd)) ) { - __set_errno(EBADF); - return -1; - } - - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/io/dup2.c --- trunk/reactos/lib/crtdll/io/dup2.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/dup2.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,10 +0,0 @@ -#include <msvcrt/io.h> -#include <msvcrt/internal/file.h> - -/* - * @implemented - */ -int _dup2( int handle1, int handle2 ) -{ - return __fileno_dup2( handle1, handle2 ); -} _____ Deleted: trunk/reactos/lib/crtdll/io/isatty.c --- trunk/reactos/lib/crtdll/io/isatty.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/isatty.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,19 +0,0 @@ -#include <msvcrt/io.h> -#include <msvcrt/sys/stat.h> - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - -/* - * @implemented - */ -int _isatty( int fd ) -{ - struct stat buf; - DPRINT("_isatty(fd %d)\n", fd); - if (_fstat (fd, &buf) < 0) - return 0; - if (S_ISCHR (buf.st_mode)) - return 1; - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/io/mktemp.c --- trunk/reactos/lib/crtdll/io/mktemp.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/mktemp.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,78 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details - * PROJECT: ReactOS system libraries - * FILE: lib/crtdll/io/mktemp.c - * PURPOSE: Makes a temp file based on a template - * PROGRAMER: DJ Delorie - Boudewijn Dekker - * UPDATE HISTORY: - * 28/12/98: Appropriated for the Reactos Kernel - */ - -/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - -#include <msvcrt/stdio.h> -#include <msvcrt/string.h> -#include <msvcrt/io.h> - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - - -/* - * @implemented - */ -char* _mktemp (char *_template) -{ - static int count = 0; - char *cp, *dp; - int i, len, xcount, loopcnt; - - DPRINT("_mktemp('%s')\n", _template); - len = strlen (_template); - cp = _template + len; - - xcount = 0; - while (xcount < 6 && cp > _template && cp[-1] == 'X') - xcount++, cp--; - - if (xcount) { - dp = cp; - while (dp > _template && dp[-1] != '/' && dp[-1] != '\\' && dp[-1] != ':') - dp--; - - /* Keep the first characters of the template, but turn the rest into - Xs. */ - while (cp > dp + 8 - xcount) { - *--cp = 'X'; - xcount = (xcount >= 6) ? 6 : 1 + xcount; - } - - /* If dots occur too early -- squash them. */ - while (dp < cp) { - if (*dp == '.') *dp = 'a'; - dp++; - } - - /* Try to add ".tmp" to the filename. Truncate unused Xs. */ - if (cp + xcount + 3 < _template + len) - strcpy (cp + xcount, ".tmp"); - else - cp[xcount] = 0; - - /* This loop can run up to 2<<(5*6) times, or about 10^9 times. */ - for (loopcnt = 0; loopcnt < (1 << (5 * xcount)); loopcnt++) { - int c = count++; - for (i = 0; i < xcount; i++, c >>= 5) - cp[i] = "abcdefghijklmnopqrstuvwxyz012345"[c & 0x1f]; - if (_access(_template,0) == -1) - return _template; - } - } - - /* Failure: truncate the template and return NULL. */ - *_template = 0; - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/io/setmode.c --- trunk/reactos/lib/crtdll/io/setmode.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/setmode.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,27 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crtdll/io/setmode.c - * PURPOSE: Sets the file translation mode - * PROGRAMER: Boudewijn Dekker - * UPDATE HISTORY: - * 28/12/98: Created - */ - -#include <msvcrt/io.h> -#include <msvcrt/stdio.h> -#include <msvcrt/internal/file.h> - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - - -/* - * @implemented - */ -int _setmode(int _fd, int _newmode) -{ - DPRINT("_setmod(fd %d, newmode %x)\n", _fd, _newmode); - return __fileno_setmode(_fd, _newmode); -} _____ Deleted: trunk/reactos/lib/crtdll/io/sopen.c --- trunk/reactos/lib/crtdll/io/sopen.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/sopen.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,10 +0,0 @@ -#include <msvcrt/io.h> - - -/* - * @implemented - */ -int _sopen(char *path,int access,int shflag,int mode) -{ - return _open((path), (access)|(shflag), (mode)); -} _____ Deleted: trunk/reactos/lib/crtdll/io/tell.c --- trunk/reactos/lib/crtdll/io/tell.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/tell.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,12 +0,0 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/errno.h> -#include <msvcrt/io.h> - - -/* - * @implemented - */ -off_t _tell(int _file) -{ - return _lseek(_file, 0, SEEK_CUR); -} _____ Deleted: trunk/reactos/lib/crtdll/io/umask.c --- trunk/reactos/lib/crtdll/io/umask.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/umask.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,14 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/sys/stat.h> - -unsigned _unMode_dll = 022; - -/* - * @implemented - */ -unsigned _umask (unsigned unMode) -{ - unsigned old_mask = _unMode_dll; - _unMode_dll = unMode; - return old_mask; -} _____ Deleted: trunk/reactos/lib/crtdll/io/utime.c --- trunk/reactos/lib/crtdll/io/utime.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/io/utime.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,25 +0,0 @@ -#include <msvcrt/stdio.h> -#include <msvcrt/io.h> -#include <msvcrt/errno.h> -#include <msvcrt/sys/utime.h> -#include <msvcrt/internal/file.h> - - -/* - * @implemented - */ -int _utime(const char* filename, struct _utimbuf* buf) -{ - int fn; - int ret; - - fn = _open(filename, _O_RDWR); - if ( fn == -1 ) { - __set_errno(EBADF); - return -1; - } - ret = _futime(fn,buf); - if ( _close(fn) < 0 ) - return -1; - return ret; -} _____ Deleted: trunk/reactos/lib/crtdll/math/acos.c --- trunk/reactos/lib/crtdll/math/acos.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/acos.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,27 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - - -double acos(double __x) -{ - return atan2(sqrt(1.0 - __x * __x), __x); -} _____ Deleted: trunk/reactos/lib/crtdll/math/asin.c --- trunk/reactos/lib/crtdll/math/asin.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/asin.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,27 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - - -double asin(double __x) -{ - return atan2(__x, sqrt(1.0 - __x * __x)); -} _____ Deleted: trunk/reactos/lib/crtdll/math/atan.c --- trunk/reactos/lib/crtdll/math/atan.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/atan.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,37 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - -double atan (double __x); - -double atan (double __x) -{ - register double __value; -#ifdef __GNUC__ - __asm __volatile__ - ("fld1\n\t" - "fpatan" - : "=t" (__value) : "0" (__x)); -#else - __value = linkme_atan(__x); -#endif /*__GNUC__*/ - return __value; -} _____ Deleted: trunk/reactos/lib/crtdll/math/atan2.c --- trunk/reactos/lib/crtdll/math/atan2.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/atan2.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,21 +0,0 @@ - -#include <msvcrt/math.h> - -double atan2 (double __y, double __x); - -/* - * @implemented - */ -double atan2 (double __y, double __x) -{ - register double __value; -#ifdef __GNUC__ - __asm __volatile__ - ("fpatan\n\t" - "fld %%st(0)" - : "=t" (__value) : "0" (__x), "u" (__y)); -#else - __value = linkme_atan2(__x, __y); -#endif /*__GNUC__*/ - return __value; -} _____ Deleted: trunk/reactos/lib/crtdll/math/cabs.c --- trunk/reactos/lib/crtdll/math/cabs.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/cabs.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,14 +0,0 @@ -#include <msvcrt/math.h> - -/* - * @implemented - */ -double _cabs( struct _complex z ) -{ - return sqrt( z.x*z.x + z.y*z.y ); -// return hypot(z.x,z.y); -} - - - - _____ Deleted: trunk/reactos/lib/crtdll/math/cos.c --- trunk/reactos/lib/crtdll/math/cos.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/cos.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,19 +0,0 @@ -#include <msvcrt/math.h> - -double cos (double __x); - -/* - * @implemented - */ -double cos (double __x) -{ - register double __value; -#ifdef __GNUC__ - __asm __volatile__ - ("fcos" - : "=t" (__value): "0" (__x)); -#else - __value = linkme_cos(__x); -#endif /*__GNUC__*/ - return __value; -} _____ Deleted: trunk/reactos/lib/crtdll/math/cosh.c --- trunk/reactos/lib/crtdll/math/cosh.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/cosh.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,12 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/math.h> - - -/* - * @implemented - */ -double cosh(double x) -{ - const double ebig = exp(fabs(x)); - return (ebig + 1.0/ebig) / 2.0; -} _____ Deleted: trunk/reactos/lib/crtdll/math/exp.c --- trunk/reactos/lib/crtdll/math/exp.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/exp.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,47 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - -double exp (double __x); - -double exp (double __x) -{ -#ifdef __GNUC__ - register double __value, __exponent; - __asm __volatile__ - ("fldl2e # e^x = 2^(x * log2(e))\n\t" - "fmul %%st(1) # x * log2(e)\n\t" - "fst %%st(1)\n\t" - "frndint # int(x * log2(e))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(x * log2(e))\n\t" - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__x)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); - - return __value; -#else - return linkme_exp(__x); -#endif /*__GNUC__*/ -} _____ Deleted: trunk/reactos/lib/crtdll/math/fabs.c --- trunk/reactos/lib/crtdll/math/fabs.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/fabs.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,36 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - -double fabs (double __x); - -double fabs (double __x) -{ - register double __value; -#ifdef __GNUC__ - __asm __volatile__ - ("fabs" - : "=t" (__value) : "0" (__x)); -#else - __value = linkme_fabs(__x); -#endif /*__GNUC__*/ - return __value; -} _____ Deleted: trunk/reactos/lib/crtdll/math/fmod.c --- trunk/reactos/lib/crtdll/math/fmod.c 2005-01-31 18:25:55 UTC (rev 13371) +++ trunk/reactos/lib/crtdll/math/fmod.c 2005-01-31 22:13:43 UTC (rev 13372) @@ -1,39 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <msvcrt/math.h> - [truncated at 1000 lines; 7077 more skipped]

19 years, 10 months

[chorns] 13371: Generate automatic dependencies.

by chorns＠svn.reactos.com

Generate automatic dependencies. Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_recu rse.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-01-31 18:25:55 UTC (rev 13371) @@ -1,5 +1,6 @@ <module name="freeldr_base" type="objectlibrary"> <include base="freeldr_base">include</include> + <include base="freeldr_base">cache</include> <compilerflag>-nostdlib</compilerflag> <compilerflag>-nostdinc</compilerflag> <compilerflag>-ffreestanding</compilerflag> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-01-31 18:25:55 UTC (rev 13371) @@ -13,21 +13,43 @@ /* Read at most this amount of bytes from each file and assume that all #includes are located within this block */ #define MAX_BYTES_TO_READ 4096 - + using std::string; using std::vector; using std::map; SourceFile::SourceFile ( AutomaticDependency* automaticDependency, Module& module, - const string& filename ) + const string& filename, + SourceFile* parent, + bool isNonAutomaticDependency ) : automaticDependency ( automaticDependency ), module ( module ), - filename ( filename ) + filename ( filename ), + isNonAutomaticDependency ( isNonAutomaticDependency ) { + if ( parent != NULL ) + parents.push_back ( parent ); + GetDirectoryAndFilenameParts (); } - + void +SourceFile::GetDirectoryAndFilenameParts () +{ + size_t index = filename.find_last_of ( CSEP ); + if ( index != string::npos ) + { + directoryPart = filename.substr ( 0, index ); + filenamePart = filename.substr ( index + 1, filename.length () - index ); + } + else + { + directoryPart = ""; + filenamePart = filename; + } +} + +void SourceFile::Close () { buf.resize ( 0 ); @@ -87,14 +109,65 @@ return false; } +bool +SourceFile::IsParentOf ( const SourceFile* parent, + const SourceFile* child ) +{ + size_t i; + for ( i = 0; i < child->parents.size (); i++ ) + { + if ( child->parents[i] != NULL ) + { + if ( child->parents[i] == parent ) + return true; + } + } + for ( i = 0; i < child->parents.size (); i++ ) + { + if ( child->parents[i] != NULL ) + { + if ( IsParentOf ( parent, + child->parents[i] ) ) + return true; + } + } + return false; +} + +bool +SourceFile::IsIncludedFrom ( const string& normalizedFilename ) +{ + if ( normalizedFilename == filename ) + return true; + + SourceFile* sourceFile = automaticDependency->RetrieveFromCache ( normalizedFilename ); + if ( sourceFile == NULL ) + return false; + + return IsParentOf ( sourceFile, + this ); +} + SourceFile* +SourceFile::GetParentSourceFile () +{ + if ( isNonAutomaticDependency ) + return NULL; + return this; +} + +SourceFile* SourceFile::ParseFile ( const string& normalizedFilename ) { string extension = GetExtension ( normalizedFilename ); - if ( extension == ".c" || extension == ".C" || extension == ".h" || extension == ".H") + if ( extension == ".c" || extension == ".C" || extension == ".h" || extension == ".H" ) { + if ( IsIncludedFrom ( normalizedFilename ) ) + return NULL; + SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module, - normalizedFilename ); + normalizedFilename, + GetParentSourceFile () ); return sourceFile; } return NULL; @@ -118,7 +191,8 @@ if ( locatedFile ) { SourceFile* sourceFile = ParseFile ( resolvedFilename ); - files.push_back ( sourceFile ); + if ( sourceFile != NULL ) + files.push_back ( sourceFile ); } } p++; @@ -173,10 +247,9 @@ const File& file ) { string normalizedFilename = NormalizeFilename ( file.name ); - SourceFile sourceFile = SourceFile ( this, - module, - normalizedFilename ); - sourceFile.Parse (); + RetrieveFromCacheOrParse ( module, + normalizedFilename, + NULL ); } bool @@ -201,40 +274,54 @@ const string& includedFilename, string& resolvedFilename ) { - for ( size_t i = 0; i < module.includes.size (); i++ ) + size_t i; + for ( i = 0; i < module.includes.size (); i++ ) { - Include* include = module.includes[0]; + Include* include = module.includes[i]; if ( LocateIncludedFile ( include->directory, includedFilename, resolvedFilename ) ) return true; } - + /* FIXME: Ifs */ - + + for ( i = 0; i < module.project.includes.size (); i++ ) + { + Include* include = module.project.includes[i]; + if ( LocateIncludedFile ( include->directory, + includedFilename, + resolvedFilename ) ) + return true; + } + resolvedFilename = ""; return false; } SourceFile* AutomaticDependency::RetrieveFromCacheOrParse ( Module& module, - const string& filename ) + const string& filename, + SourceFile* parentSourceFile ) { SourceFile* sourceFile = sourcefile_map[filename]; if ( sourceFile == NULL ) { sourceFile = new SourceFile ( this, module, - filename ); + filename, + parentSourceFile, + false ); + sourcefile_map[filename] = sourceFile; sourceFile->Parse (); - sourcefile_map[filename] = sourceFile; } + else if ( parentSourceFile != NULL ) + sourceFile->parents.push_back ( parentSourceFile ); return sourceFile; } SourceFile* -AutomaticDependency::RetrieveFromCache ( Module& module, - const string& filename ) +AutomaticDependency::RetrieveFromCache ( const string& filename ) { return sourcefile_map[filename]; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-31 18:25:55 UTC (rev 13371) @@ -19,7 +19,8 @@ MingwBackend::MingwBackend ( Project& project ) - : Backend ( project ) + : Backend ( project ), + automaticDependencyUniqueIdCounter ( 0 ) { } @@ -240,12 +241,19 @@ fprintf ( fMakefile, "\n\t\n\n" ); } +string* +MingwBackend::GenerateAutomaticDependencyUniqueId () +{ + automaticDependencyUniqueIdCounter++; + return new string ( ssprintf ( "d%d", + automaticDependencyUniqueIdCounter ) ); +} + void -MingwBackend::GenerateAutomaticDependencies () const +MingwBackend::GenerateAutomaticDependencies () { AutomaticDependency automaticDependency ( ProjectNode ); automaticDependency.Process (); - for ( size_t mi = 0; mi < ProjectNode.modules.size (); mi++ ) { Module& module = *ProjectNode.modules[mi]; @@ -253,34 +261,110 @@ { File& file = *module.files[fi]; string normalizedFilename = NormalizeFilename ( file.name ); - SourceFile* sourceFile = automaticDependency.RetrieveFromCache ( module, - normalizedFilename ); + + SourceFile* sourceFile = automaticDependency.RetrieveFromCache ( normalizedFilename ); if ( sourceFile != NULL ) { string dependencies ( "" ); - GenerateAutomaticDependenciesForFile ( sourceFile, - dependencies ); - fprintf ( fMakefile, - "%s:: %s", - normalizedFilename.c_str (), - dependencies.c_str () ); + GenerateAutomaticDependenciesForFileCached ( sourceFile, + dependencies ); + if ( dependencies.size () > 0 ) + { + const string& objectFilename = MingwModuleHandler::GetObjectFilename ( normalizedFilename ); + string* uniqueId = automaticDependencyMap[dependencies]; + if ( uniqueId == NULL ) + { + uniqueId = GenerateAutomaticDependencyUniqueId (); + automaticDependencyMap[dependencies] = uniqueId; + fprintf ( fMakefile, + "%s = %s\n", + uniqueId->c_str (), + dependencies.c_str () ); + } + fprintf ( fMakefile, + "%s: $(%s)\n", + objectFilename.c_str (), + uniqueId->c_str () ); + } } } } } +string +MingwBackend::GetFilename ( const string& filename ) const +{ + size_t index = filename.find_last_of ( CSEP ); + if ( index == string::npos ) + return filename; + else + return filename.substr ( index + 1, filename.length () - index ); +} + void +MingwBackend::GenerateAutomaticDependenciesForFileCached ( SourceFile* sourceFile, + string& dependencies ) +{ + for ( size_t i = 0; i < sourceFile->files.size (); i++) + { + SourceFile* childSourceFile = sourceFile->files[i]; + + string* uniqueId = automaticDependencyDirectoryMap[childSourceFile->directoryPart]; + if ( uniqueId == NULL ) + { + uniqueId = GenerateAutomaticDependencyUniqueId (); + automaticDependencyDirectoryMap[childSourceFile->directoryPart] = uniqueId; + fprintf ( fMakefile, + "%s = %s\n", + uniqueId->c_str (), + childSourceFile->directoryPart.c_str () ); + } + dependencies += ssprintf ( "${%s}%s%s", + uniqueId->c_str (), + SSEP, + childSourceFile->filenamePart.c_str () ); + + string childDependencies; + if ( childSourceFile->cachedDependencies.length () > 0 ) + childDependencies = childSourceFile->cachedDependencies; + else + { + GenerateAutomaticDependenciesForFile ( childSourceFile, + childDependencies ); + if ( childDependencies.length () > 200 ) + { + childSourceFile->cachedDependencies = childDependencies; + } + } + dependencies += " " + childDependencies; + } +} + +void MingwBackend::GenerateAutomaticDependenciesForFile ( SourceFile* sourceFile, - string& dependencies ) const + string& dependencies ) { - if ( dependencies.size () > 0 ) - dependencies += " "; - dependencies += sourceFile->filename; + for ( size_t i = 0; i < sourceFile->files.size (); i++ ) + { + SourceFile* childSourceFile = sourceFile->files[i]; - for ( size_t i = 0; i < sourceFile->files.size (); i++) - { - SourceFile* childSourceFile = sourceFile->files[0]; - + if ( dependencies.length () > 0 ) + dependencies += " "; + + string* uniqueId = automaticDependencyDirectoryMap[childSourceFile->directoryPart]; + if ( uniqueId == NULL ) + { + uniqueId = GenerateAutomaticDependencyUniqueId (); + automaticDependencyDirectoryMap[childSourceFile->directoryPart] = uniqueId; + fprintf ( fMakefile, + "%s = %s\n", + uniqueId->c_str (), + childSourceFile->directoryPart.c_str () ); + } + dependencies += ssprintf ( "${%s}%s%s", + uniqueId->c_str (), + SSEP, + childSourceFile->filenamePart.c_str () ); GenerateAutomaticDependenciesForFile ( childSourceFile, dependencies ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-31 18:25:55 UTC (rev 13371) @@ -8,6 +8,7 @@ { public: MingwBackend ( Project& project ); + virtual ~MingwBackend () { }; virtual void Process (); private: void ProcessModule ( Module& module ) const; @@ -27,10 +28,19 @@ void GenerateGlobalVariables () const; bool IncludeInAllTarget ( const Module& module ) const; void GenerateAllTarget () const; - void GenerateAutomaticDependencies () const; + std::string* GenerateAutomaticDependencyUniqueId (); + void GenerateAutomaticDependencies (); + bool IsAutomaticDependencyGenerated ( SourceFile* sourceFile ); + void OutputAutomaticDependenciesForFile ( SourceFile* sourceFile ); + std::string GetFilename ( const std::string& filename ) const; + void GenerateAutomaticDependenciesForFileCached ( SourceFile* sourceFile, + std::string& dependencies ); void GenerateAutomaticDependenciesForFile ( SourceFile* sourceFile, - std::string& dependencies ) const; + std::string& dependencies ); FILE* fMakefile; + int automaticDependencyUniqueIdCounter; + std::map<std::string, std::string*> automaticDependencyMap; + std::map<std::string, std::string*> automaticDependencyDirectoryMap; }; std::string FixupTargetFilename ( const std::string& targetFilename ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-31 18:25:55 UTC (rev 13371) @@ -22,6 +22,20 @@ FILE* MingwModuleHandler::fMakefile = NULL; +string +ReplaceExtension ( const string& filename, + const string& newExtension ) +{ + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) index = 0; + string tmp = filename.substr( index, filename.size() - index ); + size_t ext_index = tmp.find_last_of( '.' ); + if (ext_index != string::npos) + return filename.substr ( 0, index + ext_index ) + newExtension; + return filename + newExtension; +} + + MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype ) { if ( !ref++ ) @@ -72,10 +86,10 @@ return "."; } -string -MingwModuleHandler::GetDirectory ( const string& filename ) const +string +MingwModuleHandler::GetDirectory ( const string& filename ) { - size_t index = filename.find_last_of ( '/' ); + size_t index = filename.find_last_of ( CSEP ); if (index == string::npos) return "."; else @@ -92,19 +106,6 @@ } string -MingwModuleHandler::ReplaceExtension ( const string& filename, - const string& newExtension ) const -{ - size_t index = filename.find_last_of ( '/' ); - if (index == string::npos) index = 0; - string tmp = filename.substr( index, filename.size() - index ); - size_t ext_index = tmp.find_last_of( '.' ); - if (ext_index != string::npos) - return filename.substr ( 0, index + ext_index ) + newExtension; - return filename + newExtension; -} - -string MingwModuleHandler::GetActualSourceFilename ( const string& filename ) const { string extension = GetExtension ( filename ); @@ -237,7 +238,7 @@ } string -MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) const +MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) { string newExtension; string extension = GetExtension ( sourceFilename ); @@ -247,9 +248,8 @@ newExtension = ".stubs.o"; else newExtension = ".o"; - return PassThruCacheDirectory ( - FixupTargetFilename ( - ReplaceExtension ( sourceFilename, newExtension ) ) ); + return FixupTargetFilename ( + ReplaceExtension ( sourceFilename, newExtension ) ); } string @@ -263,7 +263,7 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += GetObjectFilename ( module.files[i]->name ); + objectFilenames += PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( module.files[i]->name ) ); } return objectFilenames; } @@ -510,7 +510,7 @@ fprintf ( fMakefile, "%s := %s $(%s)\n", objs_macro.c_str(), - GetObjectFilename(files[i]->name).c_str(), + PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ).c_str (), objs_macro.c_str() ); } } @@ -530,7 +530,7 @@ fMakefile, "%s%s", ( i%10 == 9 ? "\\\n\t" : " " ), - GetObjectFilename(files[i]->name).c_str() ); + PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -612,7 +612,7 @@ const string& cc, const string& cflagsMacro ) const { - string objectFilename = GetObjectFilename ( sourceFilename ); + string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -631,7 +631,7 @@ const string& cc, const string& cflagsMacro ) const { - string objectFilename = GetObjectFilename ( sourceFilename ); + string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -649,7 +649,7 @@ const string& sourceFilename, const string& nasmflagsMacro ) const { - string objectFilename = GetObjectFilename ( sourceFilename ); + string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -667,7 +667,7 @@ const string& sourceFilename, const string& windresflagsMacro ) const { - string objectFilename = GetObjectFilename ( sourceFilename ); + string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -908,7 +908,7 @@ size_t i; for ( i = 0; i < files.size(); i++ ) - out.push_back ( GetObjectFilename(files[i]->name) ); + out.push_back ( PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ) ); for ( i = 0; i < ifs.size(); i++ ) GetCleanTargets ( out, ifs[i]->files, ifs[i]->ifs ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-31 18:25:55 UTC (rev 13371) @@ -3,6 +3,11 @@ #include "../backend.h" +extern std::string +ReplaceExtension ( const std::string& filename, + const std::string& newExtension ); + + class MingwModuleHandler { public: @@ -16,15 +21,13 @@ static MingwModuleHandler* LookupHandler ( const std::string& location, ModuleType moduletype_ ); virtual void Process ( const Module& module ) = 0; - void GenerateDirectoryTargets () const; - + void GenerateDirectoryTargets () const; + static std::string GetObjectFilename ( const std::string& sourceFilename ); + static std::string GetDirectory ( const std::string& filename ); protected: const std::string &PassThruCacheDirectory ( const std::string &f ) const; std::string GetWorkingDirectory () const; - std::string GetDirectory (const std::string& filename ) const; std::string GetBasename ( const std::string& filename ) const; - std::string ReplaceExtension ( const std::string& filename, - const std::string& newExtension ) const; std::string GetActualSourceFilename ( const std::string& filename ) const; std::string GetModuleArchiveFilename ( const Module& module ) const; bool IsGeneratedFile ( const File& file ) const; @@ -37,7 +40,6 @@ std::string GetSourceFilenames ( const Module& module ) const; std::string GetSourceFilenamesWithoutGeneratedFiles ( const Module& module ) const; - std::string GetObjectFilename ( const std::string& sourceFilename ) const; std::string GetObjectFilenames ( const Module& module ) const; void GenerateMacrosAndTargetsHost ( const Module& module ) const; void GenerateMacrosAndTargetsTarget ( const Module& module ) const; @@ -47,6 +49,8 @@ std::string GetInvocationDependencies ( const Module& module ) const; std::string GetInvocationParameters ( const Invoke& invoke ) const; void GenerateInvocations ( const Module& module ) const; + + std::string GetPreconditionDependenciesName ( const Module& module ) const; void GeneratePreconditionDependencies ( const Module& module ) const; std::string GetCFlagsMacro ( const Module& module ) const; std::string GetObjectsMacro ( const Module& module ) const; @@ -144,7 +148,6 @@ const std::string& ar, const std::string* clags, const std::string* nasmflags ) const; - std::string GetPreconditionDependenciesName ( const Module& module ) const; std::string GetSpecObjectDependencies ( const std::string& filename ) const; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-31 18:25:55 UTC (rev 13371) @@ -352,7 +352,9 @@ public: SourceFile ( AutomaticDependency* automaticDependency, Module& module, - const std::string& filename ); + const std::string& filename, + SourceFile* parent, + bool isNonAutomaticDependency ); SourceFile* ParseFile ( const std::string& normalizedFilename ); void Parse (); std::string Location () const; @@ -360,11 +362,21 @@ AutomaticDependency* automaticDependency; Module& module; std::string filename; + std::string filenamePart; + std::string directoryPart; + std::vector<SourceFile*> parents; /* List of files, this file is included from */ + bool isNonAutomaticDependency; + std::string cachedDependencies; private: + void GetDirectoryAndFilenameParts (); void Close (); void Open (); void SkipWhitespace (); bool ReadInclude ( std::string& filename ); + bool IsIncludedFrom ( const std::string& normalizedFilename ); + SourceFile* GetParentSourceFile (); + bool IsParentOf ( const SourceFile* parent, + const SourceFile* child ); std::string buf; const char *p; const char *end; @@ -387,9 +399,9 @@ const std::string& includedFilename, std::string& resolvedFilename ); SourceFile* RetrieveFromCacheOrParse ( Module& module, - const std::string& filename ); - SourceFile* RetrieveFromCache ( Module& module, - const std::string& filename ); + const std::string& filename, + SourceFile* parentSourceFile ); + SourceFile* RetrieveFromCache ( const std::string& filename ); private: void ProcessModule ( Module& module ); void ProcessFile ( Module& module, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-31 18:25:55 UTC (rev 13371) @@ -108,6 +108,10 @@ { public: void Run(); +private: + bool IsParentOf ( const SourceFile* parent, + const SourceFile* child ); + }; #endif /* __TEST_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h 2005-01-31 18:25:55 UTC (rev 13371) @@ -1,2 +1,3 @@ -#include <sourcefile1/sourcefile1_header3.h> +#include "sourcefile1/sourcefile1_header3.h" #include <sourcefile2/sourcefile1_dontexist.h> +#include <sourcefile1_recurse.h> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_recu rse.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_recu rse.h 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_recu rse.h 2005-01-31 18:25:55 UTC (rev 13371) @@ -0,0 +1,2 @@ +#include <sourcefile1_recurse.h> +#include <sourcefile1_header1.h> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-01-31 12:49:46 UTC (rev 13370) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-01-31 18:25:55 UTC (rev 13371) @@ -2,10 +2,48 @@ using std::string; -void SourceFileTest::Run() +bool +SourceFileTest::IsParentOf ( const SourceFile* parent, + const SourceFile* child ) { + size_t i; + for ( i = 0; i < child->parents.size (); i++ ) + { + if ( child->parents[i] != NULL ) + { + if ( child->parents[i] == parent ) + { + return true; + } + } + } + for ( i = 0; i < child->parents.size (); i++ ) + { + if ( child->parents[i] != NULL ) + { + if ( IsParentOf ( parent, + child->parents[i] ) ) + { + return true; + } + } + } + return false; +} + +void +SourceFileTest::Run () +{ const Project project ( "tests/data/automaticdependency.xml" ); AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); - ARE_EQUAL(3, automaticDependency.sourcefile_map.size()); + ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); + const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); + IS_NOT_NULL( header1 ); + const SourceFile* recurse = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1_recurse.h" ); + IS_NOT_NULL( recurse ); + IS_TRUE( IsParentOf ( header1, + recurse ) ); + IS_FALSE( IsParentOf ( recurse, + header1 ) ); }

19 years, 10 months

[ekohl] 13370: - Implement DoesUserHavePrivilege and EnablePrivilege.

by ekohl＠svn.reactos.com

- Implement DoesUserHavePrivilege and EnablePrivilege. - Fix IsUserAdmin. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-01-30 19:40:24 UTC (rev 13369) +++ trunk/reactos/include/wine/setupapi.h 2005-01-31 12:49:46 UTC (rev 13370) @@ -666,7 +666,9 @@ LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); +BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName); PWSTR WINAPI DuplicateString(PCWSTR lpSrc); +BOOL WINAPI EnablePrivilege(PCWSTR lpPrivilegeName, BOOL bEnable); void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-01-30 19:40:24 UTC (rev 13369) +++ trunk/reactos/lib/setupapi/misc.c 2005-01-31 12:49:46 UTC (rev 13370) @@ -206,12 +206,17 @@ TRACE("\n"); if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { return FALSE; + } if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) { - CloseHandle(hToken); - return FALSE; + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } } lpGroups = MyMalloc(dwSize); @@ -338,3 +343,118 @@ return lpMultiByteStr; } + + +/********************************************************************** **** + * DoesUserHavePrivilege [SETUPAPI.@] + * + * Check whether the current user has got a given privilege. + * + * PARAMS + * lpPrivilegeName [I] Name of the privilege to be checked + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI DoesUserHavePrivilege(LPCWSTR lpPrivilegeName) +{ + HANDLE hToken; + DWORD dwSize; + PTOKEN_PRIVILEGES lpPrivileges; + LUID PrivilegeLuid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("%s\n", debugstr_w(lpPrivilegeName)); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return FALSE; + + if (!GetTokenInformation(hToken, TokenPrivileges, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpPrivileges = MyMalloc(dwSize); + if (lpPrivileges == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenPrivileges, lpPrivileges, dwSize, &dwSize)) + { + MyFree(lpPrivileges); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!LookupPrivilegeValueW(NULL, lpPrivilegeName, &PrivilegeLuid)) + { + MyFree(lpPrivileges); + return FALSE; + } + + for (i = 0; i < lpPrivileges->PrivilegeCount; i++) + { + if (lpPrivileges->Privileges[i].Luid.HighPart == PrivilegeLuid.HighPart && + lpPrivileges->Privileges[i].Luid.LowPart == PrivilegeLuid.LowPart) + { + bResult = TRUE; + } + } + + MyFree(lpPrivileges); + + return bResult; +} + + +/********************************************************************** **** + * EnablePrivilege [SETUPAPI.@] + * + * Enables or disables one of the current users privileges. + * + * PARAMS + * lpPrivilegeName [I] Name of the privilege to be changed + * bEnable [I] TRUE: Enables the privilege + * FALSE: Disables the privilege + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI EnablePrivilege(LPCWSTR lpPrivilegeName, BOOL bEnable) +{ + TOKEN_PRIVILEGES Privileges; + HANDLE hToken; + BOOL bResult; + + TRACE("%s %s\n", debugstr_w(lpPrivilegeName), bEnable ? "TRUE" : "FALSE"); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return FALSE; + + Privileges.PrivilegeCount = 1; + Privileges.Privileges[0].Attributes = (bEnable) ? SE_PRIVILEGE_ENABLED : 0; + + if (!LookupPrivilegeValueW(NULL, lpPrivilegeName, + &Privileges.Privileges[0].Luid)) + { + CloseHandle(hToken); + return FALSE; + } + + bResult = AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL); + + CloseHandle(hToken); + + return bResult; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-01-30 19:40:24 UTC (rev 13369) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-01-31 12:49:46 UTC (rev 13370) @@ -197,9 +197,9 @@ @ stub DelayedMove @ stub DelimStringToMultiSz @ stub DestroyTextFileReadBuffer -@ stub DoesUserHavePrivilege +@ stdcall DoesUserHavePrivilege(wstr) @ stdcall DuplicateString(wstr) -@ stub EnablePrivilege +@ stdcall EnablePrivilege(wstr long) @ stub ExtensionPropSheetPageProc @ stub FileExists @ stub FreeStringArray

19 years, 10 months

[navaraf] 13369: Force non-inlining of ctype functions even in OPTIMIZED builds. Fixes bug #497.

by navaraf＠svn.reactos.com

Force non-inlining of ctype functions even in OPTIMIZED builds. Fixes bug #497. Modified: trunk/reactos/lib/kjs/makefile _____ Modified: trunk/reactos/lib/kjs/makefile --- trunk/reactos/lib/kjs/makefile 2005-01-30 15:27:13 UTC (rev 13368) +++ trunk/reactos/lib/kjs/makefile 2005-01-30 19:40:24 UTC (rev 13369) @@ -18,7 +18,7 @@ TARGET_NAME = kjs -TARGET_CFLAGS = -g -D__NTKJS__ -Werror -Wall -I. -Isrc -Iinclude +TARGET_CFLAGS = -g -D__NTKJS__ -D__NO_INLINE__ -Werror -Wall -I. -Isrc -Iinclude # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS

19 years, 10 months

[weiden] 13368: fixed warnings when compiling with DBG:=1 and OPTIMIZE:=1

by weiden＠svn.reactos.com

fixed warnings when compiling with DBG:=1 and OPTIMIZE:=1 Modified: trunk/reactos/lib/kjs/ksrc/ejumps.h Modified: trunk/reactos/lib/kjs/ksrc/eswitch.h Modified: trunk/reactos/lib/kjs/ksrc/eswt0.h _____ Modified: trunk/reactos/lib/kjs/ksrc/ejumps.h --- trunk/reactos/lib/kjs/ksrc/ejumps.h 2005-01-30 13:48:51 UTC (rev 13367) +++ trunk/reactos/lib/kjs/ksrc/ejumps.h 2005-01-30 15:27:13 UTC (rev 13368) @@ -1175,6 +1175,7 @@ case JS_NAN: default: nan = 1; + l = 0.0; break; } @@ -1202,6 +1203,7 @@ case JS_NAN: default: nan = 1; + r = 0.0; break; } _____ Modified: trunk/reactos/lib/kjs/ksrc/eswitch.h --- trunk/reactos/lib/kjs/ksrc/eswitch.h 2005-01-30 13:48:51 UTC (rev 13367) +++ trunk/reactos/lib/kjs/ksrc/eswitch.h 2005-01-30 15:27:13 UTC (rev 13368) @@ -1135,6 +1135,7 @@ case JS_NAN: default: nan = 1; + l = 0.0; break; } @@ -1162,6 +1163,7 @@ case JS_NAN: default: nan = 1; + r = 0.0; break; } _____ Modified: trunk/reactos/lib/kjs/ksrc/eswt0.h --- trunk/reactos/lib/kjs/ksrc/eswt0.h 2005-01-30 13:48:51 UTC (rev 13367) +++ trunk/reactos/lib/kjs/ksrc/eswt0.h 2005-01-30 15:27:13 UTC (rev 13368) @@ -1133,6 +1133,7 @@ case JS_NAN: default: nan = 1; + l = 0.0; break; } @@ -1160,6 +1161,7 @@ case JS_NAN: default: nan = 1; + r = 0.0; break; }

19 years, 10 months

[ekohl] 13367: - Implement IsUserAdmin (untested), MultiByteToUnicode and UnicodeToMultiByte.

by ekohl＠svn.reactos.com

- Implement IsUserAdmin (untested), MultiByteToUnicode and UnicodeToMultiByte. - Sort prototypes in setupapi.h. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-01-30 12:56:12 UTC (rev 13366) +++ trunk/reactos/include/wine/setupapi.h 2005-01-30 13:48:51 UTC (rev 13367) @@ -664,90 +664,26 @@ #define SPDRP_INSTALL_STATE 0x00000022 #define SPDRP_MAXIMUM_PROPERTY 0x00000023 -void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show ); -void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ); + +LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); +PWSTR WINAPI DuplicateString(PCWSTR lpSrc); +void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); +void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) -HINF WINAPI SetupOpenInfFileA( PCSTR name, PCSTR pszclass, DWORD style, UINT *error ); -HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); -#define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) -BOOL WINAPI SetupOpenAppendInfFileA( PCSTR, HINF, UINT * ); -BOOL WINAPI SetupOpenAppendInfFileW( PCWSTR, HINF, UINT * ); -#define SetupOpenAppendInfFile WINELIB_NAME_AW(SetupOpenAppendInfFile) -HINF WINAPI SetupOpenMasterInf( VOID ); +BOOL WINAPI IsUserAdmin(VOID); +PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); +VOID WINAPI MyFree(PVOID lpMem); +PVOID WINAPI MyMalloc(DWORD dwSize); +PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); +LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); +BOOL WINAPI SetupCloseFileQueue( HSPFILEQ ); void WINAPI SetupCloseInfFile( HINF hinf ); -BOOL WINAPI SetupGetLineByIndexA( HINF, PCSTR, DWORD, INFCONTEXT * ); -BOOL WINAPI SetupGetLineByIndexW( HINF, PCWSTR, DWORD, INFCONTEXT * ); -#define SetupGetLineByIndex WINELIB_NAME_AW(SetupGetLineByIndex) -LONG WINAPI SetupGetLineCountA( HINF hinf, PCSTR section ); -LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section ); -#define SetupGetLineCount WINELIB_NAME_AW(SetupGetLineCount) -BOOL WINAPI SetupFindFirstLineA( HINF hinf, PCSTR section, PCSTR key, INFCONTEXT *context ); -BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTEXT *context ); -#define SetupFindFirstLine WINELIB_NAME_AW(SetupFindFirstLine) -BOOL WINAPI SetupFindNextLine( PINFCONTEXT context_in, PINFCONTEXT context_out ); -BOOL WINAPI SetupFindNextMatchLineA( PINFCONTEXT context_in, PCSTR key, PINFCONTEXT context_out ); -BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ); -#define SetupFindNextMatchLine WINELIB_NAME_AW(SetupFindNextMatchLine) -BOOL WINAPI SetupGetLineTextA( PINFCONTEXT context, HINF hinf, PCSTR section_name,PCSTR key_name, PSTR buffer, DWORD size, PDWORD required ); -BOOL WINAPI SetupGetLineTextW( PINFCONTEXT context, HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR buffer, DWORD size, PDWORD required ); -#define SetupGetLineText WINELIB_NAME_AW(SetupGetLineText) -DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); -BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ); -BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required ); -BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required ); -#define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField) -BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, DWORD size, LPDWORD required ); -BOOL WINAPI SetupGetMultiSzFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, LPDWORD required ); -BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, LPDWORD required ); -#define SetupGetMultiSzField WINELIB_NAME_AW(SetupGetMultiSzField) -BOOL WINAPI SetupSetDirectoryIdA( HINF, DWORD, PCSTR ); -BOOL WINAPI SetupSetDirectoryIdW( HINF, DWORD, PCWSTR ); -#define SetupSetDirectoryId WINELIB_NAME_AW(SetupSetDirectoryId) -HSPFILEQ WINAPI SetupOpenFileQueue(void); -BOOL WINAPI SetupCloseFileQueue( HSPFILEQ ); -BOOL WINAPI SetupSetFileQueueAlternatePlatformA( HSPFILEQ, PSP_ALTPLATFORM_INFO, PCSTR ); -BOOL WINAPI SetupSetFileQueueAlternatePlatformW( HSPFILEQ, PSP_ALTPLATFORM_INFO, PCWSTR ); -#define SetupSetFileQueueAlternatePlatform WINELIB_NAME_AW(SetupSetFileQueueAlternatePlatform) -BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD ); -BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWST R,DWORD); -#define SetupQueueCopy WINELIB_NAME_AW(SetupQueueCopy) -BOOL WINAPI SetupQueueCopyIndirectA( PSP_FILE_COPY_PARAMS_A ); -BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W ); -#define SetupQueueCopyIndirect WINELIB_NAME_AW(SetupQueueCopyIndirect) -BOOL WINAPI SetupQueueDefaultCopyA( HSPFILEQ, HINF, PCSTR, PCSTR, PCSTR, DWORD ); -BOOL WINAPI SetupQueueDefaultCopyW( HSPFILEQ, HINF, PCWSTR, PCWSTR, PCWSTR, DWORD ); -#define SetupQueueDefaultCopy WINELIB_NAME_AW(SetupQueueDefaultCopy) -BOOL WINAPI SetupQueueDeleteA( HSPFILEQ, PCSTR, PCSTR ); -BOOL WINAPI SetupQueueDeleteW( HSPFILEQ, PCWSTR, PCWSTR ); -#define SetupQueueDelete WINELIB_NAME_AW(SetupQueueDelete) -BOOL WINAPI SetupQueueRenameA( HSPFILEQ, PCSTR, PCSTR, PCSTR, PCSTR ); -BOOL WINAPI SetupQueueRenameW( HSPFILEQ, PCWSTR, PCWSTR, PCWSTR, PCWSTR ); -#define SetupQueueRename WINELIB_NAME_AW(SetupQueueRename) BOOL WINAPI SetupCommitFileQueueA( HWND, HSPFILEQ, PSP_FILE_CALLBACK_A, PVOID ); BOOL WINAPI SetupCommitFileQueueW( HWND, HSPFILEQ, PSP_FILE_CALLBACK_W, PVOID ); #define SetupCommitFileQueue WINELIB_NAME_AW(SetupCommitFileQueue) -BOOL WINAPI SetupScanFileQueueA( HSPFILEQ, DWORD, HWND, PSP_FILE_CALLBACK_A, PVOID, PDWORD ); -BOOL WINAPI SetupScanFileQueueW( HSPFILEQ, DWORD, HWND, PSP_FILE_CALLBACK_W, PVOID, PDWORD ); -#define SetupScanFileQueue WINELIB_NAME_AW(SetupScanFileQueue) -BOOL WINAPI SetupGetFileQueueCount( HSPFILEQ, UINT, PUINT ); -BOOL WINAPI SetupGetFileQueueFlags( HSPFILEQ, PDWORD ); -BOOL WINAPI SetupSetFileQueueFlags( HSPFILEQ, DWORD, DWORD ); -BOOL WINAPI SetupQueueCopySectionA( HSPFILEQ, PCSTR, HINF, HINF, PCSTR, DWORD ); -BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ, PCWSTR, HINF, HINF, PCWSTR, DWORD ); -#define SetupQueueCopySection WINELIB_NAME_AW(SetupQueueCopySection) -BOOL WINAPI SetupQueueDeleteSectionA( HSPFILEQ, HINF, HINF, PCSTR ); -BOOL WINAPI SetupQueueDeleteSectionW( HSPFILEQ, HINF, HINF, PCWSTR ); -#define SetupQueueDeleteSection WINELIB_NAME_AW(SetupQueueDeleteSection) -BOOL WINAPI SetupQueueRenameSectionA( HSPFILEQ, HINF, HINF, PCSTR ); -BOOL WINAPI SetupQueueRenameSectionW( HSPFILEQ, HINF, HINF, PCWSTR ); -#define SetupQueueRenameSection WINELIB_NAME_AW(SetupQueueRenameSection) -PVOID WINAPI SetupInitDefaultQueueCallback( HWND ); -PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND, HWND, UINT, DWORD, PVOID ); -void WINAPI SetupTermDefaultQueueCallback( PVOID ); UINT WINAPI SetupDefaultQueueCallbackA( PVOID, UINT, UINT_PTR, UINT_PTR ); UINT WINAPI SetupDefaultQueueCallbackW( PVOID, UINT, UINT_PTR, UINT_PTR ); #define SetupDefaultQueueCallback WINELIB_NAME_AW(SetupDefaultQueueCallback) - BOOL WINAPI SetupDiBuildClassInfoList(DWORD, LPGUID, DWORD, PDWORD); BOOL WINAPI SetupDiBuildClassInfoListExA(DWORD, LPGUID, DWORD, PDWORD, PCSTR, PVOID); BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD, LPGUID, DWORD, PDWORD, PCWSTR, PVOID); @@ -795,6 +731,35 @@ HKEY WINAPI SetupDiOpenClassRegKeyExA(const GUID*, REGSAM, DWORD, PCSTR, PVOID); HKEY WINAPI SetupDiOpenClassRegKeyExW(const GUID*, REGSAM, DWORD, PCWSTR, PVOID); #define SetupDiOpenClassRegKeyEx WINELIB_NAME_AW(SetupDiOpenClassRegKeyEx) +BOOL WINAPI SetupFindFirstLineA( HINF hinf, PCSTR section, PCSTR key, INFCONTEXT *context ); +BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTEXT *context ); +#define SetupFindFirstLine WINELIB_NAME_AW(SetupFindFirstLine) +BOOL WINAPI SetupFindNextLine( PINFCONTEXT context_in, PINFCONTEXT context_out ); +BOOL WINAPI SetupFindNextMatchLineA( PINFCONTEXT context_in, PCSTR key, PINFCONTEXT context_out ); +BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ); +#define SetupFindNextMatchLine WINELIB_NAME_AW(SetupFindNextMatchLine) +BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, DWORD size, LPDWORD required ); +DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); +BOOL WINAPI SetupGetFileQueueCount( HSPFILEQ, UINT, PUINT ); +BOOL WINAPI SetupGetFileQueueFlags( HSPFILEQ, PDWORD ); +BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ); +BOOL WINAPI SetupGetLineByIndexA( HINF, PCSTR, DWORD, INFCONTEXT * ); +BOOL WINAPI SetupGetLineByIndexW( HINF, PCWSTR, DWORD, INFCONTEXT * ); +#define SetupGetLineByIndex WINELIB_NAME_AW(SetupGetLineByIndex) +LONG WINAPI SetupGetLineCountA( HINF hinf, PCSTR section ); +LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section ); +#define SetupGetLineCount WINELIB_NAME_AW(SetupGetLineCount) +BOOL WINAPI SetupGetLineTextA( PINFCONTEXT context, HINF hinf, PCSTR section_name,PCSTR key_name, PSTR buffer, DWORD size, PDWORD required ); +BOOL WINAPI SetupGetLineTextW( PINFCONTEXT context, HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR buffer, DWORD size, PDWORD required ); +#define SetupGetLineText WINELIB_NAME_AW(SetupGetLineText) +BOOL WINAPI SetupGetMultiSzFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, LPDWORD required ); +BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, LPDWORD required ); +#define SetupGetMultiSzField WINELIB_NAME_AW(SetupGetMultiSzField) +BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required ); +BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required ); +#define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField) +PVOID WINAPI SetupInitDefaultQueueCallback( HWND ); +PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND, HWND, UINT, DWORD, PVOID ); BOOL WINAPI SetupInstallFilesFromInfSectionA( HINF, HINF, HSPFILEQ, PCSTR, PCSTR, UINT ); BOOL WINAPI SetupInstallFilesFromInfSectionW( HINF, HINF, HSPFILEQ, PCWSTR, PCWSTR, UINT ); #define SetupInstallFilesFromInfSection WINELIB_NAME_AW(SetupInstallFilesFromInfSection) @@ -806,6 +771,50 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR, DWORD, PSP_FILE_CALLBACK_A, PVOID); BOOL WINAPI SetupIterateCabinetW(PCWSTR, DWORD, PSP_FILE_CALLBACK_W, PVOID); #define SetupIterateCabinet WINELIB_NAME_AW(SetupIterateCabinet) +BOOL WINAPI SetupOpenAppendInfFileA( PCSTR, HINF, UINT * ); +BOOL WINAPI SetupOpenAppendInfFileW( PCWSTR, HINF, UINT * ); +#define SetupOpenAppendInfFile WINELIB_NAME_AW(SetupOpenAppendInfFile) +HSPFILEQ WINAPI SetupOpenFileQueue(void); +HINF WINAPI SetupOpenInfFileA( PCSTR name, PCSTR pszclass, DWORD style, UINT *error ); +HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); +#define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) +HINF WINAPI SetupOpenMasterInf( VOID ); +BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD ); +BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWST R,DWORD); +#define SetupQueueCopy WINELIB_NAME_AW(SetupQueueCopy) +BOOL WINAPI SetupQueueCopyIndirectA( PSP_FILE_COPY_PARAMS_A ); +BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W ); +#define SetupQueueCopyIndirect WINELIB_NAME_AW(SetupQueueCopyIndirect) +BOOL WINAPI SetupQueueCopySectionA( HSPFILEQ, PCSTR, HINF, HINF, PCSTR, DWORD ); +BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ, PCWSTR, HINF, HINF, PCWSTR, DWORD ); +#define SetupQueueCopySection WINELIB_NAME_AW(SetupQueueCopySection) +BOOL WINAPI SetupQueueDefaultCopyA( HSPFILEQ, HINF, PCSTR, PCSTR, PCSTR, DWORD ); +BOOL WINAPI SetupQueueDefaultCopyW( HSPFILEQ, HINF, PCWSTR, PCWSTR, PCWSTR, DWORD ); +#define SetupQueueDefaultCopy WINELIB_NAME_AW(SetupQueueDefaultCopy) +BOOL WINAPI SetupQueueDeleteA( HSPFILEQ, PCSTR, PCSTR ); +BOOL WINAPI SetupQueueDeleteW( HSPFILEQ, PCWSTR, PCWSTR ); +#define SetupQueueDelete WINELIB_NAME_AW(SetupQueueDelete) +BOOL WINAPI SetupQueueDeleteSectionA( HSPFILEQ, HINF, HINF, PCSTR ); +BOOL WINAPI SetupQueueDeleteSectionW( HSPFILEQ, HINF, HINF, PCWSTR ); +#define SetupQueueDeleteSection WINELIB_NAME_AW(SetupQueueDeleteSection) +BOOL WINAPI SetupQueueRenameA( HSPFILEQ, PCSTR, PCSTR, PCSTR, PCSTR ); +BOOL WINAPI SetupQueueRenameW( HSPFILEQ, PCWSTR, PCWSTR, PCWSTR, PCWSTR ); +#define SetupQueueRename WINELIB_NAME_AW(SetupQueueRename) +BOOL WINAPI SetupQueueRenameSectionA( HSPFILEQ, HINF, HINF, PCSTR ); +BOOL WINAPI SetupQueueRenameSectionW( HSPFILEQ, HINF, HINF, PCWSTR ); +#define SetupQueueRenameSection WINELIB_NAME_AW(SetupQueueRenameSection) +BOOL WINAPI SetupScanFileQueueA( HSPFILEQ, DWORD, HWND, PSP_FILE_CALLBACK_A, PVOID, PDWORD ); +BOOL WINAPI SetupScanFileQueueW( HSPFILEQ, DWORD, HWND, PSP_FILE_CALLBACK_W, PVOID, PDWORD ); +#define SetupScanFileQueue WINELIB_NAME_AW(SetupScanFileQueue) +BOOL WINAPI SetupSetDirectoryIdA( HINF, DWORD, PCSTR ); +BOOL WINAPI SetupSetDirectoryIdW( HINF, DWORD, PCWSTR ); +#define SetupSetDirectoryId WINELIB_NAME_AW(SetupSetDirectoryId) +BOOL WINAPI SetupSetFileQueueAlternatePlatformA( HSPFILEQ, PSP_ALTPLATFORM_INFO, PCSTR ); +BOOL WINAPI SetupSetFileQueueAlternatePlatformW( HSPFILEQ, PSP_ALTPLATFORM_INFO, PCWSTR ); +#define SetupSetFileQueueAlternatePlatform WINELIB_NAME_AW(SetupSetFileQueueAlternatePlatform) +BOOL WINAPI SetupSetFileQueueFlags( HSPFILEQ, DWORD, DWORD ); +void WINAPI SetupTermDefaultQueueCallback( PVOID ); +PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage); #undef DECL_WINELIB_SETUPAPI_TYPE_AW _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-01-30 12:56:12 UTC (rev 13366) +++ trunk/reactos/lib/setupapi/misc.c 2005-01-30 13:48:51 UTC (rev 13367) @@ -28,8 +28,11 @@ #include "setupapi.h" #include "wine/unicode.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + /*********************************************************************** *** * MyFree [SETUPAPI.@] * @@ -41,9 +44,9 @@ * RETURNS * None */ - VOID WINAPI MyFree(LPVOID lpMem) { + TRACE("%p\n", lpMem); HeapFree(GetProcessHeap(), 0, lpMem); } @@ -60,9 +63,9 @@ * Success: pointer to allocated memory block * Failure: NULL */ - LPVOID WINAPI MyMalloc(DWORD dwSize) { + TRACE("%lu\n", dwSize); return HeapAlloc(GetProcessHeap(), 0, dwSize); } @@ -85,9 +88,10 @@ * If lpSrc is a NULL-pointer, then MyRealloc allocates a memory * block like MyMalloc. */ - LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize) { + TRACE("%p %lu\n", lpSrc, dwSize); + if (lpSrc == NULL) return HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -110,11 +114,12 @@ * NOTES * Call MyFree() to release the duplicated string. */ - LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc) { LPWSTR lpDst; + TRACE("%s\n", debugstr_w(lpSrc)); + lpDst = MyMalloc((lstrlenW(lpSrc) + 1) * sizeof(WCHAR)); if (lpDst == NULL) return NULL; @@ -145,7 +150,6 @@ * NOTES * Use MyFree to release the lpData buffer. */ - LONG WINAPI QueryRegistryValue(HKEY hKey, LPCWSTR lpValueName, LPBYTE *lpData, @@ -154,6 +158,9 @@ { LONG lError; + TRACE("%lx %s %p %p %p\n", + hKey, debugstr_w(lpValueName), lpData, lpType, lpcbData); + /* Get required buffer size */ *lpcbData = 0; lError = RegQueryValueExW(hKey, lpValueName, 0, lpType, NULL, lpcbData); @@ -172,3 +179,162 @@ return lError; } + + +/********************************************************************** **** + * IsUserAdmin [SETUPAPI.@] + * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI IsUserAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("\n"); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return FALSE; + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + CloseHandle(hToken); + return FALSE; + } + + lpGroups = MyMalloc(dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + MyFree(lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + MyFree(lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, &lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + MyFree(lpGroups); + + return bResult; +} + + +/********************************************************************** **** + * MultiByteToUnicode [SETUPAPI.@] + * + * Converts a multi-byte string to a Unicode string. + * + * PARAMS + * lpMultiByteStr [I] Multi-byte string to be converted + * uCodePage [I] Code page + * + * RETURNS + * Success: pointer to the converted Unicode string + * Failure: NULL + * + * NOTE + * Use MyFree to release the returned Unicode string. + */ +LPWSTR WINAPI MultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage) +{ + LPWSTR lpUnicodeStr; + int nLength; + + TRACE("%s %lu\n", debugstr_a(lpMultiByteStr), uCodePage); + + nLength = MultiByteToWideChar(uCodePage, 0, lpMultiByteStr, + -1, NULL, 0); + if (nLength == 0) + return NULL; + + lpUnicodeStr = MyMalloc(nLength * sizeof(WCHAR)); + if (lpUnicodeStr == NULL) + return NULL; + + if (!MultiByteToWideChar(uCodePage, 0, lpMultiByteStr, + nLength, lpUnicodeStr, nLength)) + { + MyFree(lpUnicodeStr); + return NULL; + } + + return lpUnicodeStr; +} + + +/********************************************************************** **** + * UnicodeToMultiByte [SETUPAPI.@] + * + * Converts a Unicode string to a multi-byte string. + * + * PARAMS + * lpUnicodeStr [I] Unicode string to be converted + * uCodePage [I] Code page + * + * RETURNS + * Success: pointer to the converted multi-byte string + * Failure: NULL + * + * NOTE + * Use MyFree to release the returned multi-byte string. + */ +LPSTR WINAPI UnicodeToMultiByte(LPCWSTR lpUnicodeStr, UINT uCodePage) +{ + LPSTR lpMultiByteStr; + int nLength; + + TRACE("%s %lu\n", debugstr_w(lpUnicodeStr), uCodePage); + + nLength = WideCharToMultiByte(uCodePage, 0, lpUnicodeStr, -1, + NULL, 0, NULL, NULL); + if (nLength == 0) + return NULL; + + lpMultiByteStr = MyMalloc(nLength); + if (lpMultiByteStr == NULL) + return NULL; + + if (!WideCharToMultiByte(uCodePage, 0, lpUnicodeStr, -1, + lpMultiByteStr, nLength, NULL, NULL)) + { + MyFree(lpMultiByteStr); + return NULL; + } + + return lpMultiByteStr; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-01-30 12:56:12 UTC (rev 13366) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-01-30 13:48:51 UTC (rev 13367) @@ -97,8 +97,6 @@ @ stub CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_List_Size_ExA @ stub CM_Get_Device_Interface_List_Size_ExW -@ stub CM_Request_Device_EjectA -@ stub CM_Request_Device_EjectW @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State @@ -164,6 +162,8 @@ @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children @ stub CM_Remove_Unmarked_Children_Ex +@ stub CM_Request_Device_EjectA +@ stub CM_Request_Device_EjectW @ stub CM_Request_Eject_PC @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex @@ -214,10 +214,10 @@ @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop @ stub InstallStopEx -@ stub IsUserAdmin +@ stdcall IsUserAdmin() @ stub LookUpStringInTable @ stub MemoryInitialize -@ stub MultiByteToUnicode +@ stdcall MultiByteToUnicode(str long) @ stub MultiSzFromSearchControl @ stdcall MyFree(ptr) @ stub MyGetFileTitle @@ -527,7 +527,7 @@ @ stub StringTableStringFromId @ stub StringTableTrim @ stub TakeOwnershipOfFile -@ stub UnicodeToMultiByte +@ stdcall UnicodeToMultiByte(wstr long) @ stub UnmapAndCloseFile @ stub VerifyCatalogFile @ stub VerifyFile

19 years, 10 months

[navaraf] 13366: Attempt to solve the imfamous WM_NCPAINT handle leak. The message handler isn't required to delete the region handle while it's also valid to delete it (eg. by calling GetDCEx with it). Thus we have to send the WM_NCPAINT message only synchronously and verify the handle after the SendMessage call.

by navaraf＠svn.reactos.com

Attempt to solve the imfamous WM_NCPAINT handle leak. The message handler isn't required to delete the region handle while it's also valid to delete it (eg. by calling GetDCEx with it). Thus we have to send the WM_NCPAINT message only synchronously and verify the handle after the SendMessage call. Modified: trunk/reactos/include/win32k/gdiobj.h Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-01-30 09:46:15 UTC (rev 13365) +++ trunk/reactos/include/win32k/gdiobj.h 2005-01-30 12:56:12 UTC (rev 13366) @@ -51,6 +51,8 @@ #define GDI_OBJECT_TYPE_MEMDC 0x00750000 #define GDI_OBJECT_TYPE_DCE 0x00770000 #define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 +/** Not really an object type. Forces GDI_FreeObj to be silent. */ +#define GDI_OBJECT_TYPE_SILENT 0x80000000 /*@}*/ typedef PVOID PGDIOBJ; _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-01-30 09:46:15 UTC (rev 13365) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-01-30 12:56:12 UTC (rev 13366) @@ -105,6 +105,11 @@ MsqDecPaintCountQueue(Window->MessageQueue); IntUnLockWindowUpdate(Window); IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); + if ((HANDLE) 1 != TempRegion && NULL != TempRegion) + { + /* NOTE: The region can already be deleted! */ + GDIOBJ_FreeObj(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SILENT); + } } if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) @@ -630,30 +635,10 @@ if (Window != NULL) { IntLockWindowUpdate(Window); - if (0 != (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) - && ((0 == MsgFilterMin && 0 == MsgFilterMax) || - (MsgFilterMin <= WM_NCPAINT && - WM_NCPAINT <= MsgFilterMax))) + + if ((MsgFilterMin == 0 && MsgFilterMax == 0) || + (MsgFilterMin <= WM_PAINT && WM_PAINT <= MsgFilterMax)) { - Message->message = WM_NCPAINT; - Message->wParam = (WPARAM)Window->NCUpdateRegion; - Message->lParam = 0; - if (Remove) - { - if ((HANDLE) 1 != Window->NCUpdateRegion && - NULL != Window->NCUpdateRegion) - { - GDIOBJ_SetOwnership(Window->NCUpdateRegion, PsGetCurrentProcess()); - } - IntValidateParent(Window, Window->NCUpdateRegion); - Window->NCUpdateRegion = NULL; - Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; - MsqDecPaintCountQueue(Window->MessageQueue); - } - } else if ((0 == MsgFilterMin && 0 == MsgFilterMax) || - (MsgFilterMin <= WM_PAINT && - WM_PAINT <= MsgFilterMax)) - { Message->message = WM_PAINT; Message->wParam = Message->lParam = 0; if (Remove && Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) @@ -737,6 +722,28 @@ NtUserHideCaret(hWnd); + if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) + { + HRGN hRgn; + + if (Window->NCUpdateRegion != (HANDLE)1 && + Window->NCUpdateRegion != NULL) + { + GDIOBJ_SetOwnership(Window->NCUpdateRegion, PsGetCurrentProcess()); + } + hRgn = Window->NCUpdateRegion; + IntValidateParent(Window, Window->NCUpdateRegion); + Window->NCUpdateRegion = NULL; + Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; + MsqDecPaintCountQueue(Window->MessageQueue); + IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); + if (hRgn != (HANDLE)1 && hRgn != NULL) + { + /* NOTE: The region can already by deleted! */ + GDIOBJ_FreeObj(hRgn, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SILENT); + } + } + RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); Ps.hdc = NtUserGetDCEx(hWnd, 0, DCX_INTERSECTUPDATE | DCX_WINDOWPAINT | DCX_USESTYLE); @@ -754,17 +761,17 @@ IntValidateParent(Window, Window->UpdateRegion); Rgn = RGNDATA_LockRgn(Window->UpdateRegion); if (NULL != Rgn) - { - UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); - RGNDATA_UnlockRgn(Window->UpdateRegion); - IntGdiOffsetRect(&Ps.rcPaint, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); - } + { + UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); + RGNDATA_UnlockRgn(Window->UpdateRegion); + IntGdiOffsetRect(&Ps.rcPaint, + Window->WindowRect.left - Window->ClientRect.left, + Window->WindowRect.top - Window->ClientRect.top); + } else - { - IntGetClientRect(Window, &Ps.rcPaint); - } + { + IntGetClientRect(Window, &Ps.rcPaint); + } GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); NtGdiDeleteObject(Window->UpdateRegion); Window->UpdateRegion = NULL; _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-01-30 09:46:15 UTC (rev 13365) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-01-30 12:56:12 UTC (rev 13366) @@ -467,6 +467,7 @@ PPAGED_LOOKASIDE_LIST LookasideList; HANDLE ProcessId, LockedProcessId, PrevProcId; LONG ExpectedType; + BOOL Silent; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -485,6 +486,9 @@ ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); + Silent = (ObjectType & GDI_OBJECT_TYPE_SILENT); + ObjectType &= ~GDI_OBJECT_TYPE_SILENT; + ExpectedType = ((ObjectType != GDI_OBJECT_TYPE_DONTCARE) ? ObjectType : 0); Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); @@ -577,17 +581,20 @@ } else { - if(((ULONG_PTR)PrevProcId & 0x1) == 0) + if(!Silent) { - DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!", hObj); - } - else - { - DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); - } + if(((ULONG_PTR)PrevProcId & ~0x1) == 0) + { + DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); + } + else + { + DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); + } #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from %s:%i\n", file, line); #endif + } } return FALSE;

19 years, 10 months

[navaraf] 13365: Don't shutdown devices before flushing registry and shutting down filesystems.

by navaraf＠svn.reactos.com

Don't shutdown devices before flushing registry and shutting down filesystems. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-01-29 22:36:52 UTC (rev 13364) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-01-30 09:46:15 UTC (rev 13365) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -45,9 +45,9 @@ /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); - IoShutdownRegisteredDevices(); CmShutdownRegistry(); IoShutdownRegisteredFileSystems(); + IoShutdownRegisteredDevices(); PiShutdownProcessManager(); MiShutdownMemoryManager();

19 years, 10 months

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 January 2005