Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINSRV] Fix 64 bit issues

Browse source
This commit is contained in:
Timo Kreuzer 2018-03-04 16:07:41 +01:00
parent 2a5e2a2ab6
commit 3323d117c3
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win32ss/user/winsrv/concfg/font.c
View file

@ -28,7 +28,7 @@ CodePageToCharSet(
IN UINT CodePage) IN UINT CodePage)
{ {
CHARSETINFO CharInfo; CHARSETINFO CharInfo;
if (TranslateCharsetInfo((LPDWORD)CodePage, &CharInfo, TCI_SRCCODEPAGE)) if (TranslateCharsetInfo(UlongToPtr(CodePage), &CharInfo, TCI_SRCCODEPAGE))
return CharInfo.ciCharset; return CharInfo.ciCharset;
else else
return DEFAULT_CHARSET; return DEFAULT_CHARSET;

2
win32ss/user/winsrv/consrv/condrv/graphics.c
View file

@ -50,7 +50,7 @@ GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer,
PGRAPHICS_SCREEN_BUFFER NewBuffer = NULL; PGRAPHICS_SCREEN_BUFFER NewBuffer = NULL;
LARGE_INTEGER SectionSize; LARGE_INTEGER SectionSize;
ULONG ViewSize = 0; SIZE_T ViewSize = 0;
if (Buffer == NULL || Console == NULL || GraphicsInfo == NULL) if (Buffer == NULL || Console == NULL || GraphicsInfo == NULL)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;

4
win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
View file

@ -77,7 +77,7 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData,
{ {
PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer;
LARGE_INTEGER SectionSize; LARGE_INTEGER SectionSize;
ULONG ViewSize = 0; SIZE_T ViewSize = 0;
PCONSOLE_STATE_INFO pSharedInfo = NULL; PCONSOLE_STATE_INFO pSharedInfo = NULL;
/* /*
@ -262,7 +262,7 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData,
PCONSRV_CONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_PROCESS_DATA ProcessData; PCONSOLE_PROCESS_DATA ProcessData;
HANDLE hSection = NULL; HANDLE hSection = NULL;
ULONG ViewSize = 0; SIZE_T ViewSize = 0;
PCONSOLE_STATE_INFO pConInfo = NULL; PCONSOLE_STATE_INFO pConInfo = NULL;
if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return;

2
win32ss/user/winsrv/consrv/subsysreg.c
View file

@ -38,7 +38,7 @@ CSR_API(SrvRegisterConsoleVDM)
if (RegisterVDMRequest->RegisterFlags != 0) if (RegisterVDMRequest->RegisterFlags != 0)
{ {
LARGE_INTEGER SectionSize; LARGE_INTEGER SectionSize;
ULONG Size, ViewSize = 0; SIZE_T Size, ViewSize = 0;
HANDLE ProcessHandle; HANDLE ProcessHandle;
/* /*

12
win32ss/user/winsrv/usersrv/init.c
View file

@ -114,7 +114,7 @@ ULONG
NTAPI NTAPI
CreateSystemThreads(PVOID pParam) CreateSystemThreads(PVOID pParam)
{ {
NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); NtUserCallOneParam((DWORD_PTR)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS);
RtlExitUserThread(0); RtlExitUserThread(0);
return 0; return 0;
} }
@ -292,9 +292,15 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization)
for (i = 0; i < 2; ++i) for (i = 0; i < 2; ++i)
{ {
Status = RtlCreateUserThread(NtCurrentProcess(), Status = RtlCreateUserThread(NtCurrentProcess(),
NULL, TRUE, 0, 0, 0, NULL,
TRUE,
0,
0,
0,
CreateSystemThreads, CreateSystemThreads,
(PVOID)i, &ServerThread, &ClientId); UlongToPtr(i),
&ServerThread,
&ClientId);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
NtResumeThread(ServerThread, NULL); NtResumeThread(ServerThread, NULL);