Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[gedmurphy] 24383: add LPCDLGTEMPLATE definition
by gedmurphy＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: gedmurphy Date: Wed Oct 4 02:43:46 2006 New Revision: 24383 URL: http://svn.reactos.org/svn/reactos?rev=24383&view=rev Log: add LPCDLGTEMPLATE definition Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Wed Oct 4 02:43:46 2006 @@ -2631,6 +2631,13 @@ short cy; } DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW; typedef const DLGTEMPLATE *LPCDLGTEMPLATE; +typedef const DLGTEMPLATE *LPCDLGTEMPLATEA; +typedef const DLGTEMPLATE *LPCDLGTEMPLATEW; +#ifdef UNICODE +typedef LPCDLGTEMPLATEW LPCDLGTEMPLATE; +#else +typedef LPCDLGTEMPLATEA LPCDLGTEMPLATE; +#endif // UNICODE #pragma pack(pop) typedef struct tagDRAWITEMSTRUCT { UINT CtlType;

1 0

[gedmurphy] 24382: fix processor display
by gedmurphy＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: gedmurphy Date: Wed Oct 4 00:51:35 2006 New Revision: 24382 URL: http://svn.reactos.org/svn/reactos?rev=24382&view=rev Log: fix processor display Modified: trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Wed Oct 4 00:51:35 2006 @@ -131,12 +131,12 @@ { if (dwBuf < 1000) { - _stprintf(szBuf, _T("%lu MHz"), dwBuf); + _stprintf(szBuf, _T("%.2f MHz"), dwBuf); } else { double flt = dwBuf / 1000.0; - _stprintf(szBuf, _T("%l GHz"), flt); + _stprintf(szBuf, _T("%.2f GHz"), flt); } SetDlgItemText(hwnd,

1 0

[weiden] 24381: Fix warning
by weiden＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: weiden Date: Wed Oct 4 00:04:39 2006 New Revision: 24381 URL: http://svn.reactos.org/svn/reactos?rev=24381&view=rev Log: Fix warning Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 4 00:04:39 2006 @@ -298,7 +298,7 @@ ScreenToClient(Info->hTreeView, &HitTest.pt)) { if (TreeView_HitTest(Info->hTreeView, &HitTest)) - TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + (void)TreeView_SelectItem(Info->hTreeView, HitTest.hItem); } } break;

1 0

[gedmurphy] 24380: - Implement the context menu (mouse only at the moment) makeing it accessable when the cursor over the item only - open the propsheet when double clicking child items - make 'properties' bold
by gedmurphy＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: gedmurphy Date: Tue Oct 3 23:55:15 2006 New Revision: 24380 URL: http://svn.reactos.org/svn/reactos?rev=24380&view=rev Log: - Implement the context menu (mouse only at the moment) makeing it accessable when the cursor over the item only - open the propsheet when double clicking child items - make 'properties' bold Modified: trunk/reactos/base/applications/devmgmt/En.rc trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/precomp.h Modified: trunk/reactos/base/applications/devmgmt/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/En.rc (original) +++ trunk/reactos/base/applications/devmgmt/En.rc Tue Oct 3 23:55:15 2006 @@ -8,7 +8,7 @@ BEGIN MENUITEM "Print", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Properties...", IDC_PROP + MENUITEM "Properties", IDC_PROP MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP, GRAYED END @@ -30,7 +30,7 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Properties...", IDC_PROP, GRAYED + MENUITEM "Properties", IDC_PROP MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP END Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Tue Oct 3 23:55:15 2006 @@ -9,9 +9,15 @@ #include "precomp.h" - static SP_CLASSIMAGELIST_DATA ImageListData; static HDEVINFO hDevInfo; + + +VOID OpenPropSheet(HTREEITEM hItem) +{ + DisplayString(_T("Device Propsheet not yet implemented")); +} + static HTREEITEM InsertIntoTreeView(HWND hTV, @@ -91,12 +97,12 @@ /* FIXME: can we do this? * Set the blank icon: IDI_SETUPAPI_BLANK = 41 * it'll be image 24 in the imagelist */ - *ClassImage = 41; + *ClassImage = 24; } /* Get device info for all devices of a particular class */ hDevInfo = SetupDiGetClassDevs(&ClassGuid, - 0, + NULL, NULL, DIGCF_PRESENT); if (hDevInfo == INVALID_HANDLE_VALUE) Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Tue Oct 3 23:55:15 2006 @@ -11,6 +11,7 @@ static const TCHAR szMainWndClass[] = TEXT("DevMgmtWndClass"); + /* Toolbar buttons */ TBBUTTON Buttons [] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ @@ -39,6 +40,7 @@ {IDC_PROGHELP, IDS_HINT_HELP}, {IDC_ABOUT, IDS_HINT_ABOUT} }; + /* system menu hints */ static const MENU_HINT SystemMenuHintTable[] = { {SC_RESTORE, IDS_HINT_SYS_RESTORE}, @@ -153,11 +155,11 @@ Info->hTreeView = CreateWindowEx(0, WC_TREEVIEW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | - TVS_HASLINES | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_LINESATROOT, + WS_CHILD | WS_VISIBLE | WS_BORDER | TVS_HASLINES | + TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_LINESATROOT, 0, 0, 0, 0, Info->hMainWnd, - (HMENU) IDC_TREEVIEW, + (HMENU)IDC_TREEVIEW, hInstance, NULL); if (Info->hTreeView == NULL) @@ -200,6 +202,7 @@ static VOID InitMainWnd(PMAIN_WND_INFO Info) { + HMENU hMenu; HTREEITEM hRoot; if (!CreateToolbar(Info)) @@ -213,16 +216,123 @@ if (!CreateStatusBar(Info)) DisplayString(_T("error creating status bar")); + + /* make 'properties' bold */ + hMenu = GetMenu(Info->hMainWnd); + hMenu = GetSubMenu(hMenu, 1); + SetMenuDefaultItem(hMenu, IDC_PROP, FALSE); /* Create Popup Menu */ Info->hShortcutMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_POPUP)); Info->hShortcutMenu = GetSubMenu(Info->hShortcutMenu, 0); - + SetMenuDefaultItem(Info->hShortcutMenu, IDC_PROP, FALSE); + + /* emum all devices */ hRoot = InitTreeView(Info); if (hRoot) ListDevicesByType(Info, hRoot); +} + + +static VOID +OnContext(PMAIN_WND_INFO Info, + LPARAM lParam) +{ + HTREEITEM hSelected; + POINT pt; + RECT rc; + + INT xPos = GET_X_LPARAM(lParam); + INT yPos = GET_Y_LPARAM(lParam); + + hSelected = TreeView_GetSelection(Info->hTreeView); + + if (TreeView_GetItemRect(Info->hTreeView, + hSelected, + &rc, + TRUE)) + { + if (GetCursorPos(&pt) && + ScreenToClient(Info->hTreeView, &pt) && + PtInRect(&rc, pt)) + { + TrackPopupMenuEx(Info->hShortcutMenu, + TPM_RIGHTBUTTON, + xPos, + yPos, + Info->hMainWnd, + NULL); + } + } +} + + +static VOID +OnNotify(PMAIN_WND_INFO Info, + LPARAM lParam) +{ + + LPNMHDR pnmhdr = (LPNMHDR)lParam; + + switch (pnmhdr->code) + { + case NM_DBLCLK: + { + HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); + + if (!TreeView_GetChild(Info->hTreeView, + hSelected)) + { + OpenPropSheet(hSelected); + } + } + break; + + case NM_RCLICK: + { + TV_HITTESTINFO HitTest; + + if (GetCursorPos(&HitTest.pt) && + ScreenToClient(Info->hTreeView, &HitTest.pt)) + { + if (TreeView_HitTest(Info->hTreeView, &HitTest)) + TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + } + } + break; + + case TTN_GETDISPINFO: + { + LPTOOLTIPTEXT lpttt; + UINT idButton; + + lpttt = (LPTOOLTIPTEXT)lParam; + + idButton = (UINT)lpttt->hdr.idFrom; + switch (idButton) + { + case IDC_PROP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PROP); + break; + + case IDC_REFRESH: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + break; + + case IDC_PROGHELP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + break; + + case IDC_EXIT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; + + } + } + break; + } } @@ -237,7 +347,8 @@ { case IDC_PROP: { - // call builtin driver prop sheet + HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); + OpenPropSheet(hSelected); } break; @@ -360,88 +471,14 @@ case WM_NOTIFY: { - LPNMHDR pnmhdr = (LPNMHDR)lParam; - - switch (pnmhdr->code) - { - case NM_DBLCLK: - { - POINT pt; - RECT rect; - - GetCursorPos(&pt); - GetWindowRect(Info->hTreeView, &rect); - - if (PtInRect(&rect, pt)) - { - SendMessage(hwnd, - WM_COMMAND, - //ID_PROP, - MAKEWPARAM((WORD)IDC_PROP, (WORD)0), - 0); - } - - //OpenPropSheet(Info); - } - break; - - case TTN_GETDISPINFO: - { - LPTOOLTIPTEXT lpttt; - UINT idButton; - - lpttt = (LPTOOLTIPTEXT)lParam; - - /* Specify the resource identifier of the descriptive - * text for the given button. */ - idButton = (UINT)lpttt->hdr.idFrom; - switch (idButton) - { - case IDC_PROP: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PROP); - break; - - case IDC_REFRESH: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); - break; - - case IDC_PROGHELP: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); - break; - - case IDC_EXIT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); - break; - - } - } - break; - } + OnNotify(Info, lParam); } break; case WM_CONTEXTMENU: - { - POINT pt; - RECT lvRect; - - INT xPos = GET_X_LPARAM(lParam); - INT yPos = GET_Y_LPARAM(lParam); - - GetCursorPos(&pt); - - /* display popup when cursor is in the list view */ - GetWindowRect(Info->hTreeView, &lvRect); - if (PtInRect(&lvRect, pt)) - { - TrackPopupMenuEx(Info->hShortcutMenu, - TPM_RIGHTBUTTON, - xPos, - yPos, - Info->hMainWnd, - NULL); - } - } + { + OnContext(Info, lParam); + } break; case WM_COMMAND: Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Tue Oct 3 23:55:15 2006 @@ -15,7 +15,7 @@ #pragma warning(disable : 4100) #endif -#define MAX_DEV_LEN 1000 +#define MAX_DEV_LEN 256 typedef struct _MAIN_WND_INFO { @@ -36,7 +36,7 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -/* servman.c */ +/* devmgmt.c */ extern HINSTANCE hInstance; extern HANDLE ProcessHeap; @@ -53,6 +53,7 @@ /* enumdevices.c */ +VOID OpenPropSheet(HTREEITEM hItem); HTREEITEM InitTreeView(PMAIN_WND_INFO Info); VOID ListDevicesByType(PMAIN_WND_INFO Info, HTREEITEM hRoot);

1 0

[hpoussin] 24379: Copy i8042prt driver from 0.3.1 branch to trunk. Try #2
by hpoussin＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: hpoussin Date: Tue Oct 3 22:04:03 2006 New Revision: 24379 URL: http://svn.reactos.org/svn/reactos?rev=24379&view=rev Log: Copy i8042prt driver from 0.3.1 branch to trunk. Try #2 Added: trunk/reactos/drivers/input/i8042prt/ - copied from r24378, branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/

1 0

[hpoussin] 24378: Of course, I've added one level in directory structure in 24377. Delete the whole i8042prt driver and retry (Sorry, this revision won't build)
by hpoussin＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: hpoussin Date: Tue Oct 3 22:03:28 2006 New Revision: 24378 URL: http://svn.reactos.org/svn/reactos?rev=24378&view=rev Log: Of course, I've added one level in directory structure in 24377. Delete the whole i8042prt driver and retry (Sorry, this revision won't build) Removed: trunk/reactos/drivers/input/i8042prt/ Modified: trunk/reactos/drivers/input/ (props changed) Propchange: trunk/reactos/drivers/input/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 3 22:03:28 2006 @@ -1,0 +1,3 @@ +hidusb +hidclass +mouhid

1 0

[hpoussin] 24377: Copy i8042prt driver from 0.3.1 branch to trunk
by hpoussin＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: hpoussin Date: Tue Oct 3 22:00:04 2006 New Revision: 24377 URL: http://svn.reactos.org/svn/reactos?rev=24377&view=rev Log: Copy i8042prt driver from 0.3.1 branch to trunk Added: trunk/reactos/drivers/input/i8042prt/i8042prt/ - copied from r24376, branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/

1 0

[hpoussin] 24376: Add back registry entries from i8042prt/kbdclass/mouclass
by hpoussin＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: hpoussin Date: Tue Oct 3 21:57:29 2006 New Revision: 24376 URL: http://svn.reactos.org/svn/reactos?rev=24376&view=rev Log: Add back registry entries from i8042prt/kbdclass/mouclass Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Oct 3 21:57:29 2006 @@ -564,6 +564,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 +; i8042 port driver +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 + ; Kernel-Mode Tests ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" @@ -571,8 +578,14 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 -; Keyboard parameters +; Keyboard class driver +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" ; SB16 driver HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Base" @@ -597,6 +610,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" +; Mouse class driver +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" + ; Mailslot filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System"

1 0

[weiden] 24375: Fix displaying Win32 errors (the Reg* APIs don't set the last error code!)
by weiden＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: weiden Date: Tue Oct 3 21:02:36 2006 New Revision: 24375 URL: http://svn.reactos.org/svn/reactos?rev=24375&view=rev Log: Fix displaying Win32 errors (the Reg* APIs don't set the last error code!) Modified: trunk/reactos/dll/cpl/timedate/internettime.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.h Modified: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/internett… ============================================================================== --- trunk/reactos/dll/cpl/timedate/internettime.c (original) +++ trunk/reactos/dll/cpl/timedate/internettime.c Tue Oct 3 21:02:36 2006 @@ -116,7 +116,7 @@ &hKey); if (Ret != ERROR_SUCCESS) { - GetError(); + DisplayWin32Error(Ret); return; } @@ -127,7 +127,7 @@ (LPBYTE)szSel, sizeof(szSel)); if (Ret != ERROR_SUCCESS) - GetError(); + DisplayWin32Error(Ret); RegCloseKey(hKey); @@ -180,7 +180,10 @@ 0, dwSize); if (buf == NULL) + { + Ret = ERROR_NOT_ENOUGH_MEMORY; goto fail; + } Ret = RegQueryValueExW(hKey, szSel, @@ -212,6 +215,7 @@ NULL, NULL)) { + Ret = GetLastError(); goto fail; } @@ -223,7 +227,7 @@ return TRUE; fail: - GetError(); + DisplayWin32Error(Ret); if (hKey) RegCloseKey(hKey); HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, *lpAddress); @@ -242,7 +246,7 @@ if (! GetNTPServerAddress(&lpAddress)) return 0; - if (InitialiseConnection(lpAddress)) + if (InitializeConnection(lpAddress)) { if (SendData()) { @@ -283,7 +287,7 @@ /* convert to a file time */ if (! SystemTimeToFileTime(&stNew, &ftNew)) { - GetError(); + DisplayWin32Error(GetLastError()); return; } @@ -295,7 +299,7 @@ /* convert back to a system time */ if (! FileTimeToSystemTime(&ftNew, &stNew)) { - GetError(); + DisplayWin32Error(GetLastError()); return; } @@ -304,7 +308,7 @@ I thought SetSystemTime already dealt with this */ if (! SetSystemTime(&stNew)) - GetError(); + DisplayWin32Error(GetLastError()); } @@ -342,7 +346,7 @@ &hKey); if (Ret != ERROR_SUCCESS) { - GetError(); + DisplayWin32Error(Ret); return; } @@ -355,7 +359,7 @@ &Size); if (Ret != ERROR_SUCCESS) { - GetError(); + DisplayWin32Error(Ret); } if (lstrcmp(Data, L"NTP") == 0) @@ -369,7 +373,7 @@ static VOID -InitialiseDialog(HWND hwnd) +InitializeDialog(HWND hwnd) { GetSyncSetting(hwnd); @@ -390,7 +394,7 @@ { case WM_INITDIALOG: { - InitialiseDialog(hwndDlg); + InitializeDialog(hwndDlg); } break; Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c Tue Oct 3 21:02:36 2006 @@ -15,7 +15,7 @@ SOCKADDR_IN myAddr, ntpAddr; BOOL -InitialiseConnection(LPSTR lpAddress) +InitializeConnection(LPSTR lpAddress) { WSADATA wsaData; HOSTENT *he; Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Tue Oct 3 21:02:36 2006 @@ -22,22 +22,35 @@ {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; - -VOID GetError(VOID) +#if DBG +VOID DisplayWin32ErrorDbg(DWORD dwErrorCode, const char *file, int line) +#else +VOID DisplayWin32Error(DWORD dwErrorCode) +#endif { LPVOID lpMsgBuf; +#if DBG + TCHAR szMsg[255]; +#endif FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, - GetLastError(), + dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL ); - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); +#if DBG + if (_stprintf(szMsg, _T("%hs:%d: %s"), file, line, lpMsgBuf)) + { + MessageBox(NULL, szMsg, NULL, MB_OK | MB_ICONERROR); + } +#else + MessageBox(NULL, lpMsgBuf, NULL, MB_OK | MB_ICONERROR); +#endif LocalFree(lpMsgBuf); } Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Tue Oct 3 21:02:36 2006 @@ -42,7 +42,12 @@ /* timedate.c */ -VOID GetError(VOID); +#if DBG +VOID DisplayWin32ErrorDbg(DWORD dwErrorCode, const char *file, int line); +#define DisplayWin32Error(e) DisplayWin32ErrorDbg(e, __FILE__, __LINE__); +#else +VOID DisplayWin32Error(DWORD dwErrorCode); +#endif /* clock.c */ @@ -51,7 +56,7 @@ /* ntpclient.c */ -BOOL InitialiseConnection(CHAR *szIpAddr); +BOOL InitializeConnection(CHAR *szIpAddr); VOID DestroyConnection(VOID); BOOL SendData(VOID); ULONG RecieveData(VOID);

1 0

[weiden] 24374: Fix displaying the size of the RAM
by weiden＠svn.reactos.org 03 Oct '06

03 Oct '06

Author: weiden Date: Tue Oct 3 20:25:13 2006 New Revision: 24374 URL: http://svn.reactos.org/svn/reactos?rev=24374&view=rev Log: Fix displaying the size of the RAM Modified: trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/en.rc (original) +++ trunk/reactos/dll/cpl/sysdm/en.rc Tue Oct 3 20:25:13 2006 @@ -283,4 +283,8 @@ BEGIN IDS_CPLSYSTEMNAME "System" IDS_CPLSYSTEMDESCRIPTION "See information about your computer and change various system and hardware settings." -END + IDS_MEGABYTE "MB of RAM" + IDS_GIGABYTE "GB of RAM" + IDS_TERABYTE "TB of RAM" + IDS_PETABYTE "PB of RAM" +END Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Tue Oct 3 20:25:13 2006 @@ -131,12 +131,12 @@ { if (dwBuf < 1000) { - wsprintf(szBuf, _T("%lu MHz"), dwBuf); + _stprintf(szBuf, _T("%lu MHz"), dwBuf); } else { double flt = dwBuf / 1000.0; - wsprintf(szBuf, _T("%l GHz"), flt); + _stprintf(szBuf, _T("%l GHz"), flt); } SetDlgItemText(hwnd, @@ -145,16 +145,14 @@ } } - static VOID GetSystemInformation(HWND hwnd) { HKEY hKey; TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); - MEMORYSTATUS MemStat; + MEMORYSTATUSEX MemStat; TCHAR Buf[32]; INT Ret = 0; - /* Get Processor information * @@ -187,14 +185,56 @@ /* Get total physical RAM */ MemStat.dwLength = sizeof(MemStat); - GlobalMemoryStatus(&MemStat); - - if (MemStat.dwTotalPhys < KB_DIV) - Ret = wsprintf(Buf, _T("%luKB of RAM"), MemStat.dwTotalPhys/KB_DIV); - else if (MemStat.dwTotalPhys >= KB_DIV && MemStat.dwTotalPhys < GB_DIV) - Ret = wsprintf(Buf, _T("%luMB of RAM"), MemStat.dwTotalPhys/MB_DIV); - else if (MemStat.dwTotalPhys > GB_DIV) - Ret = wsprintf(Buf, _T("%luGB of RAM"), MemStat.dwTotalPhys/GB_DIV); + if (GlobalMemoryStatusEx(&MemStat)) + { + TCHAR szStr[32]; + double dTotalPhys; + UINT i = 0; + static const UINT uStrId[] = { + IDS_MEGABYTE, + IDS_GIGABYTE, + IDS_TERABYTE, + IDS_PETABYTE + }; + + if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) + { + /* We're dealing with GBs or more */ + MemStat.ullTotalPhys /= 1024 * 1024; + i++; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + /* We're dealing with TBs or more */ + MemStat.ullTotalPhys /= 1024; + i++; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + /* We're dealing with PBs or more */ + + MemStat.ullTotalPhys /= 1024; + i++; + + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + { + /* We're daling with MBs */ + dTotalPhys = (double)MemStat.ullTotalPhys / 1024 / 1024; + } + + if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) + { + Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); + } + } if (Ret) { Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h Tue Oct 3 20:25:13 2006 @@ -11,9 +11,6 @@ #include "resource.h" #define NUM_APPLETS (1) -#define KB_DIV 1024 -#define MB_DIV 1048576 -#define GB_DIV 1.0737e9 typedef LONG (CALLBACK *APPLET_INITPROC)(VOID); Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Tue Oct 3 20:25:13 2006 @@ -13,6 +13,11 @@ #define IDS_CPLSYSTEMNAME 60 #define IDS_CPLSYSTEMDESCRIPTION 61 + +#define IDS_MEGABYTE 62 +#define IDS_GIGABYTE 63 +#define IDS_TERABYTE 64 +#define IDS_PETABYTE 65 /* propsheet - general */ Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Tue Oct 3 20:25:13 2006 @@ -8,12 +8,12 @@ <define name="WINVER">0x501</define> <library>kernel32</library> <library>advapi32</library> + <library>msvcrt</library> <library>user32</library> <library>gdi32</library> <library>comctl32</library> <library>netapi32</library> <library>ntdll</library> - <library>msvcrt</library> <library>msimg32</library> <library>shell32</library> <file>advanced.c</file>

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

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 October 2006