Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 46747: [DDK] - A better fix for r46738. Patch by Amine Khaidi.
by mjmartin＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: mjmartin Date: Tue Apr 6 15:23:33 2010 New Revision: 46747 URL: http://svn.reactos.org/svn/reactos?rev=46747&view=rev Log: [DDK] - A better fix for r46738. Patch by Amine Khaidi. Modified: trunk/reactos/include/ddk/hubbusif.h trunk/reactos/include/ddk/usbbusif.h Modified: trunk/reactos/include/ddk/hubbusif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hubbusif.h?rev… ============================================================================== --- trunk/reactos/include/ddk/hubbusif.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hubbusif.h [iso-8859-1] Tue Apr 6 15:23:33 2010 @@ -1,10 +1,14 @@ #pragma once +#define _HUBBUSIF_ + #include "usbdi.h" #if (NTDDI_VERSION >= NTDDI_WINXP) +#if !defined(_USBBUSIF_) typedef PVOID PUSB_DEVICE_HANDLE; +#endif typedef struct _ROOTHUB_PDO_EXTENSION { ULONG Signature; Modified: trunk/reactos/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbbusif.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] Tue Apr 6 15:23:33 2010 @@ -1,10 +1,16 @@ #pragma once + +#define _USBBUSIF_ #ifndef USB_BUSIFFN #define USB_BUSIFFN __stdcall #endif #if (NTDDI_VERSION >= NTDDI_WINXP) + +#if !defined(_USBBUSIF_) +typedef PVOID PUSB_DEVICE_HANDLE; +#endif typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_SUBMIT_ISO_OUT_URB) (

1 0

[tkreuzer] 46746: [LIBXML2] revert last changes to 3rd party code and hack the config file a bit more instead.
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 14:04:47 2010 New Revision: 46746 URL: http://svn.reactos.org/svn/reactos?rev=46746&view=rev Log: [LIBXML2] revert last changes to 3rd party code and hack the config file a bit more instead. Modified: branches/header-work/lib/3rdparty/libxml2/config.h branches/header-work/lib/3rdparty/libxml2/nanoftp.c branches/header-work/lib/3rdparty/libxml2/nanohttp.c Modified: branches/header-work/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -301,3 +301,7 @@ #if !defined(__MINGW32__) || defined(__NO_ISOCEXT) #define vsnprintf _vsnprintf #endif + +#if defined(__MINGW32__) +#include <windows.h> +#endif Modified: branches/header-work/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -78,7 +78,7 @@ #if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T Modified: branches/header-work/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -79,7 +79,7 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T

1 0

[tkreuzer] 46745: [LIBXML2] Don't define _WINSOCKAPI_
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 13:44:35 2010 New Revision: 46745 URL: http://svn.reactos.org/svn/reactos?rev=46745&view=rev Log: [LIBXML2] Don't define _WINSOCKAPI_ Modified: branches/header-work/lib/3rdparty/libxml2/config.h branches/header-work/lib/3rdparty/libxml2/nanoftp.c branches/header-work/lib/3rdparty/libxml2/nanohttp.c Modified: branches/header-work/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] Tue Apr 6 13:44:35 2010 @@ -287,7 +287,7 @@ #define XML_SOCKLEN_T int /* Using the Win32 Socket implementation */ -#define _WINSOCKAPI_ 1 +//#define _WINSOCKAPI_ 1 /* Define like PROTOTYPES; this can be used by system headers. */ #define __PROTOTYPES 1 Modified: branches/header-work/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] Tue Apr 6 13:44:35 2010 @@ -78,7 +78,7 @@ #if defined(__MINGW32__) || defined(_WIN32_WCE) -#define _WINSOCKAPI_ +//#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T Modified: branches/header-work/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml… ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] Tue Apr 6 13:44:35 2010 @@ -79,7 +79,7 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) -#define _WINSOCKAPI_ +//#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T

1 0

[tkreuzer] 46744: revert r46742
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 02:20:53 2010 New Revision: 46744 URL: http://svn.reactos.org/svn/reactos?rev=46744&view=rev Log: revert r46742 Modified: trunk/reactos/drivers/storage/directory.rbuild Modified: trunk/reactos/drivers/storage/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/directory.… ============================================================================== --- trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] Tue Apr 6 02:20:53 2010 @@ -13,9 +13,7 @@ <directory name="port"> <xi:include href="port/directory.rbuild" /> </directory> -<ifnot property="ARCH" value="arm"> - <directory name="scsiport"> - <xi:include href="scsiport/scsiport.rbuild" /> - </directory> -</ifnot> +<directory name="scsiport"> + <xi:include href="scsiport/scsiport.rbuild" /> +</directory> </group>

1 0

[tkreuzer] 46743: Compile scsiport.c for freeldr only on x86 builds
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 02:19:48 2010 New Revision: 46743 URL: http://svn.reactos.org/svn/reactos?rev=46743&view=rev Log: Compile scsiport.c for freeldr only on x86 builds Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Tue Apr 6 02:19:48 2010 @@ -23,7 +23,9 @@ <file>disk.c</file> <file>partition.c</file> <file>ramdisk.c</file> - <file>scsiport.c</file> + <if property="ARCH" value="i386"> + <file>scsiport.c</file> + </if> </directory> <directory name="fs"> <file>ext2.c</file>

1 0

[tkreuzer] 46742: remove scsiport from arm build
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 02:10:46 2010 New Revision: 46742 URL: http://svn.reactos.org/svn/reactos?rev=46742&view=rev Log: remove scsiport from arm build Modified: trunk/reactos/drivers/storage/directory.rbuild Modified: trunk/reactos/drivers/storage/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/directory.… ============================================================================== --- trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] Tue Apr 6 02:10:46 2010 @@ -13,7 +13,9 @@ <directory name="port"> <xi:include href="port/directory.rbuild" /> </directory> -<directory name="scsiport"> - <xi:include href="scsiport/scsiport.rbuild" /> -</directory> +<ifnot property="ARCH" value="arm"> + <directory name="scsiport"> + <xi:include href="scsiport/scsiport.rbuild" /> + </directory> +</ifnot> </group>

1 0

[tkreuzer] 46741: - Add -fms-extensions for arm build - Add _NT_TIB_KPCR to compensate for a missing NT_TIB (hackfix) - add KERNEL_STACK_SIZE & co for arm - Add missing KeGetCurrentThread prototype for arm - define INTERLOCKED_RESULT for X86 only - Add _CONTEXT and _EXCEPTION_RECORD forward declarations
by tkreuzer＠svn.reactos.org 06 Apr '10

06 Apr '10

Author: tkreuzer Date: Tue Apr 6 02:00:00 2010 New Revision: 46741 URL: http://svn.reactos.org/svn/reactos?rev=46741&view=rev Log: - Add -fms-extensions for arm build - Add _NT_TIB_KPCR to compensate for a missing NT_TIB (hackfix) - add KERNEL_STACK_SIZE & co for arm - Add missing KeGetCurrentThread prototype for arm - define INTERLOCKED_RESULT for X86 only - Add _CONTEXT and _EXCEPTION_RECORD forward declarations Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/include/xdk/exfuncs.h Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=467… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Apr 6 02:00:00 2010 @@ -28,6 +28,7 @@ <if property="OPTIMIZE" value="1"> <compilerflag>-ftracer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-U_UNICODE</compilerflag> <compilerflag>-UUNICODE</compilerflag> Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Tue Apr 6 02:00:00 2010 @@ -3303,13 +3303,14 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite +#ifdef _X86_ + typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#ifdef _X86_ NTKERNELAPI INTERLOCKED_RESULT FASTCALL Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Apr 6 02:00:00 2010 @@ -564,6 +564,9 @@ UCHAR Number; UCHAR Reserved; } PROCESSOR_NUMBER, *PPROCESSOR_NUMBER; + +struct _CONTEXT; +struct _EXCEPTION_RECORD; typedef EXCEPTION_DISPOSITION (NTAPI *PEXCEPTION_ROUTINE)( Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Tue Apr 6 02:00:00 2010 @@ -54,13 +54,16 @@ // #define MAXIMUM_VECTOR 16 +#define KERNEL_STACK_SIZE 12288 +#define KERNEL_LARGE_STACK_SIZE 61440 +#define KERNEL_LARGE_STACK_COMMIT 12288 // // Used to contain PFNs and PFN counts // -typedef ULONG PFN_COUNT; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; +//typedef ULONG PFN_COUNT; +//typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +//typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; // // Stub @@ -124,11 +127,25 @@ #ifdef _WINNT_H #define KIRQL ULONG #endif + +typedef struct _NT_TIB_KPCR { + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + PVOID StackBase; + PVOID StackLimit; + PVOID SubSystemTib; + _ANONYMOUS_UNION union { + PVOID FiberData; + ULONG Version; + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; + struct _NT_TIB_KPCR *Self; +} NT_TIB_KPCR,*PNT_TIB_KPCR; + typedef struct _KPCR { union { - NT_TIB NtTib; + NT_TIB_KPCR NtTib; struct { struct _EXCEPTION_REGISTRATION_RECORD *Used_ExceptionList; // Unused @@ -167,6 +184,11 @@ return (struct _TEB*)USERPCR->Used_Self; } +NTSYSAPI +PKTHREAD +NTAPI +KeGetCurrentThread(VOID); + #ifndef _WINNT_H // // IRQL Support on ARM is similar to MIPS/ALPHA Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Apr 6 02:00:00 2010 @@ -67,13 +67,14 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite +#ifdef _X86_ + typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#ifdef _X86_ NTKERNELAPI INTERLOCKED_RESULT FASTCALL

1 0

[cgutman] 46740: [INF] - Fix the class GUID so devices appear in the correct category in device manager - Remove trailing spaces on some device descriptions - Remove the "(UniATA)" at the end of some device descriptions
by cgutman＠svn.reactos.org 05 Apr '10

05 Apr '10

Author: cgutman Date: Tue Apr 6 01:35:44 2010 New Revision: 46740 URL: http://svn.reactos.org/svn/reactos?rev=46740&view=rev Log: [INF] - Fix the class GUID so devices appear in the correct category in device manager - Remove trailing spaces on some device descriptions - Remove the "(UniATA)" at the end of some device descriptions Modified: trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4674… ============================================================================== Binary files - no diff available.

1 0

[gschneider] 46739: [SHELL32] - Updated polish translation by Olaf Siejka See issue #1494 for more details.
by gschneider＠svn.reactos.org 05 Apr '10

05 Apr '10

Author: gschneider Date: Mon Apr 5 18:00:49 2010 New Revision: 46739 URL: http://svn.reactos.org/svn/reactos?rev=46739&view=rev Log: [SHELL32] - Updated polish translation by Olaf Siejka See issue #1494 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Apr 5 18:00:49 2010 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * ReactOS shell32 fork translation updated by Caemyr - - * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008) + * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -672,8 +672,8 @@ IDS_RESTART_PROMPT "Czy chcesz zrestartowaæ system?" IDS_SHUTDOWN_TITLE "Wy³¹cz" IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ system?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_LOGOFF_TITLE "Wyloguj" + IDS_LOGOFF_PROMPT "Czy chcesz siê wylogowaæ z systemu?" /* shell folder path default values */ IDS_PROGRAMS "Menu Start\\Programy"

1 0

[mjmartin] 46738: [DDK] - Remove PUSB_DEVICE_HANDLE as its not used in this header. Its defined in hubbusif.
by mjmartin＠svn.reactos.org 05 Apr '10

05 Apr '10

Author: mjmartin Date: Mon Apr 5 14:56:09 2010 New Revision: 46738 URL: http://svn.reactos.org/svn/reactos?rev=46738&view=rev Log: [DDK] - Remove PUSB_DEVICE_HANDLE as its not used in this header. Its defined in hubbusif. Modified: trunk/reactos/include/ddk/usbbusif.h Modified: trunk/reactos/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbbusif.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] Mon Apr 5 14:56:09 2010 @@ -5,8 +5,6 @@ #endif #if (NTDDI_VERSION >= NTDDI_WINXP) - -typedef PVOID PUSB_DEVICE_HANDLE; typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_SUBMIT_ISO_OUT_URB) (

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