[ros-diffs] [hpoussin] 32911: Add wine_get_data_dir()/wine_get_build_dir() functions Add missing header in uuid library

Author: hpoussin
Date: Fri Apr 11 07:40:19 2008
New Revision: 32911

URL: http://svn.reactos.org/svn/reactos?rev=32911&view=rev
Log:
Add wine_get_data_dir()/wine_get_build_dir() functions
Add missing header in uuid library

Added:
    trunk/reactos/lib/3rdparty/libwine/config.c   (with props)
Modified:
    trunk/reactos/include/reactos/wine/library.h
    trunk/reactos/lib/3rdparty/libwine/debug.c   (props changed)
    trunk/reactos/lib/3rdparty/libwine/libwine.rbuild
    trunk/reactos/lib/3rdparty/libwine/string.c   (props changed)
    trunk/reactos/lib/sdk/uuid/uuid.c

Modified: trunk/reactos/include/reactos/wine/library.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra…
==============================================================================
--- trunk/reactos/include/reactos/wine/library.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/library.h [iso-8859-1] Fri Apr 11 07:40:19 2008
@@ -29,7 +29,9 @@
 
 /* configuration */
 
+extern const char *wine_get_build_dir(void);
 extern const char *wine_get_config_dir(void);
+extern const char *wine_get_data_dir(void);
 extern const char *wine_get_server_dir(void);
 extern const char *wine_get_user_name(void);
 extern void wine_init_argv0_path( const char *argv0 );

Added: trunk/reactos/lib/3rdparty/libwine/config.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/confi…
==============================================================================
--- trunk/reactos/lib/3rdparty/libwine/config.c (added)
+++ trunk/reactos/lib/3rdparty/libwine/config.c [iso-8859-1] Fri Apr 11 07:40:19 2008
@@ -1,0 +1,33 @@
+/*
+ * Configuration parameters shared between Wine server and clients
+ *
+ * Copyright 2002 Alexandre Julliard
+ *
+ * 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
+ */
+
+#include "wine/library.h"
+
+/* retrieve the wine data dir */
+const char *wine_get_data_dir(void)
+{
+    return NULL;
+}
+
+/* retrieve the wine build dir (if we are running from there) */
+const char *wine_get_build_dir(void)
+{
+    return NULL;
+}

Propchange: trunk/reactos/lib/3rdparty/libwine/config.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/lib/3rdparty/libwine/debug.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi…
==============================================================================
--- trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] Fri Apr 11 07:40:19
2008
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wine" type="staticlibrary">
 	<define name="_DISABLE_TIDENTS" />
+	<file>config.c</file>
 	<file>debug.c</file>
 	<file>string.c</file>
 </module>

Propchange: trunk/reactos/lib/3rdparty/libwine/string.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-Author Date Id Revision

Modified: trunk/reactos/lib/sdk/uuid/uuid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=32…
==============================================================================
--- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Apr 11 07:40:19 2008
@@ -69,6 +69,7 @@
 #include "urlhist.h"
 #include "hlguids.h"
 #include "isguids.h"
+#include "objsafe.h"
 
 /* FIXME: cguids declares GUIDs but does not define their values */