Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28391: Revert r28389 as it causes a build break, when you perform a full clean build I'll commit a correct fix later
by cfinck＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: cfinck Date: Sat Aug 18 03:08:12 2007 New Revision: 28391 URL: http://svn.reactos.org/svn/reactos?rev=28391&view=rev Log: Revert r28389 as it causes a build break, when you perform a full clean build I'll commit a correct fix later Removed: trunk/reactos/include/reactos/typedefs64.h Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/inflib/builddep.h (contents, props changed) trunk/reactos/lib/inflib/infhost.h (contents, props changed) trunk/reactos/lib/inflib/infhostgen.c trunk/reactos/lib/inflib/infhostget.c trunk/reactos/lib/inflib/infhostglue.c (contents, props changed) trunk/reactos/lib/inflib/infhostput.c trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h (original) +++ trunk/reactos/include/psdk/basetsd.h Sat Aug 18 03:08:12 2007 @@ -107,21 +107,11 @@ #else /* !_WIN64 */ typedef _W64 int INT_PTR, *PINT_PTR; typedef _W64 unsigned int UINT_PTR, *PUINT_PTR; - -#ifndef LONG_PTR_DEFINED -#define LONG_PTR_DEFINED - typedef _W64 long LONG_PTR, *PLONG_PTR; - typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; -#endif - +typedef _W64 long LONG_PTR, *PLONG_PTR; +typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; - -#ifndef HANDLE_PTR_DEFINED -#define HANDLE_PTR_DEFINED - typedef _W64 unsigned long HANDLE_PTR; -#endif - +typedef _W64 unsigned long HANDLE_PTR; #endif /* !_WIN64 */ typedef _W64 ULONG_PTR SIZE_T, *PSIZE_T; Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h (original) +++ trunk/reactos/include/psdk/basetyps.h Sat Aug 18 03:08:12 2007 @@ -77,8 +77,8 @@ #include <guiddef.h> #ifndef _ERROR_STATUS_T_DEFINED +typedef unsigned long error_status_t; #define _ERROR_STATUS_T_DEFINED - typedef unsigned long error_status_t; #endif #ifndef _WCHAR_T_DEFINED Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sat Aug 18 03:08:12 2007 @@ -102,8 +102,8 @@ typedef short SHORT; #ifndef LONG_DEFINED #define LONG_DEFINED - typedef long LONG; - typedef unsigned long ULONG,*PULONG; + typedef long LONG; + typedef unsigned long ULONG,*PULONG; #endif//LONG_DEFINED typedef char CCHAR, *PCCHAR; typedef unsigned char UCHAR,*PUCHAR; Removed: trunk/reactos/include/reactos/typedefs64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs64… ============================================================================== --- trunk/reactos/include/reactos/typedefs64.h (original) +++ trunk/reactos/include/reactos/typedefs64.h (removed) @@ -1,39 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/reactos/typedefs64.h - PURPOSE: Type definitions for host tools, which are built on 64-bit systems - COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> -*/ - -#ifndef _TYPEDEFS64_H -#define _TYPEDEFS64_H - -#ifndef DWORD_DEFINED -#define DWORD_DEFINED - typedef unsigned int DWORD; -#endif - -#ifndef LONG_DEFINED -#define LONG_DEFINED - typedef int LONG; - typedef unsigned int ULONG,*PULONG; -#endif - -#ifndef LONG_PTR_DEFINED -#define LONG_PTR_DEFINED - typedef int LONG_PTR, *PLONG_PTR; - typedef unsigned int ULONG_PTR, *PULONG_PTR; -#endif - -#ifndef HANDLE_PTR_DEFINED -#define HANDLE_PTR_DEFINED - typedef unsigned int HANDLE_PTR; -#endif - -#ifndef _ERROR_STATUS_T_DEFINED -#define _ERROR_STATUS_T_DEFINED - typedef unsigned int error_status_t; -#endif - -#endif Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2839… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sat Aug 18 03:08:12 2007 @@ -9,10 +9,6 @@ #define CMLIB_H //#define WIN32_NO_STATUS -#ifdef CMLIB_HOST -#include <typedefs64.h> -#endif - #include <ntddk.h> #include "hivedata.h" #include "cmdata.h" Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=28… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Sat Aug 18 03:08:12 2007 @@ -33,7 +33,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES -DCMLIB_HOST + -D__NO_CTYPE_INLINES $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sat Aug 18 03:08:12 2007 @@ -30,10 +30,10 @@ typedef char CHAR, *PCHAR; typedef unsigned char UCHAR, *PUCHAR; +typedef long LONG, *PLONG; +typedef unsigned long ULONG, *PULONG; typedef void VOID, *PVOID; typedef UCHAR BOOLEAN, *PBOOLEAN; -#include <typedefs64.h> -typedef LONG *PLONG; typedef char TCHAR, *PTCHAR, *PTSTR; #define _T(x) x @@ -48,7 +48,7 @@ #define strcasecmp stricmp #endif -extern ULONG DbgPrint(char *Fmt, ...); +extern unsigned long DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */ Propchange: trunk/reactos/lib/inflib/builddep.h ------------------------------------------------------------------------------ svn:needs-lock = * Modified: trunk/reactos/lib/inflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhost.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infhost.h (original) +++ trunk/reactos/lib/inflib/infhost.h Sat Aug 18 03:08:12 2007 @@ -17,59 +17,59 @@ extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, - ULONG BufferSize, - ULONG *ErrorLine); + unsigned long BufferSize, + unsigned long *ErrorLine); extern int InfHostOpenFile(PHINF InfHandle, - const CHAR *FileName, - ULONG *ErrorLine); + const char *FileName, + unsigned long *ErrorLine); extern int InfHostWriteFile(HINF InfHandle, - const CHAR *FileName, - const CHAR *HeaderComment); + const char *FileName, + const char *HeaderComment); extern void InfHostCloseFile(HINF InfHandle); extern int InfHostFindFirstLine(HINF InfHandle, - const CHAR *Section, - const CHAR *Key, + const char *Section, + const char *Key, PINFCONTEXT *Context); extern int InfHostFindNextLine(PINFCONTEXT ContextIn, PINFCONTEXT ContextOut); extern int InfHostFindFirstMatchLine(PINFCONTEXT ContextIn, - const CHAR *Key, + const char *Key, PINFCONTEXT ContextOut); extern int InfHostFindNextMatchLine(PINFCONTEXT ContextIn, - const CHAR *Key, + const char *Key, PINFCONTEXT ContextOut); -extern LONG InfHostGetLineCount(HINF InfHandle, - const CHAR *Section); -extern LONG InfHostGetFieldCount(PINFCONTEXT Context); +extern long InfHostGetLineCount(HINF InfHandle, + const char *Section); +extern long InfHostGetFieldCount(PINFCONTEXT Context); extern int InfHostGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - UCHAR *ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize); + unsigned long FieldIndex, + unsigned char *ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize); extern int InfHostGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - ULONG *IntegerValue); + unsigned long FieldIndex, + unsigned long *IntegerValue); extern int InfHostGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR *ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize); + unsigned long FieldIndex, + char *ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize); extern int InfHostGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR *ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize); + unsigned long FieldIndex, + char *ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize); extern int InfHostGetData(PINFCONTEXT Context, - CHAR **Key, - CHAR **Data); + char **Key, + char **Data); extern int InfHostGetDataField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR **Data); + unsigned long FieldIndex, + char **Data); extern int InfHostFindOrAddSection(HINF InfHandle, - const CHAR *Section, + const char *Section, PINFCONTEXT *Context); -extern int InfHostAddLine(PINFCONTEXT Context, const CHAR *Key); -extern int InfHostAddField(PINFCONTEXT Context, const CHAR *Data); +extern int InfHostAddLine(PINFCONTEXT Context, const char *Key); +extern int InfHostAddField(PINFCONTEXT Context, const char *Data); extern void InfHostFreeContext(PINFCONTEXT Context); #ifdef __cplusplus Propchange: trunk/reactos/lib/inflib/infhost.h ------------------------------------------------------------------------------ svn:needs-lock = * Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c (original) +++ trunk/reactos/lib/inflib/infhostgen.c Sat Aug 18 03:08:12 2007 @@ -19,15 +19,15 @@ int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, - ULONG BufferSize, - ULONG *ErrorLine) + unsigned long BufferSize, + unsigned long *ErrorLine) { INFSTATUS Status; PINFCACHE Cache; - CHAR *FileBuffer; + char *FileBuffer; *InfHandle = NULL; - *ErrorLine = (ULONG)-1; + *ErrorLine = (unsigned long)-1; /* Allocate file buffer */ FileBuffer = MALLOC(BufferSize + 1); @@ -77,17 +77,17 @@ int InfHostOpenFile(PHINF InfHandle, - const CHAR *FileName, - ULONG *ErrorLine) + const char *FileName, + unsigned long *ErrorLine) { FILE *File; - CHAR *FileBuffer; - ULONG FileLength; + char *FileBuffer; + unsigned long FileLength; PINFCACHE Cache; INFSTATUS Status; *InfHandle = NULL; - *ErrorLine = (ULONG)-1; + *ErrorLine = (unsigned long)-1; /* Open the inf file */ File = fopen(FileName, "rb"); @@ -108,7 +108,7 @@ } FileLength = ftell(File); - if ((ULONG) -1 == FileLength) + if ((unsigned long) -1 == FileLength) { DPRINT1("ftell() failed (errno %d)\n", errno); fclose(File); Modified: trunk/reactos/lib/inflib/infhostget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostget.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostget.c (original) +++ trunk/reactos/lib/inflib/infhostget.c Sat Aug 18 03:08:12 2007 @@ -16,8 +16,8 @@ int InfHostFindFirstLine(HINF InfHandle, - const CHAR *Section, - const CHAR *Key, + const char *Section, + const char *Key, PINFCONTEXT *Context) { INFSTATUS Status; @@ -56,7 +56,7 @@ int InfHostFindFirstMatchLine(PINFCONTEXT ContextIn, - const CHAR *Key, + const char *Key, PINFCONTEXT ContextOut) { INFSTATUS Status; @@ -76,7 +76,7 @@ int InfHostFindNextMatchLine(PINFCONTEXT ContextIn, - const CHAR *Key, + const char *Key, PINFCONTEXT ContextOut) { INFSTATUS Status; @@ -94,7 +94,7 @@ } -LONG +long InfHostGetLineCount(HINF InfHandle, PCTSTR Section) { @@ -105,7 +105,7 @@ /* InfGetLineText */ -LONG +long InfHostGetFieldCount(PINFCONTEXT Context) { return InfpGetFieldCount(Context); @@ -114,10 +114,10 @@ int InfHostGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - UCHAR *ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize) + unsigned long FieldIndex, + unsigned char *ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize) { INFSTATUS Status; @@ -137,8 +137,8 @@ int InfHostGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - ULONG *IntegerValue) + unsigned long FieldIndex, + unsigned long *IntegerValue) { INFSTATUS Status; @@ -157,10 +157,10 @@ int InfHostGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR * ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize) + unsigned long FieldIndex, + char * ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize) { INFSTATUS Status; @@ -180,10 +180,10 @@ int InfHostGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR *ReturnBuffer, - ULONG ReturnBufferSize, - ULONG *RequiredSize) + unsigned long FieldIndex, + char *ReturnBuffer, + unsigned long ReturnBufferSize, + unsigned long *RequiredSize) { INFSTATUS Status; @@ -203,8 +203,8 @@ int InfHostGetData(PINFCONTEXT Context, - CHAR **Key, - CHAR **Data) + char **Key, + char **Data) { INFSTATUS Status; @@ -223,8 +223,8 @@ int InfHostGetDataField(PINFCONTEXT Context, - ULONG FieldIndex, - CHAR **Data) + unsigned long FieldIndex, + char **Data) { INFSTATUS Status; Modified: trunk/reactos/lib/inflib/infhostglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostglue.c?r… ============================================================================== --- trunk/reactos/lib/inflib/infhostglue.c (original) +++ trunk/reactos/lib/inflib/infhostglue.c Sat Aug 18 03:08:12 2007 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> -ULONG +unsigned long DbgPrint(char *Fmt, ...) { va_list Args; Propchange: trunk/reactos/lib/inflib/infhostglue.c ------------------------------------------------------------------------------ svn:needs-lock = * Modified: trunk/reactos/lib/inflib/infhostput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostput.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostput.c (original) +++ trunk/reactos/lib/inflib/infhostput.c Sat Aug 18 03:08:12 2007 @@ -13,11 +13,11 @@ #include <debug.h> int -InfHostWriteFile(HINF InfHandle, const CHAR *FileName, - const CHAR *HeaderComment) +InfHostWriteFile(HINF InfHandle, const char *FileName, + const char *HeaderComment) { - CHAR *Buffer; - ULONG BufferSize; + char *Buffer; + unsigned long BufferSize; INFSTATUS Status; FILE *File; @@ -60,7 +60,7 @@ int InfHostFindOrAddSection(HINF InfHandle, - const CHAR *Section, + const char *Section, PINFCONTEXT *Context) { INFSTATUS Status; @@ -78,7 +78,7 @@ } int -InfHostAddLine(PINFCONTEXT Context, const CHAR *Key) +InfHostAddLine(PINFCONTEXT Context, const char *Key) { INFSTATUS Status; @@ -95,7 +95,7 @@ } int -InfHostAddField(PINFCONTEXT Context, const CHAR *Data) +InfHostAddField(PINFCONTEXT Context, const char *Data) { INFSTATUS Status; Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h (original) +++ trunk/reactos/tools/mkhive/mkhive.h Sat Aug 18 03:08:12 2007 @@ -37,11 +37,6 @@ #define NTOS_MODE_USER #define WIN32_NO_STATUS - -#ifdef MKHIVE_HOST -#include <typedefs64.h> -#endif - #include <ntddk.h> #include <cmlib.h> #include <infhost.h> Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Sat Aug 18 03:08:12 2007 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ -D_NTSYSTEM_ -DMKHIVE_HOST \ + -D_NTOSKRNL_ -D_NTSYSTEM_ \ -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

1 0

[cfinck] 28390: [AUDIT] I had to break some SVN locks to add my latest commit. Here I'm undoing some of them now: builddep.h - Remains unlocked. It just contains basic type definitions and include statements infcommon.h - Just unlocked this file. It just contains one basic definition and two type definitions infhost.h - Remains unlocked. It just contains the function prototypes for functions in the other source files infhostgen.c - Locked again as I did not check this file infhostget.c - Locked
by cfinck＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: cfinck Date: Sat Aug 18 02:32:52 2007 New Revision: 28390 URL: http://svn.reactos.org/svn/reactos?rev=28390&view=rev Log: [AUDIT] I had to break some SVN locks to add my latest commit. Here I'm undoing some of them now: builddep.h - Remains unlocked. It just contains basic type definitions and include statements infcommon.h - Just unlocked this file. It just contains one basic definition and two type definitions infhost.h - Remains unlocked. It just contains the function prototypes for functions in the other source files infhostgen.c - Locked again as I did not check this file infhostget.c - Locked again as I did not check this file infhostglue.c - Remains unlocked. It just contains a DbgPrint function, which can be found in many ReactOS source files infhostput.c - Locked again as I did not check this file inflib.mak - Just unlocked this file. No reason for a makefile to be locked. README.txt - Just unlocked this file. No reason for a readme file to be locked. Modified: trunk/reactos/lib/inflib/README.txt (props changed) trunk/reactos/lib/inflib/infcommon.h (props changed) trunk/reactos/lib/inflib/infhostgen.c (props changed) trunk/reactos/lib/inflib/infhostget.c (props changed) trunk/reactos/lib/inflib/infhostput.c (props changed) trunk/reactos/lib/inflib/inflib.mak (props changed) Propchange: trunk/reactos/lib/inflib/README.txt ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/inflib/infcommon.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/inflib/infhostgen.c ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/lib/inflib/infhostget.c ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/lib/inflib/infhostput.c ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/lib/inflib/inflib.mak ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[cfinck] 28389: Fix the long-standing mkhive bug on 64-bit systems This is now done by adding a "typedefs64.h" header file, which uses int's instead of long's for 32-bit values. As far as I know, this is the only way to avoid the problem that a long has a size of 64-bit on 64-bit systems. This header file is now used in the host makefiles of cmlib, inflib and mkhive. It is also suitable for the other host tools, which need 32-bit values (will do some changes there in the next few days). Unfortun
by cfinck＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: cfinck Date: Sat Aug 18 02:17:13 2007 New Revision: 28389 URL: http://svn.reactos.org/svn/reactos?rev=28389&view=rev Log: Fix the long-standing mkhive bug on 64-bit systems This is now done by adding a "typedefs64.h" header file, which uses int's instead of long's for 32-bit values. As far as I know, this is the only way to avoid the problem that a long has a size of 64-bit on 64-bit systems. This header file is now used in the host makefiles of cmlib, inflib and mkhive. It is also suitable for the other host tools, which need 32-bit values (will do some changes there in the next few days). Unfortunately, Live-CDs still do not work because of another bug (see bug #2290). But I compared the hives created by 32-bit Debian Linux and 64-bit Debian Linux and after these changes, they are exactly the same. See issue #2272 for more details. Added: trunk/reactos/include/reactos/typedefs64.h Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/inflib/builddep.h (contents, props changed) trunk/reactos/lib/inflib/infhost.h (contents, props changed) trunk/reactos/lib/inflib/infhostgen.c (contents, props changed) trunk/reactos/lib/inflib/infhostget.c (contents, props changed) trunk/reactos/lib/inflib/infhostglue.c (contents, props changed) trunk/reactos/lib/inflib/infhostput.c (contents, props changed) trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h (original) +++ trunk/reactos/include/psdk/basetsd.h Sat Aug 18 02:17:13 2007 @@ -107,11 +107,21 @@ #else /* !_WIN64 */ typedef _W64 int INT_PTR, *PINT_PTR; typedef _W64 unsigned int UINT_PTR, *PUINT_PTR; -typedef _W64 long LONG_PTR, *PLONG_PTR; -typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; + +#ifndef LONG_PTR_DEFINED +#define LONG_PTR_DEFINED + typedef _W64 long LONG_PTR, *PLONG_PTR; + typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; +#endif + typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; -typedef _W64 unsigned long HANDLE_PTR; + +#ifndef HANDLE_PTR_DEFINED +#define HANDLE_PTR_DEFINED + typedef _W64 unsigned long HANDLE_PTR; +#endif + #endif /* !_WIN64 */ typedef _W64 ULONG_PTR SIZE_T, *PSIZE_T; Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h (original) +++ trunk/reactos/include/psdk/basetyps.h Sat Aug 18 02:17:13 2007 @@ -77,8 +77,8 @@ #include <guiddef.h> #ifndef _ERROR_STATUS_T_DEFINED -typedef unsigned long error_status_t; #define _ERROR_STATUS_T_DEFINED + typedef unsigned long error_status_t; #endif #ifndef _WCHAR_T_DEFINED Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sat Aug 18 02:17:13 2007 @@ -102,8 +102,8 @@ typedef short SHORT; #ifndef LONG_DEFINED #define LONG_DEFINED - typedef long LONG; - typedef unsigned long ULONG,*PULONG; + typedef long LONG; + typedef unsigned long ULONG,*PULONG; #endif//LONG_DEFINED typedef char CCHAR, *PCCHAR; typedef unsigned char UCHAR,*PUCHAR; Added: trunk/reactos/include/reactos/typedefs64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs64… ============================================================================== --- trunk/reactos/include/reactos/typedefs64.h (added) +++ trunk/reactos/include/reactos/typedefs64.h Sat Aug 18 02:17:13 2007 @@ -1,0 +1,39 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: include/reactos/typedefs64.h + PURPOSE: Type definitions for host tools, which are built on 64-bit systems + COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +*/ + +#ifndef _TYPEDEFS64_H +#define _TYPEDEFS64_H + +#ifndef DWORD_DEFINED +#define DWORD_DEFINED + typedef unsigned int DWORD; +#endif + +#ifndef LONG_DEFINED +#define LONG_DEFINED + typedef int LONG; + typedef unsigned int ULONG,*PULONG; +#endif + +#ifndef LONG_PTR_DEFINED +#define LONG_PTR_DEFINED + typedef int LONG_PTR, *PLONG_PTR; + typedef unsigned int ULONG_PTR, *PULONG_PTR; +#endif + +#ifndef HANDLE_PTR_DEFINED +#define HANDLE_PTR_DEFINED + typedef unsigned int HANDLE_PTR; +#endif + +#ifndef _ERROR_STATUS_T_DEFINED +#define _ERROR_STATUS_T_DEFINED + typedef unsigned int error_status_t; +#endif + +#endif Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2838… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sat Aug 18 02:17:13 2007 @@ -9,6 +9,10 @@ #define CMLIB_H //#define WIN32_NO_STATUS +#ifdef CMLIB_HOST +#include <typedefs64.h> +#endif + #include <ntddk.h> #include "hivedata.h" #include "cmdata.h" Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=28… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Sat Aug 18 02:17:13 2007 @@ -33,7 +33,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES + -D__NO_CTYPE_INLINES -DCMLIB_HOST $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sat Aug 18 02:17:13 2007 @@ -30,10 +30,10 @@ typedef char CHAR, *PCHAR; typedef unsigned char UCHAR, *PUCHAR; -typedef long LONG, *PLONG; -typedef unsigned long ULONG, *PULONG; typedef void VOID, *PVOID; typedef UCHAR BOOLEAN, *PBOOLEAN; +#include <typedefs64.h> +typedef LONG *PLONG; typedef char TCHAR, *PTCHAR, *PTSTR; #define _T(x) x @@ -48,7 +48,7 @@ #define strcasecmp stricmp #endif -extern unsigned long DbgPrint(char *Fmt, ...); +extern ULONG DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */ Propchange: trunk/reactos/lib/inflib/builddep.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/inflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhost.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infhost.h (original) +++ trunk/reactos/lib/inflib/infhost.h Sat Aug 18 02:17:13 2007 @@ -17,59 +17,59 @@ extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, - unsigned long BufferSize, - unsigned long *ErrorLine); + ULONG BufferSize, + ULONG *ErrorLine); extern int InfHostOpenFile(PHINF InfHandle, - const char *FileName, - unsigned long *ErrorLine); + const CHAR *FileName, + ULONG *ErrorLine); extern int InfHostWriteFile(HINF InfHandle, - const char *FileName, - const char *HeaderComment); + const CHAR *FileName, + const CHAR *HeaderComment); extern void InfHostCloseFile(HINF InfHandle); extern int InfHostFindFirstLine(HINF InfHandle, - const char *Section, - const char *Key, + const CHAR *Section, + const CHAR *Key, PINFCONTEXT *Context); extern int InfHostFindNextLine(PINFCONTEXT ContextIn, PINFCONTEXT ContextOut); extern int InfHostFindFirstMatchLine(PINFCONTEXT ContextIn, - const char *Key, + const CHAR *Key, PINFCONTEXT ContextOut); extern int InfHostFindNextMatchLine(PINFCONTEXT ContextIn, - const char *Key, + const CHAR *Key, PINFCONTEXT ContextOut); -extern long InfHostGetLineCount(HINF InfHandle, - const char *Section); -extern long InfHostGetFieldCount(PINFCONTEXT Context); +extern LONG InfHostGetLineCount(HINF InfHandle, + const CHAR *Section); +extern LONG InfHostGetFieldCount(PINFCONTEXT Context); extern int InfHostGetBinaryField(PINFCONTEXT Context, - unsigned long FieldIndex, - unsigned char *ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize); + ULONG FieldIndex, + UCHAR *ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize); extern int InfHostGetIntField(PINFCONTEXT Context, - unsigned long FieldIndex, - unsigned long *IntegerValue); + ULONG FieldIndex, + ULONG *IntegerValue); extern int InfHostGetMultiSzField(PINFCONTEXT Context, - unsigned long FieldIndex, - char *ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize); + ULONG FieldIndex, + CHAR *ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize); extern int InfHostGetStringField(PINFCONTEXT Context, - unsigned long FieldIndex, - char *ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize); + ULONG FieldIndex, + CHAR *ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize); extern int InfHostGetData(PINFCONTEXT Context, - char **Key, - char **Data); + CHAR **Key, + CHAR **Data); extern int InfHostGetDataField(PINFCONTEXT Context, - unsigned long FieldIndex, - char **Data); + ULONG FieldIndex, + CHAR **Data); extern int InfHostFindOrAddSection(HINF InfHandle, - const char *Section, + const CHAR *Section, PINFCONTEXT *Context); -extern int InfHostAddLine(PINFCONTEXT Context, const char *Key); -extern int InfHostAddField(PINFCONTEXT Context, const char *Data); +extern int InfHostAddLine(PINFCONTEXT Context, const CHAR *Key); +extern int InfHostAddField(PINFCONTEXT Context, const CHAR *Data); extern void InfHostFreeContext(PINFCONTEXT Context); #ifdef __cplusplus Propchange: trunk/reactos/lib/inflib/infhost.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c (original) +++ trunk/reactos/lib/inflib/infhostgen.c Sat Aug 18 02:17:13 2007 @@ -19,15 +19,15 @@ int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, - unsigned long BufferSize, - unsigned long *ErrorLine) + ULONG BufferSize, + ULONG *ErrorLine) { INFSTATUS Status; PINFCACHE Cache; - char *FileBuffer; + CHAR *FileBuffer; *InfHandle = NULL; - *ErrorLine = (unsigned long)-1; + *ErrorLine = (ULONG)-1; /* Allocate file buffer */ FileBuffer = MALLOC(BufferSize + 1); @@ -77,17 +77,17 @@ int InfHostOpenFile(PHINF InfHandle, - const char *FileName, - unsigned long *ErrorLine) + const CHAR *FileName, + ULONG *ErrorLine) { FILE *File; - char *FileBuffer; - unsigned long FileLength; + CHAR *FileBuffer; + ULONG FileLength; PINFCACHE Cache; INFSTATUS Status; *InfHandle = NULL; - *ErrorLine = (unsigned long)-1; + *ErrorLine = (ULONG)-1; /* Open the inf file */ File = fopen(FileName, "rb"); @@ -108,7 +108,7 @@ } FileLength = ftell(File); - if ((unsigned long) -1 == FileLength) + if ((ULONG) -1 == FileLength) { DPRINT1("ftell() failed (errno %d)\n", errno); fclose(File); Propchange: trunk/reactos/lib/inflib/infhostgen.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/inflib/infhostget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostget.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostget.c (original) +++ trunk/reactos/lib/inflib/infhostget.c Sat Aug 18 02:17:13 2007 @@ -16,8 +16,8 @@ int InfHostFindFirstLine(HINF InfHandle, - const char *Section, - const char *Key, + const CHAR *Section, + const CHAR *Key, PINFCONTEXT *Context) { INFSTATUS Status; @@ -56,7 +56,7 @@ int InfHostFindFirstMatchLine(PINFCONTEXT ContextIn, - const char *Key, + const CHAR *Key, PINFCONTEXT ContextOut) { INFSTATUS Status; @@ -76,7 +76,7 @@ int InfHostFindNextMatchLine(PINFCONTEXT ContextIn, - const char *Key, + const CHAR *Key, PINFCONTEXT ContextOut) { INFSTATUS Status; @@ -94,7 +94,7 @@ } -long +LONG InfHostGetLineCount(HINF InfHandle, PCTSTR Section) { @@ -105,7 +105,7 @@ /* InfGetLineText */ -long +LONG InfHostGetFieldCount(PINFCONTEXT Context) { return InfpGetFieldCount(Context); @@ -114,10 +114,10 @@ int InfHostGetBinaryField(PINFCONTEXT Context, - unsigned long FieldIndex, - unsigned char *ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize) + ULONG FieldIndex, + UCHAR *ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize) { INFSTATUS Status; @@ -137,8 +137,8 @@ int InfHostGetIntField(PINFCONTEXT Context, - unsigned long FieldIndex, - unsigned long *IntegerValue) + ULONG FieldIndex, + ULONG *IntegerValue) { INFSTATUS Status; @@ -157,10 +157,10 @@ int InfHostGetMultiSzField(PINFCONTEXT Context, - unsigned long FieldIndex, - char * ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize) + ULONG FieldIndex, + CHAR * ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize) { INFSTATUS Status; @@ -180,10 +180,10 @@ int InfHostGetStringField(PINFCONTEXT Context, - unsigned long FieldIndex, - char *ReturnBuffer, - unsigned long ReturnBufferSize, - unsigned long *RequiredSize) + ULONG FieldIndex, + CHAR *ReturnBuffer, + ULONG ReturnBufferSize, + ULONG *RequiredSize) { INFSTATUS Status; @@ -203,8 +203,8 @@ int InfHostGetData(PINFCONTEXT Context, - char **Key, - char **Data) + CHAR **Key, + CHAR **Data) { INFSTATUS Status; @@ -223,8 +223,8 @@ int InfHostGetDataField(PINFCONTEXT Context, - unsigned long FieldIndex, - char **Data) + ULONG FieldIndex, + CHAR **Data) { INFSTATUS Status; Propchange: trunk/reactos/lib/inflib/infhostget.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/inflib/infhostglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostglue.c?r… ============================================================================== --- trunk/reactos/lib/inflib/infhostglue.c (original) +++ trunk/reactos/lib/inflib/infhostglue.c Sat Aug 18 02:17:13 2007 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> -unsigned long +ULONG DbgPrint(char *Fmt, ...) { va_list Args; Propchange: trunk/reactos/lib/inflib/infhostglue.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/inflib/infhostput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostput.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostput.c (original) +++ trunk/reactos/lib/inflib/infhostput.c Sat Aug 18 02:17:13 2007 @@ -13,11 +13,11 @@ #include <debug.h> int -InfHostWriteFile(HINF InfHandle, const char *FileName, - const char *HeaderComment) +InfHostWriteFile(HINF InfHandle, const CHAR *FileName, + const CHAR *HeaderComment) { - char *Buffer; - unsigned long BufferSize; + CHAR *Buffer; + ULONG BufferSize; INFSTATUS Status; FILE *File; @@ -60,7 +60,7 @@ int InfHostFindOrAddSection(HINF InfHandle, - const char *Section, + const CHAR *Section, PINFCONTEXT *Context) { INFSTATUS Status; @@ -78,7 +78,7 @@ } int -InfHostAddLine(PINFCONTEXT Context, const char *Key) +InfHostAddLine(PINFCONTEXT Context, const CHAR *Key) { INFSTATUS Status; @@ -95,7 +95,7 @@ } int -InfHostAddField(PINFCONTEXT Context, const char *Data) +InfHostAddField(PINFCONTEXT Context, const CHAR *Data) { INFSTATUS Status; Propchange: trunk/reactos/lib/inflib/infhostput.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h (original) +++ trunk/reactos/tools/mkhive/mkhive.h Sat Aug 18 02:17:13 2007 @@ -37,6 +37,11 @@ #define NTOS_MODE_USER #define WIN32_NO_STATUS + +#ifdef MKHIVE_HOST +#include <typedefs64.h> +#endif + #include <ntddk.h> #include <cmlib.h> #include <infhost.h> Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Sat Aug 18 02:17:13 2007 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ -D_NTSYSTEM_ \ + -D_NTOSKRNL_ -D_NTSYSTEM_ -DMKHIVE_HOST \ -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

1 0

[greatlrd] 28388: fixing the build and adding wine d3d8 and wined3d to bootcd
by greatlrd＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: greatlrd Date: Fri Aug 17 23:41:23 2007 New Revision: 28388 URL: http://svn.reactos.org/svn/reactos?rev=28388&view=rev Log: fixing the build and adding wine d3d8 and wined3d to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Aug 17 23:41:23 2007 @@ -119,7 +119,8 @@ dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 -dll\directx\d3d8\d3d8.dll 1 +dll\directx\wine\d3d8\d3d8.dll 1 +dll\directx\wine\wined3d\wined3d.dll 1 dll\directx\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1

1 0

[greatlrd] 28387: adding wine dx to the build all, wined3d and d3d8 is from wine cvs server date 17/8-2007
by greatlrd＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: greatlrd Date: Fri Aug 17 23:24:59 2007 New Revision: 28387 URL: http://svn.reactos.org/svn/reactos?rev=28387&view=rev Log: adding wine dx to the build all, wined3d and d3d8 is from wine cvs server date 17/8-2007 Modified: trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild (original) +++ trunk/reactos/dll/directx/directx.rbuild Fri Aug 17 23:24:59 2007 @@ -28,8 +28,9 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> -<directory name="d3d8"> - <xi:include href="d3d8/d3d8.rbuild" /> + +<directory name="wine"> + <xi:include href="wine/wine.rbuild" /> </directory> <directory name="d3d9"> <xi:include href="d3d9/d3d9.rbuild" /> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild Fri Aug 17 23:24:59 2007 @@ -37,6 +37,7 @@ <file>vertexshader.c</file> <file>volume.c</file> <file>volumetexture.c</file> + <file>version.rc</file> <file>d3d8.spec</file> </module>

1 0

[greatlrd] 28386: This is a temporary solution to our DX problem it will take some times getting native DirectX working in user mode. Wine Have manger ported their DirectX to Windows, And after some help from wine (Roderick Colenbrander aka Thunderbird), That mean we got now DirectX8 support in ReactOS from wine DirectX (base on opengl). (rember disable the SSE in mesa before trying it, and it is untested in ReactOS)
by greatlrd＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: greatlrd Date: Fri Aug 17 22:29:23 2007 New Revision: 28386 URL: http://svn.reactos.org/svn/reactos?rev=28386&view=rev Log: This is a temporary solution to our DX problem it will take some times getting native DirectX working in user mode. Wine Have manger ported their DirectX to Windows, And after some help from wine (Roderick Colenbrander aka Thunderbird), That mean we got now DirectX8 support in ReactOS from wine DirectX (base on opengl). (rember disable the SSE in mesa before trying it, and it is untested in ReactOS) Added: trunk/reactos/dll/directx/wine/ trunk/reactos/dll/directx/wine/d3d8/ trunk/reactos/dll/directx/wine/d3d8/Makefile.in (with props) trunk/reactos/dll/directx/wine/d3d8/basetexture.c (with props) trunk/reactos/dll/directx/wine/d3d8/cubetexture.c (with props) trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild (with props) trunk/reactos/dll/directx/wine/d3d8/d3d8.spec (with props) trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c (with props) trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h (with props) trunk/reactos/dll/directx/wine/d3d8/device.c (with props) trunk/reactos/dll/directx/wine/d3d8/directx.c (with props) trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c (with props) trunk/reactos/dll/directx/wine/d3d8/pixelshader.c (with props) trunk/reactos/dll/directx/wine/d3d8/resource.c (with props) trunk/reactos/dll/directx/wine/d3d8/stateblock.c (with props) trunk/reactos/dll/directx/wine/d3d8/surface.c (with props) trunk/reactos/dll/directx/wine/d3d8/swapchain.c (with props) trunk/reactos/dll/directx/wine/d3d8/texture.c (with props) trunk/reactos/dll/directx/wine/d3d8/version.rc (with props) trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c (with props) trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c (with props) trunk/reactos/dll/directx/wine/d3d8/vertexshader.c (with props) trunk/reactos/dll/directx/wine/d3d8/volume.c (with props) trunk/reactos/dll/directx/wine/d3d8/volumetexture.c (with props) trunk/reactos/dll/directx/wine/readme.txt (with props) trunk/reactos/dll/directx/wine/wine.rbuild (with props) trunk/reactos/dll/directx/wine/wined3d/ trunk/reactos/dll/directx/wine/wined3d/Makefile.in (with props) trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c (with props) trunk/reactos/dll/directx/wine/wined3d/baseshader.c (with props) trunk/reactos/dll/directx/wine/wined3d/basetexture.c (with props) trunk/reactos/dll/directx/wine/wined3d/clipper.c (with props) trunk/reactos/dll/directx/wine/wined3d/context.c (with props) trunk/reactos/dll/directx/wine/wined3d/cubetexture.c (with props) trunk/reactos/dll/directx/wine/wined3d/device.c (with props) trunk/reactos/dll/directx/wine/wined3d/directx.c (with props) trunk/reactos/dll/directx/wine/wined3d/drawprim.c (with props) trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c (with props) trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c (with props) trunk/reactos/dll/directx/wine/wined3d/palette.c (with props) trunk/reactos/dll/directx/wine/wined3d/pixelshader.c (with props) trunk/reactos/dll/directx/wine/wined3d/query.c (with props) trunk/reactos/dll/directx/wine/wined3d/resource.c (with props) trunk/reactos/dll/directx/wine/wined3d/state.c (with props) trunk/reactos/dll/directx/wine/wined3d/stateblock.c (with props) trunk/reactos/dll/directx/wine/wined3d/surface.c (with props) trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c (with props) trunk/reactos/dll/directx/wine/wined3d/swapchain.c (with props) trunk/reactos/dll/directx/wine/wined3d/texture.c (with props) trunk/reactos/dll/directx/wine/wined3d/utils.c (with props) trunk/reactos/dll/directx/wine/wined3d/version.rc (with props) trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c (with props) trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c (with props) trunk/reactos/dll/directx/wine/wined3d/vertexshader.c (with props) trunk/reactos/dll/directx/wine/wined3d/volume.c (with props) trunk/reactos/dll/directx/wine/wined3d/volumetexture.c (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d.def (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d.spec (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/directx/wine/d3d8/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/Make… Added: trunk/reactos/dll/directx/wine/d3d8/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/base… Added: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Added: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Added: trunk/reactos/dll/directx/wine/d3d8/d3d8.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Added: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Added: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Added: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Added: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Added: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Added: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Added: trunk/reactos/dll/directx/wine/d3d8/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/reso… Added: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Added: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Added: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Added: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Added: trunk/reactos/dll/directx/wine/d3d8/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vers… Added: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Added: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Added: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Added: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Added: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Added: trunk/reactos/dll/directx/wine/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/readme.tx… Added: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui… Added: trunk/reactos/dll/directx/wine/wined3d/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/M… Added: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Added: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Added: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Added: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Added: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Added: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Added: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Added: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Added: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Added: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Added: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Added: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Added: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Added: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Added: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Added: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Added: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Added: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Added: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Added: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Added: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Added: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Added: trunk/reactos/dll/directx/wine/wined3d/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…

1 0

[jimtabor] 28385: Add the rest of the dcattr structure, LocalIcm and flags with VDS size.
by jimtabor＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: jimtabor Date: Fri Aug 17 21:55:56 2007 New Revision: 28385 URL: http://svn.reactos.org/svn/reactos?rev=28385&view=rev Log: Add the rest of the dcattr structure, LocalIcm and flags with VDS size. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Fri Aug 17 21:55:56 2007 @@ -214,8 +214,10 @@ LONG lIcmMode; HANDLE hcmXform; HCOLORSPACE hColorSpace; + FLONG flIcmFlags; INT IcmBrushColor; - INT IcmPenColor; + INT IcmPenColor; + PVOID pvLIcm; FLONG flTextAlign; LONG lTextAlign; LONG lTextExtra; @@ -239,7 +241,8 @@ SIZEL szlViewportExt; FLONG flXform; SIZEL szlVirtualDevicePixel; - SIZEL szlVirtualDeviceMm; + SIZEL szlVirtualDeviceMm; + SIZEL szlVirtualDeviceSize; POINTL ptlBrushOrigin; RGNATTR VisRectRegion; } DC_ATTR, *PDC_ATTR;

1 0

[jimtabor] 28384: Add 4 more dcattr units.
by jimtabor＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: jimtabor Date: Fri Aug 17 20:24:28 2007 New Revision: 28384 URL: http://svn.reactos.org/svn/reactos?rev=28384&view=rev Log: Add 4 more dcattr units. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Fri Aug 17 20:24:28 2007 @@ -226,6 +226,10 @@ MATRIX_S mxWorldToDevice; MATRIX_S mxDevicetoWorld; MATRIX_S mxWorldToPage; + EFLOAT_S efM11PtoD; + EFLOAT_S efM22PtoD; + EFLOAT_S efDxPtoD; + EFLOAT_S efDyPtoD; INT iMapMode; DWORD dwLayout; LONG lWindowOrgx;

1 0

[greatlrd] 28383: forget remove a wine hack from this headers
by greatlrd＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: greatlrd Date: Fri Aug 17 19:41:54 2007 New Revision: 28383 URL: http://svn.reactos.org/svn/reactos?rev=28383&view=rev Log: forget remove a wine hack from this headers Modified: trunk/reactos/include/psdk/d3dtypes.h Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h (original) +++ trunk/reactos/include/psdk/d3dtypes.h Fri Aug 17 19:41:54 2007 @@ -25,9 +25,7 @@ #ifndef __WINE_D3DTYPES_H #define __WINE_D3DTYPES_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +/* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ #include <float.h> #include <ddraw.h>

1 0

[cfinck] 28382: Obsolete, we have this in the "RosBE-Windows" directory as well
by cfinck＠svn.reactos.org 17 Aug '07

17 Aug '07

Author: cfinck Date: Fri Aug 17 18:58:48 2007 New Revision: 28382 URL: http://svn.reactos.org/svn/reactos?rev=28382&view=rev Log: Obsolete, we have this in the "RosBE-Windows" directory as well Removed: trunk/tools/mingw-make/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs