Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48136: [FREELDR] - Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest - Disable debugging in isoboot.asm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 20 15:45:53 2010 New Revision: 48136 URL: http://svn.reactos.org/svn/reactos?rev=48136&view=rev Log: [FREELDR] - Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest - Disable debugging in isoboot.asm Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Tue Jul 20 15:45:53 2010 @@ -31,7 +31,7 @@ ; **************************************************************************** ; Note: The Makefile builds one version with DEBUG_MESSAGES automatically. -%define DEBUG_MESSAGES ; Uncomment to get debugging messages +;%define DEBUG_MESSAGES ; Uncomment to get debugging messages %define WAIT_FOR_KEY @@ -373,20 +373,13 @@ mov dl, [DriveNo] ; dl = boot drive mov dh, 0 ; dh = boot partition - push 0 ; push segment (0x0000) mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8000 ; RVA -> VA - push ax ; push offset - retf ; Transfer control to ROSLDR - - mov eax, [0x8000 + 0xA8] ; load the EntryPoint into eax - add eax, 0x8000 - mov [jmpaddress], eax - - - db 0xea ; jmp instruction - jmpaddress dd 0 + add eax, 0x8000 ; RVA -> VA + push ax ; push offset + retf ; Transfer control to ROSLDR + + ; ; searchdir: Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Tue Jul 20 15:45:53 2010 @@ -345,7 +345,11 @@ mov dl, [DriveNo] ; dl = boot drive mov dh, 0 ; dh = boot partition - jmp 0:0x8000 ; jump into OSLoader + push 0 ; push segment (0x0000) + mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax + add eax, 0x8000 ; RVA -> VA + push ax ; push offset + retf ; Transfer control to ROSLDR

14 years, 5 months

[akhaldi] 48135: [HEADERS] - Make the header inclusion MSVC compatible. - localspl now compiles with MSVC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 14:15:51 2010 New Revision: 48135 URL: http://svn.reactos.org/svn/reactos?rev=48135&view=rev Log: [HEADERS] - Make the header inclusion MSVC compatible. - localspl now compiles with MSVC. Modified: trunk/reactos/include/reactos/wine/ddk/winddiui.h Modified: trunk/reactos/include/reactos/wine/ddk/winddiui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/w… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/winddiui.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/winddiui.h [iso-8859-1] Tue Jul 20 14:15:51 2010 @@ -1,2 +1,2 @@ -#include_next <winddiui.h> +#include <psdk/winddiui.h>

14 years, 5 months

[akhaldi] 48134: [HEADERS] - Make the header inclusion MSVC compatible.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 14:11:43 2010 New Revision: 48134 URL: http://svn.reactos.org/svn/reactos?rev=48134&view=rev Log: [HEADERS] - Make the header inclusion MSVC compatible. Modified: trunk/reactos/include/reactos/wine/ddk/winsplp.h Modified: trunk/reactos/include/reactos/wine/ddk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/w… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/winsplp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/winsplp.h [iso-8859-1] Tue Jul 20 14:11:43 2010 @@ -1,2 +1,2 @@ -#include_next <winsplp.h> +#include <psdk/winsplp.h>

14 years, 5 months

[akhaldi] 48133: [MINGW-W64] - Group MSVC related definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 13:04:56 2010 New Revision: 48133 URL: http://svn.reactos.org/svn/reactos?rev=48133&view=rev Log: [MINGW-W64] - Group MSVC related definitions. Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Tue Jul 20 13:04:56 2010 @@ -4,13 +4,14 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#if defined (__ia64__) || defined (__x86_64) +#if defined(_MSC_VER) + +#if defined(_M_IA64) || defined(_M_AMD64) #define _ATTRIBUTES #else #define _ATTRIBUTES shared #endif -#if defined(_MSC_VER) /* Reference list of existing section for msvcrt. */ #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) @@ -59,7 +60,7 @@ #pragma section(".tls",long,read,write) #pragma section(".tls$AAA",long,read,write) #pragma section(".tls$ZZZ",long,read,write) -#endif +#endif /* _MSC_VER */ #if defined(_MSC_VER) #define _CRTALLOC(x) __declspec(allocate(x)) @@ -68,3 +69,4 @@ #else #error Your compiler is not supported. #endif +

14 years, 5 months

[akhaldi] 48132: [ACPI] - Define WIN32 when compiling with MSVC

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 12:11:17 2010 New Revision: 48132 URL: http://svn.reactos.org/svn/reactos?rev=48132&view=rev Log: [ACPI] - Define WIN32 when compiling with MSVC Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Tue Jul 20 12:11:17 2010 @@ -11,6 +11,11 @@ <xi:include href="compbatt/compbatt.rbuild" /> </directory> +<if property="ARCH" value="i386"> + <group compilerset="msc"> + <define name="WIN32"/> + </group> +</if> <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true"> <bootstrap installbase="$(CDOUTPUT)" />

14 years, 5 months

[akhaldi] 48131: [MINGW-W64] - Define WIN32_LEAN_AND_MEAN. - Include stdlib.h for _winmajor.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 12:10:10 2010 New Revision: 48131 URL: http://svn.reactos.org/svn/reactos?rev=48131&view=rev Log: [MINGW-W64] - Define WIN32_LEAN_AND_MEAN. - Include stdlib.h for _winmajor. Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Tue Jul 20 12:10:10 2010 @@ -12,17 +12,23 @@ #include <sect_attribs.h> +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <stdio.h> #include <memory.h> #include <malloc.h> +#ifndef _WIN64 +#include <stdlib.h> /* for _winmajor */ +#endif #ifndef __INTERNAL_FUNC_DEFINED #define __INTERNAL_FUNC_DEFINED - typedef void (__cdecl *_PVFV)(void); - typedef int (__cdecl *_PIFV)(void); - typedef void (__cdecl *_PVFI)(int); +typedef void (__cdecl *_PVFV)(void); +typedef int (__cdecl *_PIFV)(void); +typedef void (__cdecl *_PVFI)(int); #endif extern WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); @@ -208,5 +214,5 @@ int mingw_initltsdrot_force = 0; -int mingw_initltsdyn_force=0; +int mingw_initltsdyn_force = 0; int mingw_initltssuo_force = 0;

14 years, 5 months

[akhaldi] 48130: [MINGW-W64] - reactos.diff was pushed upstream, so it's not needed anymore. - Add a missing section. - Include sect_attribs.h into tlssup.c

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 20 10:14:07 2010 New Revision: 48130 URL: http://svn.reactos.org/svn/reactos?rev=48130&view=rev Log: [MINGW-W64] - reactos.diff was pushed upstream, so it's not needed anymore. - Add a missing section. - Include sect_attribs.h into tlssup.c Removed: trunk/reactos/include/reactos/mingw-w64/reactos.diff Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h trunk/reactos/lib/3rdparty/mingw/tlssup.c Removed: trunk/reactos/include/reactos/mingw-w64/reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/reactos.diff (removed) @@ -1,83 +1,0 @@ -Index: internal.h -=================================================================== ---- internal.h (Revision 46537) -+++ internal.h (Arbeitskopie) -@@ -35,6 +35,12 @@ - #define __IOINFO_TM_UTF8 1 - #define __IOINFO_TM_UTF16LE 2 - -+#ifdef _MSC_VER -+#pragma warning(push) -+#pragma warning(disable:4214) -+#pragma warning(disable:4820) -+#endif -+ - typedef struct { - intptr_t osfhnd; - char osfile; -@@ -46,6 +52,10 @@ - char pipech2[2]; - } ioinfo; - -+#ifdef _MSC_VER -+#pragma warning(pop) -+#endif -+ - #define IOINFO_ARRAY_ELTS (1 << 5) - - #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1))) -Index: oscalls.h -=================================================================== ---- oscalls.h (Revision 46537) -+++ oscalls.h (Arbeitskopie) -@@ -30,6 +30,11 @@ - #endif - #endif - -+#ifdef _MSC_VER -+#pragma warning(push) -+#pragma warning(disable:4214) -+#endif -+ - typedef struct _FTIME - { - unsigned short twosecs : 5; -@@ -46,6 +51,10 @@ - unsigned short year : 7; - } FDATE; - -+#ifdef _MSC_VER -+#pragma warning(pop) -+#endif -+ - typedef FDATE *PFDATE; - - #endif -Index: sect_attribs.h -=================================================================== ---- sect_attribs.h (Revision 46537) -+++ sect_attribs.h (Arbeitskopie) -@@ -10,7 +10,7 @@ - #define _ATTRIBUTES shared - #endif - --#if 0 -+#if defined(_MSC_VER) - /* Reference list of existing section for msvcrt. */ - #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) - #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) -@@ -55,6 +55,14 @@ - #pragma section(".rtc$IZZ",long,read) - #pragma section(".rtc$TAA",long,read) - #pragma section(".rtc$TZZ",long,read) -+#pragma section(".tls",long,read,write) -+#pragma section(".tls$ZZZ",long,read,write) - #endif - -+#if defined(_MSC_VER) -+#define _CRTALLOC(x) __declspec(allocate(x)) -+#elif defined(__GNUC__) - #define _CRTALLOC(x) __attribute__ ((section (x) )) -+#else -+#error -+#endif Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Tue Jul 20 10:14:07 2010 @@ -55,7 +55,9 @@ #pragma section(".rtc$IZZ",long,read) #pragma section(".rtc$TAA",long,read) #pragma section(".rtc$TZZ",long,read) +/* for tlssup.c: */ #pragma section(".tls",long,read,write) +#pragma section(".tls$AAA",long,read,write) #pragma section(".tls$ZZZ",long,read,write) #endif @@ -64,5 +66,5 @@ #elif defined(__GNUC__) #define _CRTALLOC(x) __attribute__ ((section (x) )) #else -#error +#error Your compiler is not supported. #endif Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Tue Jul 20 10:14:07 2010 @@ -10,14 +10,13 @@ #undef CRTDLL #endif +#include <sect_attribs.h> + #include <windows.h> + #include <stdio.h> #include <memory.h> #include <malloc.h> - -#ifndef _CRTALLOC -#define _CRTALLOC(x) __attribute__ ((section (x) )) -#endif #ifndef __INTERNAL_FUNC_DEFINED #define __INTERNAL_FUNC_DEFINED

14 years, 5 months

[tkreuzer] 48129: [CMD] Remove BOMs from rc files. Let me know if something's wrong with that.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 20 04:22:04 2010 New Revision: 48129 URL: http://svn.reactos.org/svn/reactos?rev=48129&view=rev Log: [CMD] Remove BOMs from rc files. Let me know if something's wrong with that. Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Tue Jul 20 04:22:04 2010 @@ -1,4 +1,4 @@ -ï»¿/* +/* * German language file by Klemens Friedl <frik85> 2005-06-03 * Update: frik85 2005-06-06 */ Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Tue Jul 20 04:22:04 2010 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Japanese translation of CMD */ #pragma code_page(65001) Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Tue Jul 20 04:22:04 2010 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Russian language file by * Andrey Korotaev (unC0Rr(a)inbox.ru) * and

14 years, 5 months

[tkreuzer] 48128: [RBUILD] For amd64 builds, invoke wrc directly, instead of using gcc to preprocess the files. The reason is that newer gcc versions (like 4.5.0) don't support multiline continuation (backslash-newline) except for preprocessor directives, but that breaks wine resource strings. This might have to be done for i386 builds too, sooner or later.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 20 03:01:57 2010 New Revision: 48128 URL: http://svn.reactos.org/svn/reactos?rev=48128&view=rev Log: [RBUILD] For amd64 builds, invoke wrc directly, instead of using gcc to preprocess the files. The reason is that newer gcc versions (like 4.5.0) don't support multiline continuation (backslash-newline) except for preprocessor directives, but that breaks wine resource strings. This might have to be done for i386 builds too, sooner or later. Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Tue Jul 20 03:01:57 2010 @@ -227,7 +227,11 @@ ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(wrc_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) +ifeq ($(ARCH),amd64) + $$(Q)$$(wrc_TARGET) --input=$$< -o $$@ ${call RBUILD_rc_pp_flags,$(1),$(4)} ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} +else ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(wrc_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} +endif endif

14 years, 5 months

[tkreuzer] 48127: [wine/commctrl.h] Don't use #include_next, instead imclude psdk/commctrl.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 20 02:53:55 2010 New Revision: 48127 URL: http://svn.reactos.org/svn/reactos?rev=48127&view=rev Log: [wine/commctrl.h] Don't use #include_next, instead imclude psdk/commctrl.h Modified: trunk/reactos/include/reactos/wine/commctrl.h Modified: trunk/reactos/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commc… ============================================================================== --- trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] Tue Jul 20 02:53:55 2010 @@ -10,7 +10,7 @@ #define _WIN32_IE 0x0501 #endif -#include_next <commctrl.h> +#include <psdk/commctrl.h> #undef DPA_GetPtr LPVOID WINAPI DPA_GetPtr(HDPA, INT);

14 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010