Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[dreimer] 28548: German Translation for Magnifier. (Made by myself)
by dreimer＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: dreimer Date: Sat Aug 25 19:39:51 2007 New Revision: 28548 URL: http://svn.reactos.org/svn/reactos?rev=28548&view=rev Log: German Translation for Magnifier. (Made by myself) Added: trunk/rosapps/magnify/lang/de-DE.rc Modified: trunk/rosapps/magnify/rsrc.rc Added: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc (added) +++ trunk/rosapps/magnify/lang/de-DE.rc Sat Aug 25 19:39:51 2007 @@ -1,0 +1,65 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", IDM_EXIT + MENUITEM "&Optionen", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Über ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Über" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Bildschirm-Lupe Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Bildschirm-Lupe Einstellungen" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Beenden",IDOK,96,161,50,14 + PUSHBUTTON "Hilfe",IDOK,38,161,50,14 + LTEXT "Vergrößerungsfaktor:",IDC_STATIC,6,12,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Folgen",IDC_STATIC,7,25,139,59 + GROUPBOX "Präsentation",IDC_STATIC,7,87,139,57 + CONTROL "Maus-Cursor folgen",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Tastaturfokus folgen",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Texteingabe folgen",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Farben invertieren",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Minimiert starten",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Bildschirm-Lupe anzeigen",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS Bildschirm-Lupe" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Die Bildschirmlupe ist für Personen mit leichten visuellen Einschränkungen gedacht und stellt lediglich Grundfunktionen zur Verfügung. Die meisten Nutzer mit visuellen Einschränkungen werden eine Bildschirm-Lupe mit mehr Funktionen für die alltägliche Nutzung benötigen.",IDC_STATIC,36,7,207,33 + CONTROL "Diese Nachricht nicht mehr anzeigen",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Bildschirm-Lupe" + IDC_MAGNIFIER "BILDSCHIRM-LUPE" +END Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=28548&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (original) +++ trunk/rosapps/magnify/rsrc.rc Sat Aug 25 19:39:51 2007 @@ -2,5 +2,6 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/uk-UA.rc"

1 0

[gedmurphy] 28547: fix a typo
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 19:18:45 2007 New Revision: 28547 URL: http://svn.reactos.org/svn/reactos?rev=28547&view=rev Log: fix a typo Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/servman.rbuild 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 Sat Aug 25 19:18:45 2007 @@ -187,7 +187,7 @@ { ret = Control(Info, hProgDlg, - SERVICE_CONTROL_RESUME); + SERVICE_CONTROL_CONTINUE); SendMessage(hProgDlg, WM_DESTROY, 0, 0); } Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Sat Aug 25 19:18:45 2007 @@ -27,7 +27,7 @@ <file>query.c</file> <file>reg.c</file> <file>servman.c</file> - <file>start.c</file> + <file>start.c</file> </compilationunit> <file>servman.rc</file> <pch>precomp.h</pch>

1 0

[gedmurphy] 28546: send the correct control message
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 18:55:02 2007 New Revision: 28546 URL: http://svn.reactos.org/svn/reactos?rev=28546&view=rev Log: send the correct control message Modified: trunk/reactos/base/applications/mscutils/servman/control.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 Sat Aug 25 18:55:02 2007 @@ -166,7 +166,7 @@ { ret = Control(Info, hProgDlg, - SERVICE_CONTROL_STOP); + SERVICE_CONTROL_PAUSE); SendMessage(hProgDlg, WM_DESTROY, 0, 0); } @@ -187,7 +187,7 @@ { ret = Control(Info, hProgDlg, - SERVICE_CONTROL_STOP); + SERVICE_CONTROL_RESUME); SendMessage(hProgDlg, WM_DESTROY, 0, 0); }

1 0

[gedmurphy] 28545: fix stop / pause / resume
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 18:51:36 2007 New Revision: 28545 URL: http://svn.reactos.org/svn/reactos?rev=28545&view=rev Log: fix stop / pause / resume Removed: trunk/reactos/base/applications/mscutils/servman/res/exit.bmp trunk/reactos/base/applications/mscutils/servman/res/help.bmp trunk/reactos/base/applications/mscutils/servman/stop.c Modified: 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/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mscutils/servman/servman.rbuild trunk/reactos/base/applications/mscutils/servman/start.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 Sat Aug 25 18:51:36 2007 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL +static BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control) @@ -131,3 +131,67 @@ return FALSE; } + +BOOL DoStop(PMAIN_WND_INFO Info) +{ + BOOL ret = FALSE; + HWND hProgDlg; + + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->CurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); + + if (hProgDlg) + { + ret = Control(Info, + hProgDlg, + SERVICE_CONTROL_STOP); + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } + + return ret; +} + +BOOL DoPause(PMAIN_WND_INFO Info) +{ + BOOL ret = FALSE; + HWND hProgDlg; + + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->CurrentService->lpServiceName, + IDS_PROGRESS_INFO_PAUSE); + + if (hProgDlg) + { + ret = Control(Info, + hProgDlg, + SERVICE_CONTROL_STOP); + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } + + return ret; +} + +BOOL DoResume(PMAIN_WND_INFO Info) +{ + BOOL ret = FALSE; + HWND hProgDlg; + + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->CurrentService->lpServiceName, + IDS_PROGRESS_INFO_RESUME); + + if (hProgDlg) + { + ret = Control(Info, + hProgDlg, + SERVICE_CONTROL_STOP); + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } + + 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 Sat Aug 25 18:51:36 2007 @@ -214,6 +214,8 @@ BEGIN IDS_PROGRESS_INFO_START "ÐåàêòÎÑ ñå îïèòâà äà ïóñíå ñëåäíàòà óñëóãà" IDS_PROGRESS_INFO_STOP "ÐåàêòÎÑ ñå îïèòâà äà ñïðå ñëåäíàòà óñëóãà" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Óñëóãàòà å óñïåøíî ñúçäàäåíà" IDS_CREATE_REQ "Ïîëåòàòà, îòáåëÿçàíè ñúñ \nçâåçäè÷êà ñà íåàçàäúëæèòåëíè" IDS_DELETE_STOP "Òðÿáâà ðú÷íî äà ñïðåòå óñëóãàòà, ïðåäè äà ÿ èçòðèåòå!" 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 Sat Aug 25 18:51:36 2007 @@ -210,6 +210,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS versucht den folgenden Dienst zu starten" IDS_PROGRESS_INFO_STOP "ReactOS versucht den folgenden Dienst zu beenden" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt" IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich" IDS_DELETE_STOP "Sie müssen den Dienst manuell beenden, bevor er gelöscht werden kann!" 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 Sat Aug 25 18:51:36 2007 @@ -208,8 +208,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" - IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" + IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" 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 Sat Aug 25 18:51:36 2007 @@ -214,6 +214,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS essaye de démarrer le service suivant" IDS_PROGRESS_INFO_STOP "ReactOS essaye d'arrêter le service suivant" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service créé" IDS_CREATE_REQ "Les champs marqués d'une astérisque\nasont obligatoires" IDS_DELETE_STOP "Vous devez arrêter le service avant de le supprimer!" 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 Sat Aug 25 18:51:36 2007 @@ -210,6 +210,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS sedang mencoba untuk memulai layanan berikut" IDS_PROGRESS_INFO_STOP "ReactOS sedang mencoba untuk menghentikan layanan berikut" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Layanan Dibuat Dengan Sukses" IDS_CREATE_REQ "Field yang ditandai dengan\nbintang adalah mandatori" IDS_DELETE_STOP "Anda harus menghentikan layanan sebelum menghapus!" 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 Sat Aug 25 18:51:36 2007 @@ -210,6 +210,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS sta avviando il seguente servizio" IDS_PROGRESS_INFO_STOP "ReactOS sta fermando il seguente servizio" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Servizio creato regolarmente" IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" 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 Sat Aug 25 18:51:36 2007 @@ -217,6 +217,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS usi³uje uruchomiæ nastêpuj¹c¹ us³ugê" IDS_PROGRESS_INFO_STOP "ReactOS usi³uje zatrzymaæ nastêpuj¹c¹ us³ugê" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Us³uga utworzona pomylnie" IDS_CREATE_REQ "Pole zaznaczone wraz z \ nasterix jest obowi¹zkowy" IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuwaniem!" 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 Sat Aug 25 18:51:36 2007 @@ -209,6 +209,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS ïûòàåòñÿ çàïóñòèòü ñëóæáó" IDS_PROGRESS_INFO_STOP "ReactOS ïûòàåòñÿ îñòàíîâèòü ñëóæáó" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Ñîçäàíèå ñëóæáû óñïåøíî çàâåðøåíî" IDS_CREATE_REQ "* = îáÿçàòåëüíûå ïîëÿ" IDS_DELETE_STOP "Âû äîëæíû âðó÷íóþ îñòàíîâèòü ñëóæáó ïåðåä óäàëåíèåì!" 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 Sat Aug 25 18:51:36 2007 @@ -219,6 +219,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" 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 Sat Aug 25 18:51:36 2007 @@ -644,24 +644,16 @@ break; case ID_STOP: - { if (DoStop(Info)) SetMenuAndButtonStates(Info); - } break; case ID_PAUSE: - { - //Control(Info, - // SERVICE_CONTROL_PAUSE); - } + DoPause(Info); break; case ID_RESUME: - { - //Control(Info, - // SERVICE_CONTROL_CONTINUE ); - } + DoResume(Info); break; case ID_RESTART: 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 Sat Aug 25 18:51:36 2007 @@ -60,23 +60,26 @@ BOOL DoStart(PMAIN_WND_INFO Info); /* stop */ -BOOL DoStop(PMAIN_WND_INFO Info); + /* control */ -BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control); +BOOL DoStop(PMAIN_WND_INFO Info); +BOOL DoPause(PMAIN_WND_INFO Info); +BOOL DoResume(PMAIN_WND_INFO Info); /* progress.c */ -HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName); +HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, UINT Event); VOID IncrementProgressBar(HWND hProgDlg); VOID CompleteProgressBar(HWND hProgDlg); /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); +LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); +BOOL RefreshServiceList(PMAIN_WND_INFO Info); + +/* reg */ BOOL SetDescription(LPTSTR, LPTSTR); LPTSTR GetDescription(LPTSTR); -LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); -BOOL RefreshServiceList(PMAIN_WND_INFO Info); -//DWORD GetServiceList(PMAIN_WND_INFO Info); /* propsheet.c */ LONG APIENTRY OpenPropSheet(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 Sat Aug 25 18:51:36 2007 @@ -96,7 +96,8 @@ HWND CreateProgressDialog(HWND hParent, - LPTSTR lpServiceName) + LPTSTR lpServiceName, + UINT Event) { HWND hProgDlg; TCHAR ProgDlgBuf[100]; @@ -113,7 +114,7 @@ /* write the info to the progress dialog */ LoadString(hInstance, - IDS_PROGRESS_INFO_STOP, + Event, ProgDlgBuf, sizeof(ProgDlgBuf) / sizeof(TCHAR)); Removed: trunk/reactos/base/applications/mscutils/servman/res/exit.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/mscutils/servman/res/help.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary file - no diff available. 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 Sat Aug 25 18:51:36 2007 @@ -164,11 +164,13 @@ /* progress bar */ -#define IDD_DLG_PROGRESS 7000 -#define IDC_SERVCON_PROGRESS 7001 -#define IDC_SERVCON_INFO 7002 -#define IDC_SERVCON_NAME 7003 -#define IDS_PROGRESS_INFO_START 7004 -#define IDS_PROGRESS_INFO_STOP 7005 +#define IDD_DLG_PROGRESS 7000 +#define IDC_SERVCON_PROGRESS 7001 +#define IDC_SERVCON_INFO 7002 +#define IDC_SERVCON_NAME 7003 +#define IDS_PROGRESS_INFO_START 7004 +#define IDS_PROGRESS_INFO_STOP 7005 +#define IDS_PROGRESS_INFO_PAUSE 7006 +#define IDS_PROGRESS_INFO_RESUME 7007 Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Sat Aug 25 18:51:36 2007 @@ -17,8 +17,6 @@ IDB_STOP BITMAP DISCARDABLE "res/stop.bmp" IDB_PAUSE BITMAP DISCARDABLE "res/pause.bmp" IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp" -IDB_HELP BITMAP DISCARDABLE "res/help.bmp" -IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" #include "lang/bg-BG.rc" #include "lang/de-DE.rc" @@ -29,5 +27,3 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc" - - Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Sat Aug 25 18:51:36 2007 @@ -27,8 +27,7 @@ <file>query.c</file> <file>reg.c</file> <file>servman.c</file> - <file>start.c</file> - <file>stop.c</file> + <file>start.c</file> </compilationunit> <file>servman.rc</file> <pch>precomp.h</pch> 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 Sat Aug 25 18:51:36 2007 @@ -130,7 +130,8 @@ BOOL bRet = FALSE; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName); + Info->CurrentService->lpServiceName, + IDS_PROGRESS_INFO_START); if (hProgDlg) { Removed: 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 (removed) @@ -1,30 +1,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/stop.c - * PURPOSE: Stops a service - * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "precomp.h" - -BOOL DoStop(PMAIN_WND_INFO Info) -{ - BOOL ret = FALSE; - HWND hProgDlg; - - hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName); - - if (hProgDlg) - { - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_STOP); - - SendMessage(hProgDlg, WM_DESTROY, 0, 0); - } - - return ret; -}

1 0

[cfinck] 28544: French translation for Magnify by Pierre Schweitzer (heis_spiter AT hotmail DOT com) See issue #2531 for more details.
by cfinck＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: cfinck Date: Sat Aug 25 18:36:22 2007 New Revision: 28544 URL: http://svn.reactos.org/svn/reactos?rev=28544&view=rev Log: French translation for Magnify by Pierre Schweitzer (heis_spiter AT hotmail DOT com) See issue #2531 for more details. Added: trunk/rosapps/magnify/lang/fr-FR.rc Modified: trunk/rosapps/magnify/rsrc.rc Added: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc (added) +++ trunk/rosapps/magnify/lang/fr-FR.rc Sat Aug 25 18:36:22 2007 @@ -1,0 +1,65 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "Quitter", IDM_EXIT + MENUITEM "&Options", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&À propos ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "À propos" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Loupe Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètres de la loupe" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Quitter",IDOK,96,161,50,14 + PUSHBUTTON "Aider",IDOK,38,161,50,14 + LTEXT "Coefficient d'agrandissement:",IDC_STATIC,6,12,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Poursuite",IDC_STATIC,7,25,139,59 + GROUPBOX "Présentation",IDC_STATIC,7,87,139,57 + CONTROL "Suivre le curseur de la souris",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Suivre le focus du clavier",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Suivre l'édition de texte",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Inverser les couleurs",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Démarrer réduit",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Montrer la loupe",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "Loupe ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "La loupe a été réalisée pour fournir un niveau minimum de fonctionnalités pour les utilisateurs souffrants de problèmes déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 + CONTROL "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Loupe" + IDC_MAGNIFIER "LOUPE" +END Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=28544&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (original) +++ trunk/rosapps/magnify/rsrc.rc Sat Aug 25 18:36:22 2007 @@ -2,4 +2,5 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/uk-UA.rc"

1 0

[greatlrd] 28543: move EngFreeModule, EngGetCurrentCodePage, EngGetPrinterDataFileName, EngLoadModule from stub.c to eng.c
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 18:23:48 2007 New Revision: 28543 URL: http://svn.reactos.org/svn/reactos?rev=28543&view=rev Log: move EngFreeModule, EngGetCurrentCodePage, EngGetPrinterDataFileName, EngLoadModule from stub.c to eng.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.c 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 Sat Aug 25 18:23:48 2007 @@ -2457,28 +2457,6 @@ return 0; } - -/* - * @implemented - */ -VOID STDCALL -EngFreeModule(HANDLE h) -{ - FreeLibrary(h); -} - -/* - * @implemented - */ - -VOID STDCALL -EngGetCurrentCodePage(OUT PUSHORT OemCodePage, - OUT PUSHORT AnsiCodePage) -{ - *OemCodePage = GetOEMCP(); - *AnsiCodePage = GetACP(); -} - /* * @unimplemented */ @@ -2488,24 +2466,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - -/* - * @implemented - */ -LPWSTR STDCALL -EngGetPrinterDataFileName(HDEV hdev) -{ - return EngGetDriverName(hdev); -} - -/* - * @implemented - */ -HANDLE STDCALL -EngLoadModule(LPWSTR pwsz) -{ - return LoadLibraryExW ( pwsz, NULL, LOAD_LIBRARY_AS_DATAFILE); } @@ -2521,9 +2481,6 @@ { return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); } - - - /* * @implemented @@ -2942,3 +2899,4 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } + Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Sat Aug 25 18:23:48 2007 @@ -78,3 +78,44 @@ return (PVOID) Lock; } +/* + * @implemented + */ +VOID STDCALL +EngFreeModule(HANDLE h) +{ + FreeLibrary(h); +} + +/* + * @implemented + */ + +VOID STDCALL +EngGetCurrentCodePage( OUT PUSHORT OemCodePage, + OUT PUSHORT AnsiCodePage) +{ + *OemCodePage = GetOEMCP(); + *AnsiCodePage = GetACP(); +} + + +/* + * @implemented + */ +LPWSTR STDCALL +EngGetPrinterDataFileName(HDEV hdev) +{ + return EngGetDriverName(hdev); +} + +/* + * @implemented + */ +HANDLE STDCALL +EngLoadModule(LPWSTR pwsz) +{ + return LoadLibraryExW ( pwsz, NULL, LOAD_LIBRARY_AS_DATAFILE); +} + +

1 0

[greatlrd] 28542: add a new file call eng.c remove EngAcquireSemaphore, EngCreateSemaphore, EngDeleteSemaphore, EngFindResource implement from stub.c to eng.c rewrite smaller part of EngFindResource so it works likes windows xp.
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 18:07:00 2007 New Revision: 28542 URL: http://svn.reactos.org/svn/reactos?rev=28542&view=rev Log: add a new file call eng.c remove EngAcquireSemaphore, EngCreateSemaphore, EngDeleteSemaphore, EngFindResource implement from stub.c to eng.c rewrite smaller part of EngFindResource so it works likes windows xp. Added: trunk/reactos/dll/win32/gdi32/objects/eng.c (with props) Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sat Aug 25 18:07:00 2007 @@ -32,6 +32,7 @@ <file>brush.c</file> <file>coord.c</file> <file>dc.c</file> + <file>eng.c</file> <file>enhmfile.c</file> <file>font.c</file> <file>linedda.c</file> 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 Sat Aug 25 18:07:00 2007 @@ -2445,15 +2445,7 @@ return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); } -/* - * @implemented - */ -VOID -STDCALL -EngAcquireSemaphore ( IN HSEMAPHORE hsem ) -{ - RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); -} + /* * @unimplemented */ @@ -2465,67 +2457,6 @@ return 0; } -/* - * @unimplemented - */ -HSEMAPHORE -STDCALL -EngCreateSemaphore ( VOID ) -{ - PRTL_CRITICAL_SECTION CritSect = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION)); - if (!CritSect) return NULL; - RtlInitializeCriticalSection( CritSect ); - return (HSEMAPHORE)CritSect; -} - - - - - -/* - * @unimplemented - */ -VOID -STDCALL -EngDeleteSemaphore ( IN HSEMAPHORE hsem ) -{ - if (!hsem) return; - - RtlDeleteCriticalSection( (PRTL_CRITICAL_SECTION) hsem ); - RtlFreeHeap( GetProcessHeap(), 0, hsem ); -} - - - - - - - -/* - * @unimplemented - */ -PVOID STDCALL -EngFindResource(HANDLE h, - int iName, - int iType, - PULONG pulSize) -{ - HRSRC HRSrc; - DWORD Size; - HGLOBAL Hg; - LPVOID Lock; - - if (!(HRSrc = FindResourceW( (HMODULE) h, - MAKEINTRESOURCEW(iName), - MAKEINTRESOURCEW(iType) - ))) - return NULL; - if (!(Size = SizeofResource( (HMODULE) h, HRSrc ))) return NULL; - if (!(Hg = LoadResource( (HMODULE) h, HRSrc ))) return NULL; - Lock = LockResource( Hg ); - pulSize = (PULONG) Size; - return (PVOID) Lock; -} /* * @implemented Added: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (added) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Sat Aug 25 18:07:00 2007 @@ -1,0 +1,80 @@ +/* $Id: stubs.c 28533 2007-08-24 22:44:36Z greatlrd $ + * + * reactos/lib/gdi32/misc/eng.c + * + * GDI32.DLL eng part + * + * + */ + +#include "precomp.h" + +/* + * @implemented + */ +VOID +STDCALL +EngAcquireSemaphore ( IN HSEMAPHORE hsem ) +{ + RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); +} + +/* + * @implemented + */ +HSEMAPHORE +STDCALL +EngCreateSemaphore ( VOID ) +{ + PRTL_CRITICAL_SECTION CritSect = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION)); + if (!CritSect) + { + return NULL; + } + + RtlInitializeCriticalSection( CritSect ); + return (HSEMAPHORE)CritSect; +} + +/* + * @implemented + */ +VOID +STDCALL +EngDeleteSemaphore ( IN HSEMAPHORE hsem ) +{ + if (!hsem) return; + + RtlDeleteCriticalSection( (PRTL_CRITICAL_SECTION) hsem ); + RtlFreeHeap( GetProcessHeap(), 0, hsem ); +} + +/* + * @implemented + */ +PVOID STDCALL +EngFindResource(HANDLE h, + int iName, + int iType, + PULONG pulSize) +{ + HRSRC HRSrc; + DWORD Size = 0; + HGLOBAL Hg; + LPVOID Lock = NULL; + + if ((HRSrc = FindResourceW( (HMODULE) h, MAKEINTRESOURCEW(iName), MAKEINTRESOURCEW(iType)))) + { + if ((Size = SizeofResource( (HMODULE) h, HRSrc ))) + { + if ((Hg = LoadResource( (HMODULE) h, HRSrc ))) + { + Lock = LockResource( Hg ); + } + } + } + + *pulSize = Size; + return (PVOID) Lock; +} + Propchange: trunk/reactos/dll/win32/gdi32/objects/eng.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 28541: code improvements and various bug fixes
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 17:41:44 2007 New Revision: 28541 URL: http://svn.reactos.org/svn/reactos?rev=28541&view=rev Log: code improvements and various bug fixes Modified: 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/query.c 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 Sat Aug 25 17:41:44 2007 @@ -15,7 +15,7 @@ /* Toolbar buttons */ -TBBUTTON Buttons [NUM_BUTTONS] = +static const TBBUTTON Buttons [] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ {TBICON_PROP, ID_PROP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ @@ -141,31 +141,19 @@ { HMENU hMainMenu; DWORD Flags, State; + UINT i; /* get handle to menu */ hMainMenu = GetMenu(Info->hMainWnd); /* set all to greyed */ - EnableMenuItem(hMainMenu, ID_START, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_STOP, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_PAUSE, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_RESUME, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_RESTART, MF_GRAYED); - - EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_STOP, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_PAUSE, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_RESUME, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_RESTART, MF_GRAYED); - - SendMessage(Info->hTool, TB_SETSTATE, ID_START, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + for (i = ID_START; i <= ID_RESTART; i++) + { + EnableMenuItem(hMainMenu, i, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED); + SendMessage(Info->hTool, TB_SETSTATE, i, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + } if (Info->SelectedItem != NO_ITEM_SELECTED) { @@ -249,7 +237,7 @@ static BOOL pCreateToolbar(PMAIN_WND_INFO Info) { - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]); Info->hTool = CreateWindowEx(0, TOOLBARCLASSNAME, @@ -288,7 +276,7 @@ SendMessage(Info->hTool, TB_ADDBUTTONS, - NumButtons, + numButtons, (LPARAM)Buttons); return TRUE; @@ -346,7 +334,6 @@ (void)ListView_SetImageList(Info->hListView, hLarge, LVSIL_NORMAL); - } @@ -472,7 +459,6 @@ if(Info->hStatus == NULL) return FALSE; - SendMessage(Info->hStatus, SB_SETPARTS, sizeof(StatWidths) / sizeof(INT), @@ -485,7 +471,6 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv) { - HMENU hMainMenu; /* get handle to menu */ @@ -543,16 +528,19 @@ } -static VOID +static BOOL InitMainWnd(PMAIN_WND_INFO Info) { if (!pCreateToolbar(Info)) + { DisplayString(_T("error creating toolbar")); + return FALSE; + } if (!CreateListView(Info)) { DisplayString(_T("error creating list view")); - return; + return FALSE; } if (!CreateStatusBar(Info)) @@ -563,6 +551,8 @@ MAKEINTRESOURCE(IDR_POPUP)); Info->hShortcutMenu = GetSubMenu(Info->hShortcutMenu, 0); + + return TRUE; } @@ -820,7 +810,8 @@ GWLP_USERDATA, (LONG_PTR)Info); - InitMainWnd(Info); + if (!InitMainWnd(Info)) + return -1; /* Show the window */ ShowWindow(hwnd, @@ -1007,10 +998,9 @@ case WM_CLOSE: { - /* Free service array */ HeapFree(ProcessHeap, 0, - Info->pServiceStatus); + Info->pAllServices); DestroyMenu(Info->hShortcutMenu); DestroyWindow(hwnd); @@ -1019,8 +1009,6 @@ case WM_DESTROY: { - //DestroyMainWnd(Info); - HeapFree(ProcessHeap, 0, Info); @@ -1028,7 +1016,6 @@ GWLP_USERDATA, 0); - /* Break the message queue loop */ PostQuitMessage(0); } break; @@ -1044,6 +1031,7 @@ } break; } + return Ret; } @@ -1122,4 +1110,3 @@ UnregisterClass(szMainWndClass, hInstance); } - 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 Sat Aug 25 17:41:44 2007 @@ -15,9 +15,6 @@ #define NO_ITEM_SELECTED -1 #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 11 -#define PROGRESSRANGE 8 - typedef struct _MAIN_WND_INFO { @@ -28,7 +25,7 @@ HMENU hShortcutMenu; int nCmdShow; - ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; /* Stores the complete services array */ + ENUM_SERVICE_STATUS_PROCESS *pAllServices; ENUM_SERVICE_STATUS_PROCESS *CurrentService; /* Stores the current selected service */ INT SelectedItem;/* selection number in the list view */ @@ -79,7 +76,7 @@ LPTSTR GetDescription(LPTSTR); LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); -DWORD GetServiceList(PMAIN_WND_INFO Info); +//DWORD GetServiceList(PMAIN_WND_INFO Info); /* propsheet.c */ LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); @@ -91,35 +88,27 @@ INT AllocAndLoadString(OUT LPTSTR *lpTarget, IN HINSTANCE hInst, IN UINT uID); - DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, OUT LPTSTR *lpTarget, ...); - BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar, IN INT PartId, IN HINSTANCE hInstance, IN UINT uID, ...); - BOOL StatusBarLoadString(IN HWND hStatusBar, IN INT PartId, IN HINSTANCE hInstance, IN UINT uID); - INT GetTextFromEdit(OUT LPTSTR lpString, IN HWND hDlg, IN UINT Res); - VOID GetError(VOID); - VOID DisplayString(PTCHAR); - HIMAGELIST InitImageList(UINT NumButtons, UINT StartResource, UINT Width, UINT Height); - #endif /* __SERVMAN_PRECOMP_H */ 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 Sat Aug 25 17:41:44 2007 @@ -8,6 +8,8 @@ */ #include "precomp.h" + +#define PROGRESSRANGE 8 VOID CompleteProgressBar(HWND hProgDlg) 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 Sat Aug 25 17:41:44 2007 @@ -25,7 +25,6 @@ /* return pointer to selected service */ return (ENUM_SERVICE_STATUS_PROCESS *)lvItem.lParam; } - /* get vendor of service binary */ @@ -99,21 +98,90 @@ } +static BOOL +GetServiceList(PMAIN_WND_INFO Info, + DWORD *NumServices) +{ + SC_HANDLE ScHandle; + BOOL bRet = FALSE; + + DWORD BytesNeeded = 0; + DWORD ResumeHandle = 0; + + *NumServices = 0; + + 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, + NULL, + 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->pAllServices = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (Info->pAllServices) + { + /* fill array with service info */ + if (EnumServicesStatusEx(ScHandle, + SC_ENUM_PROCESS_INFO, + SERVICE_WIN32, + SERVICE_STATE_ALL, + (LPBYTE)Info->pAllServices, + BytesNeeded, + &BytesNeeded, + NumServices, + &ResumeHandle, + 0)) + { + bRet = TRUE; + } + } + } + } + } + + if (ScHandle) + CloseServiceHandle(ScHandle); + + if (!bRet) + { + HeapFree(ProcessHeap, + 0, + Info->pAllServices); + } + + return bRet; +} + + BOOL RefreshServiceList(PMAIN_WND_INFO Info) { + ENUM_SERVICE_STATUS_PROCESS *pService; LVITEM lvItem; TCHAR szNumServices[32]; TCHAR szStatus[64]; - DWORD NumServices = 0; + DWORD NumServices; DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); (void)ListView_DeleteAllItems(Info->hListView); - NumServices = GetServiceList(Info); - - if (NumServices) + if (GetServiceList(Info, &NumServices)) { TCHAR buf[300]; /* buffer to hold key path */ INT NumListedServ = 0; /* how many services were listed */ @@ -122,38 +190,43 @@ { HKEY hKey = NULL; LPTSTR lpDescription = NULL; - LPTSTR LogOnAs = NULL; + LPTSTR lpLogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; + + /* copy the service info over */ + pService = &Info->pAllServices[Index]; /* open the registry key for the service */ _sntprintf(buf, 300, Path, - Info->pServiceStatus[Index].lpServiceName); - - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, + pService->lpServiceName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, 0, - KEY_READ, - &hKey); - + pService); + continue; + } /* set the display name */ ZeroMemory(&lvItem, sizeof(LVITEM)); lvItem.mask = LVIF_TEXT | LVIF_PARAM; - lvItem.pszText = Info->pServiceStatus[Index].lpDisplayName; - - /* Set a pointer for each service so we can query it later. - * Not all services are added to the list, so we can't query - * the item number as they become out of sync with the array */ - lvItem.lParam = (LPARAM)&Info->pServiceStatus[Index]; - - lvItem.iItem = ListView_GetItemCount(Info->hListView); + lvItem.pszText = pService->lpDisplayName; + + /* Add the service pointer */ + lvItem.lParam = (LPARAM)pService; + + /* add it to the listview */ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); /* set the description */ - if ((lpDescription = GetDescription(Info->pServiceStatus[Index].lpServiceName))) + if ((lpDescription = GetDescription(pService->lpServiceName))) { lvItem.pszText = lpDescription; lvItem.iSubItem = 1; @@ -168,7 +241,7 @@ } /* set the status */ - if (Info->pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { LoadString(hInstance, IDS_SERVICES_STARTED, @@ -189,18 +262,34 @@ NULL, NULL, (LPBYTE)&StartUp, - &dwValueSize)) - { - RegCloseKey(hKey); - continue; - } - - if (StartUp == 0x02) - { - LoadString(hInstance, - IDS_SERVICES_AUTO, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); + &dwValueSize) == ERROR_SUCCESS) + { + switch (StartUp) + { + case 2: + LoadStringW(hInstance, + IDS_SERVICES_AUTO, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + case 3: + LoadStringW(hInstance, + IDS_SERVICES_MAN, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + + case 4: + LoadStringW(hInstance, + IDS_SERVICES_DIS, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + default: + szStatus[0] = 0; + break; + } + lvItem.pszText = szStatus; lvItem.iSubItem = 3; SendMessage(Info->hListView, @@ -208,32 +297,6 @@ lvItem.iItem, (LPARAM)&lvItem); } - else if (StartUp == 0x03) - { - LoadString(hInstance, - IDS_SERVICES_MAN, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - else if (StartUp == 0x04) - { - LoadString(hInstance, - IDS_SERVICES_DIS, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } /* set Log On As */ dwValueSize = 0; @@ -242,52 +305,39 @@ NULL, NULL, NULL, - &dwValueSize)) - { + &dwValueSize) == ERROR_SUCCESS) + { + lpLogOnAs = HeapAlloc(ProcessHeap, + 0, + dwValueSize); + if (lpLogOnAs != NULL) + { + if(RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + (LPBYTE)lpLogOnAs, + &dwValueSize) == ERROR_SUCCESS) + { + lvItem.pszText = lpLogOnAs; + lvItem.iSubItem = 4; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + } + + HeapFree(ProcessHeap, + 0, + lpLogOnAs); + } + RegCloseKey(hKey); - continue; - } - - LogOnAs = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - dwValueSize); - if (LogOnAs == NULL) - { - RegCloseKey(hKey); - return FALSE; - } - if(RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - (LPBYTE)LogOnAs, - &dwValueSize)) - { - HeapFree(ProcessHeap, - 0, - LogOnAs); - RegCloseKey(hKey); - continue; - } - - lvItem.pszText = LogOnAs; - lvItem.iSubItem = 4; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - LogOnAs); - - RegCloseKey(hKey); - + } } + /* set the number of listed services in the status bar */ NumListedServ = ListView_GetItemCount(Info->hListView); - - /* set the number of listed services in the status bar */ LoadString(hInstance, IDS_NUM_SERVICES, szNumServices, @@ -308,78 +358,7 @@ SendMessage (Info->hListView, WM_SETREDRAW, TRUE, - 0) ; + 0); return TRUE; } - - - - -DWORD -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); - 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)) - { - /* 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); - if (Info->pServiceStatus == NULL) - return FALSE; - - /* fill array with service info */ - if (EnumServicesStatusEx(ScHandle, - SC_ENUM_PROCESS_INFO, - SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)Info->pServiceStatus, - BytesNeeded, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - bGotServices = TRUE; - } - } - } - } - - if (ScHandle) - CloseServiceHandle(ScHandle); - - if (!bGotServices) - { - HeapFree(ProcessHeap, - 0, - Info->pServiceStatus); - } - - return NumServices; -}

1 0

[greatlrd] 28540: make AddFontResourceExA lite faster.
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 15:38:35 2007 New Revision: 28540 URL: http://svn.reactos.org/svn/reactos?rev=28540&view=rev Log: make AddFontResourceExA lite faster. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Aug 25 15:38:35 2007 @@ -1116,16 +1116,22 @@ PWSTR FilenameW; int rc = 0; - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); + if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + { + SetLastError( ERROR_INVALID_PARAMETER ); } else { - rc = AddFontResourceExW ( FilenameW, fl, pvReserved ); - - HEAP_free ( FilenameW ); + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); + HEAP_free ( FilenameW ); + } } return rc; }

1 0

[greatlrd] 28539: Fix : make AddFontResourceA acts like AddFontResourceW Fix : smaller typo in AddFontResourceW
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 15:34:16 2007 New Revision: 28539 URL: http://svn.reactos.org/svn/reactos?rev=28539&view=rev Log: Fix : make AddFontResourceA acts like AddFontResourceW Fix : smaller typo in AddFontResourceW Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Aug 25 15:34:16 2007 @@ -1112,14 +1112,16 @@ STDCALL AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved ) { - NTSTATUS Status; - PWSTR FilenameW; - int rc = 0; - - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - SetLastError (RtlNtStatusToDosError(Status)); - else + NTSTATUS Status; + PWSTR FilenameW; + int rc = 0; + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else { rc = AddFontResourceExW ( FilenameW, fl, pvReserved ); @@ -1136,7 +1138,22 @@ STDCALL AddFontResourceA ( LPCSTR lpszFilename ) { - return AddFontResourceExA ( lpszFilename, 0, 0 ); + NTSTATUS Status; + PWSTR FilenameW; + int rc = 0; + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + rc = GdiAddFontResourceW ( FilenameW, 0, 0); + + HEAP_free ( FilenameW ); + } + return rc; } @@ -1147,7 +1164,7 @@ STDCALL AddFontResourceW ( LPCWSTR lpszFilename ) { - return AddFontResourceExW ( lpszFilename, 0, 0 ); + return GdiAddFontResourceW ( lpszFilename, 0, 0 ); }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007