Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 27849: fix condition in rosglCopyContext patch by Dirus (DannyDaemonic at gmail.com) See issue #2375 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jul 26 19:12:39 2007 New Revision: 27849 URL: http://svn.reactos.org/svn/reactos?rev=27849&view=rev Log: fix condition in rosglCopyContext patch by Dirus (DannyDaemonic at gmail.com) See issue #2375 for more details. Modified: trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c Thu Jul 26 19:12:39 2007 @@ -582,7 +582,7 @@ } /* I think this is only possible within one ICD */ - if (src->icd != src->icd) + if (src->icd != dst->icd) { DBGPRINT( "Error: src and dst GLRC use different ICDs!" ); SetLastError( ERROR_INVALID_HANDLE );

17 years, 5 months

[dreimer] 27848: use current dir in ssvn.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 26 19:09:11 2007 New Revision: 27848 URL: http://svn.reactos.org/svn/reactos?rev=27848&view=rev Log: use current dir in ssvn. Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Thu Jul 26 19:09:11 2007 @@ -18,15 +18,15 @@ if "%1" == "update" ( title Updating... if not "%2" == "" ( - svn update "%_ROSSOURCEDIR%" -r %2 + svn update "%CD%" -r %2 ) else ( - svn update "%_ROSSOURCEDIR%" + svn update "%CD%" ) goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... - svn cleanup "%_ROSSOURCEDIR%" + svn cleanup "%CD%" goto :ExitSVN ) :: @@ -35,13 +35,13 @@ if "%1" == "create" ( title Creating... - if exist "%_ROSSOURCEDIR%\.svn\." ( + if exist "%CD%\.svn\." ( echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b "%_ROSSOURCEDIR%" 2>nul|findstr "." >nul + dir /b "%CD%" 2>nul|findstr "." >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%_ROSSOURCEDIR%" + svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%CD%" ) else ( echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -49,7 +49,7 @@ ) if "%1" == "status" ( title Status - call svn info "%_ROSSOURCEDIR%" > "%ROSBEBASEDIR%\x.tmp" + call svn info "%CD%" > "%ROSBEBASEDIR%\x.tmp" echo Recent Offline Revision: call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp"

17 years, 5 months

[weiden] 27847: Removed hacks from findfirst/findnext APIs See issue #1736 for more details.

by weiden＠svn.reactos.org

Author: weiden Date: Thu Jul 26 19:07:07 2007 New Revision: 27847 URL: http://svn.reactos.org/svn/reactos?rev=27847&view=rev Log: Removed hacks from findfirst/findnext APIs See issue #1736 for more details. Modified: trunk/reactos/lib/sdk/crt/io/find.c Modified: trunk/reactos/lib/sdk/crt/io/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/find.c?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/io/find.c (original) +++ trunk/reactos/lib/sdk/crt/io/find.c Thu Jul 26 19:07:07 2007 @@ -12,24 +12,10 @@ _tfindfirst(const _TCHAR* _name, struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; - _TCHAR dir[MAX_PATH]; long hFindFile; - int len = 0; - if (_name == NULL || _name[0] == 0) { - len = GetCurrentDirectory(MAX_PATH-4,dir); - if (dir[len-1] != '\\') { - dir[len] = '\\'; - dir[len+1] = 0; - } - _tcscat(dir,_T("*.*")); - } else { - _tcscpy(dir,_name); - } - - hFindFile = (long)FindFirstFile(dir, &FindFileData); + hFindFile = (long)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { - memset(result,0,sizeof(struct _tfinddata_t)); _dosmaperr(GetLastError()); return -1; } @@ -40,14 +26,6 @@ result->time_write = FileTimeToUnixTime(&FindFileData.ftLastWriteTime,NULL); result->size = FindFileData.nFileSizeLow; _tcsncpy(result->name,FindFileData.cFileName,MAX_PATH); - - // if no wildcard the find file handle can be closed right away - // a return value of 0 can flag this. - - if (!_tcschr(dir,'*') && !_tcschr(dir,'?')) { - _findclose(hFindFile); - return 0; - } return hFindFile; } @@ -64,10 +42,6 @@ struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; - - // check no wildcards or invalid handle - if (handle == 0 || handle == -1) - return 0; if (!FindNextFile((void*)handle, &FindFileData)) { _dosmaperr(GetLastError()); @@ -91,27 +65,11 @@ long _tfindfirsti64(const _TCHAR *_name, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; - _TCHAR dir[MAX_PATH]; long hFindFile; - int len = 0; - if ( _name == NULL || _name[0] == 0 ) - { - len = GetCurrentDirectory(MAX_PATH-4,dir); - if (dir[len-1] != '\\') - { - dir[len] = '\\'; - dir[len+1] = 0; - } - _tcscat(dir, _T("*.*")); - } - else - _tcscpy(dir, _name); - - hFindFile = (long)FindFirstFile(dir, &FindFileData); + hFindFile = (long)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { - memset(result,0,sizeof(struct _tfinddatai64_t)); _dosmaperr(GetLastError()); return -1; } @@ -124,13 +82,6 @@ (((__int64)FindFileData.nFileSizeLow)<<32) + FindFileData.nFileSizeLow; _tcsncpy(result->name,FindFileData.cFileName,MAX_PATH); - // if no wildcard the find file handle can be closed right away - // a return value of 0 can flag this. - - if (!_tcschr(dir,'*') && !_tcschr(dir,'?')) { - _findclose(hFindFile); - return 0; - } return hFindFile; } @@ -144,10 +95,6 @@ int _tfindnexti64(long handle, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; - - // check no wildcards or invalid handle - if (handle == 0 || handle == -1) - return 0; if (!FindNextFile((HANDLE)handle, &FindFileData)) { _dosmaperr(GetLastError()); @@ -180,10 +127,12 @@ #endif ) { - // check no wildcards or invalid handle - if (handle == 0 || handle == -1) - return 0; - return FindClose((void*)handle); + if (!FindClose((void*)handle)) { + _dosmaperr(GetLastError()); + return -1; + } + + return 0; } #endif

17 years, 5 months

[cwittich] 27846: get sysdm to work with freeldr.ini as well See issue #2302 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jul 26 18:56:01 2007 New Revision: 27846 URL: http://svn.reactos.org/svn/reactos?rev=27846&view=rev Log: get sysdm to work with freeldr.ini as well See issue #2302 for more details. Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Thu Jul 26 18:56:01 2007 @@ -12,6 +12,8 @@ #include "precomp.h" static TCHAR m_szFreeldrIni[MAX_PATH + 15]; +static TCHAR szBootLdrSection[12]; +static TCHAR szBootLdrDefault[10]; void SetTimeout(HWND hwndDlg, int Timeout) { @@ -72,6 +74,7 @@ FailGetSysDrive: HeapFree(GetProcessHeap(), 0, szSystemDrive); szSystemDrive = NULL; + return FALSE; } if (szSystemDrive != NULL) @@ -84,22 +87,32 @@ { _tcscpy(m_szFreeldrIni, szSystemDrive); _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + _tcscpy(szBootLdrSection, _T("boot loader")); + _tcscpy(szBootLdrDefault, _T("default")); + } + else + { + _tcscpy(szBootLdrSection, _T("FREELOADER")); + _tcscpy(szBootLdrDefault, _T("DefaultOS")); } } HeapFree(GetProcessHeap(), 0, szSystemDrive); } } + if (m_szFreeldrIni == NULL) + return FALSE; + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); /* load settings from freeldr.ini */ - GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); + GetPrivateProfileString(szBootLdrSection, szBootLdrDefault, NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); /* timeout */ - iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni); + iTimeout = GetPrivateProfileInt(szBootLdrSection, _T("timeout"), 0, m_szFreeldrIni); SetTimeout(hwndDlg, iTimeout); if (iTimeout != 0) SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); @@ -124,7 +137,7 @@ else iTimeout = 0; _stprintf(szTimeout, _T("%i"), iTimeout); - WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni); + WritePrivateProfileString(szBootLdrSection, _T("timeout"), szTimeout, m_szFreeldrIni); } case IDCANCEL: {

17 years, 5 months

[janderwald] 27845: - fix duplicate control id constant by Carlo Bramini (carlo dot bramix at libero dot it) See issue #2479 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 26 18:54:55 2007 New Revision: 27845 URL: http://svn.reactos.org/svn/reactos?rev=27845&view=rev Log: - fix duplicate control id constant by Carlo Bramini (carlo dot bramix at libero dot it) See issue #2479 for more details. Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Thu Jul 26 18:54:55 2007 @@ -115,7 +115,7 @@ GROUPBOX "Visibility", -1, 5, 105, 230, 95 CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 - LTEXT "Long", IDC_TEXT_TRAIL_SHORT, 160, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10

17 years, 5 months

[dreimer] 27844: Commited Workaround in userenv, too. ReactOS does not like Greek letters in Folder Names... See Bug 2478. (from Giannis Adamopoulos)

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 26 18:53:15 2007 New Revision: 27844 URL: http://svn.reactos.org/svn/reactos?rev=27844&view=rev Log: Commited Workaround in userenv, too. ReactOS does not like Greek letters in Folder Names... See Bug 2478. (from Giannis Adamopoulos) Modified: trunk/reactos/dll/win32/userenv/lang/el-GR.rc Modified: trunk/reactos/dll/win32/userenv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/userenv/lang/el-GR.rc Thu Jul 26 18:53:15 2007 @@ -20,28 +20,28 @@ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Áñ÷åßá êáé ñõèìßóåéò" - IDS_APPDATA "ÄåäïìÝíá åöáñìïãþí" - IDS_DESKTOP "ÅðéöÜíåéá åñãáóßáò" - IDS_FAVORITES "ÁãáðçìÝíá" - IDS_STARTMENU "Ìåíïý Ýíáñîçò" - IDS_PROGRAMS "Ìåíïý Ýíáñîçò\\ÐñïãñÜììáôá" - IDS_ADMINTOOLS "Ìåíïý Ýíáñîçò\\ÐñïãñÜììáôá\\Åñãáëåßá äéá÷åéñéóôÞ" - IDS_STARTUP "Ìåíïý Ýíáñîçò\\ÐñïãñÜììáôá\\Åêêßíçóç" - IDS_MYDOCUMENTS "Ôá áñ÷åßá ìïõ" - IDS_MYPICTURES "Ôá áñ÷åßá ìïõ\\Ïé åéêüíåò ìïõ" - IDS_MYMUSIC "Ôá áñ÷åßá ìïõ\\Ç ìïõóéêÞ ìïõ" - IDS_MYVIDEOS "Ôá áñ÷åßá ìïõ\\Ôá Videos ìïõ" + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" + IDS_DESKTOP "Desktop" + IDS_FAVORITES "Favorites" + IDS_STARTMENU "Start Menu" + IDS_PROGRAMS "Start Menu\\Programs" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_STARTUP "Start Menu\\Programs\\Startup" + IDS_MYDOCUMENTS "My Documents" + IDS_MYPICTURES "My Documents\\My Pictures" + IDS_MYMUSIC "My Documents\\My Music" + IDS_MYVIDEOS "My Documents\\My Videos" IDS_TEMPLATES "Templates" - IDS_RECENT "Ðñüóöáôá" - IDS_SENDTO "ÁðïóôïëÞ ðñïò" - IDS_PRINTHOOD "Åêôýðùóç" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "PrintHood" IDS_NETHOOD "NetHood" - IDS_LOCALSETTINGS "ÔïðéêÝò ñõèìßóåéò" - IDS_LOCALAPPDATA "ÔïðéêÝò ñõèìßóåéò\\ÄåäïìÝíá åöáñìïãþí" - IDS_TEMP "ÔïðéêÝò ñõèìßóåéò\\ÐñïóùñéíÜ" - IDS_CACHE "ÔïðéêÝò ñõèìßóåéò\\ÐñïóùñéíÜ áñ÷åßá äéáäéêôýïõ" - IDS_HISTORY "ÔïðéêÝò ñõèìßóåéò\\Éóôïñéêü" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" - IDS_PROGRAMFILES "%SystemDrive%\\Áñ÷åßá ðñïãñáììÜôùí" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" END

17 years, 5 months

[janderwald] 27843: - update italian translation and a few code simplifications by Carlo Bramini (carlo dot bramix at libero dot it) - fix a few issues (remove SIZEOF macro + SUBLANG_ITALIAN...) See issue #2365 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 26 18:48:47 2007 New Revision: 27843 URL: http://svn.reactos.org/svn/reactos?rev=27843&view=rev Log: - update italian translation and a few code simplifications by Carlo Bramini (carlo dot bramix at libero dot it) - fix a few issues (remove SIZEOF macro + SUBLANG_ITALIAN...) See issue #2365 for more details. Modified: trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/lang/it-IT.rc Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/affinity.c (original) +++ trunk/reactos/base/applications/taskmgr/affinity.c Thu Jul 26 18:48:47 2007 @@ -27,7 +27,18 @@ TCHAR szTemp[256]; TCHAR szTempA[256]; -INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +static const DWORD dwCpuTable[] = { + IDC_CPU0, IDC_CPU1, IDC_CPU2, IDC_CPU3, + IDC_CPU4, IDC_CPU5, IDC_CPU6, IDC_CPU7, + IDC_CPU8, IDC_CPU9, IDC_CPU10, IDC_CPU11, + IDC_CPU12, IDC_CPU13, IDC_CPU14, IDC_CPU15, + IDC_CPU16, IDC_CPU17, IDC_CPU18, IDC_CPU19, + IDC_CPU20, IDC_CPU21, IDC_CPU22, IDC_CPU23, + IDC_CPU24, IDC_CPU25, IDC_CPU26, IDC_CPU27, + IDC_CPU28, IDC_CPU29, IDC_CPU30, IDC_CPU31, +}; + +static INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void ProcessPage_OnSetAffinity(void) { @@ -50,8 +61,8 @@ return; hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR)); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR)); MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } @@ -68,6 +79,7 @@ DWORD dwProcessAffinityMask = 0; DWORD dwSystemAffinityMask = 0; TCHAR strErrorText[260]; + BYTE nCpu; switch (message) { case WM_INITDIALOG: @@ -77,149 +89,25 @@ * the number of CPUs present in the system */ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { - GetLastErrorText(strErrorText, 260); + GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR)); EndDialog(hDlg, 0); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR)); MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } - /* - * Enable a checkbox for each processor present in the system - */ - if (dwSystemAffinityMask & 0x00000001) - EnableWindow(GetDlgItem(hDlg, IDC_CPU0), TRUE); - if (dwSystemAffinityMask & 0x00000002) - EnableWindow(GetDlgItem(hDlg, IDC_CPU1), TRUE); - if (dwSystemAffinityMask & 0x00000004) - EnableWindow(GetDlgItem(hDlg, IDC_CPU2), TRUE); - if (dwSystemAffinityMask & 0x00000008) - EnableWindow(GetDlgItem(hDlg, IDC_CPU3), TRUE); - if (dwSystemAffinityMask & 0x00000010) - EnableWindow(GetDlgItem(hDlg, IDC_CPU4), TRUE); - if (dwSystemAffinityMask & 0x00000020) - EnableWindow(GetDlgItem(hDlg, IDC_CPU5), TRUE); - if (dwSystemAffinityMask & 0x00000040) - EnableWindow(GetDlgItem(hDlg, IDC_CPU6), TRUE); - if (dwSystemAffinityMask & 0x00000080) - EnableWindow(GetDlgItem(hDlg, IDC_CPU7), TRUE); - if (dwSystemAffinityMask & 0x00000100) - EnableWindow(GetDlgItem(hDlg, IDC_CPU8), TRUE); - if (dwSystemAffinityMask & 0x00000200) - EnableWindow(GetDlgItem(hDlg, IDC_CPU9), TRUE); - if (dwSystemAffinityMask & 0x00000400) - EnableWindow(GetDlgItem(hDlg, IDC_CPU10), TRUE); - if (dwSystemAffinityMask & 0x00000800) - EnableWindow(GetDlgItem(hDlg, IDC_CPU11), TRUE); - if (dwSystemAffinityMask & 0x00001000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU12), TRUE); - if (dwSystemAffinityMask & 0x00002000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU13), TRUE); - if (dwSystemAffinityMask & 0x00004000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU14), TRUE); - if (dwSystemAffinityMask & 0x00008000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU15), TRUE); - if (dwSystemAffinityMask & 0x00010000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU16), TRUE); - if (dwSystemAffinityMask & 0x00020000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU17), TRUE); - if (dwSystemAffinityMask & 0x00040000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU18), TRUE); - if (dwSystemAffinityMask & 0x00080000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU19), TRUE); - if (dwSystemAffinityMask & 0x00100000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU20), TRUE); - if (dwSystemAffinityMask & 0x00200000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU21), TRUE); - if (dwSystemAffinityMask & 0x00400000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU22), TRUE); - if (dwSystemAffinityMask & 0x00800000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU23), TRUE); - if (dwSystemAffinityMask & 0x01000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU24), TRUE); - if (dwSystemAffinityMask & 0x02000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU25), TRUE); - if (dwSystemAffinityMask & 0x04000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU26), TRUE); - if (dwSystemAffinityMask & 0x08000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU27), TRUE); - if (dwSystemAffinityMask & 0x10000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU28), TRUE); - if (dwSystemAffinityMask & 0x20000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU29), TRUE); - if (dwSystemAffinityMask & 0x40000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU30), TRUE); - if (dwSystemAffinityMask & 0x80000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU31), TRUE); - - - /* - * Check each checkbox that the current process - * has affinity with - */ - if (dwProcessAffinityMask & 0x00000001) - SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000002) - SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000004) - SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000008) - SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000010) - SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000020) - SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000040) - SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000080) - SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000100) - SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000200) - SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000400) - SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000800) - SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00001000) - SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00002000) - SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00004000) - SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00008000) - SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00010000) - SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00020000) - SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00040000) - SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00080000) - SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00100000) - SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00200000) - SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00400000) - SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00800000) - SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x01000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x02000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x04000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x08000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x10000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x20000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x40000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x80000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_SETCHECK, BST_CHECKED, 0); + for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { + /* + * Enable a checkbox for each processor present in the system + */ + if (dwSystemAffinityMask & (1 << nCpu)) + EnableWindow(GetDlgItem(hDlg, dwCpuTable[nCpu]), TRUE); + /* + * Check each checkbox that the current process + * has affinity with + */ + if (dwProcessAffinityMask & (1 << nCpu)) + SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_SETCHECK, BST_CHECKED, 0); + } return TRUE; @@ -239,74 +127,14 @@ * to adjust the process affinity mask */ if (LOWORD(wParam) == IDOK) { - /* - * First we have to create a mask out of each - * checkbox that the user checked. - */ - if (SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000001; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000002; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000004; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000008; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000010; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000020; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000040; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000080; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000100; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000200; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000400; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000800; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00001000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00002000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00004000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00008000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00010000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00020000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00040000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00080000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00100000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00200000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00400000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00800000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x01000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x02000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x04000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x08000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x10000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x20000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x40000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x80000000; + for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { + /* + * First we have to create a mask out of each + * checkbox that the user checked. + */ + if (SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= (1 << nCpu); + } /* * Make sure they are giving the process affinity @@ -315,8 +143,8 @@ * of it's cpu time. */ if (!dwProcessAffinityMask) { - LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, 256); - LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, 256); + LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, sizeof(szTemp) / sizeof(TCHAR)); + LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, sizeof(szTempA) / sizeof(TCHAR)); MessageBox(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP); return TRUE; } @@ -325,9 +153,9 @@ * Try to set the process affinity */ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { - GetLastErrorText(strErrorText, 260); + GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR)); EndDialog(hDlg, LOWORD(wParam)); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR)); MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc Thu Jul 26 18:48:47 2007 @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT #pragma code_page(1252) #endif //_WIN32 @@ -192,9 +192,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Nuovo processo...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "&Passa A",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "&Termina processo",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "&Nuovo processo...",IDC_NEWTASK,172,188,68,14 + PUSHBUTTON "&Passa a",IDC_SWITCHTO,100,188,68,14,WS_DISABLED + PUSHBUTTON "&Termina processo",IDC_ENDTASK,28,188,68,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 @@ -206,7 +206,7 @@ WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Termina Processo",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Mostra i processi di tutti gli utenti",IDC_SHOWALLPROCESSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,117,10 END //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 @@ -218,11 +218,11 @@ GROUPBOX "Uso MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totali",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Carico scritture (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Memoria fisica (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Memoria del Kernel (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "Processes",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + GROUPBOX "Memoria fisica (K)",IDC_PHYSICAL_MEMORY_FRAME,126,122,116,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memoria del Kernel (K)",IDC_KERNEL_MEMORY_FRAME,126,166,116,39,0,WS_EX_TRANSPARENT + LTEXT "Handle",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Thread",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Processi",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | @@ -230,7 +230,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totale",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8 LTEXT "Picco",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -238,18 +238,18 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER - LTEXT "Totale",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Disponibile",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Cache di sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "Totale",IDS_PHYSICAL_MEMORY_TOTAL,132,131,27,8 + LTEXT "Disponibile",IDS_PHYSICAL_MEMORY_AVAILABLE,132,140,35,8 + LTEXT "Cache sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,132,149,52,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER - LTEXT "Totale",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Paginata",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Non Paginata",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "Totale",IDS_KERNEL_MEMORY_TOTAL,132,174,27,8 + LTEXT "Paginata",IDS_KERNEL_MEMORY_PAGED,132,184,31,8 + LTEXT "Non paginata",IDS_KERNEL_MEMORY_NONPAGED,132,193,48,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | @@ -364,17 +364,17 @@ LTEXT "Seleziona le colonne che saranno visibili nella pagina dei processi di Task Manager.", IDC_STATIC,7,7,181,17 CONTROL "&Nome immagine",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,7,28,56,10 + WS_DISABLED | WS_TABSTOP,7,28,65,10 CONTROL "&PID (Process Identifier)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 CONTROL "Uso &CPU",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 CONTROL "T&empo CPU",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,61,48,10 + WS_TABSTOP,7,61,53,10 CONTROL "Uso &Memoria",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 CONTROL "Incrementi uso Memoria",IDC_MEMORYUSAGEDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,89,10 CONTROL "Picco uso Memory",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 CONTROL "Page &Faults",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | @@ -384,31 +384,31 @@ CONTROL "Letture I/O",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 CONTROL "Letture I/O Bytes",IDC_IOREADBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,69,10 CONTROL "ID &Sessione",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 CONTROL "&Nome utente",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,160,51,10 - CONTROL "Incrementi Page F&ault",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + WS_TABSTOP,7,160,57,10 + CONTROL "Increm. Page F&ault",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,77,10 CONTROL "Dimensione Memoria &Virtuale",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 CONTROL "Pool Pa&ginato",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,50,53,10 + WS_TABSTOP,107,50,61,10 CONTROL "Pool N&on-paginato",IDC_NONPAGEDPOOL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,73,10 CONTROL "P&riorità base",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 CONTROL "Numero &Handle",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,83,59,10 + WS_TABSTOP,107,83,65,10 CONTROL "Numero &Thread",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,59,10 + WS_TABSTOP,107,94,65,10 CONTROL "Oggetti GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 CONTROL "Scritture I/O",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,116,49,10 + WS_TABSTOP,107,116,53,10 CONTROL "Scritture I/O Byte",IDC_IOWRITEBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,69,10 CONTROL "Altro I/O",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 CONTROL "Altro I/O Bytes",IDC_IOOTHERBYTES,"Button", @@ -684,3 +684,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED +

17 years, 5 months

[dreimer] 27842: - Stop using grep to find out if a folder is empty or not. This is needed for Vista. (thx to encoded for showing up that bug :-) )

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 26 18:20:04 2007 New Revision: 27842 URL: http://svn.reactos.org/svn/reactos?rev=27842&view=rev Log: - Stop using grep to find out if a folder is empty or not. This is needed for Vista. (thx to encoded for showing up that bug :-) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Jul 26 18:20:04 2007 @@ -61,7 +61,7 @@ :: :: Look if the Source Folder is empty. If so, ask for using "svn create". :: -dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul +dir /b "%_ROSSOURCEDIR%" 2>nul|findstr "." >nul if errorlevel 1 ( echo No ReactOS Source detected. Please use "ssvn create" to download it. goto :ExitRosBE Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Thu Jul 26 18:20:04 2007 @@ -39,7 +39,7 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul + dir /b "%_ROSSOURCEDIR%" 2>nul|findstr "." >nul if errorlevel 1 ( svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%_ROSSOURCEDIR%" ) else (

17 years, 5 months

[cfinck] 27841: Fix a memory leak I introduced...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jul 26 18:06:48 2007 New Revision: 27841 URL: http://svn.reactos.org/svn/reactos?rev=27841&view=rev Log: Fix a memory leak I introduced... Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu Jul 26 18:06:48 2007 @@ -59,12 +59,12 @@ DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { int i = 0; + static HICON hIcon; + switch (Msg) { case WM_INITDIALOG: { - HICON hIcon; - hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), IMAGE_ICON, @@ -117,6 +117,11 @@ return FALSE; } + case WM_DESTROY: + { + DestroyIcon(hIcon); + } + case WM_CLOSE: { EndDialog(Dlg, 0);

17 years, 5 months

[tkreuzer] 27840: - TextOutW: call NtGdiExtTextOut - remove NtGdiTextOut from win32k todo: NtGdiExtTextOut -> NtGdiExtTextOutW (does someone know what the 9th parameter is?)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 26 17:57:17 2007 New Revision: 27840 URL: http://svn.reactos.org/svn/reactos?rev=27840&view=rev Log: - TextOutW: call NtGdiExtTextOut - remove NtGdiTextOut from win32k todo: NtGdiExtTextOut -> NtGdiExtTextOutW (does someone know what the 9th parameter is?) Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Thu Jul 26 17:57:17 2007 @@ -43,7 +43,7 @@ LPCWSTR lpString, int cbString) { - return NtGdiTextOut(hdc, nXStart, nYStart, lpString, cbString); + return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Jul 26 17:57:17 2007 @@ -1116,15 +1116,6 @@ DWORD ROP ); -/* Use NtGdiExtTextOutW with 0, 0 at the end. */ -BOOL -STDCALL -NtGdiTextOut(HDC hDC, - int XStart, - int YStart, - LPCWSTR String, - int Count); - /* Needs to be done in user-mode. */ BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Thu Jul 26 17:57:17 2007 @@ -1502,7 +1502,7 @@ align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); - NtGdiTextOut(hDC, rect.right-16, rect.bottom-48, s_wszVersion, len); + NtGdiExtTextOut(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL); NtGdiSetBkMode(hDC, mode_old); NtGdiSetTextAlign(hDC, align_old); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Jul 26 17:57:17 2007 @@ -1554,9 +1554,9 @@ //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. - NtGdiTextOut(hDc, lpRc->left, - lpRc->top, Text->Buffer, - Text->Length/sizeof(WCHAR)); + NtGdiExtTextOut(hDc, lpRc->left, + lpRc->top, 0, NULL, Text->Buffer, + Text->Length/sizeof(WCHAR), NULL); NtGdiSetTextColor(hDc, OldTextColor); NtGdiSelectObject(hDc, hOldFont); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Thu Jul 26 17:57:17 2007 @@ -3844,17 +3844,6 @@ return FALSE; } -BOOL STDCALL -NtGdiTextOut( - HDC hDC, - INT XStart, - INT YStart, - LPCWSTR String, - INT Count) -{ - return NtGdiExtTextOut(hDC, XStart, YStart, 0, NULL, String, Count, NULL); -} - DWORD STDCALL NtGdiGetFontData( HDC hDC, Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Thu Jul 26 17:57:17 2007 @@ -270,7 +270,6 @@ NtGdiStrokeAndFillPath 1 NtGdiStrokePath 1 NtGdiSwapBuffers 1 -NtGdiTextOut 5 NtGdiTransparentBlt 11 NtGdiTranslateCharsetInfo 3 NtGdiUnrealizeObject 1

17 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
71
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 July 2007