Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[janderwald] 29048: - include intermediate path for msvc projects since buildno.h and friends are now generated there
by janderwald＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: janderwald Date: Sat Sep 15 01:05:46 2007 New Revision: 29048 URL: http://svn.reactos.org/svn/reactos?rev=29048&view=rev Log: - include intermediate path for msvc projects since buildno.h and friends are now generated there Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Sep 15 01:05:46 2007 @@ -220,8 +220,11 @@ baseaddr = prop.value; } } - - string include_string; + /* include intermediate path for reactos.rc */ + string version = intdir + "\\include\\reactos"; + includes.push_back (version); + + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" );

1 0

[cfinck] 29047: This is hopefully the last fix needed to build LiveCD on Unix hosts again
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:34:24 2007 New Revision: 29047 URL: http://svn.reactos.org/svn/reactos?rev=29047&view=rev Log: This is hopefully the last fix needed to build LiveCD on Unix hosts again Modified: trunk/reactos/lib/cmlib/cmdata.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=290… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Fri Sep 14 23:34:24 2007 @@ -20,7 +20,11 @@ #ifndef _CM_ +#ifdef CMLIB_HOST +#include <host/pshpack1.h> +#else #include <pshpack1.h> +#endif typedef struct _CM_VIEW_OF_FILE { @@ -147,7 +151,11 @@ UCHAR Data[0]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; +#ifdef CMLIB_HOST +#include <host/poppack.h> +#else #include <poppack.h> +#endif #endif

1 0

[cfinck] 29046: Small change in the slovak translation of Solitaire (patch by Mario Kacmar, kario AT szm DOT sk)
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:26:20 2007 New Revision: 29046 URL: http://svn.reactos.org/svn/reactos?rev=29046&view=rev Log: Small change in the slovak translation of Solitaire (patch by Mario Kacmar, kario AT szm DOT sk) Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Sep 14 23:26:20 2007 @@ -31,7 +31,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Výber rubu kariet" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -40,7 +40,7 @@ CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + PUSHBUTTON "Zrui", IDCANCEL, 162, 77, 54, 13 END

1 0

[cfinck] 29045: And here comes the next fix, this time for fixing the LiveCD build
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:23:36 2007 New Revision: 29045 URL: http://svn.reactos.org/svn/reactos?rev=29045&view=rev Log: And here comes the next fix, this time for fixing the LiveCD build Modified: trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Fri Sep 14 23:23:36 2007 @@ -43,7 +43,11 @@ #define HvGetCellType(Cell) \ ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) +#ifdef CMLIB_HOST +#include <host/pshpack1.h> +#else #include <pshpack1.h> +#endif /** * @name HBASE_BLOCK @@ -127,7 +131,11 @@ LONG Size; } HCELL, *PHCELL; +#ifdef CMLIB_HOST +#include <host/poppack.h> +#else #include <poppack.h> +#endif #define IsFreeCell(Cell)(Cell->Size >= 0) #define IsUsedCell(Cell)(Cell->Size < 0)

1 0

[cfinck] 29044: Forgot to change these ones as well. But somehow it compiled fine under Windows, even without these changes.
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:13:03 2007 New Revision: 29044 URL: http://svn.reactos.org/svn/reactos?rev=29044&view=rev Log: Forgot to change these ones as well. But somehow it compiled fine under Windows, even without these changes. Modified: trunk/reactos/tools/wrc/newstruc.c Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Fri Sep 14 23:13:03 2007 @@ -32,7 +32,7 @@ #include "utils.h" #include "parser.h" -#include <pshpack2.h> +#include <host/pshpack2.h> typedef struct { DWORD biSize; @@ -41,7 +41,7 @@ WORD biPlanes; WORD biBitCount; } BITMAPOS2HEADER; -#include <poppack.h> +#include <host/poppack.h> /* Generate new_* functions that have no parameters (NOTE: no ';') */ __NEW_STRUCT_FUNC(dialog)

1 0

[cfinck] 29043: Forgot to change these ones
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:02:21 2007 New Revision: 29043 URL: http://svn.reactos.org/svn/reactos?rev=29043&view=rev Log: Forgot to change these ones Modified: trunk/reactos/include/host/typedefs.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Fri Sep 14 23:02:21 2007 @@ -75,7 +75,7 @@ #define MAXUSHORT USHRT_MAX -#include <pshpack4.h> +#include <host/pshpack4.h> typedef struct _RTL_BITMAP { ULONG SizeOfBitMap; @@ -117,7 +117,7 @@ USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -#include <poppack.h> +#include <host/poppack.h> typedef const UNICODE_STRING *PCUNICODE_STRING;

1 0

[cfinck] 29042: - Create a new "include/host" directory for host-only includes. - Copy the "pshpack*.h", "poppack.h" and "typedefs_host.h" (renamed to "typedefs.h") files to this directory - Modify the Makefiles of cmlib_host, inflib_host, mkhive, unicode, wmc and wrc to remove the "include/psdk" dependency - Remove the inclusion of "ntstatus.h" in cmlib_host and mkhive
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 22:55:43 2007 New Revision: 29042 URL: http://svn.reactos.org/svn/reactos?rev=29042&view=rev Log: - Create a new "include/host" directory for host-only includes. - Copy the "pshpack*.h", "poppack.h" and "typedefs_host.h" (renamed to "typedefs.h") files to this directory - Modify the Makefiles of cmlib_host, inflib_host, mkhive, unicode, wmc and wrc to remove the "include/psdk" dependency - Remove the inclusion of "ntstatus.h" in cmlib_host and mkhive Added: trunk/reactos/include/host/ trunk/reactos/include/host/poppack.h - copied unchanged from r29040, trunk/reactos/include/psdk/poppack.h trunk/reactos/include/host/pshpack1.h - copied unchanged from r29040, trunk/reactos/include/psdk/pshpack1.h trunk/reactos/include/host/pshpack2.h - copied unchanged from r29040, trunk/reactos/include/psdk/pshpack2.h trunk/reactos/include/host/pshpack4.h - copied unchanged from r29040, trunk/reactos/include/psdk/pshpack4.h trunk/reactos/include/host/pshpack8.h - copied unchanged from r29040, trunk/reactos/include/psdk/pshpack8.h trunk/reactos/include/host/pshpck16.h - copied unchanged from r29040, trunk/reactos/include/psdk/pshpck16.h trunk/reactos/include/host/typedefs.h - copied, changed from r29040, trunk/reactos/include/reactos/typedefs_host.h Removed: trunk/reactos/include/reactos/typedefs_host.h Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/inflib.mak trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/unicode/wine/unicode.h trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wrc/wrc.mak trunk/reactos/tools/wrc/wrcrostypes.h Copied: trunk/reactos/include/host/typedefs.h (from r29040, trunk/reactos/include/reactos/typedefs_host.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?p2… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/host/typedefs.h Fri Sep 14 22:55:43 2007 @@ -1,7 +1,7 @@ /* PROJECT: ReactOS LICENSE: GPL v2 or any later version - FILE: include/reactos/typedefs_host.h + FILE: include/host/typedefs.h PURPOSE: Type definitions and useful macros for host tools COPYRIGHT: Copyright 2007 Hervé Poussineau */ Removed: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h (removed) @@ -1,136 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/reactos/typedefs_host.h - PURPOSE: Type definitions and useful macros for host tools - COPYRIGHT: Copyright 2007 Hervé Poussineau -*/ - -#ifndef _TYPEDEFS_HOST_H -#define _TYPEDEFS_HOST_H - -#include <assert.h> -#include <stdlib.h> -#include <limits.h> - -#if defined(_MSC_VER) -#define W64 __w64 -#elif defined(__GNUC__) -#define W64 -#else -#error Unknown compiler -#endif - -#if !defined(_MSC_VER) && !defined(__fastcall) -#define __fastcall __attribute__((fastcall)) -#endif -#if !defined(_MSC_VER) && !defined(__cdecl) -#define __cdecl __attribute__((cdecl)) -#endif -#if !defined(_MSC_VER) && !defined(__stdcall) -#define __stdcall __attribute__((stdcall)) -#endif - -#define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } -#define ASSERT(x) assert(x) -#define DPRINT if (0) printf -#define DPRINT1 printf - -#define NTAPI -#define WINAPI - -#define IN -#define OUT -#define OPTIONAL - -#define FALSE 0 -#define TRUE (!(FALSE)) - -/* FIXME: this value is target specific, host tools MUST not use it - * and this line has to be removed */ -#define PAGE_SIZE 4096 - -typedef void VOID, *PVOID, *HANDLE; -typedef HANDLE HKEY, *PHKEY; -typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; -typedef char CHAR, *PCHAR, *PSTR; -typedef const char CCHAR; -typedef const char *PCSTR, *LPCSTR; -typedef short SHORT; -typedef unsigned short USHORT; -typedef unsigned short WORD, *PWORD, *LPWORD; -typedef int LONG, *PLONG, *LPLONG; -typedef unsigned int ULONG, *PULONG, DWORD, *LPDWORD; -typedef long long LONGLONG; -typedef unsigned long long ULONGLONG; -typedef UCHAR BOOLEAN, *PBOOLEAN; -typedef int BOOL; -typedef long int W64 LONG_PTR, *PLONG_PTR; -typedef long unsigned int W64 ULONG_PTR, DWORD_PTR, *PULONG_PTR; -typedef ULONG_PTR SIZE_T, *PSIZE_T; -typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR; -typedef const unsigned short *PCWSTR, *LPCWSTR; -typedef int NTSTATUS; -typedef int POOL_TYPE; - -#define MAXUSHORT USHRT_MAX - -#include <pshpack4.h> -typedef struct _RTL_BITMAP -{ - ULONG SizeOfBitMap; - PULONG Buffer; -} RTL_BITMAP, *PRTL_BITMAP; - -typedef struct _RTL_BITMAP_RUN -{ - ULONG StartingIndex; - ULONG NumberOfBits; -} RTL_BITMAP_RUN, *PRTL_BITMAP_RUN; - -typedef union _LARGE_INTEGER -{ - struct - { - DWORD LowPart; - LONG HighPart; - } u; - LONGLONG QuadPart; -} LARGE_INTEGER, *PLARGE_INTEGER; - -typedef struct _LIST_ENTRY -{ - struct _LIST_ENTRY *Flink; - struct _LIST_ENTRY *Blink; -} LIST_ENTRY,*PLIST_ENTRY; - -typedef struct _ANSI_STRING -{ - USHORT Length; - USHORT MaximumLength; - PSTR Buffer; -} ANSI_STRING, *PANSI_STRING; - -typedef struct _UNICODE_STRING -{ - USHORT Length; - USHORT MaximumLength; - PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; -#include <poppack.h> - -typedef const UNICODE_STRING *PCUNICODE_STRING; - -#define NT_SUCCESS(x) ((x)>=0) -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) -#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } -#define RtlZeroMemory(Destination, Length) memset(Destination, 0, Length) -#define RtlCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) -#define RtlMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) - -/* Prevent inclusion of some other headers */ -#define __INTERNAL_DEBUG -#define RTL_H -#define _TYPEDEFS64_H - -#endif Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2904… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Fri Sep 14 22:55:43 2007 @@ -9,10 +9,20 @@ #define CMLIB_H #ifdef CMLIB_HOST -#include <typedefs_host.h> +#include <host/typedefs.h> #include <stdio.h> #include <string.h> -#include <ntstatus.h> + +// Definitions copied from <ntstatus.h> +// We only want to include host headers, so we define them manually +#define STATUS_SUCCESS ((NTSTATUS)0x00000000) +#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002) +#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017) +#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A) +#define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014C) +#define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) +#define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009) + #endif #ifndef _TYPEDEFS_HOST_H Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=29… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Fri Sep 14 22:55:43 2007 @@ -31,7 +31,7 @@ $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o)) CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ - -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk \ + -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \ -DCMLIB_HOST $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) 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 Fri Sep 14 22:55:43 2007 @@ -8,7 +8,7 @@ /* Definitions native to the host on which we're building */ -#include <typedefs_host.h> +#include <host/typedefs.h> #include <stdarg.h> #include <stdio.h> Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Fri Sep 14 22:55:43 2007 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude/psdk + -Iinclude/reactos -Iinclude $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR) 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 Fri Sep 14 22:55:43 2007 @@ -30,8 +30,19 @@ #include <stdio.h> #include <stdlib.h> -#include <typedefs_host.h> -#include <ntstatus.h> +#include <host/typedefs.h> + +// Definitions copied from <ntstatus.h> +// We only want to include host headers, so we define them manually +#define STATUS_SUCCESS ((NTSTATUS)0x00000000) +#define STATUS_UNSUCCESSFUL ((NTSTATUS)0xC0000001) +#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002) +#define STATUS_INVALID_PARAMETER ((NTSTATUS)0xC000000D) +#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017) +#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A) +#define STATUS_OBJECT_NAME_NOT_FOUND ((NTSTATUS)0xC0000034) +#define STATUS_INVALID_PARAMETER_2 ((NTSTATUS)0xC00000F0) +#define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005) NTSTATUS NTAPI RtlAnsiStringToUnicodeString( 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 Fri Sep 14 22:55:43 2007 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -DMKHIVE_HOST -Iinclude/reactos -Iinclude/psdk -g3 + -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Fri Sep 14 22:55:43 2007 @@ -96,7 +96,7 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk -Iinclude/reactos \ + -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ $(TOOLS_CFLAGS) .PHONY: unicode Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h (original) +++ trunk/reactos/tools/unicode/wine/unicode.h Fri Sep 14 22:55:43 2007 @@ -22,7 +22,7 @@ #define __WINE_UNICODE_H #include <stdarg.h> -#include <typedefs_host.h> +#include <host/typedefs.h> // Definitions copied from <winnls.h> // We only want to include host headers, so we define them manually Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2904… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Fri Sep 14 22:55:43 2007 @@ -34,7 +34,7 @@ WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ -I$(INTERMEDIATE_)/include WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=2… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h (original) +++ trunk/reactos/tools/wmc/wmctypes.h Fri Sep 14 22:55:43 2007 @@ -22,7 +22,7 @@ #define __WMC_WMCTYPES_H #include <stdarg.h> -#include <typedefs_host.h> +#include <host/typedefs.h> /* Byteordering defines */ #define WMC_BO_NATIVE 0x00 Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2904… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Fri Sep 14 22:55:43 2007 @@ -57,7 +57,7 @@ WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ -I$(INTERMEDIATE_)include WRC_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h Fri Sep 14 22:55:43 2007 @@ -9,7 +9,7 @@ #ifndef _WRC_ROSTYPES_H #define _WRC_ROSTYPES_H -#include <typedefs_host.h> +#include <host/typedefs.h> #include <string.h> // Definitions copied from various <win....h> files @@ -159,7 +159,7 @@ #define SUBLANG_SERBIAN_CYRILLIC 0x03 #define SUBLANG_UZBEK_CYRILLIC 0x02 -#include <pshpack2.h> +#include <host/pshpack2.h> typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -167,7 +167,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; -#include <poppack.h> +#include <host/poppack.h> typedef int FXPT2DOT30; typedef struct tagCIEXYZ {

1 0

[cfinck] 29041: Revert the changes in r29036 to the file "ReactOS-i386.rbuild". They broke build and look like test code for me.
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 21:34:37 2007 New Revision: 29041 URL: http://svn.reactos.org/svn/reactos?rev=29041&view=rev Log: Revert the changes in r29036 to the file "ReactOS-i386.rbuild". They broke build and look like test code for me. Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=29… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Fri Sep 14 21:34:37 2007 @@ -42,7 +42,4 @@ <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - <directory name="sampleproppage"> - <xi:include href="sampleproppage/sampleproppage.rbuild" /> - </directory> </project>

1 0

[hpoussin] 29040: Update project dtd file based on usage (doesn't mean it is good and can't be changed anymore)
by hpoussin＠svn.reactos.org 14 Sep '07

14 Sep '07

1 0

[hpoussin] 29039: Update README.WINE after revision 29034
by hpoussin＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: hpoussin Date: Fri Sep 14 21:12:13 2007 New Revision: 29039 URL: http://svn.reactos.org/svn/reactos?rev=29039&view=rev Log: Update README.WINE after revision 29034 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Sep 14 21:12:13 2007 @@ -44,7 +44,7 @@ reactos/dll/win32/dbghelp # reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imm32 # Out of sync +reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/lz32 # Autosync

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
59
Older →

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 September 2007