Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[janderwald] 29509: - add checkAlarms function - this function will be used to determine wether expiration alarms are active. If qemu dies or terminates unexpectly, this function will check if it was before an timeout. In that case alarms will be active. Note: if qemu is killed purposely, OsSupport::cancelAlarms must be called to prevent automatic termination of sysreg process
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 22:41:39 2007 New Revision: 29509 URL: http://svn.reactos.org/svn/reactos?rev=29509&view=rev Log: - add checkAlarms function - this function will be used to determine wether expiration alarms are active. If qemu dies or terminates unexpectly, this function will check if it was before an timeout. In that case alarms will be active. Note: if qemu is killed purposely, OsSupport::cancelAlarms must be called to prevent automatic termination of sysreg process Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Thu Oct 11 22:41:39 2007 @@ -15,7 +15,7 @@ OsSupport::TimeEntryVector OsSupport::s_Entries; //int gettimeofday(struct timeval *tv, void * tz); - +//------------------------------------------------------------------------ void OsSupport::checkAlarms() { struct timeval tm; @@ -44,7 +44,11 @@ } #endif } - + bool OsSupport::hasAlarms () + { + return (s_Entries.size () != 0); + } +//------------------------------------------------------------------------ void OsSupport::cancelAlarms() { @@ -284,6 +288,18 @@ { OsSupport::checkAlarms(); } + else if (sig == SIGCHLD) + { + if (OsSupport::hasAlarms()) + { + /// + /// FIXME + /// + /// there are expiriation alarms active and a child died unexpectly + /// lets commit suicide + exit(-2); + } + } } void OsSupport::setAlarm(long secs, OsSupport::ProcessID pid) { Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Thu Oct 11 22:41:39 2007 @@ -120,6 +120,13 @@ static void checkAlarms(); +///--------------------------------------------------------------------------------------- +/// +/// hasAlarms +/// +/// Description: this function checks wether there are alarms set active + + static bool hasAlarms(); protected: //---------------------------------------------------------------------------------------

1 0

[janderwald] 29508: - fix build
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 22:25:00 2007 New Revision: 29508 URL: http://svn.reactos.org/svn/reactos?rev=29508&view=rev Log: - fix build Added: trunk/reactos/dll/win32/shell32/xdg.h (with props) Added: trunk/reactos/dll/win32/shell32/xdg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/xdg.h?re… ============================================================================== --- trunk/reactos/dll/win32/shell32/xdg.h (added) +++ trunk/reactos/dll/win32/shell32/xdg.h Thu Oct 11 22:25:00 2007 @@ -1,0 +1,51 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XDG_H__ +#define __XDG_H__ + +/* + * XDG directories access + */ +#define XDG_DATA_HOME 0 +#define XDG_CONFIG_HOME 1 +#define XDG_DATA_DIRS 2 +#define XDG_CONFIG_DIRS 3 +#define XDG_CACHE_HOME 4 + +const char *XDG_GetPath(int path_id); +char *XDG_BuildPath(int root_id, const char *subpath); +int XDG_MakeDirs(const char *path); + +#define XDG_URLENCODE 0x1 +BOOL XDG_WriteDesktopStringEntry(int fd, const char *keyName, DWORD dwFlags, const char *value); + +typedef struct tagXDG_PARSED_FILE XDG_PARSED_FILE; + +XDG_PARSED_FILE *XDG_ParseDesktopFile(int fd); +char *XDG_GetStringValue(XDG_PARSED_FILE *file, const char *group_name, const char *value_name, DWORD dwFlags); +void XDG_FreeParsedFile(XDG_PARSED_FILE *file); + +/* implemented in trash.c */ +typedef struct tagTRASH_ELEMENT TRASH_ELEMENT; + +BOOL TRASH_CanTrashFile(LPCWSTR wszPath); +BOOL TRASH_TrashFile(LPCWSTR wszPath); +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data); +HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count); +void TRASH_DisposeElement(TRASH_ELEMENT *element); + + +#endif /* ndef __XDG_H__ */ Propchange: trunk/reactos/dll/win32/shell32/xdg.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 29507: - sync rest of shell32 excluding resources to wine
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 22:07:01 2007 New Revision: 29507 URL: http://svn.reactos.org/svn/reactos?rev=29507&view=rev Log: - sync rest of shell32 excluding resources to wine Added: trunk/reactos/dll/win32/shell32/shell32_Tr.rc (with props) Modified: trunk/reactos/dll/win32/shell32/brsfolder.c trunk/reactos/dll/win32/shell32/classes.c trunk/reactos/dll/win32/shell32/clipboard.c trunk/reactos/dll/win32/shell32/control.c trunk/reactos/dll/win32/shell32/cpanel.h trunk/reactos/dll/win32/shell32/cpanelfolder.c trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/folders.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shell32_xx.rc trunk/reactos/dll/win32/shell32/shellfolder.h trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/shellpath.c trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shlexec.c trunk/reactos/dll/win32/shell32/shlfileop.c trunk/reactos/dll/win32/shell32/shlfolder.c trunk/reactos/dll/win32/shell32/shres.rc trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c trunk/reactos/dll/win32/shell32/systray.c trunk/reactos/dll/win32/shell32/undocshell.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… Modified: trunk/reactos/dll/win32/shell32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/clipboar… Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… Modified: trunk/reactos/dll/win32/shell32/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanel.h… Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… Modified: trunk/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Modified: trunk/reactos/dll/win32/shell32/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell.c?… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Added: trunk/reactos/dll/win32/shell32/shell32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shellfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellfol… Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… Modified: trunk/reactos/dll/win32/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… Modified: trunk/reactos/dll/win32/shell32/shres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shres.rc… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… Modified: trunk/reactos/dll/win32/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe…

1 0

[janderwald] 29506: Jonathan Ernst <jonathan@ernstfamily.ch> - Update the address of the Free Software Foundation. Stefan Leichter <Stefan.Leichter@camline.com> - Fix the file version string of the version resource.
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 21:07:58 2007 New Revision: 29506 URL: http://svn.reactos.org/svn/reactos?rev=29506&view=rev Log: Jonathan Ernst <jonathan(a)ernstfamily.ch> - Update the address of the Free Software Foundation. Stefan Leichter <Stefan.Leichter(a)camline.com> - Fix the file version string of the version resource. Modified: trunk/reactos/dll/win32/shell32/version.h trunk/reactos/dll/win32/shell32/version.rc trunk/reactos/dll/win32/shell32/version16.rc Modified: trunk/reactos/dll/win32/shell32/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.… ============================================================================== --- trunk/reactos/dll/win32/shell32/version.h (original) +++ trunk/reactos/dll/win32/shell32/version.h Thu Oct 11 21:07:58 2007 @@ -15,10 +15,14 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILEVERSION_MAJOR 5 #define WINE_FILEVERSION_MINOR 0 #define WINE_FILEVERSION_BUILD 3900 #define WINE_FILEVERSION_PLATFORMID 6975 + +/* FIXME: when libs/wpp gets fixed to support concatenation we can remove + * this and define it in version.rc */ +#define WINE_FILEVERSION_STR "5.0.3900.6975" Modified: trunk/reactos/dll/win32/shell32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.… ============================================================================== --- trunk/reactos/dll/win32/shell32/version.rc (original) +++ trunk/reactos/dll/win32/shell32/version.rc Thu Oct 11 21:07:58 2007 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "version.h" Modified: trunk/reactos/dll/win32/shell32/version16.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version1… ============================================================================== --- trunk/reactos/dll/win32/shell32/version16.rc (original) +++ trunk/reactos/dll/win32/shell32/version16.rc Thu Oct 11 21:07:58 2007 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILEDESCRIPTION_STR "Wine core dll"

1 0

[cfinck] 29505: Change "base" to "installbase" for the <bootstrap> element of "green.rbuild" (the older syntax is no longer valid) See issue #2706 for more details.
by cfinck＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: cfinck Date: Thu Oct 11 20:06:11 2007 New Revision: 29505 URL: http://svn.reactos.org/svn/reactos?rev=29505&view=rev Log: Change "base" to "installbase" for the <bootstrap> element of "green.rbuild" (the older syntax is no longer valid) See issue #2706 for more details. Modified: trunk/rosapps/green/green.rbuild Modified: trunk/rosapps/green/green.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/green/green.rbuild?rev=295… ============================================================================== --- trunk/rosapps/green/green.rbuild (original) +++ trunk/rosapps/green/green.rbuild Thu Oct 11 20:06:11 2007 @@ -1,5 +1,5 @@ <module name="green" type="kernelmodedriver" installbase="system32/drivers" installname="green.sys"> - <bootstrap base="reactos" /> + <bootstrap installbase="reactos" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library>

1 0

[dreimer] 29504: We need a rule that updating a RC File forces the dev to do it on ALL Files, not only the English one. German one missed two Dialogs again. Updated the German RC File of shell32.dll and fixed a typo in the English one. (Nice Work with your new Dialogs For Shortcuts and co, Johannes :-))
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Thu Oct 11 20:01:18 2007 New Revision: 29504 URL: http://svn.reactos.org/svn/reactos?rev=29504&view=rev Log: We need a rule that updating a RC File forces the dev to do it on ALL Files, not only the English one. German one missed two Dialogs again. Updated the German RC File of shell32.dll and fixed a typo in the English one. (Nice Work with your new Dialogs For Shortcuts and co, Johannes :-)) Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Thu Oct 11 20:01:18 2007 @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 Henning Gerhardt + * Copyright 2007 Daniel Reimer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,9 +28,6 @@ MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END -/* - shellview background menu -*/ MENU_002 MENU DISCARDABLE BEGIN POPUP "" @@ -69,9 +67,6 @@ END END -/* - shellview item menu -*/ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" @@ -132,69 +127,69 @@ PUSHBUTTON "&Durchsuchen...", 12288, 170, 63, 50, 14, WS_TABSTOP } - SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Verknüpfung" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 10, 30, 50, 10 + LTEXT "Zeiltyp:", 14004, 10, 30, 50, 10 LTEXT "", 14005, 70, 30, 150, 10 - LTEXT "Target location:", 14006, 10, 40, 70, 10 + LTEXT "Zielpfad:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Target:", 14008, 10, 55, 45, 10 + LTEXT "Ziel:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Start in:",14010, 10, 65, 45, 10 + LTEXT "&Starten in:",14010, 10, 65, 45, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "Shortcut &key:", 14014, 10, 80, 45, 10 + LTEXT "&Tastenkombination:", 14014, 10, 80, 45, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 45, 10 + LTEXT "Ausführen:", 14016, 10, 90, 45, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "C&omment:", 14018, 10, 100, 45, 10 + LTEXT "K&ommentar:", 14018, 10, 100, 45, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Find Target...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT + PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 60, 14, ES_LEFT + PUSHBUTTON "I&con wechseln...", 14021, 80, 115, 60, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", 14022, 150, 115, 60, 14, ES_LEFT } SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Extended Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ - LTEXT "Select extended properties for this Shortcut", -1, 5, 30, 150, 10 - CHECKBOX "Execute as a different user", 14000, 30, 50, 150, 10 - LTEXT "FIXME Desc", -1, 50, 70, 200, 40 - PUSHBUTTON "OK", IDOK, 25, 130, 40, 15, WS_VISIBLE - PUSHBUTTON "Abbrechen", IDCANCEL, 120, 130, 50, 15, WS_VISIBLE +CAPTION "Erweiterte Einstellungen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ +LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 190, 10 + CHECKBOX "Als anderer Benutzer ausführen", 14000, 30, 50, 150, 10 + LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter\neinem anderen oder Ihrem eingenen Bentzerkonto auszuführen\nwährend der Computer und Ihre Daten vor unautorisierten\nProgrammaktivitäten geschützt werden können.", -1, 50, 60, 200, 40 + CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 30, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 5, 100, 10, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 10, 30, 50, 10 - LTEXT "File", 14005, 70, 30, 150, 10 - LTEXT "Opens with:", 14006, 10, 40, 50, 10 + LTEXT "Dateityp:", 14004, 10, 30, 50, 10 + LTEXT "Datei", 14005, 70, 30, 150, 10 + LTEXT "Öffnen mit:", 14006, 10, 40, 50, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Location:", 14008, 10, 55, 45, 10 + LTEXT "Pfad:", 14008, 10, 55, 45, 10 LTEXT "", 14009, 70, 55, 200, 10 - LTEXT "Size:",14010, 10, 65, 45, 10 + LTEXT "Größe:",14010, 10, 65, 45, 10 LTEXT "", 14011, 70, 65, 150, 10 - LTEXT "Created:", 14014, 10, 80, 45, 10 + LTEXT "Erstellt:", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modied:", 14016, 10, 90, 45, 10 + LTEXT "Geändert:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 - LTEXT "Accessed:", 14018, 10, 100, 45, 10 + LTEXT "Zugegriffen:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 - LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 45, 10 - CHECKBOX "&Hidden", 14022, 130, 115, 50, 10 - CHECKBOX "&Archive", 14023, 180, 115, 45, 10 + LTEXT "Attribute:", 14020, 10, 115, 45, 10 + CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 45, 10 + CHECKBOX "&Versteckt", 14022, 130, 115, 50, 10 + CHECKBOX "&Archiv", 14023, 180, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -202,15 +197,15 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "File version: ", 14000, 10, 10, 45, 10 + LTEXT "Dateiversion: ", 14000, 10, 10, 45, 10 LTEXT "", 14001, 70, 10, 150, 10 - LTEXT "Description: ", 14002, 10, 20, 45, 10 + LTEXT "Beschreibung: ", 14002, 10, 20, 45, 10 LTEXT "", 14003, 70, 20, 150, 10 LTEXT "Copyright: ", 14004, 10, 30, 45, 10 LTEXT "", 14005, 70, 30, 150, 10 - GROUPBOX "Other version information: ", 14006, 10, 45, 220, 90 - LTEXT "Item name: ", 14007, 20, 55, 50, 10 - LTEXT "Value: ", 14008, 130, 55, 45, 10 + GROUPBOX "Weitere Versionsinformationen: ", 14006, 10, 45, 220, 90 + LTEXT "Elementname: ", 14007, 20, 55, 50, 10 + LTEXT "Wert: ", 14008, 130, 55, 45, 10 LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT|WS_BORDER|WS_VSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY @@ -221,7 +216,6 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - //ICON EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 @@ -268,12 +262,32 @@ PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP } - DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { +} + +RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ausführen als" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 + CHECKBOX "Aktueller Benutzer %s", 14000, 5, 45, 150, 10 + LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 40, 65, 150, 10, WS_DISABLED + CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem\nComputer und/oder Ihren persönlichen Daten zu schaden, aber\nes kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 40, 80, 150, 10, WS_DISABLED + CHECKBOX "Folgender Benutzer:", 14002, 5, 100, 90, 10 + LTEXT "Benutzername:", -1, 15, 115, 60, 10 + COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP + LTEXT "Passwort:", -1, 15, 140, 60, 10 + EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP + PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "Abbrechen", 14008, 140, 170, 60, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Thu Oct 11 20:01:18 2007 @@ -187,7 +187,7 @@ LTEXT "", 14011, 70, 65, 150, 10 LTEXT "Created:", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modied:", 14016, 10, 90, 45, 10 + LTEXT "Modified:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 LTEXT "Accessed:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10

1 0

[fireball] 29503: - Insert back the "ugly hack for cut&paste files" (removed by 29499 commit).
by fireball＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: fireball Date: Thu Oct 11 18:47:10 2007 New Revision: 29503 URL: http://svn.reactos.org/svn/reactos?rev=29503&view=rev Log: - Insert back the "ugly hack for cut&paste files" (removed by 29499 commit). Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Oct 11 18:47:10 2007 @@ -38,6 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* ugly hack for cut&paste files */ +BOOL fileMoving = FALSE; + /************************************************************************** * IContextMenu Implementation */

1 0

[gedmurphy] 29502: use ChangeListViewText to fill out the service info
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 16:21:06 2007 New Revision: 29502 URL: http://svn.reactos.org/svn/reactos?rev=29502&view=rev Log: use ChangeListViewText to fill out the service info Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Oct 11 16:21:06 2007 @@ -229,9 +229,7 @@ RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; - LPTSTR lpDescription; LVITEM lvItem; - TCHAR szStatus[64]; DWORD NumServices; DWORD Index; @@ -246,7 +244,7 @@ { for (Index = 0; Index < NumServices; Index++) { - LPQUERY_SERVICE_CONFIG pServiceConfig; + INT i; pService = &Info->pAllServices[Index]; @@ -261,75 +259,10 @@ /* add it to the listview */ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); - /* set the description */ - if ((lpDescription = GetServiceDescription(pService->lpServiceName))) - { - lvItem.pszText = lpDescription; - lvItem.iSubItem = LVDESC; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - lpDescription); - } - - /* set the status */ - if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = LVSTATUS; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - pServiceConfig = GetServiceConfig(pService->lpServiceName); - if (pServiceConfig) - { - DWORD StringId = 0; - LPTSTR lpStartup; - - /* set the startup type */ - switch (pServiceConfig->dwStartType) - { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; - } - - if (StringId) - AllocAndLoadString(&lpStartup, - hInstance, - StringId); - - lvItem.pszText = lpStartup; - lvItem.iSubItem = LVSTARTUP; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - LocalFree(lpStartup); - - /* set Log On As */ - lvItem.pszText = pServiceConfig->lpServiceStartName; - lvItem.iSubItem = LVLOGONAS; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - pServiceConfig); + /* fill out all the column data */ + for (i = LVDESC; i <= LVLOGONAS; i++) + { + ChangeListViewText(Info, pService, i); } }

1 0

[gedmurphy] 29501: only run the change code when we have the changed struct to work with.
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 16:00:19 2007 New Revision: 29501 URL: http://svn.reactos.org/svn/reactos?rev=29501&view=rev Log: only run the change code when we have the changed struct to work with. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.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 Thu Oct 11 16:00:19 2007 @@ -700,9 +700,11 @@ { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - ListViewSelectionChanged(Info, pnmv); - SetMenuAndButtonStates(Info); - + if (pnmv->uNewState != 0) + { + ListViewSelectionChanged(Info, pnmv); + SetMenuAndButtonStates(Info); + } } break;

1 0

[gedmurphy] 29500: improve the button states in relation to the service
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 15:09:39 2007 New Revision: 29500 URL: http://svn.reactos.org/svn/reactos?rev=29500&view=rev Log: improve the button states in relation to the service Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.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 Thu Oct 11 15:09:39 2007 @@ -151,7 +151,6 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { - LPQUERY_SERVICE_CONFIG lpServiceConfig; HMENU hMainMenu; UINT i; @@ -169,6 +168,9 @@ if (Info->SelectedItem != NO_ITEM_SELECTED) { + LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; + DWORD Flags, State; + /* allow user to delete service */ if (Info->bIsUserAnAdmin) { @@ -178,14 +180,13 @@ EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED); } + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + lpServiceConfig = GetServiceConfig(Info->pCurrentService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) { - DWORD Flags, State; - - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; - if (State == SERVICE_STOPPED) { EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); @@ -193,23 +194,7 @@ SendMessage(Info->hTool, TB_SETSTATE, ID_START, (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); @@ -219,6 +204,22 @@ } HeapFree(GetProcessHeap(), 0, lpServiceConfig); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } } else @@ -396,6 +397,7 @@ Info->bDlgOpen = TRUE; OpenPropSheet(Info); Info->bDlgOpen = FALSE; + SetMenuAndButtonStates(Info); } } break; 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 Thu Oct 11 15:09:39 2007 @@ -60,6 +60,7 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; +VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info); VOID UpdateServiceCount(PMAIN_WND_INFO Info); VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column); BOOL InitMainWindowImpl(VOID); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Oct 11 15:09:39 2007 @@ -35,26 +35,26 @@ } lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); - if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) - { - if (State == SERVICE_STOPPED) - { - hButton = GetDlgItem(hwndDlg, IDC_START); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_STOP); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); - } - + if (State == SERVICE_STOPPED && + lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + hButton = GetDlgItem(hwndDlg, IDC_START); + EnableWindow (hButton, TRUE); HeapFree(GetProcessHeap(), 0, lpServiceConfig); } + else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_STOP); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } + + /* set the main toolbar */ + SetMenuAndButtonStates(dlgInfo->Info); } @@ -365,6 +365,7 @@ { case PSN_APPLY: SaveDlgInfo(dlgInfo, hwndDlg); + SetButtonStates(dlgInfo, hwndDlg); break; } }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
71
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 October 2007