Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31905: - Sync the header with Wine, it's vital for the new rpcrt4 imported.
by fireball＠svn.reactos.org 20 Jan '08

20 Jan '08

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 }

1 0

[cwittich] 31904: startpos is zero based
by cwittich＠svn.reactos.org 20 Jan '08

20 Jan '08

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; }

1 0

[cwittich] 31903: support blocks ( ... ) support parsing of env vars like %TIMERAW:~0, 2% there is still room for improvement...
by cwittich＠svn.reactos.org 20 Jan '08

20 Jan '08

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;

1 0

[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 20 Jan '08

20 Jan '08

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;

1 0

[cwittich] 31901: fix a buffer overflow
by cwittich＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: cwittich Date: Sun Jan 20 15:21:39 2008 New Revision: 31901 URL: http://svn.reactos.org/svn/reactos?rev=31901&view=rev Log: fix a buffer overflow 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 15:21:39 2008 @@ -262,7 +262,10 @@ /* Then we are transferring to another batch */ CloseHandle (bc->hBatchFile); bc->hBatchFile = INVALID_HANDLE_VALUE; - cmd_free (bc->params); + if (bc->params) + cmd_free (bc->params); + if (bc->raw_params) + cmd_free (bc->raw_params); } bc->hBatchFile = hFile; @@ -280,7 +283,7 @@ bc->raw_params = (TCHAR*) cmd_alloc((_tcslen(param)+1) * sizeof(TCHAR)); if (bc->raw_params != NULL) { - memset (bc->raw_params, 0, _tcslen(bc->raw_params) * sizeof(TCHAR)); + memset (bc->raw_params, 0, (_tcslen(param)+1) * sizeof(TCHAR)); _tcscpy(bc->raw_params,param); } else

1 0

[navaraf] 31900: Correct the parameter check in CreateIoCompletionPort.
by navaraf＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: navaraf Date: Sun Jan 20 14:18:22 2008 New Revision: 31900 URL: http://svn.reactos.org/svn/reactos?rev=31900&view=rev Log: Correct the parameter check in CreateIoCompletionPort. Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/iocompl.c (original) +++ trunk/reactos/dll/win32/kernel32/file/iocompl.c Sun Jan 20 14:18:22 2008 @@ -32,7 +32,7 @@ FILE_COMPLETION_INFORMATION CompletionInformation; IO_STATUS_BLOCK IoStatusBlock; - if ( ExistingCompletionPort == NULL && FileHandle == INVALID_HANDLE_VALUE ) + if ( FileHandle == INVALID_HANDLE_VALUE && ExistingCompletionPort != NULL ) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

[fireball] 31899: - Make deregistering of the event source return STATUS_SUCCESS too (since unimplemented registering succeeds too).
by fireball＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: fireball Date: Sun Jan 20 13:10:35 2008 New Revision: 31899 URL: http://svn.reactos.org/svn/reactos?rev=31899&view=rev Log: - Make deregistering of the event source return STATUS_SUCCESS too (since unimplemented registering succeeds too). Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c (original) +++ trunk/reactos/base/services/eventlog/rpc.c Sun Jan 20 13:10:35 2008 @@ -87,7 +87,7 @@ /* [out][in] */ PLOGHANDLE Handle) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; }

1 0

[dreimer] 31898: KDBG is defaulted to 1 now.
by dreimer＠svn.reactos.org 19 Jan '08

19 Jan '08

Author: dreimer Date: Sun Jan 20 01:22:28 2008 New Revision: 31898 URL: http://svn.reactos.org/svn/reactos?rev=31898&view=rev Log: KDBG is defaulted to 1 now. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Sun Jan 20 01:22:28 2008 @@ -152,14 +152,14 @@ cls echo Whether to compile in the integrated kernel debugger. -echo Default is: 0 +echo Default is: 1 echo. for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i set KDBG=%KDBG:~7,-1% echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" if "%KDBG_CH%" == "" ( - set KDBG_CH=0 + set KDBG_CH=1 ) cls

1 0

[pschweitzer] 31897: Fixed two bugs (this fixes Diablo II download) : - Check if returned structure for dependency is null, to avoid crash - Compare good fields to get dependency. According to xml file, it's regname that should be used.
by pschweitzer＠svn.reactos.org 19 Jan '08

19 Jan '08

Author: pschweitzer Date: Sun Jan 20 00:32:39 2008 New Revision: 31897 URL: http://svn.reactos.org/svn/reactos?rev=31897&view=rev Log: Fixed two bugs (this fixes Diablo II download) : - Check if returned structure for dependency is null, to avoid crash - Compare good fields to get dependency. According to xml file, it's regname that should be used. Modified: trunk/rosapps/downloader/main.c Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=3189… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Sun Jan 20 00:32:39 2008 @@ -654,7 +654,7 @@ { while (Category->Apps) { - if(StrCmpW(Category->Apps->Name, Dependency) == 0) + if(StrCmpW(Category->Apps->RegName, Dependency) == 0) return Category->Apps; Category->Apps = Category->Apps->Next; } @@ -721,16 +721,17 @@ { AppToInstall = SelectedApplication; SelectedApplication = GetDependency(SelectedApplication->Depends); - if (!IsApplicationInstalled(SelectedApplication)) - { - LoadString(GetModuleHandle(NULL), IDS_INSTALL_DEP, InstallDep, sizeof(InstallDep) / sizeof(WCHAR)); - LoadString(GetModuleHandle(NULL), IDS_WINDOW_TITLE, Title, sizeof(Title) / sizeof(WCHAR)); - _snwprintf(InstallDepBuffer, sizeof(InstallDepBuffer) / sizeof(WCHAR), InstallDep, SelectedApplication->Name, AppToInstall->Name, SelectedApplication->Name); - if (MessageBox(hwnd, InstallDepBuffer, Title, MB_YESNO | MB_ICONINFORMATION) == IDYES) + if (SelectedApplication) + if (!IsApplicationInstalled(SelectedApplication)) { - DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + LoadString(GetModuleHandle(NULL), IDS_INSTALL_DEP, InstallDep, sizeof(InstallDep) / sizeof(WCHAR)); + LoadString(GetModuleHandle(NULL), IDS_WINDOW_TITLE, Title, sizeof(Title) / sizeof(WCHAR)); + _snwprintf(InstallDepBuffer, sizeof(InstallDepBuffer) / sizeof(WCHAR), InstallDep, SelectedApplication->Name, AppToInstall->Name, SelectedApplication->Name); + if (MessageBox(hwnd, InstallDepBuffer, Title, MB_YESNO | MB_ICONINFORMATION) == IDYES) + { + DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + } } - } SelectedApplication = AppToInstall; }

1 0

[dchapyshev] 31896: - Update Russian translation
by dchapyshev＠svn.reactos.org 19 Jan '08

19 Jan '08

Author: dchapyshev Date: Sat Jan 19 22:57:48 2008 New Revision: 31896 URL: http://svn.reactos.org/svn/reactos?rev=31896&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Sat Jan 19 22:57:48 2008 @@ -82,7 +82,7 @@ { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ïÿ¢®ááâ ®¢«¥¨ï ReactOS.", + "\x07 ¦¬¨â¥ R ¤«ïï¢®ááâ ®¢«¥¨ï ReactOS.", TEXT_NORMAL }, { @@ -358,31 +358,31 @@ { 8, 11, - " ®¬¯ìîâ¥à:", + " ®¬¯ìîâ¥à:", TEXT_NORMAL }, { 8, 12, - " ªà :", + " ªà :", TEXT_NORMAL, }, { 8, 13, - " « ¢¨ âãà :", + " « ¢¨ âãà :", TEXT_NORMAL }, { 8, 14, - " áª« ¤ª ª« ¢¨ âãàë:", + " áª« ¤ª :", TEXT_NORMAL }, { 8, 16, - " à¨¬¥¨âì:", + " à¨¬¥¨âì:", TEXT_NORMAL }, { @@ -411,13 +411,13 @@ { 6, 23, - "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ \"à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢\"", + "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ \"à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë", TEXT_NORMAL }, { 6, 24, - "¨ ¦¬¨â¥ ENTER.", + "ãáâà®©áâ¢\" ¨ ¦¬¨â¥ ENTER.", TEXT_NORMAL }, { @@ -514,13 +514,13 @@ { 8, 10, - "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® â¨¯ ª®¬¯ìîâ¥à .", + "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® â¨¯ ", TEXT_NORMAL }, { 8, 11, - " â¥¬ ¦¬¨â¥ ENTER.", + " ª®¬¯ìîâ¥à . â¥¬ ¦¬¨â¥ ENTER.", TEXT_NORMAL }, { @@ -790,13 +790,13 @@ { 6, 8, - " á¯¨áª¥ ¨¦¥ ¯®ª § ë áãé¥áâ¢ãîé¨¥ à §¤¥«ë ¨ ¥¨á¯®«ì§ã¥¬®¥ ¯à®áâà áâ¢®", + " á¯¨áª¥ ¨¦¥ ¯®ª § ë áãé¥áâ¢ãîé¨¥ à §¤¥«ë ¨ ¥¨á¯®«ì§ã¥¬®¥", TEXT_NORMAL }, { 6, 9, - "¤«ï ®¢®£® à §¤¥« .", + "¯à®áâà áâ¢® ¤«ï ®¢®£® à §¤¥« .", TEXT_NORMAL }, { @@ -826,7 +826,7 @@ { 0, 0, - " ®¦ «ã©áâ ¯®¤®¦¤¨â¥...", + " Please wait...", TEXT_STATUS }, { @@ -934,17 +934,17 @@ { 11, 12, - "®¦ «ã©áâ ¯®¤®¦¤¨â¥ ¯®ª ¯à®£à ¬¬ ãáâ ®¢ª¨ áª®¯¨àã¥â ä ©«ë ReactOS", - TEXT_NORMAL - }, - { - 30, + "®¦ «ã©áâ ¯®¤®¦¤¨â¥ ¯®ª ¯à®£à ¬¬ ãáâ ®¢ª¨ áª®¯¨àã¥â ä ©«ë", + TEXT_NORMAL + }, + { + 11, 13, - "¢ ãáâ ®¢®çãî ¤¨à¥ªâ®à¨î.", - TEXT_NORMAL - }, - { - 20, + "ReactOS ¢ ãáâ ®¢®çãî ¤¨à¥ªâ®à¨î.", + TEXT_NORMAL + }, + { + 11, 14, "â® ¬®¦¥â § ïâì ¥áª®«ìª® ¬¨ãâ.", TEXT_NORMAL @@ -1078,13 +1078,13 @@ { 8, 10, - "\x07 ¦¬¨â¥ ¨«¨ ¤«ï ¢ë¡®à ã¦®© à áª« ¤ª¨", + "\x07 ¦¬¨â¥ ¨«¨ ¤«ï ¢ë¡®à ã¦®© à áª« ¤ª¨ ª« ¢¨ âãàë.", TEXT_NORMAL }, { 8, 11, - " ª« ¢¨ âãàë. â¥¬ ¦¬¨â¥ ENTER.", + " â¥¬ ¦¬¨â¥ ENTER.", TEXT_NORMAL }, { @@ -1294,22 +1294,22 @@ }, { //ERROR_CORRUPT_TXTSETUPSIF - "Setup found a corrupt TXTSETUP.SIF.\n", + " ©« TXTSETUP.SIF ¯®¢à¥¦¤¥.\n", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", + "¡ àã¦¥ ¥ª®àà¥ªâ ï á¨£ âãà ¢ TXTSETUP.SIF.\n", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_DRIVE_INFORMATION - "Setup could not retrieve system drive information.\n", + "¥ ã¤ «®áì ¯®«ãç¨âì ¨ä®à¬ æ¨î ® á¨áâ¥¬®¬ ¤¨áª¥.\n", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "¥ ã¤ «®áì ãáâ ®¢¨âì § £àã§ç¨ª FAT á¨áâ¥¬ë© à §¤¥«.", "ENTER = ¥à¥§ £àã§ª " }, { @@ -1334,10 +1334,10 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" + " ©¤¥ ¯® ªà ©¥© ¬¥à¥ ®¤¨ ¦¥áâª¨© ¤¨áª, ª®â®àë© á®¤¥à¦¨â à §¤¥«\n" + "¥¯®¤¤¥à¦¨¢ ¥¬ë© ReactOS!\n" "\n" - "Creating or deleting partitions can destroy the partiton table.\n" + "®§¤ ¨¥ ¨«¨ ã¤ «¥¨¥ à §¤¥«®¢ ¬®¦¥â àãè¨âì â ¡«¨æã à §¤¥«®¢.\n" "\n" " \x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨." " \x07 ¦¬¨â¥ ENTER ¤«ï ¯à®¤®«¦¥¨ï.", @@ -1345,22 +1345,22 @@ }, { //ERROR_NEW_PARTITION, - "You can not create a new Partition inside\n" - "of an already existing Partition!\n" + "ë ¥ ¬®¦¥â¥ á®§¤ âì ®¢ë© à §¤¥« ¤¨áª ¢\n" + "ã¦¥ áãé¥áâ¢ãîé¥¬ à §¤¥«¥!\n" "\n" " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï.", NULL }, { //ERROR_DELETE_SPACE, - "You can not delete unpartitioned disk space!\n" + "ë ¥ ¬®¦¥â¥ ã¤ «¨âì ¥à §¤¥«¥®¥ ¤¨áª®¢®¥ ¯à®áâà áâ¢®!\n" "\n" " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï.", NULL }, { //ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "¥ ã¤ «®áì ãáâ ®¢¨âì § £àã§ç¨ª FAT á¨áâ¥¬ë© à §¤¥«.", "ENTER = ¥à¥§ £àã§ª " }, { @@ -1370,37 +1370,37 @@ }, { //ERROR_UPDATE_KBSETTINGS, - "Setup failed to update keyboard layout settings.", + "¥ ã¤ «®áì ®¡®¢¨âì ¯ à ¬¥âàë à áª« ¤ª¨ ª« ¢¨ âãàë.", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup failed to update display registry settings.", + "¥ ã¤ «®áì ®¡®¢¨âì ¯ à ¬¥âàë íªà ¢ à¥¥áâà¥.", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_IMPORT_HIVE, - "Setup failed to import a hive file.", + "¥ ã¤ «®áì ¨¬¯®àâ¨à®¢ âì ä ©«ë ªãáâ®¢ à¥¥áâà .", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_FIND_REGISTRY - "Setup failed to find the registry data files.", + "¥ ã¤ «®áì ©â¨ ä ©«ë á¨áâ¥¬®£® à¥¥áâà .", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_CREATE_HIVE, - "Setup failed to create the registry hives.", + "¥ ã¤ «®áì á®§¤ âì ªãáâë á¨áâ¥¬®£® à¥¥áâà .", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", + "¥ ã¤ «®áì ¨¨æ¨ «¨§¨à®¢ âì á¨áâ¥¬ë© à¥¥áâà.", "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", + "Cabinet ¥ ¯®«ãç¨« ª®àà¥ªâë© inf-ä ©«.\n", "ENTER = ¥à¥§ £àã§ª " }, { @@ -1415,7 +1415,7 @@ }, { //ERROR_COPY_QUEUE, - "Setup failed to open the copy file queue.\n", + "¥ ã¤ «®áì ®âªàëâì ®ç¥à¥¤ì ª®¯¨à®¢ ¨ï ä ©«®¢.\n", "ENTER = ¥à¥§ £àã§ª " }, { @@ -1453,13 +1453,13 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" - "ENTER = Reboot computer" + "¥ ã¤ «®áì ¤®¡ ¢¨âì ¯ à ¬¥âàë ª®¤¨à®¢ª¨ ¢ à¥¥áâà.\n" + "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_UPDATE_LOCALESETTINGS, - "Setup could not set the system locale.\n" - "ENTER = Reboot computer" + "¥ ã¤ «®áì ãáâ ®¢¨âì «®ª «ì á¨áâ¥¬ë.\n" + "ENTER = ¥à¥§ £àã§ª " }, { NULL,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs