userenv: Add a skeleton userenv.h header and use it.

[Francois Gouget]

---
 dlls/userenv/userenv_main.c |    9 +-----
 include/Makefile.in         |    1 +
 include/userenv.h           |   54 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 include/userenv.h

diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c
index 8fd00c7..75fd651 100644
--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -23,7 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "profinfo.h"
+#include "userenv.h"
 
 #include "wine/debug.h"
 
@@ -103,12 +103,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
     return FALSE;
 }
 
-/* FIXME: these belong in userenv.h */
-#define PT_TEMPORARY    0x00000001
-#define PT_ROAMING      0x00000002
-#define PT_MANDATORY    0x00000004
-
-BOOL WINAPI GetProfileType( LPDWORD pdwFlags )
+BOOL WINAPI GetProfileType( DWORD *pdwFlags )
 {
     FIXME("%p\n", pdwFlags );
     *pdwFlags = 0;
diff --git a/include/Makefile.in b/include/Makefile.in
index 00c0a7b..3df3172 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -348,6 +348,7 @@ SRCDIR_INCLUDES = \
 	tlhelp32.h \
 	tmschema.h \
 	twain.h \
+	userenv.h \
 	usp10.h \
 	uuids.h \
 	uxtheme.h \
diff --git a/include/userenv.h b/include/userenv.h
new file mode 100644
index 0000000..f2f2176
--- /dev/null
+++ b/include/userenv.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Francois Gouget
+ *
+ * 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 __WINE_USERENV_H
+#define __WINE_USERENV_H
+
+/* FIXME: #include <wbemcli.h> */
+#include <profinfo.h>
+
+#define PT_TEMPORARY    0x00000001
+#define PT_ROAMING      0x00000002
+#define PT_MANDATORY    0x00000004
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL);
+BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD);
+BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD);
+#define     ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser)
+BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD);
+BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD);
+#define     GetUserProfileDirectory WINELIB_NAME_AW(GetUserProfileDirectory)
+BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD);
+BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD);
+#define     GetProfilesDirectory WINELIB_NAME_AW(GetProfilesDirectory)
+BOOL WINAPI GetProfileType(DWORD*);
+BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA);
+BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW);
+#define     LoadUserProfile WINELIB_NAME_AW(LoadUserProfile)
+BOOL WINAPI RegisterGPNotification(HANDLE,BOOL);
+BOOL WINAPI UnregisterGPNotification(HANDLE);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __WINE_USERENV_H */
-- 
1.5.2.4