Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[fireball] 31911: - Fix warnings.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 21 00:33:56 2008 New Revision: 31911 URL: http://svn.reactos.org/svn/reactos?rev=31911&view=rev Log: - Fix warnings. Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Jan 21 00:33:56 2008 @@ -35,6 +35,7 @@ #include "shlwapi.h" #include "shlobj.h" #include "shresdef.h" +#include "pidl.h" #include "wine/debug.h" #include "shell32_main.h" Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Mon Jan 21 00:33:56 2008 @@ -52,6 +52,8 @@ #endif #endif /* defined __VALIST */ +int __cdecl _wtoi (const wchar_t *); +long __cdecl _wtol (const wchar_t *); int __cdecl swprintf (wchar_t*, const wchar_t*, ...); int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST);

16 years, 8 months

[fireball] 31910: - Fix warnings.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 21 00:24:32 2008 New Revision: 31910 URL: http://svn.reactos.org/svn/reactos?rev=31910&view=rev Log: - Fix warnings. Modified: trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Mon Jan 21 00:24:32 2008 @@ -246,4 +246,5 @@ HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); BOOL SH_ShowDriveProperties(WCHAR * drive); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); +BOOL SH_ShowPropertiesDialog(WCHAR * lpf); #endif Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Mon Jan 21 00:24:32 2008 @@ -44,7 +44,17 @@ #define WINE_UNICODE_API __attribute__((dllimport)) #endif +#ifndef __VALIST +#ifdef __GNUC__ +#define __VALIST __gnuc_va_list +#else +#define __VALIST char* +#endif +#endif /* defined __VALIST */ + int __cdecl swprintf (wchar_t*, const wchar_t*, ...); +int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); +int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) {

16 years, 8 months

[fireball] 31909: - Add swprintf prototype, since oleaut32 needs it.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 20 23:29:42 2008 New Revision: 31909 URL: http://svn.reactos.org/svn/reactos?rev=31909&view=rev Log: - Add swprintf prototype, since oleaut32 needs it. Modified: trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Sun Jan 20 23:29:42 2008 @@ -44,6 +44,8 @@ #define WINE_UNICODE_API __attribute__((dllimport)) #endif +int __cdecl swprintf (wchar_t*, const wchar_t*, ...); + static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str;

16 years, 8 months

[cwittich] 31908: stdole2.tlb doesn't have an entrypoint

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 20 20:28:56 2008 New Revision: 31908 URL: http://svn.reactos.org/svn/reactos?rev=31908&view=rev Log: stdole2.tlb doesn't have an entrypoint Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Sun Jan 20 20:28:56 2008 @@ -8,7 +8,7 @@ <define name="WINVER">0x501</define> <file>std_ole_v2.idl</file> </module> -<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb"> +<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0"> <importlibrary definition="stdole2.tlb.spec.def" /> <include base="stdole2">.</include> <include base="stdole2" root="intermediate">.</include>

16 years, 8 months

[cwittich] 31907: fix process token leaks

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 20 20:01:42 2008 New Revision: 31907 URL: http://svn.reactos.org/svn/reactos?rev=31907&view=rev Log: fix process token leaks Modified: trunk/reactos/dll/win32/msi/registry.c Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c (original) +++ trunk/reactos/dll/win32/msi/registry.c Sun Jan 20 20:01:42 2008 @@ -479,11 +479,19 @@ size = sizeof(buf); if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) - return ERROR_FUNCTION_FAILED; + { + CloseHandle(token); + return ERROR_FUNCTION_FAILED; + } user = (PTOKEN_USER)buf; if (!ConvertSidToStringSidW(user->User.Sid, usersid)) - return ERROR_FUNCTION_FAILED; + { + CloseHandle(token); + return ERROR_FUNCTION_FAILED; + } + + CloseHandle(token); return ERROR_SUCCESS; }

16 years, 8 months

[navaraf] 31906: Remove redundant memset call.

by navaraf＠svn.reactos.org

Author: navaraf Date: Sun Jan 20 18:41:49 2008 New Revision: 31906 URL: http://svn.reactos.org/svn/reactos?rev=31906&view=rev Log: Remove redundant memset call. Modified: trunk/reactos/base/shell/cmd/batch.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 (original) +++ trunk/reactos/base/shell/cmd/batch.c Sun Jan 20 18:41:49 2008 @@ -284,7 +284,6 @@ bc->raw_params = (TCHAR*) cmd_alloc((_tcslen(param)+1) * sizeof(TCHAR)); if (bc->raw_params != NULL) { - memset (bc->raw_params, 0, (_tcslen(param)+1) * sizeof(TCHAR)); _tcscpy(bc->raw_params,param); } else

16 years, 8 months

[fireball] 31905: - Sync the header with Wine, it's vital for the new rpcrt4 imported.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 20 18:25:31 2008 New Revision: 31905 URL: http://svn.reactos.org/svn/reactos?rev=31905&view=rev Log: - Sync the header with Wine, it's vital for the new rpcrt4 imported. Modified: trunk/reactos/include/psdk/rpcndr.h Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h (original) +++ trunk/reactos/include/psdk/rpcndr.h Sun Jan 20 18:25:31 2008 @@ -137,6 +137,8 @@ struct NDR_ALLOC_ALL_NODES_CONTEXT; struct NDR_POINTER_QUEUE_STATE; +typedef unsigned char *RPC_BUFPTR; +typedef unsigned long RPC_LENGTH; typedef void (__RPC_USER *EXPR_EVAL)(struct _MIDL_STUB_MESSAGE *); typedef const unsigned char *PFORMAT_STRING; @@ -453,6 +455,25 @@ NDR_SCONTEXT *ArrayOfObjects; } SCONTEXT_QUEUE, *PSCONTEXT_QUEUE; +typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1 +{ + void *Buffer; + ULONG BufferSize; + void * (__RPC_API *pfnAllocate)(size_t); + void (__RPC_API *pfnFree)(void *); + struct IRpcChannelBuffer *pRpcChannelBuffer; + ULONG_PTR Reserved[5]; +} NDR_USER_MARSHAL_INFO_LEVEL1; + +typedef struct _NDR_USER_MARSHAL_INFO +{ + ULONG InformationLevel; + union + { + NDR_USER_MARSHAL_INFO_LEVEL1 Level1; + } DUMMYUNIONNAME1; +} NDR_USER_MARSHAL_INFO; + /* Context Handles */ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY @@ -564,9 +585,32 @@ #undef SIMPLE_TYPE_MARSHAL RPCRTAPI void RPC_ENTRY + NdrCorrelationInitialize( PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG flags ); +RPCRTAPI void RPC_ENTRY + NdrCorrelationPass( PMIDL_STUB_MESSAGE pStubMsg ); +RPCRTAPI void RPC_ENTRY + NdrCorrelationFree( PMIDL_STUB_MESSAGE pStubMsg ); + +RPCRTAPI void RPC_ENTRY NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, LONG NumberParams ); RPCRTAPI void RPC_ENTRY NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); + +#define USER_MARSHAL_FC_BYTE 1 +#define USER_MARSHAL_FC_CHAR 2 +#define USER_MARSHAL_FC_SMALL 3 +#define USER_MARSHAL_FC_USMALL 4 +#define USER_MARSHAL_FC_WCHAR 5 +#define USER_MARSHAL_FC_SHORT 6 +#define USER_MARSHAL_FC_USHORT 7 +#define USER_MARSHAL_FC_LONG 8 +#define USER_MARSHAL_FC_ULONG 9 +#define USER_MARSHAL_FC_FLOAT 10 +#define USER_MARSHAL_FC_HYPER 11 +#define USER_MARSHAL_FC_DOUBLE 12 + +RPCRTAPI unsigned char* RPC_ENTRY + NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); /* Note: this should return a CLIENT_CALL_RETURN, but calling convention for * returning structures/unions is different between Windows and gcc on i386. */ @@ -576,11 +620,15 @@ NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); LONG_PTR RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +LONG_PTR RPC_VAR_ENTRY + NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg ); RPCRTAPI void RPC_ENTRY NdrServerCall( PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY + NdrAsyncServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI LONG RPC_ENTRY NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); @@ -588,6 +636,8 @@ NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); +RPCRTAPI LONG RPC_ENTRY + NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI void* RPC_ENTRY NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len ); @@ -605,10 +655,25 @@ NdrOleFree( void* NodeToFree ); RPCRTAPI void RPC_ENTRY + NdrClientInitialize( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, + PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); +RPCRTAPI void RPC_ENTRY NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); RPCRTAPI unsigned char* RPC_ENTRY + NdrServerInitialize( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); +RPCRTAPI unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrServerInitializeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY + NdrServerInitializeMarshall( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg ); +RPCRTAPI void RPC_ENTRY + NdrServerMarshall( struct IRpcStubBuffer *pThis, struct IRpcChannelBuffer *pChannel, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); +RPCRTAPI void RPC_ENTRY + NdrServerUnmarshall( struct IRpcChannelBuffer *pChannel, PRPC_MESSAGE pRpcMsg, + PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, + PFORMAT_STRING pFormat, void *pParamList ); RPCRTAPI unsigned char* RPC_ENTRY NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ); RPCRTAPI void RPC_ENTRY @@ -620,6 +685,9 @@ NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, ULONG BufferLength, RPC_BINDING_HANDLE Handle ); RPCRTAPI unsigned char * RPC_ENTRY NdrNsSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pBufferEnd, RPC_BINDING_HANDLE *pAutoHandle ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + NdrGetDcomProtocolVersion( PMIDL_STUB_MESSAGE pStubMsg, RPC_VERSION *pVersion ); RPCRTAPI PFULL_PTR_XLAT_TABLES RPC_ENTRY NdrFullPointerXlatInit( ULONG NumberOfPointers, XLAT_SIDE XlatSide ); @@ -651,12 +719,8 @@ RPCRTAPI void RPC_ENTRY NdrRpcSsDefaultFree( void *NodeToFree ); - -#define RPC_BAD_STUB_DATA_EXCEPTION_FILTER \ - ( (RpcExceptionCode() == STATUS_ACCESS_VIOLATION) || \ - (RpcExceptionCode() == STATUS_DATATYPE_MISALIGNMENT) || \ - (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ - (RpcExceptionCode() == RPC_S_INVALID_BOUND) ) +RPCRTAPI RPC_STATUS RPC_ENTRY + NdrGetUserMarshalInfo( ULONG *pFlags, ULONG InformationLevel, NDR_USER_MARSHAL_INFO *pMarshalInfo ); #ifdef __cplusplus }

16 years, 8 months

[cwittich] 31904: startpos is zero based

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 20 17:41:22 2008 New Revision: 31904 URL: http://svn.reactos.org/svn/reactos?rev=31904&view=rev Log: startpos is zero based Modified: trunk/reactos/base/shell/cmd/cmd.c 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 (original) +++ trunk/reactos/base/shell/cmd/cmd.c Sun Jan 20 17:41:22 2008 @@ -1172,7 +1172,7 @@ i++; Token = _tcstok (NULL, _T(",")); } - _tcsncpy(ReturnValue, ret + (1 - StringPart[0]), StringPart[1]); + _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); _tcscpy(ret, ReturnValue); return ret; }

16 years, 8 months

[cwittich] 31903: support blocks ( ... ) support parsing of env vars like %TIMERAW:~0, 2% there is still room for improvement...

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 20 17:29:18 2008 New Revision: 31903 URL: http://svn.reactos.org/svn/reactos?rev=31903&view=rev Log: support blocks ( ... ) support parsing of env vars like %TIMERAW:~0,2% there is still room for improvement... Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/if.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 (original) +++ trunk/reactos/base/shell/cmd/batch.c Sun Jan 20 17:29:18 2008 @@ -272,6 +272,7 @@ SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; + bc->bCmdBlock = FALSE; bc->ffind = NULL; bc->forvar = _T('\0'); @@ -453,6 +454,18 @@ *++ip = _T('\0'); + /* cmd block over multiple lines (..) */ + if (bc->bCmdBlock) + { + if (*first == _T(')')) + { + bc->bCmdBlock = FALSE; + continue; + } + if (!bc->bExecuteBlock) + continue; + } + /* ignore labels and empty lines */ if (*first == _T(':') || *first == 0) continue; 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 (original) +++ trunk/reactos/base/shell/cmd/batch.h Sun Jan 20 17:29:18 2008 @@ -23,6 +23,8 @@ TCHAR Out[MAX_PATH]; TCHAR Err[MAX_PATH]; TCHAR forvar; + BOOL bCmdBlock; + BOOL bExecuteBlock; } BATCH_CONTEXT, *LPBATCH_CONTEXT; 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 (original) +++ trunk/reactos/base/shell/cmd/cmd.c Sun Jan 20 17:29:18 2008 @@ -1140,20 +1140,49 @@ static LPTSTR ret = NULL; static UINT retlen = 0; UINT size; - - size = GetEnvironmentVariable ( varName, ret, retlen ); + TCHAR varNameFixed[MAX_PATH]; + TCHAR ReturnValue[MAX_PATH]; + LPTSTR position; + LPTSTR Token; + SIZE_T i = 0; + INT StringPart[1] = {0}; + + position = _tcsstr(varName, _T(":~")); + if (position) + _tcsncpy(varNameFixed, varName, (int) (position - varName)); + else + _tcscpy(varNameFixed, varName); + + size = GetEnvironmentVariable ( varNameFixed, ret, retlen ); if ( size > retlen ) { if ( !GrowIfNecessary ( size, &ret, &retlen ) ) return NULL; - size = GetEnvironmentVariable ( varName, ret, retlen ); + size = GetEnvironmentVariable ( varNameFixed, ret, retlen ); } if ( size ) - return ret; + { + if (position) + { + position += 2; + Token = _tcstok(position, _T(",")); + while ((Token != NULL) && (i < 2)) + { + StringPart[i] = _ttoi(Token); + i++; + Token = _tcstok (NULL, _T(",")); + } + _tcsncpy(ReturnValue, ret + (1 - StringPart[0]), StringPart[1]); + _tcscpy(ret, ReturnValue); + return ret; + } + else + return ret; + } /* env var doesn't exist, look for a "special" one */ /* %CD% */ - if (_tcsicmp(varName,_T("cd")) ==0) + if (_tcsicmp(varNameFixed,_T("cd")) ==0) { size = GetCurrentDirectory ( retlen, ret ); if ( size > retlen ) @@ -1167,7 +1196,7 @@ return ret; } /* %TIME% */ - else if (_tcsicmp(varName,_T("time")) ==0) + else if (_tcsicmp(varNameFixed,_T("time")) ==0) { SYSTEMTIME t; if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) @@ -1179,7 +1208,7 @@ return ret; } /* %DATE% */ - else if (_tcsicmp(varName,_T("date")) ==0) + else if (_tcsicmp(varNameFixed,_T("date")) ==0) { if ( !GrowIfNecessary ( GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, NULL, 0), &ret, &retlen ) ) @@ -1193,7 +1222,7 @@ } /* %RANDOM% */ - else if (_tcsicmp(varName,_T("random")) ==0) + else if (_tcsicmp(varNameFixed,_T("random")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1203,13 +1232,13 @@ } /* %CMDCMDLINE% */ - else if (_tcsicmp(varName,_T("cmdcmdline")) ==0) + else if (_tcsicmp(varNameFixed,_T("cmdcmdline")) ==0) { return GetCommandLine(); } /* %CMDEXTVERSION% */ - else if (_tcsicmp(varName,_T("cmdextversion")) ==0) + else if (_tcsicmp(varNameFixed,_T("cmdextversion")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1219,7 +1248,7 @@ } /* %ERRORLEVEL% */ - else if (_tcsicmp(varName,_T("errorlevel")) ==0) + else if (_tcsicmp(varNameFixed,_T("errorlevel")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1227,8 +1256,8 @@ return ret; } - GrowIfNecessary(_tcslen(varName) + 3, &ret, &retlen); - _stprintf(ret,_T("%%%s%%"),varName); + GrowIfNecessary(_tcslen(varNameFixed) + 3, &ret, &retlen); + _stprintf(ret,_T("%%%s%%"),varNameFixed); return ret; /* not found - return orginal string */ } Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=31… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Sun Jan 20 17:29:18 2008 @@ -181,6 +181,18 @@ x_flag ^= X_EXEC; pp += p1len; + while (_istspace (*pp)) /* skip spaces */ + pp++; + + if (*pp == _T('(')) + { + if (bc) + { + bc->bCmdBlock = TRUE; + bc->bExecuteBlock = x_flag & X_EXEC; + } + } + if ( x_flag ) { x_flag |= X_EMPTY;

16 years, 8 months

[fireball] 31902: - Fix a bug, which led to incorrect prefix tree construction (and thus led to a crash when trying native npfs.sys). - Add tracing.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 20 16:49:58 2008 New Revision: 31902 URL: http://svn.reactos.org/svn/reactos?rev=31902&view=rev Log: - Fix a bug, which led to incorrect prefix tree construction (and thus led to a crash when trying native npfs.sys). - Add tracing. Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicodeprefix.c?re… ============================================================================== --- trunk/reactos/lib/rtl/unicodeprefix.c (original) +++ trunk/reactos/lib/rtl/unicodeprefix.c Sun Jan 20 16:49:58 2008 @@ -155,6 +155,9 @@ PRTL_SPLAY_LINKS SplayLinks; RTL_GENERIC_COMPARE_RESULTS Result; + DPRINT("RtlFindUnicodePrefix(): Table %p, FullName %wZ, " + "CaseInsensitive %b\n", PrefixTable, FullName, CaseInsensitiveIndex); + /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(FullName); @@ -279,6 +282,9 @@ NTAPI RtlInitializeUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable) { + DPRINT("RtlInitializeUnicodePrefix(): Table %p\n", + PrefixTable); + /* Setup the table */ PrefixTable->NameLength = 0; PrefixTable->LastNextEntry = NULL; @@ -300,6 +306,9 @@ RTL_GENERIC_COMPARE_RESULTS Result; PRTL_SPLAY_LINKS SplayLinks; + DPRINT("RtlInsertUnicodePrefix(): Table %p, Prefix %wZ, " + "TableEntry %p\n", PrefixTable, Prefix, PrefixTableEntry); + /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(Prefix); @@ -404,7 +413,7 @@ if (RtlRightChild(&Entry->Links)) { /* We do, enter it and restart the loop */ - SplayLinks = RtlLeftChild(&Entry->Links); + SplayLinks = RtlRightChild(&Entry->Links); Entry = CONTAINING_RECORD(SplayLinks, UNICODE_PREFIX_TABLE_ENTRY, Links); @@ -458,6 +467,9 @@ PRTL_SPLAY_LINKS SplayLinks; PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry; + DPRINT("RtlNextUnicodePrefix(): Table %p Restart %b\n", + PrefixTable, Restart); + /* We might need this entry 2/3rd of the time, so cache it now */ CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch; @@ -529,6 +541,9 @@ PUNICODE_PREFIX_TABLE_ENTRY Entry, RefEntry, NewEntry; PRTL_SPLAY_LINKS SplayLinks; + DPRINT("RtlRemoveUnicodePrefix(): Table %p, TableEntry %p\n", + PrefixTable, PrefixTableEntry); + /* Erase the last entry */ PrefixTable->LastNextEntry = NULL;

16 years, 8 months

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