Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-05 04:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

1. revers 24831 to 24833 userenv.h does not exists in ms psdk and shall move to folder include/ndk or include/reactos

Browse source 
2. do not create new private header, we already have one, but it is in wrong folder. 
3. This header should have been move long time ago. 
4. do not doing #include "userenv-priv.h" it will not found the header in syssetup/install
 

svn path=/trunk/; revision=24834
This commit is contained in:
Magnus Olsen 2006-11-26 10:39:50 +00:00
parent 14d9f47180
commit aeea883a59
7 changed files with 49 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/syssetup/install.c
View file

@ -40,8 +40,6 @@
#include <samlib/samlib.h> #include <samlib/samlib.h>
#include <syssetup/syssetup.h> #include <syssetup/syssetup.h>
#include <userenv.h> #include <userenv.h>
#include "userenv-priv.h"
#include <setupapi.h> #include <setupapi.h>
#include <shlobj.h> #include <shlobj.h>

1
reactos/dll/win32/syssetup/syssetup.rbuild
View file

@ -1,7 +1,6 @@
<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll"> <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll">
<importlibrary definition="syssetup.def" /> <importlibrary definition="syssetup.def" />
<include base="syssetup">.</include> <include base="syssetup">.</include>
<include base="userenv">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="UNICODE" /> <define name="UNICODE" />
<define name="_UNICODE" /> <define name="_UNICODE" />

1
reactos/dll/win32/userenv/precomp.h
View file

@ -9,4 +9,3 @@
#include "internal.h" #include "internal.h"
#include "resources.h" #include "resources.h"
#include "userenv-priv.h"

176
reactos/dll/win32/userenv/userenv-priv.h
View file

@ -1,176 +0,0 @@
#ifndef USERENV_PRIV_H__
#define USERENV_PRIV_H__
//
// Private ReactOS only userenv functions
//
//
BOOL
USERENVAPI
WINAPI
InitializeProfiles(
VOID
);
BOOL
USERENVAPI
WINAPI
CreateUserProfileA (
PSID,
LPCSTR
);
BOOL
USERENVAPI
WINAPI
CreateUserProfileW(
PSID,
LPCWSTR
);
BOOL
USERENVAPI
WINAPI
AddDesktopItemA(
BOOL,
LPCSTR,
LPCSTR,
LPCSTR,
INT,
LPCSTR,
WORD,
INT
);
BOOL
USERENVAPI
WINAPI
AddDesktopItemW(
BOOL,
LPCWSTR,
LPCWSTR,
LPCWSTR,
INT,
LPCWSTR,
WORD,
INT
);
BOOL
USERENVAPI
WINAPI
DeleteDesktopItemA (
BOOL,
LPCSTR
);
BOOL
USERENVAPI
WINAPI
DeleteDesktopItemW (
BOOL,
LPCWSTR
);
BOOL
USERENVAPI
WINAPI
CreateGroupA (
LPCSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
CreateGroupW (
LPCWSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
DeleteGroupA (
LPCSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
DeleteGroupW (
LPCWSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
AddItemA(
LPCSTR,
BOOL,
LPCSTR,
LPCSTR,
LPCSTR,
INT,
LPCSTR,
WORD,
INT
);
BOOL
USERENVAPI
WINAPI
AddItemW (
LPCWSTR,
BOOL,
LPCWSTR,
LPCWSTR,
LPCWSTR,
INT,
LPCWSTR,
WORD,
INT
);
BOOL
USERENVAPI
WINAPI
DeleteItemA (
LPCSTR,
BOOL,
LPCSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
DeleteItemW(
LPCWSTR,
BOOL,
LPCWSTR,
BOOL
);
BOOL
USERENVAPI
WINAPI
CopyProfileDirectoryA(
LPCSTR,
LPCSTR,
DWORD
);
BOOL
USERENVAPI
WINAPI
CopyProfileDirectoryW(
LPCWSTR,
LPCWSTR,
DWORD
);
#endif

1
reactos/dll/win32/userenv/userenv.rbuild
View file

@ -5,7 +5,6 @@
<define name="_WIN32_IE">0x0500</define> <define name="_WIN32_IE">0x0500</define>
<define name="_WIN32_WINNT">0x0600</define> <define name="_WIN32_WINNT">0x0600</define>
<define name="WINVER">0x0600</define> <define name="WINVER">0x0600</define>
<define name="_USERENV_" />
<library>uuid</library> <library>uuid</library>
<library>ntdll</library> <library>ntdll</library>
<library>kernel32</library> <library>kernel32</library>

10
reactos/drivers/input/i8042prt/mouse.c
View file

@ -903,6 +903,9 @@ BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt)
UCHAR Value; UCHAR Value;
UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 }; UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 };
unsigned ReplyByte; unsigned ReplyByte;
ULONG Counter;
I8042Flush();
if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) || if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) ||
! I8042Write(DevExt, I8042_DATA_PORT, 0xFF)) ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF))
@ -915,7 +918,12 @@ BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt)
ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok;
ReplyByte++) ReplyByte++)
{ {
Status = I8042ReadDataWait(DevExt, &Value); Counter = 200;
do {
Status = I8042ReadDataWait(DevExt, &Value);
} while (Status == STATUS_IO_TIMEOUT && Counter--);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
DPRINT1("No ACK after mouse reset, status 0x%08x\n", DPRINT1("No ACK after mouse reset, status 0x%08x\n",

68
reactos/include/psdk/userenv.h
View file

@ -16,13 +16,6 @@ extern "C" {
#define RP_FORCE (1) #define RP_FORCE (1)
#endif #endif
#if defined(_USERENV_)
#define USERENVAPI
#else
#define USERENVAPI DECLSPEC_IMPORT
#endif
typedef struct _PROFILEINFOA typedef struct _PROFILEINFOA
{ {
DWORD dwSize; DWORD dwSize;
@ -47,34 +40,53 @@ typedef struct _PROFILEINFOW
HANDLE hProfile; HANDLE hProfile;
} PROFILEINFOW, *LPPROFILEINFOW; } PROFILEINFOW, *LPPROFILEINFOW;
BOOL USERENVAPI WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); /* begin private */
BOOL USERENVAPI WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); BOOL WINAPI InitializeProfiles (VOID);
BOOL USERENVAPI WINAPI UnloadUserProfile (HANDLE, HANDLE); 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 GetAllUsersProfileDirectoryA (LPSTR, LPDWORD); BOOL WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD); BOOL WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD); BOOL WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD); BOOL WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD); BOOL WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD); BOOL WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD); BOOL WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD);
BOOL USERENVAPI WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD); BOOL WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD);
BOOL USERENVAPI WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL);
BOOL USERENVAPI WINAPI DestroyEnvironmentBlock(LPVOID); BOOL WINAPI DestroyEnvironmentBlock(LPVOID);
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD);
BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD);
#endif #endif
HANDLE USERENVAPI WINAPI EnterCriticalPolicySection (BOOL); HANDLE WINAPI EnterCriticalPolicySection (BOOL);
BOOL USERENVAPI WINAPI LeaveCriticalPolicySection (HANDLE); BOOL WINAPI LeaveCriticalPolicySection (HANDLE);
BOOL USERENVAPI WINAPI RefreshPolicy (BOOL); BOOL WINAPI RefreshPolicy (BOOL);
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
BOOL USERENVAPI WINAPI RefreshPolicyEx (BOOL, DWORD); BOOL WINAPI RefreshPolicyEx (BOOL, DWORD);
#endif #endif
BOOL USERENVAPI WINAPI RegisterGPNotification (HANDLE, BOOL); BOOL WINAPI RegisterGPNotification (HANDLE, BOOL);
BOOL USERENVAPI WINAPI UnregisterGPNotification (HANDLE); BOOL WINAPI UnregisterGPNotification (HANDLE);
#ifdef UNICODE #ifdef UNICODE
typedef PROFILEINFOW PROFILEINFO; typedef PROFILEINFOW PROFILEINFO;