Author: hbelusca Date: Mon Dec 15 22:48:38 2014 New Revision: 65681
URL: http://svn.reactos.org/svn/reactos?rev=65681&view=rev Log: [BASESRV] - Whitespace fixes. - Stub AppCompat module. Patch by Timo Kreuzer. CORE-7505 #comment AppCompat committed in r65681.
Added: trunk/reactos/subsystems/win/basesrv/appcompat.c (with props) Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/nls.c trunk/reactos/subsystems/win/basesrv/sndsntry.c trunk/reactos/subsystems/win/basesrv/vdm.c
Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMak... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -1,8 +1,10 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + spec2def(basesrv.dll basesrv.spec)
list(APPEND SOURCE + appcompat.c dosdev.c init.c proc.c
Modified: trunk/reactos/subsystems/win/basesrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/api.... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -7,6 +7,9 @@ */
#pragma once + +/* appcompat.c */ +CSR_API(BaseSrvCheckApplicationCompatibility);
/* dosdev.c */ VOID BaseInitDefineDosDevice(VOID);
Added: trunk/reactos/subsystems/win/basesrv/appcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/appc... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/appcompat.c (added) +++ trunk/reactos/subsystems/win/basesrv/appcompat.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -0,0 +1,67 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/init.c + * PURPOSE: Initialization + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "basesrv.h" +#include "api.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +typedef struct _BASE_APP_COMPAT_EXTRA1 +{ + WCHAR String1[32]; + ULONG tdwFlags; + ULONG SizeOfStruct; + ULONG tdwMagic; + ULONG ttrExe; + ULONG dword50; + ULONG dword54; + ULONG dword58; + PVOID ttrLayer; + CHAR String2[28]; + ULONG dword7C; + ULONG dword80; + ULONG field_84; + CHAR String3[256]; +} BASE_APP_COMPAT_EXTRA1, *PBASE_APP_COMPAT_EXTRA1; + +typedef struct _BASE_APP_COMPAT_DATA +{ + UNICODE_STRING FileName; + HANDLE ProcessHandle; + ULONG Flags; + USHORT Code; + USHORT Unknown_012; + PVOID Environment; + ULONG EnvironmentSize; + PBASE_APP_COMPAT_EXTRA1 AppCompExtra1; + ULONG AppCompExtra1Size; + PVOID AppCompExtra2; + ULONG AppCompExtra2Size; + BOOL CheckRunAppResult; + ULONG Flags2; +} BASE_APP_COMPAT_DATA, *PBASE_APP_COMPAT_DATA; + +/* PUBLIC SERVER APIS *********************************************************/ + +CSR_API(BaseSrvCheckApplicationCompatibility) +{ + PBASE_APP_COMPAT_DATA AppCompatData = (PBASE_APP_COMPAT_DATA)&ApiMessage->Data; + DPRINT1("BASESRV: BaseSrvCheckApplicationCompatibility(%wZ)\n", + AppCompatData->FileName); + + AppCompatData->CheckRunAppResult = FALSE; + + return STATUS_SUCCESS; +} + +/* EOF */
Propchange: trunk/reactos/subsystems/win/basesrv/appcompat.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/base... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -36,29 +36,29 @@
typedef struct _BASESRV_KERNEL_IMPORTS { - PCHAR FunctionName; + PCHAR FunctionName; PVOID* FunctionPointer; } BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS;
/* FIXME: BASENLS.H */ -typedef NTSTATUS(WINAPI *POPEN_DATA_FILE)(HANDLE hFile, - PWCHAR FileName); +typedef NTSTATUS (WINAPI *POPEN_DATA_FILE)(HANDLE hFile, + PWCHAR FileName);
-typedef BOOL(WINAPI *PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, - LPWSTR FileName, - ULONG FileNameSize); +typedef BOOL (WINAPI *PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, + LPWSTR FileName, + ULONG FileNameSize);
-typedef BOOL(WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, - UINT Base, - ULONG Unknown, - LPWSTR BaseName, - LPWSTR Result, - ULONG ResultSize); +typedef BOOL (WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPWSTR BaseName, + LPWSTR Result, + ULONG ResultSize);
-typedef BOOL(WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS(WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, - IN ULONG BufferSize, - IN ULONG AceType); +typedef BOOL (WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); +typedef NTSTATUS (WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG AceType);
/* Globals */ extern HANDLE BaseSrvHeap;
Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls.... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -51,7 +51,7 @@
/* FUNCTIONS *****************************************************************/
-NTSTATUS +NTSTATUS NTAPI BaseSrvDelayLoadKernel32(VOID) {
Modified: trunk/reactos/subsystems/win/basesrv/sndsntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/snds... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -50,7 +50,7 @@ 0, (PVOID*)&NewSoundSentry); } - + /* Set it as the callback for the future, and call it */ _UserSoundSentry = NewSoundSentry; return _UserSoundSentry();
Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm.... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -364,7 +364,7 @@ RtlMoveMemory(&CommandInfo->StartupInfo, CheckVdmRequest->StartupInfo, sizeof(STARTUPINFOA)); - + /* Allocate memory for the desktop */ if (CheckVdmRequest->DesktopLen != 0) { @@ -1000,7 +1000,7 @@ DosRecord->ExitCode = GetNextVdmCommandRequest->ExitCode;
/* Update the VDM state */ - DosRecord->State = VDM_READY; + DosRecord->State = VDM_READY;
/* Notify all waiting threads that the task is finished */ NtSetEvent(DosRecord->ServerEvent, NULL);