[janderwald] 24833: - finally clean up userenv.h header

Author: janderwald
Date: Sun Nov 26 13:10:29 2006
New Revision: 24833

URL: http://svn.reactos.org/svn/reactos?rev=24833&view=rev
Log:
- finally clean up userenv.h header

Modified:
    trunk/reactos/include/psdk/userenv.h

Modified: trunk/reactos/include/psdk/userenv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/userenv.h?rev=...
==============================================================================
--- trunk/reactos/include/psdk/userenv.h (original)
+++ trunk/reactos/include/psdk/userenv.h Sun Nov 26 13:10:29 2006
@@ -15,6 +15,13 @@
 #if (WINVER >= 0x0500)
 #define RP_FORCE (1)
 #endif
+
+#if defined(_USERENV_)
+#define USERENVAPI
+#else
+#define USERENVAPI DECLSPEC_IMPORT
+#endif
+

typedef struct _PROFILEINFOA
 {
@@ -40,53 +47,34 @@
   HANDLE hProfile;
 } PROFILEINFOW, *LPPROFILEINFOW;

-/* begin private */
-BOOL WINAPI InitializeProfiles (VOID);
-BOOL WINAPI CreateUserProfileA (PSID, LPCSTR);
-BOOL WINAPI CreateUserProfileW (PSID, LPCWSTR);
-BOOL WINAPI AddDesktopItemA (BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT);
-BOOL WINAPI AddDesktopItemW (BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT);
-BOOL WINAPI DeleteDesktopItemA (BOOL, LPCSTR);
-BOOL WINAPI DeleteDesktopItemW (BOOL, LPCWSTR);
-BOOL WINAPI CreateGroupA (LPCSTR, BOOL);
-BOOL WINAPI CreateGroupW (LPCWSTR, BOOL);
-BOOL WINAPI DeleteGroupA (LPCSTR, BOOL);
-BOOL WINAPI DeleteGroupW (LPCWSTR, BOOL);
-BOOL WINAPI AddItemA (LPCSTR, BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT);
-BOOL WINAPI AddItemW (LPCWSTR, BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT);
-BOOL WINAPI DeleteItemA (LPCSTR, BOOL, LPCSTR, BOOL);
-BOOL WINAPI DeleteItemW (LPCWSTR, BOOL, LPCWSTR, BOOL);
-BOOL WINAPI CopyProfileDirectoryA(LPCSTR, LPCSTR, DWORD);
-BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD);
-/* end private */
-BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA);
-BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW);
-BOOL WINAPI UnloadUserProfile (HANDLE, HANDLE);
+BOOL USERENVAPI WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA);
+BOOL USERENVAPI WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW);
+BOOL USERENVAPI WINAPI UnloadUserProfile (HANDLE, HANDLE);

-BOOL WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD);
-BOOL WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD);
-BOOL WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD);
-BOOL WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD);
-BOOL WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD);
-BOOL WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD);
-BOOL WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD);
-BOOL WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD);
+BOOL USERENVAPI WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD);

-BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL);
-BOOL WINAPI DestroyEnvironmentBlock(LPVOID);
+BOOL USERENVAPI WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL);
+BOOL USERENVAPI WINAPI DestroyEnvironmentBlock(LPVOID);
 #if (WINVER >= 0x0500)
-BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD);
-BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD);
+BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD);
+BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD);
 #endif

-HANDLE WINAPI EnterCriticalPolicySection (BOOL);
-BOOL WINAPI LeaveCriticalPolicySection (HANDLE);
-BOOL WINAPI RefreshPolicy (BOOL);
+HANDLE USERENVAPI WINAPI EnterCriticalPolicySection (BOOL);
+BOOL USERENVAPI WINAPI LeaveCriticalPolicySection (HANDLE);
+BOOL USERENVAPI WINAPI RefreshPolicy (BOOL);
 #if (WINVER >= 0x0500)
-BOOL WINAPI RefreshPolicyEx (BOOL, DWORD);
+BOOL USERENVAPI WINAPI RefreshPolicyEx (BOOL, DWORD);
 #endif
-BOOL WINAPI RegisterGPNotification (HANDLE, BOOL);
-BOOL WINAPI UnregisterGPNotification (HANDLE);
+BOOL USERENVAPI WINAPI RegisterGPNotification (HANDLE, BOOL);
+BOOL USERENVAPI WINAPI UnregisterGPNotification (HANDLE);

#ifdef UNICODE
 typedef PROFILEINFOW PROFILEINFO;