Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[janderwald] 24663: - zero complete buffer - increase buffer when reading more data than current capacity
by janderwald＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: janderwald Date: Mon Oct 30 15:58:35 2006 New Revision: 24663 URL: http://svn.reactos.org/svn/reactos?rev=24663&view=rev Log: - zero complete buffer - increase buffer when reading more data than current capacity Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 30 15:58:35 2006 @@ -15,6 +15,8 @@ namespace System_ { +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) + //--------------------------------------------------------------------------------------- NamedPipeReader::NamedPipeReader() : h_Pipe(NULL) { @@ -94,14 +96,15 @@ string::size_type NamedPipeReader::readPipe(string &Buffer) { TCHAR * buf = (TCHAR *)Buffer.c_str(); - string::size_type size = Buffer.capacity(); + string::size_type buffer_size = Buffer.capacity(); + string::size_type bytes_read = 0; DWORD cbRead; BOOL fSuccess; TCHAR * localbuf; - DWORD localsize = 100; + DWORD localsize = MIN(100, buffer_size); //#ifdef NDEBUG - memset(buf, 0x0, sizeof(TCHAR) * size); + memset(buf, 0x0, sizeof(TCHAR) * buffer_size); //#endif #ifdef __LINUX__ @@ -115,7 +118,7 @@ { do { - ZeroMemory(localbuf, sizeof(localsize) * sizeof(TCHAR)); + ZeroMemory(localbuf, localsize * sizeof(TCHAR)); fSuccess = ReadFile( h_Pipe, @@ -127,8 +130,16 @@ if (! fSuccess && GetLastError() != ERROR_MORE_DATA) break; - _tcscat(buf, localbuf); - + if(bytes_read + cbRead > buffer_size) + { + Buffer.reserve(bytes_read + localsize * 3); + buf = (TCHAR *)Buffer.c_str(); + buffer_size = Buffer.capacity(); + } + + memcpy(&buf[bytes_read], localbuf, cbRead); + bytes_read += cbRead; + } while (!fSuccess); // repeat loop if ERROR_MORE_DATA } while (localbuf[_tcslen(localbuf)-1] != '\n');

1 0

[cwittich] 24662: -force include of warning.h from WDK -removed CRT_SECURE_NO_DEPRECATE because it is declared in warning.h -set warning level to /W3 -set calling convention to stdcall -use nasmw for asm files
by cwittich＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: cwittich Date: Mon Oct 30 15:53:25 2006 New Revision: 24662 URL: http://svn.reactos.org/svn/reactos?rev=24662&view=rev Log: -force include of warning.h from WDK -removed CRT_SECURE_NO_DEPRECATE because it is declared in warning.h -set warning level to /W3 -set calling convention to stdcall -use nasmw for asm files Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Oct 30 15:53:25 2006 @@ -253,6 +253,7 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"warning.h\"\r\n" ); fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); @@ -299,9 +300,6 @@ { // this is a define in MinGW w32api, but not Microsoft's headers defines.insert ( "STDCALL=__stdcall" ); - // MinGW doesn't have a safe-string library yet - defines.insert ( "_CRT_SECURE_NO_DEPRECATE" ); - defines.insert ( "_CRT_NON_CONFORMING_SWPRINTFS" ); } if ( lib || exe ) @@ -358,12 +356,11 @@ fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); } - fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "4" ); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "3" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 0); // 2=__stdcall 0=__cdecl + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); // 2=__stdcall 0=__cdecl fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : release ? "3": "4"); // 3=/Zi 4=ZI fprintf ( OUT, "\t\t\t<Tool\r\n" ); @@ -583,7 +580,7 @@ else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) { fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n"); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );

1 0

[janderwald] 24661: - use ReactOS_Debug as a default os when DBG && unattended setup mode is defined - set timeout to zero in unattended mode && DBG defined
by janderwald＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: janderwald Date: Mon Oct 30 15:41:17 2006 New Revision: 24661 URL: http://svn.reactos.org/svn/reactos?rev=24661&view=rev Log: - use ReactOS_Debug as a default os when DBG && unattended setup mode is defined - set timeout to zero in unattended mode && DBG defined Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Mon Oct 30 15:41:17 2006 @@ -43,22 +43,48 @@ IniSection = IniCacheAppendSection(IniCache, L"FREELOADER"); - /* DefaultOS=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, +#ifdef DBG + if (IsUnattendedSetup) + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"DefaultOS", + L"ReactOS_Debug"); + } + else +#endif + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, INSERT_LAST, L"DefaultOS", L"ReactOS"); - - /* Timeout=0 or 10 */ - IniCacheInsertKey(IniSection, + } + +#ifdef DBG + if (IsUnattendedSetup) +#endif + { + /* Timeout=0 for unattended or non debug*/ + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", -#ifndef DBG L"0"); -#else + } +#ifdef DBG + else + { + /* Timeout=0 or 10 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"TimeOut", L"10"); + } #endif /* Create "Display" section */ Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Mon Oct 30 15:41:17 2006 @@ -75,6 +75,8 @@ extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; +extern BOOLEAN IsUnattendedSetup; + #endif /* __USETUP_H__*/

1 0

[weiden] 24660: Implement GetTickCount64
by weiden＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: weiden Date: Mon Oct 30 14:56:28 2006 New Revision: 24660 URL: http://svn.reactos.org/svn/reactos?rev=24660&view=rev Log: Implement GetTickCount64 Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Mon Oct 30 14:56:28 2006 @@ -519,6 +519,7 @@ GetThreadSelectorEntry@12 GetThreadTimes@20 GetTickCount@0 +GetTickCount64@0 GetTimeFormatA@24 GetTimeFormatW@24 GetTimeZoneInformation@4 Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c Mon Oct 30 14:56:28 2006 @@ -401,6 +401,16 @@ /* * @implemented */ +ULONGLONG WINAPI +GetTickCount64(VOID) +{ + return (ULONGLONG)SharedUserData->TickCountLowDeprecated * (ULONGLONG)SharedUserData->TickCountMultiplier / 16777216; +} + + +/* + * @implemented + */ BOOL STDCALL SystemTimeToTzSpecificLocalTime( LPTIME_ZONE_INFORMATION lpTimeZoneInformation, Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Mon Oct 30 14:56:28 2006 @@ -1592,6 +1592,9 @@ BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); DWORD WINAPI GetTickCount(VOID); +#if (_WIN32_WINNT >= 0x0600) +ULONGLONG WINAPI GetTickCount64(VOID); +#endif DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,DWORD,PDWORD); BOOL WINAPI GetUserNameA (LPSTR,PDWORD);

1 0

[cwittich] 24659: now it is possible to build bootcd and bootcdregtest with the same tree (without changing any files)
by cwittich＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: cwittich Date: Thu Oct 26 12:45:16 2006 New Revision: 24659 URL: http://svn.reactos.org/svn/reactos?rev=24659&view=rev Log: now it is possible to build bootcd and bootcdregtest with the same tree (without changing any files) Modified: trunk/reactos/Makefile trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=24659&r1=2465… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Oct 26 12:45:16 2006 @@ -402,6 +402,12 @@ ROS_OUTPUT=output-$(ARCH)-r \ world + +regtest: + $(cp) boot\bootdata\unattend.inf.sample output-i386\cd\reactos\unattend.inf + $(MAKE) bootcdregtest + $(rm) output-i386\cd\reactos\unattend.inf + .PHONY: msvc msvc: $(RBUILD_TARGET) $(ECHO_RBUILD) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 26 12:45:16 2006 @@ -398,7 +398,7 @@ media\inf\usb.inf 6 media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 -;boot\bootdata\unattend.inf 6 optional +boot\bootdata\unattend.inf 6 optional ; Subsystems

1 0

[ion] 24658: - Make CSRSS register the default hard error port on startup. - Stubplement the System Hard Error handler (it simply bugchecks) - Fully implement ExRaiseHardError when called from user-mode so that the strings and parameters are properly captured into user-mode memory. - Almost completely implement ExpRaiseHardError which is responsible for actually doing the error. However, ROS LPC is screwed up so sending the LPC Message crashes since the port isn't in a listening state or somethi
by ion＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: ion Date: Thu Oct 26 08:55:34 2006 New Revision: 24658 URL: http://svn.reactos.org/svn/reactos?rev=24658&view=rev Log: - Make CSRSS register the default hard error port on startup. - Stubplement the System Hard Error handler (it simply bugchecks) - Fully implement ExRaiseHardError when called from user-mode so that the strings and parameters are properly captured into user-mode memory. - Almost completely implement ExpRaiseHardError which is responsible for actually doing the error. However, ROS LPC is screwed up so sending the LPC Message crashes since the port isn't in a listening state or something. - Would appreciate some advice on how to get the LPC message to CSRSS. - Fix Get/SetErrorMode. The Native API uses an inverted value of SEM_FAILCRITICALERRORS, so this must be handled in win32. - Cleanup formatting of RaiseException, and only normalize the paramter count if we're actualy going to use it. - Implement LpcRequestWaitReplyPort as a big hack, but it should work. Modified: trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/include/ndk/lpcfuncs.h trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Thu Oct 26 08:55:34 2006 @@ -18,65 +18,89 @@ LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; UINT -STDCALL +WINAPI GetErrorMode(VOID) { - NTSTATUS Status; - UINT ErrMode; - - Status = NtQueryInformationProcess(NtCurrentProcess(), + NTSTATUS Status; + UINT ErrMode; + + /* Query the current setting */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + (PVOID)&ErrMode, + sizeof(ErrMode), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail if we couldn't query */ + SetLastErrorByStatus(Status); + return 0; + } + + /* Check if NOT failing critical errors was requested */ + if (ErrMode & SEM_FAILCRITICALERRORS) + { + /* Mask it out, since the native API works differently */ + ErrMode &= ~SEM_FAILCRITICALERRORS; + } + else + { + /* OR it if the caller didn't, due to different native semantics */ + ErrMode |= SEM_FAILCRITICALERRORS; + } + + /* Return the mode */ + return ErrMode; +} + +/* + * @implemented + */ +UINT +WINAPI +SetErrorMode(IN UINT uMode) +{ + UINT PrevErrMode, NewMode; + NTSTATUS Status; + + /* Get the previous mode */ + PrevErrMode = GetErrorMode(); + NewMode = uMode; + + /* Check if failing critical errors was requested */ + if (NewMode & SEM_FAILCRITICALERRORS) + { + /* Mask it out, since the native API works differently */ + NewMode &= ~SEM_FAILCRITICALERRORS; + } + else + { + /* OR it if the caller didn't, due to different native semantics */ + NewMode |= SEM_FAILCRITICALERRORS; + } + + /* Set the new mode */ + Status = NtSetInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, - (PVOID)&ErrMode, - sizeof(ErrMode), - NULL); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - - return ErrMode; + (PVOID)&NewMode, + sizeof(NewMode)); + if(!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); + + /* Return the previous mode */ + return PrevErrMode; } /* * @implemented */ -UINT -STDCALL -SetErrorMode(UINT uMode) -{ - UINT PrevErrMode; - NTSTATUS Status; - - PrevErrMode = GetErrorMode(); - - Status = NtSetInformationProcess(NtCurrentProcess(), - ProcessDefaultHardErrorMode, - (PVOID)&uMode, - sizeof(uMode)); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - - return PrevErrMode; -} - - -/* - * @implemented - */ LPTOP_LEVEL_EXCEPTION_FILTER -STDCALL +WINAPI SetUnhandledExceptionFilter( - LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter - ) + IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) { return InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, lpTopLevelExceptionFilter); } - /* * Private helper function to lookup the module name from a given address. @@ -268,59 +292,54 @@ return EXCEPTION_EXECUTE_HANDLER; } - /* * @implemented */ VOID -STDCALL -RaiseException ( - DWORD dwExceptionCode, - DWORD dwExceptionFlags, - DWORD nNumberOfArguments, - CONST ULONG_PTR * lpArguments OPTIONAL - ) -{ - EXCEPTION_RECORD ExceptionRecord; - - /* Do NOT normalize dwExceptionCode: it will be done in - * NTDLL.RtlRaiseException(). - */ - ExceptionRecord.ExceptionCode = dwExceptionCode; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.ExceptionAddress = (PVOID) RaiseException; - /* - * Normalize dwExceptionFlags. - */ - ExceptionRecord.ExceptionFlags = (dwExceptionFlags & EXCEPTION_NONCONTINUABLE); - /* - * Normalize nNumberOfArguments. - */ - if (EXCEPTION_MAXIMUM_PARAMETERS < nNumberOfArguments) - { - nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; - } - /* - * If the exception has no argument, - * ignore nNumberOfArguments and lpArguments. - */ - if (NULL == lpArguments) - { - ExceptionRecord.NumberParameters = 0; - } - else - { - ExceptionRecord.NumberParameters = nNumberOfArguments; - for ( nNumberOfArguments = 0; - (nNumberOfArguments < ExceptionRecord.NumberParameters); - nNumberOfArguments ++ - ) - { - ExceptionRecord.ExceptionInformation [nNumberOfArguments] - = *lpArguments ++; - } - } - RtlRaiseException (& ExceptionRecord); +WINAPI +RaiseException(IN DWORD dwExceptionCode, + IN DWORD dwExceptionFlags, + IN DWORD nNumberOfArguments, + IN CONST ULONG_PTR *lpArguments OPTIONAL) +{ + EXCEPTION_RECORD ExceptionRecord; + + /* Setup the exception record */ + ExceptionRecord.ExceptionCode = dwExceptionCode; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionAddress = (PVOID)RaiseException; + ExceptionRecord.ExceptionFlags = dwExceptionFlags & EXCEPTION_NONCONTINUABLE; + + /* Check if we have arguments */ + if (!lpArguments) + { + /* We don't */ + ExceptionRecord.NumberParameters = 0; + } + else + { + /* We do, normalize the count */ + if (nNumberOfArguments > EXCEPTION_MAXIMUM_PARAMETERS) + { + nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; + } + + /* Set the count of parameters */ + ExceptionRecord.NumberParameters = nNumberOfArguments; + + /* Loop each parameter */ + for (nNumberOfArguments = 0; + (nNumberOfArguments < ExceptionRecord.NumberParameters); + nNumberOfArguments ++) + { + /* Copy the exception information */ + ExceptionRecord.ExceptionInformation[nNumberOfArguments] = + *lpArguments++; + } + } + + /* Raise the exception */ + RtlRaiseException(&ExceptionRecord); } /* EOF */ Modified: trunk/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpcfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpcfuncs.h (original) +++ trunk/reactos/include/ndk/lpcfuncs.h Thu Oct 26 08:55:34 2006 @@ -23,6 +23,20 @@ // Dependencies // #include <umtypes.h> + +// +// LPC Exports +// +#ifndef NTOS_MODE_USER +NTKERNELAPI +NTSTATUS +NTAPI +LpcRequestWaitReplyPort( + IN PVOID Port, + IN PPORT_MESSAGE LpcMessageRequest, + OUT PPORT_MESSAGE LpcMessageReply) +; +#endif // // Native calls Modified: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ex/error.c (original) +++ trunk/reactos/ntoskrnl/ex/error.c Thu Oct 26 08:55:34 2006 @@ -23,6 +23,51 @@ /* FUNCTIONS ****************************************************************/ /*++ +* @name ExpRaiseHardError +* +* For now it's a stub +* +* @param ErrorStatus +* FILLME +* +* @param NumberOfParameters +* FILLME +* +* @param UnicodeStringParameterMask +* FILLME +* +* @param Parameters +* FILLME +* +* @param ValidResponseOptions +* FILLME +* +* @param Response +* FILLME +* +* @return None +* +* @remarks None +* +*--*/ +NTSTATUS +NTAPI +ExpSystemErrorHandler(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN BOOLEAN Shutdown) +{ + /* FIXME: STUB */ + KeBugCheckEx(FATAL_UNHANDLED_HARD_ERROR, + ErrorStatus, + 0, + 0, + 0); + return STATUS_SUCCESS; +} + +/*++ * @name ExpRaiseHardError * * For now it's a stub @@ -50,7 +95,7 @@ * @remarks None * *--*/ -VOID +NTSTATUS NTAPI ExpRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, @@ -59,7 +104,146 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { + PEPROCESS Process = PsGetCurrentProcess(); + PETHREAD Thread = PsGetCurrentThread(); + UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; + PHARDERROR_MSG Message = (PHARDERROR_MSG)Buffer; + NTSTATUS Status; + HANDLE PortHandle; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PAGED_CODE(); + DPRINT1("Hard error, baby!: %lx, %lx, %lx %p\n", + ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters); + + /* Check if this error will shutdown the system */ + if (ValidResponseOptions == OptionShutdownSystem) + { + /* Check for privilege */ + if (!SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode)) + { + /* No rights */ + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Don't handle any new hard errors */ + ExReadyForErrors = FALSE; + } + + /* Check if hard errors are not disabled */ + if (!Thread->HardErrorsAreDisabled) + { + /* Check if we can't do errors anymore, and this is serious */ + if ((!ExReadyForErrors) && (NT_ERROR(ErrorStatus))) + { + /* Use the system handler */ + ExpSystemErrorHandler(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + (PreviousMode != KernelMode) ? TRUE: FALSE); + } + } + + /* Check if we have an exception port */ + if (Process->ExceptionPort) + { + /* Check if hard errors should be processed */ + if (Process->DefaultHardErrorProcessing & 1) + { + /* Use the port */ + PortHandle = Process->ExceptionPort; + } + else + { + /* It's disabled, check if the error overrides it */ + if (ErrorStatus & 0x10000000) + { + /* Use the port anyway */ + PortHandle = Process->ExceptionPort; + } + else + { + /* No such luck */ + PortHandle = NULL; + } + } + } + else + { + /* Check if hard errors are enabled */ + if (Process->DefaultHardErrorProcessing & 1) + { + /* Use our default system port */ + PortHandle = ExpDefaultErrorPort; + } + else + { + /* It's disabled, check if the error overrides it */ + if (ErrorStatus & 0x10000000) + { + /* Use the port anyway */ + PortHandle = ExpDefaultErrorPort; + } + else + { + /* No such luck */ + PortHandle = NULL; + } + } + } + + /* If hard errors are disabled, do nothing */ + if (Thread->HardErrorsAreDisabled) PortHandle = NULL; + + /* Now check if we have a port */ + if (PortHandle) + { + /* Check if this is the default process */ + if (Process == ExpDefaultErrorPortProcess) + { + /* We can't handle the error, check if this is critical */ + if (NT_ERROR(ErrorStatus)) + { + /* It is, invoke the system handler */ + ExpSystemErrorHandler(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + (PreviousMode != KernelMode) ? TRUE: FALSE); + + /* If we survived, return to caller */ + *Response = ResponseReturnToCaller; + return STATUS_SUCCESS; + } + } + + /* Setup the LPC Message */ + Message->h.u1.Length = (sizeof(HARDERROR_MSG) << 16) | + (sizeof(HARDERROR_MSG) - sizeof(PORT_MESSAGE)); + Message->h.u2.ZeroInit = LPC_ERROR_EVENT; + Message->Status = ErrorStatus &~ 0x10000000; + Message->ValidResponseOptions = ValidResponseOptions; + Message->UnicodeStringParameterMask = UnicodeStringParameterMask; + Message->NumberOfParameters = NumberOfParameters; + KeQuerySystemTime(&Message->ErrorTime); + + /* Copy the parameters */ + if (Parameters) RtlMoveMemory(&Message->Parameters, + Parameters, + sizeof(ULONG_PTR) * NumberOfParameters); + + /* Send the message */ + Status = LpcRequestWaitReplyPort(PortHandle, + (PVOID)Message, + (PVOID)Message); + DPRINT1("Checkpoint 2: %lx\n", Status); + } + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /*++ @@ -155,7 +339,7 @@ * @remarks None * *--*/ -VOID +NTSTATUS NTAPI ExRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, @@ -164,15 +348,121 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { - /* FIXME: Capture to user-mode! */ + ULONG Size; + UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; + ULONG i; + PULONG_PTR UserData = NULL, ParameterBase; + PUNICODE_STRING StringBase; + PWSTR BufferBase; + ULONG SafeResponse; + NTSTATUS Status; + PAGED_CODE(); + + /* Check if we have parameters */ + if (Parameters) + { + /* Check if we have strings */ + if (UnicodeStringParameterMask) + { + /* Add the maximum possible size */ + Size = (sizeof(ULONG_PTR) + sizeof(UNICODE_STRING)) * + MAXIMUM_HARDERROR_PARAMETERS + sizeof(UNICODE_STRING); + + /* Loop each parameter */ + for (i = 0; i < NumberOfParameters; i++) + { + /* Check if it's part of the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Copy it */ + RtlMoveMemory(&CapturedParams[i], + &Parameters[i], + sizeof(UNICODE_STRING)); + + /* Increase the size */ + Size += CapturedParams[i].MaximumLength; + } + } + + /* Allocate the user data region */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID*)&UserData, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) return Status; + + /* Set the pointers to our various data */ + ParameterBase = UserData; + StringBase = (PVOID)((ULONG_PTR)UserData + + sizeof(ULONG_PTR) * + MAXIMUM_HARDERROR_PARAMETERS); + BufferBase = (PVOID)((ULONG_PTR)StringBase + + sizeof(UNICODE_STRING) * + MAXIMUM_HARDERROR_PARAMETERS); + + /* Loop parameters again */ + for (i = 0; i < NumberOfParameters; i++) + { + /* Check if we're in the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Update the base */ + ParameterBase[i] = (ULONG_PTR)&StringBase[i]; + + /* Copy the string buffer */ + RtlMoveMemory(BufferBase, + CapturedParams[i].Buffer, + CapturedParams[i].MaximumLength); + + /* Set buffer */ + CapturedParams[i].Buffer = BufferBase; + + /* Copy the string structure */ + RtlMoveMemory(&StringBase[i], + &CapturedParams[i], + sizeof(UNICODE_STRING)); + + /* Update the pointer */ + BufferBase += CapturedParams[i].MaximumLength; + } + else + { + /* No need to copy any strings */ + ParameterBase[i] = Parameters[i]; + } + } + } + else + { + /* Just keep the data as is */ + UserData = Parameters; + } + } /* Now call the worker function */ - ExpRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - Parameters, - ValidResponseOptions, - Response); + Status = ExpRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + UserData, + ValidResponseOptions, + &SafeResponse); + + /* Check if we had done user-mode allocation */ + if ((UserData) && (UserData != Parameters)) + { + /* We did! Delete it */ + Size = 0; + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&UserData, + &Size, + MEM_RELEASE); + } + + /* Return status and the response */ + *Response = SafeResponse; + return Status; } /*++ @@ -223,13 +513,11 @@ ULONG i; ULONG ParamSize; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - DPRINT1("Hard error %x\n", ErrorStatus); /* Validate parameter count */ if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) { /* Fail */ - DPRINT1("Invalid parameters\n"); return STATUS_INVALID_PARAMETER_2; } @@ -237,7 +525,6 @@ if ((Parameters) && !(NumberOfParameters)) { /* Fail */ - DPRINT1("Invalid parameters\n"); return STATUS_INVALID_PARAMETER_2; } @@ -401,7 +688,7 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Check if we have the Privilege */ - if(!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { DPRINT1("NtSetDefaultHardErrorPort: Caller requires " "the SeTcbPrivilege privilege!\n"); @@ -409,7 +696,7 @@ } /* Only called once during bootup, make sure we weren't called yet */ - if(!ExReadyForErrors) + if (!ExReadyForErrors) { /* Reference the port */ Status = ObReferenceObjectByHandle(PortHandle, @@ -418,9 +705,7 @@ PreviousMode, (PVOID*)&ExpDefaultErrorPort, NULL); - - /* Check for Success */ - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Save the data */ ExpDefaultErrorPortProcess = PsGetCurrentProcess(); Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Thu Oct 26 08:55:34 2006 @@ -419,18 +419,36 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS -STDCALL -LpcRequestWaitReplyPort ( - IN PEPORT Port, - IN PPORT_MESSAGE LpcMessageRequest, - OUT PPORT_MESSAGE LpcMessageReply - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +NTAPI +LpcRequestWaitReplyPort(IN PVOID Port, + IN PPORT_MESSAGE LpcMessageRequest, + OUT PPORT_MESSAGE LpcMessageReply) +{ + HANDLE PortHandle; + NTSTATUS Status; + + /* This is a SICK hack */ + Status = ObOpenObjectByPointer(Port, + 0, + NULL, + PORT_ALL_ACCESS, + LpcPortObjectType, + KernelMode, + &PortHandle); + DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); + + /* Call the Nt function. Do a ring transition to get Kmode. */ + Status = ZwRequestWaitReplyPort(PortHandle, + LpcMessageRequest, + LpcMessageReply); + DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); + + /* Close the handle */ + ObCloseHandle(PortHandle, KernelMode); + return Status; } /* EOF */ Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Thu Oct 26 08:55:34 2006 @@ -14,60 +14,6 @@ #define NDEBUG #include <internal/debug.h> - -/********************************************************************** - * NAME - * LpcSendDebugMessagePort/3 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL -LpcSendDebugMessagePort (IN PEPORT Port, - IN PDBGKM_MSG Message, - OUT PDBGKM_MSG Reply) -{ - NTSTATUS Status; - KIRQL oldIrql; - PQUEUEDMESSAGE ReplyMessage; - - Status = EiReplyOrRequestPort(Port, - &Message->h, - LPC_REQUEST, - Port); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Port); - return(Status); - } - KeReleaseSemaphore(&Port->OtherPort->Semaphore, IO_NO_INCREMENT, 1, FALSE); - - /* - * Wait for a reply - */ - KeWaitForSingleObject(&Port->Semaphore, - UserRequest, - UserMode, - FALSE, - NULL); - - /* - * Dequeue the reply - */ - KeAcquireSpinLock(&Port->Lock, &oldIrql); - ReplyMessage = EiDequeueMessagePort(Port); - KeReleaseSpinLock(&Port->Lock, oldIrql); - memcpy(Reply, &ReplyMessage->Message, ReplyMessage->Message.u1.s1.TotalLength); - ExFreePool(ReplyMessage); - - return(STATUS_SUCCESS); -} - /********************************************************************** * NAME Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Thu Oct 26 08:55:34 2006 @@ -555,7 +555,11 @@ return Status; } - +static NTSTATUS +CsrpCreateHardErrorPort (int argc, char ** argv, char ** envp) +{ + return NtSetDefaultHardErrorPort(hApiPort); +} typedef NTSTATUS (* CSR_INIT_ROUTINE)(int,char**,char**); @@ -568,6 +572,7 @@ {TRUE, CsrpRegisterSubsystem, "register with SM"}, {TRUE, CsrpCreateHeap, "create the CSR heap"}, {TRUE, CsrpCreateApiPort, "create the api port \\Windows\\ApiPort"}, + {TRUE, CsrpCreateHardErrorPort, "create the hard error port"}, {TRUE, CsrpCreateObjectDirectory,"create the object directory \\Windows"}, {TRUE, CsrpLoadKernelModeDriver, "load Kmode driver"}, {TRUE, CsrpInitVideo, "initialize video"},

1 0

[ion] 24657: - Fix dozens of missing typecast errors. - Other MSVC/WDK compatibility fixes.
by ion＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: ion Date: Thu Oct 26 05:49:51 2006 New Revision: 24657 URL: http://svn.reactos.org/svn/reactos?rev=24657&view=rev Log: - Fix dozens of missing typecast errors. - Other MSVC/WDK compatibility fixes. Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/iofuncs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/fs/name.c trunk/reactos/ntoskrnl/fs/util.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/rtl/misc.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Thu Oct 26 05:49:51 2006 @@ -91,6 +91,15 @@ ExfUnblockPushLock( PEX_PUSH_LOCK PushLock, PVOID CurrentWaitBlock +); + +// +// Resource Functions +// +BOOLEAN +NTAPI +ExTryToAcquireResourceExclusiveLite( + IN PERESOURCE Resource ); #endif Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Thu Oct 26 05:49:51 2006 @@ -104,6 +104,13 @@ #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ MUTANT_QUERY_STATE) + +#define TIMER_QUERY_STATE 0x0001 +#define TIMER_MODIFY_STATE 0x0002 +#define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + TIMER_QUERY_STATE | \ + TIMER_MODIFY_STATE) #endif // Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Thu Oct 26 05:49:51 2006 @@ -31,8 +31,10 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -//#pragma intrinsic(_enable) -//#pragma intrinsic(_disable) +void _enable(void); +void _disable(void); +#pragma intrinsic(_enable) +#pragma intrinsic(_disable) #endif // @@ -208,5 +210,12 @@ IN PTIME_FIELDS RtcTime ); -#endif -#endif +NTHALAPI +VOID +NTAPI +HalSetRealTimeClock( + IN PTIME_FIELDS RtcTime +); + +#endif +#endif Modified: trunk/reactos/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iofuncs.h (original) +++ trunk/reactos/include/ndk/iofuncs.h Thu Oct 26 05:49:51 2006 @@ -671,7 +671,6 @@ IN ULONG OutputBufferSize ); -#ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS NTAPI @@ -679,7 +678,6 @@ IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); -#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Thu Oct 26 05:49:51 2006 @@ -29,6 +29,16 @@ // // Object Functions // +NTKERNELAPI +NTSTATUS +NTAPI +ObAssignSecurity( + IN PACCESS_STATE AccessState, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PVOID Object, + IN POBJECT_TYPE Type +); + NTKERNELAPI NTSTATUS NTAPI Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Oct 26 05:49:51 2006 @@ -478,10 +478,10 @@ #ifndef __NTDDK_H #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) -#endif #define TIMER_QUERY_STATE 0x0001 #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|TIMER_QUERY_STATE|TIMER_MODIFY_STATE) +#endif /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg. Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Thu Oct 26 05:49:51 2006 @@ -358,7 +358,7 @@ for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { PFN_TYPE Page; - Page = MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT; + Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); Status = MmPageOutPhysicalAddress(Page); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Oct 26 05:49:51 2006 @@ -276,8 +276,8 @@ Length = wcslen(StartPtr); - KeyName.Length = Length * sizeof(WCHAR); - KeyName.MaximumLength = KeyName.Length + sizeof(WCHAR); + KeyName.Length = (USHORT)Length * sizeof(WCHAR); + KeyName.MaximumLength = (USHORT)KeyName.Length + sizeof(WCHAR); KeyName.Buffer = ExAllocatePool(NonPagedPool, KeyName.MaximumLength); RtlCopyMemory(KeyName.Buffer, @@ -751,7 +751,7 @@ { ObjectNameInfo->Name.Buffer = (PWCHAR)(ObjectNameInfo + 1); ObjectNameInfo->Name.Length = 0; - ObjectNameInfo->Name.MaximumLength = Length - sizeof(OBJECT_NAME_INFORMATION); + ObjectNameInfo->Name.MaximumLength = (USHORT)Length - sizeof(OBJECT_NAME_INFORMATION); } @@ -931,13 +931,13 @@ if (TargetPath->Buffer == NULL && TargetPath->MaximumLength == 0) { TargetPath->Length = 0; - TargetPath->MaximumLength = ValueCell->DataSize + sizeof(WCHAR); + TargetPath->MaximumLength = (USHORT)ValueCell->DataSize + sizeof(WCHAR); TargetPath->Buffer = ExAllocatePool(NonPagedPool, TargetPath->MaximumLength); } - TargetPath->Length = min(TargetPath->MaximumLength - sizeof(WCHAR), - (ULONG) ValueCell->DataSize); + TargetPath->Length = min((USHORT)TargetPath->MaximumLength - sizeof(WCHAR), + (USHORT)ValueCell->DataSize); if (ValueCell->DataSize > 0) { Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Thu Oct 26 05:49:51 2006 @@ -512,7 +512,7 @@ DPRINT("PID: %d, TID: %d CS %04x/%04x\n", ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, ((PETHREAD)CurrentThread)->Cid.UniqueThread, - Trapframe->SegCs, + Trapframe->Cs, CurrentThread->TrapFrame ? CurrentThread->TrapFrame->SegCs : 0); if (CurrentThread->TrapFrame == NULL) { Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c (original) +++ trunk/reactos/ntoskrnl/ex/locale.c Thu Oct 26 05:49:51 2006 @@ -80,7 +80,7 @@ if (NT_SUCCESS(Status)) { /* Return the language */ - *LanguageId = Value; + *LanguageId = (USHORT)Value; } } else Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Oct 26 05:49:51 2006 @@ -71,7 +71,7 @@ ScaledIdle = Prcb->IdleThread->KernelTime * 100; TotalTime = Prcb->KernelTime + Prcb->UserTime; if (TotalTime != 0) - *CpuUsage = 100 - (ScaledIdle / TotalTime); + *CpuUsage = (ULONG)(100 - (ScaledIdle / TotalTime)); else *CpuUsage = 0; } @@ -211,7 +211,9 @@ /* * Get the environment variable */ - Result = HalGetEnvironmentVariable(AName.Buffer, ValueBufferLength, Value); + Result = HalGetEnvironmentVariable(AName.Buffer, + (USHORT)ValueBufferLength, + Value); if(!Result) { RtlFreeAnsiString(&AName); Modified: trunk/reactos/ntoskrnl/fs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/name.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/fs/name.c (original) +++ trunk/reactos/ntoskrnl/fs/name.c Thu Oct 26 05:49:51 2006 @@ -297,13 +297,13 @@ } /* Now we have the First Part */ - FirstPart->Length = (i-FirstLoop); + FirstPart->Length = (USHORT)(i - FirstLoop); FirstPart->MaximumLength = FirstPart->Length; /* +2?? */ FirstPart->Buffer = &Name.Buffer[FirstLoop]; /* Make the second part if something is still left */ if (i<Name.Length) { - RemainingPart->Length = (Name.Length - (i+1)); + RemainingPart->Length = (USHORT)(Name.Length - (i+1)); RemainingPart->MaximumLength = RemainingPart->Length; /* +2?? */ RemainingPart->Buffer = &Name.Buffer[i+1]; } Modified: trunk/reactos/ntoskrnl/fs/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/util.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/fs/util.c (original) +++ trunk/reactos/ntoskrnl/fs/util.c Thu Oct 26 05:49:51 2006 @@ -42,8 +42,10 @@ ULONG i; /* Allocate the Resource Buffer */ - FsRtlpResources = FsRtlAllocatePool(NonPagedPool, - FSRTL_MAX_RESOURCES*sizeof(ERESOURCE)); + FsRtlpResources = FsRtlAllocatePoolWithTag(NonPagedPool, + FSRTL_MAX_RESOURCES * + sizeof(ERESOURCE), + TAG('F', 's', 'R', 'e')); /* Initialize the Resources */ for (i = 0; i < FSRTL_MAX_RESOURCES; i++) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Oct 26 05:49:51 2006 @@ -593,7 +593,7 @@ return STATUS_INSUFFICIENT_RESOURCES; KeyName.Length = 0; - KeyName.MaximumLength = KeyNameLength; + KeyName.MaximumLength = (USHORT)KeyNameLength; KeyName.Buffer = KeyNameBuffer; /* @@ -619,7 +619,7 @@ ExFreePool(KeyNameBuffer); return Status; } - KeyName.Length += DriverKeyLength - sizeof(UNICODE_NULL); + KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL); } else { @@ -750,7 +750,7 @@ sizeof(GUID)); /* The new entry is the index */ - FoundIndex = IopBusTypeGuidList->GuidCount; + FoundIndex = (USHORT)IopBusTypeGuidList->GuidCount; IopBusTypeGuidList->GuidCount++; Quickie: @@ -928,7 +928,7 @@ Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->MinorFunction = MinorFunction; + IrpSp->MinorFunction = (UCHAR)MinorFunction; if (Stack) { @@ -1618,14 +1618,14 @@ Status = STATUS_UNSUCCESSFUL; else { - KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength; + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; } goto cleanup; } if (Status != STATUS_OBJECT_NAME_NOT_FOUND) { - KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength; + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; goto cleanup; } @@ -2711,7 +2711,7 @@ IndexDevice++; /* Open device key */ - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE, hDevicesKey, NULL); Status = ZwOpenKey( @@ -2832,7 +2832,7 @@ goto cleanup; } IndexSubKey++; - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; Status = IopEnumerateDetectedDevices( @@ -2878,7 +2878,7 @@ else { /* Assign hardware id to this device */ - ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; + ValueName.Length = ValueName.MaximumLength = (USHORT)pValueInformation->DataLength; ValueName.Buffer = (PWCHAR)pValueInformation->Data; if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) ValueName.Length -= sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Oct 26 05:49:51 2006 @@ -438,21 +438,21 @@ LdrInit1(); /* Set the NX Support policy */ - SharedUserData->NXSupportPolicy = NXSupportPolicy; + SharedUserData->NXSupportPolicy = (UCHAR)NXSupportPolicy; /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_MMX); + (KeFeatureBits & KF_MMX) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (KeFeatureBits & KF_CMPXCHG8B); + (KeFeatureBits & KF_CMPXCHG8B) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)); + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)); + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_3DNOW); + (KeFeatureBits & KF_3DNOW) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (KeFeatureBits & KF_RDTSC); + (KeFeatureBits & KF_RDTSC) ? TRUE: FALSE; /* Set up the thread-related fields in the PRCB */ Prcb->CurrentThread = InitThread; @@ -514,7 +514,7 @@ { KDESCRIPTOR GdtDescriptor, IdtDescriptor; KGDTENTRY TssSelector, PcrSelector; - ULONG Tr, Fs; + USHORT Tr, Fs; /* Get GDT and IDT descriptors */ Ke386GetGlobalDescriptorTable(GdtDescriptor); @@ -666,7 +666,7 @@ InitialThread, (PVOID)InitialStack, (PKPRCB)__readfsdword(KPCR_PRCB), - Cpu, + (CCHAR)Cpu, KeLoaderBlock); /* Set the priority of this thread to 0 */ Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Thu Oct 26 05:49:51 2006 @@ -94,8 +94,8 @@ /* Save the old offset and base, and set the new ones */ OldOffset = Process->IopmOffset; OldBase = Tss->IoMapBase; - Process->IopmOffset = IOPM_OFFSET; - Tss->IoMapBase = IOPM_OFFSET; + Process->IopmOffset = (USHORT)IOPM_OFFSET; + Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ Ki386SetupAndExitToV86Mode(VdmTeb); Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Thu Oct 26 05:49:51 2006 @@ -281,7 +281,7 @@ * due to the current ""scheduler"" in ROS, it can't be done * cleanly since it actualyl dispatches threads instead. */ - Thread->Priority = Priority; + Thread->Priority = (SCHAR)Priority; } else { @@ -310,7 +310,7 @@ if (OldPriority != Priority) { /* Set it */ - Thread->Priority = Priority; + Thread->Priority = (SCHAR)Priority; /* Choose action based on thread's state */ if (Thread->State == Ready) @@ -383,7 +383,7 @@ { KAFFINITY OldAffinity; ULONG ProcessorMask; - ULONG i; + CCHAR i; PKPCR Pcr; /* Make sure that the affinity is valid */ Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Thu Oct 26 05:49:51 2006 @@ -1145,7 +1145,7 @@ RtlCopyMemory(NameBuffer, Module->FullDllName.Buffer, PathLength); RtlCopyMemory(NameBuffer + (PathLength / sizeof(WCHAR)), DriverName.Buffer, DriverName.Length); NameString.Buffer = NameBuffer; - NameString.MaximumLength = NameString.Length = PathLength + DriverName.Length; + NameString.MaximumLength = NameString.Length = (USHORT)PathLength + DriverName.Length; /* NULL-terminate */ NameString.MaximumLength += sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Thu Oct 26 05:49:51 2006 @@ -65,7 +65,7 @@ MessageReply->Message.ClientId.UniqueProcess = PsGetCurrentProcessId(); MessageReply->Message.ClientId.UniqueThread = PsGetCurrentThreadId(); - MessageReply->Message.u2.s2.Type = MessageType; + MessageReply->Message.u2.s2.Type = (CSHORT)MessageType; MessageReply->Message.MessageId = InterlockedIncrementUL(&LpcpNextMessageId); KeAcquireSpinLock(&Port->Lock, &oldIrql); @@ -276,7 +276,7 @@ CRequest = (PEPORT_CONNECT_REQUEST_MESSAGE)&Request->Message; memcpy(&Header, &Request->Message, sizeof(PORT_MESSAGE)); - Header.u1.s1.DataLength = CRequest->ConnectDataLength; + Header.u1.s1.DataLength = (CSHORT)CRequest->ConnectDataLength; Header.u1.s1.TotalLength = Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); if (PreviousMode != KernelMode) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Thu Oct 26 05:49:51 2006 @@ -586,7 +586,7 @@ RetrievalPointers = PagingFileList[MmCoreDumpPageFile]->RetrievalPointers; /* Dump the header. */ - MdlMap[0] = MmGetPhysicalAddress(MmCoreDumpPageFrame).QuadPart >> PAGE_SHIFT; + MdlMap[0] = (ULONG)(MmGetPhysicalAddress(MmCoreDumpPageFrame).QuadPart >> PAGE_SHIFT); #if defined(__GNUC__) DiskOffset = MmGetOffsetPageFile(RetrievalPointers, (LARGE_INTEGER)0LL); Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Oct 26 05:49:51 2006 @@ -163,7 +163,7 @@ /* Save the result */ Context->HashValue = HashValue; - Context->HashIndex = HashIndex; + Context->HashIndex = (USHORT)HashIndex; /* Get the root entry and set it as our lookup bucket */ AllocatedEntry = &Directory->HashBuckets[HashIndex]; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Thu Oct 26 05:49:51 2006 @@ -61,7 +61,7 @@ NTAPI ObInit2(VOID) { - ULONG i; + CCHAR i; PKPRCB Prcb; PNPAGED_LOOKASIDE_LIST CurrentList = NULL; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 26 05:49:51 2006 @@ -332,8 +332,8 @@ } /* Setup the string */ - CapturedName->Length = StringLength; - CapturedName->MaximumLength = MaximumLength; + CapturedName->Length = (USHORT)StringLength; + CapturedName->MaximumLength = (USHORT)MaximumLength; CapturedName->Buffer = StringBuffer; /* Make sure we have a buffer */ Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Thu Oct 26 05:49:51 2006 @@ -12,10 +12,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ObInitSymbolicLinkImplementation) -#endif /* GLOBALS ******************************************************************/ @@ -165,8 +161,8 @@ if (NewTargetPath != FullPath->Buffer) ExFreePool(FullPath->Buffer); /* Update the path values */ - FullPath->Length = LengthUsed; - FullPath->MaximumLength = MaximumLength; + FullPath->Length = (USHORT)LengthUsed; + FullPath->MaximumLength = (USHORT)MaximumLength; FullPath->Buffer = NewTargetPath; /* Tell the parse routine to start reparsing */ @@ -247,7 +243,7 @@ { /* Round it down */ CapturedLinkTarget.MaximumLength = - ALIGN_DOWN(CapturedLinkTarget.MaximumLength, WCHAR); + (USHORT)ALIGN_DOWN(CapturedLinkTarget.MaximumLength, WCHAR); } /* Fail if the length is odd, or if the maximum is smaller or 0 */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Oct 26 05:49:51 2006 @@ -658,9 +658,9 @@ if (!NT_SUCCESS(Status)) goto Cleanup; /* Compute Quantum and Priority */ - Process->Pcb.BasePriority = PspComputeQuantumAndPriority(Process, - 0, - &Quantum); + Process->Pcb.BasePriority = (SCHAR)PspComputeQuantumAndPriority(Process, + 0, + &Quantum); Process->Pcb.QuantumReset = Quantum; /* Check if we have a parent other then the initial system process */ @@ -912,7 +912,7 @@ NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process) { - return Process->ProcessExiting; + return (BOOLEAN)Process->ProcessExiting; } /* @@ -1083,7 +1083,7 @@ PsSetProcessPriorityClass(PEPROCESS Process, ULONG PriorityClass) { - Process->PriorityClass = PriorityClass; + Process->PriorityClass = (UCHAR)PriorityClass; } /* Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Thu Oct 26 05:49:51 2006 @@ -141,7 +141,7 @@ } /* Check if the thread is impersonating */ - IsImpersonating = Thread->ActiveImpersonationInfo; + IsImpersonating = (BOOLEAN)Thread->ActiveImpersonationInfo; if (IsImpersonating) { /* Set TEB data */ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Oct 26 05:49:51 2006 @@ -382,8 +382,8 @@ Source, Length); - UniDest->MaximumLength = Length; - UniDest->Length = Length - sizeof (WCHAR); + UniDest->MaximumLength = (USHORT)Length; + UniDest->Length = (USHORT)Length - sizeof (WCHAR); return TRUE; } Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c Thu Oct 26 05:49:51 2006 @@ -73,9 +73,9 @@ if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) { RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)lpVersionInformation; - InfoEx->wServicePackMajor = (NtOSCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = NtOSCSDVersion & 0xFF; - InfoEx->wSuiteMask = SharedUserData->SuiteMask; + InfoEx->wServicePackMajor = (USHORT)(NtOSCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = (USHORT)(NtOSCSDVersion & 0xFF); + InfoEx->wSuiteMask = (USHORT)SharedUserData->SuiteMask; InfoEx->wProductType = SharedUserData->NtProductType; } Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=24657… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Thu Oct 26 05:49:51 2006 @@ -810,7 +810,7 @@ /* Build the new security descrtiptor */ RtlCreateSecurityDescriptorRelative(RelSD, SECURITY_DESCRIPTOR_REVISION); - RelSD->Control = Control; + RelSD->Control = (USHORT)Control; Current = (ULONG_PTR)(RelSD + 1); Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Thu Oct 26 05:49:51 2006 @@ -340,7 +340,7 @@ RtlCreateSecurityDescriptor(NewSd, SECURITY_DESCRIPTOR_REVISION1); /* We always build a self-relative descriptor */ - NewSd->Control = Control | SE_SELF_RELATIVE; + NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); @@ -754,7 +754,7 @@ RtlCreateSecurityDescriptor(Descriptor, SECURITY_DESCRIPTOR_REVISION); - Descriptor->Control = Control | SE_SELF_RELATIVE; + Descriptor->Control = (USHORT)Control | SE_SELF_RELATIVE; Current = (ULONG_PTR)Descriptor + sizeof(SECURITY_DESCRIPTOR); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Thu Oct 26 05:49:51 2006 @@ -621,7 +621,7 @@ PsImpersonateClient(ServerThread, ClientContext->ClientToken, 1, - (ULONG)b, + b, ClientContext->SecurityQos.ImpersonationLevel); }

1 0

[martinf] 24656: add build script
by martinf＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: martinf Date: Thu Oct 26 01:10:38 2006 New Revision: 24656 URL: http://svn.reactos.org/svn/reactos?rev=24656&view=rev Log: add build script Added: trunk/reactos/base/shell/explorer/makearchive.bat (with props) Added: trunk/reactos/base/shell/explorer/makearchive.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/makear… ============================================================================== --- trunk/reactos/base/shell/explorer/makearchive.bat (added) +++ trunk/reactos/base/shell/explorer/makearchive.bat Thu Oct 26 01:10:38 2006 @@ -1,0 +1,21 @@ +set MAKE=mingw32-make.exe +set TARGET=D:\html\newhome\explorer + +rm explorer-ansi.exe +%MAKE% -f Makefile-precomp clean all UNICODE=0 +mv explorer.exe explorer-ansi.exe + +%MAKE% -f Makefile-precomp clean all UNICODE=1 +zip %TARGET%\ros-explorer.zip explorer-ansi.exe explorer.exe *.dll + +cd ..\lean-explorer +%MAKE% -f Makefile-precomp clean all UNICODE=1 +zip %TARGET%\lean-explorer.zip explorer.exe +cd ..\explorer + +pack +mv explorer-src.zip %TARGET%\explorer-src.zip + +make-full-docu +move ros-explorer.chm %TARGET%\ +move ros-explorer-full.chm %TARGET%\ Propchange: trunk/reactos/base/shell/explorer/makearchive.bat ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/shell/explorer/makearchive.bat ------------------------------------------------------------------------------ svn:executable = *

1 0

[martinf] 24655: added GCC compatible chinese resource file translation of Larry Li <larryli@qq.com>
by martinf＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: martinf Date: Thu Oct 26 00:58:04 2006 New Revision: 24655 URL: http://svn.reactos.org/svn/reactos?rev=24655&view=rev Log: added GCC compatible chinese resource file translation of Larry Li <larryli(a)qq.com> Added: trunk/reactos/base/shell/explorer/explorer-cn-msvc.rc - copied unchanged from r24654, trunk/reactos/base/shell/explorer/explorer-cn-msvc trunk/reactos/base/shell/explorer/explorer-cn.rc Removed: trunk/reactos/base/shell/explorer/explorer-cn-msvc Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Removed: trunk/reactos/base/shell/explorer/explorer-cn-msvc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== Binary file - no diff available. Added: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc Thu Oct 26 00:58:04 2006 @@ -1,0 +1,398 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Chinese (P.R.C.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) +#ifdef _WIN32 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "ÎÄ¼þ(&F)" + BEGIN + MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT + END + POPUP "²é¿´(&V)" + BEGIN + MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR + MENUITEM "¸½¼ÓÀ¸(&E)", ID_VIEW_EXTRA_BAR + MENUITEM "Çý¶¯Æ÷À¸(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR + MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH + MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "µ¥ÎÄµµ½çÃæ(&S)", ID_VIEW_SDI + END + POPUP "´°¿Ú(&W)" + BEGIN + MENUITEM "ÐÂ´°¿Ú(&W)", ID_WINDOW_NEW + MENUITEM "²ãµþÅÅÁÐ(&C)\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "ºáÏòÆ½ÆÌ(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "×ÝÏòÆ½ÆÌ(&V)\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "×Ô¶¯ÅÅÁÐ(&A)", ID_WINDOW_AUTOSORT + MENUITEM "È«²¿×îÐ¡»¯(&S)", ID_WINDOW_ARRANGE + END + POPUP "¹¤¾ß(&T)" + BEGIN + MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS + END + POPUP "°ïÖú(&H)" + BEGIN + MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ + MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÉèÖÃ(&S)...", ID_DESKTOPBAR_SETTINGS + MENUITEM "ÈÎÎñ¹ÜÀíÆ÷(&T)...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "´ò¿ªÒôÁ¿¿ØÖÆ(&O)", ID_TRAY_VOLUME + MENUITEM "µ÷ÕûÒôÆµÊôÐÔ(&A)", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÏÔÊ¾Òþ²ØÍ¼±ê(&S)", ID_SHOW_HIDDEN_ICONS + MENUITEM "ÏÔÊ¾Í¼±ê°´Å¥(&B)", ID_SHOW_ICON_BUTTON + MENUITEM "ÅäÖÃÈÎÎñÀ¸Í¨ÖªÇø(&C)...", ID_CONFIG_NOTIFYAREA + MENUITEM "ÉèÖÃÈÕÆÚ/Ê±¼ä(&T)...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "ÎÄ¼þ(&F)" + BEGIN + MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT + END + POPUP "²é¿´(&V)" + BEGIN + MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR + MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH + MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "¶àÎÄµµ½çÃæ(&M)", ID_VIEW_MDI + END + POPUP "¹¤¾ß(&T)" + BEGIN + MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS + END + POPUP "°ïÖú(&H)" + BEGIN + MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ + MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÔËÐÐ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "ÃüÁî(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "·ûºÅÁ´½Ó(&S)",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "È·¶¨(&O)",1,158,6,47,14 + PUSHBUTTON "È¡Ïû(&C)",2,158,23,47,14 + PUSHBUTTON "°ïÖú(&H)",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "ÔÚ¿ªÊ¼²Ëµ¥ËÑË÷³ÌÐò" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "¹ýÂË(&F):",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,185,33 + PUSHBUTTON "Ñ¡È¡ÊäÈëÏî(&C)",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 172 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "×ÀÃæÊôÐÔ" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "ÇëÑ¡Ôñ×ÀÃæÍ¼±êÅÅÁÐ·½Ê½:", + IDC_STATIC,7,7,166,8 + CONTROL "×óÉÏÏòÏÂ",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "×óÉÏÏòÓÒ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "ÓÒÉÏÏò×ó",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "ÓÒÉÏÏòÏÂ",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "×óÏÂÏòÉÏ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "×óÏÂÏòÓÒ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "ÓÒÏÂÏò×ó",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "ÓÒÏÂÏòÉÏ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "±ß½çÏòÏÂ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "±ß½çºá×Ý",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "×ÀÃæ»·ÈÆ",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "ÏÔÊ¾°æ±¾ºÅ(&V)",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÈÎÎñÀ¸ÊôÐÔ" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "ÏÔÊ¾Ê±ÖÓ(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "Òþ²Ø²»»î¶¯µÄÍ¨ÖªÇøÍ¼±ê(&H)", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "ÈÎÎñÀ¸Í¨ÖªÇø(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¿ªÊ¼²Ëµ¥ÊôÐÔ" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 207, 150 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "ÅäÖÃÍ¨ÖªÇøÍ¼±ê" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,193,31 + LTEXT "ÌáÊ¾ÎÄ×Ö(&T):",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,55,42,145,14,ES_AUTOHSCROLL + LTEXT "´°¿Ú±êÌâ(&I):",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,55,60,145,14,ES_AUTOHSCROLL + LTEXT "Ä£¿éÂ·¾¶(&M):",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,55,78,145,14,ES_AUTOHSCROLL + GROUPBOX "ÏÔÊ¾Ä£Ê½(&D)",IDC_LABEL4,7,95,157,28 + CONTROL "ÏÔÊ¾(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,107,33,10 + CONTROL "Òþ²Ø(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, + 66,107,29,10 + CONTROL "×Ô¶¯Òþ²Ø(&U)",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,107,43,10 + ICON "",IDC_PICTURE,173,100,20,20 + LTEXT "×îºó¸ü¸Ä(&L):",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "ÏÔÊ¾±»Òþ²ØµÄ(&W)",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,131,56,10 + DEFPUSHBUTTON "È·¶¨(&O)",IDOK,91,129,50,14,WS_GROUP + PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,150,129,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Ñ¡Ôñä¯ÀÀÆ÷´°¿ÚÄ£Ê½" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "ÇëÑ¡Ôñä¯ÀÀÆ÷ÓÃ»§½çÃæ:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (¶àÎÄµµ½çÃæ)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (µ¥ÎÄµµ½çÃæ)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "ÔÚÁíÒ»´°¿Ú´òÀ´×ÓÎÄ¼þ¼Ð(&E)", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "This setting will be used as default for all explorer windows in the future.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "È·¶¨(&O)",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¹ØÓÚ ReactOS ä¯ÀÀÆ÷" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS ä¯ÀÀÆ÷",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "È·¶¨(&O)",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos ä¯ÀÀÆ÷" + IDS_START "¿ªÊ¼" + IDS_LOGOFF "×¢Ïú..." + IDS_SHUTDOWN "¹Ø±Õ..." + IDS_LAUNCH "ÔËÐÐ..." + IDS_START_HELP "°ïÖú" + IDS_SEARCH_FILES "ËÑË÷..." + IDS_DOCUMENTS "ÎÒµÄÎÄµµ" + IDS_FAVORITES "ÊÕ²Ø¼Ð" + IDS_PROGRAMS "³ÌÐò" + IDS_SETTINGS "ÉèÖÃ" + IDS_EXPLORE "ä¯ÀÀÆ÷" + IDS_EMPTY "(¿Õ)" + IDS_RECENT "×î½üµÄÎÄµµ" + IDS_ADMIN "¹ÜÀí¹¤¾ß" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "¿ªÊ¼²Ëµ¥" + IDS_MINIMIZE_ALL "×îÐ¡»¯ËùÓÐ´°¿Ú" + IDS_DESKTOP_NUM "×ÀÃæ %d" + IDS_VOLUME "ÒôÁ¿" + IDS_ITEMS_CUR "µ±Ç°ÏîÄ¿" + IDS_ITEMS_CONFIGURED "ÅäÖÃ" + IDS_ITEMS_VISIBLE "¿É¼û" + IDS_ITEMS_HIDDEN "Òþ²Ø" + IDS_NOTIFY_SHOW "ÏÔÊ¾" + IDS_NOTIFY_HIDE "Òþ²Ø" + IDS_NOTIFY_AUTOHIDE "×Ô¶¯Òþ²Ø" + IDS_SHOW_HIDDEN_ICONS "ÏÔÊ¾Òþ²ØµÄÍ¼±ê" + IDS_HIDE_ICONS "Òþ²ØÍ¼±ê" + IDS_TERMINATE "ÖÕÖ¹ ROS ä¯ÀÀÆ÷" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "ÍøÂç" + IDS_CONNECTIONS "ÍøÂçÁ¬½Ó" + IDS_DRIVES "Çý¶¯Æ÷" + IDS_SEARCH_COMPUTER "ËÑË÷¼ÆËã»ú..." + IDS_SETTINGS_MENU "ÉèÖÃ²Ëµ¥" + IDS_CONTROL_PANEL "¿ØÖÆÃæ°å" + IDS_PRINTERS "´òÓ¡»ú" + IDS_BROWSE "ä¯ÀÀÎÄ¼þ" + IDS_SEARCH_PRG "ËÑË÷³ÌÐò..." + IDS_ALL_USERS "All Users\\" + IDS_SEARCH "ËÑË÷" + IDS_ABOUT_EXPLORER "¹ØÓÚä¯ÀÀÆ÷(&A)..." + IDS_LAUNCH_MANY_PROGRAMS + "ÇëÑ¡ÔñÒ»¸öÒÔÉÏµÄÓ¦ÓÃ³ÌÐò¡£\nÈ·¶¨ÒªÔËÐÐÕâÐ©³ÌÐòÃ´£¿" + IDS_DESKTOPBAR_SETTINGS "×ÀÃæÉèÖÃ" + IDS_DESKTOP "×ÀÃæ" + IDS_TASKBAR "ÈÎÎñÀ¸" +END + +#endif // Chinese (P.R.C.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Thu Oct 26 00:58:04 2006 @@ -125,9 +125,11 @@ "#include ""explorer-sv.rc""\r\n" "#include ""explorer-uk.rc""\r\n" "\r\n" - "#ifndef __WINDRES__\r\n" + "#ifdef __WINDRES__\r\n" + "#include ""explorer-cn.rc""\r\n" + "#else\r\n" + "//#include ""explorer-cn-msvc.rc""\r\n" "#include ""explorer-bn.rc""\r\n" - "#include ""explorer-cn.rc""\r\n" "#endif\r\n" "\0" END @@ -226,9 +228,11 @@ #include "explorer-sv.rc" #include "explorer-uk.rc" -#ifndef __WINDRES__ +#ifdef __WINDRES__ +#include "explorer-cn.rc" +#else +//#include "explorer-cn-msvc.rc" #include "explorer-bn.rc" -#include "explorer-cn.rc" #endif /////////////////////////////////////////////////////////////////////////////

1 0

[martinf] 24654: rename explorer-cn.rc to explorer-cn-msvc.rc (MSVC specific resource file encoding)
by martinf＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: martinf Date: Thu Oct 26 00:54:46 2006 New Revision: 24654 URL: http://svn.reactos.org/svn/reactos?rev=24654&view=rev Log: rename explorer-cn.rc to explorer-cn-msvc.rc (MSVC specific resource file encoding) Added: trunk/reactos/base/shell/explorer/explorer-cn-msvc - copied unchanged from r24653, trunk/reactos/base/shell/explorer/explorer-cn.rc Removed: trunk/reactos/base/shell/explorer/explorer-cn.rc Removed: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== Binary file - no diff available.

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 October 2006