Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 28521: Start the move towards a partial rewrite of servman Too many changes for me to bother listing
by gedmurphy＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: gedmurphy Date: Fri Aug 24 22:27:12 2007 New Revision: 28521 URL: http://svn.reactos.org/svn/reactos?rev=28521&view=rev Log: Start the move towards a partial rewrite of servman Too many changes for me to bother listing Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/export.c trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/reg.c trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c Fri Aug 24 22:27:12 2007 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/control + * FILE: base/applications/mscutils/servman/control * PURPOSE: Stops, pauses and resumes a service * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * @@ -11,9 +11,9 @@ BOOL Control(PMAIN_WND_INFO Info, + HWND hProgDlg, DWORD Control) { - HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; @@ -28,19 +28,6 @@ LVM_GETITEM, 0, (LPARAM)&item); - - /* set the progress bar range and step */ - hProgBar = GetDlgItem(Info->hProgDlg, - IDC_SERVCON_PROGRESS); - SendMessage(hProgBar, - PBM_SETRANGE, - 0, - MAKELPARAM(0, PROGRESSRANGE)); - - SendMessage(hProgBar, - PBM_SETSTEP, - (WPARAM)1, - 0); /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, @@ -100,11 +87,7 @@ else if (dwWaitTime > 5000) dwWaitTime = 5000; - /* increment the progress bar */ - SendMessage(hProgBar, - PBM_STEPIT, - 0, - 0); + IncrementProgressBar(hProgDlg); /* wait before checking status */ Sleep(dwWaitTime); @@ -122,11 +105,7 @@ if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { - /* The service is making progress. increment the progress bar */ - SendMessage(hProgBar, - PBM_STEPIT, - 0, - 0); + IncrementProgressBar(hProgDlg); dwStartTickCount = GetTickCount(); dwOldCheckPoint = ServiceStatus.dwCheckPoint; } @@ -144,10 +123,7 @@ if (ServiceStatus.dwCurrentState == Control) { - SendMessage(hProgBar, - PBM_DELTAPOS, - PROGRESSRANGE, - 0); + CompleteProgressBar(hProgDlg); Sleep(1000); return TRUE; } Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Fri Aug 24 22:27:12 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/create.c + * FILE: base/applications/mscutils/servman/create.c * PURPOSE: Create a new service - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -70,9 +70,9 @@ IDS_CREATE_SUCCESS, Buf, sizeof(Buf) / sizeof(TCHAR)); - DisplayString(Buf); - - CloseServiceHandle(hSCManager); + DisplayString(Buf); + + CloseServiceHandle(hSCManager); CloseServiceHandle(hSc); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/export.c (original) +++ trunk/reactos/base/applications/mscutils/servman/export.c Fri Aug 24 22:27:12 2007 @@ -36,10 +36,10 @@ SaveServicesToFile(PMAIN_WND_INFO Info, LPCTSTR pszFileName) { - HANDLE hFile; - BOOL bSuccess = FALSE; + HANDLE hFile; + BOOL bSuccess = FALSE; - hFile = CreateFile(pszFileName, + hFile = CreateFile(pszFileName, GENERIC_WRITE, 0, NULL, @@ -47,21 +47,21 @@ FILE_ATTRIBUTE_NORMAL, NULL); - if(hFile != INVALID_HANDLE_VALUE) - { + if(hFile != INVALID_HANDLE_VALUE) + { TCHAR LVText[500]; TCHAR newl = _T('\n'); TCHAR tab = _T('\t'); - DWORD dwTextLength, dwWritten; - INT NumListedServ = 0; - INT i, k; + DWORD dwTextLength, dwWritten; + INT NumListedServ = 0; + INT i, k; - NumListedServ = ListView_GetItemCount(Info->hListView); + NumListedServ = ListView_GetItemCount(Info->hListView); - for (i=0; i < NumListedServ; i++) - { - for (k=0; k<5; k++) - { + for (i=0; i < NumListedServ; i++) + { + for (k=0; k<5; k++) + { dwTextLength = GetTextFromListView(Info, LVText, i, @@ -80,46 +80,43 @@ &dwWritten, NULL); } - } - WriteFile(hFile, + } + WriteFile(hFile, &newl, sizeof(TCHAR), &dwWritten, NULL); - } + } - CloseHandle(hFile); - bSuccess = TRUE; - } + CloseHandle(hFile); + bSuccess = TRUE; + } - return bSuccess; + return bSuccess; } VOID ExportFile(PMAIN_WND_INFO Info) { - OPENFILENAME ofn; - TCHAR szFileName[MAX_PATH] = _T(""); + OPENFILENAME ofn; + TCHAR szFileName[MAX_PATH] = _T(""); - ZeroMemory(&ofn, sizeof(ofn)); + ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = Info->hMainWnd; - ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0"); - ofn.lpstrFile = szFileName; - ofn.nMaxFile = MAX_PATH; - ofn.lpstrDefExt = _T("txt"); - ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = Info->hMainWnd; + ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0"); + ofn.lpstrFile = szFileName; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrDefExt = _T("txt"); + ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; - if(GetSaveFileName(&ofn)) - { - if (SaveServicesToFile(Info, szFileName)) + if(GetSaveFileName(&ofn)) + { + if (SaveServicesToFile(Info, szFileName)) return; - } + } - if (CommDlgExtendedError() != CDERR_GENERALCODES) + if (CommDlgExtendedError() != CDERR_GENERALCODES) MessageBox(NULL, _T("Export to file failed"), NULL, 0); } - - - Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Fri Aug 24 22:27:12 2007 @@ -208,8 +208,6 @@ IDS_TOOLTIP_STOP "Ñïèðàíå íà óñëóãàòà" IDS_TOOLTIP_PAUSE "Çàäúðæàíå (ïàóçà) íà óñëóãàòà" IDS_TOOLTIP_RESTART "Ïðåçàïóñê íà óñëóãàòà" - IDS_TOOLTIP_HELP "Ïîìîù" - IDS_TOOLTIP_EXIT "Èçõîä" END STRINGTABLE DISCARDABLE @@ -226,30 +224,7 @@ /* IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" */ IDS_HELP_OPTIONS "ÍÀÑÒÐÎÉÊÈ ÇÀ ÑÚÇÄÀÂÀÍÅ:\r\nÇÀÁÅËÅÆÊÀ: Èìåíàòà íà íàñòðîéêèòå âêëþ÷âàò çíàê çà ðàâåíñòâî.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Fri Aug 24 22:27:12 2007 @@ -204,8 +204,6 @@ IDS_TOOLTIP_STOP "Dienst beenden" IDS_TOOLTIP_PAUSE "Dienst anhalten" IDS_TOOLTIP_RESTART "Dienst neu starten" - IDS_TOOLTIP_HELP "Hilfe" - IDS_TOOLTIP_EXIT "Beenden" END STRINGTABLE DISCARDABLE @@ -221,30 +219,7 @@ BEGIN IDS_HELP_OPTIONS "ERSTELLOPTIONEN:\r\nBEACHTEN SIE: Der Optionsname enthält das Gleichheitszeichen.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (Standard = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (Standard = demand) \r\n error= <normal|severe|critical|ignore>\r\n (Standard = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Abhängigkeiten (getrennt durch / (Schrägstrich))>\r\n obj= <KontoName|ObjektName>\r\n (Standard = LocalSystem)\r\n password= <Passwort>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Fri Aug 24 22:27:12 2007 @@ -204,8 +204,6 @@ IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" - IDS_TOOLTIP_HELP "Help" - IDS_TOOLTIP_EXIT "Exit" END STRINGTABLE DISCARDABLE @@ -221,30 +219,7 @@ BEGIN IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Fri Aug 24 22:27:12 2007 @@ -208,8 +208,6 @@ IDS_TOOLTIP_STOP "Arrêter le service" IDS_TOOLTIP_PAUSE "Suspendre le service" IDS_TOOLTIP_RESTART "Redémarrer le service" - IDS_TOOLTIP_HELP "Aide" - IDS_TOOLTIP_EXIT "Quitter" END STRINGTABLE DISCARDABLE @@ -225,30 +223,7 @@ BEGIN IDS_HELP_OPTIONS "OPTIONS DE CREATION:\r\nNOTE: le nom de l'option inclue le signe =.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Fri Aug 24 22:27:12 2007 @@ -204,8 +204,6 @@ IDS_TOOLTIP_STOP "Menghentikan layanan" IDS_TOOLTIP_PAUSE "Mengistirahatkan layanan" IDS_TOOLTIP_RESTART "Memulai lagi layanan" - IDS_TOOLTIP_HELP "Bantuan" - IDS_TOOLTIP_EXIT "Keluar" END STRINGTABLE DISCARDABLE @@ -221,30 +219,7 @@ BEGIN IDS_HELP_OPTIONS "OPSI BUAT:\r\nCATATAN: Nama opsi termasuk tanda sama dengan.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (standar = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (standar = demand) \r\n error= <normal|severe|critical|ignore>\r\n (standar = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(dipisahkan oleh / (garis miring))>\r\n obj= <AccountName|ObjectName>\r\n (standar = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Fri Aug 24 22:27:12 2007 @@ -204,8 +204,6 @@ IDS_TOOLTIP_STOP "Ferma servizio" IDS_TOOLTIP_PAUSE "Pausa servizio" IDS_TOOLTIP_RESTART "Riavvia servizio" - IDS_TOOLTIP_HELP "Aiuto" - IDS_TOOLTIP_EXIT "Esci" END STRINGTABLE DISCARDABLE @@ -221,30 +219,7 @@ BEGIN IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTA: Il nome dell'ozione comprende il simbolo di uguale.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Fri Aug 24 22:27:12 2007 @@ -211,8 +211,6 @@ IDS_TOOLTIP_STOP "Zatrzymaj us³ugê" IDS_TOOLTIP_PAUSE "Wstrzymaj us³ugê" IDS_TOOLTIP_RESTART "Wznów us³ugê" - IDS_TOOLTIP_HELP "Pomoc" - IDS_TOOLTIP_EXIT "Zakoñcz" END STRINGTABLE DISCARDABLE @@ -228,30 +226,7 @@ BEGIN IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: Nazwa opcji zawiera znak równoci.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Aug 24 22:27:12 2007 @@ -203,8 +203,6 @@ IDS_TOOLTIP_STOP "Îñòàíîâèòü ñëóæáó" IDS_TOOLTIP_PAUSE "Ïðèîñòàíîâèòü ñëóæáó" IDS_TOOLTIP_RESTART "Ïåðåçàïóñê ñëóæáû" - IDS_TOOLTIP_HELP "Ñïðàâêà" - IDS_TOOLTIP_EXIT "Âûõîä" END STRINGTABLE DISCARDABLE @@ -220,31 +218,6 @@ BEGIN IDS_HELP_OPTIONS "ÎÏÖÈÈ ÑÎÇÄÀÍÈß:\r\nÏðèìå÷àíèå: Èìÿ îïöèè âêëþ÷àåò çíàê ""ðàâíî"".\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (ïî óìîë÷àíèþ = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (ïî óìîë÷àíèþ = demand) \r\n error= <normal|severe|critical|ignore>\r\n (ïî óìîë÷àíèþ = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(îòäåëÿåòñÿ / (íàêëîííàÿ ÷åðòà))>\r\n obj= <AccountName|ObjectName>\r\n (ïî óìîë÷àíèþ = LocalSystem)\r\n password= <password>\r\n" END - -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 /* Hints */ STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Fri Aug 24 22:27:12 2007 @@ -213,8 +213,6 @@ IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" - IDS_TOOLTIP_HELP "Help" - IDS_TOOLTIP_EXIT "Exit" END STRINGTABLE DISCARDABLE @@ -230,30 +228,7 @@ BEGIN IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 + /* Hints */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Fri Aug 24 22:27:12 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/mainwnd.c + * FILE: base/applications/mscutils/servman/mainwnd.c * PURPOSE: Main window message handler - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -33,12 +33,6 @@ {TBICON_STOP, ID_STOP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ - - {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* help */ - {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* exit */ - }; @@ -281,7 +275,7 @@ 0); hImageList = InitImageList(IDB_PROP, - IDB_EXIT, + IDB_RESTART, 16, 16); if (hImageList == NULL) @@ -585,22 +579,9 @@ { if (Info->SelectedItem != NO_ITEM_SELECTED) { - PPROP_DLG_INFO PropSheet; - - PropSheet = (PROP_DLG_INFO*) HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PROP_DLG_INFO)); - if (PropSheet != NULL) - { - Info->PropSheet = PropSheet; - OpenPropSheet(Info); - } - - HeapFree(ProcessHeap, - 0, - PropSheet); - - Info->PropSheet = NULL; + Info->bDlgOpen = TRUE; + OpenPropSheet(Info); + Info->bDlgOpen = FALSE; } } break; @@ -667,27 +648,29 @@ case ID_START: { - DoStart(Info); + if (DoStart(Info)) + SetMenuAndButtonStates(Info); } break; case ID_STOP: { - DoStop(Info); + if (DoStop(Info)) + SetMenuAndButtonStates(Info); } break; case ID_PAUSE: { - Control(Info, - SERVICE_CONTROL_PAUSE); + //Control(Info, + // SERVICE_CONTROL_PAUSE); } break; case ID_RESUME: { - Control(Info, - SERVICE_CONTROL_CONTINUE ); + //Control(Info, + // SERVICE_CONTROL_CONTINUE ); } break; @@ -847,60 +830,60 @@ } break; - case WM_SIZE: - { + case WM_SIZE: + { MainWndResize(Info, LOWORD(lParam), HIWORD(lParam)); - } - break; - - case WM_NOTIFY: + } + break; + + case WM_NOTIFY: { LPNMHDR pnmhdr = (LPNMHDR)lParam; switch (pnmhdr->code) { - case NM_DBLCLK: - { - POINT pt; - RECT rect; - - GetCursorPos(&pt); - GetWindowRect(Info->hListView, &rect); - - if (PtInRect(&rect, pt)) - { + case NM_DBLCLK: + { + POINT pt; + RECT rect; + + GetCursorPos(&pt); + GetWindowRect(Info->hListView, &rect); + + if (PtInRect(&rect, pt)) + { SendMessage(hwnd, WM_COMMAND, //ID_PROP, MAKEWPARAM((WORD)ID_PROP, (WORD)0), 0); - } + } //OpenPropSheet(Info); - } - break; - - case LVN_COLUMNCLICK: - { + } + break; + + case LVN_COLUMNCLICK: + { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; (void)ListView_SortItems(Info->hListView, CompareFunc, pnmv->iSubItem); bSortAscending = !bSortAscending; - } + } break; - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - - ListViewSelectionChanged(Info, pnmv); - - } - break; + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + + ListViewSelectionChanged(Info, pnmv); + + } + break; case TTN_GETDISPINFO: { @@ -949,15 +932,6 @@ case ID_RESTART: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); break; - - case ID_HELP: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); - break; - - case ID_EXIT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); - break; - } } break; @@ -1031,19 +1005,19 @@ break; } - case WM_CLOSE: - { + case WM_CLOSE: + { /* Free service array */ HeapFree(ProcessHeap, 0, Info->pServiceStatus); DestroyMenu(Info->hShortcutMenu); - DestroyWindow(hwnd); - } - break; - - case WM_DESTROY: + DestroyWindow(hwnd); + } + break; + + case WM_DESTROY: { //DestroyMainWnd(Info); @@ -1057,18 +1031,18 @@ /* Break the message queue loop */ PostQuitMessage(0); } - break; - - default: - { + break; + + default: + { HandleDefaultMessage: Ret = DefWindowProc(hwnd, msg, wParam, lParam); - } - break; + } + break; } return Ret; } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Fri Aug 24 22:27:12 2007 @@ -13,29 +13,11 @@ #pragma warning(disable : 4100) #endif -#ifndef SB_SIMPLEID -#define SB_SIMPLEID 0xFF -#endif - #define NO_ITEM_SELECTED -1 #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 14 +#define NUM_BUTTONS 11 #define PROGRESSRANGE 8 - -typedef struct _PROP_DLG_INFO -{ - HWND hwndGenDlg; - HWND hwndDepDlg; - LPTSTR lpServiceName; - LPTSTR lpDisplayName; - LPTSTR lpDescription; - LPTSTR lpPathToExe; - TCHAR szStartupType; - TCHAR szServiceStatus[25]; - LPTSTR lpStartParams; - -} PROP_DLG_INFO, *PPROP_DLG_INFO; typedef struct _MAIN_WND_INFO { @@ -43,22 +25,14 @@ HWND hListView; HWND hStatus; HWND hTool; - HWND hProgDlg; HMENU hShortcutMenu; int nCmdShow; - /* Stores the complete services array */ - ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; + ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; /* Stores the complete services array */ + ENUM_SERVICE_STATUS_PROCESS *CurrentService; /* Stores the current selected service */ - /* Stores the current selected service */ - ENUM_SERVICE_STATUS_PROCESS *CurrentService; - - /* selection number in the list view */ - INT SelectedItem; - - struct _PROP_DLG_INFO *PropSheet; - - /* status flags */ + INT SelectedItem;/* selection number in the list view */ + BOOL bDlgOpen; BOOL InMenuLoop; } MAIN_WND_INFO, *PMAIN_WND_INFO; @@ -92,7 +66,12 @@ BOOL DoStop(PMAIN_WND_INFO Info); /* control */ -BOOL Control(PMAIN_WND_INFO Info, DWORD Control); +BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control); + +/* progress.c */ +HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName); +VOID IncrementProgressBar(HWND hProgDlg); +VOID CompleteProgressBar(HWND hProgDlg); /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c Fri Aug 24 22:27:12 2007 @@ -1,20 +1,73 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/progress.c + * FILE: base/applications/mscutils/servman/progress.c * PURPOSE: Progress dialog box message handler - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam) +VOID +CompleteProgressBar(HWND hProgDlg) +{ + HWND hProgBar; + + hProgBar = GetDlgItem(hProgDlg, + IDC_SERVCON_PROGRESS); + + if (hProgBar) + { + SendMessage(hProgBar, + PBM_DELTAPOS, + PROGRESSRANGE, + 0); + } +} + +VOID +IncrementProgressBar(HWND hProgDlg) +{ + HWND hProgBar; + + hProgBar = GetDlgItem(hProgDlg, + IDC_SERVCON_PROGRESS); + + if (hProgBar) + { + SendMessage(hProgBar, + PBM_STEPIT, + 0, + 0); + } +} + +BOOL CALLBACK +ProgressDialogProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) { switch(Message) { case WM_INITDIALOG: + { + HWND hProgBar; + /* set the progress bar range and step */ + hProgBar = GetDlgItem(hDlg, + IDC_SERVCON_PROGRESS); + SendMessage(hProgBar, + PBM_SETRANGE, + 0, + MAKELPARAM(0, PROGRESSRANGE)); + + SendMessage(hProgBar, + PBM_SETSTEP, + (WPARAM)1, + 0); + } break; case WM_COMMAND: @@ -39,3 +92,42 @@ } +HWND +CreateProgressDialog(HWND hParent, + LPTSTR lpServiceName) +{ + HWND hProgDlg; + TCHAR ProgDlgBuf[100]; + + /* open the progress dialog */ + hProgDlg = CreateDialog(hInstance, + MAKEINTRESOURCE(IDD_DLG_PROGRESS), + hParent, + (DLGPROC)ProgressDialogProc); + if (hProgDlg != NULL) + { + ShowWindow(hProgDlg, + SW_SHOW); + + /* write the info to the progress dialog */ + LoadString(hInstance, + IDS_PROGRESS_INFO_STOP, + ProgDlgBuf, + sizeof(ProgDlgBuf) / sizeof(TCHAR)); + + SendDlgItemMessage(hProgDlg, + IDC_SERVCON_INFO, + WM_SETTEXT, + 0, + (LPARAM)ProgDlgBuf); + + /* write the service name to the progress dialog */ + SendDlgItemMessage(hProgDlg, + IDC_SERVCON_NAME, + WM_SETTEXT, + 0, + (LPARAM)lpServiceName); + } + + return hProgDlg; +} Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Fri Aug 24 22:27:12 2007 @@ -1,16 +1,17 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/propsheet.c + * FILE: base/applications/mscutils/servman/propsheet.c * PURPOSE: Property dialog box message handler - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" static VOID -SetButtonStates(PMAIN_WND_INFO Info) +SetButtonStates(PMAIN_WND_INFO Info, + HWND hwndDlg) { HWND hButton; DWORD Flags, State; @@ -20,25 +21,25 @@ if (State == SERVICE_STOPPED) { - hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START); + hButton = GetDlgItem(hwndDlg, IDC_START); EnableWindow (hButton, TRUE); } if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { - hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_STOP); + hButton = GetDlgItem(hwndDlg, IDC_STOP); EnableWindow (hButton, TRUE); } if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) { - hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE); + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { - hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE); + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } } @@ -48,7 +49,8 @@ * values and sets it to value of the selected item */ static VOID -SetStartupType(PMAIN_WND_INFO Info) +SetStartupType(PMAIN_WND_INFO Info, + HWND hwndDlg) { HWND hList; HKEY hKey; @@ -70,7 +72,7 @@ KEY_READ, &hKey); - hList = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START_TYPE); + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR)); SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); @@ -97,7 +99,6 @@ SendMessage(hList, CB_SETCURSEL, 1, 0); else if (StartUp == 0x04) SendMessage(hList, CB_SETCURSEL, 2, 0); - } @@ -106,75 +107,90 @@ * the relevant service information */ static VOID -GetDlgInfo(PMAIN_WND_INFO Info) -{ +GetDlgInfo(PMAIN_WND_INFO Info, + HWND hwndDlg) +{ + LPTSTR lpDescription; + LPTSTR lpPathToExe; + /* set the service name */ - Info->PropSheet->lpServiceName = Info->CurrentService->lpServiceName; - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + SendDlgItemMessage(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->lpServiceName); + (LPARAM)Info->CurrentService->lpServiceName); /* set the display name */ - Info->PropSheet->lpDisplayName = Info->CurrentService->lpDisplayName; - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->lpDisplayName); + (LPARAM)Info->CurrentService->lpDisplayName); /* set the description */ - if ((Info->PropSheet->lpDescription = GetDescription(Info->CurrentService->lpServiceName))) - { - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + if ((lpDescription = GetDescription(Info->CurrentService->lpServiceName))) + { + SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->lpDescription); + (LPARAM)lpDescription); + + HeapFree(ProcessHeap, + 0, + lpDescription); + + } /* set the executable path */ - if ((Info->PropSheet->lpPathToExe = GetExecutablePath(Info))) - { - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + if ((lpPathToExe = GetExecutablePath(Info))) + { + SendDlgItemMessage(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->lpPathToExe); + (LPARAM)lpPathToExe); + + HeapFree(ProcessHeap, + 0, + lpPathToExe); } /* set startup type */ - SetStartupType(Info); + SetStartupType(Info, hwndDlg); /* set service status */ if (Info->CurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { + TCHAR szServiceStatus[32]; + LoadString(hInstance, IDS_SERVICES_STARTED, - Info->PropSheet->szServiceStatus, - sizeof(Info->PropSheet->szServiceStatus) / sizeof(TCHAR)); - - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + szServiceStatus, + _tcslen(szServiceStatus) + 1); + + SendDlgItemMessage(hwndDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->szServiceStatus); + (LPARAM)szServiceStatus); } else { + TCHAR szServiceStatus[32]; + LoadString(hInstance, IDS_SERVICES_STOPPED, - Info->PropSheet->szServiceStatus, - sizeof(Info->PropSheet->szServiceStatus) / sizeof(TCHAR)); - - SendDlgItemMessage(Info->PropSheet->hwndGenDlg, + szServiceStatus, + _tcslen(szServiceStatus) + 1); + + SendDlgItemMessage(hwndDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, - (LPARAM)Info->PropSheet->szServiceStatus); - } - + (LPARAM)szServiceStatus); + } } @@ -207,13 +223,11 @@ Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam); if (Info != NULL) { - Info->PropSheet->hwndGenDlg = hwndDlg; - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)Info); - GetDlgInfo(Info); - SetButtonStates(Info); + GetDlgInfo(Info, hwndDlg); + SetButtonStates(Info, hwndDlg); } } break; @@ -251,16 +265,6 @@ break; case WM_DESTROY: - if (Info->PropSheet->lpDescription) - HeapFree(ProcessHeap, - 0, - Info->PropSheet->lpDescription); - - if (Info->PropSheet->lpPathToExe) - HeapFree(ProcessHeap, - 0, - Info->PropSheet->lpPathToExe); - break; case WM_NOTIFY: @@ -290,8 +294,8 @@ static INT_PTR CALLBACK DependanciesPageProc(HWND hwndDlg, UINT uMsg, - WPARAM wParam, - LPARAM lParam) + WPARAM wParam, + LPARAM lParam) { PMAIN_WND_INFO Info; @@ -311,8 +315,6 @@ Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam); if (Info != NULL) { - Info->PropSheet->hwndDepDlg = hwndDlg; - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)Info); @@ -377,8 +379,6 @@ } - - static VOID InitPropSheetPage(PROPSHEETPAGE *psp, PMAIN_WND_INFO Info, Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Fri Aug 24 22:27:12 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/query.c + * FILE: base/applications/mscutils/servman/query.c * PURPOSE: Query service information - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -320,32 +320,36 @@ GetServiceList(PMAIN_WND_INFO Info) { SC_HANDLE ScHandle; + BOOL bGotServices = FALSE; DWORD BytesNeeded = 0; DWORD ResumeHandle = 0; DWORD NumServices = 0; - ScHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); + ScHandle = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); if (ScHandle != INVALID_HANDLE_VALUE) { - if (EnumServicesStatusEx(ScHandle, - SC_ENUM_PROCESS_INFO, - SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)Info->pServiceStatus, - 0, &BytesNeeded, - &NumServices, - &ResumeHandle, - 0) == FALSE) + if (!EnumServicesStatusEx(ScHandle, + SC_ENUM_PROCESS_INFO, + SERVICE_WIN32, + SERVICE_STATE_ALL, + (LPBYTE)Info->pServiceStatus, + 0, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) { /* Call function again if required size was returned */ if (GetLastError() == ERROR_MORE_DATA) { /* reserve memory for service info array */ Info->pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) - HeapAlloc(ProcessHeap, - 0, - BytesNeeded); + HeapAlloc(ProcessHeap, + 0, + BytesNeeded); if (Info->pServiceStatus == NULL) return FALSE; @@ -359,22 +363,23 @@ &BytesNeeded, &NumServices, &ResumeHandle, - 0) == FALSE) + 0)) { - HeapFree(ProcessHeap, - 0, - Info->pServiceStatus); - return FALSE; + bGotServices = TRUE; } } - else /* exit on failure */ - { - return FALSE; - } } } - CloseServiceHandle(ScHandle); + if (ScHandle) + CloseServiceHandle(ScHandle); + + if (!bGotServices) + { + HeapFree(ProcessHeap, + 0, + Info->pServiceStatus); + } return NumServices; } Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Fri Aug 24 22:27:12 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/reg.c + * FILE: base/applications/mscutils/servman/reg.c * PURPOSE: Query service information - * COPYRIGHT: Copyright 2005 - 2007 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h Fri Aug 24 22:27:12 2007 @@ -51,8 +51,6 @@ #define IDS_TOOLTIP_STOP 6006 #define IDS_TOOLTIP_PAUSE 6007 #define IDS_TOOLTIP_RESTART 6008 -#define IDS_TOOLTIP_HELP 6009 -#define IDS_TOOLTIP_EXIT 6010 #define IDS_SERVICES_STARTED 5000 #define IDS_SERVICES_STOPPED 5001 @@ -73,8 +71,6 @@ #define IDB_STOP 10006 #define IDB_PAUSE 10007 #define IDB_RESTART 10008 -#define IDB_HELP 10009 -#define IDB_EXIT 10010 /* toolbar buttons */ #define TBICON_PROP 0 @@ -86,8 +82,6 @@ #define TBICON_STOP 6 #define TBICON_PAUSE 7 #define TBICON_RESTART 8 -#define TBICON_HELP 9 -#define TBICON_EXIT 10 /* menu hints */ Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c Fri Aug 24 22:27:12 2007 @@ -1,39 +1,24 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/start.c + * FILE: base/applications/mscutils/servman/start.c * PURPOSE: Start a service - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" static BOOL -DoStartService(PMAIN_WND_INFO Info) +DoStartService(PMAIN_WND_INFO Info, + HWND hProgDlg) { - HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; INT ArgCount = 0; DWORD dwStartTickCount, dwOldCheckPoint; - - - /* set the progress bar range and step */ - hProgBar = GetDlgItem(Info->hProgDlg, - IDC_SERVCON_PROGRESS); - - SendMessage(hProgBar, - PBM_SETRANGE, - 0, - MAKELPARAM(0, PROGRESSRANGE)); - - SendMessage(hProgBar, - PBM_SETSTEP, - (WPARAM)1, - 0); /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, @@ -92,8 +77,7 @@ else if ( dwWaitTime > 5000 ) dwWaitTime = 5000; - /* increment the progress bar */ - SendMessage(hProgBar, PBM_STEPIT, 0, 0); + IncrementProgressBar(hProgDlg); /* wait before checking status */ Sleep(ServiceStatus.dwWaitHint / 8); @@ -112,7 +96,7 @@ if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { /* The service is making progress. increment the progress bar */ - SendMessage(hProgBar, PBM_STEPIT, 0, 0); + IncrementProgressBar(hProgDlg); dwStartTickCount = GetTickCount(); dwOldCheckPoint = ServiceStatus.dwCheckPoint; } @@ -130,96 +114,34 @@ if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { - SendMessage(hProgBar, - PBM_DELTAPOS, - PROGRESSRANGE, - 0); + CompleteProgressBar(hProgDlg); Sleep(1000); return TRUE; } else return FALSE; - } - - BOOL DoStart(PMAIN_WND_INFO Info) { HWND hProgDlg; - TCHAR ProgDlgBuf[100]; + BOOL bRet = FALSE; - /* open the progress dialog */ - hProgDlg = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_DLG_PROGRESS), - Info->hMainWnd, - (DLGPROC)ProgressDialogProc); - if (hProgDlg != NULL) + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->CurrentService->lpServiceName); + + if (hProgDlg) { - ShowWindow(hProgDlg, - SW_SHOW); + bRet = DoStartService(Info, + hProgDlg); - /* write the info to the progress dialog */ - LoadString(hInstance, - IDS_PROGRESS_INFO_START, - ProgDlgBuf, - sizeof(ProgDlgBuf) / sizeof(TCHAR)); - - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_INFO, - WM_SETTEXT, - 0, - (LPARAM)ProgDlgBuf); - - /* write the service name to the progress dialog */ - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_NAME, - WM_SETTEXT, - 0, - (LPARAM)Info->CurrentService->lpServiceName); + SendMessage(hProgDlg, + WM_DESTROY, + 0, + 0); } - /* start the service */ - if ( DoStartService(Info) ) - { - LVITEM item; - TCHAR szStatus[64]; - TCHAR buf[25]; - - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - item.pszText = szStatus; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - /* change dialog status */ - if (Info->PropSheet != NULL) - { - LoadString(hInstance, - IDS_SERVICES_STARTED, - buf, - sizeof(buf) / sizeof(TCHAR)); - - SendDlgItemMessageW(Info->PropSheet->hwndGenDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)buf); - } - } - - SendMessage(hProgDlg, - WM_DESTROY, - 0, - 0); - - return TRUE; + return bRet; } Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c Fri Aug 24 22:27:12 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/stop.c + * FILE: base/applications/mscutils/servman/stop.c * PURPOSE: Stops a service - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -11,68 +11,20 @@ BOOL DoStop(PMAIN_WND_INFO Info) { + BOOL ret = FALSE; HWND hProgDlg; - TCHAR ProgDlgBuf[100]; - /* open the progress dialog */ - hProgDlg = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_DLG_PROGRESS), - Info->hMainWnd, - (DLGPROC)ProgressDialogProc); - if (hProgDlg != NULL) + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->CurrentService->lpServiceName); + + if (hProgDlg) { - ShowWindow(hProgDlg, - SW_SHOW); + ret = Control(Info, + hProgDlg, + SERVICE_CONTROL_STOP); - /* write the info to the progress dialog */ - LoadString(hInstance, - IDS_PROGRESS_INFO_STOP, - ProgDlgBuf, - sizeof(ProgDlgBuf) / sizeof(TCHAR)); - - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_INFO, - WM_SETTEXT, - 0, - (LPARAM)ProgDlgBuf); - - /* write the service name to the progress dialog */ - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_NAME, - WM_SETTEXT, - 0, - (LPARAM)Info->CurrentService->lpServiceName); + SendMessage(hProgDlg, WM_DESTROY, 0, 0); } - if ( Control(Info, SERVICE_CONTROL_STOP) ) - { - LVITEM item; - TCHAR buf[25]; - - item.pszText = _T('\0'); - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - /* change dialog status */ - if (Info->PropSheet != NULL) - { - LoadString(hInstance, - IDS_SERVICES_STOPPED, - buf, - sizeof(buf) / sizeof(TCHAR)); - - SendDlgItemMessageW(Info->PropSheet->hwndGenDlg, - IDC_SERV_STATUS, WM_SETTEXT, - 0, - (LPARAM)buf); - } - } - - SendMessage(hProgDlg, WM_DESTROY, 0, 0); - - return TRUE; + return ret; }

1 0

[greatlrd] 28520: sorry fix the build
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 21:46:43 2007 New Revision: 28520 URL: http://svn.reactos.org/svn/reactos?rev=28520&view=rev Log: sorry fix the build Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 24 21:46:43 2007 @@ -176,9 +176,7 @@ DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 Ellipse@20=NtGdiEllipse@20 EngCopyBits@24 -EngCreateDeviceBitmap@16 EngCreatePalette@24 -EngDeleteClip@4 EngDeletePalette@4 EngDeletePath@4 EngDeleteSemaphore@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 24 21:46:43 2007 @@ -2454,14 +2454,6 @@ { RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); } - - - - - - - - /* * @unimplemented */

1 0

[greatlrd] 28519: Kill of NtGdiCreatePolyPolygonRgn from the syscall list, it being use only internal in win32k. it should be rename to intGdiCreatePolyPolygonRgn
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 21:43:11 2007 New Revision: 28519 URL: http://svn.reactos.org/svn/reactos?rev=28519&view=rev Log: Kill of NtGdiCreatePolyPolygonRgn from the syscall list, it being use only internal in win32k. it should be rename to intGdiCreatePolyPolygonRgn Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Aug 24 21:43:11 2007 @@ -752,7 +752,6 @@ NtGdiCopyEnhMetaFile 2 NtGdiCreateDIBitmap 6 NtGdiCreateEnhMetaFile 4 -NtGdiCreatePolyPolygonRgn 4 NtGdiCreateScalableFontResource 4 NtGdiDeleteEnhMetaFile 1 NtGdiDeleteObject 1

1 0

[greatlrd] 28518: Fix CreatePolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Fix CreatePolyPolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Redirect : EnableEUDC@4 to NtGdiEnableEudc@4, EngAssociateSurface@12 to NtGdiEngAssociateSurface@12, EngCheckAbort@4 to NtGdiEngCheckAbort@4, EngD
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 21:37:53 2007 New Revision: 28518 URL: http://svn.reactos.org/svn/reactos?rev=28518&view=rev Log: Fix CreatePolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Fix CreatePolyPolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Redirect : EnableEUDC@4 to NtGdiEnableEudc@4, EngAssociateSurface@12 to NtGdiEngAssociateSurface@12, EngCheckAbort@4 to NtGdiEngCheckAbort@4, EngDeleteClip@4 to NtGdiEngDeleteClip@4 Redirect : EngCreateClip@0 to NtGdiEngCreateClip@0, EngCreateDeviceSurface@16 to NtGdiEngCreateDeviceSurface@16, EngCreateDeviceBitmap@16 to NtGdiEngCreateDeviceBitmap@16 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 24 21:37:53 2007 @@ -96,6 +96,23 @@ DeviceCapabilitiesExA DeviceCapabilitiesExW DrawEscape@16 +EnableEUDC@4=NtGdiEnableEudc@4 +EndDoc@4 +EndFormPage@4 +EndPage@4 +EndPath@4 +EngAcquireSemaphore@4 +EngAlphaBlend@28=NtGdiEngAlphaBlend@28 +EngAssociateSurface@12=NtGdiEngAssociateSurface@12 +EngBitBlt@44=NtGdiEngBitBlt@44 +EngCreateClip@0=NtGdiEngCreateClip@0 +EngDeleteClip@4=NtGdiEngDeleteClip@4 +EngCheckAbort@4=NtGdiEngCheckAbort@4 +EngComputeGlyphSet@12 +EngCreateSemaphore@0 +EngCreateBitmap@24 +EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16 +EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16 ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -158,24 +175,9 @@ DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 Ellipse@20=NtGdiEllipse@20 -EnableEUDC@4 -EndDoc@4 -EndFormPage@4 -EndPage@4 -EndPath@4 -EngAcquireSemaphore@4 -EngAlphaBlend@28=NtGdiEngAlphaBlend@28; -EngAssociateSurface@12 -EngBitBlt@44=NtGdiEngBitBlt@44; -EngCheckAbort@4 -EngComputeGlyphSet@12 EngCopyBits@24 -EngCreateBitmap@24 -EngCreateClip@0 EngCreateDeviceBitmap@16 -EngCreateDeviceSurface@16 EngCreatePalette@24 -EngCreateSemaphore@0 EngDeleteClip@4 EngDeletePalette@4 EngDeletePath@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 24 21:37:53 2007 @@ -1330,18 +1330,6 @@ BOOL STDCALL ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEntries) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -EnableEUDC(BOOL enable) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -2458,7 +2446,7 @@ } /* - * @unimplemented + * @implemented */ VOID STDCALL @@ -2468,31 +2456,11 @@ } -/* - * @unimplemented - */ -BOOL STDCALL -EngAssociateSurface(IN HSURF Surface, - IN HDEV Dev, - IN ULONG Hooks) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - -/* - * @unimplemented - */ -BOOL STDCALL -EngCheckAbort(SURFOBJ *pso) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + + + + + /* * @unimplemented @@ -2536,42 +2504,6 @@ return 0; } -/* - * @unimplemented - */ -CLIPOBJ* STDCALL -EngCreateClip(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBITMAP STDCALL -EngCreateDeviceBitmap(IN DHSURF Surface, - IN SIZEL Size, - IN ULONG Format) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HSURF STDCALL -EngCreateDeviceSurface(IN DHSURF Surface, - IN SIZEL Size, - IN ULONG FormatVersion) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented @@ -2602,15 +2534,7 @@ return (HSEMAPHORE)CritSect; } -/* - * @unimplemented - */ -VOID STDCALL -EngDeleteClip(CLIPOBJ *ClipRegion) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} + /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Fri Aug 24 21:37:53 2007 @@ -30,14 +30,9 @@ HRGN WINAPI -CreatePolygonRgn( const POINT* lppt, int cPoints, int fnPolyFillMode) +CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) { - /* FIXME NtGdiPolyPolyDraw */ -#if 0 - return NtGdiPolyPolyDraw(fnPolyFillMode,lppt,cPoints,1,6); -#else - return CreatePolyPolygonRgn(lppt, (const INT*)&cPoints, 1, fnPolyFillMode); -#endif + return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); } @@ -48,17 +43,7 @@ int nCount, int fnPolyFillMode) { - /* FIXME NtGdiPolyPolyDraw */ -#if 0 - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, - (PPOINT) lppt, - (PULONG) lpPolyCounts, - (ULONG) nCount, - GdiPolyPolyRgn ); -#else - return NtGdiCreatePolyPolygonRgn( (PPOINT)lppt, (PINT)lpPolyCounts, nCount, fnPolyFillMode); -#endif - + return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); } HRGN

1 0

[greatlrd] 28517: implement stub for NtGdiEnableEudc, NtGdiEngAssociateSurface, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateClip, NtGdiEngDeleteClip, NtGdiEngCheckAbort
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 18:49:53 2007 New Revision: 28517 URL: http://svn.reactos.org/svn/reactos?rev=28517&view=rev Log: implement stub for NtGdiEnableEudc, NtGdiEngAssociateSurface, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateClip, NtGdiEngDeleteClip, NtGdiEngCheckAbort Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Fri Aug 24 18:49:53 2007 @@ -1301,3 +1301,87 @@ return NULL; } + +/* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEnableEudc(BOOL enable) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngAssociateSurface(IN HSURF Surface, + IN HDEV Dev, + IN ULONG Hooks) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +CLIPOBJ* STDCALL +NtGdiEngCreateClip(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +VOID STDCALL +NtGdiEngDeleteClip(CLIPOBJ *ClipRegion) +{ + UNIMPLEMENTED; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngCheckAbort(SURFOBJ *pso) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +HSURF STDCALL +NtGdiEngCreateDeviceSurface( IN DHSURF Surface, + IN SIZEL Size, + IN ULONG FormatVersion, + IN DWORD UNKNOWN) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +HBITMAP STDCALL +NtGdiEngCreateDeviceBitmap( + IN DHSURF dhsurf, + IN SIZEL sizl, + IN ULONG iFormatCompat, + IN DWORD UNKNOWN) +{ + UNIMPLEMENTED; + return NULL; +} + + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Aug 24 18:49:53 2007 @@ -135,7 +135,7 @@ NtGdiDoPalette 6 NtGdiDrawEscape 4 NtGdiEllipse 5 -# NtGdiEnableEudc 1 +NtGdiEnableEudc 1 NtGdiEndDoc 1 NtGdiEndPage 1 NtGdiEndPath 1 @@ -605,10 +605,10 @@ # NtUserRemoteRedrawScreen 0 # NtUserRemoteStopScreenUpdates 0 # NtUserCtxDisplayIOCtl 3 -# NtGdiEngAssociateSurface 3 +NtGdiEngAssociateSurface 3 # NtGdiEngCreateBitmap 6 -# NtGdiEngCreateDeviceSurface 4 -# NtGdiEngCreateDeviceBitmap 4 +NtGdiEngCreateDeviceSurface 4 +NtGdiEngCreateDeviceBitmap 4 # NtGdiEngCreatePalette 6 # NtGdiEngComputeGlyphSet 3 # NtGdiEngCopyBits 6 @@ -638,8 +638,8 @@ NtGdiCLIPOBJ_cEnumStart 5 NtGdiCLIPOBJ_ppoGetPath 1 # NtGdiEngDeletePath 1 -# NtGdiEngCreateClip 0 -# NtGdiEngDeleteClip 1 +NtGdiEngCreateClip 0 +NtGdiEngDeleteClip 1 NtGdiBRUSHOBJ_ulGetBrushColor 1 NtGdiBRUSHOBJ_pvAllocRbrush 2 NtGdiBRUSHOBJ_pvGetRbrush 1 @@ -665,7 +665,7 @@ # NtGdiPATHOBJ_vEnumStartClipLines 4 # NtGdiPATHOBJ_bEnumClipLines 3 # NtGdiGetDhpdev 1 -# NtGdiEngCheckAbort 1 +NtGdiEngCheckAbort 1 # NtGdiHT_Get8BPPFormatPalette 4 # NtGdiHT_Get8BPPMaskPalette 6 # NtGdiUpdateTransform 1

1 0

[greatlrd] 28516: the NtGdiEngCreateDeviceSurface got 4 param, see syscall table. and official doc from msdn and osr say only 3, we can clear see it is 4 param in the syscall table. and I name it the four param as UNKNOWN for now.
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 18:46:06 2007 New Revision: 28516 URL: http://svn.reactos.org/svn/reactos?rev=28516&view=rev Log: the NtGdiEngCreateDeviceSurface got 4 param, see syscall table. and official doc from msdn and osr say only 3, we can clear see it is 4 param in the syscall table. and I name it the four param as UNKNOWN for now. Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Fri Aug 24 18:46:06 2007 @@ -2971,7 +2971,8 @@ NtGdiEngCreateDeviceSurface( IN DHSURF dhsurf, IN SIZEL sizl, - IN ULONG iFormatCompat + IN ULONG iFormatCompat, + IN DWORD UNKNOWN ); W32KAPI

1 0

[greatlrd] 28515: NtGdiEngCreateDeviceBitmap need four param the last param are undoc in msdn/osr at moment I do have small clude what it is use for. But I name it to UNKNOWN, you can check the syscall table and u see it is 4 param not 3 it need.
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 18:24:49 2007 New Revision: 28515 URL: http://svn.reactos.org/svn/reactos?rev=28515&view=rev Log: NtGdiEngCreateDeviceBitmap need four param the last param are undoc in msdn/osr at moment I do have small clude what it is use for. But I name it to UNKNOWN, you can check the syscall table and u see it is 4 param not 3 it need. Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Fri Aug 24 18:24:49 2007 @@ -2980,7 +2980,8 @@ NtGdiEngCreateDeviceBitmap( IN DHSURF dhsurf, IN SIZEL sizl, - IN ULONG iFormatCompat + IN ULONG iFormatCompat, + IN DWORD UNKNOWN ); W32KAPI

1 0

[greatlrd] 28514: Bug Fix from Gregor Brunmar (gregor dot brunmar at home dot se), IRC nick ALiENiD we getting change display working again with this bugfix. details * Added missing info from PrimarySurface.DMW when display driver defaults back to the video drivers standard mode * Fixed caching system in IntEnumDisplaySettings when run more than once * Hacked a way around the bug in FindDDIDriver
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Fri Aug 24 16:10:10 2007 New Revision: 28514 URL: http://svn.reactos.org/svn/reactos?rev=28514&view=rev Log: Bug Fix from Gregor Brunmar (gregor dot brunmar at home dot se), IRC nick ALiENiD we getting change display working again with this bugfix. details * Added missing info from PrimarySurface.DMW when display driver defaults back to the video drivers standard mode * Fixed caching system in IntEnumDisplaySettings when run more than once * Hacked a way around the bug in FindDDIDriver Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/driver.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/driver.h Fri Aug 24 16:10:10 2007 @@ -176,6 +176,7 @@ } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver); +PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name); PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name); PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber); BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED, @@ -186,3 +187,4 @@ #endif + Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c Fri Aug 24 16:10:10 2007 @@ -75,6 +75,21 @@ GenericDriver = Driver; return TRUE; +} + +PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name) +{ + GRAPHICS_DRIVER *Driver = DriverList; + while (Driver && Name) + { + if (!_wcsicmp(Driver->Name, Name)) + { + return Driver->EnableDriver; + } + Driver = Driver->Next; + } + + return NULL; } PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Aug 24 16:10:10 2007 @@ -600,6 +600,12 @@ DPRINT1("Perhaps DDI driver doesn't match miniport driver?\n"); continue; } + + // Update the primary surface with what we really got + PrimarySurface.DMW.dmPelsWidth = PrimarySurface.GDIInfo.ulHorzRes; + PrimarySurface.DMW.dmPelsHeight = PrimarySurface.GDIInfo.ulVertRes; + PrimarySurface.DMW.dmBitsPerPel = PrimarySurface.GDIInfo.cBitsPixel; + PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.GDIInfo.ulVRefresh; } if (0 == PrimarySurface.GDIInfo.ulLogPixelsX) @@ -2640,6 +2646,68 @@ #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220 +static NTSTATUS FASTCALL +GetDisplayNumberFromDeviceName( + IN PUNICODE_STRING pDeviceName OPTIONAL, + OUT ULONG *DisplayNumber) +{ + UNICODE_STRING DisplayString = RTL_CONSTANT_STRING(L"\\\\.\\DISPLAY"); + NTSTATUS Status = STATUS_SUCCESS; + ULONG Length; + ULONG Number; + ULONG i; + + if (DisplayNumber == NULL) + return STATUS_INVALID_PARAMETER_2; + + if (pDeviceName && pDeviceName->Length <= DisplayString.Length) + return STATUS_OBJECT_NAME_INVALID; + + if (pDeviceName == NULL || pDeviceName->Length == 0) + { + PWINDOW_OBJECT DesktopObject; + HDC DesktopHDC; + PDC pDC; + + DesktopObject = UserGetDesktopWindow(); + DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + pDC = DC_LockDc(DesktopHDC); + + *DisplayNumber = ((GDIDEVICE *)pDC->GDIDevice)->DisplayNumber; + + DC_UnlockDc(DesktopHDC); + UserReleaseDC(DesktopObject, DesktopHDC, FALSE); + + return STATUS_SUCCESS; + } + + /* Hack to check if the first parts are equal, by faking the device name length */ + Length = pDeviceName->Length; + pDeviceName->Length = DisplayString.Length; + if (RtlEqualUnicodeString(&DisplayString, pDeviceName, FALSE) == FALSE) + Status = STATUS_OBJECT_NAME_INVALID; + pDeviceName->Length = Length; + + if (NT_SUCCESS(Status)) + { + /* Convert the last part of pDeviceName to a number */ + Number = 0; + Length = pDeviceName->Length / sizeof(WCHAR); + for (i = DisplayString.Length / sizeof(WCHAR); i < Length; i++) + { + WCHAR Char = pDeviceName->Buffer[i]; + if (Char >= L'0' && Char <= L'9') + Number = Number * 10 + Char - L'0'; + else if (Char != L'\0') + return STATUS_OBJECT_NAME_INVALID; + } + + *DisplayNumber = Number - 1; + } + + return Status; +} + /*! \brief Enumerate possible display settings for the given display... * * \todo Make thread safe!? @@ -2655,10 +2723,17 @@ { static DEVMODEW *CachedDevModes = NULL, *CachedDevModesEnd = NULL; static DWORD SizeOfCachedDevModes = 0; + static UNICODE_STRING CachedDeviceName; PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; INT Size, OldSize; - ULONG DisplayNumber = 0; /* only default display supported */ + ULONG DisplayNumber; + + if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) + { + SetLastWin32Error(STATUS_NO_SUCH_DEVICE); + return FALSE; + } DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); @@ -2693,11 +2768,27 @@ } else { - if (iModeNum == 0 || CachedDevModes == NULL) /* query modes from drivers */ + BOOL IsCachedDevice = (CachedDevModes != NULL); + + if (CachedDevModes && + ((pDeviceName == NULL && CachedDeviceName.Length > 0) || + (pDeviceName != NULL && pDeviceName->Buffer != NULL && CachedDeviceName.Length == 0) || + (pDeviceName != NULL && pDeviceName->Buffer != NULL && CachedDeviceName.Length > 0 && RtlEqualUnicodeString(pDeviceName, &CachedDeviceName, TRUE) == FALSE))) + { + IsCachedDevice = FALSE; + } + + if (iModeNum == 0 || IsCachedDevice == FALSE) /* query modes from drivers */ { UNICODE_STRING DriverFileNames; LPWSTR CurrentName; DRVENABLEDATA DrvEnableData; + + /* Free resources from last driver cache */ + if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL) + { + RtlFreeUnicodeString(&CachedDeviceName); + } /* Retrieve DDI driver names from registry */ RtlInitUnicodeString(&DriverFileNames, NULL); @@ -2719,9 +2810,12 @@ { INT i; PGD_ENABLEDRIVER GDEnableDriver; + PGD_GETMODES GetModes = NULL; + INT SizeNeeded, SizeUsed; /* Get the DDI driver's entry point */ - GDEnableDriver = DRIVER_FindDDIDriver(CurrentName); + //GDEnableDriver = DRIVER_FindDDIDriver(CurrentName); + GDEnableDriver = DRIVER_FindExistingDDIDriver(L"DISPLAY"); if (NULL == GDEnableDriver) { DPRINT("FindDDIDriver failed for %S\n", CurrentName); @@ -2743,61 +2837,80 @@ for (i = 0; i < DrvEnableData.c; i++) { PDRVFN DrvFn = DrvEnableData.pdrvfn + i; - PGD_GETMODES GetModes; - INT SizeNeeded, SizeUsed; - - if (DrvFn->iFunc != INDEX_DrvGetModes) - continue; - - GetModes = (PGD_GETMODES)DrvFn->pfn; - - /* make sure we have enough memory to hold the modes */ - SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), 0, NULL); - if (SizeNeeded <= 0) + + if (DrvFn->iFunc == INDEX_DrvGetModes) { - DPRINT("DrvGetModes failed for %S\n", CurrentName); + GetModes = (PGD_GETMODES)DrvFn->pfn; break; } - - SizeUsed = CachedDevModesEnd - CachedDevModes; - if (SizeOfCachedDevModes - SizeUsed < SizeNeeded) + } + + if (GetModes == NULL) + { + DPRINT("DrvGetModes doesn't exist for %S\n", CurrentName); + continue; + } + + /* make sure we have enough memory to hold the modes */ + SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), 0, NULL); + if (SizeNeeded <= 0) + { + DPRINT("DrvGetModes failed for %S\n", CurrentName); + break; + } + + SizeUsed = (PCHAR)CachedDevModesEnd - (PCHAR)CachedDevModes; + if (SizeOfCachedDevModes < SizeUsed + SizeNeeded) + { + PVOID NewBuffer; + + SizeOfCachedDevModes += SizeNeeded; + NewBuffer = ExAllocatePool(PagedPool, SizeOfCachedDevModes); + if (NewBuffer == NULL) { - PVOID NewBuffer; - - SizeOfCachedDevModes += SizeNeeded; - NewBuffer = ExAllocatePool(PagedPool, SizeOfCachedDevModes); - if (NewBuffer == NULL) - { - /* clean up */ - ExFreePool(CachedDevModes); - SizeOfCachedDevModes = 0; - CachedDevModes = NULL; - CachedDevModesEnd = NULL; - SetLastWin32Error(STATUS_NO_MEMORY); - return FALSE; - } - if (CachedDevModes != NULL) - { - RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); - ExFreePool(CachedDevModes); - } - CachedDevModes = NewBuffer; - CachedDevModesEnd = (DEVMODEW *)((PCHAR)NewBuffer + SizeUsed); + /* clean up */ + ExFreePool(CachedDevModes); + CachedDevModes = NULL; + CachedDevModesEnd = NULL; + SizeOfCachedDevModes = 0; + + if (CachedDeviceName.Buffer != NULL) + RtlFreeUnicodeString(&CachedDeviceName); + + SetLastWin32Error(STATUS_NO_MEMORY); + return FALSE; } - - /* query modes */ - SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), - SizeOfCachedDevModes - SizeUsed, - CachedDevModesEnd); - if (SizeNeeded <= 0) + if (CachedDevModes != NULL) { - DPRINT("DrvGetModes failed for %S\n", CurrentName); + RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); + ExFreePool(CachedDevModes); } - else - { - CachedDevModesEnd = (DEVMODEW *)((PCHAR)CachedDevModesEnd + SizeNeeded); - } - break; + CachedDevModes = NewBuffer; + CachedDevModesEnd = (DEVMODEW *)((PCHAR)NewBuffer + SizeUsed); + } + + if (!IsCachedDevice) + { + if (CachedDeviceName.Buffer != NULL) + RtlFreeUnicodeString(&CachedDeviceName); + + if (pDeviceName) + IntSafeCopyUnicodeString(&CachedDeviceName, pDeviceName); + + IsCachedDevice = TRUE; + } + + /* query modes */ + SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), + SizeNeeded, + CachedDevModesEnd); + if (SizeNeeded <= 0) + { + DPRINT("DrvGetModes failed for %S\n", CurrentName); + } + else + { + CachedDevModesEnd = (DEVMODEW *)((PCHAR)CachedDevModesEnd + SizeNeeded); } }

1 0

[winesync] 28513: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: winesync Date: Fri Aug 24 13:42:29 2007 New Revision: 28513 URL: http://svn.reactos.org/svn/reactos?rev=28513&view=rev Log: Autosyncing with Wine HEAD Added: trunk/rostests/winetests/mlang/mlang.c (with props) trunk/rostests/winetests/mlang/mlang.rbuild (with props) trunk/rostests/winetests/mlang/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild trunk/rostests/winetests/shlwapi/clist.c trunk/rostests/winetests/shlwapi/clsid.c trunk/rostests/winetests/shlwapi/generated.c trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/shlwapi.rbuild trunk/rostests/winetests/shlwapi/shreg.c trunk/rostests/winetests/shlwapi/string.c trunk/rostests/winetests/shlwapi/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… Added: trunk/rostests/winetests/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.rbu… Added: trunk/rostests/winetests/mlang/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/testlist.… Modified: trunk/rostests/winetests/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/clist.c… Modified: trunk/rostests/winetests/shlwapi/clsid.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/clsid.c… Modified: trunk/rostests/winetests/shlwapi/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/generat… Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… Modified: trunk/rostests/winetests/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shlwapi… Modified: trunk/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shreg.c… Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… Modified: trunk/rostests/winetests/shlwapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/testlis…

1 0

[hpoussin] 28512: Update status of shlwapi
by hpoussin＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: hpoussin Date: Fri Aug 24 13:40:17 2007 New Revision: 28512 URL: http://svn.reactos.org/svn/reactos?rev=28512&view=rev Log: Update status of shlwapi Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Aug 24 13:40:17 2007 @@ -53,7 +53,7 @@ reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync reactos/dll/win32/msimg32 # Autosync -reactos/dll/win32/msi # Out of sync +reactos/dll/win32/msi # Needs a widl update reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/netapi32 # Autosync @@ -74,7 +74,7 @@ reactos/dll/win32/shell32 # Synced to Wine-0_9_5 reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync -reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 +reactos/dll/win32/shlwapi # Autosync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/uxtheme # Autosync

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