Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[weiden] 28096: Fix compiling rostests
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 10:59:36 2007 New Revision: 28096 URL: http://svn.reactos.org/svn/reactos?rev=28096&view=rev Log: Fix compiling rostests Added: trunk/reactos/base/shell/cmd/main.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/precomp.h Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Aug 2 10:59:36 2007 @@ -1836,7 +1836,7 @@ /* * main function */ -int _tmain (int argc, const TCHAR *argv[]) +int cmd_main (int argc, const TCHAR *argv[]) { TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Thu Aug 2 10:59:36 2007 @@ -101,6 +101,7 @@ VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); VOID DoCommand (LPTSTR line); +int cmd_main (int argc, const TCHAR *argv[]); extern HANDLE CMD_ModuleHandle; Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Thu Aug 2 10:59:36 2007 @@ -1,14 +1,12 @@ -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> +<module name="cmd_base" type="objectlibrary"> <include base="ReactOS">include/reactos/wine</include> - <include base="cmd">.</include> + <include base="cmd_base">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <define name="_DEBUG_MEM" /> - <library>kernel32</library> - <library>advapi32</library> - <library>shell32</library> - <library>user32</library> + <define name="UNICODE" /> + <define name="_UNICODE" /> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> @@ -66,5 +64,18 @@ <file>where.c</file> <file>window.c</file> </compilationunit> +</module> +<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> + <include base="ReactOS">include/reactos/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>cmd_base</library> + <library>kernel32</library> + <library>advapi32</library> + <library>shell32</library> + <library>user32</library> <file>cmd.rc</file> + <file>main.c</file> </module> Added: trunk/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/main.c (added) +++ trunk/reactos/base/shell/cmd/main.c Thu Aug 2 10:59:36 2007 @@ -1,0 +1,6 @@ +#include <precomp.h> + +int _tmain (int argc, const TCHAR *argv[]) +{ + return cmd_main(argc, argv); +} Propchange: trunk/reactos/base/shell/cmd/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h (original) +++ trunk/reactos/base/shell/cmd/precomp.h Thu Aug 2 10:59:36 2007 @@ -1,3 +1,6 @@ +#ifndef __CMD_PRECOMP_H +#define __CMD_PRECOMP_H + #ifdef _MSC_VER #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ #undef _CRT_SECURE_NO_DEPRECATE @@ -32,3 +35,4 @@ #include <reactos/resource.h> +#endif /* __CMD_PRECOMP_H */

1 0

[weiden] 28095: Include stddef.h for ptrdiff_t
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 08:19:52 2007 New Revision: 28095 URL: http://svn.reactos.org/svn/reactos?rev=28095&view=rev Log: Include stddef.h for ptrdiff_t Modified: trunk/reactos/lib/inflib/inflib.h Modified: trunk/reactos/lib/inflib/inflib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.h?rev=28… ============================================================================== --- trunk/reactos/lib/inflib/inflib.h (original) +++ trunk/reactos/lib/inflib/inflib.h Thu Aug 2 08:19:52 2007 @@ -5,6 +5,7 @@ */ #include <ctype.h> +#include <stddef.h> #include <stdlib.h> #include "builddep.h"

1 0

[weiden] 28094: Fix buffer overflow in InfpAddSection. See issue #2516 for more details.
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 08:09:19 2007 New Revision: 28094 URL: http://svn.reactos.org/svn/reactos?rev=28094&view=rev Log: Fix buffer overflow in InfpAddSection. See issue #2516 for more details. Modified: trunk/reactos/lib/inflib/infcore.c trunk/reactos/lib/inflib/infpriv.h Modified: trunk/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infcore.c?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infcore.c (original) +++ trunk/reactos/lib/inflib/infcore.c Thu Aug 2 08:09:19 2007 @@ -181,7 +181,8 @@ } /* Allocate and initialize the new section */ - Size = sizeof(INFCACHESECTION) + (_tcslen (Name) * sizeof(TCHAR)); + Size = FIELD_OFFSET(INFCACHESECTION, + Name[_tcslen (Name) + 1]); Section = (PINFCACHESECTION)MALLOC (Size); if (Section == NULL) { @@ -285,7 +286,8 @@ PINFCACHEFIELD Field; ULONG Size; - Size = sizeof(INFCACHEFIELD) + (_tcslen(Data) * sizeof(TCHAR)); + Size = FIELD_OFFSET(INFCACHEFIELD, + Data[_tcslen(Data) + 1]); Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { Modified: trunk/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infpriv.h (original) +++ trunk/reactos/lib/inflib/infpriv.h Thu Aug 2 08:09:19 2007 @@ -9,6 +9,9 @@ #ifndef INFPRIV_H_INCLUDED #define INFPRIV_H_INCLUDED +#ifndef FIELD_OFFSET +#define FIELD_OFFSET(t,f) ((ptrdiff_t)&(((t*)0)->f)) +#endif #define INF_STATUS_INSUFFICIENT_RESOURCES (0xC000009A) #define INF_STATUS_BAD_SECTION_NAME_LINE (0xC0700001)

1 0

[cwittich] 28093: fix a crash
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 07:08:17 2007 New Revision: 28093 URL: http://svn.reactos.org/svn/reactos?rev=28093&view=rev Log: fix a crash Modified: trunk/reactos/base/shell/cmd/where.c Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c (original) +++ trunk/reactos/base/shell/cmd/where.c Thu Aug 2 07:08:17 2007 @@ -245,12 +245,12 @@ if (0 == _tcsicmp(pCh, pExt)) { cmd_free(pszBuffer); - cmd_free(pszBuffer2); + LocalFree(pszBuffer2); return SearchForExecutableSingle(pFileName, pFullName, NULL); } pCh = _tcstok(NULL, _T(";")); } - cmd_free(pszBuffer2); + LocalFree(pszBuffer2); } }

1 0

[cwittich] 28092: fix null pointer check
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 05:45:02 2007 New Revision: 28092 URL: http://svn.reactos.org/svn/reactos?rev=28092&view=rev Log: fix null pointer check Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Thu Aug 2 05:45:02 2007 @@ -135,8 +135,8 @@ return 1; } - param =cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); - if (rest == NULL) + param = cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); + if (param == NULL) { if(comspec != NULL) cmd_free(comspec);

1 0

[tkreuzer] 28091: remove NtGdiArc, NtGdiArcTo and NtGdiChord from win32k, they are not used any longer.
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 05:44:59 2007 New Revision: 28091 URL: http://svn.reactos.org/svn/reactos?rev=28091&view=rev Log: remove NtGdiArc, NtGdiArcTo and NtGdiChord from win32k, they are not used any longer. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Aug 2 05:44:59 2007 @@ -148,22 +148,6 @@ } /******************************************************************************/ - -BOOL -STDCALL -NtGdiChord(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - UNIMPLEMENTED; - return FALSE; -} /* * NtGdiEllipse Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Thu Aug 2 05:44:59 2007 @@ -284,29 +284,6 @@ return dc->w.ArcDirection; } -BOOL FASTCALL -IntGdiArc(DC *dc, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - if(PATH_IsPathOpen(dc->w.path)) - { - return PATH_Arc(dc, LeftRect, TopRect, RightRect, BottomRect, - XStartArc, YStartArc, XEndArc, YEndArc, GdiTypeArc ); - } - - // FIXME -// EngArc(dc, LeftRect, TopRect, RightRect, BottomRect, UNIMPLEMENTED -// XStartArc, YStartArc, XEndArc, YEndArc); - - return TRUE; -} BOOL FASTCALL IntGdiPolyPolyline(DC *dc, @@ -348,102 +325,6 @@ { UNIMPLEMENTED; return FALSE; -} - -BOOL -STDCALL -NtGdiArc(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - DC *dc; - BOOL Ret; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - Ret = IntGdiArc(dc, - LeftRect, - TopRect, - RightRect, - BottomRect, - XStartArc, - YStartArc, - XEndArc, - YEndArc); - - DC_UnlockDc( dc ); - return Ret; -} - -BOOL -STDCALL -NtGdiArcTo(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - BOOL result; - DC *dc; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - // Line from current position to starting point of arc - if ( !IntGdiLineTo(dc, XRadial1, YRadial1) ) - { - DC_UnlockDc(dc); - return FALSE; - } - - //dc = DC_LockDc(hDC); - - //if(!dc) return FALSE; - - // Then the arc is drawn. - result = IntGdiArc(dc, LeftRect, TopRect, RightRect, BottomRect, - XRadial1, YRadial1, XRadial2, YRadial2); - - //DC_UnlockDc(dc); - - // If no error occured, the current position is moved to the ending point of the arc. - if(result) - IntGdiMoveToEx(dc, XRadial2, YRadial2, NULL); - - DC_UnlockDc(dc); - - return result; } INT Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 2 05:44:59 2007 @@ -5,13 +5,10 @@ NtGdiAlphaBlend 11 NtGdiAngleArc 6 NtGdiAnimatePalette 4 -NtGdiArc 9 NtGdiArcInternal 10 -NtGdiArcTo 9 NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -NtGdiChord 9 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1 NtGdiCloseMetaFile 1

1 0

[cwittich] 28090: fix another memory leak
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 05:13:28 2007 New Revision: 28090 URL: http://svn.reactos.org/svn/reactos?rev=28090&view=rev Log: fix another memory leak Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Thu Aug 2 05:13:28 2007 @@ -872,7 +872,7 @@ FindClose(hFile); if (arg!=NULL) - cmd_free(arg); + freep(arg); return 0; }

1 0

[tkreuzer] 28089: update ntgdibad.h
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 04:25:02 2007 New Revision: 28089 URL: http://svn.reactos.org/svn/reactos?rev=28089&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Aug 2 04:25:02 2007 @@ -1053,11 +1053,6 @@ LPWSTR Filename, UINT Command); -/* These shouldn't even be called NtGdi */ -HDC STDCALL NtGdiGetDCState(HDC hDC); -WORD STDCALL NtGdiSetHookFlags(HDC hDC, WORD Flags); -VOID STDCALL NtGdiSetDCState ( HDC hDC, HDC hDCSave ); - /* All this Should be in user-mode, not NtUser calls. Especially not in GDI! */ DWORD NTAPI

1 0

[tkreuzer] 28088: rename NtGdiSetDCState to IntGdiSetDCState
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 04:23:48 2007 New Revision: 28088 URL: http://svn.reactos.org/svn/reactos?rev=28088&view=rev Log: rename NtGdiSetDCState to IntGdiSetDCState Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Thu Aug 2 04:23:48 2007 @@ -257,5 +257,7 @@ WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags); +VOID STDCALL IntGdiSetDCState ( HDC hDC, HDC hDCSave ); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Aug 2 04:23:48 2007 @@ -251,7 +251,7 @@ else DC_SetOwnership( defaultDCstate, PsGetCurrentProcess()); - NtGdiSetDCState(dce->hDC, defaultDCstate); + IntGdiSetDCState(dce->hDC, defaultDCstate); DC_SetOwnership( defaultDCstate, NULL); // Return default dc state to inaccessible mode. dce->DCXFlags &= ~DCX_DCEBUSY; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Aug 2 04:23:48 2007 @@ -1327,7 +1327,7 @@ VOID STDCALL -NtGdiSetDCState ( HDC hDC, HDC hDCSave ) +IntGdiSetDCState ( HDC hDC, HDC hDCSave ) { PDC dc, dcs; @@ -1840,7 +1840,7 @@ DC_UnlockDc( dc ); DC_UnlockDc( dcs ); - NtGdiSetDCState(hDC, hdcs); + IntGdiSetDCState(hDC, hdcs); if (!PATH_AssignGdiPath( &dc->w.path, &dcs->w.path )) {

1 0

[tkreuzer] 28087: rename NtGdiSetHookFlags into IntGdiSetHookFlags
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 04:16:31 2007 New Revision: 28087 URL: http://svn.reactos.org/svn/reactos?rev=28087&view=rev Log: rename NtGdiSetHookFlags into IntGdiSetHookFlags Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Thu Aug 2 04:16:31 2007 @@ -255,5 +255,7 @@ HDC STDCALL IntGdiGetDCState(HDC hDC); +WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Aug 2 04:16:31 2007 @@ -244,7 +244,7 @@ if (dce->DCXFlags & DCX_CACHE) { /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ - NtGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); + IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); if( dce->pProcess ) // Attempt to fix Dc_Attr problem. DC_SetOwnership( defaultDCstate, dce->pProcess); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Aug 2 04:16:31 2007 @@ -2067,7 +2067,7 @@ } WORD STDCALL -NtGdiSetHookFlags(HDC hDC, WORD Flags) +IntGdiSetHookFlags(HDC hDC, WORD Flags) { WORD wRet; DC *dc = DC_LockDc(hDC);

1 0

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