Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29194: implmented EngQueryEMFInfo it always return FALSE it is historic in Windows XP, But not in Windows 2000
by greatlrd＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: greatlrd Date: Mon Sep 24 22:00:49 2007 New Revision: 29194 URL: http://svn.reactos.org/svn/reactos?rev=29194&view=rev Log: implmented EngQueryEMFInfo it always return FALSE it is historic in Windows XP, But not in Windows 2000 Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.c Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c Mon Sep 24 22:00:49 2007 @@ -14,6 +14,17 @@ #include <ddrawint.h> #include <ddrawgdi.h> #include <ntgdi.h> + +/* + * @implemented + */ +BOOL +STDCALL +EngQueryEMFInfo(HDEV hdev, + EMFINFO *pEMFInfo) +{ + return FALSE; +} /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Sep 24 22:00:49 2007 @@ -2296,30 +2296,6 @@ return 0; } -/* - * @unimplemented - * wrong info it is not Obsolete GDI Function as http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm say - */ -BOOL STDCALL -EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo) -{ -#if 0 - BOOL retValue = FALSE; - DHPDEV Dhpdev; - - if ((!hdev) && (!pEMFInfo)) - { - if ((Dhpdev = NtGdiGetDhpdev(hdev))) - { - /* FIXME check if it support or if it is pEMFInfo we got */ - /* FIXME copy the data from Dhpdev to pEMFInfo */ - } - } - return retValue; -#else - return FALSE; -#endif -} /* Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Mon Sep 24 22:00:49 2007 @@ -43,10 +43,11 @@ STDCALL EngDeleteSemaphore ( IN HSEMAPHORE hsem ) { - if (!hsem) return; - - RtlDeleteCriticalSection( (PRTL_CRITICAL_SECTION) hsem ); - RtlFreeHeap( GetProcessHeap(), 0, hsem ); + if (hsem) + { + RtlDeleteCriticalSection( (PRTL_CRITICAL_SECTION) hsem ); + RtlFreeHeap( GetProcessHeap(), 0, hsem ); + } } /*

1 0

[fireball] 29193: Dmitry Chapyshev <lentind@yandex.ru> - Start implementing systeminfo system utility (it already works quite nice, but not complete yet).
by fireball＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: fireball Date: Mon Sep 24 20:32:12 2007 New Revision: 29193 URL: http://svn.reactos.org/svn/reactos?rev=29193&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Start implementing systeminfo system utility (it already works quite nice, but not complete yet). Added: trunk/rosapps/sysutils/systeminfo/ (with props) trunk/rosapps/sysutils/systeminfo/lang/ (with props) trunk/rosapps/sysutils/systeminfo/lang/en-US.rc (with props) trunk/rosapps/sysutils/systeminfo/resource.h (with props) trunk/rosapps/sysutils/systeminfo/rsrc.rc (with props) trunk/rosapps/sysutils/systeminfo/systeminfo.c (with props) trunk/rosapps/sysutils/systeminfo/systeminfo.rbuild (with props) trunk/rosapps/sysutils/systeminfo/systeminfo.rc (with props) Modified: trunk/rosapps/sysutils/sysutils.rbuild Propchange: trunk/rosapps/sysutils/systeminfo/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Sep 24 20:32:12 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/sysutils/systeminfo/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Sep 24 20:32:12 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rosapps/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/e… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/en-US.rc (added) +++ trunk/rosapps/sysutils/systeminfo/lang/en-US.rc Mon Sep 24 20:32:12 2007 @@ -1,0 +1,60 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ +Discription:\n\ + This command line tool enables an administrator to query for basic\n\ + system configuration information.\n\n\ +Parameter List:\n\ + /S system Specifies the remote system to connect to.\n\n\ + /U [domain\\]user Specifies the user context under which\n\ + the command should execute.\n\n\ + /P [password] Specifies the password for the given\n\ + user context. Prompts for input if omitted.\n\n\ + /FO format Specifies the format in which the output\n\ + is to be displayed.\n\ + Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Specifies that the \"Column Header\" should\n\ + not be displayed in the output.\n\ + Valid only for \"TABLE\" and \"CSV\" formats.\n\n\ + /? Displays this help/usage.\n\n\ +Examples:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S system\n\ + SYSTEMINFO /S system /U user\n\ + SYSTEMINFO /S system /U domain\\user /P password /FO TABLE\n\ + SYSTEMINFO /S system /FO LIST\n\ + SYSTEMINFO /S system /FO CSV /NH\n" + +IDS_OS_NAME, "OS Name: %s\n" +IDS_OS_VERSION, "OS Version: %d.%d.%d %s" +IDS_OS_BUILD, " Build %s\n" +IDS_OS_BUILD_TYPE, "OS Build Type: %s\n" +IDS_REG_OWNER, "Registered Owner: %s\n" +IDS_REG_ORG, "Registered Organization: %s\n" +IDS_PRODUCT_ID, "Product ID: %s\n" +IDS_INST_DATE, "Install Date: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "System type: Unknown\n" +IDS_SYS_TYPE_X86, "System type: X86-based PC\n" +IDS_SYS_TYPE_IA64, "System type: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "System type: AMD64-based PC\n" +IDS_PROCESSORS, "Processor(s): %u Processor(s) Installed.\n" +IDS_ROS_DIR, "ReactOS Directory: %s\n" +IDS_SYS_DIR, "System Directory: %s\n" +IDS_BOOT_DEV, "Boot Device: %s\n" +IDS_SYS_LOCALE, "System Locale: %s\n" +IDS_INPUT_LOCALE, "Input Locale: %s\n" +IDS_TOTAL_PHYS_MEM, "Total Physical Memory: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" +IDS_HOST_NAME, "Host Name: %s\n" +IDS_PAGEFILE_LOC, "Page File Location(s) %s" +IDS_TIME_ZONE, "Time zone: %s\n" + +} Propchange: trunk/rosapps/sysutils/systeminfo/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/resour… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/resource.h (added) +++ trunk/rosapps/sysutils/systeminfo/resource.h Mon Sep 24 20:32:12 2007 @@ -1,0 +1,29 @@ +#define IDS_USAGE 1000 + +#define IDS_OS_NAME 100 +#define IDS_OS_VERSION 101 +#define IDS_OS_BUILD 102 +#define IDS_OS_BUILD_TYPE 103 +#define IDS_REG_OWNER 104 +#define IDS_REG_ORG 105 +#define IDS_PRODUCT_ID 106 +#define IDS_INST_DATE 107 +#define IDS_INST_TIME 108 +#define IDS_SYS_TYPE_UNKNOWN 109 +#define IDS_SYS_TYPE_X86 110 +#define IDS_SYS_TYPE_IA64 111 +#define IDS_SYS_TYPE_AMD64 112 +#define IDS_PROCESSORS 113 +#define IDS_ROS_DIR 114 +#define IDS_SYS_DIR 115 +#define IDS_BOOT_DEV 116 +#define IDS_SYS_LOCALE 117 +#define IDS_INPUT_LOCALE 118 +#define IDS_TOTAL_PHYS_MEM 119 +#define IDS_AVAIL_PHISICAL_MEM 120 +#define IDS_VIRT_MEM_MAX 121 +#define IDS_VIRT_MEM_AVAIL 122 +#define IDS_VIRT_MEM_INUSE 123 +#define IDS_HOST_NAME 124 +#define IDS_PAGEFILE_LOC 125 +#define IDS_TIME_ZONE 126 Propchange: trunk/rosapps/sysutils/systeminfo/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/rsrc.r… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/rsrc.rc (added) +++ trunk/rosapps/sysutils/systeminfo/rsrc.rc Mon Sep 24 20:32:12 2007 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" Propchange: trunk/rosapps/sysutils/systeminfo/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/system… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/systeminfo.c (added) +++ trunk/rosapps/sysutils/systeminfo/systeminfo.c Mon Sep 24 20:32:12 2007 @@ -1,0 +1,348 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* Copyright (C) 2007, Dmitry Chapyshev <lentind(a)yandex.ru> */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <windows.h> +#include <io.h> + +#include "resource.h" + +#define BUFFER_SIZE 32767 + +/* Load from resource and convert to OEM */ +static +BOOL +GetOemStrings(UINT rcID, LPSTR OutMsg) +{ + TCHAR Msg[BUFFER_SIZE]; + if (LoadString(GetModuleHandle(NULL), rcID, (LPTSTR)Msg, BUFFER_SIZE)) + { + CharToOem(Msg, OutMsg); + return TRUE; + } + return FALSE; +} + +/* Load data from registry */ +static +BOOL +GetRegistryValue(HKEY hKeyName, LPCTSTR SubKey, LPCTSTR ValueName, LPCTSTR Buf) +{ + DWORD CharCount = BUFFER_SIZE; + HKEY hKey; + LONG lRet; + + CharCount = BUFFER_SIZE; + lRet = RegOpenKeyEx(hKeyName, + SubKey, + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) return FALSE; + lRet = RegQueryValueEx(hKey, + ValueName, + NULL, + NULL, + (LPBYTE)Buf, + &CharCount); + if (lRet != ERROR_SUCCESS) return FALSE; + return TRUE; +} + +/* Show usage */ +static +VOID +Usage(VOID) +{ + TCHAR Buf[BUFFER_SIZE]; + if(GetOemStrings(IDS_USAGE,Buf)) printf("%s",Buf); +} + +/* Print all system information */ +VOID +AllSysInfo(VOID) +{ + DWORD CharCount = BUFFER_SIZE; + OSVERSIONINFO VersionInfo; + BOOL bOsVersionInfoEx; + SYSTEM_INFO SysInfo; + TCHAR Buf[BUFFER_SIZE],Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE]; + MEMORYSTATUS memory; + unsigned int DIV = 1024; + + GetSystemInfo(&SysInfo); + + // getting computer name + CharCount = BUFFER_SIZE; + if(!GetComputerName(Buf,&CharCount)) printf("Error getting: GetComputerName"); + if(GetOemStrings(IDS_HOST_NAME,Msg)) fprintf(stderr,Msg,Buf); + + //getting OS Name + GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("ProductName"), + Buf); + if(GetOemStrings(IDS_OS_NAME,Msg)) fprintf(stderr,Msg,Buf); + + //getting OS Version + ZeroMemory(&VersionInfo, sizeof(OSVERSIONINFO)); + VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if(!(bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*)&VersionInfo))) + { + VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (!GetVersionEx((OSVERSIONINFO*)&VersionInfo)) + return; + } + if (VersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) + { + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("CSDVersion"), + Buf)) + if(GetOemStrings(IDS_OS_VERSION,Msg)) + fprintf(stderr, Msg, + (int)VersionInfo.dwMajorVersion, + (int)VersionInfo.dwMinorVersion, + (int)VersionInfo.dwBuildNumber, + Buf); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("CurrentBuildNumber"), + Buf)) + if(GetOemStrings(IDS_OS_BUILD,Msg)) fprintf(stderr,Msg,Buf); + } + + //getting OS Manufacturer + + //getting OS Configuration + + //getting OS Build Type + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("CurrentType"), + Buf)) + if(GetOemStrings(IDS_OS_BUILD_TYPE,Msg)) fprintf(stderr,Msg,Buf); + + //getting Registered Owner + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("RegisteredOwner"), + Buf)) + if(GetOemStrings(IDS_REG_OWNER,Msg)) fprintf(stderr,Msg,Buf); + + //getting Registered Organization + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("RegisteredOrganization"), + Buf)) + if(GetOemStrings(IDS_REG_ORG,Msg)) fprintf(stderr,Msg,Buf); + + //getting Product ID + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("ProductId"), + Buf)) + if(GetOemStrings(IDS_PRODUCT_ID,Msg)) fprintf(stderr,Msg,Buf); + + //getting Install Date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), + TEXT("SetupDate"), + Buf)) + if(GetOemStrings(IDS_INST_DATE,Msg)) fprintf(stderr,Msg,Buf); + + //getting Install Time + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), + TEXT("SetupTime"), + Buf)) + if(GetOemStrings(IDS_INST_TIME,Msg)) fprintf(stderr,Msg,Buf); + + //getting System Up Time + + //getting System Manufacturer + + //getting System Model + + //getting System type + switch (SysInfo.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_UNKNOWN: + if(GetOemStrings(IDS_SYS_TYPE_UNKNOWN,Msg)) printf("%s",Msg); + break; + case PROCESSOR_ARCHITECTURE_INTEL: + if(GetOemStrings(IDS_SYS_TYPE_X86,Msg)) printf("%s",Msg); + break; + case PROCESSOR_ARCHITECTURE_IA64: + if(GetOemStrings(IDS_SYS_TYPE_IA64,Msg)) printf("%s",Msg); + break; + case PROCESSOR_ARCHITECTURE_AMD64: + if(GetOemStrings(IDS_SYS_TYPE_AMD64,Msg)) printf("%s",Msg); + break; + } + + //getting Processor(s) + if(GetOemStrings(IDS_PROCESSORS,Msg)) + { + fprintf(stderr,Msg,(unsigned int)SysInfo.dwNumberOfProcessors); + unsigned int i; + for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) + { + sprintf(Tmp,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("Identifier"), + Buf)) + printf(" [0%u]: %s",i+1,Buf); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("VendorIdentifier"), + Buf)) + printf(" %s\n",Buf); + } + } + + //getting BIOS Version + + //getting ReactOS Directory + if(!GetWindowsDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); + if(GetOemStrings(IDS_ROS_DIR,Msg)) fprintf(stderr,Msg,Buf); + + //getting System Directory + if(!GetSystemDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetSystemDirectory"); + if(GetOemStrings(IDS_SYS_DIR,Msg)) fprintf(stderr,Msg,Buf); + + //getting Boot Device + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\Setup"), + TEXT("SystemPartition"), + Buf)) + if(GetOemStrings(IDS_BOOT_DEV,Msg)) fprintf(stderr,Msg,Buf); + + //getting System Locale + if (GetRegistryValue(HKEY_CURRENT_USER, + TEXT("Control Panel\\International"), + TEXT("Locale"), + Tmp)) + if (GetRegistryValue(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + (LPTSTR)Tmp, + Buf)) + if(GetOemStrings(IDS_SYS_LOCALE,Msg)) fprintf(stderr,Msg,Buf); + + //getting Input Locale + if (GetRegistryValue(HKEY_CURRENT_USER, + TEXT("Keyboard Layout\\Preload"), + TEXT("1"), + Buf)) + { + int i,j; + for(j = 0, i = 4; i <= 8; j++, i++) Tmp[j] = Buf[i]; + if (GetRegistryValue(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + (LPTSTR)Tmp, + Buf)) + if(GetOemStrings(IDS_INPUT_LOCALE,Msg)) fprintf(stderr,Msg,Buf); + } + + //getting Time Zone + TIME_ZONE_INFORMATION TimeZoneInfo; + GetTimeZoneInformation(&TimeZoneInfo); + sprintf(Tmp,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\%S",TimeZoneInfo.StandardName); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("Display"), + Buf)) + if(GetOemStrings(IDS_TIME_ZONE,Msg)) fprintf(stderr,Msg,Buf); + + //getting Total Physical Memory + GlobalMemoryStatus(&memory); + if(GetOemStrings(IDS_TOTAL_PHYS_MEM,Msg)) + fprintf(stderr, + Msg, + memory.dwTotalPhys/(DIV*DIV), + memory.dwTotalPhys/DIV); + + //getting Available Physical Memory + if(GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) + fprintf(stderr, + Msg, + memory.dwAvailPhys/(DIV*DIV), + memory.dwAvailPhys/DIV); + + //getting Virtual Memory: Max Size + if(GetOemStrings(IDS_VIRT_MEM_MAX,Msg)) + fprintf(stderr, + Msg, + memory.dwTotalVirtual/(DIV*DIV), + memory.dwTotalVirtual/DIV); + + //getting Virtual Memory: Available + if(GetOemStrings(IDS_VIRT_MEM_AVAIL,Msg)) + fprintf(stderr, + Msg, + memory.dwAvailVirtual/(DIV*DIV), + memory.dwAvailVirtual/DIV); + + //getting Virtual Memory: In Use + if(GetOemStrings(IDS_VIRT_MEM_INUSE,Msg)) + fprintf(stderr, + Msg, + (memory.dwTotalVirtual-memory.dwAvailVirtual)/(DIV*DIV), + (memory.dwTotalVirtual-memory.dwAvailVirtual)/DIV); + + //getting Page File Location(s) + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\ControlSet001\\Control\\Session Manager\\Memory Management"), + TEXT("PagingFiles"), + Buf)) + { + int i; + for(i = 0; i < strlen((char*)Buf); i++) + { + if (Buf[i] == ' ') + { + Buf[i] = '\0'; + break; + } + } + if(GetOemStrings(IDS_PAGEFILE_LOC,Msg)) fprintf(stderr,Msg,Buf); + } + + //getting Domain + + //getting Logon Server + + //getting NetWork Card(s) + +} + +/* Main program */ +int +main(int argc,char *argv[]) +{ + if (argc > 1 && argv[1] == "/?") + { + Usage(); + return 0; + } + AllSysInfo(); + return 0; +} Propchange: trunk/rosapps/sysutils/systeminfo/systeminfo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/sysutils/systeminfo/systeminfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/system… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/systeminfo.rbuild (added) +++ trunk/rosapps/sysutils/systeminfo/systeminfo.rbuild Mon Sep 24 20:32:12 2007 @@ -1,0 +1,12 @@ +<module name="systeminfo" type="win32cui" installbase="system32" installname="systeminfo.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>ntdll</library> + <library>advapi32</library> + <file>systeminfo.c</file> + <file>systeminfo.rc</file> + <file>rsrc.rc</file> +</module> Propchange: trunk/rosapps/sysutils/systeminfo/systeminfo.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/sysutils/systeminfo/systeminfo.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/system… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/systeminfo.rc (added) +++ trunk/rosapps/sysutils/systeminfo/systeminfo.rc Mon Sep 24 20:32:12 2007 @@ -1,0 +1,6 @@ +#define REACTOS_STR_FILE_DESCRIPTION "System Information\0" +#define REACTOS_STR_INTERNAL_NAME "systeminfo\0" +#define REACTOS_STR_ORIGINAL_FILENAME "systeminfo.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/rosapps/sysutils/systeminfo/systeminfo.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/sysutils.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/sysutils.rbuild (original) +++ trunk/rosapps/sysutils/sysutils.rbuild Mon Sep 24 20:32:12 2007 @@ -34,6 +34,10 @@ <xi:include href="regexpl/regexpl.rbuild" /> </directory> + <directory name="systeminfo"> + <xi:include href="systeminfo/systeminfo.rbuild" /> + </directory> + <directory name="tcat"> <xi:include href="tcat/cat.rbuild" /> </directory>

1 0

[fireball] 29192: - Make PsChargeProcessPoolQuota returning STATUS_SUCCESS
by fireball＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: fireball Date: Mon Sep 24 20:00:21 2007 New Revision: 29192 URL: http://svn.reactos.org/svn/reactos?rev=29192&view=rev Log: - Make PsChargeProcessPoolQuota returning STATUS_SUCCESS Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Mon Sep 24 20:00:21 2007 @@ -114,7 +114,7 @@ IN ULONG Amount) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /*

1 0

[gedmurphy] 29191: Add basic tests for NtGdiGetDIBitsInternal
by gedmurphy＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: gedmurphy Date: Mon Sep 24 19:09:15 2007 New Revision: 29191 URL: http://svn.reactos.org/svn/reactos?rev=29191&view=rev Log: Add basic tests for NtGdiGetDIBitsInternal Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c Mon Sep 24 19:09:15 2007 @@ -1,0 +1,71 @@ +/* taken from gdi32, bitmap.c */ +UINT +FASTCALL +DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) +{ + UINT MaxBits = 0; + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; + MaxBits = Core->bcBitCount * Core->bcPlanes * Core->bcWidth; + } + else /* assume BITMAPINFOHEADER */ + { + if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) + return Info->bmiHeader.biSizeImage; + // Planes are over looked by Yuan. I guess assumed always 1. + MaxBits = Info->bmiHeader.biBitCount * Info->bmiHeader.biPlanes * Info->bmiHeader.biWidth; + } + MaxBits = ((MaxBits + 31) & ~31 ) / 8; // From Yuan, ScanLineSize = (Width * bitcount + 31)/32 + return (MaxBits * ScanLines); // ret the full Size. +} + + +INT +Test_NtGdiGetDIBitsInternal(PTESTINFO pti) +{ + HBITMAP hBitmap; + BITMAPINFO bi; + INT ScreenBpp; + + HDC hDCScreen = GetDC(NULL); + ASSERT(hDCScreen != NULL); + + hBitmap = CreateCompatibleBitmap(hDCScreen, 16, 16); + ASSERT(hBitmap != NULL); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal(0, 0, 0, 0, NULL, NULL, 0, 0, 0) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal((HDC)2345, 0, 0, 0, NULL, NULL, 0, 0, 0) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal((HDC)2345, hBitmap, 0, 0, NULL, NULL, 0, 0, 0) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal((HDC)2345, hBitmap, 0, 15, NULL, &bi, 0, 0, 0) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS, + DIB_BitmapMaxBitsSize(&bi, 15), 0) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + ScreenBpp = GetDeviceCaps(hDCScreen, BITSPIXEL); + RTEST(bi.bmiHeader.biWidth == 16); + RTEST(bi.bmiHeader.biHeight == 16); + RTEST(bi.bmiHeader.biBitCount == ScreenBpp); + RTEST(bi.bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8)); + + ReleaseDC(NULL, hDCScreen); + DeleteObject(hBitmap); + + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Mon Sep 24 19:09:15 2007 @@ -17,6 +17,7 @@ #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" +#include "ntgdi/NtGdiGetDIBits.c" #include "ntuser/NtUserCountClipboardFormats.c" @@ -40,6 +41,7 @@ { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, // { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, + { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, /* ntuser */ { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }

1 0

[gedmurphy] 29190: Add basic tests for GetDIBits
by gedmurphy＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: gedmurphy Date: Mon Sep 24 19:02:20 2007 New Revision: 29190 URL: http://svn.reactos.org/svn/reactos?rev=29190&view=rev Log: Add basic tests for GetDIBits Added: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c (original) +++ trunk/rostests/apitests/gdi32api/testlist.c Mon Sep 24 19:02:20 2007 @@ -13,6 +13,7 @@ #include "tests/GetClipRgn.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" +#include "tests/GetDIBits.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" @@ -30,6 +31,7 @@ { L"GetClipRgn", Test_GetClipRgn }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, + { L"GetDIBits", Test_GetDIBits }, { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, Added: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetDIBits.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Mon Sep 24 19:02:20 2007 @@ -1,0 +1,49 @@ +INT +Test_GetDIBits(PTESTINFO pti) +{ + HDC hDCScreen; + HBITMAP hBitmap; + BITMAPINFO bi; + INT ScreenBpp; + + hDCScreen = GetDC(NULL); + if (hDCScreen == NULL) + { + return FALSE; + } + + hBitmap = CreateCompatibleBitmap(hDCScreen, 16, 16); + RTEST(hBitmap != NULL); + + SetLastError(ERROR_SUCCESS); + RTEST(GetDIBits(0, 0, 0, 0, NULL, NULL, 0) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + RTEST(GetDIBits((HDC)2345, 0, 0, 0, NULL, NULL, 0) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + RTEST(GetDIBits((HDC)2345, hBitmap, 0, 0, NULL, NULL, 0) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + RTEST(GetDIBits((HDC)2345, hBitmap, 0, 15, NULL, &bi, 0) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + ScreenBpp = GetDeviceCaps(hDCScreen, BITSPIXEL); + RTEST(bi.bmiHeader.biWidth == 16); + RTEST(bi.bmiHeader.biHeight == 16); + RTEST(bi.bmiHeader.biBitCount == ScreenBpp); + RTEST(bi.bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8)); + + DeleteObject(hBitmap); + ReleaseDC(NULL, hDCScreen); + return APISTATUS_NORMAL; +}

1 0

[dreimer] 29189: Recent RBUILD Changes cry for a RosBE Update. Getting Ready for 0.3.8.1
by dreimer＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: dreimer Date: Mon Sep 24 18:14:43 2007 New Revision: 29189 URL: http://svn.reactos.org/svn/reactos?rev=29189&view=rev Log: Recent RBUILD Changes cry for a RosBE Update. Getting Ready for 0.3.8.1 Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Sep 24 18:14:43 2007 @@ -1,3 +1,9 @@ +*** Sep 24th, 2007 - RosBE 0.3.8.1 Released + +- Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to + seperate target and host headers by Hervé Poussineau. (Hervé Poussineau, Daniel Reimer) +- Updated: NASM 0.99.02 to 0.99.03 (Daniel Reimer) + *** Sep 11th, 2007 - RosBE 0.3.8 Released - Updated: w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Mon Sep 24 18:14:43 2007 @@ -1,4 +1,4 @@ -ReactOS Build Environment v0.3.8 +ReactOS Build Environment v0.3.8.1 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Mon Sep 24 18:14:43 2007 @@ -1,7 +1,7 @@ -ReactOS Build Environment 0.3.8 +ReactOS Build Environment 0.3.8.1 -The ReactOS Build Environment v0.3.8 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v0.3.8.1 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. @@ -9,13 +9,13 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.8 contains the following packages: +The ReactOS Build Environment v0.3.8.1 contains the following packages: binutils-2.17.50-20070806 mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.02-win32 +nasm-0.99.03-win32 mingw-4.1.3-20070829-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Sep 24 18:14:43 2007 @@ -15,7 +15,7 @@ :: Config Tool. :: color 0A -set _VER=0.3.8 +set _VER=0.3.8.1 set ROSBEBASEDIR=%~dp0 for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i set _ROSSOURCEDIRBASE=%CD% @@ -114,7 +114,6 @@ set PATH=%ROSBEBASEDIR%\4.1.3\bin;%ROSBEBASEDIR%\4.1.3\libexec\gcc\mingw32\4.1.3;%PATH% set _MINGWMAKE=%ROSBEBASEDIR%\4.1.3\bin\mingw32-make.exe set _MINGWVERSION=4.1.3 - :: Set all paths (needed by Windows Vista) set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include"

1 0

[fireball] 29188: - Add Ex*Spinlock macros and FLUSH_MULTIPLE_MAXIMUM definitions missing from DDK - Add KeAcquireQueuedSpinLock / KeAcquireReleaseQueuedSpinLock, RtlCompareMemoryUlong definitions missing from IFS. - Add actual section object definition to NDK - More NDK fixes - Fix incorrect definition of MMPTE_LIST - Fix incorrect prototype of NtFlushVirtualMemory - Fix incorrect prototypes of KeAcquire / ReleaseQueuedSpinLock - Add a second parameter to MmCreateKernelStack to select the NUMA
by fireball＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: fireball Date: Mon Sep 24 18:01:54 2007 New Revision: 29188 URL: http://svn.reactos.org/svn/reactos?rev=29188&view=rev Log: - Add Ex*Spinlock macros and FLUSH_MULTIPLE_MAXIMUM definitions missing from DDK - Add KeAcquireQueuedSpinLock / KeAcquireReleaseQueuedSpinLock, RtlCompareMemoryUlong definitions missing from IFS. - Add actual section object definition to NDK - More NDK fixes - Fix incorrect definition of MMPTE_LIST - Fix incorrect prototype of NtFlushVirtualMemory - Fix incorrect prototypes of KeAcquire / ReleaseQueuedSpinLock - Add a second parameter to MmCreateKernelStack to select the NUMA node on which the stack should be allocated - Avoid usage of PROS_SECTION_OBJECT in Ps where possible - Unimplement PsChargeProcessQuota. It was not working right - Use PFN_NUMBER defined in DDK instead of PFN_TYPE internal ROS Type. Modified: trunk/reactos/hal/halx86/mp/spinlock.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/io/iomgr/iomdl.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/quota.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c Mon Sep 24 18:01:54 2007 @@ -170,7 +170,7 @@ */ KIRQL FASTCALL -KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number) { UNIMPLEMENTED; return 0; @@ -192,7 +192,7 @@ */ VOID FASTCALL -KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number, IN KIRQL OldIrql) { UNIMPLEMENTED; Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=29… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Mon Sep 24 18:01:54 2007 @@ -3460,6 +3460,21 @@ IN BOOLEAN AllowRawMount ); +NTHALAPI +KIRQL +FASTCALL +KeAcquireQueuedSpinLock ( + IN KSPIN_LOCK_QUEUE_NUMBER Number +); + +NTHALAPI +VOID +FASTCALL +KeReleaseQueuedSpinLock ( + IN KSPIN_LOCK_QUEUE_NUMBER Number, + IN KIRQL OldIrql +); + NTKERNELAPI VOID NTAPI @@ -3885,6 +3900,15 @@ IN ULONG FramesToCapture, OUT PVOID *BackTrace, OUT PULONG BackTraceHash OPTIONAL +); + +NTSYSAPI +SIZE_T +NTAPI +RtlCompareMemoryUlong ( + PVOID Source, + SIZE_T Length, + ULONG Pattern ); NTSYSAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Sep 24 18:01:54 2007 @@ -4743,6 +4743,8 @@ typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +#define FLUSH_MULTIPLE_MAXIMUM 32 + typedef enum _MM_SYSTEM_SIZE { MmSmallSystem, MmMediumSystem, @@ -8899,6 +8901,11 @@ */ #define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) +#define ExAcquireSpinLock(Lock, OldIrql) KeAcquireSpinLock((Lock), (OldIrql)) +#define ExReleaseSpinLock(Lock, OldIrql) KeReleaseSpinLock((Lock), (OldIrql)) +#define ExAcquireSpinLockAtDpcLevel(Lock) KeAcquireSpinLockAtDpcLevel(Lock) +#define ExReleaseSpinLockFromDpcLevel(Lock) KeReleaseSpinLockFromDpcLevel(Lock) + NTHALAPI VOID NTAPI Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h Mon Sep 24 18:01:54 2007 @@ -114,8 +114,10 @@ { ULONG Valid:1; ULONG OneEntry:1; - ULONG filler10:10; + ULONG filler0:8; ULONG NextEntry:20; + ULONG Prototype:1; + ULONG filler1:1; } MMPTE_LIST; #ifndef CONFIG_SMP Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h (original) +++ trunk/reactos/include/ndk/mmfuncs.h Mon Sep 24 18:01:54 2007 @@ -133,9 +133,9 @@ NTAPI NtFlushVirtualMemory( IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush, - OUT PULONG NumberOfBytesFlushed OPTIONAL + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + OUT PIO_STATUS_BLOCK IoStatus ); NTSTATUS Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Mon Sep 24 18:01:54 2007 @@ -508,6 +508,22 @@ } MM_AVL_TABLE, *PMM_AVL_TABLE; // +// Actual Section Object +// +typedef struct _SECTION +{ + MMADDRESS_NODE Address; + PSEGMENT Segment; + LARGE_INTEGER SizeOfSection; + union + { + ULONG LongFlags; + MMSECTION_FLAGS Flags; + } u; + ULONG InitialPageProtection; +} SECTION, *PSECTION; + +// // Memory Manager Working Set Structures // typedef struct _MMWSLENTRY @@ -567,11 +583,14 @@ ULONG BeingTrimmed:1; ULONG SessionLeader:1; ULONG TrimHard:1; - ULONG WorkingSetHard:1; - ULONG AddressSpaceBeingDeleted :1; - ULONG Available:10; - ULONG AllowWorkingSetAdjustment:8; + ULONG MaximumWorkingSetHard:1; + ULONG ForceTrim:1; + ULONG MinimumworkingSetHard:1; + ULONG Available0:1; ULONG MemoryPriority:8; + ULONG GrowWsleHash:1; + ULONG AcquiredUnsafe:1; + ULONG Available:14; } MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS; // Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Mon Sep 24 18:01:54 2007 @@ -191,6 +191,7 @@ #define STA_LPC_RECEIVED_MSG_ID_VALID_BIT 0x1 #define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 #define STA_ADDRESS_SPACE_OWNER_BIT 0x4 +#define STA_OWNS_WORKING_SET_BITS 0x1F8 #endif #define TLS_EXPANSION_SLOTS 1024 Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Sep 24 18:01:54 2007 @@ -941,6 +941,18 @@ VOID ); +VOID +FASTCALL +KeAcquireQueuedSpinLockAtDpcLevel( + IN OUT PKSPIN_LOCK_QUEUE LockQueue +); + +VOID +FASTCALL +KeReleaseQueuedSpinLockFromDpcLevel( + IN OUT PKSPIN_LOCK_QUEUE LockQueue +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Mon Sep 24 18:01:54 2007 @@ -802,7 +802,7 @@ PVOID NTAPI -MmCreateKernelStack(BOOLEAN GuiStack); +MmCreateKernelStack(BOOLEAN GuiStack, UCHAR Node); VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Mon Sep 24 18:01:54 2007 @@ -57,10 +57,6 @@ #define PSTRACE(x, ...) DPRINT(__VA_ARGS__); #define PSREFTRACE(x) #endif - -#define PspSetProcessFlag(Process, Flag) \ - InterlockedOr((PLONG)&Process->Flags, Flag) - // // Maximum Count of Notification Routines Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Mon Sep 24 18:01:54 2007 @@ -18,6 +18,12 @@ #define PspQuantumLengthFromMask(Mask) \ ((Mask) & 48) + +// +// Set Process Flag routines +// +#define PspSetProcessFlag(Process, Flag) \ + InterlockedOr((PLONG)&Process->Flags, Flag) // // Cross Thread Flag routines Modified: trunk/reactos/ntoskrnl/io/iomgr/iomdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomdl.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomdl.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomdl.c Mon Sep 24 18:01:54 2007 @@ -95,8 +95,8 @@ IN PVOID VirtualAddress, IN ULONG Length) { - PPFN_TYPE TargetPages = (PPFN_TYPE)(TargetMdl + 1); - PPFN_TYPE SourcePages = (PPFN_TYPE)(SourceMdl + 1); + PPFN_NUMBER TargetPages = (PPFN_NUMBER)(TargetMdl + 1); + PPFN_NUMBER SourcePages = (PPFN_NUMBER)(SourceMdl + 1); ULONG Offset; /* Calculate the offset */ @@ -131,7 +131,7 @@ Offset = ((ULONG_PTR)TargetMdl->StartVa - (ULONG_PTR)SourceMdl->StartVa) >> PAGE_SHIFT; SourcePages += Offset; - RtlCopyMemory(TargetPages, SourcePages, Length * sizeof(PFN_TYPE)); + RtlCopyMemory(TargetPages, SourcePages, Length * sizeof(PFN_NUMBER)); } /* 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 Mon Sep 24 18:01:54 2007 @@ -580,7 +580,7 @@ Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; /* Allocate the DPC Stack */ - DpcStack = MmCreateKernelStack(FALSE); + DpcStack = MmCreateKernelStack(FALSE, 0); if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); Prcb->DpcStack = (PVOID)((ULONG_PTR)DpcStack + KERNEL_STACK_SIZE); Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c Mon Sep 24 18:01:54 2007 @@ -19,7 +19,7 @@ VOID FASTCALL -KeAcquireQueuedSpinLockAtDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeAcquireQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) { #ifdef CONFIG_SMP PKSPIN_LOCK_QUEUE Prev; @@ -49,7 +49,7 @@ VOID FASTCALL -KeReleaseQueuedSpinLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeReleaseQueuedSpinLockFromDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) { #ifdef CONFIG_SMP KSPIN_LOCK LockVal; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Mon Sep 24 18:01:54 2007 @@ -797,7 +797,7 @@ if (!KernelStack) { /* We don't, allocate one */ - KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE) + + KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE, 0) + KERNEL_STACK_SIZE); if (!KernelStack) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Mon Sep 24 18:01:54 2007 @@ -180,7 +180,8 @@ PVOID STDCALL -MmCreateKernelStack(BOOLEAN GuiStack) +MmCreateKernelStack(BOOLEAN GuiStack, + UCHAR Node) { PMEMORY_AREA StackArea; ULONG i; Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Mon Sep 24 18:01:54 2007 @@ -19,9 +19,9 @@ NTSTATUS STDCALL NtFlushVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush, - OUT PULONG NumberOfBytesFlushed OPTIONAL) + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToFlush, + OUT PIO_STATUS_BLOCK IoStatusBlock) /* * FUNCTION: Flushes virtual memory to file * ARGUMENTS: Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Mon Sep 24 18:01:54 2007 @@ -26,18 +26,18 @@ PsReferenceProcessFilePointer(IN PEPROCESS Process, OUT PFILE_OBJECT *FileObject) { - PROS_SECTION_OBJECT Section; + PSECTION Section; PAGED_CODE(); /* Lock the process */ ExAcquireRundownProtection(&Process->RundownProtect); /* Get the section */ - Section = (PROS_SECTION_OBJECT)Process->SectionObject; + Section = Process->SectionObject; if (Section) { /* Get the file object and reference it */ - *FileObject = MmGetFileObjectForSection(Section); + *FileObject = MmGetFileObjectForSection((PVOID)Section); ObReferenceObject(*FileObject); } Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Mon Sep 24 18:01:54 2007 @@ -113,49 +113,8 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { - PEPROCESS_QUOTA_BLOCK QuotaBlock; - ULONG NewUsageSize; - ULONG NewMaxQuota; - - /* Get current Quota Block */ - QuotaBlock = Process->QuotaBlock; - - /* Quota Operations are not to be done on the SYSTEM Process */ - if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; - - /* New Size in use */ - NewUsageSize = QuotaBlock->QuotaEntry[PoolType].Usage + Amount; - - /* Does this size respect the quota? */ - if (NewUsageSize > QuotaBlock->QuotaEntry[PoolType].Limit) - { - /* It doesn't, so keep raising the Quota */ - while (MiRaisePoolQuota(PoolType, - QuotaBlock->QuotaEntry[PoolType].Limit, - &NewMaxQuota)) - { - /* Save new Maximum Quota */ - QuotaBlock->QuotaEntry[PoolType].Limit = NewMaxQuota; - - /* See if the new Maximum Quota fulfills our need */ - if (NewUsageSize <= NewMaxQuota) goto QuotaChanged; - } - - return STATUS_QUOTA_EXCEEDED; - } - -QuotaChanged: - /* Save new Usage */ - QuotaBlock->QuotaEntry[PoolType].Usage = NewUsageSize; - - /* Is this a new peak? */ - if (NewUsageSize > QuotaBlock->QuotaEntry[PoolType].Peak) - { - QuotaBlock->QuotaEntry[PoolType].Peak = NewUsageSize; - } - - /* All went well */ - return STATUS_SUCCESS; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Mon Sep 24 18:01:54 2007 @@ -52,7 +52,8 @@ if (!Thread->Tcb.LargeStack) { /* We don't create one */ - NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE) + KERNEL_LARGE_STACK_SIZE; + NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0) + + KERNEL_LARGE_STACK_SIZE; if (!NewStack) { /* Panic in user-mode */

1 0

[dreimer] 29187: Update Variables to support recent trunk.
by dreimer＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: dreimer Date: Mon Sep 24 17:48:28 2007 New Revision: 29187 URL: http://svn.reactos.org/svn/reactos?rev=29187&view=rev Log: Update Variables to support recent trunk. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Sep 24 17:48:28 2007 @@ -115,9 +115,8 @@ set _MINGWMAKE=%ROSBEBASEDIR%\4.1.3\bin\mingw32-make.exe set _MINGWVERSION=4.1.3 :: Set all paths (needed by Windows Vista) - set C_INCLUDE_PATH=%ROSBEBASEDIR%\4.1.3\include;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include - set CPLUS_INCLUDE_PATH=%ROSBEBASEDIR%\4.1.3\include;%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3;%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include - set LIBRARY_PATH=%ROSBEBASEDIR%\4.1.3\lib;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3 + set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" + set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" echo ******************************************************************************* echo * *

1 0

[hpoussin] 29186: When depending of a module, also depends of its generated headers
by hpoussin＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: hpoussin Date: Mon Sep 24 17:21:31 2007 New Revision: 29186 URL: http://svn.reactos.org/svn/reactos?rev=29186&view=rev Log: When depending of a module, also depends of its generated headers Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 17:21:31 2007 @@ -386,7 +386,22 @@ { string dep; if ( ReferenceObjects ( importedModule ) ) + { + const vector<CompilationUnit*>& compilationUnits = importedModule.non_if_data.compilationUnits; + size_t i; + dep = GetTargetMacro ( importedModule ); + for ( i = 0; i < compilationUnits.size (); i++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[i]; + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + if ( GetExtension ( *objectFilename ) == ".h" ) + { + dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); + break; + } + } + } else dep = backend->GetFullName ( *GetImportLibraryFilename ( importedModule, NULL ) ); return dep;

1 0

[hpoussin] 29185: Add headers dependencies for modules which declare a .idl in their rbuild file
by hpoussin＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: hpoussin Date: Mon Sep 24 16:53:33 2007 New Revision: 29185 URL: http://svn.reactos.org/svn/reactos?rev=29185&view=rev Log: Add headers dependencies for modules which declare a .idl in their rbuild file Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 16:53:33 2007 @@ -1364,6 +1364,7 @@ void MingwModuleHandler::GenerateCommands ( const CompilationUnit& compilationUnit, + const string& extraDependencies, const string& cc, const string& cppc, const string& cflagsMacro, @@ -1376,7 +1377,7 @@ if ( extension == ".c" || extension == ".C" ) { GenerateGccCommand ( sourceFile, - GetCompilationUnitDependencies ( compilationUnit ), + GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cc, cflagsMacro ); return; @@ -1386,7 +1387,7 @@ extension == ".cxx" || extension == ".CXX" ) { GenerateGccCommand ( sourceFile, - GetCompilationUnitDependencies ( compilationUnit ), + GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cppc, cflagsMacro ); return; @@ -1414,7 +1415,7 @@ { GenerateWinebuildCommands ( sourceFile ); GenerateGccCommand ( GetActualSourceFilename ( sourceFile ), - "", + extraDependencies, cc, cflagsMacro ); return; @@ -1696,11 +1697,24 @@ const string& widlflagsMacro ) { size_t i; + string moduleDependencies; const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; for ( i = 0; i < compilationUnits.size (); i++ ) { + CompilationUnit& compilationUnit = *compilationUnits[i]; + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + if ( GetExtension ( *objectFilename ) == ".h" ) + { + moduleDependencies = ssprintf ( " $(%s_HEADERS)", module.name.c_str () ); + break; + } + } + + for ( i = 0; i < compilationUnits.size (); i++ ) + { GenerateCommands ( *compilationUnits[i], + moduleDependencies, cc, cppc, cflagsMacro, @@ -1728,6 +1742,7 @@ for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { GenerateCommands ( *sourceCompilationUnits[i], + moduleDependencies, cc, cppc, cflagsMacro, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Sep 24 16:53:33 2007 @@ -174,6 +174,7 @@ void GenerateWidlCommands ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateCommands ( const CompilationUnit& compilationUnit, + const std::string& extraDependencies, const std::string& cc, const std::string& cppc, const std::string& cflagsMacro,

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