Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[sginsberg] 36961: - Make serial build for 64 bit -- explicitly cast first parameter to InterlockedCompareExchangePointer to PVOID (not needed, with ros headers, on 32-bit for whatever reason)
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 12:58:43 2008 New Revision: 36961 URL: http://svn.reactos.org/svn/reactos?rev=36961&view=rev Log: - Make serial build for 64 bit -- explicitly cast first parameter to InterlockedCompareExchangePointer to PVOID (not needed, with ros headers, on 32-bit for whatever reason) Modified: branches/ros-amd64-bringup/reactos/drivers/serial/serial/devctrl.c Modified: branches/ros-amd64-bringup/reactos/drivers/serial/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] Sat Oct 25 12:58:43 2008 @@ -802,7 +802,7 @@ * as pending, it might be possible to complete the * Irp before pending it, leading to a crash! */ WaitingIrp = InterlockedCompareExchangePointer( - &DeviceExtension->WaitOnMaskIrp, + (PVOID)&DeviceExtension->WaitOnMaskIrp, Irp, NULL);

1 0

[hyperion] 36960: The real, definitive, Visual C++ support branch. Accept no substitutes
by hyperion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: hyperion Date: Sat Oct 25 12:56:00 2008 New Revision: 36960 URL: http://svn.reactos.org/svn/reactos?rev=36960&view=rev Log: The real, definitive, Visual C++ support branch. Accept no substitutes Added: branches/the-real-msvc/ - copied from r36959, trunk/reactos/

1 0

[cgutman] 36959: - Return if we aren't connected
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: cgutman Date: Sat Oct 25 12:50:53 2008 New Revision: 36959 URL: http://svn.reactos.org/svn/reactos?rev=36959&view=rev Log: - Return if we aren't connected Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Oct 25 12:50:53 2008 @@ -28,6 +28,9 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + + if(!(NCE->State & NUD_CONNECTED)) + return; /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue,

1 0

[sginsberg] 36958: - Fix isapnp compilation for 64-bit
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 12:50:42 2008 New Revision: 36958 URL: http://svn.reactos.org/svn/reactos?rev=36958&view=rev Log: - Fix isapnp compilation for 64-bit Modified: branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c Modified: branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Sat Oct 25 12:50:42 2008 @@ -153,7 +153,7 @@ } #endif -static __inline VOID SetReadDataPort(ULONG Port) +static __inline VOID SetReadDataPort(ULONG_PTR Port) { IsaPnPReadPort = (PUCHAR)Port; WriteUchar(0x00, (UCHAR) (Port >> 2)); @@ -214,13 +214,13 @@ #define READ_DATA_PORT_STEP 32 /* Minimum is 4 */ -static ULONG FindNextReadPort(VOID) -{ - ULONG Port; - - - - Port = (ULONG)IsaPnPReadPort; +static ULONG_PTR FindNextReadPort(VOID) +{ + ULONG_PTR Port; + + + + Port = (ULONG_PTR)IsaPnPReadPort; while (TRUE) { @@ -260,7 +260,7 @@ static BOOLEAN IsolateReadDataPortSelect(VOID) { - ULONG Port; + ULONG_PTR Port; SendWait(); SendKey(); @@ -333,7 +333,7 @@ KeStallExecutionProcessor(250); iteration++; SendWake(0x00); - SetReadDataPort((ULONG)IsaPnPReadPort); + SetReadDataPort((ULONG_PTR)IsaPnPReadPort); KeStallExecutionProcessor(1000); WriteAddress(0x01); KeStallExecutionProcessor(1000); @@ -1305,7 +1305,7 @@ do { Status = BuildResourceList(LogicalDevice, p, Priority); if (NT_SUCCESS(Status)) { - p = (PIO_RESOURCE_LIST)((ULONG)p + SingleListSize); + p = (PIO_RESOURCE_LIST)((ULONG_PTR)p + SingleListSize); Priority++; } } while (Status != STATUS_NOT_FOUND); @@ -1477,7 +1477,7 @@ CurrentEntry = CurrentEntry->Flink; } - Irp->IoStatus.Information = (ULONG)Relations; + Irp->IoStatus.Information = (ULONG_PTR)Relations; return Status; }

1 0

[hyperion] 36957: modified dll/win32/kernel32/kernel32.rbuild Disable exceptions and RTTI in kernel32_base Move icustubs.cpp closer to other NLS stuff This commit dedicated to Stefan100
by hyperion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: hyperion Date: Sat Oct 25 12:41:48 2008 New Revision: 36957 URL: http://svn.reactos.org/svn/reactos?rev=36957&view=rev Log: modified dll/win32/kernel32/kernel32.rbuild Disable exceptions and RTTI in kernel32_base Move icustubs.cpp closer to other NLS stuff This commit dedicated to Stefan100 Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Oct 25 12:41:48 2008 @@ -109,7 +109,6 @@ <file>lcformat.c</file> <file>profile.c</file> <file>utils.c</file> - <file>icustubs.cpp</file> </directory> <directory name="thread"> <if property="ARCH" value="i386"> @@ -120,6 +119,12 @@ </if> </directory> + <compilerflag compiler="cpp">-fno-exceptions</compilerflag> + <compilerflag compiler="cpp">-fno-rtti</compilerflag> + + <directory name="misc"> + <file>icustubs.cpp</file> + </directory> <library>normalize</library> </module> <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">

1 0

[hyperion] 36956: I did not, in fact, test my commit
by hyperion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: hyperion Date: Sat Oct 25 12:36:53 2008 New Revision: 36956 URL: http://svn.reactos.org/svn/reactos?rev=36956&view=rev Log: I did not, in fact, test my commit Modified: trunk/reactos/lib/3rdparty/mingw/cpu_features.c Modified: trunk/reactos/lib/3rdparty/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cpu_features.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cpu_features.c [iso-8859-1] Sat Oct 25 12:36:53 2008 @@ -60,7 +60,7 @@ : "=&r" (eax), "=&r" (ebx) : "i" (0x00200000)); - return ((eax ^ ebx) & 0x00200000; + return (eax ^ ebx) & 0x00200000; #elif defined(_MSC_VER) unsigned int retval;

1 0

[gschneider] 36955: Misc. typo fixes
by gschneider＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: gschneider Date: Sat Oct 25 12:35:45 2008 New Revision: 36955 URL: http://svn.reactos.org/svn/reactos?rev=36955&view=rev Log: Misc. typo fixes Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Sat Oct 25 12:35:45 2008 @@ -764,17 +764,17 @@ /* Calc the Zoom Width of Source */ SrcSizeX = SourceRect->right - SourceRect->left; - /* Calc the Zoom height of Destions */ + /* Calc the Zoom height of Destinations */ DesSizeY = DestRect->bottom - DestRect->top; - /* Calc the Zoom width of Destions */ + /* Calc the Zoom width of Destinations */ DesSizeX = DestRect->right - DestRect->left; - /* Calc the zoom factor of soruce height */ + /* Calc the zoom factor of source height */ SrcZoomYHight = SrcSizeY / DesSizeY; SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); - /* Calc the zoom factor of soruce width */ + /* Calc the zoom factor of source width */ SrcZoomXHight = SrcSizeX / DesSizeX; SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Oct 25 12:35:45 2008 @@ -516,17 +516,17 @@ /* Calc the Zoom Width of Source */ SrcSizeX = SourceRect->right - SourceRect->left; - /* Calc the Zoom height of Destions */ + /* Calc the Zoom height of Destinations */ DesSizeY = DestRect->bottom - DestRect->top; - /* Calc the Zoom width of Destions */ + /* Calc the Zoom width of Destinations */ DesSizeX = DestRect->right - DestRect->left; - /* Calc the zoom factor of soruce height */ + /* Calc the zoom factor of source height */ SrcZoomYHight = SrcSizeY / DesSizeY; SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); - /* Calc the zoom factor of soruce width */ + /* Calc the zoom factor of source width */ SrcZoomXHight = SrcSizeX / DesSizeX; SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Sat Oct 25 12:35:45 2008 @@ -499,17 +499,17 @@ /* Calc the Zoom Width of Source */ SrcSizeX = SourceRect->right - SourceRect->left; - /* Calc the Zoom height of Destions */ + /* Calc the Zoom height of Destinations */ DesSizeY = DestRect->bottom - DestRect->top; - /* Calc the Zoom width of Destions */ + /* Calc the Zoom width of Destinations */ DesSizeX = DestRect->right - DestRect->left; - /* Calc the zoom factor of soruce height */ + /* Calc the zoom factor of source height */ SrcZoomYHight = SrcSizeY / DesSizeY; SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); - /* Calc the zoom factor of soruce width */ + /* Calc the zoom factor of source width */ SrcZoomXHight = SrcSizeX / DesSizeX; SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); @@ -677,7 +677,7 @@ for (DesX=0; DesX<DesSizeX; DesX++) { *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + DIB_32BPP_GetPixel(SourceSurf, sx, sy)); DestBits = (PULONG)((ULONG_PTR)DestBits + 1);

1 0

[hyperion] 36954: modified base/applications/screensavers/3dtext/3dtext.rbuild modified lib/sdk/crt/crt.rbuild Split chkstk away from crt Link 3dtext to chkstk for Visual C++ builds (a gcc-built 3dtext would simply crash, I guess?) modified dll/cpl/access/display.c modified dll/cpl/access/general.c modified dll/cpl/access/keyboard.c modified dll/cpl/access/mouse.c Fixed signedness violations (thank you cl -Wall -W4) modified dll/win32/acledit/acledit.rbuild modified dll/win32/aclui/aclui.rbuild
by hyperion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: hyperion Date: Sat Oct 25 12:32:54 2008 New Revision: 36954 URL: http://svn.reactos.org/svn/reactos?rev=36954&view=rev Log: modified base/applications/screensavers/3dtext/3dtext.rbuild modified lib/sdk/crt/crt.rbuild Split chkstk away from crt Link 3dtext to chkstk for Visual C++ builds (a gcc-built 3dtext would simply crash, I guess?) modified dll/cpl/access/display.c modified dll/cpl/access/general.c modified dll/cpl/access/keyboard.c modified dll/cpl/access/mouse.c Fixed signedness violations (thank you cl -Wall -W4) modified dll/win32/acledit/acledit.rbuild modified dll/win32/aclui/aclui.rbuild Removed empty stubs (thank you cl -Wall -W4) modified dll/win32/aclui/checklist.c Fixed signedness violations wcsnicmp is not a standard C routine BOOL is not a boolean Thank you cl -Wall -W4 modified dll/win32/aclui/sidcache.c Marked possible overflow (thank you cl -Wall -W4) modified dll/win32/msvcrt/msvcrt.def __iob_func and __p_iob are the same thing Export non-conforming swprintf as _swprintf, too (will fix for real later) Thank you cl -Wall -W4 modified include/ddk/winddk.h Zero-length array field in struct _SCATTER_GATHER_LIST Forward-declare structures out of argument lists Thank you cl -Wall -W4 modified include/reactos/msvctarget.h No need to emulate Visual C++ flags when compiling with Visual C++ modified lib/3rdparty/mingw/cpu_features.c modified lib/3rdparty/mingw/cpu_features.h Useless dependency from stdbool.h removed Now compiles with Visual C++ too modified lib/3rdparty/mingw/getopt.c Silence harmless warning modified lib/3rdparty/mingw/isascii.c modified lib/3rdparty/mingw/iscsym.c modified lib/3rdparty/mingw/iscsymf.c modified lib/3rdparty/mingw/toascii.c Undefine conflicting macro names before declaring the functions modified Makefile Visual C++ support is coming, did you bring your coat? Modified: trunk/reactos/Makefile trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/aclui/aclui.rbuild trunk/reactos/dll/win32/aclui/checklist.c trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/include/ddk/winddk.h trunk/reactos/include/reactos/msvctarget.h trunk/reactos/lib/3rdparty/mingw/cpu_features.c trunk/reactos/lib/3rdparty/mingw/cpu_features.h trunk/reactos/lib/3rdparty/mingw/getopt.c trunk/reactos/lib/3rdparty/mingw/isascii.c trunk/reactos/lib/3rdparty/mingw/iscsym.c trunk/reactos/lib/3rdparty/mingw/iscsymf.c trunk/reactos/lib/3rdparty/mingw/toascii.c trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=36954&r1=3695… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -215,6 +215,7 @@ ECHO_INVOKE =@echo $(QUOTE)[INVOKE] $<$(QUOTE) ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) + ECHO_CL =@echo $(QUOTE)[CL] $<$(QUOTE) ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) ECHO_AR =@echo $(QUOTE)[AR] $@$(QUOTE) @@ -224,6 +225,7 @@ ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) + ECHO_LINK =@echo $(QUOTE)[LINK] $@$(QUOTE) ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) ECHO_RBUILD =@echo $(QUOTE)[RBUILD] $@$(QUOTE) @@ -309,6 +311,8 @@ dlltool = $(Q)$(PREFIX_)dlltool strip = $(Q)$(PREFIX_)strip windres = $(Q)$(PREFIX_)windres +cl = $(Q)cl -nologo +link = $(Q)link -nologo # Set utilities ifeq ($(OSTYPE),msys) Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes"> <library>scrnsave</library> + <library>chkstk</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/display.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -87,7 +87,7 @@ SendDlgItemMessage(hwndDlg, IDC_CONTRAST_COMBO, CB_SELECTSTRING, - -1, + (WPARAM)-1, (LPARAM)pGlobalData->highContrast.lpszDefaultScheme); break; Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/general.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -19,7 +19,7 @@ #define BAUDTICKS 6 -static INT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; +static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -19,16 +19,16 @@ #define BOUNCETICKS 5 -static INT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; +static UINT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; #define DELAYTICKS 5 -static INT nDelayArray[DELAYTICKS] = {300, 700, 1000, 1500, 2000}; +static UINT nDelayArray[DELAYTICKS] = {300, 700, 1000, 1500, 2000}; #define REPEATTICKS 6 -static INT nRepeatArray[REPEATTICKS] = {300, 500, 700, 1000, 1500, 2000}; +static UINT nRepeatArray[REPEATTICKS] = {300, 500, 700, 1000, 1500, 2000}; #define WAITTICKS 10 -static INT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000}; +static UINT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000}; static VOID Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -20,7 +20,7 @@ #define SPEEDTICKS 9 #define ACCELTICKS 9 -static INT nSpeedArray[SPEEDTICKS] = {10, 20, 30, 40, 60, 80, 120, 180, 360}; +static UINT nSpeedArray[SPEEDTICKS] = {10, 20, 30, 40, 60, 80, 120, 180, 360}; INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -11,5 +11,4 @@ <file>acledit.c</file> <file>stubs.c</file> <file>acledit.rc</file> - <file>acledit.spec</file> </module> Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rbui… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.rbuild [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -17,6 +17,5 @@ <file>misc.c</file> <file>sidcache.c</file> <file>aclui.rc</file> - <file>aclui.spec</file> <pch>precomp.h</pch> </module> Modified: trunk/reactos/dll/win32/aclui/checklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/checklist.… ============================================================================== --- trunk/reactos/dll/win32/aclui/checklist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/checklist.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -153,12 +153,12 @@ return Found; } -static UINT +static INT FindCheckItemIndexByAccessMask(IN PCHECKLISTWND infoPtr, IN ACCESS_MASK AccessMask) { PCHECKITEM Item; - UINT Index = 0, Found = -1; + INT Index = 0, Found = -1; for (Item = infoPtr->CheckItemListHead; Item != NULL; @@ -208,7 +208,7 @@ CurItem = CurItem->Next) { if ((CurItem->State & CIS_DISABLED) != CIS_DISABLED && - !wcsnicmp(CurItem->Name, + !_wcsnicmp(CurItem->Name, SearchText, Count)) { break; @@ -1569,7 +1569,7 @@ { PCHECKITEM PtItem; UINT PtItemBox; - BOOL OldPushed; + UINT OldPushed; PtItem = PtToCheckItemBox(infoPtr, &pt, @@ -2137,7 +2137,7 @@ (infoPtr->QuickSearchHitItem == NULL || infoPtr->QuickSearchHitItem == infoPtr->FocusedCheckItem)) { - BOOL OldPushed = infoPtr->FocusedPushed; + UINT OldPushed = infoPtr->FocusedPushed; infoPtr->FocusedPushed = TRUE; if (infoPtr->FocusedPushed != OldPushed) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -120,7 +120,7 @@ __fpecode @115 __getmainargs @116 __initenv @117 -; __iob_func @118 + __iob_func=__p__iob @118 __isascii @119 __iscsym @120 __iscsymf @121 @@ -846,3 +846,5 @@ wctomb @840 wprintf @841 wscanf @842 + + _swprintf=swprintf Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -749,11 +749,11 @@ typedef enum _IO_PAGING_PRIORITY { - IoPagingPriorityInvalid, - IoPagingPriorityNormal, - IoPagingPriorityHigh, - IoPagingPriorityReserved1, - IoPagingPriorityReserved2 + IoPagingPriorityInvalid, + IoPagingPriorityNormal, + IoPagingPriorityHigh, + IoPagingPriorityReserved1, + IoPagingPriorityReserved2 } IO_PAGING_PRIORITY; typedef enum _IO_ALLOCATION_ACTION { @@ -2362,7 +2362,7 @@ typedef struct _SCATTER_GATHER_LIST { ULONG NumberOfElements; ULONG_PTR Reserved; - SCATTER_GATHER_ELEMENT Elements[0]; + SCATTER_GATHER_ELEMENT Elements[1]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; typedef struct _MDL { @@ -2763,6 +2763,7 @@ } KD_OPTION; /* Function Type Defintions for Dispatch Functions */ +struct _DEVICE_CONTROL_CONTEXT; typedef VOID (DDKAPI *PDEVICE_CONTROL_COMPLETION)( @@ -4441,6 +4442,8 @@ ULONG NumberOfBits; } RTL_BITMAP_RUN, *PRTL_BITMAP_RUN; +struct _RTL_RANGE; + typedef BOOLEAN (NTAPI *PRTL_CONFLICT_RANGE_CALLBACK) ( PVOID Context, @@ -4806,6 +4809,8 @@ KbCallbackDumpIo, } KBUGCHECK_CALLBACK_REASON; +struct _KBUGCHECK_REASON_CALLBACK_RECORD; + typedef VOID (DDKAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)( IN KBUGCHECK_CALLBACK_REASON Reason, Modified: trunk/reactos/include/reactos/msvctarget.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvctarget… ============================================================================== --- trunk/reactos/include/reactos/msvctarget.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/msvctarget.h [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -1,3 +1,4 @@ +#ifndef _MSC_VER #ifndef __GNUC__ #error Unsupported compiler #endif @@ -15,3 +16,4 @@ #elif defined(__i386__) && !defined(_M_IX86) #define _M_IX86 300 #endif +#endif Modified: trunk/reactos/lib/3rdparty/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cpu_features.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cpu_features.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -1,5 +1,8 @@ -#include <stdbool.h> #include "cpu_features.h" + +#if defined(_MSC_VER) +#include <intrin.h> +#endif /* level 1 edx bits */ #define EDX_CX8 (1 << 8) /* CMPXCHG8B */ @@ -18,28 +21,76 @@ #define EDX_3DNOWP (1 << 30) #define EDX_LM (1 << 29) /*LONG MODE */ +/* Combine the different cpuid flags into a single bitmap. */ + +unsigned int __cpu_features = 0; + +#ifdef __i386__ +#if defined(__GNUC__) #define __cpuid(level,a,b,c,d) \ __asm__ __volatile__ ("cpuid;" \ : "=a" (a), "=b" (b), "=c" (c), "=d" (d)\ : "0" (level)) +#elif defined(_MSC_VER) +void ___cpuid (int level, unsigned int * a, unsigned int * b, unsigned int * c, unsigned int * d) +{ + int info[4]; -/* Combine the different cpuid flags into a single bitmap. */ + __cpuid (info, level); -unsigned int __cpu_features = 0; + *a = info[0]; + *b = info[1]; + *c = info[2]; + *d = info[3]; +} +#define __cpuid(level,a,b,c,d) \ + ___cpuid(level, &(a), &(b), &(c), &(d)) +#endif -void __cpu_features_init (void) +static +unsigned int __detect_cpuid (void) { -#ifdef __i386__ - unsigned int eax, ebx, ecx, edx; - /* Try to change the value of CPUID bit (bit 21) in EFLAGS. + /* Try to change the value of CPUID bit (bit 21) in EFLAGS. If the bit can be toggled, CPUID is supported. */ +#if defined(__GNUC__) + unsigned int eax, ebx; asm volatile ("pushfl; pushfl; popl %0;" "movl %0,%1; xorl %2,%0;" "pushl %0; popfl; pushfl; popl %0; popfl" : "=&r" (eax), "=&r" (ebx) : "i" (0x00200000)); - if (((eax ^ ebx) & 0x00200000) == 0) + return ((eax ^ ebx) & 0x00200000; +#elif defined(_MSC_VER) + unsigned int retval; + + __asm + { + pushf + pushf + pop eax + mov ebx, eax + xor eax, 00200000h + push eax + popf + pushf + pop eax + popf + xor eax, ebx + mov [retval], eax + } + + return retval & 0x00200000; +#endif +} +#endif + +void __cpu_features_init (void) +{ +#ifdef __i386__ + unsigned int eax, ebx, ecx, edx; + + if (!__detect_cpuid ()) return; __cpuid (0, eax, ebx, ecx, edx); Modified: trunk/reactos/lib/3rdparty/mingw/cpu_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cpu_features.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cpu_features.h [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -1,7 +1,5 @@ #ifndef _CPU_FEATURES_H #define _CPU_FEATURES_H - -#include <stdbool.h> #define _CRT_CMPXCHG8B 0x0001 #define _CRT_CMOV 0x0002 Modified: trunk/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/getopt.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -82,7 +82,7 @@ ++ s_nArgChar; /* unrecognized option */ - if((_toptopt == _T(':')) || ((pcOptChar = _tcschr(optstring, _toptopt)) == NULL)) + if((_toptopt == _T(':')) || ((pcOptChar = _tcschr(optstring, (_TCHAR)_toptopt)) == NULL)) { /* print an error message */ if(_topterr && optstring[0] != _T(':')) Modified: trunk/reactos/lib/3rdparty/mingw/isascii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/isascii… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/isascii.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/isascii.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -13,6 +13,10 @@ #include <ctype.h> +#ifdef isascii +#undef isascii +#endif + int isascii (int c) { Modified: trunk/reactos/lib/3rdparty/mingw/iscsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/iscsym.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/iscsym.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/iscsym.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -13,6 +13,10 @@ #include <ctype.h> +#ifdef iscsym +#undef iscsym +#endif + int iscsym (int c) { Modified: trunk/reactos/lib/3rdparty/mingw/iscsymf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/iscsymf… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/iscsymf.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/iscsymf.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -13,6 +13,10 @@ #include <ctype.h> +#ifdef iscsymf +#undef iscsymf +#endif + int iscsymf (int c) { Modified: trunk/reactos/lib/3rdparty/mingw/toascii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/toascii… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/toascii.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/toascii.c [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -13,6 +13,9 @@ #include <ctype.h> +#ifdef toascii +#undef toascii +#endif int toascii (int c) Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Oct 25 12:32:54 2008 @@ -1,6 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="chkstk" type="staticlibrary"> + <directory name="except"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>chkstk_asm.s</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>chkstk_asm.s</file> + </directory> + </if> + </directory> +</module> + <module name="crt" type="staticlibrary"> + <library>chkstk</library> <include base="crt">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> @@ -43,7 +59,6 @@ <file>matherr.c</file> <if property="ARCH" value="i386"> <directory name="i386"> - <file>chkstk_asm.s</file> <file>prolog.s</file> <file>seh.s</file> <file>unwind.c</file> @@ -52,7 +67,6 @@ <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file>seh.s</file> - <file>chkstk_asm.s</file> </directory> </if> <file>xcptfil.c</file>

1 0

[sginsberg] 36953: - Fix AFD compilation for 64-bit (treat handles as ULONG_PTR-sized) - Also correct Winsock's SOCKET definition
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 12:15:23 2008 New Revision: 36953 URL: http://svn.reactos.org/svn/reactos?rev=36953&view=rev Log: - Fix AFD compilation for 64-bit (treat handles as ULONG_PTR-sized) - Also correct Winsock's SOCKET definition Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -112,7 +112,7 @@ * We do this in order to get some storage for the locked handle table * Maybe I'll use some tail item in the irp instead */ #define AFD_HANDLES(x) ((PAFD_HANDLE)(x)->Exclusive) -#define SET_AFD_HANDLES(x,y) (((x)->Exclusive) = (ULONG)(y)) +#define SET_AFD_HANDLES(x,y) (((x)->Exclusive) = (ULONG_PTR)(y)) typedef struct _AFD_MAPBUF { PVOID BufferAddress; Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -33,7 +33,7 @@ typedef unsigned long u_long; #define _BSDTYPES_DEFINED #endif /* ! def _BSDTYPES_DEFINED */ -typedef u_int SOCKET; +typedef UINT_PTR SOCKET; #ifndef FD_SETSIZE #define FD_SETSIZE 64 #endif Modified: branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -46,7 +46,7 @@ } AFD_LISTEN_DATA, *PAFD_LISTEN_DATA; typedef struct _AFD_HANDLE_ { - SOCKET Handle; + HANDLE Handle; ULONG Events; NTSTATUS Status; } AFD_HANDLE, *PAFD_HANDLE; @@ -54,7 +54,7 @@ typedef struct _AFD_POLL_INFO { LARGE_INTEGER Timeout; ULONG HandleCount; - ULONG Exclusive; + ULONG_PTR Exclusive; AFD_HANDLE Handles[1]; } AFD_POLL_INFO, *PAFD_POLL_INFO;

1 0

[sginsberg] 36952: - More correct MmGetSystemAddressForMdlSafe macro
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 11:26:30 2008 New Revision: 36952 URL: http://svn.reactos.org/svn/reactos?rev=36952&view=rev Log: - More correct MmGetSystemAddressForMdlSafe macro Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sat Oct 25 11:26:30 2008 @@ -10428,11 +10428,11 @@ * IN MM_PAGE_PRIORITY Priority) */ #define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \ - ((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ + (((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ | MDL_SOURCE_IS_NONPAGED_POOL)) ? \ (_Mdl)->MappedSystemVa : \ (PVOID) MmMapLockedPagesSpecifyCache((_Mdl), \ - KernelMode, MmCached, NULL, FALSE, _Priority) + KernelMode, MmCached, NULL, FALSE, (_Priority))) NTKERNELAPI PVOID

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008