Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[tkreuzer] 35685: Make kdcom x86 code 64bit compatible and use it for amd64, too. Add a DriverEntry to make ld happy.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 16:29:31 2008 New Revision: 35685 URL: http://svn.reactos.org/svn/reactos?rev=35685&view=rev Log: Make kdcom x86 code 64bit compatible and use it for amd64, too. Add a DriverEntry to make ld happy. Removed: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/amd64/ Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Aug 26 16:29:31 2008 @@ -24,7 +24,7 @@ { ULONG ComPort; ULONG BaudRate; - ULONG BaseAddress; + ULONG_PTR BaseAddress; } KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; BOOLEAN @@ -62,6 +62,8 @@ const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; #elif defined(_M_ARM) const ULONG BaseArray[2] = {0, 0xF1012000}; +#elif defined(_M_AMD64) +const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; #else #error Unknown architecture #endif @@ -126,7 +128,7 @@ static BOOLEAN KdpDoesComPortExist( - IN ULONG BaseAddress) + IN ULONG_PTR BaseAddress) { BOOLEAN found; UCHAR mcr; @@ -185,6 +187,14 @@ /* FUNCTIONS ****************************************************************/ + +NTSTATUS +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} /* HAL.KdPortInitialize */ BOOLEAN @@ -245,7 +255,7 @@ IN ULONG Unknown1, IN ULONG Unknown2) { - ULONG ComPortBase; + ULONG_PTR ComPortBase; CHAR buffer[80]; ULONG divisor; UCHAR lcr; Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Tue Aug 26 16:29:31 2008 @@ -17,7 +17,7 @@ </directory> </if> <if property="ARCH" value="amd64"> - <directory name="amd64"> + <directory name="i386"> <file>kdbg.c</file> </directory> </if>

16 years, 4 months

[tkreuzer] 35684: If you change an rbuild file to use an arch-specific .def file, please also provide those .def files.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 15:58:04 2008 New Revision: 35684 URL: http://svn.reactos.org/svn/reactos?rev=35684&view=rev Log: If you change an rbuild file to use an arch-specific .def file, please also provide those .def files. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Tue Aug 26 15:58:04 2008 @@ -1,5 +1,5 @@ <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true"> - <importlibrary definition="gdi32_$(ARCH).def" /> + <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define>

16 years, 4 months

[tkreuzer] 35683: fix d3d9.def file and enable d3d8 and d3d9 to fix x86 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 15:56:07 2008 New Revision: 35683 URL: http://svn.reactos.org/svn/reactos?rev=35683&view=rev Log: fix d3d9.def file and enable d3d8 and d3d9 to fix x86 build Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9.def branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9.def [iso-8859-1] Tue Aug 26 15:56:07 2008 @@ -5,4 +5,4 @@ PSGPSampleTexture DebugSetLevel DebugSetMute - Direct3DCreate9 + Direct3DCreate9@4 Modified: branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild [iso-8859-1] Tue Aug 26 15:56:07 2008 @@ -1,8 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="d3d8"> + <xi:include href="d3d8/d3d8.rbuild" /> + </directory> <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> + </directory> + <directory name="d3d9"> + <xi:include href="d3d9/d3d9.rbuild" /> </directory> <directory name="ddraw"> <xi:include href="ddraw/ddraw.rbuild" />

16 years, 4 months

[tkreuzer] 35682: Start a new strsafe lib. Nothing implemented so far, more something like a framework. The actual function implementation will be in the header, because the ms header allows to inline the functions. It uses recursive include to avoid code duplication. The lib uses these functions to generate the code.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 15:51:14 2008 New Revision: 35682 URL: http://svn.reactos.org/svn/reactos?rev=35682&view=rev Log: Start a new strsafe lib. Nothing implemented so far, more something like a framework. The actual function implementation will be in the header, because the ms header allows to inline the functions. It uses recursive include to avoid code duplication. The lib uses these functions to generate the code. Added: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/sdk.rbuild Added: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h (added) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -1,0 +1,144 @@ +#ifndef __STRSAFE_H_ +#define __STRSAFE_H_ + +#include <stdlib.h> +#include <stdarg.h> + +#if defined(STRSAFE_NO_CCH_FUNCTIONS) && defined(STRSAFE_NO_CB_FUNCTIONS) +#error Both STRSAFE_NO_CCH_FUNCTIONS and STRSAFE_NO_CB_FUNCTIONS are defined +#endif + + +#ifndef _HRESULT_DEFINED +#define _HRESULT_DEFINED +typedef long HRESULT; +#endif + +typedef char * STRSAFE_LPSTR; +typedef const char * STRSAFE_LPCSTR; +typedef wchar_t * STRSAFE_LPWSTR; +typedef const wchar_t * STRSAFE_LPCWSTR; +typedef unsigned long STRSAFE_DWORD; + +/* Implement for ansi and unicode */ +#define STRSAFE_PASS2 +#define STRSAFE_UNICODE 0 +# include <strsafe.h> +#undef STRSAFE_UNICODE +#define STRSAFE_UNICODE 1 +# include <strsafe.h> +#undef STRSAFE_UNICODE +#undef STRSAFE_PASS2 + +/* Now define the functions depending on UNICODE */ +#ifdef UNICODE +# define STRSAFE_UNICODE 1 +#else +# define STRSAFE_UNICODE 0 +#endif +#include <strsafe.h> +#undef STRSAFE_UNICODE + +#endif // !__STRSAFE_H_ + +/*****************************************************************************/ + +#if defined(STRSAFE_UNICODE) +#if (STRSAFE_UNICODE == 1) + +#define STRSAFE_LPTSTR STRSAFE_LPWSTR +#define STRSAFE_LPCTSTR STRSAFE_LPCWSTR + +#define StringCbCat StringCbCatW +#define StringCbCopy StringCbCopyW +#define StringCbVPrintf StringCbVPrintfW +#define StringCbPrintf StringCbPrintfW + +#else // (STRSAFE_UNICODE != 1) + +#define STRSAFE_LPTSTR STRSAFE_LPSTR +#define STRSAFE_LPCTSTR STRSAFE_LPCSTR + +#define StringCbCat StringCbCatA +#define StringCbCopy StringCbCopyA +#define StringCbVPrintf StringCbVPrintfA +#define StringCbPrintf StringCbPrintfA + +#endif // (STRSAFE_UNICODE != 1) +#endif // defined(STRSAFE_UNICODE) + +/*****************************************************************************/ + +#if defined (STRSAFE_PASS2) + +#ifdef STRSAFE_LIB + +/* Normal function prototypes only */ +#define STRSAFEAPI HRESULT __stdcall + +#ifndef STRSAFE_NO_CB_FUNCTIONS +STRSAFEAPI StringCbCat(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCbCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCbVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args); +STRSAFEAPI StringCbPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...); +#endif // !STRSAFE_NO_CB_FUNCTIONS + +#ifndef STRSAFE_NO_CCH_FUNCTIONS + +#endif // !STRSAFE_NO_CCH_FUNCTIONS + + +#else // !STRSAFE_LIB + +/* Create inlined versions */ +#define STRSAFEAPI HRESULT static __inline__ + +#ifndef STRSAFE_NO_CB_FUNCTIONS + +STRSAFEAPI StringCbCat(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) +{ + return 0; // FIXME +} + +STRSAFEAPI +StringCbCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) +{ + return 0; // FIXME +} + +STRSAFEAPI +StringCbVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args) +{ + return 0; // FIXME +} + +STRSAFEAPI +StringCbPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCbVPrintf(pszDest, cbDest, pszFormat, args); + va_end(args); + return result; +} + +#endif // !STRSAFE_NO_CB_FUNCTIONS + +#ifndef STRSAFE_NO_CCH_FUNCTIONS + +#endif // !STRSAFE_NO_CCH_FUNCTIONS + +#endif // !STRSAFE_LIB + +/* Functions are implemented or defined, clear #defines for next pass */ +#undef StringCbCat +#undef StringCbCopy +#undef StringCbVPrintf +#undef StringCbPrintf + +#undef STRSAFE_LPTSTR +#undef STRSAFE_LPCTSTR + +#endif // defined (STRSAFE_PASS2) + Propchange: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/sdk.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/sdk.rbuild [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -14,6 +14,9 @@ <directory name="strmiids"> <xi:include href="strmiids/strmiids.rbuild" /> </directory> + <directory name="strsafe"> + <xi:include href="strsafe/strsafe.rbuild" /> + </directory> <directory name="uuid"> <xi:include href="uuid/uuid.rbuild" /> </directory> Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatA.c [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatA _StringCbCatA +#include <strsafe.h> + +#undef StringCbCatA +HRESULT __stdcall +StringCbCatA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCbCatA(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyA.c [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyA _StringCbCopyA +#include <strsafe.h> + +#undef StringCbCopyA +HRESULT __stdcall +StringCbCopyA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCbCopyA(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfA.c [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbPrintfA _StringCbPrintfA +#include <strsafe.h> + +#undef StringCbPrintfA +HRESULT __stdcall +StringCbPrintfA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCbVPrintfA(pszDest, cbDest, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild [iso-8859-1] Tue Aug 26 15:51:14 2008 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="strsafe" type="staticlibrary"> + <define name="_DISABLE_TIDENTS" /> + <file>StringCbCatA.c</file> + <file>StringCbCopyA.c</file> + <file>StringCbPrintfA.c</file> +</module> Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 4 months

[jmorlan] 35681: - Implement call :label by creating a new batch context; this way calls can be nested and have their own %0-%9 parameters. - GetBatchVar: Implement %~n. Remove %? (an old FreeDOS-ism; the Windows equivalent is %ERRORLEVEL%)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Aug 26 15:36:38 2008 New Revision: 35681 URL: http://svn.reactos.org/svn/reactos?rev=35681&view=rev Log: - Implement call :label by creating a new batch context; this way calls can be nested and have their own %0-%9 parameters. - GetBatchVar: Implement %~n. Remove %? (an old FreeDOS-ism; the Windows equivalent is %ERRORLEVEL%) Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/goto.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Tue Aug 26 15:36:38 2008 @@ -216,10 +216,9 @@ * */ -BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) +BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, BOOL forcenew) { HANDLE hFile; - LPTSTR tmp; SetLastError(0); hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | @@ -238,7 +237,7 @@ while (bc && bc->forvar) ExitBatch (NULL); - if (bc == NULL) + if (bc == NULL || forcenew) { /* No curent batch file, create a new context */ LPBATCH_CONTEXT n = (LPBATCH_CONTEXT)cmd_alloc (sizeof(BATCH_CONTEXT)); @@ -264,16 +263,13 @@ cmd_free (bc->raw_params); } - GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, &tmp); - *tmp = '\0'; + GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); bc->hBatchFile = hFile; SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; bc->bCmdBlock = -1; - bc->lCallPosition = 0; - bc->lCallPositionHigh = 0; bc->ffind = NULL; bc->forvar = _T('\0'); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Tue Aug 26 15:36:38 2008 @@ -23,8 +23,6 @@ TCHAR forvar; INT bCmdBlock; BOOL bExecuteBlock[MAX_PATH]; - LONG lCallPosition; /* store position where to return to after Call :Label */ - LONG lCallPositionHigh; } BATCH_CONTEXT, *LPBATCH_CONTEXT; @@ -43,7 +41,7 @@ LPTSTR FindArg (INT); LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (LPTSTR); -BOOL Batch (LPTSTR, LPTSTR, LPTSTR); +BOOL Batch (LPTSTR, LPTSTR, LPTSTR, BOOL); LPTSTR ReadBatchLine(); VOID AddBatchRedirection(REDIRECTION **); Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Tue Aug 26 15:36:38 2008 @@ -53,9 +53,18 @@ if (*param == _T(':') && (bc)) { - bc->lCallPosition = SetFilePointer(bc->hBatchFile, 0, &bc->lCallPositionHigh, FILE_CURRENT); - cmd_goto(param); - return 0; + TCHAR *first = param; + while (*param && !_istspace(*param)) + param++; + if (*param) + { + *param++ = _T('\0'); + while (_istspace(*param)) + param++; + } + if (!Batch(bc->BatchFilePath, first, param, TRUE)) + return 1; + return cmd_goto(first); } nErrorLevel = 0; Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Aug 26 15:36:38 2008 @@ -470,7 +470,7 @@ if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - Batch (szFullName, first, rest); + Batch (szFullName, first, rest, FALSE); } else { @@ -1024,14 +1024,16 @@ return NULL; } + + LPCTSTR GetBatchVar ( LPCTSTR varName, UINT* varNameLen ) { static LPTSTR ret = NULL; static UINT retlen = 0; - - if ( varNameLen ) - *varNameLen = 1; + DWORD len; + + *varNameLen = 1; switch ( *varName ) { @@ -1039,10 +1041,35 @@ varName++; if (_tcsncicmp(varName, _T("dp0"), 3) == 0) { - if ( varNameLen ) - *varNameLen = 4; - return bc->BatchFilePath; - } + *varNameLen = 4; + len = _tcsrchr(bc->BatchFilePath, _T('\\')) + 1 - bc->BatchFilePath; + if (!GrowIfNecessary(len + 1, &ret, &retlen)) + return NULL; + memcpy(ret, bc->BatchFilePath, len * sizeof(TCHAR)); + ret[len] = _T('\0'); + return ret; + } + + *varNameLen = 2; + if (*varName >= _T('0') && *varName <= _T('9')) { + LPTSTR arg = FindArg(*varName - _T('0')); + + if (*arg != _T('"')) + return arg; + + /* Exclude the leading and trailing quotes */ + arg++; + len = _tcslen(arg); + if (arg[len - 1] == _T('"')) + len--; + + if (!GrowIfNecessary(len + 1, &ret, &retlen)) + return NULL; + memcpy(ret, arg, len * sizeof(TCHAR)); + ret[len] = _T('\0'); + return ret; + } + break; case _T('0'): case _T('1'): case _T('2'): @@ -1063,16 +1090,6 @@ case _T('%'): return _T("%"); - - case _T('?'): - /* TODO FIXME 10 is only max size for 32-bit */ - if ( !GrowIfNecessary ( 11, &ret, &retlen ) ) - return NULL; - _sntprintf ( ret, retlen, _T("%u"), nErrorLevel); - ret[retlen-1] = 0; - if ( varNameLen ) - *varNameLen = 1; - return ret; } return NULL; } Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Tue Aug 26 15:36:38 2008 @@ -75,15 +75,7 @@ /* jump to end of the file */ if ( _tcsicmp( param, _T(":eof"))==0) { - /* when lCallPosition != 0 we have to return to the caller */ - if (bc->lCallPosition == 0) - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); - else - { - SetFilePointer (bc->hBatchFile, (LONG)bc->lCallPosition, &bc->lCallPositionHigh, FILE_BEGIN); - bc->lCallPosition = 0; - bc->lCallPositionHigh = 0; - } + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); return 0; }

16 years, 4 months

[janderwald] 35680: Copied remotely

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 26 14:48:08 2008 New Revision: 35680 URL: http://svn.reactos.org/svn/reactos?rev=35680&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c - copied unchanged from r35679, trunk/reactos/dll/win32/shell32/cpanelfolder.c

16 years, 4 months

[jmorlan] 35679: cmd_type: Fix misuse of ConOutPrintf which caused problems when the file had any '%' characters in it.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Aug 26 14:07:23 2008 New Revision: 35679 URL: http://svn.reactos.org/svn/reactos?rev=35679&view=rev Log: cmd_type: Fix misuse of ConOutPrintf which caused problems when the file had any '%' characters in it. Modified: trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Tue Aug 26 14:07:23 2008 @@ -106,7 +106,7 @@ { if(bRet) { - if (ConOutPrintfPaging(bFirstTime, buff) == 1) + if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1) { bCtrlBreak = FALSE; return 0; @@ -116,7 +116,7 @@ else { if(bRet) - ConOutPrintf(buff); + ConOutPrintf(_T("%s"), buff); } bFirstTime = FALSE;

16 years, 4 months

[pschweitzer] 35678: Implemented FsRtlInitPerStreamContext

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 26 12:31:48 2008 New Revision: 35678 URL: http://svn.reactos.org/svn/reactos?rev=35678&view=rev Log: Implemented FsRtlInitPerStreamContext Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Tue Aug 26 12:31:48 2008 @@ -2894,8 +2894,8 @@ OUT PULONG SectorCount ); -#define FsRtlGetPerStreamContextPointer(FO) ( \ - (PFSRTL_ADVANCED_FCB_HEADER) FO->FsContext \ +#define FsRtlGetPerStreamContextPointer(FO) ( \ + (PFSRTL_ADVANCED_FCB_HEADER)(FO)->FsContext \ ) NTKERNELAPI @@ -2944,6 +2944,12 @@ FsRtlInitializeTunnelCache ( IN PTUNNEL Cache ); + +#define FsRtlInitPerStreamContext(PSC, O, I, FC) ( \ + (PSC)->OwnerId = (O), \ + (PSC)->InstanceId = (I), \ + (PSC)->FreeCallback = (FC) \ +) NTKERNELAPI NTSTATUS

16 years, 4 months

[fireball] 35677: - Move fdiv pentium bug function stubs to another file. - Exclude platform-independent CI math function stubs when compiling x86 target. Should finally fix bug 1255. See issue #1255 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 26 12:21:02 2008 New Revision: 35677 URL: http://svn.reactos.org/svn/reactos?rev=35677&view=rev Log: - Move fdiv pentium bug function stubs to another file. - Exclude platform-independent CI math function stubs when compiling x86 target. Should finally fix bug 1255. See issue #1255 for more details. Added: trunk/reactos/lib/sdk/crt/math/fdivbug.c (contents, props changed) - copied, changed from r35665, trunk/reactos/lib/sdk/crt/math/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild 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] Tue Aug 26 12:21:02 2008 @@ -86,6 +86,7 @@ <file>cabs.c</file> <file>cosh.c</file> <file>div.c</file> + <file>fdivbug.c</file> <file>frexp.c</file> <file>huge_val.c</file> <file>hypot.c</file> @@ -97,7 +98,6 @@ <file>rand.c</file> <file>s_modf.c</file> <file>sinh.c</file> - <file>stubs.c</file> <file>tanh.c</file> <file>pow_asm.c</file> @@ -114,6 +114,7 @@ </directory> </if> <ifnot property="ARCH" value="i386"> + <file>stubs.c</file> </ifnot> </directory> Copied: trunk/reactos/lib/sdk/crt/math/fdivbug.c (from r35665, trunk/reactos/lib/sdk/crt/math/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/fdivbug.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/fdivbug.c [iso-8859-1] Tue Aug 26 12:21:02 2008 @@ -1,136 +1,5 @@ #include <precomp.h> #include <math.h> - -double CDECL _CIsin(double x); -double CDECL _CIcos(double x); -double CDECL _CItan(double x); -double CDECL _CIsinh(double x); -double CDECL _CIcosh(double x); -double CDECL _CItanh(double x); -double CDECL _CIasin(double x); -double CDECL _CIacos(double x); -double CDECL _CIatan(double x); -double CDECL _CIatan2(double y, double x); -double CDECL _CIexp(double x); -double CDECL _CIlog(double x); -double CDECL _CIlog10(double x); -double CDECL _CIpow(double x, double y); -double CDECL _CIsqrt(double x); -double CDECL _CIfmod(double x, double y); - - -/* - * @implemented - */ -double CDECL _CIsin(double x) -{ - return sin(x); -} -/* - * @implemented - */ -double CDECL _CIcos(double x) -{ - return cos(x); -} -/* - * @implemented - */ -double CDECL _CItan(double x) -{ - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(double x) -{ - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(double x) -{ - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(double x) -{ - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(double x) -{ - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(double x) -{ - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(double x) -{ - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(double x, double y) -{ - return atan2(y, x); -} -/* - * @implemented - */ -double CDECL _CIexp(double x) -{ - return exp(x); -} -/* - * @implemented - */ -double CDECL _CIlog(double x) -{ - return log(x); -} -/* - * @implemented - */ -double CDECL _CIlog10(double x) -{ - return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(double x, double y) -{ - return pow(x, y); -} -/* - * @implemented - */ -double CDECL _CIsqrt(double x) -{ - return sqrt(x); -} -/* - * @implemented - */ -double CDECL _CIfmod(double x, double y) -{ - return fmod(x, y); -} /* The following functions are likely workarounds for the pentium fdiv bug */ void __stdcall _adj_fdiv_m32( unsigned int arg ) Propchange: trunk/reactos/lib/sdk/crt/math/fdivbug.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/math/fdivbug.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/lib/sdk/crt/math/fdivbug.c ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 4 months

[janderwald] 35676: - Fix executing item which was broken in last revision

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 26 11:27:40 2008 New Revision: 35676 URL: http://svn.reactos.org/svn/reactos?rev=35676&view=rev Log: - Fix executing item which was broken in last revision Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Tue Aug 26 11:27:40 2008 @@ -692,7 +692,7 @@ } if (poainfo->oaifInFlags & OAIF_EXEC) - ExecuteOpenItem(pItemContext, szBuffer); + ExecuteOpenItem(pItemContext, poainfo->pcszFile); } FreeListItems(hwndDlg); EndDialog(hwndDlg, 1);

16 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
86
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 August 2008