- Ros-dev - ReactOS.org

by Waldo Alvarez Cañizares

Hi Robert: How are you? I think that putting a little generated file won´t hurt, notice that you could add a warning like /* ======================================== this is a machine generated code modify xfile.l instead ========================================*/ I think that dealing with bison could make the build system a little more complex and remember that with the current one some people gets confused when starting. In fact lots of compilers source packages have both files in case you want to modify grammar rules the (.l .lex .y .ycc) and the .c in case you don´t have a parser generator, the gcc team does that and they are not the only ones, so seems to be a good choice. Regards Waldo Alvarez ________________________________ From: ros-dev-bounces(a)reactos.com on behalf of Robert Köpferl Sent: Wed 12/1/2004 4:16 PM To: ReactOS Development List Subject: [ros-dev] Very bad Idea. Sorry guys, but some of you never heared about (lets say) compiler and code. Never, never import generated artifacts into a VCS. The only thing allowed is doc and code (models). At a generated peace of code is not worked on (one mustn't). Instead one has to work on it's model (its source). This sadly implies that the matching tool (a compiler/transformer) must be available. As you mentioned: People will start working on generated code (baaaad). Also I hate projects where establishing a build env. seems like programming an app. But you can't ascribe everything back to Gcc as a minimum dominator. Gcc is not the high-level language to produce parsers. Try to run a make script with gcc :-/ Thus I am for adding bison to our tool list and against importing generated code (=not source). And think: Bison is litle more C++ affine than a Pascal compiler or the like. In my sight it's not harder than providing an archive which contains bison beneath mingw etc. If you want me to, I'd create that archive. Steven Edwards wrote: > Hi Alex, > > I understand everyones problem with bison and I agree with Filip, > Casper and GvG. Importing the generated C file in to CVS is fine as far > as I see it. The issue I worry about is people not submitting stuff > back toi Winehq and having thier code get lost in the merges. I have > some ideas about how to deal with this problem but I need to talk them > over with GvG, Eric, Filip and others that have done a lot of work on > ported Wine code. > > I have tried to address some of the other questions inline. > > --- Alex Ionescu <ionucu(a)videotron.ca> wrote: > >>All great points but I must ask, why should be bend our "rules" in >>order >>to be able to mingle cleanly with WINE, and why shouldn't they be the > > >>ones that should also try to be more flexible. From what you're >>saying >>(I have no personal experience to base this upon), it seems that they >>aren't trying very hard to make sure everything stays easily >>portable. I >>agree we need wine for the user dlls, but they also need our fixes to >>be >>easily implementable in their tree. > > > The Wine developers spent a year looking in to how to implement MSI you > would have come to the same answer they did and that was using bison to > generate the database was the best way to go. This is a tool that is > going to be used on Linux by Linux people for Linux people. I mean when > you talk about porting Wine you have to understand that Winelib runs on > Linux, Solaris, Mac OS/X. It does not get much more portable than that > for a Unix application. And yes its audited vs MS_VC from time to time. > I can build more of Wine with MS_VC than I can ReactOS. > > Most of the world still laughs at the ideal of ReactOS but Wine project > (and Mingw) have been one of our closest supporters. A good number of > the Wine developers lurk on this lists and try to do things to help > both projects. > > If you give a example of a real problem we have had working with them > so far then we can have that problem addressed in little to no time. > The Wine development process is a little slow but its also for all the > bad talk it gets one of the most stable and cleanest FreeSoftware > projects there is. I have never checked out Wine CVS and had the build > be broken, had a major regression that lasted more than a day or had > any problem getting a good answer as to why something could not go in > to CVS. > > >>I think the best solution is for everyone to work together, and to >>try >>to respect our project's guidelines. If they really need to do stuff >>their own way, we really need to do stuff our own way too. Maybe some > > >>sort of mega conversion tool could be built or something of the sort. >>I >>think WINE has gotten really far, but because they are such an old >>project, they are carrying a lot of cruft that needs to cleaned out >>(just like any other project). It would be unsensical to have to >>import >>such cruft (I'm not referring to Bison, but those x-level DLL >>messes). > > > This is not going to happen overnight. If you look at the revision > history of Wine you will see where Alexandre and the Wine team has > added many things to aid in our development. Supporting seperating the > Win16 and Win32 dlls in the build, adding cross-compiling support, > cleaning up the header dependancy mess in the Wine tree, removing > Wineisms/Unixisms etc.... > > An import/conversion tool would be nice and GvG started working on > making it a little less painful by adding support for Wine makefiles to > the build system. Importing some of the other Wine tools would make > things easy too such as WIDL and using the Wine headers but most of the > ReactOS does not want to do that. > > >>I don't see why the .C code would force everyone to use linux? Why >>would >>mingw32 not want to build it? Anyways, I restate, I'm against Bison > > > Sure and I am not opposed to having the generated sources imported in > the CVS. We already do this for the Wine Message Compiler that we have > used in ntoskrnl and kernel32 for years. > > Anyway if anyone has any ideas about how to make code sharing with Wine > more simple I am all ears. My patches to fix Wine building on MS_VC are > almost never rejected, ditto for the Win16/32 cleanups or anything else > that would make sharing code less of a pain. > > Thanks > Steven > > > > > __________________________________ > Do you Yahoo!? > Yahoo! Mail - Helps protect you from nasty viruses. > http://promotions.yahoo.com/new_mail > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.com > http://reactos.com:8080/mailman/listinfo/ros-dev > _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.com http://reactos.com:8080/mailman/listinfo/ros-dev

20 years, 5 months

1
0
0 0

RE: [ros-dev] HAL reorganisation

by Waldo Alvarez Cañizares

Hi Ge: Now that you talk it think that if some port is to be done that would be the ideal been a lot like the PC. IMHO the next could be a little endian well known arch. Regards Waldo ________________________________ From: ros-dev-bounces(a)reactos.com on behalf of Ge van Geldorp Sent: Tue 11/30/2004 5:21 PM To: 'ReactOS Development List' Subject: [ros-dev] HAL reorganisation As most of you know, I'm dabbling around a little bit with a port of ReactOS to the Xbox. I think most of the differences between a standard PC and the Xbox can be handled by using a custom HAL for the Xbox, after all, that's what the HAL is for. At the moment, we build 1 HAL, based on the value of MP in config it's either a UniProcessor HAL or a MultiProcessor HAL. Which code is compiled is based on preprocessor statements. I'd like to be able to build 3 HALs in parallel, the UP, MP and Xbox HALs. When installing ("make install"), the correct HAL would be selected based on the MP config var. When creating a boot cd, all three would be copied to the CD and the setup program would select the correct one to copy to the harddisk. This will allow us to build a single boot CD for different configurations. I'm aware that we'll need a NTKRNLMP.EXE on the boot CD too (I will try very very hard not to need a different kernel for Xbox) for this "single boot CD" idea to work, but that's a different problem and I'd like to tackle that later. The three HALs will share a lot of the code. To avoid code duplication, I propose to create a directory structure like this: hal | --- hal | --- halx86 | | | +----- generic | | | | | +----- include | | | +----- up | | | +----- mp | | | +----- xbox | +-- hal68k :-) | +-- etc... The "generic" subdir will contain most of the code. The "up" subdir will contain mostly simple .c files which just include a .c file from generic. For example, the HalMakeBeep() function will be defined in generic/beep.c. In "up" there will be a file beep_up.c which contains only 'include "beep.c"', which will be compiled with the include path set to "../generic". The "mp" and "xbox" directories can either include "generic" files or have their own implementation of a given routine (e.g. display_xbox.c for HalDisplay* functions on the Xbox). Doing it this way we should have little code duplication and our dependency tracking system should work. Comments? Gé van Geldorp. _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.com http://reactos.com:8080/mailman/listinfo/ros-dev

20 years, 5 months

1
0
0 0

Re: [ros-cvs] CVS Update: reactos

by Filip Navara

greatlrd(a)cvs.reactos.com wrote: >CVSROOT: /CVS/ReactOS >Module name: reactos >Repository: reactos/lib/dinput/ >Changes by: greatlrd(a)mok.osexperts.com 04/12/01 07:20:14 > >Added files: > reactos/lib/dinput/: dinput.spec.def > >Log message: > forget add file dinput.spec.def > other wise dinput will not build > > This is wrong and this file should be autogenerated. Only the dinput.spec file should be in CVS! - Filip

20 years, 5 months

2
1
0 0

RE: [ros-dev] HAL reorganisation

by Colin Burn

CXBX would not be suitable for developing ROS. CXBX doesn't try to emulate any of the hardware of an Xbox, it instead tries to convert an xbox executable (xbe) into a windows executable (exe). The conversion is done by locating DirectX calls in the xbe (Note: On an xbox the executables are directly linked to the DirectX libraries) and redirecting them appropriately under windows. -----Original Message----- From: Richard Campbell [mailto:eek2121@comcast.net] Sent: 01 December 2004 09:31 To: ReactOS Development List Subject: Re: [ros-dev] HAL reorganisation Keep in mind there is an XBOX emulator: CXBX available at http://www.caustik.com/cxbx/, that, though incomplete, runs at least 1 commercial game and might be complete enough to run an xbox port of ROS. Also, i'm sure you already know about the OpenXDK at http://www.openxdk.org/.

20 years, 5 months

2
1
0 0

Re: [ros-cvs] CVS Update: reactos

by James Tabor

weiden(a)cvs.reactos.com wrote: > CVSROOT: /CVS/ReactOS > Module name: reactos > Repository: ./ > Changes by: weiden(a)mok.osexperts.com 04/11/30 12:21:34 > > Modified files: > ./: Makefile > > Log message: > don't build msi for now as it uses a 3rd party build utility until situation is cleared > It build on a windows box, right? It worked on my wifes XP here, but it did build right? Ducken behind the desk waiting for more flamers, James

20 years, 5 months

2
1
0 0

Msi.dll was Re: working together on stdole.tlb and a end to dcom9x

by James Tabor

Wow! To complete the port for msi.dll, I need LoadTypeLib, RegisterTypeLib and ITypeLib_Release. So, is stdole32 a "32 bit" replacement for Wine typelib oleaut32 functions? I see only CreateTypeLib2 in the file. Thanks, James ps. I can compile msi w/o those functions, ha! just comment them out. So here is a patch and makefiles, just remove the "msi-" and go. Steven Edwards wrote: > Hi Sam, > --- Sam Lauber <sam124(a)operamail.com> wrote: > >>I tried it with MS mktyplib (with Wine DLLs). Strangly, it produced >>the exact same FIXMEs that the C program generated, but generated a >>diffrent typelib. And more then two bytes differed. The two typelibs >>are attached. I'll try it with InstallShield. > > > Try this one > > http://www.volny.cz/xnavara/stdole32.c > > Thanks > Steven > > Only in /root/wine/wine/dlls/msi: .cvsignore Only in /root/wine/wine/dlls/msi: CVS Only in ./: Makefile Only in ./: Makefile.ros-template diff -u /root/wine/wine/dlls/msi/action.c ./action.c --- /root/wine/wine/dlls/msi/action.c 2004-10-27 20:43:05.000000000 -0500 +++ ./action.c 2004-10-30 12:14:17.000000000 -0500 @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdio.h> +#include <fcntl.h> #define COBJMACROS @@ -39,7 +40,7 @@ #include "fdi.h" #include "msi.h" #include "msiquery.h" -#include "msvcrt/fcntl.h" +//#include "msvcrt/fcntl.h" #include "objbase.h" #include "objidl.h" #include "msipriv.h" @@ -3477,7 +3478,7 @@ continue; } - res = LoadTypeLib(package->files[index].TargetPath,&ptLib); +// res = LoadTypeLib(package->files[index].TargetPath,&ptLib); if (SUCCEEDED(res)) { WCHAR help[MAX_PATH]; @@ -3488,7 +3489,7 @@ resolve_folder(package,helpid,help,FALSE,FALSE,NULL); - res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help); +// res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help); if (!SUCCEEDED(res)) ERR("Failed to register type library %s\n", debugstr_w(package->files[index].TargetPath)); @@ -3503,8 +3504,9 @@ debugstr_w(package->files[index].TargetPath)); } - if (ptLib) - ITypeLib_Release(ptLib); + if (ptLib){ + //ITypeLib_Release(ptLib); + } } else ERR("Failed to load type library %s\n", Only in ./: patch.diff diff -u /root/wine/wine/dlls/msi/suminfo.c ./suminfo.c --- /root/wine/wine/dlls/msi/suminfo.c 2004-10-18 13:20:12.000000000 -0500 +++ ./suminfo.c 2004-10-30 00:09:12.000000000 -0500 @@ -23,6 +23,8 @@ #define COBJMACROS #define NONAMELESSUNION +#define PRSPEC_PROPID (1) + #include "windef.h" #include "winbase.h" #include "winreg.h" # $Id: Makefile,v 1.12 2004/02/25 20:00:41 sedwards Exp $ PATH_TO_TOP = ../.. TARGET_TYPE = winedll include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk # $Id: Makefile.ros-template TARGET_NAME = msi TARGET_OBJECTS = @C_SRCS@ @EXTRA_OBJS@ TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@ TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a TARGET_BASE = $(TARGET_BASE_LIB_WINMM) TARGET_RC_SRCS = @RC_SRCS@ TARGET_RC_BINSRC = @RC_BINSRC@ TARGET_RC_BINARIES = @RC_BINARIES@ TARGET_CLEAN = *.tab.c *.tab.h default: all DEP_OBJECTS = $(TARGET_OBJECTS) include $(TOOLS_PATH)/depend.mk # # Bison is requiered for building msi.dll. If MingW32 for windows, # download bison from http://gnuwin32.sourceforge.net/ # Make sure bison.exe is placed in your command path for execution. # # sql.tab.c sql.tab.h: sql.y bison -p SQL_ -d ./sql.y -o sql.tab.c cond.tab.c cond.tab.h: cond.y bison -p COND_ -d ./cond.y -o cond.tab.c

20 years, 5 months

1
0
0 0

compile failure on debian with mingw32msvc

by Damian Dimmich

Hi, Just like to let you know that the latest cvs code does not compile out of the box using mingw on a debian testing box. $i586-mingw32msvc-cc --version i586-mingw32msvc-cc (GCC) 3.4.2 (mingw-special) The problem is some functions are re-declared in the string.h (line 169, wchar_t() ) and stdio.h (line 269, putwc() )files. Also the loadlib.c test file failed to compile since it was not including stdlib.h and could not find the mbstowcs function. This is the latest cvs code from 5:30'ish GMT. Cheers, Damian output from cvs diff: Index: apps/testsets/loadlib/loadlib.c =================================================================== RCS file: /CVS/ReactOS/reactos/apps/testsets/loadlib/loadlib.c,v retrieving revision 1.2 diff -r1.2 loadlib.c 26a27 > #include <stdlib.h> Index: include/msvcrt/stdio.h =================================================================== RCS file: /CVS/ReactOS/reactos/include/msvcrt/stdio.h,v retrieving revision 1.8 diff -r1.8 stdio.h 269c269 < int putwc(wint_t wc, FILE* fileWrite); --- > //int putwc(wint_t wc, FILE* fileWrite); Index: include/msvcrt/string.h =================================================================== RCS file: /CVS/ReactOS/reactos/include/msvcrt/string.h,v retrieving revision 1.6 diff -r1.6 string.h 169c169 < wchar_t* wcsdup(const wchar_t* wsToDuplicate); --- > //wchar_t* wcsdup(const wchar_t* wsToDuplicate);

20 years, 5 months

1
0
0 0

ELF mapping support for ntoskrnl, for anybody who is interested (untested)

by Gregor Anich

Hi! I have attached a elf.h file (to be put into the toplevel include directory) with ELF structures/constants and a patch for ntoskrnl/mm/section.c which should add support for mapping ELF files with NtCreateSection. It is completly untested I think. We also have to port a runtime linker (rtld) - it has to be statically linked/use only syscalls because if an ELF file contains an interpreter name (on linux something like /lib/rtld-elf.so) the kernel usually maps the interpreter instead (or additionally) and begins execution at the interpreter's entry point, passing it a file handle or the base address of the file to be linked & ran and the interpreter does the rest. - blight #ifndef __INCLUDE_ELF_H #define __INCLUDE_ELF_H #ifdef __64BITS__ /* FIXME: how to check for 64 bits? */ # define ELF_ARCH_SIZE 64 #else # define ELF_ARCH_SIZE 32 #endif /* 32-bit data types */ typedef unsigned long ELF32_ADDR; /* Unsigned program address */ typedef unsigned short ELF32_HALF; /* Unsigned medium integer */ typedef unsigned long ELF32_OFF; /* Unsigned file offset */ typedef unsigned long ELF32_SWORD; /* Signed large integer */ typedef unsigned long ELF32_WORD; /* Unsigned large integer */ typedef ELF32_OFF ELF32_HASHELT; /* Hash element? */ /* Elf data encodings */ #define IMAGE_ELF_DATA_NONE 0 /* Invalid data encoding */ #define IMAGE_ELF_DATA_2LSB 1 /* 2's complement, LSB first */ #define IMAGE_ELF_DATA_2MSB 2 /* 2's complement, MSB first */ /* Elf object file types */ #define IMAGE_ELF_TYPE_NONE 0 /* No file type */ #define IMAGE_ELF_TYPE_REL 1 /* Relocatable file */ #define IMAGE_ELF_TYPE_EXEC 2 /* Executable file */ #define IMAGE_ELF_TYPE_DYN 3 /* Shared object file */ #define IMAGE_ELF_TYPE_CORE 4 /* Core file */ /* Elf machines */ #define IMAGE_ELF_MACHINE_NONE 0 /* No machine */ #define IMAGE_ELF_MACHINE_M32 1 /* AT&T WE 32100 */ #define IMAGE_ELF_MACHINE_SPARC 2 /* SPARC */ #define IMAGE_ELF_MACHINE_386 3 /* Intel 80386 */ #define IMAGE_ELF_MACHINE_68K 4 /* Motorola 68000 */ #define IMAGE_ELF_MACHINE_88K 5 /* Motorola 88000 */ /* 6 is reserved */ #define IMAGE_ELF_MACHINE_860 7 /* Intel 80860 */ #define IMAGE_ELF_MACHINE_MIPS 8 /* MIPS RS3000 (MIPS I) */ #define IMAGE_ELF_MACHINE_S370 9 /* IBM System/370 Processor */ #define IMAGE_ELF_MACHINE_MIPS_RS3_LE 10 /* MIPS RS3000 Little-endian */ /* 11-14 are reserved */ #define IMAGE_ELF_MACHINE_PARISC 15 /* Hewlett-Packard PA-RISC */ /* 16 is reserved */ #define IMAGE_ELF_MACHINE_VPP500 17 /* Fujitsu VPP500 */ #define IMAGE_ELF_MACHINE_SPARC32PLUS 18 /* Enhanced instruction set SPARC */ #define IMAGE_ELF_MACHINE_960 19 /* Intel 80960 */ #define IMAGE_ELF_MACHINE_PPC 20 /* PowerPC */ #define IMAGE_ELF_MACHINE_PPC64 21 /* 64-bit PowerPC */ /* 22-35 are reserved */ #define IMAGE_ELF_MACHINE_V800 36 /* NEC V800 */ #define IMAGE_ELF_MACHINE_FR20 37 /* Fujitsu FR20 */ #define IMAGE_ELF_MACHINE_RH32 38 /* TRW RH-32 */ #define IMAGE_ELF_MACHINE_RCE 39 /* Motorola RCE */ #define IMAGE_ELF_MACHINE_ARM 40 /* Advanced RISC Machines ARM */ #define IMAGE_ELF_MACHINE_ALPHA 41 /* Digital Alpha */ #define IMAGE_ELF_MACHINE_SH 42 /* Hitachi SH */ #define IMAGE_ELF_MACHINE_SPARCV9 43 /* SPARC Version 9 */ #define IMAGE_ELF_MACHINE_TRICORE 44 /* Siemens Tricore embedded processor */ #define IMAGE_ELF_MACHINE_ARC 45 /* Argonaut RISC Core, Argonaut Technologies Inc. */ #define IMAGE_ELF_MACHINE_H8_300 46 /* Hitachi H8/300 */ #define IMAGE_ELF_MACHINE_H8_300H 47 /* Hitachi H8/300H */ #define IMAGE_ELF_MACHINE_H8S 48 /* Hitachi H8S */ #define IMAGE_ELF_MACHINE_H8_500 49 /* Hitachi H8/500 */ #define IMAGE_ELF_MACHINE_IA_64 50 /* Intel IA-64 processor architecture */ #define IMAGE_ELF_MACHINE_MIPS_X 51 /* Stanford MIPS-X */ #define IMAGE_ELF_MACHINE_COLDFIRE 52 /* Motorola ColdFire */ #define IMAGE_ELF_MACHINE_68HC12 53 /* Motorola M68HC12 */ #define IMAGE_ELF_MACHINE_MMA 54 /* Fujitsu MMA Multimedia Accelerator */ #define IMAGE_ELF_MACHINE_PCP 55 /* Siemens PCP */ #define IMAGE_ELF_MACHINE_NCPU 56 /* Sony nCPU embedded RISC processor */ #define IMAGE_ELF_MACHINE_NDR1 57 /* Denso NDR1 microprocessor */ #define IMAGE_ELF_MACHINE_STARCORE 58 /* Motorola Star*Core processor */ #define IMAGE_ELF_MACHINE_ME16 59 /* Toyota ME16 processor */ #define IMAGE_ELF_MACHINE_ST100 60 /* STMicroelectronics ST100 processor */ #define IMAGE_ELF_MACHINE_TINYJ 61 /* Advanced Logic Corp. TinyJ embedded processor family */ /* 62-65 are reserved */ #define IMAGE_ELF_MACHINE_FX66 66 /* Siemens FX66 microcontroller */ #define IMAGE_ELF_MACHINE_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 bit microcontroller */ #define IMAGE_ELF_MACHINE_ST7 68 /* STMicroelectronics ST7 8-bit microcontroller */ #define IMAGE_ELF_MACHINE_68HC16 69 /* Motorola MC68HC16 Microcontroller */ #define IMAGE_ELF_MACHINE_68HC11 70 /* Motorola MC68HC11 Microcontroller */ #define IMAGE_ELF_MACHINE_68HC08 71 /* Motorola MC68HC08 Microcontroller */ #define IMAGE_ELF_MACHINE_68HC05 72 /* Motorola MC68HC05 Microcontroller */ #define IMAGE_ELF_MACHINE_SVX 73 /* Silicon Graphics SVx */ #define IMAGE_ELF_MACHINE_ST19 74 /* STMicroelectronics ST19 8-bit microcontroller */ #define IMAGE_ELF_MACHINE_VAX 75 /* Digital VAX */ #define IMAGE_ELF_MACHINE_CRIS 76 /* Axis Communications 32-bit embedded processor */ #define IMAGE_ELF_MACHINE_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ #define IMAGE_ELF_MACHINE_FIREPATH 78 /* Element 14 64-bit DSP Processor */ #define IMAGE_ELF_MACHINE_ZSP 79 /* LSI Logic 16-bit DSP Processor */ #define IMAGE_ELF_MACHINE_MMIX 80 /* Donald Knuth's educational 64-bit processor */ #define IMAGE_ELF_MACHINE_HUANY 81 /* Harvard University machine-independent object files */ #define IMAGE_ELF_MACHINE_PRISM 82 /* SiTera Prism */ #define IMAGE_ELF_MACHINE_AVR 83 /* Atmel AVR 8-bit microcontroller */ #define IMAGE_ELF_MACHINE_FR30 84 /* Fujitsu FR30 */ #define IMAGE_ELF_MACHINE_D10V 85 /* Mitsubishi D10V */ #define IMAGE_ELF_MACHINE_D30V 86 /* Mitsubishi D30V */ #define IMAGE_ELF_MACHINE_V850 87 /* NEC v850 */ #define IMAGE_ELF_MACHINE_M32R 88 /* Mitsubishi M32R */ #define IMAGE_ELF_MACHINE_MN10300 89 /* Matsushita MN10300 */ #define IMAGE_ELF_MACHINE_MN10200 90 /* Matsushita MN10200 */ #define IMAGE_ELF_MACHINE_PJ 91 /* picoJava */ #define IMAGE_ELF_MACHINE_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ /* Elf versions */ #define IMAGE_ELF_VERSION_NONE 0 /* Invalid version */ #define IMAGE_ELF_VERSION_CURRENT 1 /* Current version */ /* Elf identification */ #define IMAGE_ELF_SIZEOF_IDENT 16 #define IMAGE_ELF_IDENT_MAGIC0 0 /* Magic */ #define IMAGE_ELF_IDENT_MAGIC1 1 #define IMAGE_ELF_IDENT_MAGIC2 2 #define IMAGE_ELF_IDENT_MAGIC3 3 #define IMAGE_ELF_IDENT_CLASS 4 /* File class */ #define IMAGE_ELF_IDENT_DATA 5 /* Data encoding */ #define IMAGE_ELF_IDENT_VERSION 6 /* File version */ #define IMAGE_ELF_IDENT_OSABI 7 /* Operating system/ABI identification */ #define IMAGE_ELF_IDENT_ABIVERSION 8 /* ABI version */ #define IMAGE_ELF_IDENT_PAD 9 /* Start of padding bytes */ /* Magic numbers */ #define IMAGE_ELF_MAGIC0 0x7f #define IMAGE_ELF_MAGIC1 'E' #define IMAGE_ELF_MAGIC2 'L' #define IMAGE_ELF_MAGIC3 'F' /* Elf file classes */ #define IMAGE_ELF_CLASS_NONE 0 /* Invalid class */ #define IMAGE_ELF_CLASS_32 1 /* 32-bit object */ #define IMAGE_ELF_CLASS_64 2 /* 64-bit object */ /* Check elf magic */ #define IMAGE_IS_ELF(hdr) ((hdr).Ident[IMAGE_ELF_IDENT_MAGIC0] == IMAGE_ELF_MAGIC0 && \ (hdr).Ident[IMAGE_ELF_IDENT_MAGIC1] == IMAGE_ELF_MAGIC1 && \ (hdr).Ident[IMAGE_ELF_IDENT_MAGIC2] == IMAGE_ELF_MAGIC2 && \ (hdr).Ident[IMAGE_ELF_IDENT_MAGIC3] == IMAGE_ELF_MAGIC3) /* 32-bit Elf header */ typedef struct _IMAGE_ELF32_HEADER { unsigned char Ident[IMAGE_ELF_SIZEOF_IDENT]; /* Identification */ ELF32_HALF Type; /* Object file type */ ELF32_HALF Machine; /* Required architecture */ ELF32_WORD Version; /* Object file version */ ELF32_ADDR Entry; /* Virtual address of entry point */ ELF32_OFF PhOff; /* Program header table offset in file */ ELF32_OFF ShOff; /* Section header offset in file */ ELF32_WORD Flags; /* Processor specific flags - zero for SPARC and x86 */ ELF32_HALF EhSize; /* Elf header size in bytes (this struct) */ ELF32_HALF PhEntSize; /* Size of an entry in the program header table */ ELF32_HALF PhNum; /* Number of entries in the program header table */ ELF32_HALF ShEntSize; /* Size of an entry in the section header table */ ELF32_HALF ShNum; /* Number of entries in the section header table */ ELF32_HALF ShStrNdx; /* Index into the section header table for the entry of the section name string table */ } IMAGE_ELF32_HEADER, *PIMAGE_ELF32_HEADER; /* Special section indexes */ #define IMAGE_ELF_SECTION_INDEX_UNDEF 0 /*#define IMAGE_ELF_SECTION_INDEX_LORESERVE 0xff00 #define IMAGE_ELF_SECTION_INDEX_LOPROC 0xff00 #define IMAGE_ELF_SECTION_INDEX_HIPROC 0xff1f*/ #define IMAGE_ELF_SECTION_INDEX_ABS 0xfff1 #define IMAGE_ELF_SECTION_INDEX_COMMON 0xfff2 /*#define IMAGE_ELF_SECTION_INDEX_HIRESERVE 0xffff*/ /* Section types */ #define IMAGE_ELF_SECTION_TYPE_NULL 0 /* Incactive section header */ #define IMAGE_ELF_SECTION_TYPE_PROGBITS 1 /* Program defined section */ #define IMAGE_ELF_SECTION_TYPE_SYMTAB 2 /* Symbol table (for link editing) */ #define IMAGE_ELF_SECTION_TYPE_STRTAB 3 /* String table */ #define IMAGE_ELF_SECTION_TYPE_RELA 4 /* Relocation table (with explicit addends) */ #define IMAGE_ELF_SECTION_TYPE_HASH 5 /* Symbol hash table */ #define IMAGE_ELF_SECTION_TYPE_DYNAMIC 6 /* Information for dynamic linking */ #define IMAGE_ELF_SECTION_TYPE_NOTE 7 /* Note section ;-) */ #define IMAGE_ELF_SECTION_TYPE_NOBITS 8 /* Occupies no space in the file, otherwise like PROGBITS */ #define IMAGE_ELF_SECTION_TYPE_REL 9 /* Relocation table (without explicit addends) */ #define IMAGE_ELF_SECTION_TYPE_SHLIB 10 /* Reserved, unspecified */ #define IMAGE_ELF_SECTION_TYPE_DYNSYM 11 /* Symbol table (for dynamic linking) */ /*#define IMAGE_ELF_SECTION_TYPE_LOPROC 0x70000000 #define IMAGE_ELF_SECTION_TYPE_HIPROC 0x7fffffff #define IMAGE_ELF_SECTION_TYPE_LOUSER 0x80000000 #define IMAGE_ELF_SECTION_TYPE_HIUSER 0xffffffff*/ /* Section flags/attributes */ #define SHF_WRITE 0x1 /* Section must be writeable */ #define SHF_ALLOC 0x2 /* Section must be loaded/mapped into memory */ #define SHF_EXECINSTR 0x4 /* The section contains executable code */ /*#define SHF_MASKPROC 0xf0000000*/ /* 32-bit Section header entry */ typedef struct _IMAGE_ELF32_SECTION_HEADER { ELF32_WORD Name; /* Name of the section (index into the section header string table) */ ELF32_WORD Type; /* Type of section */ ELF32_WORD Flags; /* Attributes */ ELF32_ADDR Addr; /* Virtual address to load section at */ ELF32_OFF Offset; /* Offset into the file of the section's data */ ELF32_WORD Size; /* Size of the section */ ELF32_WORD Link; /* Section header table index link... */ ELF32_WORD Info; /* Extra information... */ ELF32_WORD AddrAlign; /* Required alignment */ ELF32_WORD EntSize; /* Size of entries in the table */ } IMAGE_ELF32_SECTION_HEADER, *PIMAGE_ELF32_SECTION_HEADER; /* Symbol table indexes */ #define IMAGE_ELF_SYMBOL_INDEX_UNDEF 0 /* Undefined symbol */ /* Symbol binding/types */ #define IMAGE_ELF32_SYMBOL_BIND(Info) ((Info) >> 4) #define IMAGE_ELF32_SYMBOL_TYPE(Info) ((Info) & 0x0f) #define IMAGE_ELF32_SYMBOL_INFO(Bind, Type) (((Bind) << 4) | ((Type) & 0x0f)) #define IMAGE_ELF_SYMBOL_BINDING_LOCAL 0 /* Local ("static") symbol */ #define IMAGE_ELF_SYMBOL_BINDING_GLOBAL 1 /* Global symbol */ #define IMAGE_ELF_SYMBOL_BINDING_WEAK 2 /* Weak symbol... */ /*#define IMAGE_ELF_SYMBOL_BINDING_LOPROC 13 #define IMAGE_ELF_SYMBOL_BINDING_HIPROC 15*/ #define IMAGE_ELF_SYMBOL_TYPE_NOTYPE 0 /* Unspecified symbol type */ #define IMAGE_ELF_SYMBOL_TYPE_OBJECT 1 /* Data object (i.e. an array, variable, ...) */ #define IMAGE_ELF_SYMBOL_TYPE_FUNC 2 /* Function (or other executable code) */ #define IMAGE_ELF_SYMBOL_TYPE_SECTION 3 /* Symbol for relocating (usually has local binding) */ #define IMAGE_ELF_SYMBOL_TYPE_FILE 4 /* Name of the associated source file */ #define IMAGE_ELF_SYMBOL_TYPE_LOPROC 13 #define IMAGE_ELF_SYMBOL_TYPE_HIPROC 15 /* 32-bit Symbol entry */ typedef struct _IMAGE_ELF32_SYMBOL { ELF32_WORD Name; /* Symbol name (index into the symbol string table) */ ELF32_ADDR Value; /* Value of symbol */ ELF32_WORD Size; /* Size of symbol (0 means unknown) */ unsigned char Info; /* Type and binding attributes */ unsigned char Other; /* Unused - 0 */ ELF32_HALF Shndx; /* Section index */ } IMAGE_ELF32_SYMBOL, *PIMAGE_ELF32_SYMBOL; /* Relocation macros */ #define IMAGE_ELF32_RELOC_SYM(Info) ((Info) >> 8) #define IMAGE_ELF32_RELOC_TYPE(Info) ((unsigned char)(Info)) #define IMAGE_ELF32_RELOC_INFO(Sym,Type) (((Sym) << 8) | (unsigned char)(Type)) /* 386 Relocation types */ #define IMAGE_ELF_RELOC_386_NONE 0 /* none */ #define IMAGE_ELF_RELOC_386_32 1 #define IMAGE_ELF_RELOC_386_PC32 2 #define IMAGE_ELF_RELOC_386_GOT32 3 #define IMAGE_ELF_RELOC_386_PLT32 4 #define IMAGE_ELF_RELOC_386_COPY 5 #define IMAGE_ELF_RELOC_386_GLOB_DAT 6 #define IMAGE_ELF_RELOC_386_JMP_SLOT 7 #define IMAGE_ELF_RELOC_386_RELATIVE 8 #define IMAGE_ELF_RELOC_386_GOTOFF 9 #define IMAGE_ELF_RELOC_386_GOTPC 10 /* 386 TLS Relocation types */ #define IMAGE_ELF_RELOC_386_TLS_GD_PLT 12 #define IMAGE_ELF_RELOC_386_TLS_LDM_PLT 13 #define IMAGE_ELF_RELOC_386_TLS_TPOFF 14 #define IMAGE_ELF_RELOC_386_TLS_IE 15 #define IMAGE_ELF_RELOC_386_TLS_GOTIE 16 #define IMAGE_ELF_RELOC_386_TLS_LE 17 #define IMAGE_ELF_RELOC_386_TLS_GD 18 #define IMAGE_ELF_RELOC_386_TLS_LDM 19 #define IMAGE_ELF_RELOC_386_TLS_LDO_32 32 #define IMAGE_ELF_RELOC_386_TLS_DTPMOD32 35 #define IMAGE_ELF_RELOC_386_TLS_DTPOFF32 36 /* 32-bit Relocation entries */ typedef struct _IMAGE_ELF32_RELOC { ELF32_ADDR Offset; /* Section offset/virtual address */ ELF32_WORD Info; /* Symbol table index/relocation type */ } IMAGE_ELF32_RELOC, *PIMAGE_ELF32_RELOC; typedef struct _IMAGE_ELF32_RELOCA { ELF32_ADDR Offset; /* Section offset/virtual address */ ELF32_WORD Info; /* Symbol table index/relocation type */ ELF32_SWORD Addend; /* Addend */ } IMAGE_ELF32_RELOCA, *PIMAGE_ELF32_RELOCA; /* Program header/segment types */ #define IMAGE_ELF_SEGMENT_TYPE_NULL 0 /* Unused array entry */ #define IMAGE_ELF_SEGMENT_TYPE_LOAD 1 /* Loadable segment */ #define IMAGE_ELF_SEGMENT_TYPE_DYNAMIC 2 /* Dynamic linking info... */ #define IMAGE_ELF_SEGMENT_TYPE_INTERP 3 /* Interpreter */ #define IMAGE_ELF_SEGMENT_TYPE_NOTE 4 /* Note... */ #define IMAGE_ELF_SEGMENT_TYPE_SHLIB 5 /* Reserved but unspecified */ #define IMAGE_ELF_SEGMENT_TYPE_PHDR 6 /* Program header table */ #define IMAGE_ELF_SEGMENT_TYPE_TLS 7 /* Thread local storage */ #define IMAGE_ELF_SEGMENT_TYPE_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ #define IMAGE_ELF_SEGMENT_TYPE_GNU_STACK 0x6474e551 /* Indicates stack executability */ /*#define IMAGE_ELF_SEGMENT_TYPE_LOPROC 0x70000000 #define IMAGE_ELF_SEGMENT_TYPE_HIPROC 0x7fffffff*/ /* Program header/segment flags */ #define IMAGE_ELF_SEGMENT_FLAG_EXEC 0x01 #define IMAGE_ELF_SEGMENT_FLAG_WRITE 0x02 #define IMAGE_ELF_SEGMENT_FLAG_READ 0x04 /*#define IMAGE_ELF_SEGMENT_FLAG_MASKPROC 0xf0000000*/ /* 32-bit Program header entry */ typedef struct _IMAGE_ELF32_PROGRAM_HEADER { ELF32_WORD Type; /* Type of segment */ ELF32_OFF Offset; /* File offset of segment data */ ELF32_ADDR VAddr; /* Virtual address to load segment at */ ELF32_ADDR PAddr; /* Physical address to load segment at */ ELF32_WORD FileSz; /* Size in file of segment */ ELF32_WORD MemSz; /* Size in memory of segment */ ELF32_WORD Flags; /* Flags of segment */ ELF32_WORD Align; /* Required alignment */ } IMAGE_ELF32_PROGRAM_HEADER, *PIMAGE_ELF32_PROGRAM_HEADER; /* Dynamic array tags */ #define IMAGE_ELF_DYNAMIC_TAG_NULL 0 /* End of array */ #define IMAGE_ELF_DYNAMIC_TAG_NEEDED 1 /* Dependency */ #define IMAGE_ELF_DYNAMIC_TAG_PLTRELSZ 2 /* Size in bytes of the relocation entries associated with the plt */ #define IMAGE_ELF_DYNAMIC_TAG_PLTGOT 3 /* Address associated with got/plt */ #define IMAGE_ELF_DYNAMIC_TAG_HASH 4 /* Hash table for symbol table indicated by SYMTAB */ #define IMAGE_ELF_DYNAMIC_TAG_STRTAB 5 /* Address of string table */ #define IMAGE_ELF_DYNAMIC_TAG_SYMTAB 6 /* Address of the symbol table */ #define IMAGE_ELF_DYNAMIC_TAG_RELA 7 /* Address of reloc table with addends */ #define IMAGE_ELF_DYNAMIC_TAG_RELASZ 8 /* Size of reloc table in bytes */ #define IMAGE_ELF_DYNAMIC_TAG_RELAENT 9 /* Size of reloc table entry in bytes? */ #define IMAGE_ELF_DYNAMIC_TAG_STRSZ 10 /* Size of the string table in bytes */ #define IMAGE_ELF_DYNAMIC_TAG_SYMENT 11 /* Size of symbol table entry in bytes */ #define IMAGE_ELF_DYNAMIC_TAG_INIT 12 /* Address of initialization function */ #define IMAGE_ELF_DYNAMIC_TAG_FINI 13 /* Address of termination function */ #define IMAGE_ELF_DYNAMIC_TAG_SONAME 14 /* Name of the shared object (string table offset) */ #define IMAGE_ELF_DYNAMIC_TAG_RPATH 15 /* Library search path (string table offset) */ #define IMAGE_ELF_DYNAMIC_TAG_SYMBOLIC 16 /* Alter runtime-linkers symbol resolution... */ #define IMAGE_ELF_DYNAMIC_TAG_REL 17 /* Address of reloc table without addends */ #define IMAGE_ELF_DYNAMIC_TAG_RELSZ 18 /* Size of reloc table in bytes */ #define IMAGE_ELF_DYNAMIC_TAG_RELENT 19 /* Size of reloc table entry in bytes? */ #define IMAGE_ELF_DYNAMIC_TAG_PLTREL 20 /* Type of relocation entry for plt (...TAG_REL or ...TAG_RELA) */ #define IMAGE_ELF_DYNAMIC_TAG_DEBUG 21 /* Used for debugging */ #define IMAGE_ELF_DYNAMIC_TAG_TEXTREL 22 /* If present informs the linker that a relocation might update a non-writable segment */ #define IMAGE_ELF_DYNAMIC_TAG_JMPREL 23 /* Address of relocation entries associated solely with the plt */ #define IMAGE_ELF_DYNAMIC_TAG_FILTER 24 /* Specifies the name of a shared objects for which this one acts as a filter */ #define IMAGE_ELF_DYNAMIC_TAG_RUNPATH 29 /* String table offset of a null-terminated library search path string. */ #define IMAGE_ELF_DYNAMIC_TAG_FLAGS 30 /* Object specific flag values. */ /* Dynamic flags (for IMAGE_ELF_DYNAMIC_TAG_FLAGS) */ #define IMAGE_ELF_DYNAMIC_FLAG_ORIGIN 0x0001 /* Indicates that the object being loaded may make reference to the $ORIGIN substitution string.*/ #define IMAGE_ELF_DYNAMIC_FLAG_SYMBOLIC 0x0002 /* Indicates "symbolic" linking. */ #define IMAGE_ELF_DYNAMIC_FLAG_TEXTREL 0x0004 /* Indicates there may be relocations in non-writable segments. */ #define IMAGE_ELF_DYNAMIC_FLAG_BIND_NOW 0x0008 /* Indicates that the dynamic linker should process all relocations for the object containing this entry before transferring control to the program. */ #define IMAGE_ELF_DYNAMIC_FLAG_STATIC_TLS 0x0010 /* Indicates that the shared object or executable contains code using a static thread-local storage scheme. */ /* Dynamic array entry */ typedef struct _IMAGE_ELF32_DYNAMIC { ELF32_SWORD Tag; union { ELF32_WORD Val; ELF32_ADDR Ptr; } Un; } IMAGE_ELF32_DYNAMIC, *PIMAGE_ELF32_DYNAMIC; /* Auxiliary types */ #define IMAGE_ELF_AUX_TYPE_NULL 0 /* Terminates the vector. */ #define IMAGE_ELF_AUX_TYPE_IGNORE 1 /* Ignored entry. */ #define IMAGE_ELF_AUX_TYPE_EXECFD 2 /* File descriptor of program to load. */ #define IMAGE_ELF_AUX_TYPE_PHDR 3 /* Program header of program already loaded. */ #define IMAGE_ELF_AUX_TYPE_PHENT 4 /* Size of each program header entry. */ #define IMAGE_ELF_AUX_TYPE_PHNUM 5 /* Number of program header entries. */ #define IMAGE_ELF_AUX_TYPE_PAGESZ 6 /* Page size in bytes. */ #define IMAGE_ELF_AUX_TYPE_BASE 7 /* Interpreter's base address. */ #define IMAGE_ELF_AUX_TYPE_FLAGS 8 /* Flags (unused for i386). */ #define IMAGE_ELF_AUX_TYPE_ENTRY 9 /* Where interpreter should transfer control. */ /* * The following non-standard values are used for passing information * from John Polstra's testbed program to the dynamic linker. These * are expected to go away soon. * * Unfortunately, these overlap the Linux non-standard values, so they * must not be used in the same context. */ #define IMAGE_ELF_AUX_TYPE_BRK 10 /* Starting point for sbrk and brk. */ #define IMAGE_ELF_AUX_TYPE_DEBUG 11 /* Debugging level. */ /* * The following non-standard values are used in Linux ELF binaries. */ #define IMAGE_ELF_AUX_TYPE_NOTELF 10 /* Program is not ELF ?? */ #define IMAGE_ELF_AUX_TYPE_UID 11 /* Real uid. */ #define IMAGE_ELF_AUX_TYPE_EUID 12 /* Effective uid. */ #define IMAGE_ELF_AUX_TYPE_GID 13 /* Real gid. */ #define IMAGE_ELF_AUX_TYPE_EGID 14 /* Effective gid. */ #define IMAGE_ELF_AUX_TYPE_COUNT 15 /* Count of defined aux entry types. */ /* Auxiliary vector entry on initial stack */ typedef struct _IMAGE_ELF32_AUXINFO { ELF32_SWORD Type; /* Entry type. */ union { ELF32_SWORD Val; /* Integer value. */ ELF32_ADDR Ptr; /* Address. */ void (*Fcn)(void); /* Function pointer (not used). */ } Un; } IMAGE_ELF32_AUXINFO, *PIMAGE_ELF32_AUXINFO; /* arch data types */ #if ELF_ARCH_SIZE == 32 #define IMAGE_ELF_SYMBOL_BIND(args...) IMAGE_ELF32_SYMBOL_BIND(args) #define IMAGE_ELF_SYMBOL_TYPE(args...) IMAGE_ELF32_SYMBOL_TYPE(args) #define IMAGE_ELF_SYMBOL_INFO(args...) IMAGE_ELF32_SYMBOL_INFO(args) #define IMAGE_ELF_RELOC_SYM(args...) IMAGE_ELF32_RELOC_SYM(args) #define IMAGE_ELF_RELOC_TYPE(args...) IMAGE_ELF32_RELOC_TYPE(args) #define IMAGE_ELF_RELOC_INFO(args...) IMAGE_ELF32_RELOC_INFO(args) typedef ELF32_ADDR ELF_ADDR; typedef ELF32_HALF ELF_HALF; typedef ELF32_OFF ELF_OFF; typedef ELF32_SWORD ELF_SWORD; typedef ELF32_WORD ELF_WORD; typedef ELF32_HASHELT ELF_HASHELT; typedef IMAGE_ELF32_HEADER IMAGE_ELF_HEADER, *PIMAGE_ELF_HEADER; typedef IMAGE_ELF32_SECTION_HEADER IMAGE_ELF_SECTION_HEADER, *PIMAGE_ELF_SECTION_HEADER; typedef IMAGE_ELF32_SYMBOL IMAGE_ELF_SYMBOL, *PIMAGE_ELF_SYMBOL; typedef IMAGE_ELF32_RELOC IMAGE_ELF_RELOC, *PIMAGE_ELF_RELOC; typedef IMAGE_ELF32_RELOCA IMAGE_ELF_RELOCA, *PIMAGE_ELF_RELOCA; typedef IMAGE_ELF32_PROGRAM_HEADER IMAGE_ELF_PROGRAM_HEADER, *PIMAGE_ELF_PROGRAM_HEADER; typedef IMAGE_ELF32_DYNAMIC IMAGE_ELF_DYNAMIC, *PIMAGE_ELF_DYNAMIC; typedef IMAGE_ELF32_AUXINFO IMAGE_ELF_AUXINFO, *PIMAGE_ELF_AUXINFO; #elif ELF_ARCH_SIZE == 64 # error 64 bits unsupported #else # error Undefined architecture size! #endif /* target macros */ #ifdef _M_IX86 # define IMAGE_ELF_TARGET_CLASS IMAGE_ELF_CLASS_32 # define IMAGE_ELF_TARGET_DATA IMAGE_ELF_DATA_2LSB # define IMAGE_ELF_TARGET_MACHINE IMAGE_ELF_MACHINE_386 # define IMAGE_ELF_TARGET_VERSION 1 #else # error Unsupported architecture! #endif #undef ELF_ARCH_SIZE #endif /* __INCLUDE_ELF_H */ Index: ntoskrnl/mm/section.c =================================================================== RCS file: /CVS/ReactOS/reactos/ntoskrnl/mm/section.c,v retrieving revision 1.163 diff -u -r1.163 section.c --- ntoskrnl/mm/section.c 28 Sep 2004 20:58:29 -0000 1.163 +++ ntoskrnl/mm/section.c 19 Sep 2004 19:55:31 -0000 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: section.c,v 1.163 2004/09/28 20:58:29 gvg Exp $ +/* $Id: section.c,v 1.162 2004/08/28 22:18:24 navaraf Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/section.c @@ -29,6 +29,8 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#include <elf.h> + #define NDEBUG #include <internal/debug.h> @@ -2506,6 +2508,18 @@ PAGE_EXECUTE_READWRITE, // 15 = WRITABLE, READABLE, EXECUTABLE, SHARED }; +static ULONG ElfProgramHeaderFlagsToProtect[8] = + { + PAGE_NOACCESS, /* 0 = NONE */ + PAGE_EXECUTE, /* 1 = EXECUTABLE */ + PAGE_READWRITE, /* 2 = WRITABLE */ + PAGE_EXECUTE_READWRITE, /* 3 = WRITABLE, EXECUTABLE */ + PAGE_READONLY, /* 4 = READABLE */ + PAGE_EXECUTE_READ, /* 5 = READABLE, EXECUTABLE */ + PAGE_READWRITE, /* 6 = READABLE, WRITABLE */ + PAGE_EXECUTE_READWRITE, /* 7 = READABLE, EXECUTABLE, WRITABLE */ + }; + NTSTATUS MmCreateImageSection(PSECTION_OBJECT *SectionObject, ACCESS_MASK DesiredAccess, @@ -2518,7 +2532,12 @@ PSECTION_OBJECT Section; NTSTATUS Status; PFILE_OBJECT FileObject; - IMAGE_DOS_HEADER DosHeader; + union { + IMAGE_DOS_HEADER DosHeader; +#ifdef _ELF_SUPPORT + IMAGE_ELF_HEADER ElfHeader; +#endif /* _ELF_SUPPORT */ + } FileHeader; IO_STATUS_BLOCK Iosb; LARGE_INTEGER Offset; IMAGE_NT_HEADERS PEHeader; @@ -2560,9 +2579,15 @@ if (!NT_SUCCESS(Status) || FileObject->SectionObjectPointer->ImageSectionObject == NULL) { - PIMAGE_SECTION_HEADER ImageSections; + PIMAGE_SECTION_HEADER ImageSections = NULL; +#ifdef _ELF_SUPPORT + PIMAGE_ELF_PROGRAM_HEADER ElfImagePHeaders = NULL; + BOOL ElfImageDynamic = FALSE; + PCHAR ElfImageInterp = NULL; +#endif + /* - * Read the dos header and check the DOS signature + * Read the DOS/ELF header and check the signature */ Offset.QuadPart = 0; Status = ZwReadFile(FileHandle, @@ -2570,8 +2595,8 @@ NULL, NULL, &Iosb, - &DosHeader, - sizeof(DosHeader), + &FileHeader, + sizeof(FileHeader), &Offset, NULL); if (!NT_SUCCESS(Status)) @@ -2581,78 +2606,357 @@ } /* - * Check the DOS signature + * Check the DOS/ELF signature */ - if (Iosb.Information != sizeof(DosHeader) || - DosHeader.e_magic != IMAGE_DOS_SIGNATURE) + if (Iosb.Information != sizeof(FileHeader) || + (FileHeader.DosHeader.e_magic != IMAGE_DOS_SIGNATURE && +#ifdef _ELF_SUPPORT + !IMAGE_IS_ELF(FileHeader.ElfHeader))) +#else + TRUE)) +#endif { ObDereferenceObject(FileObject); return(STATUS_INVALID_IMAGE_FORMAT); } - /* - * Read the PE header - */ - Offset.QuadPart = DosHeader.e_lfanew; - Status = ZwReadFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - &PEHeader, - sizeof(PEHeader), - &Offset, - NULL); - if (!NT_SUCCESS(Status)) + if (FileHeader.DosHeader.e_magic == IMAGE_DOS_SIGNATURE) { - ObDereferenceObject(FileObject); - return(Status); - } - - /* - * Check the signature - */ - if (Iosb.Information != sizeof(PEHeader) || - PEHeader.Signature != IMAGE_NT_SIGNATURE) - { - ObDereferenceObject(FileObject); - return(STATUS_INVALID_IMAGE_FORMAT); - } + /* + * Read the PE header + */ + Offset.QuadPart = FileHeader.DosHeader.e_lfanew; + Status = ZwReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + &PEHeader, + sizeof(PEHeader), + &Offset, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return(Status); + } - /* - * Read in the section headers - */ - Offset.QuadPart = DosHeader.e_lfanew + sizeof(PEHeader); - ImageSections = ExAllocatePool(NonPagedPool, - PEHeader.FileHeader.NumberOfSections * - sizeof(IMAGE_SECTION_HEADER)); - if (ImageSections == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_NO_MEMORY); - } + /* + * Check the signature + */ + if (Iosb.Information != sizeof(PEHeader) || + PEHeader.Signature != IMAGE_NT_SIGNATURE) + { + ObDereferenceObject(FileObject); + return(STATUS_INVALID_IMAGE_FORMAT); + } - Status = ZwReadFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - ImageSections, - PEHeader.FileHeader.NumberOfSections * - sizeof(IMAGE_SECTION_HEADER), - &Offset, - 0); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(FileObject); - ExFreePool(ImageSections); - return(Status); + /* + * Read in the section headers + */ + Offset.QuadPart = FileHeader.DosHeader.e_lfanew + sizeof(PEHeader); + ImageSections = ExAllocatePool(NonPagedPool, + PEHeader.FileHeader.NumberOfSections * + sizeof(IMAGE_SECTION_HEADER)); + if (ImageSections == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_NO_MEMORY); + } + + Status = ZwReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + ImageSections, + PEHeader.FileHeader.NumberOfSections * + sizeof(IMAGE_SECTION_HEADER), + &Offset, + 0); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + ExFreePool(ImageSections); + return(Status); + } + if (Iosb.Information != (PEHeader.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER))) + { + ObDereferenceObject(FileObject); + ExFreePool(ImageSections); + return(STATUS_INVALID_IMAGE_FORMAT); + } + NrSegments = PEHeader.FileHeader.NumberOfSections; } - if (Iosb.Information != (PEHeader.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER))) + else { - ObDereferenceObject(FileObject); - ExFreePool(ImageSections); - return(STATUS_INVALID_IMAGE_FORMAT); +#ifdef _ELF_SUPPORT + BOOL ElfImageOk = TRUE; + + assert(IMAGE_IS_ELF(FileHeader.ElfHeader)); + + /* + * Check the ELF type, target, ... + */ + if (FileHeader.ElfHeader.Ident[IMAGE_ELF_IDENT_CLASS] != IMAGE_ELF_TARGET_CLASS || + FileHeader.ElfHeader.Ident[IMAGE_ELF_IDENT_DATA] != IMAGE_ELF_TARGET_DATA) + { + DPRINT1("ELF: unsupported file layout\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.Ident[IMAGE_ELF_IDENT_VERSION] != IMAGE_ELF_VERSION_CURRENT || + FileHeader.ElfHeader.Version != IMAGE_ELF_VERSION_CURRENT) + { + DPRINT1("ELF: unsupported file version\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.Type != IMAGE_ELF_TYPE_EXEC && + FileHeader.ElfHeader.Type != IMAGE_ELF_TYPE_DYN) + { + DPRINT1("ELF: unsupported file type\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.Machine != IMAGE_ELF_TARGET_MACHINE) + { + DPRINT1("ELF: unsupported machine\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.PhEntSize != sizeof(IMAGE_ELF_PROGRAM_HEADER)) + { + DPRINT1("ELF: invalid object: ElfHeader.PhEntSize != sizeof(IMAGE_ELF_PROGRAM_HEADER)\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.PhOff == 0) + { + DPRINT1("ELF: file does not contain a program header table (PhOff == 0)\n"); + ElfImageOk = FALSE; + } + else if (FileHeader.ElfHeader.PhNum == 0) + { + DPRINT1("ELF: file does not contain a program header table (PhNum == 0)\n"); + ElfImageOk = FALSE; + } + + if (!ElfImageOk) + { + ObDereferenceObject(FileObject); + return(STATUS_INVALID_IMAGE_FORMAT); + } + + /* + * Read in the program header table + */ + Offset.QuadPart = FileHeader.ElfHeader.PhOff; + ElfImagePHeaders = ExAllocatePool(NonPagedPool, + FileHeader.ElfHeader.PhNum * + sizeof(IMAGE_ELF_PROGRAM_HEADER)); + if (ElfImagePHeaders == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_NO_MEMORY); + } + + Status = ZwReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + ElfImagePHeaders, + FileHeader.ElfHeader.PhNum * + sizeof(IMAGE_ELF_PROGRAM_HEADER), + &Offset, + 0); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + return(Status); + } + if (Iosb.Information != (FileHeader.ElfHeader.PhNum * sizeof(IMAGE_ELF_PROGRAM_HEADER))) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + return(STATUS_INVALID_IMAGE_FORMAT); + } + + /* + * Get some important program headers (.dynamic, .interp), count number of loadable segments + */ + NrSegments = 0; + for (i = 0; i < FileHeader.ElfHeader.PhNum; i++) + { + switch (ElfImagePHeaders[i].Type) + { + case IMAGE_ELF_SEGMENT_TYPE_NULL: + case IMAGE_ELF_SEGMENT_TYPE_PHDR: + break; + + case IMAGE_ELF_SEGMENT_TYPE_LOAD: + /* Check alignment of segment */ + if (ElfImagePHeaders[i].Align > 1 && ElfImagePHeaders[i].Align < PAGE_SIZE) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + if (ElfImageInterp != NULL) + ExFreePool(ElfImageInterp); + + DPRINT1("ELF: IMAGE_ELF_SEGMENT_TYPE_LOAD Segment %d not page-aligned\n", i); + return(STATUS_INVALID_IMAGE_FORMAT); + } + NrSegments++; + break; + + case IMAGE_ELF_SEGMENT_TYPE_DYNAMIC: /* dynamically linked image */ + ElfImageDynamic = TRUE; + break; + + case IMAGE_ELF_SEGMENT_TYPE_INTERP: + /* Allocate memory for interpreter */ + if (ElfImageInterp != NULL) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + ExFreePool(ElfImageInterp); + DPRINT1("ELF: Only one IMAGE_ELF_SEGMENT_TYPE_INTERP segment allowed\n"); + return(STATUS_INVALID_IMAGE_FORMAT); + } + Size = max(ElfImagePHeaders[i].MemSz, ElfImagePHeaders[i].FileSz + 1); + ElfImageInterp = ExAllocatePool(NonPagedPool, Size); + if (ElfImageInterp == NULL) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + return(STATUS_NO_MEMORY); + } + + /* Read interpreter path */ + Offset.QuadPart = ElfImagePHeaders[i].Offset; + Status = ZwReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + ElfImageInterp, + ElfImagePHeaders[i].FileSz, + &Offset, + 0); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + ExFreePool(ElfImageInterp); + return(Status); + } + if (Iosb.Information != ElfImagePHeaders[i].FileSz) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + ExFreePool(ElfImageInterp); + return(STATUS_INVALID_IMAGE_FORMAT); + } + ElfImageInterp[Size - 1] = '\0'; + break; + +#if 0 + case IMAGE_ELF_SEGMENT_TYPE_GNU_STACK: + ElfImageStackExec = TRUE; /* Stack should be executable */ + break; +#endif + default: /* Unknown/unused type */ + DPRINT1("ELF: Segment %d has unknown type %d\n", i, ElfImagePHeaders[i].Type); + break; + } + } + + if (NrSegments == 0) /* No loadable segments found */ + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + if (ElfImageInterp != NULL) + ExFreePool(ElfImageInterp); + DPRINT1("ELF: No loadable segments found!\n"); + return(STATUS_INVALID_IMAGE_FORMAT); + } + + if (ElfImageDynamic) + { + HANDLE hInterpFile; + OBJECT_ATTRIBUTES Attribs; + ANSI_STRING AnsiInterp; + UNICODE_STRING UnicodeInterp; + + if(ElfImageInterp == NULL) + { + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + DPRINT1("ELF: Dynamic image needs interpreter!\n"); + return(STATUS_INVALID_IMAGE_FORMAT); + } + + /* + * Release resources + */ + ObDereferenceObject(FileObject); + ExFreePool(ElfImagePHeaders); + + /* + * The ELF file contains an interpreter, let's try to map it instead... + */ + RtlInitAnsiString(&AnsiInterp, ElfImageInterp); + Status = RtlAnsiStringToUnicodeString(&UnicodeInterp, &AnsiInterp, TRUE); + ExFreePool(ElfImageInterp); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ELF: Couldn't convert interpreter from ansi to unicode!\n"); + return(Status); + } + + InitializeObjectAttributes(&Attribs, + &UnicodeInterp, + (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), /* FIXME: which flags to use? */ + NULL, + NULL); + + Status = ZwCreateFile(&hInterpFile, + GENERIC_READ | GENERIC_EXECUTE, + &Attribs, + &Iosb, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ELF: Couldn't open interpreter '%wZ'!\n", &UnicodeInterp); + RtlFreeUnicodeString(&UnicodeInterp); + return(Status); + } + RtlFreeUnicodeString(&UnicodeInterp); + + Status = MmCreateImageSection(SectionObject, + DesiredAccess, + NULL, + NULL, + PAGE_EXECUTE | PAGE_WRITECOPY, + SEC_IMAGE, + hInterpFile); + ZwClose(hInterpFile); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ELF: Couldn't create section for interpreter (0x%x)\n", Status); + } + return(Status); /* The interpreter should take care of the rest... */ + } + + NrSegments = FileHeader.ElfHeader.PhNum; + +#else /* _ELF_SUPPORT */ + assert(0); /* should never be executed */ +#endif } /* @@ -2670,7 +2974,14 @@ if (!NT_SUCCESS(Status)) { ObDereferenceObject(FileObject); - ExFreePool(ImageSections); + if (ImageSections != NULL) + ExFreePool(ImageSections); +#ifdef _ELF_SUPPORT + if (ElfImagePHeaders != NULL) + ExFreePool(ElfImagePHeaders); + if (ElfImageInterp != NULL) + ExFreePool(ElfImageInterp); +#endif return(Status); } @@ -2684,8 +2995,8 @@ KeInitializeSpinLock(&Section->ViewListLock); /* - * Check file access required - */ + * Check file access required + */ if (SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) { FileAccess = FILE_READ_DATA | FILE_WRITE_DATA; @@ -2703,14 +3014,21 @@ { ObDereferenceObject(Section); ObDereferenceObject(FileObject); - ExFreePool(ImageSections); + if (ImageSections != NULL) + ExFreePool(ImageSections); +#ifdef _ELF_SUPPORT + if (ElfImagePHeaders != NULL) + ExFreePool(ElfImagePHeaders); + if (ElfImageInterp != NULL) + ExFreePool(ElfImageInterp); +#endif return(Status); } /* - * allocate the section segments to describe the mapping + * allocate and fill the section segments to describe the mapping */ - NrSegments = PEHeader.FileHeader.NumberOfSections + 1; + NrSegments += 1; /* the first segment is special i guess... */ Size = sizeof(MM_IMAGE_SECTION_OBJECT) + sizeof(MM_SECTION_SEGMENT) * NrSegments; ImageSectionObject = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MM_SECTION_SEGMENT); if (ImageSectionObject == NULL) @@ -2718,110 +3036,241 @@ KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); ObDereferenceObject(Section); ObDereferenceObject(FileObject); - ExFreePool(ImageSections); + if (ImageSections != NULL) + ExFreePool(ImageSections); +#ifdef _ELF_SUPPORT + if (ElfImagePHeaders != NULL) + ExFreePool(ElfImagePHeaders); + if (ElfImageInterp != NULL) + ExFreePool(ElfImageInterp); +#endif return(STATUS_NO_MEMORY); } Section->ImageSection = ImageSectionObject; ImageSectionObject->NrSegments = NrSegments; - ImageSectionObject->ImageBase = (PVOID)PEHeader.OptionalHeader.ImageBase; - ImageSectionObject->EntryPoint = (PVOID)PEHeader.OptionalHeader.AddressOfEntryPoint; - ImageSectionObject->StackReserve = PEHeader.OptionalHeader.SizeOfStackReserve; - ImageSectionObject->StackCommit = PEHeader.OptionalHeader.SizeOfStackCommit; - ImageSectionObject->Subsystem = PEHeader.OptionalHeader.Subsystem; - ImageSectionObject->MinorSubsystemVersion = PEHeader.OptionalHeader.MinorSubsystemVersion; - ImageSectionObject->MajorSubsystemVersion = PEHeader.OptionalHeader.MajorSubsystemVersion; - ImageSectionObject->ImageCharacteristics = PEHeader.FileHeader.Characteristics; - ImageSectionObject->Machine = PEHeader.FileHeader.Machine; - ImageSectionObject->Executable = (PEHeader.OptionalHeader.SizeOfCode != 0); - SectionSegments = ImageSectionObject->Segments; - SectionSegments[0].FileOffset = 0; - SectionSegments[0].Characteristics = IMAGE_SECTION_CHAR_DATA; - SectionSegments[0].Protection = PAGE_READONLY; - SectionSegments[0].RawLength = PAGE_SIZE; - SectionSegments[0].Length = PAGE_SIZE; - SectionSegments[0].Flags = 0; - SectionSegments[0].ReferenceCount = 1; - SectionSegments[0].VirtualAddress = 0; - SectionSegments[0].WriteCopy = TRUE; - SectionSegments[0].Attributes = 0; - ExInitializeFastMutex(&SectionSegments[0].Lock); - RtlZeroMemory(&SectionSegments[0].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); - for (i = 1; i < NrSegments; i++) - { - SectionSegments[i].FileOffset = ImageSections[i-1].PointerToRawData; - SectionSegments[i].Characteristics = ImageSections[i-1].Characteristics; - /* - * Set up the protection and write copy variables. - */ - Characteristics = ImageSections[i - 1].Characteristics; - if (Characteristics & (IMAGE_SECTION_CHAR_READABLE|IMAGE_SECTION_CHAR_WRITABLE|IMAGE_SECTION_CHAR_EXECUTABLE)) - { - SectionSegments[i].Protection = SectionCharacteristicsToProtect[Characteristics >> 28]; - SectionSegments[i].WriteCopy = !(Characteristics & IMAGE_SECTION_CHAR_SHARED); - } - else if (Characteristics & IMAGE_SECTION_CHAR_CODE) - { - SectionSegments[i].Protection = PAGE_EXECUTE_READ; - SectionSegments[i].WriteCopy = TRUE; - } - else if (Characteristics & IMAGE_SECTION_CHAR_DATA) - { - SectionSegments[i].Protection = PAGE_READWRITE; - SectionSegments[i].WriteCopy = TRUE; - } - else if (Characteristics & IMAGE_SECTION_CHAR_BSS) - { - SectionSegments[i].Protection = PAGE_READWRITE; - SectionSegments[i].WriteCopy = TRUE; - } - else + if (FileHeader.DosHeader.e_magic == IMAGE_DOS_SIGNATURE) + { + ImageSectionObject->ImageBase = (PVOID)PEHeader.OptionalHeader.ImageBase; + ImageSectionObject->EntryPoint = (PVOID)PEHeader.OptionalHeader.AddressOfEntryPoint; + ImageSectionObject->StackReserve = PEHeader.OptionalHeader.SizeOfStackReserve; + ImageSectionObject->StackCommit = PEHeader.OptionalHeader.SizeOfStackCommit; + ImageSectionObject->Subsystem = PEHeader.OptionalHeader.Subsystem; + ImageSectionObject->MinorSubsystemVersion = PEHeader.OptionalHeader.MinorSubsystemVersion; + ImageSectionObject->MajorSubsystemVersion = PEHeader.OptionalHeader.MajorSubsystemVersion; + ImageSectionObject->ImageCharacteristics = PEHeader.FileHeader.Characteristics; + ImageSectionObject->Machine = PEHeader.FileHeader.Machine; + ImageSectionObject->Executable = (PEHeader.OptionalHeader.SizeOfCode != 0); + + SectionSegments[0].FileOffset = 0; + SectionSegments[0].Characteristics = IMAGE_SECTION_CHAR_DATA; + SectionSegments[0].Protection = PAGE_READONLY; + SectionSegments[0].RawLength = PAGE_SIZE; + SectionSegments[0].Length = PAGE_SIZE; + SectionSegments[0].Flags = 0; + SectionSegments[0].ReferenceCount = 1; + SectionSegments[0].VirtualAddress = 0; + SectionSegments[0].WriteCopy = TRUE; + SectionSegments[0].Attributes = 0; + ExInitializeFastMutex(&SectionSegments[0].Lock); + RtlZeroMemory(&SectionSegments[0].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); + for (i = 1; i < NrSegments; i++) { - SectionSegments[i].Protection = PAGE_NOACCESS; - SectionSegments[i].WriteCopy = TRUE; - } + SectionSegments[i].FileOffset = ImageSections[i-1].PointerToRawData; + SectionSegments[i].Characteristics = ImageSections[i-1].Characteristics; - /* - * Set up the attributes. - */ - if (Characteristics & IMAGE_SECTION_CHAR_CODE) - { - SectionSegments[i].Attributes = 0; + /* + * Set up the protection and write copy variables. + */ + Characteristics = ImageSections[i - 1].Characteristics; + if (Characteristics & (IMAGE_SECTION_CHAR_READABLE|IMAGE_SECTION_CHAR_WRITABLE|IMAGE_SECTION_CHAR_EXECUTABLE)) + { + SectionSegments[i].Protection = SectionCharacteristicsToProtect[Characteristics >> 28]; + SectionSegments[i].WriteCopy = !(Characteristics & IMAGE_SECTION_CHAR_SHARED); + } + else if (Characteristics & IMAGE_SECTION_CHAR_CODE) + { + SectionSegments[i].Protection = PAGE_EXECUTE_READ; + SectionSegments[i].WriteCopy = TRUE; + } + else if (Characteristics & IMAGE_SECTION_CHAR_DATA) + { + SectionSegments[i].Protection = PAGE_READWRITE; + SectionSegments[i].WriteCopy = TRUE; + } + else if (Characteristics & IMAGE_SECTION_CHAR_BSS) + { + SectionSegments[i].Protection = PAGE_READWRITE; + SectionSegments[i].WriteCopy = TRUE; + } + else + { + SectionSegments[i].Protection = PAGE_NOACCESS; + SectionSegments[i].WriteCopy = TRUE; + } + + /* + * Set up the attributes. + */ + if (Characteristics & IMAGE_SECTION_CHAR_CODE) + { + SectionSegments[i].Attributes = 0; + } + else if (Characteristics & IMAGE_SECTION_CHAR_DATA) + { + SectionSegments[i].Attributes = 0; + } + else if (Characteristics & IMAGE_SECTION_CHAR_BSS) + { + SectionSegments[i].Attributes = MM_SECTION_SEGMENT_BSS; + } + else + { + SectionSegments[i].Attributes = 0; + } + + SectionSegments[i].RawLength = ImageSections[i-1].SizeOfRawData; + if (ImageSections[i-1].Misc.VirtualSize != 0) + { + SectionSegments[i].Length = ImageSections[i-1].Misc.VirtualSize; + } + else + { + SectionSegments[i].Length = ImageSections[i-1].SizeOfRawData; + } + SectionSegments[i].Flags = 0; + SectionSegments[i].ReferenceCount = 1; + SectionSegments[i].VirtualAddress = (PVOID)ImageSections[i-1].VirtualAddress; + ExInitializeFastMutex(&SectionSegments[i].Lock); + RtlZeroMemory(&SectionSegments[i].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); } - else if (Characteristics & IMAGE_SECTION_CHAR_DATA) + } + else + { +#ifdef _ELF_SUPPORT + ULONG j; + + ImageSectionObject->ImageBase = (PVOID)ElfImagePHeaders[0].VAddr; + ImageSectionObject->EntryPoint = (PVOID)FileHeader.ElfHeader.Entry; + if (FileHeader.ElfHeader.Entry != (ELF_ADDR)NULL) + { + ImageSectionObject->EntryPoint = (PVOID)((UINT_PTR)FileHeader.ElfHeader.Entry - + (UINT_PTR)ImageSectionObject->ImageBase); + } + ImageSectionObject->StackReserve = 0x10000; /* FIXME: does ELF provide such info? */ + ImageSectionObject->StackCommit = 0x1000; /* FIXME: does ELF provide such info? */ + ImageSectionObject->Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; /* FIXME: we need to extend ELF */ + ImageSectionObject->MajorSubsystemVersion = 4; + ImageSectionObject->MinorSubsystemVersion = 0; /* WinNT 4.0 */ + ImageSectionObject->Executable = TRUE; + ImageSectionObject->ImageCharacteristics = IMAGE_FILE_32BIT_MACHINE; + if (FileHeader.ElfHeader.Type == IMAGE_ELF_TYPE_EXEC) { - SectionSegments[i].Attributes = 0; + ImageSectionObject->ImageCharacteristics |= IMAGE_FILE_EXECUTABLE_IMAGE; } - else if (Characteristics & IMAGE_SECTION_CHAR_BSS) + else { - SectionSegments[i].Attributes = MM_SECTION_SEGMENT_BSS; - } + assert(FileHeader.ElfHeader.Type == IMAGE_ELF_TYPE_DYN); + ImageSectionObject->ImageCharacteristics |= IMAGE_FILE_DLL; + } + + if (FileHeader.ElfHeader.Machine == IMAGE_ELF_MACHINE_386) + ImageSectionObject->Machine = IMAGE_FILE_MACHINE_I386; else { - SectionSegments[i].Attributes = 0; + /* + * This should never be reached because we check if + * ElfHeader.Machine is IMAGE_ELF_TARGET_MACHINE above + * and fail if it is not. + */ + assert(0); } - SectionSegments[i].RawLength = ImageSections[i-1].SizeOfRawData; - if (ImageSections[i-1].Misc.VirtualSize != 0) + /* FIXME: what is this first segment used for? */ + SectionSegments[0].FileOffset = 0; + SectionSegments[0].Characteristics = IMAGE_SECTION_CHAR_DATA; + SectionSegments[0].Protection = PAGE_READONLY; + SectionSegments[0].RawLength = PAGE_SIZE; + SectionSegments[0].Length = PAGE_SIZE; + SectionSegments[0].Flags = 0; + SectionSegments[0].ReferenceCount = 1; + SectionSegments[0].VirtualAddress = 0; + SectionSegments[0].WriteCopy = TRUE; + SectionSegments[0].Attributes = 0; + ExInitializeFastMutex(&SectionSegments[0].Lock); + RtlZeroMemory(&SectionSegments[0].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); + for (i = 1, j = 0; j < (NrSegments - 1); j++) { - SectionSegments[i].Length = ImageSections[i-1].Misc.VirtualSize; - } - else - { - SectionSegments[i].Length = ImageSections[i-1].SizeOfRawData; - } - SectionSegments[i].Flags = 0; - SectionSegments[i].ReferenceCount = 1; - SectionSegments[i].VirtualAddress = (PVOID)ImageSections[i-1].VirtualAddress; - ExInitializeFastMutex(&SectionSegments[i].Lock); - RtlZeroMemory(&SectionSegments[i].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); + if (ElfImagePHeaders[j].Type != IMAGE_ELF_SEGMENT_TYPE_LOAD) + continue; + + SectionSegments[i].FileOffset = ElfImagePHeaders[j].Offset; + + /* + * Fill in characteristics + */ + Characteristics = 0; + if (ElfImagePHeaders[j].Flags & IMAGE_ELF_SEGMENT_FLAG_READ) + Characteristics |= IMAGE_SECTION_CHAR_READABLE; + if (ElfImagePHeaders[j].Flags & IMAGE_ELF_SEGMENT_FLAG_WRITE) + Characteristics |= IMAGE_SECTION_CHAR_WRITABLE; + if (ElfImagePHeaders[j].Flags & IMAGE_ELF_SEGMENT_FLAG_EXEC) + Characteristics |= IMAGE_SECTION_CHAR_EXECUTABLE | IMAGE_SECTION_CHAR_CODE; + else /* not executable, must be some kind of data */ + Characteristics |= (ElfImagePHeaders[j].FileSz > 0) ? IMAGE_SECTION_CHAR_DATA : + IMAGE_SECTION_CHAR_BSS; + SectionSegments[i].Characteristics = Characteristics; + + /* + * Set up the protection and write copy variables. + */ + SectionSegments[i].Protection = ElfProgramHeaderFlagsToProtect[ElfImagePHeaders[j].Flags & 7]; + SectionSegments[i].WriteCopy = TRUE; /* ELF does not support shared segments */ + + /* + * Set up the attributes. + */ + if (Characteristics & IMAGE_SECTION_CHAR_CODE) + { + SectionSegments[i].Attributes = 0; + } + else if (Characteristics & IMAGE_SECTION_CHAR_DATA) + { + SectionSegments[i].Attributes = 0; + } + else if (Characteristics & IMAGE_SECTION_CHAR_BSS) + { + SectionSegments[i].Attributes = MM_SECTION_SEGMENT_BSS; + } + else + { + SectionSegments[i].Attributes = 0; + } + + SectionSegments[i].RawLength = ElfImagePHeaders[j].FileSz; + SectionSegments[i].Length = ElfImagePHeaders[j].MemSz; /* FIXME: I hope these are correct */ + + SectionSegments[i].Flags = 0; + SectionSegments[i].ReferenceCount = 1; + SectionSegments[i].VirtualAddress = (PVOID)((UINT_PTR)ElfImagePHeaders[j].VAddr - + (UINT_PTR)ImageSectionObject->ImageBase); + ExInitializeFastMutex(&SectionSegments[i].Lock); + RtlZeroMemory(&SectionSegments[i].PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); + + i++; + } + ImageSectionObject->NrSegments = i; + +#else /* if !_ELF_SUPPORT */ + assert(0); +#endif /* !_ELF_SUPPORT */ } if (0 != InterlockedCompareExchange((PLONG)&FileObject->SectionObjectPointer->ImageSectionObject, (LONG)ImageSectionObject, 0)) { /* - * An other thread has initialized the some image in the background + * An other thread has initialized the same image in the background */ ExFreePool(ImageSectionObject); ImageSectionObject = FileObject->SectionObjectPointer->ImageSectionObject; @@ -2833,7 +3282,10 @@ InterlockedIncrement((LONG *)&SectionSegments[i].ReferenceCount); } } - ExFreePool(ImageSections); + if (ImageSections != NULL) + ExFreePool(ImageSections); + if (ElfImagePHeaders != NULL) + ExFreePool(ElfImagePHeaders); } else { @@ -3809,7 +4261,7 @@ return(STATUS_UNSUCCESSFUL); } /* Otherwise find a gap to map the image. */ - ImageBase = MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), PAGE_SIZE, FALSE); + ImageBase = MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), FALSE); if (ImageBase == NULL) { MmUnlockAddressSpace(AddressSpace);

20 years, 5 months

9
12
0 0

Re: [ros-cvs] CVS Update: reactos

by James Tabor

Hay!!!! greatlrd(a)cvs.reactos.com wrote: > CVSROOT: /CVS/ReactOS > Module name: reactos > Repository: reactos/include/ > Changes by: greatlrd(a)mok.osexperts.com 04/11/28 16:15:24 > > Added files: > reactos/include/: dinput.h > > Log message: > first port of wine directx support to reactos I want to commit my port of msi.dll from wine! 8^) James

20 years, 5 months

2
3
0 0

Web site actualization

by Lucio Diaz

PD: Humm, send me a contact mail and i will send you the files ziped. Best Regards, Lucio Diaz ______________________________________________ Renovamos el Correo Yahoo!: ¡100 MB GRATIS! Nuevos servicios, más seguridad http://correo.yahoo.es

20 years, 5 months

1
0
0 0

Web site actualization

by Lucio Diaz

Could Someone with autorization to edit the Reactos.com Web page look at my FAQ and Howto, to decide if he/she likes it and what have to be changed so it could be in the web page. I think it is a improvement over the actual texts. The texts i did are thought for everybody, even with screenshots to guide the people with little experience. Thankyou, Lucio Diaz. ______________________________________________ Renovamos el Correo Yahoo!: ¡100 MB GRATIS! Nuevos servicios, más seguridad http://correo.yahoo.es

20 years, 5 months

1
0
0 0

GMT

by Lucio Diaz

>While attempting to guess the location isn't going to >be successful >100% >of the time, it would probably be better then the 99% >incorrect that >you >get with always defaulting to 1 set zone. >Also, are there any other user-set preferences that >come before the >date/time page (How do you call the different parts of >Setup?) that >might help determining location? It seems a pain in the @ss to code the whole thing, taking in acount ALL the countries and their probable timezones(countries with diferent timezone areas) for something as easy to the user as to look at his watch and set the time. I dont mind what standard (if GMT -8 or GMT 0) you chose, but i believe that making it more elaborate does not worth today when many other things, quite more important, are waiting to be implemented (like Networking). I am sure that time will come for those details. ______________________________________________ Renovamos el Correo Yahoo!: ¡100 MB GRATIS! Nuevos servicios, más seguridad http://correo.yahoo.es

20 years, 5 months

4
6
0 0

Moving ntoskrnl configuration defines into ntoskrnl/include/config.h ?

by Gregor Anich

Hi! I have written a tool to configure the ReactOS source tree (customize the build) It builds a GUI interface from an XML file which lists all the possible options and how they are "realized" (in which file a value has to be changed to make the build-system do what is wanted, i.e. set KDBG in config to 1) I would like to add the possibility of configuring things like WHOLE_PAGE_ALLOCATIONS or TAG_STATISTICS_TRACKING (from ntoskrnl/mm/npool.c) It would be good if such defines were moved into a file like ntoskrnl/include/config.h which is then included by ntoskrnl.h and looks like this: /* Enable tracking of statistics about the tagged blocks in the pool */ #undef TAG_STATISTICS_TRACKING /* * Put each block in its own range of pages and position the block at the * end of the range so any accesses beyond the end of block are to invalid * memory locations. */ #undef WHOLE_PAGE_ALLOCATIONS I don't want to make the tool edit the C files directly. If anybody is against this please let me know, otherwise I will do it. (Note: The tool is written in python and will thus not be allowed into the reactos tree but I will provide it for whomever is interested) Thanks, blight

20 years, 5 months

4
3
0 0

GMT

by Lucio Diaz

>The most intelligent solution is to stick to GMT 0. >Best regards, >Alex Ionescu I agree, is both the easier and the most logic option (also i live at GMT 0 ;) ______________________________________________ Renovamos el Correo Yahoo!: ¡100 MB GRATIS! Nuevos servicios, más seguridad http://correo.yahoo.es

20 years, 5 months

1
0
0 0

Re: [ros-diffs] [CVS reactos] - Saved the state of the fpu at a win32 call and restored the state

by Gregor Anich

Hi Hartmut! You have changed the w32 callback to save the FPU state, this is wrong I think! I was wondering too wether it should be saved so GvG suggested to check myself and I modified our winhello app... It prints out the FPU control word, calls CreateWindow and printf the FPU control word again. In the callback for the WM_CREATE message (produced by CreateWindow) it also prints the control word, then modifies it (and prints the modified one) This is the output on windows2000: Original FPU control word: 0x8001f WM_CREATE: Original FPU control word: 0x8001f WM_CREATE: Modified FPU control word: 0xa001f FPU control word after CreateWindow: 0xa001f Of course I have attached the program. I am not sure but I think in the KiClearFloatingPointState which you have added you have to set KPCR->NpxThread to NULL if it's CurrentThread before you do the fn/xsave because it could raise a delayed FPU exception (which will be ignored when KPCR->CurrentThread is NULL and be delivered when the saved FPU state is restored for the thread) I think I have made the same mistake in tskswitch.S - I am pretty sure it has to be fixed there because we don't want a FPU exception to be raised while we are in a cli/sti block and switching to another task. - blight

20 years, 5 months

2
4
0 0

ReactOS Setup Wizard Scroll Bar for Timezone.

by James Tabor

Hi all! Missing scroll bars for timezone. FYI, James

20 years, 5 months

6
19
0 0

RE: [ros-dev] ReactOS and Viruses

by Waldo Alvarez Cañizares

Hi Thomas: There are some parts of your e-mail that I can't understand but I believe you try to give some kind of solution. And yes I think is correct at some point, I was wondering once about that, to do the same with native applications as for example what is done with java applets running in the browser. Containing them to some set of files. I think that yes it would be good to prevent applications corrupting other files and such things. And in fact could be great for advanced users But ... 1 - That is not a solution for viruses, there are kernel mode virus and trojans I wonder how that can get there. At the end human intelligence can't be stopped that easy and of course the opposite also happens, ignorance could be huge. I wonder how a virus like the I love you that can be written in a couple of minutes could spread that far. Believe me that won't work. 2 - That should not be enabled by default, sometimes if you present a password to users they will get lost. That happened to some users that switched from win98 to an NT based one. That was news, and was true. With the solution you propose there will be a lot that will press the Yes. Eh I even know ppl that click whatever they please when a message box appears. Regards Waldo ________________________________ De: ros-dev-bounces(a)reactos.com en nombre de Thomas Larsen Enviado el: jue 11/25/2004 12:42 Para: ReactOS Development List Asunto: RE: [ros-dev] ReactOS and Viruses Hi why would it be a could a idea simply becures we eliminate a lot of old viruses but we could allso make a function theire hold all exe files from execute when they contain some strange command f.eks the delete or format funtion or some other stuff or some kind of database and the send a signal out Maybe Reactos->MaybeVirusFile(Filename,Path); VirusApps<-TestingFile(Filename,Path); Ekstra Idea: And a funtion to Stop new apps from run (REGEDIT RUNAPPS etc.) Some New viruses use that way to start all the time and the user could be asked NEW APP STARTING UP RUN THE APP [X] DISMISS THE APP [ ] VIRUS TEST APP [ ] Information about file NEWER SHOW AGAIN [X] And then make a group of apps that run i secure mode FOLDER SECURERUN and then make a group of apps that run i unsecure mode FOLDER UNSECURERUN So those in SECURE can´t change the reg and delete file e.g. don´t know just and idea but think people should care more about getting reactos to work... Thomas >>Hi Rick: >Well I don't believe that would be a protection at all against viruses. Why? >If I where to write a virus and knowing that reactos has such protection that would not stop me at >all. I could simply write a function to calculate the hash in the virus (or simply tell the OS to >do it for me) and update such database. Look at windows file protection, virus laugh at it. I >think the verification of the PE checksum is enough to tell if a file is corrupt and would be >faster >wich means a faster load. If you want to know some more about viruses look for the e-zines of 29A >on the internet to find out more about the subject. Their articles are as advanced as those in Waldo __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.com http://reactos.com:8080/mailman/listinfo/ros-dev

20 years, 5 months

2
1
0 0

CVS Build Bug

by Alex Ionescu

Hi, CVS seems to be rebuilding rosrtl in a loop...can anyone investigate please? Best regards, Alex Ionescu

20 years, 5 months

4
3
0 0

Missing files on bootcd

by WaxDragon

Please add the following files to the bootcd: lib\dnsapi\dnsapi.dll 1 lib\iphlpapi\iphlpapi.dll 1 lib\rpcrt4\rpcrt4.dll 1 lib\ole32\ole32.dll 1 This fixes the reboot loop FloFri was seeing with current cvs bootcds. (ntuser/desktop.c:499) CreateDesktop: Screen-Saver (NTDLL:ldr/utils.c:2018) Failed to create or open dll section of 'dnsapi.dll' (Status c0000135) (NTDLL:ldr/utils.c:1357) failed to load dnsapi.dll (NTDLL:ldr/utils.c:1819) failed to load dnsapi.dll (NTDLL:ldr/utils.c:2085) LdrFixupImports failed for ws2_32.dll, status=c0000135 (NTDLL:ldr/utils.c:1357) failed to load ws2_32.dll (NTDLL:ldr/utils.c:1819) failed to load ws2_32.dll (NTDLL:ldr/utils.c:2085) LdrFixupImports failed for iphlpapi.dll, status=c0000135 (NTDLL:ldr/utils.c:1357) failed to load iphlpapi.dll (NTDLL:ldr/utils.c:1819) failed to load iphlpapi.dll (NTDLL:ldr/utils.c:2085) LdrFixupImports failed for rpcrt4.dll, status=c0000135 (NTDLL:ldr/utils.c:1357) failed to load rpcrt4.dll (NTDLL:ldr/utils.c:1819) failed to load rpcrt4.dll (NTDLL:ldr/utils.c:2085) LdrFixupImports failed for ole32.dll, status=c0000135 (NTDLL:ldr/utils.c:1357) failed to load ole32.dll (NTDLL:ldr/utils.c:1819) failed to load ole32.dll (NTDLL:ldr/utils.c:1941) LdrFixupImports() failed for setup.exe (NTDLL:ldr/startup.c:441) Failed to initialize image -- The cheese stands alone.

20 years, 5 months

2
1
0 0

RE: [ros-diffs] [CVS reactos] Added gethostbyname implementation written by Adam Kelly (insulanus).

by Casper Hornstrup

This is the wrong way to do it. A Namespace Service Provider should be written for DNS instead. See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/wi…. DNS is a TCP/IP thing. Other protocols have their own namespace system so ws2_32 should remain generic and not depend on dnsapi. Casper _____ From: ros-diffs-bounces(a)reactos.com [mailto:ros-diffs-bounces@reactos.com] On Behalf Of arty(a)osexperts.com Sent: 26. november 2004 00:33 To: ros-diffs(a)reactos.com Subject: [ros-diffs] [CVS reactos] Added gethostbyname implementation written by Adam Kelly (insulanus). Commit in reactos/lib/ws2_32 on MAIN makefile <> +45 -44 1.18 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile?rev=1.18&…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile.diff?r1=t…> > 1.19 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile?rev=1.19&…> include/ws2_32.h <> +8 1.9 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h?r…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h.d…> > 1.10 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h?r…> misc/dllmain.c <> +11 1.18 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c?rev…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c.dif…> > 1.19 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c?rev…> /event.c <> +6 1.6 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c?rev=1…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c.diff?…> > 1.7 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c?rev=1…> /ns.c <> +1216 -989 1.9 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c?rev=1.9&…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c.diff?r1=…> > 1.10 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c?rev=1.10…> /stubs.c <> +1 -1 1.14 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c?rev=1…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c.diff?…> > 1.15 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c?rev=1…> +1287 -1034 6 modified files Added gethostbyname implementation written by Adam Kelly (insulanus). - Mostly complete, does not support multiple returned a records or hosts file though - Relies on dnsapi - Stores hostent struct in teb->Hostent _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> makefile 1.18 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile?rev=1.18&…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile.diff?r1=t…> > 1.19 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/makefile?rev=1.19&…> diff -u -r1.18 -r1.19 --- makefile 17 Nov 2004 05:17:21 -0000 1.18 +++ makefile 25 Nov 2004 23:32:53 -0000 1.19 @@ -1,44 +1,45 @@ -# $Id: makefile,v 1.18 2004/11/17 05:17:21 arty Exp $ - -PATH_TO_TOP = ../.. - -TARGET_REGTESTS = yes - -TARGET_TYPE = dynlink - -TARGET_NAME = ws2_32 - -TARGET_PCH = include/ws2_32.h - -TARGET_BASE = $(TARGET_BASE_LIB_W2_32) - -TARGET_CFLAGS = \ - -I./include \ - -Wall \ - -Werror \ - -fno-builtin \ - -DUNICODE \ - -DLE \ - -D__USE_W32API - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a - -TARGET_OBJECTS = \ - misc/bsd.o misc/catalog.o misc/dllmain.o \ - misc/event.o misc/handle.o misc/ns.o \ - misc/sndrcv.o misc/stubs.o misc/upcall.o - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -include $(TOOLS_PATH)/depend.mk - -# EOF +# $Id: makefile,v 1.19 2004/11/25 23:32:53 arty Exp $ + +PATH_TO_TOP = ../.. + +TARGET_REGTESTS = yes + +TARGET_TYPE = dynlink + +TARGET_NAME = ws2_32 + +TARGET_PCH = include/ws2_32.h + +TARGET_BASE = $(TARGET_BASE_LIB_W2_32) + +TARGET_CFLAGS = \ + -I./include \ + -Wall \ + -Werror \ + -fno-builtin \ + -DUNICODE \ + -DLE \ + -D__USE_W32API \ + -D_WIN32_WINNT=0x0500 + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a dnsapi.a + +TARGET_OBJECTS = \ + misc/bsd.o misc/catalog.o misc/dllmain.o \ + misc/event.o misc/handle.o misc/ns.o \ + misc/sndrcv.o misc/stubs.o misc/upcall.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +# EOF _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> /include <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include> ws2_32.h 1.9 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h?r…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h.d…> > 1.10 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/include/ws2_32.h?r…> diff -u -r1.9 -r1.10 --- ws2_32.h 15 Jul 2004 02:03:06 -0000 1.9 +++ ws2_32.h 25 Nov 2004 23:32:54 -0000 1.10 @@ -7,6 +7,7 @@ #ifndef __WS2_32_H #define __WS2_32_H +#include <roscfg.h> #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ntos.h> @@ -17,6 +18,7 @@ #include <windows.h> #undef assert #include <debug.h> +#include <WinDNS.h> // DNS_A_DATA /* Exported by ntdll.dll, but where is the prototype? */ unsigned long strtoul(const char *nptr, char **endptr, int base); @@ -51,6 +53,7 @@ Getservbyname; /* Buffer used by getservbyname */ PWINSOCK_GETSERVBYPORT_CACHE Getservbyport; /* Buffer used by getservbyname */ + struct hostent* Hostent; } WINSOCK_THREAD_BLOCK, *PWINSOCK_THREAD_BLOCK; @@ -60,6 +63,11 @@ #define WSASETINITIALIZED (Initialized = TRUE) +/* ws2_32 internal Functions */ +void check_hostent(struct hostent **he); +void populate_hostent(struct hostent *he, char* name, DNS_A_DATA addr); +void free_hostent(struct hostent *he); +void free_servent(struct servent* s); #ifdef LE _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> /misc <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc> dllmain.c 1.18 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c?rev…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c.dif…> > 1.19 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/dllmain.c?rev…> diff -u -r1.18 -r1.19 --- dllmain.c 17 Nov 2004 05:17:22 -0000 1.18 +++ dllmain.c 25 Nov 2004 23:32:54 -0000 1.19 @@ -663,6 +663,16 @@ return FALSE; } +void free_winsock_thread_block(PWINSOCK_THREAD_BLOCK p) { + if(p) { + if(p->Hostent) { free_hostent(p->Hostent); p->Hostent = 0; } + if(p->Getservbyname){} + if(p->Getservbyport) {} + + + } +} + BOOL STDCALL DllMain(HANDLE hInstDll, @@ -708,6 +718,7 @@ return FALSE; } + p->Hostent = NULL; p->LastErrorValue = NO_ERROR; p->Getservbyname = NULL; p->Getservbyport = NULL; _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> /misc <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc> event.c 1.6 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c?rev=1…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c.diff?…> > 1.7 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/event.c?rev=1…> diff -u -r1.6 -r1.7 --- event.c 7 Aug 2003 04:03:24 -0000 1.6 +++ event.c 25 Nov 2004 23:32:54 -0000 1.7 @@ -157,6 +157,10 @@ INT Status; INT Errno; + WS_DbgPrint(MID_TRACE,("Called (Socket %x, hEventObject %x, " + "lpNetworkEvents %x)\n", + s, hEventObject, lpNetworkEvents)); + if (!lpNetworkEvents) { WSASetLastError(WSAEINVAL); return SOCKET_ERROR; @@ -180,6 +184,8 @@ if (Status == SOCKET_ERROR) WSASetLastError(Errno); + WS_DbgPrint(MID_TRACE,("Leaving %x\n", Status)); + return Status; } _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> /misc <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc> ns.c 1.9 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c?rev=1.9&…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c.diff?r1=…> > 1.10 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/ns.c?rev=1.10…> diff -u -r1.9 -r1.10 --- ns.c 15 Jul 2004 02:03:07 -0000 1.9 +++ ns.c 25 Nov 2004 23:32:54 -0000 1.10 @@ -1,989 +1,1216 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/ns.c - * PURPOSE: Namespace APIs - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/09-2000 Created - */ -#include <ctype.h> -#include <ws2_32.h> - -#ifndef BUFSIZ -#define BUFSIZ 1024 -#endif/*BUFSIZ*/ - -/* Name resolution APIs */ - -/* - * @unimplemented - */ -INT -EXPORT -WSAAddressToStringA( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOA lpProtocolInfo, - OUT LPSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAAddressToStringW( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAEnumNameSpaceProvidersA( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOA lpnspBuffer) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAEnumNameSpaceProvidersW( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOW lpnspBuffer) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAGetServiceClassInfoA( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSASERVICECLASSINFOA lpServiceClassInfo) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAGetServiceClassInfoW( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSASERVICECLASSINFOW lpServiceClassInfo) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAGetServiceClassNameByClassIdA( - IN LPGUID lpServiceClassId, - OUT LPSTR lpszServiceClassName, - IN OUT LPDWORD lpdwBufferLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAGetServiceClassNameByClassIdW( - IN LPGUID lpServiceClassId, - OUT LPWSTR lpszServiceClassName, - IN OUT LPDWORD lpdwBufferLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAInstallServiceClassA( - IN LPWSASERVICECLASSINFOA lpServiceClassInfo) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAInstallServiceClassW( - IN LPWSASERVICECLASSINFOW lpServiceClassInfo) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSALookupServiceBeginA( - IN LPWSAQUERYSETA lpqsRestrictions, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSALookupServiceBeginW( - IN LPWSAQUERYSETW lpqsRestrictions, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSALookupServiceEnd( - IN HANDLE hLookup) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSALookupServiceNextA( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETA lpqsResults) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSALookupServiceNextW( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETW lpqsResults) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSARemoveServiceClass( - IN LPGUID lpServiceClassId) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSASetServiceA( - IN LPWSAQUERYSETA lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSASetServiceW( - IN LPWSAQUERYSETW lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAStringToAddressA( - IN LPSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOA lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -INT -EXPORT -WSAStringToAddressW( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength) -{ - UNIMPLEMENTED - - return 0; -} - - -/* WinSock 1.1 compatible name resolution APIs */ - -/* - * @unimplemented - */ -LPHOSTENT -EXPORT -gethostbyaddr( - IN CONST CHAR FAR* addr, - IN INT len, - IN INT type) -{ - UNIMPLEMENTED - - return (LPHOSTENT)NULL; -} - -/* - * @unimplemented - */ -LPHOSTENT -EXPORT -gethostbyname( - IN CONST CHAR FAR* name) -{ - UNIMPLEMENTED - - return (LPHOSTENT)NULL; -} - - -/* - * @unimplemented - */ -INT -EXPORT -gethostname( - OUT CHAR FAR* name, - IN INT namelen) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * XXX arty -- Partial implementation pending a better one. This one will - * do for normal purposes. - * - * Return the address of a static LPPROTOENT corresponding to the named - * protocol. These structs aren't very interesting, so I'm not too ashamed - * to have this function work on builtins for now. - * - * @unimplemented - */ -LPPROTOENT -EXPORT -getprotobyname( - IN CONST CHAR FAR* name) -{ - static CHAR *udp_aliases = 0; - static PROTOENT udp = { "udp", &udp_aliases, 17 }; - static CHAR *tcp_aliases = 0; - static PROTOENT tcp = { "tcp", &tcp_aliases, 6 }; - if( !_stricmp( name, "udp" ) ) { - return &udp; - } else if( !_stricmp( name, "tcp" ) ) { - return &tcp; - } - - return 0; -} - -/* - * @unimplemented - */ -LPPROTOENT -EXPORT -getprotobynumber( - IN INT number) -{ - UNIMPLEMENTED - - return (LPPROTOENT)NULL; -} - -#define SKIPWS(ptr,act) \ -{while(*ptr && isspace(*ptr)) ptr++; if(!*ptr) act;} -#define SKIPANDMARKSTR(ptr,act) \ -{while(*ptr && !isspace(*ptr)) ptr++; \ - if(!*ptr) {act;} else { *ptr = 0; ptr++; }} - - -static BOOL DecodeServEntFromString( IN PCHAR ServiceString, - OUT PCHAR *ServiceName, - OUT PCHAR *PortNumberStr, - OUT PCHAR *ProtocolStr, - IN PCHAR *Aliases, - IN DWORD MaxAlias ) { - UINT NAliases = 0; - - WS_DbgPrint(MAX_TRACE, ("Parsing service ent [%s]\n", ServiceString)); - - SKIPWS(ServiceString, return FALSE); - *ServiceName = ServiceString; - SKIPANDMARKSTR(ServiceString, return FALSE); - SKIPWS(ServiceString, return FALSE); - *PortNumberStr = ServiceString; - SKIPANDMARKSTR(ServiceString, ;); - - while( *ServiceString && NAliases < MaxAlias - 1 ) { - SKIPWS(ServiceString, break); - if( *ServiceString ) { - SKIPANDMARKSTR(ServiceString, ;); - if( strlen(ServiceString) ) { - WS_DbgPrint(MAX_TRACE, ("Alias: %s\n", ServiceString)); - *Aliases++ = ServiceString; - NAliases++; - } - } - } - *Aliases = NULL; - - *ProtocolStr = strchr(*PortNumberStr,'/'); - if( !*ProtocolStr ) return FALSE; - **ProtocolStr = 0; (*ProtocolStr)++; - - WS_DbgPrint(MAX_TRACE, ("Parsing done: %s %s %s %d\n", - *ServiceName, *ProtocolStr, *PortNumberStr, - NAliases)); - - return TRUE; -} - -#define ADJ_PTR(p,b1,b2) p = (p - b1) + b2 - -/* - * @implemented - */ -LPSERVENT -EXPORT -getservbyname( - - IN CONST CHAR FAR* name, - IN CONST CHAR FAR* proto) -{ - BOOL Found = FALSE; - HANDLE ServicesFile; - CHAR ServiceDBData[BUFSIZ] = { 0 }; - PCHAR SystemDirectory = ServiceDBData; /* Reuse this stack space */ - PCHAR ServicesFileLocation = "\\drivers\\etc\\services"; - PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, - ProtocolStr = 0, Comment = 0; - PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; - UINT i,SizeNeeded = 0, - SystemDirSize = sizeof(ServiceDBData) - 1; - DWORD ReadSize = 0, ValidData = 0; - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - - if( !p ) { - WSASetLastError( WSANOTINITIALISED ); - return NULL; - } - - if( !name ) { - WSASetLastError( WSANO_RECOVERY ); - return NULL; - } - - if( !GetSystemDirectoryA( SystemDirectory, SystemDirSize ) ) { - WSASetLastError( WSANO_RECOVERY ); - WS_DbgPrint(MIN_TRACE, ("Could not get windows system directory.\n")); - return NULL; /* Can't get system directory */ - } - - strncat( SystemDirectory, ServicesFileLocation, SystemDirSize ); - - ServicesFile = CreateFileA( SystemDirectory, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, - NULL ); - - if( ServicesFile == INVALID_HANDLE_VALUE ) { - WSASetLastError( WSANO_RECOVERY ); - return NULL; - } - - /* Scan the services file ... - * - * We will read up to BUFSIZ bytes per pass, until the buffer does not - * contain a full line, then we will try to read more. - * - * We fall from the loop if the buffer does not have a line terminator. - */ - - /* Initial Read */ - while( !Found && - ReadFile( ServicesFile, ServiceDBData + ValidData, - sizeof( ServiceDBData ) - ValidData, - &ReadSize, NULL ) ) { - ValidData += ReadSize; - ReadSize = 0; - NextLine = ThisLine = ServiceDBData; - - /* Find the beginning of the next line */ - while( NextLine < ServiceDBData + ValidData && - *NextLine != '\r' && *NextLine != '\n' ) NextLine++; - - /* Zero and skip, so we can treat what we have as a string */ - if( NextLine >= ServiceDBData + ValidData ) - break; - - *NextLine = 0; NextLine++; - - Comment = strchr( ThisLine, '#' ); - if( Comment ) *Comment = 0; /* Terminate at comment start */ - - if( DecodeServEntFromString( ThisLine, - &ServiceName, - &PortNumberStr, - &ProtocolStr, - Aliases, - WS2_INTERNAL_MAX_ALIAS ) && - !strcmp( ServiceName, name ) && - (proto ? !strcmp( ProtocolStr, proto ) : TRUE) ) { - - WS_DbgPrint(MAX_TRACE,("Found the service entry.\n")); - Found = TRUE; - SizeNeeded = sizeof(WINSOCK_GETSERVBYNAME_CACHE) + - (NextLine - ThisLine); - break; - } - - /* Get rid of everything we read so far */ - while( NextLine <= ServiceDBData + ValidData && - isspace( *NextLine ) ) NextLine++; - - WS_DbgPrint(MAX_TRACE,("About to move %d chars\n", - ServiceDBData + ValidData - NextLine)); - - memmove( ServiceDBData, NextLine, - ServiceDBData + ValidData - NextLine ); - ValidData -= NextLine - ServiceDBData; - WS_DbgPrint(MAX_TRACE,("Valid bytes: %d\n", ValidData)); - } - - /* This we'll do no matter what */ - CloseHandle( ServicesFile ); - - if( !Found ) { - WS_DbgPrint(MAX_TRACE,("Not found\n")); - WSASetLastError( WSANO_DATA ); - return NULL; - } - - if( !p->Getservbyname || p->Getservbyname->Size < SizeNeeded ) { - /* Free previous getservbyname buffer, allocate bigger */ - if( p->Getservbyname ) - HeapFree(GlobalHeap, 0, p->Getservbyname); - p->Getservbyname = HeapAlloc(GlobalHeap, 0, SizeNeeded); - if( !p->Getservbyname ) { - WS_DbgPrint(MIN_TRACE,("Couldn't allocate %d bytes\n", - SizeNeeded)); - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - p->Getservbyname->Size = SizeNeeded; - } - - /* Copy the data */ - memmove( p->Getservbyname->Data, - ThisLine, - NextLine - ThisLine ); - - ADJ_PTR(ServiceName,ThisLine,p->Getservbyname->Data); - ADJ_PTR(ProtocolStr,ThisLine,p->Getservbyname->Data); - WS_DbgPrint(MAX_TRACE, - ("ServiceName: %s, Protocol: %s\n", ServiceName, ProtocolStr)); - - for( i = 0; Aliases[i]; i++ ) { - ADJ_PTR(Aliases[i],ThisLine,p->Getservbyname->Data); - WS_DbgPrint(MAX_TRACE,("Aliase %d: %s\n", i, Aliases[i])); - } - - memcpy(p->Getservbyname,Aliases,sizeof(Aliases)); - - /* Create the struct proper */ - p->Getservbyname->ServerEntry.s_name = ServiceName; - p->Getservbyname->ServerEntry.s_aliases = p->Getservbyname->Aliases; - p->Getservbyname->ServerEntry.s_port = htons(atoi(PortNumberStr)); - p->Getservbyname->ServerEntry.s_proto = ProtocolStr; - - return &p->Getservbyname->ServerEntry; -} - - -/* - * @implemented - */ -LPSERVENT -EXPORT -getservbyport( - IN INT port, - IN CONST CHAR FAR* proto) -{ - BOOL Found = FALSE; - HANDLE ServicesFile; - CHAR ServiceDBData[BUFSIZ] = { 0 }; - PCHAR SystemDirectory = ServiceDBData; /* Reuse this stack space */ - PCHAR ServicesFileLocation = "\\drivers\\etc\\services"; - PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, - ProtocolStr = 0, Comment = 0; - PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; - UINT i,SizeNeeded = 0, - SystemDirSize = sizeof(ServiceDBData) - 1; - DWORD ReadSize = 0, ValidData = 0; - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - - if( !p ) { - WSASetLastError( WSANOTINITIALISED ); - return NULL; - } - - if ( !port ) { - WSASetLastError( WSANO_RECOVERY ); - return NULL; - } - - if( !GetSystemDirectoryA( SystemDirectory, SystemDirSize ) ) { - WSASetLastError( WSANO_RECOVERY ); - WS_DbgPrint(MIN_TRACE, ("Could not get windows system directory.\n")); - return NULL; /* Can't get system directory */ - } - - strncat( SystemDirectory, ServicesFileLocation, SystemDirSize ); - - ServicesFile = CreateFileA( SystemDirectory, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, - NULL ); - - if( ServicesFile == INVALID_HANDLE_VALUE ) { - WSASetLastError( WSANO_RECOVERY ); - return NULL; - } - - /* Scan the services file ... - * - * We will read up to BUFSIZ bytes per pass, until the buffer does not - * contain a full line, then we will try to read more. - * - * We fall from the loop if the buffer does not have a line terminator. - */ - - /* Initial Read */ - while( !Found && - ReadFile( ServicesFile, ServiceDBData + ValidData, - sizeof( ServiceDBData ) - ValidData, - &ReadSize, NULL ) ) { - ValidData += ReadSize; - ReadSize = 0; - NextLine = ThisLine = ServiceDBData; - - /* Find the beginning of the next line */ - while( NextLine < ServiceDBData + ValidData && - *NextLine != '\r' && *NextLine != '\n' ) NextLine++; - - /* Zero and skip, so we can treat what we have as a string */ - if( NextLine >= ServiceDBData + ValidData ) - break; - - *NextLine = 0; NextLine++; - - Comment = strchr( ThisLine, '#' ); - if( Comment ) *Comment = 0; /* Terminate at comment start */ - - if( DecodeServEntFromString( ThisLine, - &ServiceName, - &PortNumberStr, - &ProtocolStr, - Aliases, - WS2_INTERNAL_MAX_ALIAS ) && - (htons(atoi( PortNumberStr )) == port ) && - (proto ? !strcmp( ProtocolStr, proto ) : TRUE) ) { - - WS_DbgPrint(MAX_TRACE,("Found the port entry.\n")); - - Found = TRUE; - SizeNeeded = sizeof(WINSOCK_GETSERVBYPORT_CACHE) + - (NextLine - ThisLine); - break; - } - - /* Get rid of everything we read so far */ - while( NextLine <= ServiceDBData + ValidData && - isspace( *NextLine ) ) NextLine++; - - WS_DbgPrint(MAX_TRACE,("About to move %d chars\n", - ServiceDBData + ValidData - NextLine)); - - memmove( ServiceDBData, NextLine, - ServiceDBData + ValidData - NextLine ); - ValidData -= NextLine - ServiceDBData; - WS_DbgPrint(MAX_TRACE,("Valid bytes: %d\n", ValidData)); - } - - /* This we'll do no matter what */ - CloseHandle( ServicesFile ); - - if( !Found ) { - WS_DbgPrint(MAX_TRACE,("Not found\n")); - WSASetLastError( WSANO_DATA ); - return NULL; - } - - if( !p->Getservbyport || p->Getservbyport->Size < SizeNeeded ) { - /* Free previous getservbyport buffer, allocate bigger */ - if( p->Getservbyport ) - HeapFree(GlobalHeap, 0, p->Getservbyport); - p->Getservbyport = HeapAlloc(GlobalHeap, 0, SizeNeeded); - if( !p->Getservbyport ) { - WS_DbgPrint(MIN_TRACE,("Couldn't allocate %d bytes\n", - SizeNeeded)); - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - p->Getservbyport->Size = SizeNeeded; - } - /* Copy the data */ - memmove( p->Getservbyport->Data, - ThisLine, - NextLine - ThisLine ); - - ADJ_PTR(PortNumberStr,ThisLine,p->Getservbyport->Data); - ADJ_PTR(ProtocolStr,ThisLine,p->Getservbyport->Data); - WS_DbgPrint(MAX_TRACE, - ("Port Number: %s, Protocol: %s\n", PortNumberStr, ProtocolStr)); - - for( i = 0; Aliases[i]; i++ ) { - ADJ_PTR(Aliases[i],ThisLine,p->Getservbyport->Data); - WS_DbgPrint(MAX_TRACE,("Aliases %d: %s\n", i, Aliases[i])); - } - - memcpy(p->Getservbyport,Aliases,sizeof(Aliases)); - - /* Create the struct proper */ - p->Getservbyport->ServerEntry.s_name = ServiceName; - p->Getservbyport->ServerEntry.s_aliases = p->Getservbyport->Aliases; - p->Getservbyport->ServerEntry.s_port = port; - p->Getservbyport->ServerEntry.s_proto = ProtocolStr; - - WS_DbgPrint(MID_TRACE,("s_name: %s\n", ServiceName)); - - return &p->Getservbyport->ServerEntry; - -} - - -/* - * @implemented - */ -ULONG -EXPORT -inet_addr( - IN CONST CHAR FAR* cp) -/* - * FUNCTION: Converts a string containing an IPv4 address to an unsigned long - * ARGUMENTS: - * cp = Pointer to string with address to convert - * RETURNS: - * Binary representation of IPv4 address, or INADDR_NONE - */ -{ - UINT i; - PCHAR p; - ULONG u = 0; - - p = (PCHAR)cp; - - if (strlen(p) == 0) - return INADDR_NONE; - - if (strcmp(p, " ") == 0) - return 0; - - for (i = 0; i <= 3; i++) { - u += (strtoul(p, &p, 0) << (i * 8)); - - if (strlen(p) == 0) - return u; - - if (p[0] != '.') - return INADDR_NONE; - - p++; - } - - return u; -} - - -/* - * @implemented - */ -CHAR FAR* -EXPORT -inet_ntoa( - IN IN_ADDR in) -{ - CHAR b[10]; - PCHAR p; - - p = ((PWINSOCK_THREAD_BLOCK)NtCurrentTeb()->WinSockData)->Intoa; - _itoa(in.S_un.S_addr & 0xFF, b, 10); - strcpy(p, b); - _itoa((in.S_un.S_addr >> 8) & 0xFF, b, 10); - strcat(p, "."); - strcat(p, b); - _itoa((in.S_un.S_addr >> 16) & 0xFF, b, 10); - strcat(p, "."); - strcat(p, b); - _itoa((in.S_un.S_addr >> 24) & 0xFF, b, 10); - strcat(p, "."); - strcat(p, b); - return (CHAR FAR*)p; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetHostByAddr( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* addr, - IN INT len, - IN INT type, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetHostByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetProtoByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetProtoByNumber( - IN HWND hWnd, - IN UINT wMsg, - IN INT number, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetServByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetServByPort( - IN HWND hWnd, - IN UINT wMsg, - IN INT port, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - -/* EOF */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: misc/ns.c + * PURPOSE: Namespace APIs + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * REVISIONS: [truncated at 1000 lines; 1209 more skipped] _____ reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos> /lib <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib> /ws2_32 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32> /misc <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc> stubs.c 1.14 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c?rev=1…> - <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c.diff?…> > 1.15 <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/ws2_32/misc/stubs.c?rev=1…> diff -u -r1.14 -r1.15 --- stubs.c 17 Nov 2004 05:17:22 -0000 1.14 +++ stubs.c 25 Nov 2004 23:32:54 -0000 1.15 @@ -147,7 +147,7 @@ * @implemented */ INT -EXPORT +EXPORT __stdcall setsockopt( IN SOCKET s, IN INT level, CVSspam <http://www.badgers-in-foil.co.uk/projects/cvsspam/> 0.2.8

20 years, 5 months

3
4
0 0

RE: [ros-diffs] [CVS reactos] FPU/SSE state saving on taskswitching, FPU and SSE exception support.

by Hartmut Birr

Hi Gregor, I've some problems with your changes. On my smp machine I get an assertion from fpu.c line 452. I think, it isn't possible to use KPCR.PrcbData.NpxThread on a smp machine. With your first patch I don't have any problems. - Hartmut

20 years, 5 months

3
6
0 0

NTDLL.DLL

by Thomas Larsen

Hi got a problem i Reactos The Kernel32.Def File LIBERY KERNEL32.DLL EXPORTS NTDLL.RTLALLOCHEAP And all the other def files where HAL.Somefunction NTDLL.Somefunction etc are in I know that NTDLL.DLL IMPORTS "RtlAllocateHeap etc." those funktions from a lib in rtl.lib but don�t know if thats the problem becures SCSIPORT.SYS allso import some HAL.somefunction witch allso are broke The tool DependX86 a tool use to find broke link in files can�t either find them and it a littel strange problem becures i should work microsoft allso do that kind of linking against files and allso use lib files to import Use the most recent CVS of Reactos and the newest edition of MingGW Allso tried differet option and differt compilere versions but seems to me theire must lay a strange problem in reactos og MingGw Simpl don�t support that... Crashlist of Files: Kernel32.dll depend on NTdll.dll User32.dll depend on kernel32.dll Atapi.sys depend on Scsiport.sys depend on HAL.DLL The Subsystem CRSS And Many more Anybody Help Me Please Thomas __________________________________ Do you Yahoo!? The all-new My Yahoo! - What will yours do? http://my.yahoo.com

20 years, 5 months

3
2
0 0

RE: [ros-dev] ReactOS and Viruses

by Waldo Alvarez Cañizares

Hi Rick: Well I don't believe that would be a protection at all against viruses. Why? If I where to write a virus and knowing that reactos has such protection that would not stop me at all. I could simply write a function to calculate the hash in the virus (or simply tell the OS to do it for me) and update such database. Look at windows file protection, virus laugh at it. I think the verification of the PE checksum is enough to tell if a file is corrupt and would be faster wich means a faster load. If you want to know some more about viruses look for the e-zines of 29A on the internet to find out more about the subject. Their articles are as advanced as those in phrack (the latest). I think there is not solution for viruses, users will always do insecure things and viruses will be there waiting for them to do it. Regards Waldo ________________________________ De: ros-dev-bounces(a)reactos.com en nombre de Rick Langschultz Enviado el: Lun 11/22/2004 11:25 p.m. Para: ReactOS Development List Asunto: [ros-dev] ReactOS and Viruses Sun will be releasing Solaris 10 shortly as a commercial product available for purchase. There is a new file system that is 128-bit, and is protected by md5 checksums, I think this is a great idea for reactos. I think before a program executes there should be a binary verifier that checks this checksum and then allows the program to run. This would help in deterring Windows viruses from attaching themselves to reactos binaries. Since ReactOS is open source it will be harder to protect a binary if there is an attack and a malicious user replaces a dll or an exe. Perhaps this can be done using a small xml file or a txt file called md5sums or something. Please let me know what you think.

20 years, 5 months

2
1
0 0

Please add pcnet.sys to the bootcd.

by WaxDragon

I noticed yesterday while installing ros from a locally generated bootcd that pcnet.sys is not included. Could someone add it to reactos.dff? Thanks! Andrew -- The cheese stands alone.

20 years, 5 months

2
1
0 0

ReactOS and Viruses

by Rick Langschultz

Sun will be releasing Solaris 10 shortly as a commercial product available for purchase. There is a new file system that is 128-bit, and is protected by md5 checksums, I think this is a great idea for reactos. I think before a program executes there should be a binary verifier that checks this checksum and then allows the program to run. This would help in deterring Windows viruses from attaching themselves to reactos binaries. Since ReactOS is open source it will be harder to protect a binary if there is an attack and a malicious user replaces a dll or an exe. Perhaps this can be done using a small xml file or a txt file called md5sums or something. Please let me know what you think.

20 years, 5 months

5
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev