Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[gedmurphy] 22161: more gcc 4.1 fixes
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Fri Jun 2 01:18:22 2006 New Revision: 22161 URL: http://svn.reactos.ru/svn/reactos?rev=22161&view=rev Log: more gcc 4.1 fixes Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c Fri Jun 2 01:18:22 2006 @@ -332,8 +332,8 @@ { Context->SelectedLine = LineID; - ListView_DeleteAllItems(GetDlgItem(Context->hwndDlg, - IDC_CONTROLS)); + (void)ListView_DeleteAllItems(GetDlgItem(Context->hwndDlg, + IDC_CONTROLS)); Context->tmp = 0; SndMixerEnumConnections(Context->Mixer, @@ -497,8 +497,8 @@ /* initialize the list view control */ hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS); - ListView_SetExtendedListViewStyle(hwndControls, - LVS_EX_CHECKBOXES); + (void)ListView_SetExtendedListViewStyle(hwndControls, + LVS_EX_CHECKBOXES); GetClientRect(hwndControls, &rcClient);

1 0

[gedmurphy] 22160: fix build for w3seek and his gcc 4.1 crew ; )
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Fri Jun 2 01:12:55 2006 New Revision: 22160 URL: http://svn.reactos.ru/svn/reactos?rev=22160&view=rev Log: fix build for w3seek and his gcc 4.1 crew ;) Modified: trunk/reactos/base/applications/servman/delete.c trunk/reactos/base/applications/servman/mainwnd.c trunk/reactos/base/applications/servman/query.c Modified: trunk/reactos/base/applications/servman/delete.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/d… ============================================================================== --- trunk/reactos/base/applications/servman/delete.c (original) +++ trunk/reactos/base/applications/servman/delete.c Fri Jun 2 01:12:55 2006 @@ -122,8 +122,8 @@ { case IDOK: if (DoDeleteService(Info, hDlg)) - ListView_DeleteItem(Info->hListView, - Info->SelectedItem); + (void)ListView_DeleteItem(Info->hListView, + Info->SelectedItem); DestroyIcon(hIcon); EndDialog(hDlg, Modified: trunk/reactos/base/applications/servman/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/m… ============================================================================== --- trunk/reactos/base/applications/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/servman/mainwnd.c Fri Jun 2 01:12:55 2006 @@ -277,8 +277,8 @@ return FALSE; } - ListView_SetExtendedListViewStyle(Info->hListView, - LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/ + (void)ListView_SetExtendedListViewStyle(Info->hListView, + LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/ lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; lvc.fmt = LVCFMT_LEFT; @@ -293,9 +293,9 @@ szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(Info->hListView, - 0, - &lvc); + (void)ListView_InsertColumn(Info->hListView, + 0, + &lvc); /* description */ lvc.iSubItem = 1; @@ -305,9 +305,9 @@ szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(Info->hListView, - 1, - &lvc); + (void)ListView_InsertColumn(Info->hListView, + 1, + &lvc); /* status */ lvc.iSubItem = 2; @@ -317,9 +317,9 @@ szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(Info->hListView, - 2, - &lvc); + (void)ListView_InsertColumn(Info->hListView, + 2, + &lvc); /* startup type */ lvc.iSubItem = 3; @@ -329,9 +329,9 @@ szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(Info->hListView, - 3, - &lvc); + (void)ListView_InsertColumn(Info->hListView, + 3, + &lvc); /* logon as */ lvc.iSubItem = 4; @@ -341,9 +341,9 @@ szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(Info->hListView, - 4, - &lvc); + (void)ListView_InsertColumn(Info->hListView, + 4, + &lvc); return TRUE; } @@ -660,9 +660,9 @@ { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - ListView_SortItems(Info->hListView, - CompareFunc, - pnmv->iSubItem); + (void)ListView_SortItems(Info->hListView, + CompareFunc, + pnmv->iSubItem); bSortAscending = !bSortAscending; } break; Modified: trunk/reactos/base/applications/servman/query.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/q… ============================================================================== --- trunk/reactos/base/applications/servman/query.c (original) +++ trunk/reactos/base/applications/servman/query.c Fri Jun 2 01:12:55 2006 @@ -251,12 +251,12 @@ hLgIconItem); /* assign the image to the list view */ - ListView_SetImageList(Info->hListView, - hSmall, - LVSIL_SMALL); - ListView_SetImageList(Info->hListView, - hLarge, - LVSIL_NORMAL); + (void)ListView_SetImageList(Info->hListView, + hSmall, + LVSIL_SMALL); + (void)ListView_SetImageList(Info->hListView, + hLarge, + LVSIL_NORMAL); } @@ -272,7 +272,7 @@ DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - ListView_DeleteAllItems(Info->hListView); + (void)ListView_DeleteAllItems(Info->hListView); InitListViewImage(Info);

1 0

[greatlrd] 22159: remove stub for _wenviron we already have it implement in crt.a
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Fri Jun 2 01:05:53 2006 New Revision: 22159 URL: http://svn.reactos.ru/svn/reactos?rev=22159&view=rev Log: remove stub for _wenviron we already have it implement in crt.a Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.def… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Fri Jun 2 01:05:53 2006 @@ -579,7 +579,7 @@ _wctime64=stub _wcsupr _wctime -_wenviron=stub +_wenviron _wexecl _wexecle _wexeclp

1 0

[hpoussin] 22158: Don't free the string, as it is not ours
by hpoussin＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: hpoussin Date: Thu Jun 1 23:55:28 2006 New Revision: 22158 URL: http://svn.reactos.ru/svn/reactos?rev=22158&view=rev Log: Don't free the string, as it is not ours Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/misc/displ… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c (original) +++ trunk/reactos/dll/win32/user32/misc/display.c Thu Jun 1 23:55:28 2006 @@ -114,8 +114,6 @@ iDevNum, lpDisplayDevice, dwFlags ); - - //RtlFreeUnicodeString ( &Device ); return rc; } @@ -505,9 +503,6 @@ rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam ); - if (lpszDeviceName != NULL) - RtlFreeUnicodeString ( pDeviceName ); - return rc; }

1 0

[gedmurphy] 22157: - Temperarly add the screenshot app to the start menu - Remove the existance checks for the games as they're part of ROS now.
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Thu Jun 1 23:34:33 2006 New Revision: 22157 URL: http://svn.reactos.ru/svn/reactos?rev=22157&view=rev Log: - Temperarly add the screenshot app to the start menu - Remove the existance checks for the games as they're part of ROS now. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/syssetup_En.rc Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/install.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Thu Jun 1 23:34:33 2006 @@ -373,8 +373,6 @@ { TCHAR sAccessories[256]; TCHAR sGames[256]; - TCHAR Sys[MAX_PATH]; - TCHAR GamePath[MAX_PATH]; # if 0 @@ -421,29 +419,23 @@ CreateShortcut(CSIDL_ADMINTOOLS, NULL, _T("Services.lnk"), _T("servman.exe"), IDS_CMT_SERVMAN); /* create and fill Accessories subfolder */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) { + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) + { CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"), _T("screenshot.exe"), IDS_CMT_SCREENSHOT); } /* create Games subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) { - if(GetSystemDirectory(Sys, MAX_PATH)) { - /* copy system dir */ - _tcscpy(GamePath, Sys); - /* concatonate full file path and check for existance */ - if((_taccess(_tcscat(GamePath, _T("\\sol.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); - - _tcscpy(GamePath, Sys); - if((_taccess(_tcscat(GamePath, _T("\\winemine.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); - } + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) + { + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); } CoUninitialize(); Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/resource… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Thu Jun 1 23:34:33 2006 @@ -99,6 +99,7 @@ #define IDS_CMT_GETFIREFOX 3219 #define IDS_CMT_SERVMAN 3220 #define IDS_CMT_WORDPAD 3221 +#define IDS_CMT_SCREENSHOT 3222 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Thu Jun 1 23:34:33 2006 @@ -196,6 +196,7 @@ IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_REGEDIT "Launch Registry Editor" IDS_CMT_WORDPAD "Launch Document Editor" + IDS_CMT_SCREENSHOT "Take screenshot" END STRINGTABLE @@ -207,14 +208,14 @@ STRINGTABLE BEGIN - IDS_REACTOS_SETUP "ReactOS Setup" + IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_REGISTERING_COMPONENTS "Registering components..." + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " - IDS_TIMEOUT "Timeout during registration" + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" END

1 0

[hpoussin] 22156: Fix calculation of loss percentage
by hpoussin＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: hpoussin Date: Thu Jun 1 22:27:08 2006 New Revision: 22156 URL: http://svn.reactos.ru/svn/reactos?rev=22156&view=rev Log: Fix calculation of loss percentage Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/network/p… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Thu Jun 1 22:27:08 2006 @@ -606,11 +606,7 @@ } /* Calculate loss percent */ - if (LostCount > 0) { - Count = (SentCount * 100) / LostCount; - } else { - Count = 0; - } + Count = (LostCount * 100) / SentCount; if (!MinRTTSet) MinRTT = MaxRTT;

1 0

[greatlrd] 22155: fix so fread return right value of bytes/chars it reads make one more wine test pass in msvcrt file
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Thu Jun 1 22:20:34 2006 New Revision: 22155 URL: http://svn.reactos.ru/svn/reactos?rev=22155&view=rev Log: fix so fread return right value of bytes/chars it reads make one more wine test pass in msvcrt file Modified: trunk/reactos/lib/crt/stdio/fread.c Modified: trunk/reactos/lib/crt/stdio/fread.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdio/fread.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/stdio/fread.c (original) +++ trunk/reactos/lib/crt/stdio/fread.c Thu Jun 1 22:20:34 2006 @@ -81,5 +81,8 @@ } } } - return count - (to_read/size); + // return count - (to_read/size) + /* FIXME is this formual right ?, I copy the formula from djgpp + in our to_read or copy ? */ + return size != 0 ? count - ((to_read + size - 1) / size) : 0; }

1 0

[cwittich] 22154: -don't update the time in the DTP control when the user is about to change it
by cwittich＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: cwittich Date: Thu Jun 1 22:06:25 2006 New Revision: 22154 URL: http://svn.reactos.ru/svn/reactos?rev=22154&view=rev Log: -don't update the time in the DTP control when the user is about to change it Modified: trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 1 22:06:25 2006 @@ -52,6 +52,7 @@ static HBITMAP hBitmap = NULL; static int cxSource, cySource; +static WNDPROC pOldWndProc = NULL; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -289,6 +290,25 @@ } +INT_PTR CALLBACK +DTPProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_KEYDOWN: + /* stop the timer when the user is about to change the time */ + if ((wParam != VK_LEFT) & (wParam != VK_RIGHT)) + KillTimer(GetParent(hwnd), ID_TIMER); + return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); + break; + default: + return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); + } +} + /* Property page dialog callback */ INT_PTR CALLBACK DateTimePageProc(HWND hwndDlg, @@ -321,6 +341,8 @@ NULL, hApplet, NULL); + + pOldWndProc = (WNDPROC) SetWindowLong(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); break; case WM_TIMER:

1 0

[greatlrd] 22153: [AUDIT] this code is clear, if u look at djgpp fread u will see it base directly of it same struct and line out.
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Thu Jun 1 21:42:00 2006 New Revision: 22153 URL: http://svn.reactos.ru/svn/reactos?rev=22153&view=rev Log: [AUDIT] this code is clear, if u look at djgpp fread u will see it base directly of it same struct and line out. Modified: trunk/reactos/lib/crt/stdio/fread.c (props changed) Propchange: trunk/reactos/lib/crt/stdio/fread.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22152: add a really dodgy delete button. I'll replace all these buttons in due course.
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Thu Jun 1 21:29:05 2006 New Revision: 22152 URL: http://svn.reactos.ru/svn/reactos?rev=22152&view=rev Log: add a really dodgy delete button. I'll replace all these buttons in due course. Modified: trunk/reactos/base/applications/servman/res/toolbar.bmp Modified: trunk/reactos/base/applications/servman/res/toolbar.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/r… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006