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:
//---------------------------------------------------------------------------------------
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
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"