Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[gedmurphy] 29200: - Add usermode checks to GetDIBits - passes 21 out of 27 tests - Add GdiSetLastError to the lib instead of forwarding it straight to kernel32

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 25 17:27:09 2007 New Revision: 29200 URL: http://svn.reactos.org/svn/reactos?rev=29200&view=rev Log: - Add usermode checks to GetDIBits - passes 21 out of 27 tests - Add GdiSetLastError to the lib instead of forwarding it straight to kernel32 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Tue Sep 25 17:27:09 2007 @@ -328,7 +328,7 @@ GdiResetDCEMF@8 GdiSetAttrs@4 GdiSetBatchLimit@4 -GdiSetLastError@4=SetLastError@4 +GdiSetLastError@4 GdiSetPixelFormat@8=NtGdiSetPixelFormat@8 GdiSetServerAttr@8 GdiStartDocEMF@8 Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Tue Sep 25 17:27:09 2007 @@ -192,5 +192,9 @@ STDCALL GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv); +VOID +STDCALL +GdiSetLastError( DWORD dwErrCode ); + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Tue Sep 25 17:27:09 2007 @@ -178,3 +178,13 @@ { return NtGdiExtEscape(hDC, NULL, 0, nEscape, cbInput, (LPSTR)lpszInData, cbOutput, lpszOutData); } + +/* + * @implemented + */ +VOID +STDCALL +GdiSetLastError(DWORD dwErrCode) +{ + SetLastError(dwErrCode); +} Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Tue Sep 25 17:27:09 2007 @@ -1,4 +1,7 @@ #include "precomp.h" + +//#define NDEBUG +//#include <debug.h> /* * Return the full scan size for a bitmap. @@ -151,8 +154,6 @@ - - INT STDCALL GetDIBits( @@ -162,16 +163,34 @@ UINT cScanLines, LPVOID lpvBits, LPBITMAPINFO lpbmi, - UINT uUsage - ) + UINT uUsage) { - return NtGdiGetDIBitsInternal(hDC, - hbmp, - uStartScan, - cScanLines, - lpvBits, - lpbmi, - uUsage, - DIB_BitmapMaxBitsSize( lpbmi, cScanLines ), - 0); + INT ret = 0; + + if (hDC == NULL || !GdiIsHandleValid((HGDIOBJ)hDC)) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + } + else if (lpbmi == NULL) + { + // XP doesn't run this check and results in a + // crash in DIB_BitmapMaxBitsSize, we'll be more forgiving + GdiSetLastError(ERROR_INVALID_PARAMETER); + } + else + { + UINT cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); + + ret = NtGdiGetDIBitsInternal(hDC, + hbmp, + uStartScan, + cScanLines, + lpvBits, + lpbmi, + uUsage, + cjBmpScanSize, + 0); + } + + return ret; }

16 years, 11 months

[gedmurphy] 29199: add more checks for GetDIBits

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 25 17:20:46 2007 New Revision: 29199 URL: http://svn.reactos.org/svn/reactos?rev=29199&view=rev Log: add more checks for GetDIBits Modified: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Modified: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetDIBits.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Tue Sep 25 17:20:46 2007 @@ -15,6 +15,7 @@ hBitmap = CreateCompatibleBitmap(hDCScreen, 16, 16); RTEST(hBitmap != NULL); + /* misc */ SetLastError(ERROR_SUCCESS); RTEST(GetDIBits(0, 0, 0, 0, NULL, NULL, 0) == 0); RTEST(GetLastError() == ERROR_INVALID_PARAMETER); @@ -31,12 +32,51 @@ RTEST(GetDIBits((HDC)2345, hBitmap, 0, 15, NULL, &bi, 0) == 0); RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + + /* null hdc */ SetLastError(ERROR_SUCCESS); - ZeroMemory(&bi, sizeof(BITMAPINFO)); - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(NULL, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* null bitmap */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, NULL, 0, 15, NULL, &bi, DIB_RGB_COLORS) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* 0 scan lines */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, hBitmap, 0, 0, NULL, &bi, DIB_RGB_COLORS) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* null bitmap info - crashes XP*/ + //SetLastError(ERROR_SUCCESS); + //RTEST(GetDIBits(hDCScreen, NULL, 0, 15, NULL, NULL, DIB_RGB_COLORS) == 0); + //RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* bad bmi colours (uUsage) */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, hBitmap, 0, 15, NULL, &bi, 100) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + RTEST(bi.bmiHeader.biWidth == 0); + RTEST(bi.bmiHeader.biHeight == 0); + RTEST(bi.bmiHeader.biBitCount == 0); + RTEST(bi.bmiHeader.biSizeImage == 0); + + /* basic call */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); RTEST(GetDIBits(hDCScreen, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS) > 0); RTEST(GetLastError() == ERROR_SUCCESS); - ScreenBpp = GetDeviceCaps(hDCScreen, BITSPIXEL); RTEST(bi.bmiHeader.biWidth == 16); RTEST(bi.bmiHeader.biHeight == 16);

16 years, 11 months

[cfinck] 29198: Traditional chinese translation for "cacls" by Chaoming Tseng See issue #2687 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Sep 25 14:32:22 2007 New Revision: 29198 URL: http://svn.reactos.org/svn/reactos?rev=29198&view=rev Log: Traditional chinese translation for "cacls" by Chaoming Tseng See issue #2687 for more details. Added: trunk/reactos/base/applications/cacls/lang/zh-TW.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc Added: trunk/reactos/base/applications/cacls/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/cacls/lang/zh-TW.rc Tue Sep 25 14:32:22 2007 @@ -1,0 +1,95 @@ +/* + * cacls (TRADITIONAL Chinese resources) + * (ÁcÅé¤¤¤å¸ê·½) + * Copyright 2007 jauming <jauming.tw(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Åã¥Ü©ÎªÌ×§ï¤å¥óªº³X°Ý±±¨îªí \n\n\ +CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ + [/P user:perm [...]] [/D user [...]]\n\ + filename Åã¥Ü ACLs¡C\n\ + /T §ó§ï·í«e¥Ø¿ý¤Î¨ä©Ò¦³¤l¥Ø¿ý¤¤\n\ + «ü©w¤å¥óªº ACL¡C\n\ + /E ½s¿è ACL ¦Ó¤£´À´«¡C\n\ + /C ¦b¥X²{©Úµ´³X°Ý¿ù»~®ÉÄ~Äò¡C\n\ + /G user:perm ½á¤©«ü©w¥Î¤á³X°ÝÅv¡C\n\ + Perm ¥i¥H¬O: R Åª¨ú \n\ + W ¼g¤J \n\ + C §ó§ï(¼g¤J) \n\ + F §¹¥þ±±¨î \n\ + /R user ºM¾P«ü©w¥Î¤áªº³X°ÝÅv(¶È¦bÉO /E ¤@°_¨Ï¥Î®É¦Xªk)¡C\n\ + /P user:perm ´À´««ü©w¥Î¤áªº³X°ÝÅv¡C\n\ + Perm ¥i¥H¬O: N µL \n\ + R Åª¨ú \n\ + W ¼g¤J \n\ + C §ó§ï(¼g¤J) \n\ + F §¹¥þ±±¨î \n\ + /D user ©Úµ´«ü©w¥Î¤áªº³X°Ý¡C\n\ +¦b©R¥O¤¤¥i¥H¨Ï¥Î³q°t²Å«ü©w¦hÓ¤å¥ó¡C\n\ +±z¤]¥i¥H¦b©R¥O¤¤«ü©w¦hÓ¥Î¤á¡C\n\n\ +ÁY¼g: \n\ + CI - ®e¾¹Ä~©Ó¡C\n\ + ACE·|¥Ñ¥Ø¿ýÄ~©Ó¡C\n\ + OI - ¹ï¶HÄ~©Ó¡C\n\ + ACE ·|¥Ñ¤å¥óÄ~©Ó¡C\n\ + IO - ¥uÄ~©Ó¡C\n\ + ACE ¤£¾A¥Î©ó·í«e¤å¥ó/¥Ø¿ý¡C\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Tue Sep 25 14:32:22 2007 @@ -1,13 +1,6 @@ - - #include <windows.h> #include "resource.h" -/* define language neutral resources */ - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* include localised resources */ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" #include "lang/de-DE.rc" @@ -22,3 +15,4 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" +#include "lang/zh-TW.rc"

16 years, 11 months

[cfinck] 29197: - Bug 2685: Ukrainian translation for "format" by Rostislav Zabolotny (rstzab AT yandex DOT ru) - Bug 2686: Ukrainian translation for "regsvr32" by Rostislav Zabolotny (rstzab AT yandex DOT ru)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Sep 25 14:08:39 2007 New Revision: 29197 URL: http://svn.reactos.org/svn/reactos?rev=29197&view=rev Log: - Bug 2685: Ukrainian translation for "format" by Rostislav Zabolotny (rstzab AT yandex DOT ru) - Bug 2686: Ukrainian translation for "regsvr32" by Rostislav Zabolotny (rstzab AT yandex DOT ru) Added: trunk/reactos/base/system/format/lang/uk-UA.rc trunk/reactos/base/system/regsvr32/lang/uk-UA.rc Modified: trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc Added: trunk/reactos/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk… ============================================================================== --- trunk/reactos/base/system/format/lang/uk-UA.rc (added) +++ trunk/reactos/base/system/format/lang/uk-UA.rc Tue Sep 25 14:08:39 2007 @@ -1,0 +1,75 @@ +#include "resource.h" +/* + * PROJECT: ReactOS CMD Format. + * LICENSE: GPL - See COPYING in the top level directory + * FILE: reactos/base/system/format/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Format command + * PROGRAMMERS: Rostislav Zabolotny + */ + + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Âèêîðèñòàííÿ: %S ïðèñòð³é: [-FS:ôàéë-ñèñòåìà] [-V:ì³òêà] [-Q] [-A:ðîçì³ð] [-C]\n\n\ + [ïðèñòð³é:] Âêàçóº äèñê, ÿêèé ñë³ä â³äôîðìàòóâàòè (äâîêðàïêà îáîâ'ÿçêîâà).\n\ + -FS:ôàéë-ñèñòåìà Âèçíà÷àº òèï ôàéëîâî¿ ñèñòåìè (%s).\n\ + -V:ì³òêà Âèçíà÷àº êîðîòêó íàçâó äèñêó.\n\ + -Q Øâèäêå ôîðìàòóâàííÿ.\n\ + -A:ðîçì³ð Ïåðåâèçíà÷àº ðîçì³ð êëàñòåðà çà çàìîâ÷óâàííÿì. Ðåêîìåíäóºòüñÿ \n\ + âèêîðèñòîâóâàòè çíà÷åííÿ çà çàìîâ÷óâàííÿì.\n\ + NTFS ï³äòðèìóº 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT ï³äòðèìóº 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS ñòèñêàííÿ íå ï³äòðèìóºòüñÿ äëÿ êëàñòåð³â á³ëüøèõ çà 4096.\n\ + -C Âñòàíîâëþº ðåæèì ñòèñêàííÿ äëÿ âñ³õ íîâèõ ôàéë³â,\n\ + ÿê³ ñòâîðþþòüñÿ íà äèñêó.\n\n" + +STRING_COMPLETE "%lu â³äñîòê³â âèêîíàíî.\r" + +STRING_FORMAT_FAIL "FormatEx íå çì³ã óñï³øíî âèêîíàòè çàâäàííÿ.\n\n" + +STRING_NO_SUPPORT "Ôóíêö³ÿ íå ï³äòðèìóºòüñÿ" + +STRING_FMIFS_FAIL "Íå çì³ã çíàöòè FMIFS òî÷êè âõîäó.\n\n" + +STRING_UNKNOW_ARG "Íåâ³äîìèé àðãóìåíò: %S\n" + +STRING_DRIVE_PARM "Íåîáõ³äíèé ïàðàìåòð îïåðàö³¿ â³äñóòí³é.\n\n" + +STRING_ERROR_DRIVE_TYPE "Íå âäàëîñÿ âòñàíâèòè òèï ïðèñòðîþ" + +STRING_INSERT_DISK "Âñòàâòå ÷èñòèé äèñê â ïðèñòð³é %C:\n³ íàòèñí³òü Enter ùîá ïðîäîâæèòè..." + +STRING_NO_VOLUME "Íå âäàëîñÿ âèêîíàòè çàïèò äî ïðèñòðîþ" + +STRING_NO_VOLUME_SIZE "Íå âäàëîñÿ âèçíà÷èòè ðîçì³ð äèñêó" + +STRING_FILESYSTEM "Âèçíà÷åíà ôàéëîâà ñèñòåìà %S.\n" + +STRING_LABEL_NAME_EDIT "Âèçíà÷òå ì³òêó äèñêó %C: " + +STRING_ERROR_LABEL "Áóëî âêàçàíî íåêîððåêòíó ì³òêó.\n" + +STRING_YN_FORMAT "\nÓÂÀÃÀ! ÂÑ² ÄÀÍ² ÍÀ Ô²ÊÑÎÂÀÍÎÌÓ ÄÈÑÊÓ %C:\n\ + ÁÓÄÅ ÂÒÐÀ×ÅÍÎ! \nÐîçïî÷àòè ôîðìàòóâàííÿ(Y/N)? " + +STRING_YES_NO_FAQ "YN" + +STRING_VERIFYING "Ïåðåâ³ðêà" + +STRING_FAST_FMT "Øâèäêå ôîðìàòóâàííÿ" + +STRING_CREATE_FSYS "Ñòâîðåííÿ ôàéëîâî¿ ñèñòåìè.\n" + +STRING_FMT_COMPLETE "Ôîðìàòóâàííÿ çàâåðøåíî.\n" + +STRING_VOL_COMPRESS "Äèñê íå ï³äòðèìóº ñòèñêàííÿ.\n" + +STRING_ENTER_LABEL "Ì³òêà äèñêó (11 ñèìâîë³â,íàòèñí³òü Enter ÿêùî íå òðåáà)? " + +STRING_NO_LABEL "Íå ìîæó âñòàíîâèòè ì³òêó äèñêó" + +STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â íàÿâíî íà äèñêó.\n" + +STRING_SERIAL_NUMBER "\nÑåð³éíèé íîìåð äèñêó - %04X-%04X\n" +} Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc (original) +++ trunk/reactos/base/system/format/rsrc.rc Tue Sep 25 14:08:39 2007 @@ -13,3 +13,4 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/system/regsvr32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/uk-UA.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/uk-UA.rc Tue Sep 25 14:08:39 2007 @@ -1,0 +1,29 @@ +#include "resource.h" + + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nÂèêîðèñòàííÿ: regsvr32 [/u] [/s] [/c] [/n] [/i[:ïàðàìåòðè]] íàçâà_dll\n\ +/u - Â³äì³íèòè ðåºñòðàö³þ ñåðâåðà\n\ +/s - Òèõèé ðåæèì: Íå âèâîäèòè ïîâ³äîìëåíü\n\ +/c - Âèâ³ä â êîíñîëü\n\ +/i - Âèêëèêàòè DllInstall ç äîäàòêîâèìè ïàðàìåòðàìè [ïàðàìåòðè]; Êîëè âèêîðèñòîâóºòüñÿ êëþ÷ /u âèêëèêàºòüñÿ DllUninstall\n\ +/n - Íå âèêëèêàòè DllRegisterServer; öåé êëþ÷ ìàº âèêîðèñòîâóâàòèñÿ ç /i" + +IDS_NoDllSpecified, "Íå âêàçàíî ³ì'ÿ DLL." + +IDS_InvalidFlag, "Íåâ³äîìèé êëþ÷: %s" + +IDS_SwitchN_NoI, "Íåâ³äîìèé êëþ÷: /n âèêîðèñòîâóºòüñÿ ëèøå ç êëþ÷åì /i" + +IDS_DllNotLoaded, "LoadLibrary('%s') çàâåðøèâñÿ àâàð³éíî.\nGetLastError ïîâåðíóëî 0x%08x." + +IDS_MissingEntry, "%s áóëî çàïóùåíî, àëå òî÷êà âõîäó äëÿ %s íå çíàéäåíî.\n\n\ +%s ìîæå íå åêñïîðòóâàòèñü, ÷è â ïàì'ÿò³ ëåæèòü ïîøêîäæåíà âåðñ³ÿ %s. Äëÿ òîãî ùîá çíàéòè ³ âèäàëòè %s, âèêîðèñòîâóéòå PView." + +IDS_FailureMessage, "%s â %s çàâåðøèëîñÿ àâàð³éíî.\nÊîä çàâåðøåííÿ: 0x%08x" + +IDS_SuccessMessage "%s â %s óñï³øíî âèêîíàíî." +} Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc Tue Sep 25 14:08:39 2007 @@ -15,3 +15,4 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

16 years, 11 months

[dreimer] 29196: Next try. Hopefully with Vista Support.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Sep 25 00:37:35 2007 New Revision: 29196 URL: http://svn.reactos.org/svn/reactos?rev=29196&view=rev Log: Next try. Hopefully with Vista Support. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Tue Sep 25 00:37:35 2007 @@ -116,6 +116,7 @@ set _MINGWVERSION=4.1.3 set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" + set HOST_LFLAGS=-L"%ROSBEBASEDIR%\4.1.3\lib" -L"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3" echo ******************************************************************************* echo * * Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Tue Sep 25 00:37:35 2007 @@ -1,4 +1,4 @@ -Section "-MinGW, GCC v4.1.3 and NASM 0.99.02" SEC01 +Section "-MinGW, GCC v4.1.3 and NASM 0.99.03" SEC01 SetOutPath "$INSTDIR\4.1.3\" SetOverwrite try File /r Components\4.1.3\*.* Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Tue Sep 25 00:37:35 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "0.3.8.0" +!define PRODUCT_VERSION "0.3.8.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.0" +VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.1" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.3.8.0" +VIProductVersion "0.3.8.1" CRCCheck force SetCompressor /FINAL /SOLID lzma

16 years, 12 months

[greatlrd] 29195: clean up : move EngWideCharToMultiByte from stubs.c to eng.c and mark it as implement

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Sep 24 23:17:15 2007 New Revision: 29195 URL: http://svn.reactos.org/svn/reactos?rev=29195&view=rev Log: clean up : move EngWideCharToMultiByte from stubs.c to eng.c and mark it as implement Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Sep 24 23:17:15 2007 @@ -2282,9 +2282,6 @@ return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); } - - - /* * @unimplemented */ @@ -2295,30 +2292,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - - - -/* - * @unimplemented - */ -INT STDCALL -EngWideCharToMultiByte( UINT CodePage, - LPWSTR WideCharString, - INT BytesInWideCharString, - LPSTR MultiByteString, - INT BytesInMultiByteString) -{ - return WideCharToMultiByte( - CodePage, - 0, - WideCharString, - (BytesInWideCharString/sizeof(WCHAR)), /* Bytes to (in WCHARs) */ - MultiByteString, - BytesInMultiByteString, - NULL, - NULL); -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Mon Sep 24 23:17:15 2007 @@ -17,6 +17,52 @@ EngAcquireSemaphore ( IN HSEMAPHORE hsem ) { RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); +} + + +/* + * @unimplemented + */ +BOOL +copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) +{ + BOOL retValue = FALSE; + + memcpy(src_glyphset, dst_glyphset, Size); + if (src_glyphset->cRuns == 0) + { + retValue = TRUE; + } + + /* FIXME copy wrun */ + return retValue; +} + +FD_GLYPHSET* STDCALL +EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) +{ + FD_GLYPHSET * ntfd_glyphset; + FD_GLYPHSET * myfd_glyphset = NULL; + + ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); + + if (!ntfd_glyphset) + { + if (ntfd_glyphset->cjThis) + { + myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); + + if (!myfd_glyphset) + { + if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) + { + GlobalFree(myfd_glyphset); + myfd_glyphset = NULL; + } + } + } + } + return myfd_glyphset; } /* @@ -160,47 +206,20 @@ RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); } -BOOL -copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) -{ - BOOL retValue = FALSE; - - memcpy(src_glyphset, dst_glyphset, Size); - if (src_glyphset->cRuns == 0) - { - retValue = TRUE; - } - - /* FIXME copy wrun */ - return retValue; -} - -/* - * @unimplemented - */ -FD_GLYPHSET* STDCALL -EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) -{ - FD_GLYPHSET * ntfd_glyphset; - FD_GLYPHSET * myfd_glyphset = NULL; - - ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - - if (!ntfd_glyphset) - { - if (ntfd_glyphset->cjThis) - { - myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - - if (!myfd_glyphset) - { - if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) - { - GlobalFree(myfd_glyphset); - myfd_glyphset = NULL; - } - } - } - } - return myfd_glyphset; -} + + + +/* + * @implemented + */ +INT +STDCALL +EngWideCharToMultiByte( UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return WideCharToMultiByte(CodePage, 0, WideCharString, (BytesInWideCharString/sizeof(WCHAR)), + MultiByteString, BytesInMultiByteString, NULL, NULL); +}

16 years, 12 months

[greatlrd] 29194: implmented EngQueryEMFInfo it always return FALSE it is historic in Windows XP, But not in Windows 2000

by greatlrd＠svn.reactos.org

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

16 years, 12 months

[fireball] 29193: Dmitry Chapyshev <lentind@yandex.ru> - Start implementing systeminfo system utility (it already works quite nice, but not complete yet).

by fireball＠svn.reactos.org

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

16 years, 12 months

[fireball] 29192: - Make PsChargeProcessPoolQuota returning STATUS_SUCCESS

by fireball＠svn.reactos.org

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

16 years, 12 months

[gedmurphy] 29191: Add basic tests for NtGdiGetDIBitsInternal

by gedmurphy＠svn.reactos.org

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

16 years, 12 months

← Newer
1
...
10
11
12
13
14
15
16
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007