Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mainly standardisation of makefiles. Added some exports to core libs for wine dependancies.

Browse source 
svn path=/trunk/; revision=4002
This commit is contained in:
Robert Dickenson 2003-01-15 20:05:53 +00:00
parent eb3b9049a9
commit e6a193806c
24 changed files with 428 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
reactos/apps/tests/Makefile Normal file
View file

@ -0,0 +1,85 @@
#
# ReactOS test applications makefile
#
PATH_TO_TOP = ../..
include $(PATH_TO_TOP)/rules.mak
# Test applications
# alive apc args atomtest bench consume copymove count dump_shared_data
# event file gditest hello isotest lpc mstest mutex nptest
# pteb regtest sectest shm simple thread vmtest winhello
TEST_APPS = alive apc args atomtest bench consume copymove count dump_shared_data \
event file gditest hello isotest lpc mstest mutex nptest \
pteb regtest sectest shm simple thread tokentest vmtest winhello dibtest
TEST_MISC =
all: $(TEST_APPS) $(TEST_MISC)
depends:
implib: $(TEST_APPS:%=%_implib) \
$(TEST_MISC:%=%_implib)
clean: $(TEST_APPS:%=%_clean) \
$(TEST_MISC:%=%_clean)
install: $(TEST_APPS:%=%_install) \
$(TEST_MISC:%=%_install)
dist: $(TEST_APPS:%=%_dist) \
$(TEST_MISC:%=%_dist)
.PHONY: all depends implib clean install dist
#
# Test Applications
#
$(TEST_APPS): %:
make -C $*
$(TEST_APPS:%=%_implib): %_implib:
make -C $* implib
$(TEST_APPS:%=%_clean): %_clean:
make -C $* clean
$(TEST_APPS:%=%_dist): %_dist:
make -C $* dist
$(TEST_APPS:%=%_install): %_install:
make -C $* install
.PHONY: $(TEST_APPS) $(TEST_APPS:%=%_implib) $(TEST_APPS:%=%_clean) $(TEST_APPS:%=%_install) $(TEST_APPS:%=%_dist)
#
# Misc Test Applications
#
$(TEST_MISC): %:
make -C tests/$*
$(TEST_MISC:%=%_implib): %_implib:
make -C tests/$* implib
$(TEST_MISC:%=%_clean): %_clean:
make -C tests/$* clean
$(TEST_MISC:%=%_dist): %_dist:
make -C tests/$* dist
$(TEST_MISC:%=%_install): %_install:
make -C tests/$* install
.PHONY: $(TEST_MISC) $(TEST_MISC:%=%_implib) $(TEST_MISC:%=%_clean) $(TEST_MISC:%=%_install) $(TEST_MISC:%=%_dist)
etags:
find . -name "*.[ch]" -print | etags --language=c -
# EOF

5
reactos/apps/tests/tests/GetSysMetrics/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
*.o
*.sym
*.exe
*.dsp
*.dsw

3
reactos/apps/tests/tests/GetSystemInfo/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.exe
*.o
*.sym

2
reactos/apps/tests/tests/Mutex/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
*.exe
*.sym

3
reactos/apps/tests/tests/Parent_Child/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.sym
*.exe
*.o

3
reactos/apps/tests/tests/guitest/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.exe
*.o
*.sym

3
reactos/apps/tests/tests/hello/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.exe
*.sym
*.o

3
reactos/apps/tests/tests/hello2/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.exe
*.o
*.sym

3
reactos/apps/tests/tests/new/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.exe
*.o
*.sym

3
reactos/apps/tests/tests/rolex/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.o
*.exe
*.sym

3
reactos/apps/tests/tests/volinfo/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
*.o
*.exe
*.sym

188
reactos/apps/testsets/Makefile Normal file
View file

@ -0,0 +1,188 @@
#
# ReactOS system testsets makefile
#
PATH_TO_TOP = ../..
include $(PATH_TO_TOP)/rules.mak
# Testset applications
TEST_SETS = ldr loadlib
TEST_KERNEL32 =
TEST_MSVCRT =
TEST_COM =
TEST_SEH =
TEST_REGRESSIONS =
all: $(TEST_SETS) $(TEST_KERNEL32) $(TEST_MSVCRT) $(TEST_COM) $(TEST_SEH) $(TEST_REGRESSIONS)
depends:
implib: $(TEST_SETS:%=%_implib) \
$(TEST_KERNEL32:%=%_implib) \
$(TEST_MSVCRT:%=%_implib) \
$(TEST_COM:%=%_implib) \
$(TEST_SEH:%=%_implib) \
$(TEST_REGRESSIONS:%=%_implib)
clean: $(TEST_SETS:%=%_clean) \
$(TEST_KERNEL32:%=%_clean) \
$(TEST_MSVCRT:%=%_clean) \
$(TEST_COM:%=%_clean) \
$(TEST_SEH:%=%_clean) \
$(TEST_REGRESSIONS:%=%_clean)
install: $(TEST_SETS:%=%_install) \
$(TEST_KERNEL32:%=%_install) \
$(TEST_MSVCRT:%=%_install) \
$(TEST_COM:%=%_install) \
$(TEST_SEH:%=%_install) \
$(TEST_REGRESSIONS:%=%_install)
dist: $(TEST_SETS:%=%_dist) \
$(TEST_KERNEL32:%=%_dist) \
$(TEST_MSVCRT:%=%_dist) \
$(TEST_COM:%=%_dist) \
$(TEST_SEH:%=%_dist) \
$(TEST_REGRESSIONS:%=%_dist)
.PHONY: all depends implib clean install dist
#
# Testset Applications
#
$(TEST_SETS): %:
make -C $*
$(TEST_SETS:%=%_implib): %_implib:
make -C $* implib
$(TEST_SETS:%=%_clean): %_clean:
make -C $* clean
$(TEST_SETS:%=%_dist): %_dist:
make -C $* dist
$(TEST_SETS:%=%_install): %_install:
make -C $* install
.PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install) $(TEST_SETS:%=%_dist)
#
# Kernel32 Test Applications
#
$(TEST_KERNEL32): %:
make -C kernel32/$*
$(TEST_KERNEL32:%=%_implib): %_implib:
make -C kernel32/$* implib
$(TEST_KERNEL32:%=%_clean): %_clean:
make -C kernel32/$* clean
$(TEST_KERNEL32:%=%_dist): %_dist:
make -C kernel32/$* dist
$(TEST_KERNEL32:%=%_install): %_install:
make -C kernel32/$* install
.PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install) $(TEST_KERNEL32:%=%_dist)
#
# msvcrt Test Applications
#
$(TEST_MSVCRT): %:
make -C msvcrt/$*
$(TEST_MSVCRT:%=%_implib): %_implib:
make -C msvcrt/$* implib
$(TEST_MSVCRT:%=%_clean): %_clean:
make -C msvcrt/$* clean
$(TEST_MSVCRT:%=%_dist): %_dist:
make -C msvcrt/$* dist
$(TEST_MSVCRT:%=%_install): %_install:
make -C msvcrt/$* install
.PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install) $(TEST_MSVCRT:%=%_dist)
#
# COM Test Applications
#
$(TEST_COM): %:
make -C com/$*
$(TEST_COM:%=%_implib): %_implib:
make -C com/$* implib
$(TEST_COM:%=%_clean): %_clean:
make -C com/$* clean
$(TEST_COM:%=%_dist): %_dist:
make -C com/$* dist
$(TEST_COM:%=%_install): %_install:
make -C com/$* install
.PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install) $(TEST_COM:%=%_dist)
#
# SEH Test Applications
#
$(TEST_SEH): %:
make -C seh/$*
$(TEST_SEH:%=%_implib): %_implib:
make -C seh/$* implib
$(TEST_SEH:%=%_clean): %_clean:
make -C seh/$* clean
$(TEST_SEH:%=%_dist): %_dist:
make -C seh/$* dist
$(TEST_SEH:%=%_install): %_install:
make -C seh/$* install
.PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install) $(TEST_SEH:%=%_dist)
#
# Regression Test Applications
#
$(TEST_REGRESSIONS): %:
make -C regres/$*
$(TEST_REGRESSIONS:%=%_implib): %_implib:
make -C regres/$* implib
$(TEST_REGRESSIONS:%=%_clean): %_clean:
make -C regres/$* clean
$(TEST_REGRESSIONS:%=%_dist): %_dist:
make -C regres/$* dist
$(TEST_REGRESSIONS:%=%_install): %_install:
make -C regres/$* install
.PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install) $(TEST_REGRESSIONS:%=%_dist)
etags:
find . -name "*.[ch]" -print | etags --language=c -
# EOF

4
reactos/apps/testsets/loadlib/.cvsignore
View file

@ -3,3 +3,7 @@
*.exe
*.coff
*.sym
*.dsp
*.dsw
*.ncb
*.opt

82
reactos/apps/utils/Makefile Normal file
View file

@ -0,0 +1,82 @@
#
# ReactOS system utilities makefile
#
PATH_TO_TOP = ../..
include $(PATH_TO_TOP)/rules.mak
# Console system utilities
# cabman cat net objdir partinfo pice ps sc stats
UTIL_APPS = cat objdir partinfo sc stats
UTIL_NET_APPS =
all: $(UTIL_APPS) $(UTIL_NET_APPS)
depends:
implib: $(UTIL_APPS:%=%_implib) \
$(UTIL_NET_APPS:%=%_implib)
clean: $(UTIL_APPS:%=%_clean) \
$(UTIL_NET_APPS:%=%_clean)
install: $(UTIL_APPS:%=%_install) \
$(UTIL_NET_APPS:%=%_install)
dist: $(UTIL_APPS:%=%_dist) \
$(UTIL_NET_APPS:%=%_dist)
.PHONY: all depends implib clean install dist
#
# Utility Applications
#
$(UTIL_APPS): %:
make -C $*
$(UTIL_APPS:%=%_implib): %_implib:
make -C $* implib
$(UTIL_APPS:%=%_clean): %_clean:
make -C $* clean
$(UTIL_APPS:%=%_dist): %_dist:
make -C $* dist
$(UTIL_APPS:%=%_install): %_install:
make -C $* install
.PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install) $(UTIL_APPS:%=%_dist)
#
# GUI Utility Applications
#
$(UTIL_NET_APPS): %:
make -C net/$*
$(UTIL_NET_APPS:%=%_implib): %_implib:
make -C net/$* implib
$(UTIL_NET_APPS:%=%_clean): %_clean:
make -C net/$* clean
$(UTIL_NET_APPS:%=%_dist): %_dist:
make -C net/$* dist
$(UTIL_NET_APPS:%=%_install): %_install:
make -C net/$* install
.PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install) $(UTIL_NET_APPS:%=%_dist)
etags:
find . -name "*.[ch]" -print | etags --language=c -
# EOF

7
reactos/include/defines.h
View file

@ -3572,6 +3572,7 @@ extern "C" {
#define LVS_SMALLICON (2)
#define LVS_SORTASCENDING (16)
#define LVS_SORTDESCENDING (32)
#define LVS_OWNERDATA 0x1000
#define LVS_TYPESTYLEMASK (64512)
#define LVSIL_NORMAL (0)
#define LVSIL_SMALL (1)
@ -4737,7 +4738,8 @@ DECLARE_HANDLE(HANDLE);
#endif
#ifndef __USE_W32API
#ifndef __USE_W32API
typedef enum _SC_STATUS_TYPE {
SC_STATUS_PROCESS_INFO = 0
@ -4747,7 +4749,8 @@ typedef enum _SC_ENUM_TYPE {
SC_ENUM_PROCESS_INFO = 0
} SC_ENUM_TYPE;
#endif /* !__USE_W32API */
#endif /* !__USE_W32API */
#ifdef __cplusplus
}

10
reactos/include/msvcrt/ctype.h
View file

@ -18,9 +18,9 @@
* DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.5 $
* $Revision: 1.6 $
* $Author: robd $
* $Date: 2002/11/24 18:06:00 $
* $Date: 2003/01/15 20:05:50 $
*
*/
@ -119,8 +119,10 @@ int iswspace(wint_t);
int iswupper(wint_t);
int iswxdigit(wint_t);
wchar_t towlower(wchar_t);
wchar_t towupper(wchar_t);
//wchar_t towlower(wchar_t);
//wchar_t towupper(wchar_t);
int towlower(wint_t);
int towupper(wint_t);
int isleadbyte(int);

4
reactos/lib/advapi32/advapi32.edf
View file

@ -1,4 +1,4 @@
; $Id: advapi32.edf,v 1.17 2003/01/07 17:32:58 robd Exp $
; $Id: advapi32.edf,v 1.18 2003/01/15 20:05:50 robd Exp $
;
; advapi32.edf
;
@ -174,7 +174,7 @@ GetUserNameW=GetUserNameW@8
;I_ScGetCurrentGroupStateW=I_ScGetCurrentGroupStateW@12
;I_ScSetServiceBitsA=I_ScSetServiceBitsA@20
;I_ScSetServiceBitsW=I_ScSetServiceBitsW@20
;ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
;ImpersonateNamedPipeClient=ImpersonateNamedPipeClient@4
ImpersonateSelf=ImpersonateSelf@4
InitializeAcl=InitializeAcl@12

4
reactos/lib/advapi32/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.23 2002/09/08 10:22:35 chorns Exp $
# $Id: makefile,v 1.24 2003/01/15 20:05:50 robd Exp $
PATH_TO_TOP = ../..
@ -10,7 +10,7 @@ TARGET_SDKLIBS = ntdll.a kernel32.a
# TARGET_CFLAGS = -DUNICODE
TARGET_BASE = 0x77dc0000
TARGET_BASE = 0x77DB0000
MISC_OBJECTS=\
misc/dllmain.o \

7
reactos/lib/advapi32/sec/misc.c
View file

@ -75,6 +75,13 @@ MapGenericMask(PDWORD AccessMask,
}
WINBOOL
STDCALL
ImpersonateLoggedOnUser(HANDLE hToken)
{
return FALSE;
}
BOOL STDCALL
ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
{

1
reactos/lib/kernel32/kernel32.def
View file

@ -586,6 +586,7 @@ SetLocaleInfoW@12
SetMailslotInfo@8
SetNamedPipeHandleState@16
SetPriorityClass@8
SetProcessAffinityMask@8
SetProcessShutdownParameters@8
SetProcessWorkingSetSize@12
SetStdHandle@8

3
reactos/lib/kernel32/kernel32.edf
View file

@ -1,4 +1,4 @@
; $Id: kernel32.edf,v 1.20 2003/01/07 17:29:09 robd Exp $
; $Id: kernel32.edf,v 1.21 2003/01/15 20:05:51 robd Exp $
;
; kernel32.edf
;
@ -591,6 +591,7 @@ SetLocaleInfoW=SetLocaleInfoW@12
SetMailslotInfo=SetMailslotInfo@8
SetNamedPipeHandleState=SetNamedPipeHandleState@16
SetPriorityClass=SetPriorityClass@8
SetProcessAffinityMask=SetProcessAffinityMask@8
SetProcessShutdownParameters=SetProcessShutdownParameters@8
SetProcessWorkingSetSize=SetProcessWorkingSetSize@12
SetStdHandle=SetStdHandle@8

8
reactos/lib/kernel32/process/proc.c
View file

@ -1,4 +1,4 @@
/* $Id: proc.c,v 1.48 2002/10/20 16:39:06 ekohl Exp $
/* $Id: proc.c,v 1.49 2003/01/15 20:05:52 robd Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -702,5 +702,11 @@ GetProcessVersion (DWORD ProcessId)
}
BOOL STDCALL
SetProcessAffinityMask(HANDLE hProcess, DWORD dwProcessAffinityMask)
{
return FALSE;
}
/* EOF */

6
reactos/lib/msvcrt/ctype/tolower.c
View file

@ -10,7 +10,8 @@ int tolower(int c)
}
#undef towlower
wchar_t towlower(wchar_t c)
int towlower(wint_t c)
//wchar_t towlower(wchar_t c)
{
if (iswctype (c, _UPPER))
return (c - (L'A' - L'a'));
@ -25,6 +26,9 @@ int _tolower(int c)
}
/*
int towlower(wint_t);
int towupper(wint_t);
wchar_t _towlower(wchar_t c)
{
if (iswctype (c, _UPPER))

4
reactos/lib/packet/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.3 2002/09/24 15:08:14 robd Exp $
# $Id: makefile,v 1.4 2003/01/15 20:05:52 robd Exp $
PATH_TO_TOP = ../..
@ -16,8 +16,6 @@ TARGET_OBJECTS = \
Packet32.o \
trace.o
TARGET_CLEAN = $(TARGET_OBJECTS)
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk