Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 29022: Set the main icon resource number to 3004. This should ensure SetupDiLoadClassIcon loads it correctly.
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 23:00:36 2007 New Revision: 29022 URL: http://svn.reactos.org/svn/reactos?rev=29022&view=rev Log: Set the main icon resource number to 3004. This should ensure SetupDiLoadClassIcon loads it correctly. Modified: trunk/reactos/dll/cpl/mmsys/resource.h Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Wed Sep 12 23:00:36 2007 @@ -2,9 +2,9 @@ #define __CPL_RESOURCE_H -#define IDI_CPLICON 4379 -#define IDI_MUTED_ICON 4380 -#define IDI_MICROPHONE_ICON 4381 +#define IDI_CPLICON 3004 +#define IDI_MUTED_ICON 4393 +#define IDI_MICROPHONE_ICON 4378 #define IDD_HARDWARE 100 #define IDD_VOLUME 101

1 0

[janderwald] 29021: - start implementing sound scheme dialog
by janderwald＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: janderwald Date: Wed Sep 12 21:51:51 2007 New Revision: 29021 URL: http://svn.reactos.org/svn/reactos?rev=29021&view=rev Log: - start implementing sound scheme dialog Added: trunk/reactos/dll/cpl/mmsys/sounds.c (with props) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Wed Sep 12 21:51:51 2007 @@ -144,24 +144,7 @@ return FALSE; } -/* Sounds property page dialog callback */ -static INT_PTR CALLBACK -SoundsDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - - return FALSE; -} + /* Audio property page dialog callback */ static INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h Wed Sep 12 21:51:51 2007 @@ -27,6 +27,16 @@ LPARAM wParam, LPARAM lParam); +/* sounds.c */ + +INT_PTR +CALLBACK +SoundsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + + #endif /* __CPL_MMSYS_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Wed Sep 12 21:51:51 2007 @@ -13,6 +13,8 @@ <library>msvcrt</library> <library>devmgr</library> <library>gdi32</library> + <library>advapi32</library> <file>mmsys.c</file> + <file>sounds.c</file> <file>mmsys.rc</file> </module> Added: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (added) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Wed Sep 12 21:51:51 2007 @@ -1,0 +1,289 @@ +/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ + * + * PROJECT: ReactOS Multimedia Control Panel + * FILE: lib/cpl/mmsys/mmsys.c + * PURPOSE: ReactOS Multimedia Control Panel + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * Johannes Anderwald <janderwald(a)reactos.com> + */ + +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cpl.h> +#include <tchar.h> + +#include "mmsys.h" +#include "resource.h" + +BOOL +LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) +{ + HKEY hSubKey; + DWORD dwData; + DWORD dwDesc; + TCHAR szDesc[MAX_PATH]; + TCHAR szData[MAX_PATH]; + + + LRESULT lResult; + if (RegOpenKeyEx(hKey, + szSubKey, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwDesc = sizeof(szDesc) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szDesc, + &dwDesc) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + dwData = sizeof(szDesc) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + _T("DispFileName"), + NULL, + NULL, + (LPBYTE)szData, + &dwData) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + + //FIXME + //lResult = SendDlgItemMessage(hwndDlg, + lResult = 0; + return TRUE; +} + + + +BOOL +LoadEventLabels(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwCurKey; + TCHAR szName[MAX_PATH]; + DWORD dwName; + DWORD dwResult; + DWORD dwCount; + if (RegOpenKeyEx(hKey, + _T("EventLabels"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwCurKey = 0; + dwCount = 0; + do + { + dwName = sizeof(szName) / sizeof(szName[0]); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (LoadEventLabel(hwndDlg, hSubKey, szName)) + { + dwCount++; + } + } + dwCurKey++; + + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return (dwCount != 0); +} + +BOOL +AddSoundScheme(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) +{ + HKEY hSubKey; + TCHAR szValue[MAX_PATH]; + DWORD dwValue, dwResult; + + if (RegOpenKeyEx(hKey, + szSubKey, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwValue = sizeof(szValue) / sizeof(TCHAR); + dwResult = RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szValue, + &dwValue); + RegCloseKey(hSubKey); + if (dwResult == ERROR_SUCCESS) + { + LRESULT lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + /// + /// FIXME store a context struct + /// + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)szSubKey); + if (SetDefault) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + } + return TRUE; + } + return FALSE; +} + + + +BOOL +EnumerateSoundSchemes(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwName, dwCurKey, dwResult, dwNumSchemes; + TCHAR szName[MAX_PATH]; + TCHAR szDefault[MAX_PATH]; + + dwName = sizeof(szDefault) / sizeof(TCHAR); + if (RegQueryValueEx(hKey, + NULL, + NULL, + NULL, + (LPBYTE)szDefault, + &dwName) != ERROR_SUCCESS) + { + return FALSE; + } + + + + if (RegOpenKeyEx(hKey, + _T("Names"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwNumSchemes = 0; + dwCurKey = 0; + do + { + dwName = sizeof(szName) / sizeof(szName[0]); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (AddSoundScheme(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + { + dwNumSchemes++; + } + } + + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return (dwNumSchemes != 0); +} + + +BOOL +LoadSoundSchemes(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + BOOL Result; + + if (RegOpenKeyEx(hKey, + _T("Schemes"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + + + Result = EnumerateSoundSchemes(hwndDlg, hSubKey); + RegCloseKey(hSubKey); + + return Result; +} + + + +BOOL +InitSoundSettings(HWND hwndDlg) +{ + HKEY hKey; + + if (RegOpenKey(HKEY_CURRENT_USER, + _T("AppEvents"), + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + LoadEventLabels(hwndDlg, hKey); + LoadSoundSchemes(hwndDlg, hKey); + + RegCloseKey(hKey); + + return TRUE; +} + + +/* Sounds property page dialog callback */ +INT_PTR +CALLBACK +SoundsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) + { + case WM_INITDIALOG: + InitSoundSettings(hwndDlg); + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 29020: Check for the Makefile instead of the ".svn" directory, when "Build-Shared.cmd" is executed. The ".svn" directory does not exist, when you try to build an SVN Export. (and all "src" Release packages are SVN Exports)
by cfinck＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: cfinck Date: Wed Sep 12 19:34:14 2007 New Revision: 29020 URL: http://svn.reactos.org/svn/reactos?rev=29020&view=rev Log: Check for the Makefile instead of the ".svn" directory, when "Build-Shared.cmd" is executed. The ".svn" directory does not exist, when you try to build an SVN Export. (and all "src" Release packages are SVN Exports) Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Wed Sep 12 19:34:14 2007 @@ -31,7 +31,7 @@ :: if %logdiff% == 0 ( if not exist "RosBE-Logs\." ( - if not exist ".svn\." ( + if not exist "Makefile" ( echo Folder is empty. No Build can be performed without a Source Code. goto :EOB ) else (

1 0

[dreimer] 29019: Translate the Keyboard Settings too.
by dreimer＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: dreimer Date: Wed Sep 12 19:17:15 2007 New Revision: 29019 URL: http://svn.reactos.org/svn/reactos?rev=29019&view=rev Log: Translate the Keyboard Settings too. Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Wed Sep 12 19:17:15 2007 @@ -114,134 +114,134 @@ BEGIN IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." - IDS_US_LAYOUT, "US" - IDS_BELGIAN_LAYOUT, "Belgian (Period)" - IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" - IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" - IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" - IDS_DANISH_LAYOUT, "Danish" - IDS_DUTCH_LAYOUT, "Dutch" - IDS_FINNISH_LAYOUT, "Finnish" - IDS_FRENCH_LAYOUT, "French" - IDS_GERMAN_LAYOUT, "German" - IDS_GERMAN_IBM_LAYOUT, "German (IBM)" - IDS_ICELANDIC_LAYOUT, "Icelandic" - IDS_IRISH_LAYOUT, "Irish" - IDS_ITALIAN_LAYOUT, "Italian" - IDS_ITALIAN_142_LAYOUT, "Italian (142)" - IDS_LATIN_AMERICAN_LAYOUT, "Latin American" - IDS_NORWEGIAN_LAYOUT, "Norwegian" - IDS_PORTUGUESE_LAYOUT, "Portuguese" - IDS_SPANISH_LAYOUT, "Spanish" - IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" - IDS_SWEDISH_LAYOUT, "Swedish" - IDS_SWISS_FRENCH_LAYOUT, "Swiss French" - IDS_SWISS_GERMAN_LAYOUT, "Swiss German" - IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" - IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" - IDS_ALBANIAN_LAYOUT, "Albanian" - IDS_CROATIAN_LAYOUT, "Croatian" - IDS_CZECH_LAYOUT, "Czech" - IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" - IDS_HUNGARIAN_LAYOUT, "Hungarian" - IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" - IDS_POLISH_LAYOUT, "Polish (Programmers)" - IDS_POLISH_214_LAYOUT, "Polish (214)" - IDS_ROMANIAN_LAYOUT, "Romanian" - IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" - IDS_SLOVAK_LAYOUT, "Slovak" - IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" - IDS_SLOVENIAN_LAYOUT, "Slovenian" - IDS_ESTONIAN_LAYOUT, "Estonian" - IDS_LATVIAN_LAYOUT, "Latvian" - IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" - IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" - IDS_GREEK_LAYOUT, "Greek" - IDS_GREEK_LATIN_LAYOUT, "Greek Latin" - IDS_GREEK_220_LAYOUT, "Greek (220)" - IDS_GREEK_319_LAYOUT, "Greek (319)" - IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" - IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" - IDS_BELARUSIAN_LAYOUT, "Belarusian" - IDS_BULGARIAN_LAYOUT, "Bulgarian" - IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" - IDS_RUSSIAN_LAYOUT, "Russian" - IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" - IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" - IDS_UKRAINIAN_LAYOUT, "Ukrainian" - IDS_TURKISH_F_LAYOUT, "Turkish F" - IDS_TURKISH_Q_LAYOUT, "Turkish Q" - IDS_JAPANESE_LAYOUT, "Japanese" - IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" - IDS_KOREAN_LAYOUT, "Korean" - IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" - IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" - IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" - IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" - IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" - IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" - IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" - IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" - IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" - IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" - IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" - IDS_HEBREW_LAYOUT, "Hebrew" - IDS_ARABIC_101_LAYOUT, "Arabic (101)" - IDS_ARABIC_102_LAYOUT, "Arabic (102)" - IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" - IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" - IDS_LITHUANIAN_LAYOUT, "Lithuanian" - IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" - IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" - IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" - IDS_ASSAMESE_LAYOUT, "Assamese" - IDS_BENGALI_LAYOUT, "Bengali" - IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" - IDS_GUJARATI_LAYOUT, "Gujarati" - IDS_KANNADA_LAYOUT, "Kannada" - IDS_MALAYALAM_LAYOUT, "Malayalam" - IDS_ORIYA_LAYOUT, "Oriya" - IDS_PUNJABI_LAYOUT, "Punjabi" - IDS_TAMIL_LAYOUT, "Tamil" - IDS_TELUGU_LAYOUT, "Telugu" - IDS_MARATHI_LAYOUT, "Marathi" - IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" - IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" - IDS_FAEROESE_LAYOUT, "Faeroese" - IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" - IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" - IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" - IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" - IDS_KAZAKH_LAYOUT, "Kazakh" - IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" - IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" - IDS_TATAR_LAYOUT, "Tatar" - IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" - IDS_VIETNAMESE_LAYOUT, "Vietnamese" - IDS_GEORGIAN_LAYOUT, "Georgian" - IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" - IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" - IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" - IDS_FARSI_LAYOUT, "Farsi" - IDS_GAELIC_LAYOUT, "Gaelic" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" - IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" - IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" - IDS_URDU_LAYOUT, "Urdu" - IDS_SYRIAC_LAYOUT, "Syriac" - IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" - IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" - IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgisch (Punkt)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgisch (Wallonisch)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portugiesisch (Brasilianisch, ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Französisch (Kanada)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Französisch (Kanada, herkömmlich)" + IDS_DANISH_LAYOUT, "Dänisch" + IDS_DUTCH_LAYOUT, "Niederländisch" + IDS_FINNISH_LAYOUT, "Finnisch" + IDS_FRENCH_LAYOUT, "Französisch" + IDS_GERMAN_LAYOUT, "Deutsch" + IDS_GERMAN_IBM_LAYOUT, "Deutsch (IBM)" + IDS_ICELANDIC_LAYOUT, "Isländisch" + IDS_IRISH_LAYOUT, "Irisch" + IDS_ITALIAN_LAYOUT, "Italienisch" + IDS_ITALIAN_142_LAYOUT, "Italienisch (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Lateinamerikanisch" + IDS_NORWEGIAN_LAYOUT, "Norwegisch" + IDS_PORTUGUESE_LAYOUT, "Portugiesisch" + IDS_SPANISH_LAYOUT, "Spanisch" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanisch (Variation)" + IDS_SWEDISH_LAYOUT, "Schwedisch" + IDS_SWISS_FRENCH_LAYOUT, "Französisch (Schweiz)" + IDS_SWISS_GERMAN_LAYOUT, "Deutsch (Schweiz)" + IDS_UNITED_KINGDOM_LAYOUT, "Englisch (Großbritannien u. Nordirland)" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "Englisch (USA, International)" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "Englisch (USA, Dvorak für Linkshänder)" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "Englisch (USA, Dvorak für Rechtshänder)" + IDS_ALBANIAN_LAYOUT, "Albanisch" + IDS_CROATIAN_LAYOUT, "Kroatisch" + IDS_CZECH_LAYOUT, "Tschechisch" + IDS_CZECH_QWERTY_LAYOUT, "Tschechisch (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Ungarisch" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Ungarisch (101-Tastatur)" + IDS_POLISH_LAYOUT, "Polnisch (Programmierer)" + IDS_POLISH_214_LAYOUT, "Polnisch (214)" + IDS_ROMANIAN_LAYOUT, "Rumänisch" + IDS_SERBIAN_LATIN_LAYOUT, "Serbisch (Lateinisch)" + IDS_SLOVAK_LAYOUT, "Slowakisch" + IDS_SLOVAK_QWERTY_LAYOUT, "Slowakisch (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slowenisch" + IDS_ESTONIAN_LAYOUT, "Estnisch" + IDS_LATVIAN_LAYOUT, "Lettisch" + IDS_LATVIAN_QWERTY_LAYOUT, "Lettisch (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Litauisch (IBM)" + IDS_GREEK_LAYOUT, "Griechisch" + IDS_GREEK_LATIN_LAYOUT, "Griechisch (Lateinisch)" + IDS_GREEK_220_LAYOUT, "Griechisch (220)" + IDS_GREEK_319_LAYOUT, "Griechisch (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Griechisch (220, Lateinisch)" + IDS_GREEK_319_LATIN_LAYOUT, "Griechisch (319, Lateinisch)" + IDS_BELARUSIAN_LAYOUT, "Belarussisch" + IDS_BULGARIAN_LAYOUT, "Bulgarisch" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarisch (Lateinisch)" + IDS_RUSSIAN_LAYOUT, "Russisch" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russisch (Schreibmaschine)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbisch (Kyrillisch)" + IDS_UKRAINIAN_LAYOUT, "Ukrainisch" + IDS_TURKISH_F_LAYOUT, "Türkisch F" + IDS_TURKISH_Q_LAYOUT, "Türkisch Q" + IDS_JAPANESE_LAYOUT, "Japanisch" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanisches Eingabesystem (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Koreanisch" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Koreanisches Eingabesystem (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinesisch (traditionell) - US-Tastatur" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinesisch (traditionell) - Phonetisch" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinesisch (traditionell) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinesisch (traditionell) - Big5-Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinesisch (traditionell) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinesisch (traditionell) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinesisch (traditionell) - Alphanumerisch" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinesisch (vereinfacht) - US-Tastatur" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinesisch (vereinfacht) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinesisch (vereinfacht) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinesisch (vereinfacht) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinesisch (vereinfacht) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (nicht ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (nicht ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebräisch" + IDS_ARABIC_101_LAYOUT, "Arabisch (101)" + IDS_ARABIC_102_LAYOUT, "Arabisch (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabisch (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Tschechisch (Programmierer)" + IDS_LITHUANIAN_LAYOUT, "Litauisch" + IDS_BELGIAN_COMMA_LAYOUT, "Belgisch (Komma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinesisch (traditionell) - Phonetisch, neu" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinesisch (vereinfacht) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "Englisch (USA, Dvorak)" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinesisch (traditionell) - ChangJie, neu" + IDS_ASSAMESE_LAYOUT, "Assamisch" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi (traditionell)" + IDS_CANTONESE_PHONETIC_LAYOUT, "Phonetisches Kantonesisch" + IDS_FAEROESE_LAYOUT, "Färöisch" + IDS_FYRO_MACEDONIAN_LAYOUT, "Mazedonisch (FYROM)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Kanada (Standard -- Multilingual)" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinesisch (traditionell) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinesisch (traditionell) - Array" + IDS_KAZAKH_LAYOUT, "Kasachisch" + IDS_UZBEK_CYRILLIC_LAYOUT, "Usbekisches Kyrillisch" + IDS_AZERI_CYRILLIC_LAYOUT, "Aserbaidschanisch (Kyrillisch)" + IDS_TATAR_LAYOUT, "Tatarisch" + IDS_AZERI_LATIN_LAYOUT, "Aserbaidschanisch (Lateinisch)" + IDS_VIETNAMESE_LAYOUT, "Vietnamesisch" + IDS_GEORGIAN_LAYOUT, "Georgisch" + IDS_ARMENIAN_EASTERN_LAYOUT, "Ostarmenisch" + IDS_ARMENIAN_WESTERN_LAYOUT, "Westarmenisch" + IDS_GREEK_POLYTONIC_LAYOUT, "Griechisch (Polytonisch)" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US-Englische Tabelle für IBM Arabisch 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gälisch" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugiesisch (Brasilianisch, ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolisches Kyrillisch" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kirgisisches Kyrillisch" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syrisch" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syrisch (Phonetisch)" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi (Phonetisch)" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi (Schreibmaschine)" END

1 0

[gedmurphy] 29018: - rewrite the Control code - smooth the progress bar movement - clean up various other bits
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 17:50:51 2007 New Revision: 29018 URL: http://svn.reactos.org/svn/reactos?rev=29018&view=rev Log: - rewrite the Control code - smooth the progress bar movement - clean up various other bits Modified: trunk/reactos/base/applications/mscutils/servman/about.c trunk/reactos/base/applications/mscutils/servman/control.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/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c Wed Sep 12 17:50:51 2007 @@ -12,43 +12,33 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - HWND hLicenseEditWnd; - HICON hIcon = NULL; - TCHAR strLicense[700]; - switch (message) { case WM_INITDIALOG: - - hIcon = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - if (hIcon) - { - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); - DestroyIcon(hIcon); - } + { + HWND hLicenseEditWnd; hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); if (hLicenseEditWnd) { - LoadString(hInstance, - IDS_LICENSE, - strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + LPTSTR lpString; - SetWindowText(hLicenseEditWnd, - strLicense); + if (AllocAndLoadString(&lpString, + hInstance, + IDS_LICENSE)) + { + SetWindowText(hLicenseEditWnd, + lpString); + + HeapFree(GetProcessHeap(), + 0, + lpString); + } } return TRUE; + } case WM_COMMAND: 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 Wed Sep 12 17:50:51 2007 @@ -18,117 +18,99 @@ SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; SERVICE_STATUS Status; - LVITEM item; DWORD BytesNeeded = 0; - DWORD dwStartTickCount, dwOldCheckPoint; + BOOL bRet = FALSE; + BOOL bDispErr = TRUE; - item.mask = LVIF_PARAM; - item.iItem = Info->SelectedItem; - SendMessage(Info->hListView, - LVM_GETITEM, - 0, - (LPARAM)&item); - - /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) + if (hSCManager != NULL) { - GetError(); - return FALSE; - } + hSc = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_ALL_ACCESS); + if (hSc != NULL) + { + if (ControlService(hSc, + Control, + &Status)) + { + bDispErr = FALSE; - /* open handle to the service */ - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SC_MANAGER_ALL_ACCESS); - if (hSc == NULL) - { - GetError(); - return FALSE; - } + if (QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + DWORD dwStartTickCount = GetTickCount(); + DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; + DWORD dwMaxWait = 2000 * 60; // wait for 2 mins - /* process requested action */ - if (! ControlService(hSc, - Control, - &Status)) - { - GetError(); - CloseServiceHandle(hSc); - return FALSE; - } + IncrementProgressBar(hProgDlg); - /* query the state of the service */ - if (! QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - GetError(); - return FALSE; - } + while (ServiceStatus.dwCurrentState != Control) + { + DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; - /* Save the tick count and initial checkpoint. */ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; + if (!QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + break; + } - /* loop whilst service is not running */ - /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState != Control) - { - DWORD dwWaitTime; + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* The service is making progress, increment the progress bar */ + IncrementProgressBar(hProgDlg); + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if(GetTickCount() >= dwStartTickCount + dwMaxWait) + { + /* give up */ + break; + } + } - dwWaitTime = ServiceStatus.dwWaitHint / 10; + if(dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; - if (dwWaitTime < 500) - dwWaitTime = 500; - else if (dwWaitTime > 5000) - dwWaitTime = 5000; - - IncrementProgressBar(hProgDlg); - - /* wait before checking status */ - Sleep(dwWaitTime); - - /* check status again */ - if (! QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - GetError(); - return FALSE; + Sleep(dwWaitTime); + } + } + } + + CloseServiceHandle(hSc); } - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - IncrementProgressBar(hProgDlg); - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) - { - /* No progress made within the wait hint */ - break; - } - } + CloseServiceHandle(hSCManager); } - - CloseServiceHandle(hSc); if (ServiceStatus.dwCurrentState == Control) { CompleteProgressBar(hProgDlg); - Sleep(1000); - return TRUE; + Sleep(500); + bRet = TRUE; } else - return FALSE; + { + if (bDispErr) + GetError(); + else + DisplayString(_T("The service failed to start")); + } + + return bRet; + } @@ -146,7 +128,7 @@ hProgDlg, SERVICE_CONTROL_STOP); - SendMessage(hProgDlg, WM_DESTROY, 0, 0); + DestroyWindow(hProgDlg); } return ret; @@ -166,7 +148,7 @@ hProgDlg, SERVICE_CONTROL_PAUSE); - SendMessage(hProgDlg, WM_DESTROY, 0, 0); + DestroyWindow(hProgDlg); } return ret; @@ -186,7 +168,7 @@ hProgDlg, SERVICE_CONTROL_CONTINUE); - SendMessage(hProgDlg, WM_DESTROY, 0, 0); + DestroyWindow(hProgDlg); } return ret; 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 Wed Sep 12 17:50:51 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -162,7 +162,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Óïðàâëåíèå íà óñëóãèòå" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -159,7 +159,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Dienststeuerung" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -159,7 +159,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -69,7 +69,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -160,7 +160,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Contrôle du Service" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -159,7 +159,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Kontrol Layanan" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -159,7 +159,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -75,7 +75,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -165,7 +165,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Us³uga kontrolna" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Ìåíåäæåð ñëóæá v0.8\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Ìåíåäæåð ñëóæá v0.8\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -158,7 +158,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Óïðàâëåíèå ñëóæáàìè" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "",IDC_SERVCON_PROGRESS,"msctls_progress32",0x50000000,8,46,238,13 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 Wed Sep 12 17:50:51 2007 @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.8\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.8\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "»Ô´", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -168,7 +168,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "µÑÇ¤Çº¤ØÁºÃÔ¡ÒÃ" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc Wed Sep 12 17:50:51 2007 @@ -76,7 +76,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Äèñïåò÷åð êåðóâàííÿ ñëóæáàìè v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Äèñïåò÷åð êåðóâàííÿ ñëóæáàìè v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Çàêðèòè", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -167,7 +167,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Óïðàâë³ííÿ ñëóæáàìè" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 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 Wed Sep 12 17:50:51 2007 @@ -9,7 +9,7 @@ #include "precomp.h" -#define PROGRESSRANGE 8 +#define PROGRESSRANGE 20 VOID CompleteProgressBar(HWND hProgDlg) @@ -21,10 +21,21 @@ if (hProgBar) { - SendMessage(hProgBar, - PBM_DELTAPOS, - PROGRESSRANGE, - 0); + INT pos = 0; + + pos = SendMessage(hProgBar, + PBM_GETPOS, + 0, + 0); + + for (; pos <= PROGRESSRANGE; pos++) + { + SendMessage(hProgBar, + PBM_DELTAPOS, + pos, + 0); + Sleep(15); + } } } @@ -82,10 +93,6 @@ } break; - case WM_DESTROY: - DestroyWindow(hDlg); - break; - default: return FALSE; } @@ -109,9 +116,6 @@ (DLGPROC)ProgressDialogProc); if (hProgDlg != NULL) { - ShowWindow(hProgDlg, - SW_SHOW); - /* write the info to the progress dialog */ LoadString(hInstance, Event, 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 Wed Sep 12 17:50:51 2007 @@ -18,6 +18,7 @@ SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; BOOL bRet = FALSE; + BOOL bDispErr = TRUE; hSCManager = OpenSCManager(NULL, NULL, @@ -33,6 +34,8 @@ 0, NULL)) { + bDispErr = FALSE; + if (QueryServiceStatusEx(hSc, SC_STATUS_PROCESS_INFO, (LPBYTE)&ServiceStatus, @@ -41,19 +44,13 @@ { DWORD dwStartTickCount = GetTickCount(); DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; + DWORD dwMaxWait = 2000 * 60; // wait for 2 mins + + IncrementProgressBar(hProgDlg); while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) { DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; - - if(dwWaitTime < 1000) - dwWaitTime = 500; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; - - IncrementProgressBar(hProgDlg); - Sleep(dwWaitTime ); - IncrementProgressBar(hProgDlg); if (!QueryServiceStatusEx(hSc, SC_STATUS_PROCESS_INFO, @@ -73,12 +70,19 @@ } else { - if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) + if(GetTickCount() >= dwStartTickCount + dwMaxWait) { - /* No progress made within the wait hint */ + /* give up */ break; } } + + if(dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; + + Sleep(dwWaitTime); } } } @@ -92,11 +96,16 @@ if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { CompleteProgressBar(hProgDlg); - Sleep(1000); + Sleep(500); bRet = TRUE; } else - GetError(); + { + if (bDispErr) + GetError(); + else + DisplayString(_T("The service failed to start")); + } return bRet; } @@ -114,13 +123,12 @@ if (hProgDlg) { + IncrementProgressBar(hProgDlg); + bRet = DoStartService(Info, hProgDlg); - SendMessage(hProgDlg, - WM_DESTROY, - 0, - 0); + DestroyWindow(hProgDlg); } return bRet;

1 0

[gedmurphy] 29017: Use the handle for ControlService too. This allows me to start and stop my test service (but tcpsvcs hangs on stop)
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 13:27:33 2007 New Revision: 29017 URL: http://svn.reactos.org/svn/reactos?rev=29017&view=rev Log: Use the handle for ControlService too. This allows me to start and stop my test service (but tcpsvcs hangs on stop) Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Wed Sep 12 13:27:33 2007 @@ -581,7 +581,7 @@ return ERROR_NOT_ENOUGH_MEMORY; ControlPacket->dwControl = dwControl; - + ControlPacket->hClient = Service->hClient; ControlPacket->dwSize = TotalLength; wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName);

1 0

[gedmurphy] 29016: silence a couple of debug messages I missed
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 13:08:11 2007 New Revision: 29016 URL: http://svn.reactos.org/svn/reactos?rev=29016&view=rev Log: silence a couple of debug messages I missed Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Wed Sep 12 13:08:11 2007 @@ -133,7 +133,7 @@ if (CurrentService->hClient == Handle) { - DPRINT1("Found service: '%S'\n", CurrentService->lpDisplayName); + DPRINT("Found service: '%S'\n", CurrentService->lpDisplayName); return CurrentService; } @@ -620,7 +620,7 @@ PWSTR Ptr; DWORD Count; - DPRINT1("ScmSendStartCommand() called\n"); + DPRINT("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1;

1 0

[gedmurphy] 29015: add a client handle to the private interface
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 12:47:06 2007 New Revision: 29015 URL: http://svn.reactos.org/svn/reactos?rev=29015&view=rev Log: add a client handle to the private interface Modified: trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h (original) +++ trunk/reactos/include/reactos/services/services.h Wed Sep 12 12:47:06 2007 @@ -11,9 +11,12 @@ #define SERVICE_CONTROL_START 0 +typedef DWORD CLIENT_HANDLE; + typedef struct _SCM_CONTROL_PACKET { DWORD dwControl; + CLIENT_HANDLE hClient; DWORD dwSize; WCHAR szArguments[1]; } SCM_CONTROL_PACKET, *PSCM_CONTROL_PACKET;

1 0

[gedmurphy] 29014: - Share a client service handle with the SCM and use it to identify services. - This fixes the problem where a service name created via CreateService (reg key name) can be different than the one supplied in the call to StartServiceCtrlDispatcher. Windows can still start services in this situation, previously we would fail to find the right service.
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 12:46:00 2007 New Revision: 29014 URL: http://svn.reactos.org/svn/reactos?rev=29014&view=rev Log: - Share a client service handle with the SCM and use it to identify services. - This fixes the problem where a service name created via CreateService (reg key name) can be different than the one supplied in the call to StartServiceCtrlDispatcher. Windows can still start services in this situation, previously we would fail to find the right service. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Wed Sep 12 12:46:00 2007 @@ -1,14 +1,13 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/advapi32/service/sctrl.c - * PURPOSE: Service control manager functions - * PROGRAMMER: Emanuele Aliberti - * UPDATE HISTORY: - * 19990413 EA created - * 19990515 EA - */ +/* + * PROJECT: ReactOS advapi32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/advapi32/service/sctrl.c + * PURPOSE: Service control manager functions + * COPYRIGHT: Copyright 1999 Emanuele Aliberti + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + /* INCLUDES ******************************************************************/ @@ -24,7 +23,7 @@ typedef struct _ACTIVE_SERVICE { - SERVICE_STATUS_HANDLE hServiceStatus; + CLIENT_HANDLE hService; UNICODE_STRING ServiceName; union { @@ -226,18 +225,17 @@ return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } - /* HACK: send the SERVICE_STATUS_HANDLE handle */ + /* Share the SERVICE_HANDLE handle with the SCM */ WriteFile(*hPipe, - (DWORD *)&lpActiveServices->hServiceStatus, - sizeof(SERVICE_STATUS_HANDLE), + (DWORD *)&lpActiveServices->hService, + sizeof(CLIENT_HANDLE), &dwBytesWritten, NULL); - DPRINT("Sent SERVICE_STATUS_HANDLE handle %lu\n", lpActiveServices->hServiceStatus); + DPRINT("Sent SERVICE_HANDLE %lu\n", lpActiveServices->hService); return ERROR_SUCCESS; } - static DWORD @@ -248,12 +246,16 @@ DWORD ThreadId; DPRINT("ScStartService() called\n"); + DPRINT("client handle: %lu\n", ControlPacket->hClient); DPRINT("Size: %lu\n", ControlPacket->dwSize); DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); - lpService = ScLookupServiceByServiceName(&ControlPacket->szArguments[0]); + lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) + { + DPRINT1("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; + } lpService->Arguments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -291,18 +293,19 @@ DPRINT("Size: %lu\n", ControlPacket->dwSize); DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); - lpService = ScLookupServiceByServiceName(&ControlPacket->szArguments[0]); + lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) + { + DPRINT1("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; + } if (lpService->HandlerFunction) { - DPRINT("Calling HandlerFunction with %lu\n", ControlPacket->dwControl); (lpService->HandlerFunction)(ControlPacket->dwControl); } else if (lpService->HandlerFunctionEx) { - DPRINT("Calling HandlerFunctionEx with %lu\n", ControlPacket->dwControl); /* FIXME: send correct params */ (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); } @@ -333,8 +336,8 @@ DPRINT("ScDispatcherLoop() called\n"); ControlPacket = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - 1024); + HEAP_ZERO_MEMORY, + 1024); if (ControlPacket == NULL) return FALSE; @@ -433,9 +436,9 @@ Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hServiceStatus); - - return Service->hServiceStatus; + DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hService); + + return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -482,7 +485,6 @@ { PACTIVE_SERVICE Service; - /* FIXME: WinXP can start services with incorrect names */ Service = ScLookupServiceByServiceName(lpServiceName); if (Service == NULL) { @@ -493,9 +495,9 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext; - DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hServiceStatus); - - return Service->hServiceStatus; + DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hService); + + return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -551,7 +553,7 @@ /********************************************************************** * StartServiceCtrlDispatcherA * - * @unimplemented + * @implemented */ BOOL STDCALL StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable) @@ -584,7 +586,7 @@ RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; + lpActiveServices[i].hService = (CLIENT_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = FALSE; } @@ -629,7 +631,7 @@ /********************************************************************** * StartServiceCtrlDispatcherW * - * @unimplemented + * @implemented */ BOOL STDCALL StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW lpServiceStartTable) @@ -662,7 +664,7 @@ RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; + lpActiveServices[i].hService = (CLIENT_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = TRUE; }

1 0

[gedmurphy] 29013: Receive a client service handle from advapi32 so we can get a permenant link between the SCM and the service
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 12:41:00 2007 New Revision: 29013 URL: http://svn.reactos.org/svn/reactos?rev=29013&view=rev Log: Receive a client service handle from advapi32 so we can get a permenant link between the SCM and the service Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Wed Sep 12 12:41:00 2007 @@ -116,12 +116,12 @@ PSERVICE -ScmGetServiceEntryByServiceStatusHandle(ULONG Handle) +ScmGetServiceEntryByClientHandle(ULONG Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; - DPRINT("ScmGetServiceEntryByServiceStatusHandle() called\n"); + DPRINT("ScmGetServiceEntryByClientHandle() called\n"); DPRINT("looking for %lu\n", Handle); ServiceEntry = ServiceListHead.Flink; @@ -131,7 +131,7 @@ SERVICE, ServiceListEntry); - if (CurrentService->hServiceStatus == Handle) + if (CurrentService->hClient == Handle) { DPRINT1("Found service: '%S'\n", CurrentService->lpDisplayName); return CurrentService; @@ -640,13 +640,14 @@ DPRINT("ArgsLength: %ld TotalLength: %ld\n", ArgsLength, TotalLength); /* Allocate a control packet */ - ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); + ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; ControlPacket->dwControl = SERVICE_CONTROL_START; + ControlPacket->hClient = Service->hClient; ControlPacket->dwSize = TotalLength; Ptr = &ControlPacket->szArguments[0]; wcscpy(Ptr, Service->lpServiceName); @@ -793,7 +794,7 @@ /* Read SERVICE_STATUS_HANDLE from pipe */ if (!ReadFile(Service->ControlPipeHandle, - (LPVOID)&Service->hServiceStatus, + (LPVOID)&Service->hClient, sizeof(DWORD), &dwRead, NULL)) @@ -804,8 +805,7 @@ } else { - DPRINT("Received service status %lu\n", Service->hServiceStatus); - DPRINT("calling ScmSendStartCommand on %S\n", Service->lpDisplayName); + DPRINT("Received service status %lu\n", Service->hClient); /* Send start command */ dwError = ScmSendStartCommand(Service, lpArgs); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Wed Sep 12 12:41:00 2007 @@ -717,7 +717,7 @@ if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; - lpService = ScmGetServiceEntryByServiceStatusHandle((ULONG)hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle((ULONG)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Wed Sep 12 12:41:00 2007 @@ -41,7 +41,7 @@ BOOL bDeleted; DWORD dwResumeCount; - SERVICE_STATUS_HANDLE hServiceStatus; + CLIENT_HANDLE hClient; SERVICE_STATUS Status; DWORD dwStartType; DWORD dwErrorControl; @@ -105,7 +105,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByServiceStatusHandle(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); DWORD ScmMarkServiceForDelete(PSERVICE pService);

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