Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[spetreolle] 28247: use unicode directive
by spetreolle＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: spetreolle Date: Wed Aug 8 20:41:25 2007 New Revision: 28247 URL: http://svn.reactos.org/svn/reactos?rev=28247&view=rev Log: use unicode directive Modified: trunk/rosapps/downloader/main.c trunk/rosapps/gettype/gettype.c trunk/rosapps/imagesoft/imagesoft.c trunk/rosapps/screenshot/screenshot.c trunk/rosapps/sysutils/ctm/ctm.c trunk/rosapps/winver/winver.c Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=2824… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Wed Aug 8 20:41:25 2007 @@ -444,8 +444,8 @@ return DefWindowProc (hwnd, Message, wParam, lParam); } -INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, - LPSTR lpCmdLine, INT nCmdShow) +INT WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, + LPTSTR lpCmdLine, INT nCmdShow) { int i; WNDCLASSEXW WndClass = {0}; Modified: trunk/rosapps/gettype/gettype.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/gettype/gettype.c?rev=2824… ============================================================================== --- trunk/rosapps/gettype/gettype.c (original) +++ trunk/rosapps/gettype/gettype.c Wed Aug 8 20:41:25 2007 @@ -226,7 +226,7 @@ } INT -main (VOID) +_tmain (VOID) { DWORD Operations = 0; INT ret = 255; Modified: trunk/rosapps/imagesoft/imagesoft.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.c?rev=… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.c (original) +++ trunk/rosapps/imagesoft/imagesoft.c Wed Aug 8 20:41:25 2007 @@ -4,9 +4,9 @@ HANDLE ProcessHeap; int WINAPI -WinMain(HINSTANCE hThisInstance, +_tWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPTSTR lpCmdLine, int nCmdShow) { LPTSTR lpAppName, lpVersion, lpTitle; Modified: trunk/rosapps/screenshot/screenshot.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/screenshot/screenshot.c?re… ============================================================================== --- trunk/rosapps/screenshot/screenshot.c (original) +++ trunk/rosapps/screenshot/screenshot.c Wed Aug 8 20:41:25 2007 @@ -334,9 +334,9 @@ // INT WINAPI GetScreenshot(BOOL bFullScreen) -int WINAPI WinMain(HINSTANCE hInstance, +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - PSTR szCmdLine, + LPTSTR szCmdLine, int iCmdShow) { PSCREENSHOT pScrSht; Modified: trunk/rosapps/sysutils/ctm/ctm.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.c?rev=282… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.c (original) +++ trunk/rosapps/sysutils/ctm/ctm.c Wed Aug 8 20:41:25 2007 @@ -602,7 +602,7 @@ } -int main(int argc, char **argv) +int _tmain(int argc, char **argv) { int i; TCHAR lpStr[80]; Modified: trunk/rosapps/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.c?rev=28247&… ============================================================================== --- trunk/rosapps/winver/winver.c (original) +++ trunk/rosapps/winver/winver.c Wed Aug 8 20:41:25 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include <tchar.h> -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 }; UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow);

1 0

[spetreolle] 28246: use unicode directive
by spetreolle＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: spetreolle Date: Wed Aug 8 20:34:54 2007 New Revision: 28246 URL: http://svn.reactos.org/svn/reactos?rev=28246&view=rev Log: use unicode directive Modified: trunk/rosapps/cardsbav/cardsbav.rbuild trunk/rosapps/downloader/downloader.rbuild trunk/rosapps/gettype/gettype.rbuild trunk/rosapps/imagesoft/imagesoft.rbuild trunk/rosapps/screenshot/screenshot.rbuild trunk/rosapps/sysutils/ctm/ctm.rbuild trunk/rosapps/winver/winver.rbuild Modified: trunk/rosapps/cardsbav/cardsbav.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.rbuild?r… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.rbuild (original) +++ trunk/rosapps/cardsbav/cardsbav.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll"> +<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll" unicode="yes"> <importlibrary definition="cardsbav.def" /> <include base="cardsbav">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> Modified: trunk/rosapps/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rbui… ============================================================================== --- trunk/rosapps/downloader/downloader.rbuild (original) +++ trunk/rosapps/downloader/downloader.rbuild Wed Aug 8 20:34:54 2007 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <installfile base="system32">downloader.xml</installfile> -<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> +<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes"> <include base="downloader">.</include> <include base="expat">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE>0x0600</define> Modified: trunk/rosapps/gettype/gettype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/gettype/gettype.rbuild?rev… ============================================================================== --- trunk/rosapps/gettype/gettype.rbuild (original) +++ trunk/rosapps/gettype/gettype.rbuild Wed Aug 8 20:34:54 2007 @@ -1,9 +1,7 @@ -<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe"> +<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes"> <include base="gettype">.</include> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>shell32</library> <library>mpr</library> Modified: trunk/rosapps/imagesoft/imagesoft.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.rbuild… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.rbuild (original) +++ trunk/rosapps/imagesoft/imagesoft.rbuild Wed Aug 8 20:34:54 2007 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe"> + <module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe" unicode="yes"> <include base="imagesoft">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/screenshot/screenshot.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/screenshot/screenshot.rbui… ============================================================================== --- trunk/rosapps/screenshot/screenshot.rbuild (original) +++ trunk/rosapps/screenshot/screenshot.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe"> +<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes"> <include base="screenshot">.</include> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> Modified: trunk/rosapps/sysutils/ctm/ctm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.rbuild?re… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.rbuild (original) +++ trunk/rosapps/sysutils/ctm/ctm.rbuild Wed Aug 8 20:34:54 2007 @@ -1,7 +1,5 @@ -<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe"> +<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" unicode="yes"> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>epsapi</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/rosapps/winver/winver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.rbuild?rev=2… ============================================================================== --- trunk/rosapps/winver/winver.rbuild (original) +++ trunk/rosapps/winver/winver.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" > +<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes"> <include base="winver">.</include> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x0501</define> <library>shell32</library>

1 0

[cfinck] 28245: Never use spaces in rbuild files! Also re-unlock the file again
by cfinck＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: cfinck Date: Wed Aug 8 19:22:02 2007 New Revision: 28245 URL: http://svn.reactos.org/svn/reactos?rev=28245&view=rev Log: Never use spaces in rbuild files! Also re-unlock the file again Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild (contents, props changed) Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Wed Aug 8 19:22:02 2007 @@ -9,5 +9,5 @@ <file>bootdata.c</file> <file>vga.c</file> <file>bootvid.rc</file> - <pch>precomp.h</pch> + <pch>precomp.h</pch> </module> Propchange: trunk/reactos/drivers/base/bootvid/bootvid.rbuild ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 28244: Replace a call to undocumented function CreateUserProfile by its documented equivalent (LogonUser + LoadUserProfile) In all cases, this code should be removed once NtUnloadKey is implemented Add a message to remind when to remove this hack
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 17:44:03 2007 New Revision: 28244 URL: http://svn.reactos.org/svn/reactos?rev=28244&view=rev Log: Replace a call to undocumented function CreateUserProfile by its documented equivalent (LogonUser + LoadUserProfile) In all cases, this code should be removed once NtUnloadKey is implemented Add a message to remind when to remove this hack Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Aug 8 17:44:03 2007 @@ -722,17 +722,38 @@ } } - /* Create the Administrator profile */ - if (!CreateUserProfileW(AdminSid, L"Administrator")) - { - DebugPrint("CreateUserProfileW() failed!"); - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - return 0; - } - RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); + + /* ROS HACK, as long as NtUnloadKey is not implemented */ + { + NTSTATUS Status = NtUnloadKey(NULL); + if (Status == STATUS_NOT_IMPLEMENTED) + { + /* Create the Administrator profile */ + PROFILEINFOW ProfileInfo; + HANDLE hToken; + BOOL ret; +#define LOGON32_LOGON_NETWORK 3 + ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); + if (!ret) + { + DebugPrint("LogonUserW() failed!"); + return 0; + } + ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW)); + ProfileInfo.dwSize = sizeof(PROFILEINFOW); + ProfileInfo.lpUserName = L"Administrator"; + ProfileInfo.dwFlags = PI_NOUI; + LoadUserProfileW(hToken, &ProfileInfo); + CloseHandle(hToken); + } + else + { + DPRINT1("ROS HACK not needed anymore. Please remove it\n"); + } + } + /* END OF ROS HACK */ CreateTempDir(L"TEMP"); CreateTempDir(L"TMP");

1 0

[hpoussin] 28243: Be less alarming in a debug message
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 14:46:03 2007 New Revision: 28243 URL: http://svn.reactos.org/svn/reactos?rev=28243&view=rev Log: Be less alarming in a debug message Modified: trunk/reactos/drivers/filesystems/vfat/create.c Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Wed Aug 8 14:46:03 2007 @@ -249,7 +249,7 @@ } else { - DPRINT1("File not found %wZ\n", &PathNameU); + DPRINT("FCB not found for %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb);

1 0

[hpoussin] 28242: Add SCESTATUS_* constants
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 12:58:58 2007 New Revision: 28242 URL: http://svn.reactos.org/svn/reactos?rev=28242&view=rev Log: Add SCESTATUS_* constants Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h (original) +++ trunk/reactos/include/psdk/ntsecapi.h Wed Aug 8 12:58:58 2007 @@ -123,6 +123,27 @@ #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 +#define SCESTATUS_SUCCESS 0L +#define SCESTATUS_INVALID_PARAMETER 1L +#define SCESTATUS_RECORD_NOT_FOUND 2L +#define SCESTATUS_INVALID_DATA 3L +#define SCESTATUS_OBJECT_EXISTS 4L +#define SCESTATUS_BUFFER_TOO_SMALL 5L +#define SCESTATUS_PROFILE_NOT_FOUND 6L +#define SCESTATUS_BAD_FORMAT 7L +#define SCESTATUS_NOT_ENOUGH_RESOURCE 8L +#define SCESTATUS_ACCESS_DENIED 9L +#define SCESTATUS_CANT_DELETE 10L +#define SCESTATUS_PREFIX_OVERFLOW 11L +#define SCESTATUS_OTHER_ERROR 12L +#define SCESTATUS_ALREADY_RUNNING 13L +#define SCESTATUS_SERVICE_NOT_SUPPORT 14L +#define SCESTATUS_MOD_NOT_FOUND 15L +#define SCESTATUS_EXCEPTION_IN_SERVER 16L +#define SCESTATUS_NO_TEMPLATE_GIVEN 17L +#define SCESTATUS_NO_MAPPING 18L +#define SCESTATUS_TRUST_FAIL 19L + #if !defined(_NTDEF_) typedef LONG NTSTATUS, *PNTSTATUS; #endif @@ -163,6 +184,13 @@ #endif +typedef enum _KERB_LOGON_SUBMIT_TYPE +{ + KerbInteractiveLogon = 2, + KerbS4ULogon = 12, + KerbTicketLogon = 10, + KerbTicketUnlockLogon = 11 +} KERB_LOGON_SUBMIT_TYPE, *PKERB_LOGON_SUBMIT_TYPE; typedef enum _MSV1_0_LOGON_SUBMIT_TYPE { MsV1_0InteractiveLogon = 2, MsV1_0Lm20Logon, @@ -377,6 +405,12 @@ LONG DomainIndex; } LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME; +typedef struct _KERB_INTERACTIVE_LOGON { + KERB_LOGON_SUBMIT_TYPE MessageType; + UNICODE_STRING LogonDomainName; + UNICODE_STRING UserName; + UNICODE_STRING Password; +} KERB_INTERACTIVE_LOGON, *PKERB_INTERACTIVE_LOGON; typedef struct _MSV1_0_INTERACTIVE_LOGON { MSV1_0_LOGON_SUBMIT_TYPE MessageType; UNICODE_STRING LogonDomainName; @@ -660,6 +694,8 @@ NTSTATUS NTAPI LsaLookupAuthenticationPackage(HANDLE,PLSA_STRING,PULONG); NTSTATUS NTAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); +NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, + PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS);

1 0

[hpoussin] 28241: Improve LoadUserProfileW, by creating the profile if it doesn't exist
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 12:26:44 2007 New Revision: 28241 URL: http://svn.reactos.org/svn/reactos?rev=28241&view=rev Log: Improve LoadUserProfileW, by creating the profile if it doesn't exist Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c (original) +++ trunk/reactos/dll/win32/userenv/profile.c Wed Aug 8 12:26:44 2007 @@ -63,7 +63,7 @@ lpszPtr++; } - if (wcslen(lpName) + wcslen(lpszPostfix) >= dwMaxLength) + if (wcslen(lpName) + wcslen(lpszPostfix) + 1 >= dwMaxLength) { DPRINT1("Error: buffer overflow\n"); SetLastError(ERROR_BUFFER_OVERFLOW); @@ -825,52 +825,194 @@ BOOL WINAPI -LoadUserProfileW (HANDLE hToken, - LPPROFILEINFOW lpProfileInfo) -{ - WCHAR szUserHivePath[MAX_PATH]; +LoadUserProfileW( + IN HANDLE hToken, + IN OUT LPPROFILEINFOW lpProfileInfo) +{ + WCHAR szUserHivePath[MAX_PATH]; + LPWSTR UserName = NULL, Domain = NULL; + DWORD UserNameLength = 0, DomainLength = 0; + PTOKEN_USER UserSid = NULL; + SID_NAME_USE AccountType; + UNICODE_STRING SidString = { 0, }; + LONG Error; + BOOL ret = FALSE; + DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); + + DPRINT("LoadUserProfileW() called\n"); + + /* Check profile info */ + if (!lpProfileInfo + || lpProfileInfo->dwSize != sizeof(PROFILEINFOW) + || lpProfileInfo->lpUserName == NULL + || lpProfileInfo->lpUserName[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return TRUE; + } + + /* Don't load a profile twice */ + if (CheckForLoadedProfile(hToken)) + { + DPRINT ("Profile already loaded\n"); + lpProfileInfo->hProfile = NULL; + return TRUE; + } + + if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) + { + DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); + return FALSE; + } + + wcscat(szUserHivePath, L"\\"); + wcscat(szUserHivePath, lpProfileInfo->lpUserName); + dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); + if (!AppendSystemPostfix(szUserHivePath, dwLength)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + /* Create user hive name */ + wcscat(szUserHivePath, L"\\ntuser.dat"); + DPRINT("szUserHivePath: %S\n", szUserHivePath); + + /* Create user profile directory if needed */ + if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) + { + /* Get user sid */ + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) + || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + DPRINT1 ("GetTokenInformation() failed\n"); + return FALSE; + } + UserSid = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!UserSid) + { + DPRINT1 ("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetTokenInformation(hToken, TokenUser, UserSid, dwLength, &dwLength)) + { + DPRINT1 ("GetTokenInformation() failed\n"); + goto cleanup; + } + + /* Get user name */ + do + { + if (UserNameLength > 0) + { + HeapFree(GetProcessHeap(), 0, UserName); + UserName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, UserNameLength * sizeof(WCHAR)); + if (!UserName) + { + DPRINT1("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + if (DomainLength > 0) + { + HeapFree(GetProcessHeap(), 0, Domain); + Domain = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, DomainLength * sizeof(WCHAR)); + if (!Domain) + { + DPRINT1("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + ret = LookupAccountSidW( + NULL, UserSid->User.Sid, + UserName, &UserNameLength, + Domain, &DomainLength, + &AccountType); + } while (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER); + + if (!ret) + { + DPRINT1("LookupAccountSidW() failed\n"); + goto cleanup; + } + + /* Create profile */ + /* FIXME: ignore Domain? */ + DPRINT("UserName %S, Domain %S\n", UserName, Domain); + ret = CreateUserProfileW(UserSid->User.Sid, UserName); + if (!ret) + { + DPRINT1("CreateUserProfileW() failed\n"); + goto cleanup; + } + } + + /* Get user SID string */ + ret = GetUserSidFromToken(hToken, &SidString); + if (!ret) + { + DPRINT1("GetUserSidFromToken() failed\n"); + goto cleanup; + } + ret = FALSE; + + /* Load user registry hive */ + Error = RegLoadKeyW(HKEY_USERS, + SidString.Buffer, + szUserHivePath); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + goto cleanup; + } + + /* Open future HKEY_CURRENT_USER */ + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + (PHKEY)&lpProfileInfo->hProfile); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + goto cleanup; + } + + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, UserSid); + HeapFree(GetProcessHeap(), 0, UserName); + HeapFree(GetProcessHeap(), 0, Domain); + RtlFreeUnicodeString(&SidString); + + DPRINT("LoadUserProfileW() done\n"); + return ret; +} + + +BOOL WINAPI +UnloadUserProfile (HANDLE hToken, + HANDLE hProfile) +{ UNICODE_STRING SidString; LONG Error; - DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); - - DPRINT ("LoadUserProfileW() called\n"); - - /* Check profile info */ - if (lpProfileInfo->dwSize != sizeof(PROFILEINFOW) || - lpProfileInfo->lpUserName == NULL || - lpProfileInfo->lpUserName[0] == 0) - { + + DPRINT ("UnloadUserProfile() called\n"); + + if (hProfile == NULL) + { + DPRINT1 ("Invalide profile handle\n"); SetLastError (ERROR_INVALID_PARAMETER); return FALSE; } - /* Don't load a profile twice */ - if (CheckForLoadedProfile (hToken)) - { - DPRINT ("Profile already loaded\n"); - lpProfileInfo->hProfile = NULL; - return TRUE; - } - - if (!GetProfilesDirectoryW (szUserHivePath, - &dwLength)) - { - DPRINT1("GetProfilesDirectoryW() failed\n", GetLastError()); - return FALSE; - } - - wcscat (szUserHivePath, L"\\"); - wcscat (szUserHivePath, lpProfileInfo->lpUserName); - if (!AppendSystemPostfix (szUserHivePath, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - /* Create user hive name */ - wcscat (szUserHivePath, L"\\ntuser.dat"); - - DPRINT ("szUserHivePath: %S\n", szUserHivePath); + RegCloseKey (hProfile); if (!GetUserSidFromToken (hToken, &SidString)) @@ -881,65 +1023,6 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - Error = RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szUserHivePath); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - (PHKEY)&lpProfileInfo->hProfile); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - RtlFreeUnicodeString (&SidString); - - DPRINT ("LoadUserProfileW() done\n"); - - return TRUE; -} - - -BOOL WINAPI -UnloadUserProfile (HANDLE hToken, - HANDLE hProfile) -{ - UNICODE_STRING SidString; - LONG Error; - - DPRINT ("UnloadUserProfile() called\n"); - - if (hProfile == NULL) - { - DPRINT1 ("Invalide profile handle\n"); - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } - - RegCloseKey (hProfile); - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return FALSE; - } - - DPRINT ("SidString: '%wZ'\n", &SidString); - Error = RegUnLoadKeyW (HKEY_USERS, SidString.Buffer); if (Error != ERROR_SUCCESS)

1 0

[hpoussin] 28240: Implement LsaLookupSids Add a fake implementation to LsaLookupNames to return some information
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 12:24:32 2007 New Revision: 28240 URL: http://svn.reactos.org/svn/reactos?rev=28240&view=rev Log: Implement LsaLookupSids Add a fake implementation to LsaLookupNames to return some information Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Wed Aug 8 12:24:32 2007 @@ -217,10 +217,10 @@ } /* - * @unimplemented - */ -NTSTATUS -STDCALL + * @implemented + */ +NTSTATUS +WINAPI LsaLookupNames( LSA_HANDLE PolicyHandle, ULONG Count, @@ -228,7 +228,39 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_SID *Sids) { - return STATUS_NOT_IMPLEMENTED; + PLSA_TRANSLATED_SID2 Sids2; + LSA_TRANSLATED_SID *TranslatedSids; + ULONG i; + NTSTATUS Status; + + /* Call LsaLookupNames2, which supersedes this function */ + Status = LsaLookupNames2(PolicyHandle, Count, 0, Names, ReferencedDomains, &Sids2); + if (!NT_SUCCESS(Status)) + return Status; + + /* Translate the returned structure */ + TranslatedSids = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count * sizeof(LSA_TRANSLATED_SID)); + if (!TranslatedSids) + { + LsaFreeMemory(Sids2); + return SCESTATUS_NOT_ENOUGH_RESOURCE; + } + RtlZeroMemory(Sids, Count * sizeof(PLSA_TRANSLATED_SID)); + for (i = 0; i < Count; i++) + { + TranslatedSids[i].Use = Sids2[i].Use; + if (Sids2[i].Use != SidTypeInvalid && Sids2[i].Use != SidTypeUnknown) + { + TranslatedSids[i].DomainIndex = Sids2[i].DomainIndex; + if (Sids2[i].Use != SidTypeDomain) + TranslatedSids[i].RelativeId = *GetSidSubAuthority(Sids2[i].Sid, 0); + } + } + LsaFreeMemory(Sids2); + + *Sids = TranslatedSids; + + return Status; } /* @@ -251,7 +283,7 @@ * @unimplemented */ NTSTATUS -STDCALL +WINAPI LsaLookupSids( LSA_HANDLE PolicyHandle, ULONG Count, @@ -259,7 +291,33 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_NAME *Names) { - return STATUS_NONE_MAPPED; + static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); + PLSA_REFERENCED_DOMAIN_LIST LocalDomains; + PLSA_TRANSLATED_NAME LocalNames; + + DPRINT1("LsaLookupSids(): stub. Always returning 'Administrator'\n"); + if (Count != 1) + return STATUS_NONE_MAPPED; + LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); + if (!LocalDomains) + return SCESTATUS_NOT_ENOUGH_RESOURCE; + LocalNames = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_NAME) + UserName.MaximumLength); + if (!LocalNames) + { + LsaFreeMemory(LocalDomains); + return SCESTATUS_NOT_ENOUGH_RESOURCE; + } + LocalDomains[0].Entries = 0; + LocalDomains[0].Domains = NULL; + LocalNames[0].Use = SidTypeWellKnownGroup; + LocalNames[0].Name.Buffer = (LPWSTR)((ULONG_PTR)(LocalNames) + sizeof(LSA_TRANSLATED_NAME)); + LocalNames[0].Name.Length = UserName.Length; + LocalNames[0].Name.MaximumLength = UserName.MaximumLength; + RtlCopyMemory(LocalNames[0].Name.Buffer, UserName.Buffer, UserName.MaximumLength); + + *ReferencedDomains = LocalDomains; + *Names = LocalNames; + return STATUS_SUCCESS; } /******************************************************************************

1 0

[jimtabor] 28239: Removed NtGdiGetRelAbs. Use GetDCDWord in gdi32. Update ntgdibad.h.
by jimtabor＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: jimtabor Date: Wed Aug 8 06:20:43 2007 New Revision: 28239 URL: http://svn.reactos.org/svn/reactos?rev=28239&view=rev Log: Removed NtGdiGetRelAbs. Use GetDCDWord in gdi32. Update ntgdibad.h. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Wed Aug 8 06:20:43 2007 @@ -151,6 +151,14 @@ NTAPI GdiConvertToDevmodeW(DEVMODEA *dm); +DWORD +STDCALL +GetAndSetDCDWord( HDC, INT, DWORD, DWORD, DWORD, DWORD ); + +DWORD +STDCALL +GetDCDWord( HDC, INT, DWORD); + VOID NTAPI LogFontA2W( Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Aug 8 06:20:43 2007 @@ -300,7 +300,7 @@ DWORD dwIgnore ) { - return NtGdiGetRelAbs(hdc); + return GetDCDWord( hdc, GdiGetRelAbs, 0); } @@ -334,7 +334,7 @@ } } } -// Ret = NtGdiGetAndSetDCDword( hDC, u, dwIn, (DWORD*) &u ); + Ret = NtGdiGetAndSetDCDword( hDC, u, dwIn, (DWORD*) &u ); if (Ret) return u; else @@ -350,7 +350,7 @@ STDCALL GetDCDWord( HDC hDC, INT u, DWORD Result ) { - BOOL Ret = TRUE; //NtGdiGetDCDword( hDC, u, (DWORD*) &u ); + BOOL Ret = NtGdiGetDCDword( hDC, u, (DWORD*) &u ); if (!Ret) return Result; else return u; } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 8 06:20:43 2007 @@ -466,9 +466,6 @@ INT STDCALL NtGdiGetROP2(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetRelAbs(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 06:20:43 2007 @@ -1800,7 +1800,6 @@ return iRetCount; } -DC_GET_VAL( INT, NtGdiGetRelAbs, Dc_Attr.lRelAbs ) DC_GET_VAL( INT, NtGdiGetROP2, Dc_Attr.jROP2 ) DC_GET_VAL( INT, NtGdiGetStretchBltMode, Dc_Attr.jStretchBltMode ) DC_GET_VAL( UINT, NtGdiGetTextAlign, Dc_Attr.lTextAlign ) @@ -2159,6 +2158,7 @@ case GdiGetJournal: break; case GdiGetRelAbs: + SafeResult = dc->Dc_Attr.lRelAbs; break; case GdiGetBreakExtra: break; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 8 06:20:43 2007 @@ -816,7 +816,6 @@ NtGdiGetPixelFormat 1 NtGdiGetPolyFillMode 1 NtGdiGetROP2 1 -NtGdiGetRelAbs 1 NtGdiGetSetTextCharExtra 3 NtGdiGetStretchBltMode 1 NtGdiGetSystemPaletteEntries 4

1 0

[tkreuzer] 28238: remove NtGdiGetClipRgn from win32k
by tkreuzer＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: tkreuzer Date: Wed Aug 8 06:03:25 2007 New Revision: 28238 URL: http://svn.reactos.org/svn/reactos?rev=28238&view=rev Log: remove NtGdiGetClipRgn from win32k Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 06:03:25 2007 @@ -1101,7 +1101,6 @@ DC_GET_VAL( COLORREF, NtGdiGetBkColor, Dc_Attr.crBackgroundClr ) DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode ) DC_GET_VAL_EX( GetBrushOrgEx, Dc_Attr.ptlBrushOrigin.x, Dc_Attr.ptlBrushOrigin.y, POINT, x, y ) -DC_GET_VAL( HRGN, NtGdiGetClipRgn, w.hClipRgn ) HGDIOBJ STDCALL NtGdiGetCurrentObject(HDC hDC, UINT ObjectType) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 8 06:03:25 2007 @@ -795,7 +795,6 @@ NtGdiGetCharWidth32 4 NtGdiGetCharWidthFloat 4 NtGdiGetClipBox 2 -NtGdiGetClipRgn 1 NtGdiGetColorSpace 1 NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007