Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 19796: WINSTA_ALL_ACCESS is now defined in winuser.h
by gvg＠svn.reactos.com 01 Dec '05

01 Dec '05

WINSTA_ALL_ACCESS is now defined in winuser.h Modified: trunk/reactos/regtests/winetests/user32/winstation.c _____ Modified: trunk/reactos/regtests/winetests/user32/winstation.c --- trunk/reactos/regtests/winetests/user32/winstation.c 2005-12-01 14:29:46 UTC (rev 19795) +++ trunk/reactos/regtests/winetests/user32/winstation.c 2005-12-01 15:01:38 UTC (rev 19796) @@ -23,7 +23,6 @@ #include "wingdi.h" #include "winuser.h" -#define WINSTA_ALL_ACCESS 0x037f// fixme #define DESKTOP_ALL_ACCESS 0x01ff static void print_object( HANDLE obj )

1 0

[weiden] 19795: - hide devices if necessary
by weiden＠svn.reactos.com 01 Dec '05

01 Dec '05

- hide devices if necessary - add some (not all!) missing device node status flags to w32api Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/w32api/include/setupapi.h _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-01 10:52:16 UTC (rev 19794) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-01 14:29:46 UTC (rev 19795) @@ -228,7 +228,7 @@ sizeof(DevAdvPropInfo->szDevName) / sizeof(DevAdvPropInfo->szDevName[0]))) { psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = hWndParent; psh.pszCaption = DevAdvPropInfo->szDevName; _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-12-01 10:52:16 UTC (rev 19794) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-12-01 14:29:46 UTC (rev 19795) @@ -41,6 +41,7 @@ { struct _HWCLASSDEVINFO *ClassDevInfo; SP_DEVINFO_DATA DevInfoData; + BOOL HideDevice; } HWDEVINFO, *PHWDEVINFO; typedef struct _HWCLASSDEVINFO @@ -281,7 +282,7 @@ ClassDevInfo->hDevInfo = SetupDiGetClassDevs(&ClassDevInfo->Guid, NULL, hpd->hWnd, - DIGCF_PRESENT); + DIGCF_PRESENT | DIGCF_PROFILE); if (ClassDevInfo->hDevInfo != INVALID_HANDLE_VALUE) { DWORD MemberIndex = 0; @@ -295,6 +296,8 @@ MemberIndex++, &DevInfoData)) { + BOOL HideDevice = FALSE; + if (ClassDevInfo->HwDevInfo != NULL) { PHWDEVINFO HwNewDevInfo = HeapReAlloc(GetProcessHeap(), @@ -325,9 +328,15 @@ } } + /* Find out if the device should be hidden by default */ + IsDeviceHidden(DevInfoData.DevInst, + NULL, + &HideDevice); + /* save all information for the current device */ ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount].ClassDevInfo = ClassDevInfo; - ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount++].DevInfoData = DevInfoData; + ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount].DevInfoData = DevInfoData; + ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount++].HideDevice = HideDevice; } } @@ -362,7 +371,8 @@ LVITEM li; /* get the device name */ - if (GetDeviceDescriptionString(ClassDevInfo->hDevInfo, + if (!HwDevInfo->HideDevice && + GetDeviceDescriptionString(ClassDevInfo->hDevInfo, &HwDevInfo->DevInfoData, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-01 10:52:16 UTC (rev 19794) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-01 14:29:46 UTC (rev 19795) @@ -97,32 +97,42 @@ static INT AllocAndLoadStringsCat(OUT LPWSTR *lpTarget, IN HINSTANCE hInst, - IN UINT uID1, - IN UINT uID2) + IN UINT *uID, + IN UINT nIDs) { - INT ln; + INT ln = 0; + UINT i; - ln = LengthOfStrResource(hInst, - uID1); - ln += LengthOfStrResource(hInst, - uID2); - if (ln++ > 0) + for (i = 0; + i != nIDs; + i++) { + ln += LengthOfStrResource(hInst, + uID[i]); + } + + if (ln != 0) + { (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, - ln * sizeof(WCHAR)); + (ln + 1) * sizeof(WCHAR)); if ((*lpTarget) != NULL) { - INT Ret, Ret2 = 0; - if (!(Ret = LoadStringW(hInst, uID1, *lpTarget, ln))) + LPWSTR s = *lpTarget; + INT Ret = 0; + + for (i = 0; + i != nIDs; + i++) { - LocalFree((HLOCAL)(*lpTarget)); + if (!(Ret = LoadStringW(hInst, uID[i], s, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + + s += Ret; } - else if (!(Ret2 = LoadStringW(hInst, uID2, *lpTarget + Ret, ln - Ret))) - { - LocalFree((HLOCAL)(*lpTarget)); - Ret = 0; - } - return Ret + Ret2; + + return s - *lpTarget; } } return 0; @@ -141,7 +151,7 @@ if (AllocAndLoadString(&lpFormat, hInstance, - uID) > 0) + uID) != 0) { va_start(lArgs, lpTarget); /* let's use FormatMessage to format it because it has the ability to allocate @@ -164,8 +174,8 @@ DWORD LoadAndFormatStringsCat(IN HINSTANCE hInstance, - IN UINT uID1, - IN UINT uID2, + IN UINT *uID, + IN UINT nIDs, OUT LPWSTR *lpTarget, ...) { @@ -175,8 +185,8 @@ if (AllocAndLoadStringsCat(&lpFormat, hInstance, - uID1, - uID2) > 0) + uID, + nIDs) != 0) { va_start(lArgs, lpTarget); /* let's use FormatMessage to format it because it has the ability to allocate @@ -458,10 +468,15 @@ else { LPWSTR szProblem; + UINT StringIDs[] = + { + MessageId, + IDS_DEVCODE, + }; if (LoadAndFormatStringsCat(hDllInstance, - MessageId, - IDS_DEVCODE, + StringIDs, + sizeof(StringIDs) / sizeof(StringIDs[0]), &szProblem, ProblemNumber)) { @@ -493,6 +508,41 @@ BOOL +IsDeviceHidden(IN DEVINST DevInst, + IN HANDLE hMachine, + OUT BOOL *IsHidden) +{ + CONFIGRET cr; + ULONG Status, ProblemNumber; + BOOL Ret = FALSE; + + if (hMachine != NULL) + { + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DevInst, + 0, + hMachine); + } + else + { + cr = CM_Get_DevNode_Status(&Status, + &ProblemNumber, + DevInst, + 0); + } + + if (cr == CR_SUCCESS) + { + *IsHidden = ((Status & DN_NO_SHOW_IN_DM) != 0); + Ret = TRUE; + } + + return Ret; +} + + +BOOL GetDeviceTypeString(IN PSP_DEVINFO_DATA DeviceInfoData, OUT LPWSTR szBuffer, IN DWORD BufferSize) _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-01 10:52:16 UTC (rev 19794) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-01 14:29:46 UTC (rev 19795) @@ -199,8 +199,8 @@ DWORD LoadAndFormatStringsCat(IN HINSTANCE hInstance, - IN UINT uID1, - IN UINT uID2, + IN UINT *uID, + IN UINT nIDs, OUT LPWSTR *lpTarget, ...); @@ -232,6 +232,11 @@ IN DWORD BufferSize); BOOL +IsDeviceHidden(IN DEVINST DevInst, + IN HANDLE hMachine, + OUT BOOL *IsHidden); + +BOOL GetDeviceTypeString(IN PSP_DEVINFO_DATA DeviceInfoData, OUT LPWSTR szBuffer, IN DWORD BufferSize); _____ Modified: trunk/reactos/w32api/include/setupapi.h --- trunk/reactos/w32api/include/setupapi.h 2005-12-01 10:52:16 UTC (rev 19794) +++ trunk/reactos/w32api/include/setupapi.h 2005-12-01 14:29:46 UTC (rev 19795) @@ -212,6 +212,13 @@ #define DMI_MASK 0x00000001 #define DMI_BKCOLOR 0x00000002 #define DMI_USERECT 0x00000004 +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 #define DNF_DUPDESC 0x00000001 #define DNF_OLDDRIVER 0x00000002 #define DNF_EXCLUDEFROMLIST 0x00000004

1 0

[hpoussin] 19794: Don't write outside the array in SetupDiGetClassDevPropertySheetsW
by hpoussin＠svn.reactos.com 01 Dec '05

01 Dec '05

Don't write outside the array in SetupDiGetClassDevPropertySheetsW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-01 00:07:35 UTC (rev 19793) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-01 10:52:16 UTC (rev 19794) @@ -3733,14 +3733,14 @@ Request.DeviceInfoSet = DeviceInfoSet; Request.DeviceInfoData = DeviceInfoData; PropPageData.PropertySheetPages = &PropertySheetHeader->phpage[PropertySheetHeader->nPages]; - PropPageData.MaximumNumberOfPages = PropertySheetHeaderPageListSize; + PropPageData.MaximumNumberOfPages = PropertySheetHeaderPageListSize - PropertySheetHeader->nPages; PropPageData.NumberOfPages = 0; ret = pPropPageProvider(&Request, GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); if (!ret) goto cleanup; if (RequiredSize) - *RequiredSize = PropPageData.NumberOfPages; + *RequiredSize = PropPageData.NumberOfPages + PropertySheetHeader->nPages; if (PropPageData.NumberOfPages <= PropPageData.MaximumNumberOfPages) { PropertySheetHeader->nPages += PropPageData.NumberOfPages;

1 0

[weiden] 19793: set the MaximumLength in ProbeAndCaptureUnicodeString
by weiden＠svn.reactos.com 01 Dec '05

01 Dec '05

set the MaximumLength in ProbeAndCaptureUnicodeString Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-30 23:33:29 UTC (rev 19792) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-12-01 00:07:35 UTC (rev 19793) @@ -188,6 +188,7 @@ /* Set it as the buffer */ Dest->Buffer = Buffer; + Dest->MaximumLength = Dest->Length + sizeof(WCHAR); } else {

1 0

[cwittich] 19792: fixed the build options for different configurations
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

fixed the build options for different configurations Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 23:32:31 UTC (rev 19791) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 23:33:29 UTC (rev 19792) @@ -228,7 +228,7 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); + fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); bool multiple_includes = false; @@ -278,7 +278,7 @@ } fprintf ( OUT, "\"\r\n" ); - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); @@ -298,6 +298,14 @@ } fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE"); + if ( release ) + { + fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); + } + + fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); + fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" ); fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4");

1 0

[weiden] 19791: fixed querying the automatic daylight-savings information
by weiden＠svn.reactos.com 30 Nov '05

30 Nov '05

fixed querying the automatic daylight-savings information Modified: trunk/reactos/lib/cpl/timedate/timedate.c _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.c --- trunk/reactos/lib/cpl/timedate/timedate.c 2005-11-30 23:24:19 UTC (rev 19790) +++ trunk/reactos/lib/cpl/timedate/timedate.c 2005-11-30 23:32:31 UTC (rev 19791) @@ -462,7 +462,7 @@ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", 0, - KEY_SET_VALUE, + KEY_QUERY_VALUE, &hKey)) return;

1 0

[gvg] 19790: Make GetProcessWindowStation work for CSRSS
by gvg＠svn.reactos.com 30 Nov '05

30 Nov '05

Make GetProcessWindowStation work for CSRSS Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-11-30 22:44:41 UTC (rev 19789) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-11-30 23:24:19 UTC (rev 19790) @@ -915,17 +915,31 @@ HWINSTA FASTCALL UserGetProcessWindowStation(VOID) { + NTSTATUS Status; + HWINSTA WinSta; + if(PsGetCurrentProcess() != CsrProcess) { return PsGetCurrentProcess()->Win32WindowStation; } else { - /* FIXME - get the pointer to the window station by querying the parent of - the desktop of the calling thread (which is a window station), - then use ObFindHandleForObject() to find a suitable handle */ - DPRINT1("CSRSS called NtUserGetProcessWindowStation()!!! returned NULL!\n"); - return NULL; + DPRINT1("Should use ObFindHandleForObject\n"); + Status = ObOpenObjectByPointer(PsGetWin32Thread()->Desktop->WindowStation, + 0, + NULL, + WINSTA_ALL_ACCESS, + ExWindowStationObjectType, + UserMode, + (PHANDLE) &WinSta); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DPRINT1("Unable to open handle for CSRSSs winsta, status 0x%08x\n", + Status); + return NULL; + } + return WinSta; } } _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-11-30 22:44:41 UTC (rev 19789) +++ trunk/reactos/w32api/include/winuser.h 2005-11-30 23:24:19 UTC (rev 19790) @@ -380,6 +380,7 @@ #define WINSTA_READATTRIBUTES 2 #define WINSTA_READSCREEN 512 #define WINSTA_WRITEATTRIBUTES 16 +#define WINSTA_ALL_ACCESS 895 #define DDL_READWRITE 0 #define DDL_READONLY 1 #define DDL_HIDDEN 2

1 0

[cwittich] 19789: added PCH support
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

added PCH support removed some redundant code Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 22:17:11 UTC (rev 19788) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 22:44:41 UTC (rev 19789) @@ -213,7 +213,10 @@ { std::string& cfg = cfgs[icfg]; - bool debug = !strstr ( cfg.c_str(), "Release" ); + bool debug = strstr ( cfg.c_str(), "Debug" ); + bool speed = strstr ( cfg.c_str(), "Speed" ); + bool release = (!debug && !speed ); + //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); fprintf ( OUT, "\t\t<Configuration\r\n" ); @@ -248,30 +251,22 @@ if ( debug ) { defines.push_back ( "_DEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } } else { defines.push_back ( "NDEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } } + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); for ( i = 0; i < defines.size(); i++ ) { @@ -284,15 +279,29 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); + + if ( module.pch != NULL ) + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" ); + string pch_path = Path::RelativeFromDirectory ( + module.pch->file.name, + module.GetBasePath() ); + fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); + } + fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE"); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); + fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4"); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); @@ -318,7 +327,7 @@ fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); - fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); if ( debug ) fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); @@ -351,7 +360,7 @@ fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); } } - else if ( dll) + else if ( dll ) { fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x40000" : module.baseaddress.c_str ()); @@ -407,11 +416,24 @@ fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - if (configuration.VSProjectVersion < "8.00") { - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + + if ( isrcfile == 0 ) { - std::string& config = cfgs[iconfig]; + /* little hack to speed up PCH */ + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str() ); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tUsePrecompiledHeader=\"1\"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + } + if (configuration.VSProjectVersion < "8.00") { if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))) { fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );

1 0

[cwittich] 19788: -moved files into correct dir
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

-moved files into correct dir -removed wrong named dirs Deleted: trunk/reactos/subsys/system/regsrv32/ Added: trunk/reactos/subsys/system/regsvr32/Hu.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc Added: trunk/reactos/subsys/system/sndvol32/Hu.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Deleted: trunk/reactos/subsys/system/soundvol32/ _____ Copied: trunk/reactos/subsys/system/regsvr32/Hu.rc (from rev 19784, trunk/reactos/subsys/system/regsrv32/Hu.rc) _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc --- trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-11-30 22:11:00 UTC (rev 19787) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-11-30 22:17:11 UTC (rev 19788) @@ -9,3 +9,4 @@ #include "En.rc" #include "De.rc" #include "Ja.rc" +#include "Hu.rc" _____ Copied: trunk/reactos/subsys/system/sndvol32/Hu.rc (from rev 19784, trunk/reactos/subsys/system/soundvol32/Hu.rc) _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-11-30 22:11:00 UTC (rev 19787) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-11-30 22:17:11 UTC (rev 19788) @@ -20,3 +20,4 @@ #include "De.rc" #include "Ja.rc" #include "Sv.rc" +#include "Hu.rc"

1 0

[cwittich] 19786: fix macro redefinition when compiling with msvc
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

fix macro redefinition when compiling with msvc Modified: trunk/reactos/subsys/system/taskmgr/precomp.h _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-30 22:11:00 UTC (rev 19786) @@ -1,6 +1,5 @@ #ifndef __PRECOMP_H #define __PRECOMP_H -#define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS #include <windows.h>

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