Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51226: [TEE] - TEE should overwrite existing file - Patch by vins8920 hotmail See issue #6022 for more details.
by janderwald＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: janderwald Date: Sat Apr 2 15:15:08 2011 New Revision: 51226 URL: http://svn.reactos.org/svn/reactos?rev=51226&view=rev Log: [TEE] - TEE should overwrite existing file - Patch by vins8920 hotmail See issue #6022 for more details. Modified: trunk/rosapps/applications/cmdutils/tee/tee.c Modified: trunk/rosapps/applications/cmdutils/tee/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/tee/… ============================================================================== --- trunk/rosapps/applications/cmdutils/tee/tee.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/tee/tee.c [iso-8859-1] Sat Apr 2 15:15:08 2011 @@ -154,7 +154,7 @@ //l=0; hFile[i] = CreateFile(files[i],GENERIC_WRITE, 0,NULL, - OPEN_ALWAYS, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,NULL); if (hFile[i] == INVALID_HANDLE_VALUE)

1 0

[rharabien] 51225: [SYSTEMINFO] * Fix Domain field * Get rid of TCHAR * Translate System Up Time to polish
by rharabien＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: rharabien Date: Sat Apr 2 14:54:24 2011 New Revision: 51225 URL: http://svn.reactos.org/svn/reactos?rev=51225&view=rev Log: [SYSTEMINFO] * Fix Domain field * Get rid of TCHAR * Translate System Up Time to polish Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -39,7 +39,7 @@ IDS_REG_ORG, "Registrierte Organisation: %s\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" IDS_INST_DATE, "Installationsdatum: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Systemtyp: %s\n" @@ -58,7 +58,7 @@ IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %s MB\n" IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %s MB\n" IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e): %s" -IDS_DOMINE, "Domain: %s\n" +IDS_DOMAIN, "Domain: %s\n" IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -37,7 +37,7 @@ IDS_REG_ORG, "Registered Organization: %s\n" IDS_PRODUCT_ID, "Product ID: %s\n" IDS_INST_DATE, "Install Date: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "System type: %s\n" @@ -56,7 +56,7 @@ IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %s MB\n" IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %s MB\n" IDS_PAGEFILE_LOC, "Page File Location(s): %s\n" -IDS_DOMINE, "Domain: %s\n" +IDS_DOMAIN, "Domain: %s\n" IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -42,7 +42,7 @@ IDS_REG_ORG, "Organización: %s\n" IDS_PRODUCT_ID, "Identificador de Producto %s\n" IDS_INST_DATE, "Fecha de Instalación: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Tipo de sistema: %s\n" @@ -61,7 +61,7 @@ IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %s MB\n" IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %s MB\n" IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación: %s\n" -IDS_DOMINE, "Dominio: %s\n" +IDS_DOMAIN, "Dominio: %s\n" IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -37,7 +37,7 @@ IDS_REG_ORG, "Organisation enregistrée : %s\n" IDS_PRODUCT_ID, "ID du produit : %s\n" IDS_INST_DATE, "Date d'installation : %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Type du système : %s\n" @@ -56,7 +56,7 @@ IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %s Mo\n" IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %s Mo\n" IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange : %s" -IDS_DOMINE, "Domaine : %s\n" +IDS_DOMAIN, "Domaine : %s\n" IDS_NETWORK_CARDS, "Carte(s) réseau %u installée(s).\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -37,7 +37,7 @@ IDS_REG_ORG, "Registerert organisasjon: %s\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" IDS_INST_DATE, "Installert dato: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Systemtype: %s\n" @@ -56,7 +56,7 @@ IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %s MB\n" IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %s MB\n" IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er): %s\n" -IDS_DOMINE, "Domene: %s\n" +IDS_DOMAIN, "Domene: %s\n" IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -44,7 +44,7 @@ IDS_REG_ORG, "Organizacja: %s\n" IDS_PRODUCT_ID, "ID produktu: %s\n" IDS_INST_DATE, "Data instalacji: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "Czas pracy systemu: %u dni, %u godzin, %u minut, %u sekund\n" IDS_SYS_MANUFACTURER, "Producent systemu: %s\n" IDS_SYS_MODEL, "Model systemu: %s\n" IDS_SYS_TYPE, "Rodzaj systemu: %s\n" @@ -63,7 +63,7 @@ IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: dostêpne: %s MB\n" IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: w u¿yciu: %s MB\n" IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany: %s\n" -IDS_DOMINE, "Domena: %s\n" +IDS_DOMAIN, "Domena: %s\n" IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -41,7 +41,7 @@ IDS_REG_ORG, "Registrovan organiz cia: %s\n" IDS_PRODUCT_ID, "ID produktu: %s\n" IDS_INST_DATE, "D tum inçtal cie: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Typ systmu: %s\n" @@ -60,7 +60,7 @@ IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %s MB\n" IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %s MB\n" IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" -IDS_DOMINE, "Domna: %s\n" +IDS_DOMAIN, "Domna: %s\n" IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -45,7 +45,7 @@ IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" IDS_INST_DATE, "Äàòà óñòàíîâêè: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" IDS_SYS_TYPE, "Òèï ñèñòåìè: %s\n" @@ -64,7 +64,7 @@ IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %s ÌÁ\n" IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %s ÌÁ\n" IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ: %s\n" -IDS_DOMINE, "Äîìåí: %s\n" +IDS_DOMAIN, "Äîìåí: %s\n" IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -27,5 +27,5 @@ #define IDS_VIRT_MEM_INUSE 125 #define IDS_PAGEFILE_LOC 126 #define IDS_TIME_ZONE 127 -#define IDS_DOMINE 128 +#define IDS_DOMAIN 128 #define IDS_NETWORK_CARDS 130 Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -16,13 +16,15 @@ /* Copyright (C) 2007, Dmitry Chapyshev <lentind(a)yandex.ru> */ /* Copyright (C) 2011, Rafal Harabien <rafalh1992(a)o2.pl> */ +#include <wchar.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <windows.h> -#include <tchar.h> #include <time.h> +#include <locale.h> +#include <lm.h> #include "resource.h" @@ -31,124 +33,119 @@ /* Load from resource and convert to OEM */ static BOOL -GetOemStrings(UINT rcID, LPTSTR OutMsg) -{ - TCHAR Msg[BUFFER_SIZE]; - - if (LoadString(GetModuleHandle(NULL), rcID, (LPTSTR)Msg, BUFFER_SIZE)) - { - CharToOem(Msg, OutMsg); +GetOemStrings(UINT rcID, LPWSTR OutMsg) +{ + if (LoadStringW(GetModuleHandle(NULL), rcID, OutMsg, BUFFER_SIZE)) return TRUE; - } + return FALSE; } /* Load data from registry */ static BOOL -RegGetSZ(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPTSTR Buf) -{ - DWORD dwBytes = BUFFER_SIZE*sizeof(TCHAR), dwType; +RegGetSZ(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR Buf) +{ + DWORD dwBytes = BUFFER_SIZE*sizeof(WCHAR), dwType; BOOL bRet = TRUE; - + /* If SubKy is specified open it */ - if (lpSubKey && RegOpenKeyEx(hKey, + if (lpSubKey && RegOpenKeyExW(hKey, + lpSubKey, + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + //wprintf("Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); + return FALSE; + } + + if (RegQueryValueExW(hKey, + lpValueName, + NULL, + &dwType, + (LPBYTE)Buf, + &dwBytes) != ERROR_SUCCESS || (dwType != REG_SZ && dwType != REG_MULTI_SZ)) + { + //wprintf("Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); + dwBytes = 0; + bRet = FALSE; + } + + /* Close key if we opened it */ + if (lpSubKey) + RegCloseKey(hKey); + + /* NULL-terminate string */ + Buf[min(BUFFER_SIZE-1, dwBytes/sizeof(WCHAR))] = L'\0'; + + return bRet; +} + +static +BOOL +RegGetDWORD(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPDWORD lpData) +{ + DWORD dwBytes = sizeof(*lpData), dwType; + BOOL bRet = TRUE; + + /* If SubKy is specified open it */ + if (lpSubKey && RegOpenKeyExW(hKey, lpSubKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { - //_tprintf("Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); return FALSE; } - if (RegQueryValueEx(hKey, - lpValueName, - NULL, - &dwType, - (LPBYTE)Buf, - &dwBytes) != ERROR_SUCCESS || (dwType != REG_SZ && dwType != REG_MULTI_SZ)) - { - //_tprintf("Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); - dwBytes = 0; + if (RegQueryValueExW(hKey, + lpValueName, + NULL, + &dwType, + (LPBYTE)lpData, + &dwBytes) != ERROR_SUCCESS || dwType != REG_DWORD) + { + //wprintf("Warning! Cannot query %s. Last err: %lu, type: %lu\n", lpValueName, GetLastError(), dwType); + *lpData = 0; bRet = FALSE; } - + /* Close key if we opened it */ if (lpSubKey) RegCloseKey(hKey); - - /* NULL-terminate string */ - Buf[min(BUFFER_SIZE-1, dwBytes/sizeof(TCHAR))] = TEXT('\0'); - - return bRet; -} - -static -BOOL -RegGetDWORD(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPDWORD lpData) -{ - DWORD dwBytes = sizeof(*lpData), dwType; - BOOL bRet = TRUE; - - /* If SubKy is specified open it */ - if (lpSubKey && RegOpenKeyEx(hKey, - lpSubKey, - 0, - KEY_QUERY_VALUE, - &hKey) != ERROR_SUCCESS) - { - return FALSE; - } - - if (RegQueryValueEx(hKey, - lpValueName, - NULL, - &dwType, - (LPBYTE)lpData, - &dwBytes) != ERROR_SUCCESS || dwType != REG_DWORD) - { - //_tprintf("Warning! Cannot query %s. Last err: %lu, type: %lu\n", lpValueName, GetLastError(), dwType); - *lpData = 0; - bRet = FALSE; - } - - /* Close key if we opened it */ - if (lpSubKey) - RegCloseKey(hKey); - + return bRet; } static void -FormatBytes(LPTSTR Buf, unsigned cBytes) -{ - TCHAR szMB[32], Tmp[BUFFER_SIZE]; - NUMBERFMT fmt; - - itoa(cBytes / (1024*1024), szMB, 10); - +FormatBytes(LPWSTR Buf, unsigned cBytes) +{ + WCHAR szMB[32]; + NUMBERFMTW fmt; + + _itow(cBytes / (1024*1024), szMB, 10); + fmt.NumDigits = 0; fmt.LeadingZero = 0; fmt.Grouping = 3; - fmt.lpDecimalSep = TEXT(""); - fmt.lpThousandSep = TEXT(" "); + fmt.lpDecimalSep = L""; + fmt.lpThousandSep = L" "; fmt.NegativeOrder = 0; - if(!GetNumberFormat(LOCALE_SYSTEM_DEFAULT, 0, szMB, &fmt, Tmp, BUFFER_SIZE)) - printf("Error! GetNumberFormat failed.\n"); - - CharToOem(Tmp, Buf); + + if(!GetNumberFormatW(LOCALE_SYSTEM_DEFAULT, 0, szMB, &fmt, Buf, BUFFER_SIZE)) + wprintf(L"Error! GetNumberFormat failed.\n"); } static void -FormatDateTime(time_t Time, LPTSTR lpBuf) +FormatDateTime(time_t Time, LPWSTR lpBuf) { unsigned cchBuf = BUFFER_SIZE, i; SYSTEMTIME SysTime; const struct tm *lpTm; - + lpTm = localtime(&Time); SysTime.wYear = (WORD)(1900 + lpTm->tm_year); SysTime.wMonth = (WORD)(1 + lpTm->tm_mon); @@ -158,12 +155,15 @@ SysTime.wMinute = (WORD)lpTm->tm_min; SysTime.wSecond = (WORD)lpTm->tm_sec; SysTime.wMilliseconds = 0; - - i = GetDateFormat(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf, cchBuf); + + /* Time first */ + i = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf, cchBuf); if (i) --i; /* don't count NULL character */ - i += _stprintf(lpBuf + i, TEXT(", ")); - GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, cchBuf - i); + + /* Time now */ + i += swprintf(lpBuf + i, L", "); + GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, cchBuf - i); } /* Show usage */ @@ -171,10 +171,10 @@ VOID Usage(VOID) { - TCHAR Buf[BUFFER_SIZE]; - + WCHAR Buf[BUFFER_SIZE]; + if(GetOemStrings(IDS_USAGE, Buf)) - _tprintf("%s", Buf); + wprintf(L"%s", Buf); } /* Print all system information */ @@ -182,18 +182,20 @@ AllSysInfo(VOID) { DWORD dwCharCount = BUFFER_SIZE, dwTimestamp; - OSVERSIONINFO VersionInfo; + OSVERSIONINFOW VersionInfo; SYSTEM_INFO SysInfo; - TCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; - const TCHAR *lpcszSysType; + WCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; + const WCHAR *lpcszSysType; + LPWSTR lpNetBuffer; + NETSETUP_JOIN_STATUS NetJoinStatus; MEMORYSTATUS MemoryStatus; unsigned int cSeconds; TIME_ZONE_INFORMATION TimeZoneInfo; HKEY hKey; - if (!GetSystemDirectory(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) - { - _tprintf("Error! GetSystemDirectory failed.\n"); + if (!GetSystemDirectoryW(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) + { + wprintf(L"Error! GetSystemDirectory failed.\n"); return; } @@ -201,34 +203,34 @@ // getting computer name dwCharCount = BUFFER_SIZE; - if (!GetComputerName(Buf, &dwCharCount)) - _tprintf("Error! GetComputerName failed.\n"); + if (!GetComputerNameW(Buf, &dwCharCount)) + wprintf(L"Error! GetComputerName failed.\n"); else if (GetOemStrings(IDS_HOST_NAME, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); // open CurrentVersion key - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { - _tprintf("Error! RegOpenKeyEx failed.\n"); + wprintf(L"Error! RegOpenKeyEx failed.\n"); return; } //getting OS Name - RegGetSZ(hKey, NULL, TEXT("ProductName"), Buf); + RegGetSZ(hKey, NULL, L"ProductName", Buf); if (GetOemStrings(IDS_OS_NAME, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting OS Version ZeroMemory(&VersionInfo, sizeof(VersionInfo)); VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); - GetVersionEx(&VersionInfo); + GetVersionExW(&VersionInfo); if (GetOemStrings(IDS_OS_VERSION, Msg)) - _tprintf(Msg, + wprintf(Msg, (unsigned)VersionInfo.dwMajorVersion, (unsigned)VersionInfo.dwMinorVersion, (unsigned)VersionInfo.dwBuildNumber, @@ -240,30 +242,30 @@ //getting OS Configuration //getting OS Build Type - RegGetSZ(hKey, NULL, TEXT("CurrentType"), Buf); + RegGetSZ(hKey, NULL, L"CurrentType", Buf); if (GetOemStrings(IDS_OS_BUILD_TYPE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Registered Owner - RegGetSZ(hKey, NULL, TEXT("RegisteredOwner"), Buf); + RegGetSZ(hKey, NULL, L"RegisteredOwner", Buf); if (GetOemStrings(IDS_REG_OWNER, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Registered Organization - RegGetSZ(hKey, NULL, TEXT("RegisteredOrganization"), Buf); + RegGetSZ(hKey, NULL, L"RegisteredOrganization", Buf); if (GetOemStrings(IDS_REG_ORG, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Product ID - RegGetSZ(hKey, NULL, TEXT("ProductId"), Buf); + RegGetSZ(hKey, NULL, L"ProductId", Buf); if (GetOemStrings(IDS_PRODUCT_ID, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Install Date - RegGetDWORD(hKey, NULL, TEXT("InstallDate"), &dwTimestamp); + RegGetDWORD(hKey, NULL, L"InstallDate", &dwTimestamp); FormatDateTime((time_t)dwTimestamp, Buf); if (GetOemStrings(IDS_INST_DATE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); // close Current Version key now RegCloseKey(hKey); @@ -271,115 +273,115 @@ //getting System Up Time cSeconds = GetTickCount() / 1000; if (GetOemStrings(IDS_UP_TIME, Msg)) - _tprintf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); + wprintf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); //getting System Manufacturer; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Manufacturer for Win >= 6.0 - sprintf(Tmp, "%s\\oeminfo.ini", szSystemDir); - GetPrivateProfileString(TEXT("General"), - TEXT("Manufacturer"), - TEXT("To Be Filled By O.E.M."), - Buf, - sizeof(Buf)/sizeof(Buf[0]), - Tmp); + swprintf(Tmp, L"%s\\oeminfo.ini", szSystemDir); + GetPrivateProfileStringW(L"General", + L"Manufacturer", + L"To Be Filled By O.E.M.", + Buf, + sizeof(Buf)/sizeof(Buf[0]), + Tmp); if (GetOemStrings(IDS_SYS_MANUFACTURER, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting System Model; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Model for Win >= 6.0 - GetPrivateProfileString(TEXT("General"), - TEXT("Model"), - TEXT("To Be Filled By O.E.M."), - Buf, - sizeof(Buf)/sizeof(Buf[0]), - Tmp); + GetPrivateProfileStringW(L"General", + L"Model", + L"To Be Filled By O.E.M.", + Buf, + sizeof(Buf)/sizeof(Buf[0]), + Tmp); if (GetOemStrings(IDS_SYS_MODEL, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting System type switch (SysInfo.wProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_INTEL: - lpcszSysType = TEXT("X86-based PC"); + lpcszSysType = L"X86-based PC"; break; case PROCESSOR_ARCHITECTURE_IA64: - lpcszSysType = TEXT("IA64-based PC"); + lpcszSysType = L"IA64-based PC"; break; case PROCESSOR_ARCHITECTURE_AMD64: - lpcszSysType = TEXT("AMD64-based PC"); + lpcszSysType = L"AMD64-based PC"; break; default: - lpcszSysType = TEXT("Unknown"); + lpcszSysType = L"Unknown"; break; } if (GetOemStrings(IDS_SYS_TYPE, Msg)) - _tprintf(Msg, lpcszSysType); + wprintf(Msg, lpcszSysType); //getting Processor(s) if (GetOemStrings(IDS_PROCESSORS, Msg)) { unsigned int i; - _tprintf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); + wprintf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) { - sprintf(Tmp, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i); - - RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, TEXT("Identifier"), Buf); - _tprintf(" [%02u]: %s", i+1, Buf); - - RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, TEXT("VendorIdentifier"), Buf); - _tprintf(" %s\n", Buf); + swprintf(Tmp, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u", i); + + RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"Identifier", Buf); + wprintf(L" [%02u]: %s", i+1, Buf); + + RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"VendorIdentifier", Buf); + wprintf(L" %s\n", Buf); } } //getting BIOS Version RegGetSZ(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosVersion"), + L"HARDWARE\\DESCRIPTION\\System", + L"SystemBiosVersion", Buf); if (GetOemStrings(IDS_BIOS_VERSION, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //gettings BIOS date RegGetSZ(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosDate"), + L"HARDWARE\\DESCRIPTION\\System", + L"SystemBiosDate", Buf); if (GetOemStrings(IDS_BIOS_DATE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting ReactOS Directory - if (!GetWindowsDirectory(Buf, BUFFER_SIZE)) - _tprintf("Error! GetWindowsDirectory failed."); + if (!GetWindowsDirectoryW(Buf, BUFFER_SIZE)) + wprintf(L"Error! GetWindowsDirectory failed."); else if (GetOemStrings(IDS_ROS_DIR, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting System Directory if (GetOemStrings(IDS_SYS_DIR, Msg)) - _tprintf(Msg, szSystemDir); + wprintf(Msg, szSystemDir); //getting Boot Device RegGetSZ(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\Setup"), - TEXT("SystemPartition"), + L"SYSTEM\\Setup", + L"SystemPartition", Buf); if (GetOemStrings(IDS_BOOT_DEV, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting System Locale if (RegGetSZ(HKEY_CURRENT_USER, - TEXT("Control Panel\\International"), - TEXT("Locale"), + L"Control Panel\\International", + L"Locale", Tmp)) if (RegGetSZ(HKEY_CLASSES_ROOT, - TEXT("MIME\\Database\\Rfc1766"), + L"MIME\\Database\\Rfc1766", Tmp, Buf)) if (GetOemStrings(IDS_SYS_LOCALE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Input Locale if (RegGetSZ(HKEY_CURRENT_USER, - TEXT("Keyboard Layout\\Preload"), - TEXT("1"), + L"Keyboard Layout\\Preload", + L"1", Buf)) { int i, j; @@ -388,84 +390,74 @@ Tmp[j] = Buf[i]; if (RegGetSZ(HKEY_CLASSES_ROOT, - TEXT("MIME\\Database\\Rfc1766"), + L"MIME\\Database\\Rfc1766", Tmp, Buf)) if (GetOemStrings(IDS_INPUT_LOCALE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); } //getting Time Zone GetTimeZoneInformation(&TimeZoneInfo); - + /* Open Time Zones key */ - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"), - 0, - KEY_ENUMERATE_SUB_KEYS|KEY_READ, - &hKey) == ERROR_SUCCESS) + if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", + 0, + KEY_ENUMERATE_SUB_KEYS|KEY_READ, + &hKey) == ERROR_SUCCESS) { unsigned i; - + /* Find current timezone */ dwCharCount = 256; // Windows seems to have a bug - it doesnt accept BUFFER_SIZE here - for(i = 0; RegEnumKeyEx(hKey, i, Tmp, &dwCharCount, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++i, dwCharCount = 255) + for(i = 0; RegEnumKeyExW(hKey, i, Tmp, &dwCharCount, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++i, dwCharCount = 255) { -#ifdef _UNICODE - RegGetSZ(hKey, Tmp, TEXT("Std"), Buf); - - if(!wcscmp(wBuf, TimeZoneInfo.StandardName)) -#else - wchar_t wBuf[BUFFER_SIZE]; - - RegGetSZ(hKey, Tmp, TEXT("Std"), Buf); - mbstowcs(wBuf, Buf, BUFFER_SIZE); - - if(!wcscmp(wBuf, TimeZoneInfo.StandardName)) -#endif + RegGetSZ(hKey, Tmp, L"Std", Buf); + + if(!wcscmp(Buf, TimeZoneInfo.StandardName)) { - RegGetSZ(hKey, Tmp, TEXT("Display"), Buf); + RegGetSZ(hKey, Tmp, L"Display", Buf); if (GetOemStrings(IDS_TIME_ZONE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); break; } } RegCloseKey(hKey); } - - + //getting Total Physical Memory GlobalMemoryStatus(&MemoryStatus); FormatBytes(Buf, MemoryStatus.dwTotalPhys); if (GetOemStrings(IDS_TOTAL_PHYS_MEM, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Available Physical Memory FormatBytes(Buf, MemoryStatus.dwAvailPhys); if (GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Virtual Memory: Max Size FormatBytes(Buf, MemoryStatus.dwTotalVirtual); if (GetOemStrings(IDS_VIRT_MEM_MAX, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Virtual Memory: Available FormatBytes(Buf, MemoryStatus.dwAvailVirtual); if (GetOemStrings(IDS_VIRT_MEM_AVAIL, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Virtual Memory: In Use FormatBytes(Buf, MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual); if (GetOemStrings(IDS_VIRT_MEM_INUSE, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); //getting Page File Location(s) if (RegGetSZ(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"), - TEXT("PagingFiles"), + L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management", + L"PagingFiles", Buf)) { int i; @@ -478,18 +470,19 @@ break; } } - + if(GetOemStrings(IDS_PAGEFILE_LOC, Msg)) - _tprintf(Msg, Buf); + wprintf(Msg, Buf); } //getting Domain - if (RegGetSZ(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), - TEXT("CachePrimaryDomain"), - Buf)) - if(GetOemStrings(IDS_DOMINE, Msg)) - _tprintf(Msg, Buf); + if (NetGetJoinInformation (NULL, &lpNetBuffer, &NetJoinStatus) == NERR_Success) + { + if(GetOemStrings(IDS_DOMAIN, Msg)) + wprintf(Msg, lpNetBuffer); + + NetApiBufferFree(lpNetBuffer); + } //getting Logon Server @@ -504,6 +497,8 @@ int main(int argc, char *argv[]) { + setlocale(LC_ALL, ""); + if (argc > 1 && (!strcmp(argv[1], "/?") || !strcmp(argv[1], "-?"))) { Usage(); Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] Sat Apr 2 14:54:24 2011 @@ -2,6 +2,7 @@ <library>user32</library> <library>ntdll</library> <library>advapi32</library> + <library>netapi32</library> <file>systeminfo.c</file> <file>systeminfo.rc</file> <file>rsrc.rc</file>

1 0

[gadamopoulos] 51224: [win32k] - Simplify co_IntWaitMessage - In co_IntGetPeekMessage, call co_MsqWaitForNewMessages instead of co_IntWaitMessage when we need to wait for a new message. co_IntWaitM...
by gadamopoulos＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gadamopoulos Date: Sat Apr 2 10:12:44 2011 New Revision: 51224 URL: http://svn.reactos.org/svn/reactos?rev=51224&view=rev Log: [win32k] - Simplify co_IntWaitMessage - In co_IntGetPeekMessage, call co_MsqWaitForNewMessages instead of co_IntWaitMessage when we need to wait for a new message. co_IntWaitMessage calls co_IntPeekMessage again without removing messages. The problem is that processing some messages produce other messages or hooks even though the message must not be removed. As a result some messages like WM_NCHITTEST were received twice by the application - Should fix bug 3232 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Apr 2 10:12:44 2011 @@ -850,15 +850,15 @@ Window, MsgFilterMin, MsgFilterMax); - } - while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || - STATUS_TIMEOUT == Status ); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DPRINT1("Exit co_IntWaitMessage on error!\n"); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DPRINT1("Exit co_IntWaitMessage on error!\n"); + + return FALSE; + } + } + while ( TRUE ); return FALSE; } @@ -874,6 +874,7 @@ PWND Window; PTHREADINFO pti; BOOL Present = FALSE; + NTSTATUS Status; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) hWnd = HWND_BOTTOM; @@ -941,7 +942,11 @@ if ( bGMSG ) { - if ( !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) + Status = co_MsqWaitForNewMessages( pti->MessageQueue, + Window, + MsgFilterMin, + MsgFilterMax); + if ( !NT_SUCCESS(Status) ) { Present = -1; break;

1 0

[fireball] 51223: [NTDLL] - Fix a typo which led to incorrect logic of TLS allocation. This repairs those installers broken by r51051. See issue #6009 for more details.
by fireball＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: fireball Date: Sat Apr 2 09:20:16 2011 New Revision: 51223 URL: http://svn.reactos.org/svn/reactos?rev=51223&view=rev Log: [NTDLL] - Fix a typo which led to incorrect logic of TLS allocation. This repairs those installers broken by r51051. See issue #6009 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Apr 2 09:20:16 2011 @@ -786,8 +786,8 @@ PVOID *TlsVector; /* Check if we have any entries */ - if (LdrpNumberOfTlsEntries) - return 0; + if (!LdrpNumberOfTlsEntries) + return STATUS_SUCCESS; /* Allocate the vector array */ TlsVector = RtlAllocateHeap(RtlGetProcessHeap(),

1 0

[rharabien] 51222: [ADVAPI32] * Fix bug in RegQueryValueExA, which causes buffer overflow * Fixes systeminfo in ReactOS See issue #6050 for more details.
by rharabien＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: rharabien Date: Fri Apr 1 22:10:52 2011 New Revision: 51222 URL: http://svn.reactos.org/svn/reactos?rev=51222&view=rev Log: [ADVAPI32] * Fix bug in RegQueryValueExA, which causes buffer overflow * Fixes systeminfo in ReactOS See issue #6050 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri Apr 1 22:10:52 2011 @@ -3988,7 +3988,7 @@ LPDWORD lpcbData) { UNICODE_STRING ValueName; - UNICODE_STRING ValueData; + LPWSTR lpValueBuffer; LONG ErrorCode; DWORD Length; DWORD Type; @@ -4003,39 +4003,42 @@ return ERROR_INVALID_PARAMETER; } + Length = (lpcbData == NULL || lpData == NULL) ? 0 : *lpcbData * sizeof(WCHAR); + if (lpData) { - ValueData.Length = 0; - ValueData.MaximumLength = (*lpcbData + 1) * sizeof(WCHAR); - ValueData.Buffer = RtlAllocateHeap(ProcessHeap, - 0, - ValueData.MaximumLength); - if (!ValueData.Buffer) + lpValueBuffer = RtlAllocateHeap(ProcessHeap, + 0, + Length + sizeof(WCHAR)); + if (!lpValueBuffer) { return ERROR_OUTOFMEMORY; } } else { - ValueData.Buffer = NULL; - ValueData.Length = 0; - ValueData.MaximumLength = 0; + lpValueBuffer = NULL; if (lpcbData) *lpcbData = 0; } - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (LPSTR)lpValueName); - - Length = (lpcbData == NULL) ? 0 : *lpcbData * sizeof(WCHAR); + if(!RtlCreateUnicodeStringFromAsciiz(&ValueName, + (LPSTR)lpValueName)) + { + ERR("RtlCreateUnicodeStringFromAsciiz failed!\n"); + ErrorCode = ERROR_OUTOFMEMORY; + goto cleanup; + } + ErrorCode = RegQueryValueExW(hKey, ValueName.Buffer, lpReserved, &Type, - (lpData == NULL) ? NULL : (LPBYTE)ValueData.Buffer, + (LPBYTE)lpValueBuffer, &Length); TRACE("ErrorCode %lu\n", ErrorCode); + RtlFreeUnicodeString(&ValueName); if (ErrorCode == ERROR_SUCCESS || @@ -4044,9 +4047,9 @@ if (is_string(Type)) { - if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) + if (ErrorCode == ERROR_SUCCESS && lpValueBuffer != NULL) { - Status = RtlUnicodeToMultiByteN((PCHAR)lpData, *lpcbData, &Index, (PWCHAR)ValueData.Buffer, Length); + Status = RtlUnicodeToMultiByteN((PCHAR)lpData, *lpcbData, &Index, (PWCHAR)lpValueBuffer, Length); if (NT_SUCCESS(Status)) { PCHAR szData = (PCHAR)lpData; @@ -4063,7 +4066,7 @@ Length = Length / sizeof(WCHAR); } - else if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) + else if (ErrorCode == ERROR_SUCCESS && lpValueBuffer != NULL) { if (*lpcbData < Length) { @@ -4071,7 +4074,7 @@ } else { - RtlMoveMemory(lpData, ValueData.Buffer, Length); + RtlMoveMemory(lpData, lpValueBuffer, Length); } } @@ -4086,9 +4089,10 @@ *lpType = Type; } - if (ValueData.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer); +cleanup: + if (lpValueBuffer != NULL) + { + RtlFreeHeap(ProcessHeap, 0, lpValueBuffer); } return ErrorCode;

1 0

[rharabien] 51221: [SYSTEMINFO] Don't translate System Type Don't mix TCHARs and chars Fix Time Zone for not English systems Use proper registry key for Install Date Format dates using system setti...
by rharabien＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: rharabien Date: Fri Apr 1 18:58:12 2011 New Revision: 51221 URL: http://svn.reactos.org/svn/reactos?rev=51221&view=rev Log: [SYSTEMINFO] Don't translate System Type Don't mix TCHARs and chars Fix Time Zone for not English systems Use proper registry key for Install Date Format dates using system settings Format numbers Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -38,15 +38,11 @@ IDS_REG_OWNER, "Registrierter Benutzer: %s\n" IDS_REG_ORG, "Registrierte Organisation: %s\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installationsdatum: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Installationsdatum: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Systemtyp: Unbekannt\n" -IDS_SYS_TYPE_X86, "Systemtyp: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Systemtyp: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Systemtyp: AMD64-based PC\n" +IDS_SYS_TYPE, "Systemtyp: %s\n" IDS_PROCESSORS, "Prozessor(en): %u Prozessor(en) Installiert.\n" IDS_BIOS_DATE, "BIOS Datum: %s\n" IDS_BIOS_VERSION, "BIOS Version: %s\n" @@ -55,13 +51,13 @@ IDS_BOOT_DEV, "Startgerät: %s\n" IDS_SYS_LOCALE, "Systemgebietsschema: %s\n" IDS_INPUT_LOCALE, "Eingabegebietsschema: %s\n" -IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %ld MB (%ld KB)\n" -IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" -IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher: %s MB\n" +IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %s MB\n" +IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %s MB\n" +IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e): %s" IDS_DOMINE, "Domain: %s\n" IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -36,15 +36,11 @@ 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_INST_DATE, "Install Date: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %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_SYS_TYPE, "System type: %s\n" IDS_PROCESSORS, "Processor(s): %u Processor(s) Installed.\n" IDS_BIOS_DATE, "BIOS Date: %s\n" IDS_BIOS_VERSION, "BIOS Version: %s\n" @@ -53,13 +49,13 @@ 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_PAGEFILE_LOC, "Page File Location(s) %s\n" -IDS_TIME_ZONE, "Time zone: %s\n" +IDS_TIME_ZONE, "Time zone: %s\n" +IDS_TOTAL_PHYS_MEM, "Total Physical Memory: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory: %s MB\n" +IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %s MB\n" +IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %s MB\n" +IDS_PAGEFILE_LOC, "Page File Location(s): %s\n" IDS_DOMINE, "Domain: %s\n" IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -41,15 +41,11 @@ IDS_REG_OWNER, "Propietario: %s\n" IDS_REG_ORG, "Organización: %s\n" IDS_PRODUCT_ID, "Identificador de Producto %s\n" -IDS_INST_DATE, "Fecha de Instalación: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Fecha de Instalación: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Tipo de sistema: Desconocido\n" -IDS_SYS_TYPE_X86, "Tipo de sistema: PC basado en X86\n" -IDS_SYS_TYPE_IA64, "Tipo de sistema: PC basado en IA64\n" -IDS_SYS_TYPE_AMD64, "Tipo de sistema: PC basado en AMD64\n" +IDS_SYS_TYPE, "Tipo de sistema: %s\n" IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" IDS_BIOS_DATE, "Fecha BIOS: %s\n" IDS_BIOS_VERSION, "Versión BIOS: %s\n" @@ -58,13 +54,13 @@ IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" IDS_SYS_LOCALE, "Idioma del sistema: %s\n" IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" -IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %ld MB (%ld KB)\n" -IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación %s\n" IDS_TIME_ZONE, "Zona horario: %s\n" +IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %s MB\n" +IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %s MB\n" +IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %s MB\n" +IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación: %s\n" IDS_DOMINE, "Dominio: %s\n" IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -36,15 +36,11 @@ IDS_REG_OWNER, "Propriétaire enregistré : %s\n" IDS_REG_ORG, "Organisation enregistrée : %s\n" IDS_PRODUCT_ID, "ID du produit : %s\n" -IDS_INST_DATE, "Date d'installation : %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Date d'installation : %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Type du système : Inconnu\n" -IDS_SYS_TYPE_X86, "Type du système : Basé sur un PC X86\n" -IDS_SYS_TYPE_IA64, "Type du système : Basé sur un PC IA64\n" -IDS_SYS_TYPE_AMD64, "Type du système : Basé sur un PC AMD64\n" +IDS_SYS_TYPE, "Type du système : %s\n" IDS_PROCESSORS, "Processeur(s) : %u Processeur(s) installé(s).\n" IDS_BIOS_DATE, "Date du BIOS : %s\n" IDS_BIOS_VERSION, "Version du BIOS : %s\n" @@ -53,13 +49,13 @@ IDS_BOOT_DEV, "Périphérique de démarrage : %s\n" IDS_SYS_LOCALE, "Paramètre régional du système : %s\n" IDS_INPUT_LOCALE, "Paramètre régional de saisie : %s\n" -IDS_TOTAL_PHYS_MEM, "Mémoire physique totale : %ld Mo (%ld Ko)\n" -IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %ld Mo (%ld Ko)\n" -IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" IDS_TIME_ZONE, "Fuseau horaire : %s\n" +IDS_TOTAL_PHYS_MEM, "Mémoire physique totale : %s Mo\n" +IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible : %s Mo\n" +IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max : %s Mo\n" +IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %s Mo\n" +IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %s Mo\n" +IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange : %s" IDS_DOMINE, "Domaine : %s\n" IDS_NETWORK_CARDS, "Carte(s) réseau %u installée(s).\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -36,15 +36,11 @@ IDS_REG_OWNER, "Registert eier: %s\n" IDS_REG_ORG, "Registerert organisasjon: %s\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installert dato: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Installert dato: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Systemtype: Ukjent\n" -IDS_SYS_TYPE_X86, "Systemtype: X86-basert PC\n" -IDS_SYS_TYPE_IA64, "Systemtype: IA64-basert PC\n" -IDS_SYS_TYPE_AMD64, "Systemtype: AMD64-basert PC\n" +IDS_SYS_TYPE, "Systemtype: %s\n" IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" IDS_BIOS_DATE, "BIOS dato: %s\n" IDS_BIOS_VERSION, "BIOS Versjon: %s\n" @@ -53,13 +49,13 @@ IDS_BOOT_DEV, "Oppstartsenhet: %s\n" IDS_SYS_LOCALE, "System lokal: %s\n" IDS_INPUT_LOCALE, "Input lokal: %s\n" -IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %ld MB (%ld KB)\n" -IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er) %s\n" -IDS_TIME_ZONE, "Tidssone: %s\n" +IDS_TIME_ZONE, "Tidssone: %s\n" +IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %s MB\n" +IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %s MB\n" +IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %s MB\n" +IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er): %s\n" IDS_DOMINE, "Domene: %s\n" IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -43,15 +43,11 @@ IDS_REG_OWNER, "U¿ytkownik: %s\n" IDS_REG_ORG, "Organizacja: %s\n" IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "Data instalacji: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Data instalacji: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "Producent systemu: %s\n" IDS_SYS_MODEL, "Model systemu: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Rodzaj systemu: Unknown\n" -IDS_SYS_TYPE_X86, "Architektura: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Architektura: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Rodzaj systemu: AMD64-based PC\n" +IDS_SYS_TYPE, "Rodzaj systemu: %s\n" IDS_PROCESSORS, "Iloæ Procesorów: %u.\n" IDS_BIOS_DATE, "Data BIOSu: %s\n" IDS_BIOS_VERSION, "Wersja BIOSu: %s\n" @@ -60,13 +56,13 @@ IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" IDS_SYS_LOCALE, "Wersja lokalizacji: %s\n" IDS_INPUT_LOCALE, "Lokalizacja klawiatury: %s\n" -IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: Maksymalnie: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: Dostêpne: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: W u¿yciu: %ld MB (%ld KB)\n" -IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany %s\n" -IDS_TIME_ZONE, "Strefa czasowa: %s\n" +IDS_TIME_ZONE, "Strefa czasowa: %s\n" +IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %s MB\n" +IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: maksymalnie: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: dostêpne: %s MB\n" +IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: w u¿yciu: %s MB\n" +IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany: %s\n" IDS_DOMINE, "Domena: %s\n" IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -40,15 +40,11 @@ IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" IDS_REG_ORG, "Registrovan organiz cia: %s\n" IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "D tum inçtal cie: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "D tum inçtal cie: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Typ systmu: Nezn my\n" -IDS_SYS_TYPE_X86, "Typ systmu: PC zalo§en na X86\n" -IDS_SYS_TYPE_IA64, "Typ systmu: PC zalo§en na IA64\n" -IDS_SYS_TYPE_AMD64, "Typ systmu: PC zalo§en na AMD64\n" +IDS_SYS_TYPE, "Typ systmu: %s\n" IDS_PROCESSORS, "Procesor(y): %u Procesor(y) nainçtalovanì.\n" IDS_BIOS_DATE, "D tum BIOSu: %s\n" IDS_BIOS_VERSION, "Verzia BIOSu: %s\n" @@ -57,13 +53,13 @@ IDS_BOOT_DEV, "Zav dzacie zariadenie: %s\n" IDS_SYS_LOCALE, "System Locale: %s\n" IDS_INPUT_LOCALE, "Input Locale: %s\n" -IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %ld MB (%ld KB)\n" +IDS_TIME_ZONE, "¬asov p smo: %s\n" +IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %s MB\n" +IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %s MB\n" +IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %s MB\n" +IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %s MB\n" +IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %s MB\n" IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" -IDS_TIME_ZONE, "¬asov p smo: %s\n" IDS_DOMINE, "Domna: %s\n" IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -44,15 +44,11 @@ IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" -IDS_INST_DATE, "Äàòà óñòàíîâêè: %s, " -IDS_INST_TIME, "%s\n" +IDS_INST_DATE, "Äàòà óñòàíîâêè: %s\n" IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE_UNKNOWN, "Òèï ñèñòåìè: Íåâ³äîìà\n" -IDS_SYS_TYPE_X86, "Òèï ñèñòåìè: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Òèï ñèñòåìè: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Òèï ñèñòåìè: AMD64-based PC\n" +IDS_SYS_TYPE, "Òèï ñèñòåìè: %s\n" IDS_PROCESSORS, "Ïðîöåñîð(è): %u ïðîöåñîð(à,³â) âñòàíîâëåíî.\n" IDS_BIOS_DATE, "Äàòà BIOS: %s\n" IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS: %s\n" @@ -61,13 +57,13 @@ IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ: %s\n" IDS_SYS_LOCALE, "Ìîâà ñèñòåìè: %s\n" IDS_INPUT_LOCALE, "Ìîâà ââîäó: %s\n" -IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" -IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %ld ÌÁ (%ld ÊÁ)\n" -IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ %s\n" -IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" +IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" +IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %s ÌÁ\n" +IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %s ÌÁ\n" +IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %s ÌÁ\n" +IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %s ÌÁ\n" +IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %s ÌÁ\n" +IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ: %s\n" IDS_DOMINE, "Äîìåí: %s\n" IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -8,11 +8,10 @@ #define IDS_REG_ORG 105 #define IDS_PRODUCT_ID 106 #define IDS_INST_DATE 107 -#define IDS_INST_TIME 108 #define IDS_UP_TIME 109 #define IDS_SYS_MANUFACTURER 110 #define IDS_SYS_MODEL 111 -#define IDS_SYS_TYPE_UNKNOWN 112 +#define IDS_SYS_TYPE 112 #define IDS_PROCESSORS 113 #define IDS_BIOS_DATE 114 #define IDS_BIOS_VERSION 115 @@ -30,6 +29,3 @@ #define IDS_TIME_ZONE 127 #define IDS_DOMINE 128 #define IDS_NETWORK_CARDS 130 -#define IDS_SYS_TYPE_X86 140 -#define IDS_SYS_TYPE_IA64 141 -#define IDS_SYS_TYPE_AMD64 142 Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Fri Apr 1 18:58:12 2011 @@ -14,27 +14,27 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Copyright (C) 2007, Dmitry Chapyshev <lentind(a)yandex.ru> */ +/* Copyright (C) 2011, Rafal Harabien <rafalh1992(a)o2.pl> */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <windows.h> -#include <io.h> #include <tchar.h> +#include <time.h> #include "resource.h" #define BUFFER_SIZE 32767 -#define B_TO_MB(bytes) ((bytes)/(1024*1024)) -#define B_TO_KB(bytes) ((bytes)/1024) /* Load from resource and convert to OEM */ static BOOL -GetOemStrings(UINT rcID, LPSTR OutMsg) +GetOemStrings(UINT rcID, LPTSTR OutMsg) { TCHAR Msg[BUFFER_SIZE]; + if (LoadString(GetModuleHandle(NULL), rcID, (LPTSTR)Msg, BUFFER_SIZE)) { CharToOem(Msg, OutMsg); @@ -46,27 +46,124 @@ /* Load data from registry */ static BOOL -GetRegistryValue(HKEY hKeyName, LPCTSTR SubKey, LPCTSTR ValueName, LPCTSTR Buf) -{ - DWORD CharCount = BUFFER_SIZE; - HKEY hKey; - LONG lRet; - - 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; - RegCloseKey(hKey); - return TRUE; +RegGetSZ(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPTSTR Buf) +{ + DWORD dwBytes = BUFFER_SIZE*sizeof(TCHAR), dwType; + BOOL bRet = TRUE; + + /* If SubKy is specified open it */ + if (lpSubKey && RegOpenKeyEx(hKey, + lpSubKey, + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + //_tprintf("Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); + return FALSE; + } + + if (RegQueryValueEx(hKey, + lpValueName, + NULL, + &dwType, + (LPBYTE)Buf, + &dwBytes) != ERROR_SUCCESS || (dwType != REG_SZ && dwType != REG_MULTI_SZ)) + { + //_tprintf("Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); + dwBytes = 0; + bRet = FALSE; + } + + /* Close key if we opened it */ + if (lpSubKey) + RegCloseKey(hKey); + + /* NULL-terminate string */ + Buf[min(BUFFER_SIZE-1, dwBytes/sizeof(TCHAR))] = TEXT('\0'); + + return bRet; +} + +static +BOOL +RegGetDWORD(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPDWORD lpData) +{ + DWORD dwBytes = sizeof(*lpData), dwType; + BOOL bRet = TRUE; + + /* If SubKy is specified open it */ + if (lpSubKey && RegOpenKeyEx(hKey, + lpSubKey, + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + if (RegQueryValueEx(hKey, + lpValueName, + NULL, + &dwType, + (LPBYTE)lpData, + &dwBytes) != ERROR_SUCCESS || dwType != REG_DWORD) + { + //_tprintf("Warning! Cannot query %s. Last err: %lu, type: %lu\n", lpValueName, GetLastError(), dwType); + *lpData = 0; + bRet = FALSE; + } + + /* Close key if we opened it */ + if (lpSubKey) + RegCloseKey(hKey); + + return bRet; +} + +static +void +FormatBytes(LPTSTR Buf, unsigned cBytes) +{ + TCHAR szMB[32], Tmp[BUFFER_SIZE]; + NUMBERFMT fmt; + + itoa(cBytes / (1024*1024), szMB, 10); + + fmt.NumDigits = 0; + fmt.LeadingZero = 0; + fmt.Grouping = 3; + fmt.lpDecimalSep = TEXT(""); + fmt.lpThousandSep = TEXT(" "); + fmt.NegativeOrder = 0; + if(!GetNumberFormat(LOCALE_SYSTEM_DEFAULT, 0, szMB, &fmt, Tmp, BUFFER_SIZE)) + printf("Error! GetNumberFormat failed.\n"); + + CharToOem(Tmp, Buf); +} + +static +void +FormatDateTime(time_t Time, LPTSTR lpBuf) +{ + unsigned cchBuf = BUFFER_SIZE, i; + SYSTEMTIME SysTime; + const struct tm *lpTm; + + lpTm = localtime(&Time); + SysTime.wYear = (WORD)(1900 + lpTm->tm_year); + SysTime.wMonth = (WORD)(1 + lpTm->tm_mon); + SysTime.wDayOfWeek = (WORD)lpTm->tm_wday; + SysTime.wDay = (WORD)lpTm->tm_mday; + SysTime.wHour = (WORD)lpTm->tm_hour; + SysTime.wMinute = (WORD)lpTm->tm_min; + SysTime.wSecond = (WORD)lpTm->tm_sec; + SysTime.wMilliseconds = 0; + + i = GetDateFormat(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf, cchBuf); + if (i) + --i; /* don't count NULL character */ + i += _stprintf(lpBuf + i, TEXT(", ")); + GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, cchBuf - i); } /* Show usage */ @@ -75,46 +172,63 @@ Usage(VOID) { TCHAR Buf[BUFFER_SIZE]; - if(GetOemStrings(IDS_USAGE, Buf)) printf("%s",Buf); + + if(GetOemStrings(IDS_USAGE, Buf)) + _tprintf("%s", Buf); } /* Print all system information */ VOID AllSysInfo(VOID) { - DWORD dwCharCount = BUFFER_SIZE; + DWORD dwCharCount = BUFFER_SIZE, dwTimestamp; OSVERSIONINFO VersionInfo; SYSTEM_INFO SysInfo; TCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; + const TCHAR *lpcszSysType; MEMORYSTATUS MemoryStatus; unsigned int cSeconds; TIME_ZONE_INFORMATION TimeZoneInfo; + HKEY hKey; if (!GetSystemDirectory(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) - printf("Error getting: GetSystemDirectory\n"); + { + _tprintf("Error! GetSystemDirectory failed.\n"); + return; + } + GetSystemInfo(&SysInfo); // getting computer name dwCharCount = BUFFER_SIZE; if (!GetComputerName(Buf, &dwCharCount)) - printf("Error getting: GetComputerName"); - if (GetOemStrings(IDS_HOST_NAME, Msg)) - printf(Msg, Buf); + _tprintf("Error! GetComputerName failed.\n"); + else if (GetOemStrings(IDS_HOST_NAME, Msg)) + _tprintf(Msg, Buf); + + // open CurrentVersion key + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + _tprintf("Error! RegOpenKeyEx failed.\n"); + return; + } //getting OS Name - GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("ProductName"), - Buf); - if (GetOemStrings(IDS_OS_NAME, Msg)) printf(Msg, Buf); + RegGetSZ(hKey, NULL, TEXT("ProductName"), Buf); + if (GetOemStrings(IDS_OS_NAME, Msg)) + _tprintf(Msg, Buf); //getting OS Version ZeroMemory(&VersionInfo, sizeof(VersionInfo)); VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); GetVersionEx(&VersionInfo); - + if (GetOemStrings(IDS_OS_VERSION, Msg)) - printf(Msg, + _tprintf(Msg, (unsigned)VersionInfo.dwMajorVersion, (unsigned)VersionInfo.dwMinorVersion, (unsigned)VersionInfo.dwBuildNumber, @@ -126,53 +240,40 @@ //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)) printf(Msg, Buf); + RegGetSZ(hKey, NULL, TEXT("CurrentType"), Buf); + if (GetOemStrings(IDS_OS_BUILD_TYPE, Msg)) + _tprintf(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)) printf(Msg, Buf); + RegGetSZ(hKey, NULL, TEXT("RegisteredOwner"), Buf); + if (GetOemStrings(IDS_REG_OWNER, Msg)) + _tprintf(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)) printf(Msg, Buf); - - //getting Product ID // use SOFTWARE\Microsoft\Windows NT\CurrentVersion\InstallDate - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("ProductId"), - Buf)) - if (GetOemStrings(IDS_PRODUCT_ID, Msg)) printf(Msg, Buf); + RegGetSZ(hKey, NULL, TEXT("RegisteredOrganization"), Buf); + if (GetOemStrings(IDS_REG_ORG, Msg)) + _tprintf(Msg, Buf); + + //getting Product ID + RegGetSZ(hKey, NULL, TEXT("ProductId"), Buf); + if (GetOemStrings(IDS_PRODUCT_ID, Msg)) + _tprintf(Msg, Buf); //getting Install Date - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), - TEXT("SetupDate"), - Buf)) - if (GetOemStrings(IDS_INST_DATE, Msg)) printf(Msg, Buf); - - //getting Install Time - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), - TEXT("SetupTime"), - Buf)) - if (GetOemStrings(IDS_INST_TIME, Msg)) printf(Msg, Buf); + RegGetDWORD(hKey, NULL, TEXT("InstallDate"), &dwTimestamp); + FormatDateTime((time_t)dwTimestamp, Buf); + if (GetOemStrings(IDS_INST_DATE, Msg)) + _tprintf(Msg, Buf); + + // close Current Version key now + RegCloseKey(hKey); //getting System Up Time cSeconds = GetTickCount() / 1000; if (GetOemStrings(IDS_UP_TIME, Msg)) - printf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); - - //getting System Manufacturer + _tprintf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); + + //getting System Manufacturer; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Manufacturer for Win >= 6.0 sprintf(Tmp, "%s\\oeminfo.ini", szSystemDir); GetPrivateProfileString(TEXT("General"), TEXT("Manufacturer"), @@ -181,9 +282,9 @@ sizeof(Buf)/sizeof(Buf[0]), Tmp); if (GetOemStrings(IDS_SYS_MANUFACTURER, Msg)) - printf(Msg, Buf); - - //getting System Model + _tprintf(Msg, Buf); + + //getting System Model; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Model for Win >= 6.0 GetPrivateProfileString(TEXT("General"), TEXT("Model"), TEXT("To Be Filled By O.E.M."), @@ -191,164 +292,204 @@ sizeof(Buf)/sizeof(Buf[0]), Tmp); if (GetOemStrings(IDS_SYS_MODEL, Msg)) - printf(Msg, Buf); + _tprintf(Msg, Buf); //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); + lpcszSysType = TEXT("X86-based PC"); break; case PROCESSOR_ARCHITECTURE_IA64: - if (GetOemStrings(IDS_SYS_TYPE_IA64, Msg)) printf("%s", Msg); + lpcszSysType = TEXT("IA64-based PC"); break; case PROCESSOR_ARCHITECTURE_AMD64: - if (GetOemStrings(IDS_SYS_TYPE_AMD64, Msg)) printf("%s", Msg); + lpcszSysType = TEXT("AMD64-based PC"); break; - } + default: + lpcszSysType = TEXT("Unknown"); + break; + } + if (GetOemStrings(IDS_SYS_TYPE, Msg)) + _tprintf(Msg, lpcszSysType); //getting Processor(s) if (GetOemStrings(IDS_PROCESSORS, Msg)) { unsigned int i; - printf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); + _tprintf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); 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); + sprintf(Tmp, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i); + + RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, TEXT("Identifier"), Buf); + _tprintf(" [%02u]: %s", i+1, Buf); + + RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, TEXT("VendorIdentifier"), Buf); + _tprintf(" %s\n", Buf); } } //getting BIOS Version - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosVersion"), - Buf)) - if (GetOemStrings(IDS_BIOS_VERSION, Msg)) printf(Msg, Buf); + RegGetSZ(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosVersion"), + Buf); + if (GetOemStrings(IDS_BIOS_VERSION, Msg)) + _tprintf(Msg, Buf); //gettings BIOS date - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosDate"), - Buf)) - if (GetOemStrings(IDS_BIOS_DATE, Msg)) printf(Msg, Buf); + RegGetSZ(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosDate"), + Buf); + if (GetOemStrings(IDS_BIOS_DATE, Msg)) + _tprintf(Msg, Buf); //getting ReactOS Directory - if (!GetWindowsDirectory(Buf, BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); - if (GetOemStrings(IDS_ROS_DIR, Msg)) printf(Msg, Buf); + if (!GetWindowsDirectory(Buf, BUFFER_SIZE)) + _tprintf("Error! GetWindowsDirectory failed."); + else if (GetOemStrings(IDS_ROS_DIR, Msg)) + _tprintf(Msg, Buf); //getting System Directory - if (GetOemStrings(IDS_SYS_DIR, Msg)) printf(Msg, szSystemDir); + if (GetOemStrings(IDS_SYS_DIR, Msg)) + _tprintf(Msg, szSystemDir); //getting Boot Device - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\Setup"), - TEXT("SystemPartition"), - Buf)) - if (GetOemStrings(IDS_BOOT_DEV, Msg)) printf(Msg, Buf); + RegGetSZ(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\Setup"), + TEXT("SystemPartition"), + Buf); + if (GetOemStrings(IDS_BOOT_DEV, Msg)) + _tprintf(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)) printf(Msg, Buf); + if (RegGetSZ(HKEY_CURRENT_USER, + TEXT("Control Panel\\International"), + TEXT("Locale"), + Tmp)) + if (RegGetSZ(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + Tmp, + Buf)) + if (GetOemStrings(IDS_SYS_LOCALE, Msg)) + _tprintf(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)) printf(Msg, Buf); + if (RegGetSZ(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 (RegGetSZ(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + Tmp, + Buf)) + if (GetOemStrings(IDS_INPUT_LOCALE, Msg)) + _tprintf(Msg, Buf); } //getting Time Zone 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)) printf(Msg, Buf); - - //getting Total Physical Memory - GlobalMemoryStatus(&MemoryStatus); - if(GetOemStrings(IDS_TOTAL_PHYS_MEM, Msg)) - printf(Msg, - B_TO_MB(MemoryStatus.dwTotalPhys), - B_TO_KB(MemoryStatus.dwTotalPhys)); - - //getting Available Physical Memory - if(GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) - printf(Msg, - B_TO_MB(MemoryStatus.dwAvailPhys), - B_TO_KB(MemoryStatus.dwAvailPhys)); - - //getting Virtual Memory: Max Size - if(GetOemStrings(IDS_VIRT_MEM_MAX, Msg)) - printf(Msg, - B_TO_MB(MemoryStatus.dwTotalVirtual), - B_TO_KB(MemoryStatus.dwTotalVirtual)); - - //getting Virtual Memory: Available - if(GetOemStrings(IDS_VIRT_MEM_AVAIL, Msg)) - printf(Msg, - B_TO_MB(MemoryStatus.dwAvailVirtual), - B_TO_KB(MemoryStatus.dwAvailVirtual)); - - //getting Virtual Memory: In Use - if(GetOemStrings(IDS_VIRT_MEM_INUSE, Msg)) - printf(Msg, - B_TO_MB(MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual), - B_TO_KB(MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual)); - - //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++) + + /* Open Time Zones key */ + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"), + 0, + KEY_ENUMERATE_SUB_KEYS|KEY_READ, + &hKey) == ERROR_SUCCESS) + { + unsigned i; + + /* Find current timezone */ + dwCharCount = 256; // Windows seems to have a bug - it doesnt accept BUFFER_SIZE here + for(i = 0; RegEnumKeyEx(hKey, i, Tmp, &dwCharCount, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++i, dwCharCount = 255) { - if (Buf[i] == ' ') +#ifdef _UNICODE + RegGetSZ(hKey, Tmp, TEXT("Std"), Buf); + + if(!wcscmp(wBuf, TimeZoneInfo.StandardName)) +#else + wchar_t wBuf[BUFFER_SIZE]; + + RegGetSZ(hKey, Tmp, TEXT("Std"), Buf); + mbstowcs(wBuf, Buf, BUFFER_SIZE); + + if(!wcscmp(wBuf, TimeZoneInfo.StandardName)) +#endif { - Buf[i] = '\0'; + RegGetSZ(hKey, Tmp, TEXT("Display"), Buf); + + if (GetOemStrings(IDS_TIME_ZONE, Msg)) + _tprintf(Msg, Buf); + break; } } - if(GetOemStrings(IDS_PAGEFILE_LOC, Msg)) printf(Msg, Buf); + RegCloseKey(hKey); + } + + + //getting Total Physical Memory + GlobalMemoryStatus(&MemoryStatus); + FormatBytes(Buf, MemoryStatus.dwTotalPhys); + if (GetOemStrings(IDS_TOTAL_PHYS_MEM, Msg)) + _tprintf(Msg, Buf); + + //getting Available Physical Memory + FormatBytes(Buf, MemoryStatus.dwAvailPhys); + if (GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) + _tprintf(Msg, Buf); + + //getting Virtual Memory: Max Size + FormatBytes(Buf, MemoryStatus.dwTotalVirtual); + if (GetOemStrings(IDS_VIRT_MEM_MAX, Msg)) + _tprintf(Msg, Buf); + + //getting Virtual Memory: Available + FormatBytes(Buf, MemoryStatus.dwAvailVirtual); + if (GetOemStrings(IDS_VIRT_MEM_AVAIL, Msg)) + _tprintf(Msg, Buf); + + //getting Virtual Memory: In Use + FormatBytes(Buf, MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual); + if (GetOemStrings(IDS_VIRT_MEM_INUSE, Msg)) + _tprintf(Msg, Buf); + + //getting Page File Location(s) + if (RegGetSZ(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"), + TEXT("PagingFiles"), + Buf)) + { + int i; + + for(i = 0; i < strlen((char*)Buf); i++) + { + if (Buf[i] == TEXT(' ')) + { + Buf[i] = TEXT('\0'); + break; + } + } + + if(GetOemStrings(IDS_PAGEFILE_LOC, Msg)) + _tprintf(Msg, Buf); } //getting Domain - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), - TEXT("CachePrimaryDomain"), - Buf)) - if(GetOemStrings(IDS_DOMINE, Msg)) printf(Msg, Buf); + if (RegGetSZ(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), + TEXT("CachePrimaryDomain"), + Buf)) + if(GetOemStrings(IDS_DOMINE, Msg)) + _tprintf(Msg, Buf); //getting Logon Server @@ -368,6 +509,8 @@ Usage(); return 0; } + AllSysInfo(); + return 0; }

1 0

[jgardou] 51220: [CMAKE] - Get rid of buildno_header target, builno.h is generated at configure time.
by jgardou＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: jgardou Date: Fri Apr 1 17:34:49 2011 New Revision: 51220 URL: http://svn.reactos.org/svn/reactos?rev=51220&view=rev Log: [CMAKE] - Get rid of buildno_header target, builno.h is generated at configure time. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt branches/cmake-bringup/dll/win32/printui/CMakeLists.txt branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/tools/wpp/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/dxtn… Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libj… Modified: branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libp… Modified: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libt… Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libx… Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… Modified: branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/d3d8t… Modified: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… Modified: branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dmusi… Modified: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… Modified: branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Modified: branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Modified: branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Modified: branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Modified: branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Modified: branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Modified: branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… Modified: branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… Modified: branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… Modified: branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… Modified: branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Modified: branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Modified: branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Modified: branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Modified: branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Modified: branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Modified: branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Modified: branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Modified: branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Modified: branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Modified: branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Modified: branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Modified: branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdj… Modified: branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… Modified: branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… Modified: branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Modified: branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Modified: branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Modified: branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdm… Modified: branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… Modified: branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… Modified: branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… Modified: branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… Modified: branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Modified: branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Modified: branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Modified: branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Modified: branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Modified: branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Modified: branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Modified: branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Modified: branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Modified: branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdv… Modified: branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… Modified: branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… Modified: branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/idndl/CMa… Modified: branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/normaliz/… Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… Modified: branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… Modified: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… Modified: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… Modified: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… Modified: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Modified: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… Modified: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/nddeapi… Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… Modified: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr3… Modified: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/printui… Modified: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasapi3… Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/… Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspap… Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco… Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… Modified: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libw… Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… Modified: branches/cmake-bringup/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wpp/CMakeLi…

1 0

[jgardou] 51219: [CMAKE] - Do not make an artificial target for gendib generated files. GENERATED property for source files is there for that and is automatically set by cmake for custom command OU...
by jgardou＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: jgardou Date: Fri Apr 1 16:59:14 2011 New Revision: 51219 URL: http://svn.reactos.org/svn/reactos?rev=51219&view=rev Log: [CMAKE] - Do not make an artificial target for gendib generated files. GENERATED property for source files is there for that and is automatically set by cmake for custom command OUTPUT files. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Apr 1 16:59:14 2011 @@ -200,20 +200,6 @@ add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib) - - list(APPEND OUTPUT_FILES - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c) - - add_custom_command( - OUTPUT ${OUTPUT_FILES} - COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib - DEPENDS native-gendib) - - add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) #bootcd and livecd Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Apr 1 16:59:14 2011 @@ -12,6 +12,17 @@ add_definitions( -DLANGPACK -D_WIN32K_) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib) + +list(APPEND GENDIB_FILES + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c) + +add_custom_command( + OUTPUT ${GENDIB_FILES} + COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib) list(APPEND SOURCE dib/alphablend.c @@ -149,15 +160,8 @@ stubs/stubs.c stubs/umpdstubs.c win32k.rc) - -list(APPEND GENDIB_GENERATED - ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c - ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c - ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c) - -set_source_files_properties(${GENDIB_GENERATED} PROPERTIES GENERATED TRUE) - -list(APPEND SOURCE ${GENDIB_GENERATED}) + +list(APPEND SOURCE ${GENDIB_FILES}) if(ARCH MATCHES i386) list(APPEND SOURCE

1 0

[fireball] 51218: - Fix build. Happens.
by fireball＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: fireball Date: Fri Apr 1 12:18:54 2011 New Revision: 51218 URL: http://svn.reactos.org/svn/reactos?rev=51218&view=rev Log: - Fix build. Happens. Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Fri Apr 1 12:18:54 2011 @@ -191,7 +191,7 @@ // // Callback function for LdrEnumerateLoadedModules // -typedef NTSTATUS (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN PVOID Parameter, OUT BOOLEAN *Stop); +typedef VOID (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN PVOID Parameter, OUT BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; #endif

1 0

[fireball] 51217: [KERNEL32] - Implement a simple version of BasepGetDllPath()/BasepGetProcessPath().
by fireball＠svn.reactos.org 01 Apr '11

01 Apr '11

Author: fireball Date: Fri Apr 1 10:06:03 2011 New Revision: 51217 URL: http://svn.reactos.org/svn/reactos?rev=51217&view=rev Log: [KERNEL32] - Implement a simple version of BasepGetDllPath()/BasepGetProcessPath(). Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri Apr 1 10:06:03 2011 @@ -94,6 +94,8 @@ extern RTL_CRITICAL_SECTION BaseDllDirectoryLock; extern UNICODE_STRING BaseDllDirectory; +extern UNICODE_STRING BaseDefaultPath; +extern UNICODE_STRING BaseDefaultPathAppend; extern LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter; Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Fri Apr 1 10:06:03 2011 @@ -21,8 +21,6 @@ extern UNICODE_STRING SystemDirectory; extern UNICODE_STRING WindowsDirectory; -extern UNICODE_STRING BaseDefaultPath; -extern UNICODE_STRING BaseDefaultPathAppend; WCHAR BaseDefaultPathBuffer[6140]; Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Fri Apr 1 10:06:03 2011 @@ -16,6 +16,7 @@ UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH"); UNICODE_STRING BaseDefaultPath; +PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry; #define CMD_STRING L"cmd /c " @@ -355,12 +356,194 @@ } } +VOID +NTAPI +BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, + IN PVOID Context, + OUT BOOLEAN *StopEnumeration) +{ + /* Make sure we get Entry, Context and valid StopEnumeration pointer */ + ASSERT(Entry); + ASSERT(Context); + ASSERT(StopEnumeration); + + /* If entry is already found - signal to stop */ + if (BasepExeLdrEntry) + { + /* Signal to stop enumeration and return */ + *StopEnumeration = TRUE; + return; + } + + /* We don't have a exe ldr entry, so try to see if this one is ours + by matching base address */ + if (Entry->DllBase == Context) + { + /* It matches, so remember the ldr entry */ + BasepExeLdrEntry = Entry; + + /* And stop enumeration */ + *StopEnumeration = TRUE; + } +} + LPWSTR WINAPI BasepGetProcessPath(DWORD Reserved, LPWSTR FullPath, PVOID Environment) { + NTSTATUS Status; + LPWSTR AllocatedPath = NULL, ch; + ULONG DefaultLength = BaseDefaultPath.Length; + ULONG AppLength = 0; + UNICODE_STRING EnvPath; + LPWSTR NamePtr; + LPWSTR PathBuffer; + BOOLEAN SecondAttempt = FALSE; + PPEB Peb = NtCurrentPeb(); + + if (!Environment) RtlAcquirePebLock(); + + /* Query PATH env var into append path */ + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &BaseDefaultPathAppend); + if (NT_SUCCESS(Status)) + { + /* Add up PATH environment length */ + DefaultLength += BaseDefaultPathAppend.Length; + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* We have to allocate path dynamically */ + AllocatedPath = RtlAllocateHeap(RtlGetProcessHeap(), 0, BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL)); + + if (AllocatedPath) + { + /* Set up EnvPath */ + EnvPath.Buffer = AllocatedPath; + EnvPath.Length = BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL); + EnvPath.MaximumLength = EnvPath.Length; + + /* Query PATH env var into newly allocated path */ + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &EnvPath); + + if (NT_SUCCESS(Status)) + { + DefaultLength += EnvPath.Length; + } + else + { + /* Free newly allocated path, it didn't work */ + RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); + AllocatedPath = NULL; + Status = STATUS_NO_MEMORY; + } + } + } + +secondattempt: + if (!FullPath) + { + /* Initialize BasepExeLdrEntry if necessary */ + if (!BasepExeLdrEntry) + LdrEnumerateLoadedModules(0, BasepLocateExeLdrEntry, Peb->ImageBaseAddress); + + DPRINT1("Found BasepExeLdrEntry %wZ\n", &BasepExeLdrEntry->FullDllName); + + /* Set name pointer to the full dll path */ + NamePtr = BasepExeLdrEntry->FullDllName.Buffer; + } + else + { + /* Set name pointer to the provided path */ + NamePtr = FullPath; + } + + /* Determine application path length */ + if (NamePtr) + { + ch = NamePtr; + while (*ch) + { + /* Check if there is a slash */ + if (*ch == L'\\') + { + /* Update app length */ + AppLength = (ULONG_PTR)ch - (ULONG_PTR)NamePtr + sizeof(WCHAR); + } + + ch++; + } + } + + /* Now check, if we found a valid path in the provided full path */ + if (!AppLength && FullPath && !SecondAttempt) + { + /* We were provided with a bad full path, retry again using just this app's path */ + FullPath = NULL; + SecondAttempt = TRUE; + goto secondattempt; + } + + /* Allocate the path buffer */ + PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DefaultLength + AppLength + 2*sizeof(WCHAR)); + if (!PathBuffer) + { + /* Fail */ + if (!Environment) RtlReleasePebLock(); + if (AllocatedPath) RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); + return NULL; + } + + /* Copy contents there */ + if (AppLength) + { + /* Remove trailing slashes if it's not root dir */ + if (AppLength != 3*sizeof(WCHAR)) + AppLength -= sizeof(WCHAR); + + /* Copy contents */ + RtlMoveMemory(PathBuffer, NamePtr, AppLength); + } + + /* Release the lock */ + if (!Environment) RtlReleasePebLock(); + + /* Finish preparing the path string */ + NamePtr = &PathBuffer[AppLength / sizeof(WCHAR)]; + + /* Put a separating ";" if something was added */ + if (AppLength) + { + *NamePtr = L';'; + NamePtr++; + } + + if (AllocatedPath) + { + /* Dynamically allocated env path, copy from the static buffer, + concatenate with dynamic buffer and free it */ + RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, BaseDefaultPath.Length); + RtlMoveMemory(&NamePtr[BaseDefaultPath.Length / sizeof(WCHAR)], AllocatedPath, EnvPath.Length); + + /* Free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); + } + else + { + /* Static env path string, copy directly from BaseDefaultPath */ + RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, DefaultLength); + } + + /* Null terminate the string */ + NamePtr[DefaultLength / sizeof(WCHAR)] = 0; + + DPRINT("Path: %S\n", NamePtr); + return NULL; } @@ -369,6 +552,7 @@ BasepGetDllPath(LPWSTR FullPath, PVOID Environment) { +#if 0 LPWSTR DllPath = NULL; /* Acquire DLL directory lock */ @@ -395,6 +579,9 @@ /* Return dll path */ return DllPath; +#else + return BasepGetProcessPath(0, FullPath, Environment); +#endif } VOID

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