Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gedmurphy] 20953: - Resource added for creating a service

by gedmurphy＠svn.reactos.org

- Resource added for creating a service - Allow the prop sheet to control services - Add exe path to prop sheet - Only update the listview item itself when changing a service state Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-20 16:14:10 UTC (rev 20952) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-20 17:29:50 UTC (rev 20953) @@ -57,7 +57,7 @@ FONT 8,"Tahoma",0,0 STYLE 0x00C80080 BEGIN - CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)",IDC_STATIC,"Static",WS_VISIBLE|0x0002000C,48,7,13 0,26 + CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)",IDC_STATIC,"Static",0x1002000C,48,7,130,26 CONTROL "Close",IDOK,"Button",0x50030001,75,162,44,15 CONTROL "",IDI_SM_ICON,"Static",0x50000203,0,12,7,30 CONTROL "",IDC_LICENSE_EDIT,"Edit",0x50210804,8,44,174,107,0x00000200 @@ -67,7 +67,6 @@ FONT 8,"MS Sans Serif",0,0 STYLE 0x10CF0000 BEGIN - CONTROL "Service name:",IDC_STATIC,"Static",0x50000000,4,11,53,11 CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 CONTROL "",IDC_EXEPATH,"Static",0x50001000,6,86,238,12 @@ -76,6 +75,7 @@ CONTROL "Stop",IDC_STOP,"Button",0x50010000,68,155,54,15 CONTROL "Pause",IDC_PAUSE,"Button",0x50010000,130,155,54,15 CONTROL "Resume",IDC_RESUME,"Button",0x50010000,192,155,54,15 + CONTROL "Service name:",IDC_STATIC,"Static",0x50000000,4,11,53,11 CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 CONTROL "Display name:",IDC_STATIC,"Static",0x50000000,4,29,53,11 CONTROL "Description",IDC_STATIC,"Static",0x50000000,4,51,53,11 @@ -98,7 +98,28 @@ CONTROL "This service depends on the following components",IDC_STATIC,"Static",0x50000000,8,57,236,9 CONTROL "",IDC_DEPEND_SERVICE,"Static",0x50000000,8,38,236,13 END +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "Create a service" +FONT 8,"MS Sans Serif",0,0 +STYLE 0x10CF0000 +BEGIN + CONTROL "",IDC_CREATE_SERVNAME,"Edit",0x50010000,72,12,150,11,0x00000200 + CONTROL "",IDC_CREATE_DISPNAME,"Edit",0x50010000,72,31,150,11,0x00000200 + CONTROL "",IDC_CREATE_PATH,"Edit",0x50010000,8,62,214,13,0x00000200 + CONTROL "",IDC_CREATE_DESC,"Edit",0x50010000,10,97,210,48,0x00000200 + CONTROL "",IDC_CREATE_OPTIONS,"Edit",0x50010000,10,162,210,13,0x00000200 + CONTROL "Service Name :",IDC_STATIC,"Static",0x50000202,12,12,54,9 + CONTROL "Display Name :",IDC_STATIC,"Static",0x50000202,12,33,54,9 + CONTROL "Path to executable :",IDC_STATIC,"Static",0x50000000,10,51,68,9 + CONTROL "Description :",IDC_STATIC,"Static",0x50000000,12,86,44,9 + CONTROL "OK",IDOK,"Button",0x50010000,126,192,44,13 + CONTROL "Cancel",IDCANCEL,"Button",0x50010000,176,192,46,13 + CONTROL "Additional options (click help for details)",IDC_STATIC,"Static",0x50000000,10,151,134,9 + CONTROL "Help",ID_CREATE_HELP,"Button",0x50010000,6,192,44,13 +END + IDB_BUTTONS BITMAP DISCARDABLE "res/toolbar.bmp" + STRINGTABLE DISCARDABLE BEGIN IDS_FIRSTCOLUMN "Name" _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-20 16:14:10 UTC (rev 20952) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-20 17:29:50 UTC (rev 20953) @@ -90,7 +90,7 @@ Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; /* open the registry key for the service */ - _sntprintf(buf, 300, Path, Service->lpServiceName); + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, Service->lpServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, buf, 0, @@ -99,23 +99,26 @@ /* set the service name */ DlgInfo.lpServiceName = Service->lpServiceName; - SendDlgItemMessageW(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpServiceName); + SendDlgItemMessage(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, ( + LPARAM)DlgInfo.lpServiceName); /* set the display name */ DlgInfo.lpDisplayName = Service->lpDisplayName; - SendDlgItemMessageW(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDisplayName); + SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, + (LPARAM)DlgInfo.lpDisplayName); /* set the description */ if (GetDescription(hKey, &DlgInfo.lpDescription)) - SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDescription); + SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, + (LPARAM)DlgInfo.lpDescription); /* FIXME: needs implementing. Use code base at bottom of query.c */ /* set the executable path */ if (GetExecutablePath(&DlgInfo.lpPathToExe)) - SendDlgItemMessageW(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpPathToExe); + SendDlgItemMessage(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpPathToExe); /* set startup type */ @@ -163,18 +166,26 @@ { case WM_INITDIALOG: GetDlgInfo(hwndDlg); - break; case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_START: + SendMessage(hMainWnd, WM_COMMAND, ID_START, 0); break; case IDC_STOP: + SendMessage(hMainWnd, WM_COMMAND, ID_STOP, 0); + break; + case IDC_PAUSE: + SendMessage(hMainWnd, WM_COMMAND, ID_PAUSE, 0); break; + + case IDC_RESUME: + SendMessage(hMainWnd, WM_COMMAND, ID_RESUME, 0); + break; } break; _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-20 16:14:10 UTC (rev 20952) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-20 17:29:50 UTC (rev 20953) @@ -74,44 +74,64 @@ /* get vendor of service binary */ BOOL GetExecutablePath(LPTSTR *ExePath) { + SC_HANDLE hSCManager = NULL; + SC_HANDLE hSc = NULL; LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; - SC_HANDLE hService = NULL; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; LVITEM item; - WORD wCodePage, wLangID; - DWORD BytesNeeded = 0, dwHandle, dwLen; + DWORD BytesNeeded = 0; TCHAR FileName[MAX_PATH]; - LPTSTR lpData; - LPTSTR lpBuffer; - TCHAR szStrFileInfo[80]; - LPVOID pvData; - UINT BufLen; - if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) + item.mask = LVIF_PARAM; + item.iItem = GetSelectedItem(); + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + /* open handle to the SCM */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); + if (hSCManager == NULL) { + GetError(0); + return FALSE; + } + + /* get a handle to the service requested for starting */ + hSc = OpenService(hSCManager, Service->lpServiceName, SERVICE_QUERY_CONFIG); + if (hSc == NULL) + { + GetError(0); + goto cleanup; + } + + + if (!QueryServiceConfig(hSc, pServiceConfig, 0, &BytesNeeded)) + { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceConfig == NULL) - return FALSE; + goto cleanup; - if (!QueryServiceConfig(hService, + if (!QueryServiceConfig(hSc, pServiceConfig, BytesNeeded, &BytesNeeded)) { HeapFree(GetProcessHeap(), 0, pServiceConfig); - return FALSE; + goto cleanup; } } else /* exit on failure */ { - return FALSE; + goto cleanup; } } - memset(&FileName, 0, MAX_PATH); + ZeroMemory(&FileName, MAX_PATH); if (_tcscspn(pServiceConfig->lpBinaryPathName, _T("\""))) { _tcsncpy(FileName, pServiceConfig->lpBinaryPathName, @@ -122,46 +142,19 @@ _tcscpy(FileName, pServiceConfig->lpBinaryPathName); } - HeapFree(GetProcessHeap(), 0, pServiceConfig); - pServiceConfig = NULL; + *ExePath = FileName; - dwLen = GetFileVersionInfoSize(FileName, &dwHandle); - if (dwLen) - { - lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); - if (lpData == NULL) - return FALSE; + CloseServiceHandle(hSCManager); + CloseServiceHandle(hSc); - if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { - HeapFree(GetProcessHeap(), 0, lpData); - return FALSE; - } + return TRUE; - if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), &pvData, (PUINT) &BufLen)) - { - wCodePage = LOWORD(*(DWORD*) pvData); - wLangID = HIWORD(*(DWORD*) pvData); - wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), wCodePage, wLangID); - } - - if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) { - item.pszText = lpBuffer; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - HeapFree(GetProcessHeap(), 0, lpData); - } - /*else - { - LoadString(hInstance, IDS_SERVICES_UNKNOWN, szStatus, 128); - item.pszText = szStatus; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - }*/ - - CloseServiceHandle(hService); - - return TRUE; +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hSc != NULL) + CloseServiceHandle(hSc); + return FALSE; } @@ -172,7 +165,7 @@ { LVITEM item; TCHAR szNumServices[32]; - TCHAR szStatus[128]; + TCHAR szStatus[64]; DWORD NumServices = 0; DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); @@ -193,7 +186,8 @@ GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1); /* Add an icon to each image list */ - hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); + hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, 16, 16, 0); ImageList_AddIcon(hSmall, hiconItem); /* assign the image to the list view */ @@ -249,9 +243,11 @@ /* set the status */ - if (pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (pServiceStatus[Index].ServiceStatusProcess.dwCurrentState + == SERVICE_RUNNING) { - LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, 128); + LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); item.pszText = szStatus; item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); @@ -275,21 +271,24 @@ if (StartUp == 0x02) { - LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, 128); + LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); item.pszText = szStatus; item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } else if (StartUp == 0x03) { - LoadString(hInstance, IDS_SERVICES_MAN, szStatus, 128); + LoadString(hInstance, IDS_SERVICES_MAN, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); item.pszText = szStatus; item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } else if (StartUp == 0x04) { - LoadString(hInstance, IDS_SERVICES_DIS, szStatus, 128); + LoadString(hInstance, IDS_SERVICES_DIS, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); item.pszText = szStatus; item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); @@ -342,7 +341,8 @@ NumListedServ = ListView_GetItemCount(hListView); /* set the number of listed services in the status bar */ - LoadString(hInstance, IDS_NUM_SERVICES, szNumServices, 32); + LoadString(hInstance, IDS_NUM_SERVICES, szNumServices, + sizeof(szNumServices) / sizeof(TCHAR)); _sntprintf(buf, 300, szNumServices, NumListedServ); SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf); } @@ -382,7 +382,8 @@ if (GetLastError() == ERROR_MORE_DATA) { /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceStatus == NULL) return FALSE; @@ -566,5 +567,53 @@ } CloseServiceHandle(hService); } + + + + + + + + HeapFree(GetProcessHeap(), 0, pServiceConfig); + pServiceConfig = NULL; + + dwLen = GetFileVersionInfoSize(FileName, &dwHandle); + if (dwLen) + { + lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); + if (lpData == NULL) + return FALSE; + + if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { + HeapFree(GetProcessHeap(), 0, lpData); + return FALSE; + } + + if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), + &pvData, (PUINT) &BufLen)) + { + wCodePage = LOWORD(*(DWORD*) pvData); + wLangID = HIWORD(*(DWORD*) pvData); + wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), + wCodePage, wLangID); + } + + if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) + { + item.pszText = lpBuffer; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + HeapFree(GetProcessHeap(), 0, lpData); + } + else + { + LoadString(hInstance, IDS_SERVICES_UNKNOWN, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + + */ _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-20 16:14:10 UTC (rev 20952) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-20 17:29:50 UTC (rev 20953) @@ -87,3 +87,12 @@ #define IDC_DEPEND_TREE2 20003 #define IDC_DEPEND_SERVICE 20004 + +/* create service dialog */ +#define IDD_DLG_CREATE 8000 +#define IDC_CREATE_SERVNAME 8001 +#define IDC_CREATE_DISPNAME 8002 +#define IDC_CREATE_PATH 8003 +#define IDC_CREATE_DESC 8004 +#define IDC_CREATE_OPTIONS 8005 +#define ID_CREATE_HELP 8006 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-20 16:14:10 UTC (rev 20952) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-20 17:29:50 UTC (rev 20953) @@ -332,6 +332,7 @@ { case ID_PROP: OpenPropSheet(hwnd); + break; case ID_REFRESH: @@ -342,29 +343,63 @@ break; case ID_START: - DoStartService(); - RefreshServiceList(); + if ( DoStartService() ) + { + LVITEM item; + TCHAR szStatus[64]; + + LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + item.pszText = szStatus; + item.iItem = GetSelectedItem(); + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } break; case ID_STOP: - Control(SERVICE_CONTROL_STOP); - RefreshServiceList(); + if( Control(SERVICE_CONTROL_STOP) ) + { + LVITEM item; + + item.pszText = '\0'; + item.iItem = GetSelectedItem(); + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } break; case ID_PAUSE: Control(SERVICE_CONTROL_PAUSE); - RefreshServiceList(); break; case ID_RESUME: Control(SERVICE_CONTROL_CONTINUE ); - RefreshServiceList(); break; case ID_RESTART: - Control(SERVICE_CONTROL_STOP); - DoStartService(); - RefreshServiceList(); + if( Control(SERVICE_CONTROL_STOP) ) + { + LVITEM item; + + item.pszText = '\0'; + item.iItem = GetSelectedItem(); + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + + if ( DoStartService() ) + { + LVITEM item; + TCHAR szStatus[64]; + + LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + item.pszText = szStatus; + item.iItem = GetSelectedItem(); + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } break; case ID_NEW: @@ -416,7 +451,6 @@ { WNDCLASSEX wc; MSG Msg; - BOOL bRet; hInstance = hThisInstance; @@ -461,17 +495,11 @@ ShowWindow(hMainWnd, nCmdShow); UpdateWindow(hMainWnd); - while( (bRet = GetMessage( &Msg, NULL, 0, 0 )) != 0) + while( GetMessage( &Msg, NULL, 0, 0 ) ) { - if (bRet == -1) - { - /* handle the error and possibly exit */ - } - else - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } return (int)Msg.wParam; }

18 years, 8 months

[mbosma] 20952: Delete libjpeg because sedwards and greatlord thought we should wait with jpeg support until the patent expired. If someone got a different opinion please take the issue to ros-dev.

by mbosma＠svn.reactos.org

Delete libjpeg because sedwards and greatlord thought we should wait with jpeg support until the patent expired. If someone got a different opinion please take the issue to ros-dev. Deleted: vendor/libjpeg/

18 years, 8 months

[frik85] 20951: RosCMS update:

by frik85＠svn.reactos.org

RosCMS update: remove an unused textbox, to avoid misunderstandings Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php 2006-01-20 01:54:56 UTC (rev 20950) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php 2006-01-20 15:51:54 UTC (rev 20951) @@ -166,12 +166,6 @@ </font></p></td> </tr> <tr> - <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Interests</strong></font></div></td> - <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> - <input name="intere" type="text" id="intere" value="<?php echo $result_content['user_fullname']; ?>" size="50" maxlength="100"> - </font></td> - </tr> - <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> <td valign="top" bgcolor="#E2E2E2"><textarea name="textarea_content" cols="60" rows="5" id="textarea_content"><?php echo $result_content['user_description']; @@ -259,6 +253,6 @@ <br> <address>* only required if you want to set a new password</address> <p><input type="submit" name="Submit" value="Update"> - </form> + </form> </div>

18 years, 8 months

[turner] 20950: Rename NtGdiGetTextExtentPoint to NtGdiGetTextExtent and correct the declaration.

by turner＠svn.reactos.org

Rename NtGdiGetTextExtentPoint to NtGdiGetTextExtent and correct the declaration. Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/lib/gdi32/objects/text.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-20 00:52:35 UTC (rev 20949) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-20 01:54:56 UTC (rev 20950) @@ -714,14 +714,6 @@ LPINT Dx, LPSIZE Size); -/* Rename to NtGdiGetTextExtent. Add 0 at the end. */ -BOOL -STDCALL -NtGdiGetTextExtentPoint(HDC hDC, - LPCWSTR String, - int Count, - LPSIZE Size); - /* Rename to NtGdiGetTextFaceW, add FALSE at the end. */ int STDCALL _____ Modified: trunk/reactos/lib/gdi32/objects/text.c --- trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 00:52:35 UTC (rev 20949) +++ trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 01:54:56 UTC (rev 20950) @@ -155,7 +155,7 @@ LPSIZE lpSize ) { - return NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize); + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0); } _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2006-01-20 00:52:35 UTC (rev 20949) +++ trunk/reactos/subsys/win32k/objects/text.c 2006-01-20 01:54:56 UTC (rev 20950) @@ -2446,12 +2446,13 @@ BOOL STDCALL -NtGdiGetTextExtentPoint(HDC hDC, - LPCWSTR String, - int Count, - LPSIZE Size) +NtGdiGetTextExtent(HDC hdc, + LPWSTR lpwsz, + INT cwc, + LPSIZE psize, + UINT flOpts) { - return NtGdiGetTextExtentExPoint(hDC, String, Count, 0, NULL, NULL, Size); + return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize); } BOOL _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-20 00:52:35 UTC (rev 20949) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-20 01:54:56 UTC (rev 20950) @@ -159,7 +159,7 @@ NtGdiGetTextCharsetInfo 3 NtGdiGetTextColor 1 NtGdiGetTextExtentExPoint 7 -NtGdiGetTextExtentPoint 4 +NtGdiGetTextExtent 5 NtGdiGetTextExtentPoint32 4 NtGdiGetTextFace 3 NtGdiGetTextMetrics 2

18 years, 8 months

[jimtabor] 20949: Move GetTextCharset & Info to text.c. This part of a Wine port.

by jimtabor＠svn.reactos.org

Move GetTextCharset & Info to text.c. This part of a Wine port. Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/lib/gdi32/objects/text.c _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2006-01-20 00:24:34 UTC (rev 20948) +++ trunk/reactos/lib/gdi32/include/precomp.h 2006-01-20 00:52:35 UTC (rev 20949) @@ -15,6 +15,7 @@ /* SDK/DDK/NDK Headers. */ #include <windows.h> #include <ndk/ntndk.h> +#include <wingdi.h> #include <winddi.h> #include <d3dnthal.h> #include <prntfont.h> _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2006-01-20 00:24:34 UTC (rev 20948) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2006-01-20 00:52:35 UTC (rev 20949) @@ -260,38 +260,6 @@ /* * @unimplemented */ -int -STDCALL -GetTextCharset( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -int -STDCALL -GetTextCharsetInfo( - HDC hdc, - LPFONTSIGNATURE lpSig, - DWORD dwFlags - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ DWORD STDCALL GetFontLanguageInfo( _____ Modified: trunk/reactos/lib/gdi32/objects/text.c --- trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 00:24:34 UTC (rev 20948) +++ trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 00:52:35 UTC (rev 20949) @@ -1,6 +1,10 @@ #include "precomp.h" +#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); + + + /* * @implemented */ @@ -49,6 +53,37 @@ /* * @implemented */ +int +STDCALL +GetTextCharset( + HDC hdc + ) +{ + /* MSDN docs say this is equivalent */ + return GetTextCharsetInfo(hdc, NULL, 0); +} + + +/* + * @unimplemented + */ +int +STDCALL +GetTextCharsetInfo( + HDC hdc, + LPFONTSIGNATURE lpSig, + DWORD dwFlags + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/* + * @implemented + */ BOOL STDCALL GetTextMetricsA(

18 years, 8 months

[gedmurphy] 20948: - Add some more info to the properties dialog

by gedmurphy＠svn.reactos.org

- Add some more info to the properties dialog - Preliminary starting and stopping of services - Other jiggling about of the code ;) - still untested (I should get really round to this sometime :) ) Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/about.c Added: trunk/reactos/subsys/system/servman/control.c Modified: trunk/reactos/subsys/system/servman/geterror.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h Modified: trunk/reactos/subsys/system/servman/servman.xml Added: trunk/reactos/subsys/system/servman/start.c _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-20 00:24:34 UTC (rev 20948) @@ -1,102 +1,92 @@ - IDR_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", ID_EXIT + MENUITEM "E&xit",ID_EXIT END POPUP "Action" BEGIN - MENUITEM "Start", ID_START - MENUITEM "Stop", ID_STOP - MENUITEM "Pause", ID_PAUSE - MENUITEM "Resume", ID_RESUME - MENUITEM "Restart", ID_RESTART + MENUITEM "Start",ID_START + MENUITEM "Stop",ID_STOP + MENUITEM "Pause",ID_PAUSE + MENUITEM "Resume",ID_RESUME + MENUITEM "Restart",ID_RESTART MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH + MENUITEM "Refresh",ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties", ID_PROP + MENUITEM "Properties",ID_PROP END POPUP "View" BEGIN - MENUITEM "Customize", ID_VIEW_CUSTOMIZE + MENUITEM "Customize",ID_VIEW_CUSTOMIZE END POPUP "Help" BEGIN - MENUITEM "About", ID_ABOUT + MENUITEM "About",ID_ABOUT END END - - IDR_POPUP MENU BEGIN POPUP "popup" BEGIN - MENUITEM "Start", ID_START - MENUITEM "Stop", ID_STOP - MENUITEM "Pause", ID_PAUSE - MENUITEM "Resume", ID_RESUME - MENUITEM "Restart", ID_RESTART + MENUITEM "Start",ID_START + MENUITEM "Stop",ID_STOP + MENUITEM "Pause",ID_PAUSE + MENUITEM "Resume",ID_RESUME + MENUITEM "Restart",ID_RESTART MENUITEM SEPARATOR POPUP "All tasks" BEGIN - MENUITEM "Start", ID_START - MENUITEM "Stop", ID_STOP - MENUITEM "Pause", ID_PAUSE - MENUITEM "Resume", ID_RESUME - MENUITEM "Restart", ID_RESTART - MENUITEM "Refresh", ID_REFRESH + MENUITEM "Start",ID_START + MENUITEM "Stop",ID_STOP + MENUITEM "Pause",ID_PAUSE + MENUITEM "Resume",ID_RESUME + MENUITEM "Restart",ID_RESTART + MENUITEM "Refresh",ID_REFRESH END MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH + MENUITEM "Refresh",ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties", ID_PROP + MENUITEM "Properties",ID_PROP MENUITEM SEPARATOR - MENUITEM "Help", ID_HELP + MENUITEM "Help",ID_HELP END END - - -IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "About Service Manager" -FONT 8, "Tahoma" +FONT 8,"Tahoma",0,0 +STYLE 0x00C80080 BEGIN - CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", - IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 - DEFPUSHBUTTON "Close",IDOK,75,162,44,15,WS_GROUP - ICON IDI_SM_ICON,IDC_STATIC,12,7,30,20 - EDITTEXT IDC_LICENSE_EDIT,8,44,174,107,ES_MULTILINE | - ES_READONLY | WS_VSCROLL + CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)",IDC_STATIC,"Static",WS_VISIBLE|0x0002000C,48,7,13 0,26 + CONTROL "Close",IDOK,"Button",0x50030001,75,162,44,15 + CONTROL "",IDI_SM_ICON,"Static",0x50000203,0,12,7,30 + CONTROL "",IDC_LICENSE_EDIT,"Edit",0x50210804,8,44,174,107,0x00000200 END - - IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "General" FONT 8,"MS Sans Serif",0,0 STYLE 0x10CF0000 BEGIN CONTROL "Service name:",IDC_STATIC,"Static",0x50000000,4,11,53,11 - CONTROL "Display name:",IDC_STATIC,"Static",0x50000000,4,29,53,11 - CONTROL "Description",IDC_STATIC,"Static",0x50000000,4,51,53,11 - CONTROL "",IDC_SERV_NAME,"Static",0x50000000,70,11,176,11 CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 - CONTROL "Path to executable:",IDC_STATIC,"Static",0x50000000,6,73,82,9 CONTROL "",IDC_EXEPATH,"Static",0x50001000,6,86,238,12 - CONTROL "Startup type:",IDC_STATIC,"Static",0x50000000,6,108,53,11 CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 - CONTROL "Service status:",IDC_STATIC,"Static",0x50000000,4,138,53,11 - CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 CONTROL "Start",IDC_START,"Button",0x50010000,6,155,54,15 CONTROL "Stop",IDC_STOP,"Button",0x50010000,68,155,54,15 CONTROL "Pause",IDC_PAUSE,"Button",0x50010000,130,155,54,15 CONTROL "Resume",IDC_RESUME,"Button",0x50010000,192,155,54,15 + CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 + CONTROL "Display name:",IDC_STATIC,"Static",0x50000000,4,29,53,11 + CONTROL "Description",IDC_STATIC,"Static",0x50000000,4,51,53,11 + CONTROL "",IDC_SERV_NAME,"Static",0x50000000,70,11,176,11 + CONTROL "Path to executable:",IDC_STATIC,"Static",0x50000000,6,73,82,9 + CONTROL "Startup type:",IDC_STATIC,"Static",0x50000000,6,108,53,11 + CONTROL "Service status:",IDC_STATIC,"Static",0x50000000,4,138,53,11 + CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 CONTROL "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC,"Static",0x50000000,6,177,240,15 CONTROL "Start parameters",IDC_STATIC,"Static",0x50000000,6,199,53,11 - CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END - IDD_DLG_DEPEND DIALOGEX 6,6,253,225 CAPTION "Dependencies" FONT 8,"MS Sans Serif",0,0 @@ -108,44 +98,38 @@ CONTROL "This service depends on the following components",IDC_STATIC,"Static",0x50000000,8,57,236,9 CONTROL "",IDC_DEPEND_SERVICE,"Static",0x50000000,8,38,236,13 END - - - -IDB_BUTTONS BITMAP "res/toolbar.bmp" - +IDB_BUTTONS BITMAP DISCARDABLE "res/toolbar.bmp" STRINGTABLE DISCARDABLE BEGIN - IDS_FIRSTCOLUMN "Name" + IDS_FIRSTCOLUMN "Name" IDS_SECONDCOLUMN "Description" - IDS_THIRDCOLUMN "Status" + IDS_THIRDCOLUMN "Status" IDS_FOURTHCOLUMN "Startup Type" - IDS_FITHCOLUMN "Log On As" + IDS_FITHCOLUMN "Log On As" END - STRINGTABLE DISCARDABLE BEGIN - IDS_SERVICES_STARTED "Started" - IDS_SERVICES_AUTO "Automatic" - IDS_SERVICES_MAN "Manual" - IDS_SERVICES_DIS "Disabled" + IDS_SERVICES_STARTED "Started" + IDS_SERVICES_STOPPED "Stopped" + IDS_SERVICES_AUTO "Automatic" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Disabled" END - STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" - IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have receive" END - STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "Properties" - IDS_TOOLTIP_REFRESH "Refresh" - IDS_TOOLTIP_EXPORT "Export list" - IDS_TOOLTIP_START "Start service" - IDS_TOOLTIP_STOP "Stop service" - IDS_TOOLTIP_PAUSE "Pause service" - IDS_TOOLTIP_RESTART "Restart service" - IDS_TOOLTIP_NEW "Create a service" - IDS_TOOLTIP_HELP "Help" - IDS_TOOLTIP_EXIT "Exit" + IDS_TOOLTIP_PROP "Properties" + IDS_TOOLTIP_REFRESH "Refresh" + IDS_TOOLTIP_EXPORT "Export list" + IDS_TOOLTIP_START "Start service" + IDS_TOOLTIP_STOP "Stop service" + IDS_TOOLTIP_PAUSE "Pause service" + IDS_TOOLTIP_RESTART "Restart service" + IDS_TOOLTIP_NEW "Create new a service" + IDS_TOOLTIP_HELP "Help" + IDS_TOOLTIP_EXIT "Exit" END _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -4,7 +4,7 @@ * FILE: subsys/system/servman/about.c * PURPOSE: About dialog box message handler * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ //ShellAbout(hwnd, _T("test"), _T("test2"), MAKEINTRESOURCE(IDI_SM_ICON)); @@ -19,13 +19,17 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - HWND hLicenseEditWnd; - TCHAR strLicense[0x1000]; + HWND hLicenseEditWnd; + HICON hIcon = NULL; + TCHAR strLicense[0x1000]; switch (message) { case WM_INITDIALOG: + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); LoadString(hInstance, IDS_LICENSE, strLicense, 0x1000); @@ -38,6 +42,7 @@ if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { + DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; } _____ Added: trunk/reactos/subsys/system/servman/control.c --- trunk/reactos/subsys/system/servman/control.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/control.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/control + * PURPOSE: Stops, pauses and resumes a service + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "servman.h" + +extern HWND hListView; + + +BOOL Control(DWORD Control) +{ + SC_HANDLE hSCManager; + SC_HANDLE hSc; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + SERVICE_STATUS Status; + LVITEM item; + + item.mask = LVIF_PARAM; + item.iItem = GetSelectedItem(); + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + /* open handle to the SCM */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (hSCManager == NULL) + { + GetError(0); + return FALSE; + } + + /* open handle to the service */ + hSc = OpenService(hSCManager, Service->lpServiceName, + SERVICE_PAUSE_CONTINUE | SERVICE_STOP); + if (hSc == NULL) + { + GetError(0); + return FALSE; + } + + /* process requested action */ + if (! ControlService(hSc, Control, &Status)) + { + GetError(0); + CloseServiceHandle(hSc); + return FALSE; + } + + CloseServiceHandle(hSc); + + return TRUE; + +} _____ Modified: trunk/reactos/subsys/system/servman/geterror.c --- trunk/reactos/subsys/system/servman/geterror.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/geterror.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -1,4 +1,4 @@ - +//#include <stdarg> #include "servman.h" /* temp file for debugging */ @@ -27,6 +27,7 @@ VOID DisplayString(PTCHAR Msg) { + MessageBox(NULL, Msg, _T("Error!"), MB_OK | MB_ICONERROR); } _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: subsys/system/servman/propsheet.c * PURPOSE: Property dialog box message handler - * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ @@ -12,7 +12,7 @@ extern ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; extern HINSTANCE hInstance; extern HWND hListView; -extern INT SelectedItem; +extern HWND hMainWnd; typedef struct _PROP_DLG_INFO @@ -21,14 +21,58 @@ LPTSTR lpDisplayName; LPTSTR lpDescription; LPTSTR lpPathToExe; - DWORD dwStartupType; - DWORD dwServiceStatus; + TCHAR szStartupType; + TCHAR szServiceStatus[25]; LPTSTR lpStartParams; } PROP_DLG_INFO, *PPROP_DLG_INFO; +/* + * Fills the 'startup type' combo box with possible + * values and sets it to value of the selected item + */ +VOID SetStartupType(HKEY hKey, HWND hwndDlg) +{ + HWND hList; + TCHAR buf[25]; + DWORD dwValueSize = 0; + DWORD StartUp = 0; + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); + LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR)); + SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); + LoadString(hInstance, IDS_SERVICES_MAN, buf, sizeof(buf) / sizeof(TCHAR)); + SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); + LoadString(hInstance, IDS_SERVICES_DIS, buf, sizeof(buf) / sizeof(TCHAR)); + SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); + + dwValueSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + _T("Start"), + NULL, + NULL, + (LPBYTE)&StartUp, + &dwValueSize)) + { + RegCloseKey(hKey); + return; + } + + if (StartUp == 0x02) + SendMessage(hList, CB_SETCURSEL, 0, 0); + else if (StartUp == 0x03) + SendMessage(hList, CB_SETCURSEL, 1, 0); + else if (StartUp == 0x04) + SendMessage(hList, CB_SETCURSEL, 2, 0); + +} + + +/* + * Populates the General Properties dialog with + * the relevant service information + */ VOID GetDlgInfo(HWND hwndDlg) { HKEY hKey; @@ -39,7 +83,7 @@ TCHAR buf[300]; item.mask = LVIF_PARAM; - item.iItem = SelectedItem; + item.iItem = GetSelectedItem(); SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); /* copy pointer to selected service */ @@ -57,28 +101,57 @@ DlgInfo.lpServiceName = Service->lpServiceName; SendDlgItemMessageW(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpServiceName); + /* set the display name */ DlgInfo.lpDisplayName = Service->lpDisplayName; SendDlgItemMessageW(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDisplayName); + /* set the description */ if (GetDescription(hKey, &DlgInfo.lpDescription)) SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDescription); + + /* FIXME: needs implementing. Use code base at bottom of query.c */ /* set the executable path */ if (GetExecutablePath(&DlgInfo.lpPathToExe)) SendDlgItemMessageW(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpPathToExe); + /* set startup type */ + SetStartupType(hKey, hwndDlg); + + /* set service status */ + if (Service->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + LoadString(hInstance, IDS_SERVICES_STARTED, DlgInfo.szServiceStatus, + sizeof(DlgInfo.szServiceStatus) / sizeof(TCHAR)); + SendDlgItemMessageW(hwndDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, (LPARAM)DlgInfo.szServiceStatus); + } + else + { + LoadString(hInstance, IDS_SERVICES_STOPPED, DlgInfo.szServiceStatus, + sizeof(DlgInfo.szServiceStatus) / sizeof(TCHAR)); + SendDlgItemMessageW(hwndDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, (LPARAM)DlgInfo.szServiceStatus); + } + + + + } #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -/* Property page dialog callback */ + +/* + * General Property dialog callback. + * Controls messages to the General dialog + */ +/* FIXME: this may be better as a modeless dialog */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, @@ -125,8 +198,11 @@ - - +/* + * Dependancies Property dialog callback. + * Controls messages to the Dependancies dialog + */ +/* FIXME: this may be better as a modeless dialog */ INT_PTR CALLBACK DependanciesPageProc(HWND hwndDlg, UINT uMsg, @@ -211,3 +287,4 @@ return (LONG)(PropertySheet(&psh) != -1); } + _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: subsys/system/servman/query.c * PURPOSE: Query service information - * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ @@ -23,6 +23,7 @@ HeapFree(GetProcessHeap(), 0, pServiceStatus); } + /* Retrives the service description from the registry */ BOOL GetDescription(HKEY hKey, LPTSTR *retDescription) { @@ -70,13 +71,102 @@ } +/* get vendor of service binary */ BOOL GetExecutablePath(LPTSTR *ExePath) { + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; + SC_HANDLE hService = NULL; + LVITEM item; + WORD wCodePage, wLangID; + DWORD BytesNeeded = 0, dwHandle, dwLen; + TCHAR FileName[MAX_PATH]; + LPTSTR lpData; + LPTSTR lpBuffer; + TCHAR szStrFileInfo[80]; + LPVOID pvData; + UINT BufLen; - return FALSE; + + if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pServiceConfig = (LPQUERY_SERVICE_CONFIG) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceConfig == NULL) + return FALSE; + + if (!QueryServiceConfig(hService, + pServiceConfig, + BytesNeeded, + &BytesNeeded)) + { + HeapFree(GetProcessHeap(), 0, pServiceConfig); + return FALSE; + } + } + else /* exit on failure */ + { + return FALSE; + } + } + + memset(&FileName, 0, MAX_PATH); + if (_tcscspn(pServiceConfig->lpBinaryPathName, _T("\""))) + { + _tcsncpy(FileName, pServiceConfig->lpBinaryPathName, + _tcscspn(pServiceConfig->lpBinaryPathName, _T(" ")) ); + } + else + { + _tcscpy(FileName, pServiceConfig->lpBinaryPathName); + } + + HeapFree(GetProcessHeap(), 0, pServiceConfig); + pServiceConfig = NULL; + + dwLen = GetFileVersionInfoSize(FileName, &dwHandle); + if (dwLen) + { + lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); + if (lpData == NULL) + return FALSE; + + if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { + HeapFree(GetProcessHeap(), 0, lpData); + return FALSE; + } + + if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), &pvData, (PUINT) &BufLen)) + { + wCodePage = LOWORD(*(DWORD*) pvData); + wLangID = HIWORD(*(DWORD*) pvData); + wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), wCodePage, wLangID); + } + + if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) { + item.pszText = lpBuffer; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + HeapFree(GetProcessHeap(), 0, lpData); + } + /*else + { + LoadString(hInstance, IDS_SERVICES_UNKNOWN, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + }*/ + + CloseServiceHandle(hService); + + return TRUE; } + + BOOL RefreshServiceList(VOID) { @@ -477,3 +567,4 @@ CloseServiceHandle(hService); } */ + _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-20 00:24:34 UTC (rev 20948) @@ -46,6 +46,7 @@ #define IDS_TOOLTIP_EXIT 6009 #define IDS_SERVICES_STARTED 5000 +#define IDS_SERVICES_STOPPED 5001 #define IDS_SERVICES_AUTO 5004 #define IDS_SERVICES_MAN 5005 #define IDS_SERVICES_DIS 5006 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: subsys/system/servman/servman.c * PURPOSE: Main window message handler - * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ @@ -20,6 +20,12 @@ INT SelectedItem; +INT GetSelectedItem(VOID) +{ + return SelectedItem; +} + + LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) @@ -336,18 +342,29 @@ break; case ID_START: + DoStartService(); + RefreshServiceList(); break; case ID_STOP: + Control(SERVICE_CONTROL_STOP); + RefreshServiceList(); break; case ID_PAUSE: + Control(SERVICE_CONTROL_PAUSE); + RefreshServiceList(); break; case ID_RESUME: + Control(SERVICE_CONTROL_CONTINUE ); + RefreshServiceList(); break; case ID_RESTART: + Control(SERVICE_CONTROL_STOP); + DoStartService(); + RefreshServiceList(); break; case ID_NEW: @@ -460,3 +477,4 @@ } + _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-20 00:24:34 UTC (rev 20948) @@ -3,7 +3,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include <windowsx.h> +#include <windowsx.h> /* GET_X/Y_LPARAM */ #include <stdio.h> #include <tchar.h> #include <commctrl.h> @@ -16,8 +16,11 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL Start(LPCTSTR, LPCTSTR, INT); +BOOL DoStartService(VOID); +BOOL Control(DWORD Control); +INT GetSelectedItem(VOID); + VOID GetError(DWORD); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); _____ Modified: trunk/reactos/subsys/system/servman/servman.xml --- trunk/reactos/subsys/system/servman/servman.xml 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/servman.xml 2006-01-20 00:24:34 UTC (rev 20948) @@ -14,10 +14,12 @@ <library>shell32</library> <compilationunit name="unit.c"> <file>about.c</file> + <file>control.c</file> <file>geterror.c</file> <file>propsheet.c</file> <file>query.c</file> <file>servman.c</file> + <file>start.c</file> </compilationunit> <file>servman.rc</file> <pch>servman.h</pch> _____ Added: trunk/reactos/subsys/system/servman/start.c --- trunk/reactos/subsys/system/servman/start.c 2006-01-19 18:19:44 UTC (rev 20947) +++ trunk/reactos/subsys/system/servman/start.c 2006-01-20 00:24:34 UTC (rev 20948) @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/start.c + * PURPOSE: Start a service + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "servman.h" + +extern HWND hListView; + +BOOL DoStartService(VOID) +{ + SC_HANDLE hSCManager; + SC_HANDLE hSc; + SERVICE_STATUS_PROCESS ServiceStatus; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + LVITEM item; + DWORD BytesNeeded; + INT ArgCount = 0; + BOOL Loop = 10; //FIXME: testing value. needs better control + + item.mask = LVIF_PARAM; + item.iItem = GetSelectedItem(); + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + /* open handle to the SCM */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (hSCManager == NULL) + { + GetError(0); + return FALSE; + } + + /* get a handle to the service requested for starting */ + hSc = OpenService(hSCManager, Service->lpServiceName, SERVICE_ALL_ACCESS); + if (hSc == NULL) + { + GetError(0); + return FALSE; + } + + /* start the service opened */ + if (! StartService(hSc, ArgCount, NULL)) + { + GetError(0); + return FALSE; + } + + /* query the state of the service */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + + /* loop whilst service is not running */ + /* FIXME: needs more control adding. 'Loop' is temparary */ + while (ServiceStatus.dwCurrentState == SERVICE_START_PENDING || !Loop) + { + /* wait before checking status */ + Sleep(ServiceStatus.dwWaitHint); + + /* check status again */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + Loop--; + } + + CloseServiceHandle(hSc); + + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + return TRUE; + else + return FALSE; + +} +

18 years, 8 months

[cwittich] 20947: display first tab at startup

by cwittich＠svn.reactos.org

display first tab at startup fixed a typo in german rc file resized some controls Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.c _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2006-01-19 03:25:51 UTC (rev 20946) +++ trunk/reactos/subsys/system/msconfig/De.rc 2006-01-19 18:19:44 UTC (rev 20947) @@ -60,19 +60,19 @@ BEGIN CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 PUSHBUTTON "&Alle Bootpfade ³berpr³fen", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 90, 12 - PUSHBUTTON "A&ls Standart", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12 - PUSHBUTTON "Nach &Oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12 - PUSHBUTTON "Nach &Unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12 + PUSHBUTTON "A&ls Standard", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12 + PUSHBUTTON "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12 + PUSHBUTTON "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12 GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90 CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 - CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "E&rweiterte Optionen...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 - LTEXT "&Zeitlimit:", -1, 280, 90, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 10, ES_LEFT - LTEXT "Sek.", -1, 340, 90, 15, 10 + LTEXT "&Zeitlimit:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "Sek.", -1, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2006-01-19 03:25:51 UTC (rev 20946) +++ trunk/reactos/subsys/system/msconfig/En.rc 2006-01-19 18:19:44 UTC (rev 20947) @@ -65,14 +65,14 @@ PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Boot Options", -1, 10, 80, 250, 90 CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 - CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Timeout:", -1, 280, 90, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 10, ES_LEFT - LTEXT "sec.", -1, 340, 90, 15, 10 + LTEXT "&Timeout:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "sec.", -1, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2006-01-19 03:25:51 UTC (rev 20946) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2006-01-19 18:19:44 UTC (rev 20947) @@ -5,6 +5,7 @@ HWND hMainWnd; /* Main Window */ HWND hTabWnd; /* Tab Control Window */ +void MsConfig_OnTabWndSelChange(void); BOOL OnCreate(HWND hWnd) { @@ -59,6 +60,8 @@ item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 5, &item); + MsConfig_OnTabWndSelChange(); + return TRUE; } @@ -161,6 +164,7 @@ case WM_DESTROY: DestroyWindow(hToolsPage); + DestroyWindow(hGeneralPage); DestroyWindow(hServicesPage); DestroyWindow(hStartupPage); DestroyWindow(hFreeLdrPage);

18 years, 8 months

[jimtabor] 20946: Patch by Sebastiaan Roodenburg. Fixes problem in NtGdiStrechBlt.

by jimtabor＠svn.reactos.org

Patch by Sebastiaan Roodenburg. Fixes problem in NtGdiStrechBlt. Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-18 22:02:44 UTC (rev 20945) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-19 03:25:51 UTC (rev 20946) @@ -1274,18 +1274,20 @@ if (WinSta->WallpaperMode == wmStretch) { - NtGdiStretchBlt(hDC, - x, - y, - Rect.right, - Rect.bottom, - hWallpaperDC, - 0, - 0, + if(Rect.right && Rect.bottom) + NtGdiStretchBlt(hDC, + x, + y, + sz.cx, + sz.cy, + hWallpaperDC, + 0, + 0, WinSta->cxWallpaper, WinSta->cyWallpaper, SRCCOPY, 0); + } else if (WinSta->WallpaperMode == wmTile) {

18 years, 8 months

[jimtabor] 20945: Start Wine port for most Gdi functions. GetCharWidthA should be redirected to GetCharWidth32A in the def file. Just taking one step at a time ATM.

by jimtabor＠svn.reactos.org

Start Wine port for most Gdi functions. GetCharWidthA should be redirected to GetCharWidth32A in the def file. Just taking one step at a time ATM. Modified: trunk/reactos/lib/gdi32/objects/font.c _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2006-01-17 23:14:51 UTC (rev 20944) +++ trunk/reactos/lib/gdi32/objects/font.c 2006-01-18 22:02:44 UTC (rev 20945) @@ -331,8 +331,7 @@ LPINT lpBuffer ) { - /* FIXME what to do with iFirstChar and iLastChar ??? */ - return NtGdiGetCharWidth32 ( hdc, iFirstChar, iLastChar, lpBuffer ); + return GetCharWidth32A ( hdc, iFirstChar, iLastChar, lpBuffer ); }

18 years, 8 months

[hbirr] 20944: Removed my name from the hall of fame. Since it seems, that parts of ReactOS are implemented by ripping code from Windows, it isn't longer honourable to find my name inside the sources of ReactOS.

by hbirr＠svn.reactos.org

Removed my name from the hall of fame. Since it seems, that parts of ReactOS are implemented by ripping code from Windows, it isn't longer honourable to find my name inside the sources of ReactOS. Modified: trunk/rosapps/notevil/notevil.rc Modified: trunk/rosapps/tests/diskspeed/diskspeed.c _____ Modified: trunk/rosapps/notevil/notevil.rc --- trunk/rosapps/notevil/notevil.rc 2006-01-17 23:11:13 UTC (rev 20943) +++ trunk/rosapps/notevil/notevil.rc 2006-01-17 23:14:51 UTC (rev 20944) @@ -43,33 +43,32 @@ 19, "Paolo Pantaleo" 20, "Hernan Ochoa" 21, "Casper Hornstrup" - 22, "Hartmut Birr" - 23, "Steven Edwards" - 24, "KJK::Hyperion" - 25, "Robert Dickenson" - 26, "Eugene Ingerman" - 27, "Guido de Jong" - 28, "Jurgen van Gael" - 29, "Marty Dill" - 30, "Ge van Geldorp" + 22, "Steven Edwards" + 23, "KJK::Hyperion" + 24, "Robert Dickenson" + 25, "Eugene Ingerman" + 26, "Guido de Jong" + 27, "Jurgen van Gael" + 28, "Marty Dill" + 29, "Ge van Geldorp" + 30, "Richard Campbell" END STRINGTABLE MOVEABLE BEGIN - 31, "Richard Campbell" - 32, "Gunnar Andre' Dalsnes" - 33, "Aleksey Bragin" - 34, "Royce Mitchell III" - 35, "Mark Tempel" - 36, "Art Yerkes" - 37, "Martin Fuchs" - 38, "Vizzini" - 39, "Filip Navara" - 40, "Andrew Greenwood" - 41, "Thomas Weidenmueller" - 42, "Jonathan Wilson" - 43, "Alex Ionescu" - 44, "Jim Tabor" + 31, "Gunnar Andre' Dalsnes" + 32, "Aleksey Bragin" + 33, "Royce Mitchell III" + 34, "Mark Tempel" + 35, "Art Yerkes" + 36, "Martin Fuchs" + 37, "Vizzini" + 38, "Filip Navara" + 39, "Andrew Greenwood" + 40, "Thomas Weidenmueller" + 41, "Jonathan Wilson" + 42, "Alex Ionescu" + 43, "Jim Tabor" END /* EOF */ _____ Modified: trunk/rosapps/tests/diskspeed/diskspeed.c --- trunk/rosapps/tests/diskspeed/diskspeed.c 2006-01-17 23:11:13 UTC (rev 20943) +++ trunk/rosapps/tests/diskspeed/diskspeed.c 2006-01-17 23:14:51 UTC (rev 20944) @@ -5,7 +5,7 @@ * PROJECT: ReactOS diskspeed.exe * FILE: apps/tests/diskspeed/diskspeed.c * PURPOSE: Determines disk transfer rates - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: */ #include <stdio.h>

18 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
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 January 2006