Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 20837: don't forget the ibrowser toolbar :)
by gedmurphy＠svn.reactos.org 13 Jan '06

13 Jan '06

don't forget the ibrowser toolbar :) Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp (Binary files differ)

1 0

[gedmurphy] 20836: some new toolbar icons
by gedmurphy＠svn.reactos.org 13 Jan '06

13 Jan '06

some new toolbar icons Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp (Binary files differ)

1 0

[weiden] 20835: revert my last change
by weiden＠svn.reactos.org 13 Jan '06

13 Jan '06

revert my last change Modified: trunk/reactos/lib/crt/crt.xml Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/misc/tls.c Modified: trunk/reactos/lib/crt/process/thread.c Added: trunk/reactos/lib/crt/wine/thread.c _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/crt.xml 2006-01-13 17:54:37 UTC (rev 20835) @@ -385,6 +385,7 @@ <file>cppexcept.c</file> <file>heap.c</file> <file>scanf.c</file> + <file>thread.c</file> <file>undname.c</file> </directory> </module> _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:54:37 UTC (rev 20835) @@ -17,10 +17,6 @@ typedef struct _ThreadData { - HANDLE hThread; /* handle to the current thread */ - void (__cdecl *start_address)(void*); /* the start address supplied by _beginthread() */ - void* arglist; /* the argument list supplied by _beginthread() */ - int terrno; /* *nix error code */ unsigned long tdoserrno; /* Win32 error code (for I/O only) */ unsigned __int64 tnext; /* used by rand/srand */ @@ -45,8 +41,7 @@ int CreateThreadData(void); void DestroyThreadData(void); -int SetThreadData(PTHREADDATA ThreadData); -void FreeThreadData(PTHREADDATA ThreadData); +void FreeThreadData(PTHREADDATA ptd); PTHREADDATA GetThreadData(void); #endif /* __MSVCRT_INTERNAL_TLS_H */ _____ Modified: trunk/reactos/lib/crt/misc/tls.c --- trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:54:37 UTC (rev 20835) @@ -4,7 +4,7 @@ #include <internal/rterror.h> -static DWORD TlsIndex = TLS_OUT_OF_INDEXES; +static unsigned long TlsIndex = (unsigned long)-1; static void InitThreadData(PTHREADDATA ThreadData) @@ -19,38 +19,40 @@ } -int SetThreadData(PTHREADDATA ThreadData) +int CreateThreadData(void) { - if(TlsIndex == TLS_OUT_OF_INDEXES || - !TlsSetValue(TlsIndex, ThreadData)) + PTHREADDATA ThreadData; + + TlsIndex = TlsAlloc(); + if (TlsIndex == (unsigned long)-1) return FALSE; + ThreadData = (PTHREADDATA)calloc(1, sizeof(THREADDATA)); + if (ThreadData == NULL) + return FALSE; + + if(!TlsSetValue(TlsIndex, (LPVOID)ThreadData)) + return FALSE; + InitThreadData(ThreadData); return TRUE; } -int CreateThreadData(void) -{ - TlsIndex = TlsAlloc(); - return (TlsIndex != TLS_OUT_OF_INDEXES); -} - - void DestroyThreadData(void) { - if (TlsIndex != TLS_OUT_OF_INDEXES) + if (TlsIndex != (unsigned long)-1) { TlsFree(TlsIndex); - TlsIndex = TLS_OUT_OF_INDEXES; + TlsIndex = (unsigned long)-1; } } void FreeThreadData(PTHREADDATA ThreadData) { - if (TlsIndex != TLS_OUT_OF_INDEXES) + if (TlsIndex != (unsigned long)-1) { if (ThreadData == NULL) ThreadData = TlsGetValue(TlsIndex); @@ -82,8 +84,6 @@ TlsSetValue(TlsIndex, (LPVOID)ThreadData); InitThreadData(ThreadData); - - ThreadData->hThread = GetCurrentThread(); } else { _____ Modified: trunk/reactos/lib/crt/process/thread.c --- trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:54:37 UTC (rev 20835) @@ -1,102 +1,23 @@ #include <precomp.h> -void _endthread(void); - -static DWORD WINAPI -_beginthread_start(PVOID lpParameter) -{ - PTHREADDATA ThreadData = (PTHREADDATA)lpParameter; - - if (SetThreadData(ThreadData)) - { - /* FIXME - wrap start_address in SEH! */ - ThreadData->start_address(ThreadData->arglist); - - _endthread(); - } - else - { - /* couldn't set the thread data, free it before terminating */ - free(ThreadData); - } - - ExitThread(0); -} - - +#if 0 /* - * @implemented - * - * FIXME: the return type should be uintptr_t + * @unimplemented */ unsigned long _beginthread( void (__cdecl *start_address)(void*), unsigned stack_size, void* arglist) { - HANDLE hThread; - PTHREADDATA ThreadData; - - if (start_address == NULL) { - __set_errno(EINVAL); - return (unsigned long)-1; - } - - /* allocate the thread data structure already here instead of allocating the - thread data structure in the thread itself. this way we can pass an error - code to the caller in case we don't have sufficient resources */ - ThreadData = malloc(sizeof(THREADDATA)); - if (ThreadData == NULL) - { - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - ThreadData->start_address = start_address; - ThreadData->arglist = arglist; - - hThread = CreateThread(NULL, - stack_size, - _beginthread_start, - ThreadData, - CREATE_SUSPENDED, - NULL); - if (hThread == NULL) - { - free(ThreadData); - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - ThreadData->hThread = hThread; - - if (ResumeThread(hThread) == (DWORD)-1) - { - CloseHandle(hThread); - - /* freeing the ThreadData _could_ cause a crash, but only in case someone - else resumed the thread and it got to free the context before we actually - get here, but that's _very_ unlikely! */ - free(ThreadData); - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - return (unsigned long)hThread; + __set_errno ( ENOSYS ); + return (unsigned long)-1; } - +#endif /* - * @implemented + * @unimplemented */ void _endthread(void) { - PTHREADDATA ThreadData = GetThreadData(); - - /* close the thread handle */ - CloseHandle(ThreadData->hThread); - - /* NOTE: the thread data will be freed in the thread detach routine that will - call FreeThreadData */ - - ExitThread(0); } + +/* EOF */ _____ Copied: trunk/reactos/lib/crt/wine/thread.c (from rev 20833, trunk/reactos/lib/crt/wine/thread.c)

1 0

[weiden] 20834: remove wine's broken _beginthread() and _endthread() and implement them properly
by weiden＠svn.reactos.org 13 Jan '06

13 Jan '06

remove wine's broken _beginthread() and _endthread() and implement them properly Modified: trunk/reactos/lib/crt/crt.xml Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/misc/tls.c Modified: trunk/reactos/lib/crt/process/thread.c Deleted: trunk/reactos/lib/crt/wine/thread.c _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/crt.xml 2006-01-13 17:32:59 UTC (rev 20834) @@ -385,7 +385,6 @@ <file>cppexcept.c</file> <file>heap.c</file> <file>scanf.c</file> - <file>thread.c</file> <file>undname.c</file> </directory> </module> _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:32:59 UTC (rev 20834) @@ -17,6 +17,10 @@ typedef struct _ThreadData { + HANDLE hThread; /* handle to the current thread */ + void (__cdecl *start_address)(void*); /* the start address supplied by _beginthread() */ + void* arglist; /* the argument list supplied by _beginthread() */ + int terrno; /* *nix error code */ unsigned long tdoserrno; /* Win32 error code (for I/O only) */ unsigned __int64 tnext; /* used by rand/srand */ @@ -41,7 +45,8 @@ int CreateThreadData(void); void DestroyThreadData(void); -void FreeThreadData(PTHREADDATA ptd); +int SetThreadData(PTHREADDATA ThreadData); +void FreeThreadData(PTHREADDATA ThreadData); PTHREADDATA GetThreadData(void); #endif /* __MSVCRT_INTERNAL_TLS_H */ _____ Modified: trunk/reactos/lib/crt/misc/tls.c --- trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -4,7 +4,7 @@ #include <internal/rterror.h> -static unsigned long TlsIndex = (unsigned long)-1; +static DWORD TlsIndex = TLS_OUT_OF_INDEXES; static void InitThreadData(PTHREADDATA ThreadData) @@ -19,40 +19,38 @@ } -int CreateThreadData(void) +int SetThreadData(PTHREADDATA ThreadData) { - PTHREADDATA ThreadData; - - TlsIndex = TlsAlloc(); - if (TlsIndex == (unsigned long)-1) + if(TlsIndex == TLS_OUT_OF_INDEXES || + !TlsSetValue(TlsIndex, ThreadData)) return FALSE; - ThreadData = (PTHREADDATA)calloc(1, sizeof(THREADDATA)); - if (ThreadData == NULL) - return FALSE; - - if(!TlsSetValue(TlsIndex, (LPVOID)ThreadData)) - return FALSE; - InitThreadData(ThreadData); return TRUE; } +int CreateThreadData(void) +{ + TlsIndex = TlsAlloc(); + return (TlsIndex != TLS_OUT_OF_INDEXES); +} + + void DestroyThreadData(void) { - if (TlsIndex != (unsigned long)-1) + if (TlsIndex != TLS_OUT_OF_INDEXES) { TlsFree(TlsIndex); - TlsIndex = (unsigned long)-1; + TlsIndex = TLS_OUT_OF_INDEXES; } } void FreeThreadData(PTHREADDATA ThreadData) { - if (TlsIndex != (unsigned long)-1) + if (TlsIndex != TLS_OUT_OF_INDEXES) { if (ThreadData == NULL) ThreadData = TlsGetValue(TlsIndex); @@ -84,6 +82,8 @@ TlsSetValue(TlsIndex, (LPVOID)ThreadData); InitThreadData(ThreadData); + + ThreadData->hThread = GetCurrentThread(); } else { _____ Modified: trunk/reactos/lib/crt/process/thread.c --- trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -1,23 +1,102 @@ #include <precomp.h> -#if 0 +void _endthread(void); + +static DWORD WINAPI +_beginthread_start(PVOID lpParameter) +{ + PTHREADDATA ThreadData = (PTHREADDATA)lpParameter; + + if (SetThreadData(ThreadData)) + { + /* FIXME - wrap start_address in SEH! */ + ThreadData->start_address(ThreadData->arglist); + + _endthread(); + } + else + { + /* couldn't set the thread data, free it before terminating */ + free(ThreadData); + } + + ExitThread(0); +} + + /* - * @unimplemented + * @implemented + * + * FIXME: the return type should be uintptr_t */ unsigned long _beginthread( void (__cdecl *start_address)(void*), unsigned stack_size, void* arglist) { - __set_errno ( ENOSYS ); - return (unsigned long)-1; + HANDLE hThread; + PTHREADDATA ThreadData; + + if (start_address == NULL) { + __set_errno(EINVAL); + return (unsigned long)-1; + } + + /* allocate the thread data structure already here instead of allocating the + thread data structure in the thread itself. this way we can pass an error + code to the caller in case we don't have sufficient resources */ + ThreadData = malloc(sizeof(THREADDATA)); + if (ThreadData == NULL) + { + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + ThreadData->start_address = start_address; + ThreadData->arglist = arglist; + + hThread = CreateThread(NULL, + stack_size, + _beginthread_start, + ThreadData, + CREATE_SUSPENDED, + NULL); + if (hThread == NULL) + { + free(ThreadData); + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + ThreadData->hThread = hThread; + + if (ResumeThread(hThread) == (DWORD)-1) + { + CloseHandle(hThread); + + /* freeing the ThreadData _could_ cause a crash, but only in case someone + else resumed the thread and it got to free the context before we actually + get here, but that's _very_ unlikely! */ + free(ThreadData); + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + return (unsigned long)hThread; } -#endif + /* - * @unimplemented + * @implemented */ void _endthread(void) { + PTHREADDATA ThreadData = GetThreadData(); + + /* close the thread handle */ + CloseHandle(ThreadData->hThread); + + /* NOTE: the thread data will be freed in the thread detach routine that will + call FreeThreadData */ + + ExitThread(0); } - -/* EOF */ _____ Deleted: trunk/reactos/lib/crt/wine/thread.c --- trunk/reactos/lib/crt/wine/thread.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/wine/thread.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -1,108 +0,0 @@ -/* - * msvcrt.dll thread functions - * - * Copyright 2000 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <precomp.h> -#include <internal/wine/msvcrt.h> - -#include <malloc.h> -#include <process.h> - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); - -void _amsg_exit (int errnum); -/* Index to TLS */ -DWORD MSVCRT_tls_index; - -typedef void (*_beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); - -/********************************************************************/ - -typedef struct { - _beginthread_start_routine_t start_address; - void *arglist; -} _beginthread_trampoline_t; - -/********************************************************************* - * msvcrt_get_thread_data - * - * Return the thread local storage structure. - */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) -{ - MSVCRT_thread_data *ptr; - DWORD err = GetLastError(); /* need to preserve last error */ - - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) - { - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - } - SetLastError( err ); - return ptr; -} - -/********************************************************************* - * _beginthread_trampoline - */ -static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) -{ - _beginthread_trampoline_t local_trampoline; - - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - free(arg); - - local_trampoline.start_address(local_trampoline.arglist); - return 0; -} - -/********************************************************************* - * _beginthread (MSVCRT.@) - */ -unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ - unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - void *arglist) /* [in] Argument list to be passed to new thread or NULL */ -{ - _beginthread_trampoline_t* trampoline; - - TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); -}

1 0

[weiden] 20833: fixed uninitialized variable warning
by weiden＠svn.reactos.org 13 Jan '06

13 Jan '06

fixed uninitialized variable warning Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-13 13:56:10 UTC (rev 20832) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-13 17:24:06 UTC (rev 20833) @@ -542,7 +542,7 @@ PVIDEO_MODE_INFORMATION VideoMode, PSTATUS_BLOCK StatusBlock) { - ULONG AvMode; + ULONG AvMode = 0; VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); VideoMode->ModeIndex = 0;

1 0

[royce] 20832: msvc2k5 build files
by royce＠svn.reactos.org 13 Jan '06

13 Jan '06

msvc2k5 build files Added: trunk/reactos/tools/rbuild/rbuild.sln Added: trunk/reactos/tools/rbuild/rbuild.vcproj _____ Added: trunk/reactos/tools/rbuild/rbuild.sln --- trunk/reactos/tools/rbuild/rbuild.sln 2006-01-13 13:53:26 UTC (rev 20831) +++ trunk/reactos/tools/rbuild/rbuild.sln 2006-01-13 13:56:10 UTC (rev 20832) @@ -0,0 +1,20 @@ +´?? +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.ActiveCfg = Debug|Win32 + {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.Build.0 = Debug|Win32 + {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.ActiveCfg = Release|Win32 + {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal _____ Added: trunk/reactos/tools/rbuild/rbuild.vcproj --- trunk/reactos/tools/rbuild/rbuild.vcproj 2006-01-13 13:53:26 UTC (rev 20831) +++ trunk/reactos/tools/rbuild/rbuild.vcproj 2006-01-13 13:56:10 UTC (rev 20832) @@ -0,0 +1,1174 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="rbuild" + ProjectGUID="{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/rbuild.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile=".\Release/rbuild.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\Release/rbuild.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/rbuild.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_N O_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/rbuild.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile=".\Debug/rbuild.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/rbuild.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/rbuild.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="backends" + > + <Filter + Name="devcpp" + > + <File + RelativePath="backend\devcpp\devcpp.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h" + > + </File> + </Filter> + <Filter + Name="msvc" + > + <File + RelativePath="backend\msvc\genguid.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h" + > + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="mingw" + > + <File + RelativePath="backend\mingw\mingw.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h" + > + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h" + > + </File> + <File + RelativePath="backend\mingw\pch_detection.h" + > + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="backend_sources" + > + <File + RelativePath="backend\backend.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="backend_headers" + > + <File + RelativePath="backend\backend.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="rbuild_sources" + > + <File + RelativePath="automaticdependency.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="rbuild_headers" + > + <File + RelativePath="exception.h" + > + </File> + <File + RelativePath="pch.h" + > + </File> + <File + RelativePath="rbuild.h" + > + </File> + <File + RelativePath="test.h" + > + </File> + </Filter> + <Filter + Name="inflib" + > + <File + RelativePath="..\..\lib\inflib\builddep.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > [truncated at 1000 lines; 204 more skipped]

1 0

[royce] 20831: msvc2k5 compatibility fix
by royce＠svn.reactos.org 13 Jan '06

13 Jan '06

msvc2k5 compatibility fix Modified: trunk/reactos/tools/rbuild/directory.cpp _____ Modified: trunk/reactos/tools/rbuild/directory.cpp --- trunk/reactos/tools/rbuild/directory.cpp 2006-01-13 06:35:52 UTC (rev 20830) +++ trunk/reactos/tools/rbuild/directory.cpp 2006-01-13 13:53:26 UTC (rev 20831) @@ -19,7 +19,9 @@ #include <assert.h> #include "rbuild.h" -#ifndef _MSC_VER +#ifdef _MSC_VER +#include <errno.h> +#else #include <dirent.h> #endif//_MSC_VER

1 0

[sedwards] 20830: This screws up my grep and is not used anymore
by sedwards＠svn.reactos.org 13 Jan '06

13 Jan '06

This screws up my grep and is not used anymore Deleted: trunk/reactos/lib/crtdll/old cruft/

1 0

[sedwards] 20829: guard the private header
by sedwards＠svn.reactos.org 13 Jan '06

13 Jan '06

guard the private header Modified: trunk/reactos/lib/shell32/shfldr.h _____ Modified: trunk/reactos/lib/shell32/shfldr.h --- trunk/reactos/lib/shell32/shfldr.h 2006-01-13 01:28:10 UTC (rev 20828) +++ trunk/reactos/lib/shell32/shfldr.h 2006-01-13 05:34:04 UTC (rev 20829) @@ -21,6 +21,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef __SHFLDR_H +#define __SHFLDR_H + #define CHARS_IN_GUID 39 typedef struct { @@ -71,3 +74,5 @@ void SHELL_FS_ProcessDisplayFilename(LPSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); + +#endif /* __SHFLDR_H */

1 0

[weiden] 20828: pszGroupName in EnumServicesStatusEx() can be NULL
by weiden＠svn.reactos.org 13 Jan '06

13 Jan '06

pszGroupName in EnumServicesStatusEx() can be NULL Modified: trunk/reactos/include/idl/svcctl.idl _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2006-01-13 00:28:08 UTC (rev 20827) +++ trunk/reactos/include/idl/svcctl.idl 2006-01-13 01:28:10 UTC (rev 20828) @@ -383,7 +383,7 @@ [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, [in, out, unique] LPDWORD lpResumeHandle, - [in, string] LPCSTR pszGroupName); + [in, string, unique] LPCSTR pszGroupName); /* Function 42 */ DWORD ScmrEnumServicesStatusExW([in] handle_t BindingHandle, @@ -396,7 +396,7 @@ [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, [in, out, unique] LPDWORD lpResumeHandle, - [in, string] LPCWSTR pszGroupName); + [in, string, unique] LPCWSTR pszGroupName); /* Function 43 */ /* ScmrSendTSMessage */

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