Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59879: [BASESRV]: The last few APIs were off-by-one due to an unimplmented (in Windows) or deprecated api.c [BASESRV]: Implement BaseSrvNlsCreateSection, which is needed by Windows kernel32.d...
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 20:13:31 2013 New Revision: 59879 URL: http://svn.reactos.org/svn/reactos?rev=59879&view=rev Log: [BASESRV]: The last few APIs were off-by-one due to an unimplmented (in Windows) or deprecated api.c [BASESRV]: Implement BaseSrvNlsCreateSection, which is needed by Windows kernel32.dll. Also implement the delay-loading functionality it needs. Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/nls.c trunk/reactos/subsystems/win32/csrsrv/api.c Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -46,6 +46,7 @@ BasepNlsUpdateCacheCount, BasepSetTermsrvClientTimeZone, BasepSxsCreateActivationContext, + BasepUnknown, BasepRegisterThread, BasepNlsGetUserInfo, BasepMaxApiNumber @@ -260,6 +261,13 @@ UNICODE_STRING TargetPath; } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE; +typedef struct +{ + HANDLE SectionHandle; + ULONG Type; + ULONG LocaleId; +} BASE_NLS_CREATE_SECTION, *PBASE_NLS_CREATE_SECTION; + typedef struct _BASE_API_MESSAGE { PORT_MESSAGE Header; @@ -288,6 +296,7 @@ BASE_SOUND_SENTRY SoundSentryRequest; BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; + BASE_NLS_CREATE_SECTION NlsCreateSection; } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -24,6 +24,32 @@ #include <win/basemsg.h> #include <win/base.h> +typedef struct _BASESRV_KERNEL_IMPORTS +{ + PCHAR FunctionName; + PVOID* FunctionPointer; +} BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; + +/* FIXME: BASENLS.H */ +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_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPSTR BaseName, + LPSTR 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); /* Globals */ extern HANDLE BaseSrvHeap; Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -17,6 +17,7 @@ /* GLOBALS ********************************************************************/ HANDLE BaseSrvDllInstance = NULL; +extern UNICODE_STRING BaseSrvKernel32DllPath; /* Memory */ HANDLE BaseSrvHeap = NULL; // Our own heap. @@ -54,6 +55,7 @@ BaseSrvNlsUpdateCacheCount, BaseSrvSetTermsrvClientTimeZone, BaseSrvSxsCreateActivationContext, + BaseSrvDebugProcess, BaseSrvRegisterThread, BaseSrvNlsGetUserInfo, }; @@ -84,12 +86,13 @@ TRUE, // BaseSrvSoundSentryNotification TRUE, // BaseSrvRefreshIniFileMapping TRUE, // BaseSrvDefineDosDevice - FALSE, // BaseSrvSetTermsrvAppInstallMode - FALSE, // BaseSrvNlsUpdateCacheCount - FALSE, // BaseSrvSetTermsrvClientTimeZone - FALSE, // BaseSrvSxsCreateActivationContext - FALSE, // BaseSrvRegisterThread - FALSE, // BaseSrvNlsGetUserInfo + TRUE, // BaseSrvSetTermsrvAppInstallMode + TRUE, // BaseSrvNlsUpdateCacheCount + TRUE, // BaseSrvSetTermsrvClientTimeZone + TRUE, // BaseSrvSxsCreateActivationContext + TRUE, // BasepDebugProcess + TRUE, // BaseSrvRegisterThread + TRUE, // BaseSrvNlsGetUserInfo }; PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = @@ -311,6 +314,12 @@ SystemRootString.Buffer); ASSERT(NT_SUCCESS(Status)); + /* Create the kernel32 path */ + wcscat(SystemRootString.Buffer, L"\\kernel32.dll"); + Status = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + /* FIXME: Check Session ID */ wcscpy(Buffer, L"\\BaseNamedObjects"); RtlInitUnicodeString(&BnoString, Buffer); 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] Thu Aug 29 20:13:31 2013 @@ -13,6 +13,95 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ********************************************************************/ + +BOOLEAN BaseSrvKernel32DelayLoadComplete; +HANDLE BaseSrvKernel32DllHandle; +UNICODE_STRING BaseSrvKernel32DllPath; + +POPEN_DATA_FILE pOpenDataFile; +PVOID /*PGET_DEFAULT_SORTKEY_SIZE */ pGetDefaultSortkeySize; +PVOID /*PGET_LINGUIST_LANG_SIZE*/ pGetLinguistLangSize; +PVOID /*PNLS_CONVERT_INTEGER_TO_STRING*/ pNlsConvertIntegerToString; +PVOID /*PVALIDATE_LCTYPE*/ pValidateLCType; +PVALIDATE_LOCALE pValidateLocale; +PGET_NLS_SECTION_NAME pGetNlsSectionName; +PVOID /*PGET_USER_DEFAULT_LANGID*/ pGetUserDefaultLangID; +PGET_CP_FILE_NAME_FROM_REGISTRY pGetCPFileNameFromRegistry; +PCREATE_NLS_SECURTY_DESCRIPTOR pCreateNlsSecurityDescriptor; + +BASESRV_KERNEL_IMPORTS BaseSrvKernel32Imports[10] = +{ + { "OpenDataFile", (PVOID*) &pOpenDataFile }, + { "GetDefaultSortkeySize", (PVOID*) &pGetDefaultSortkeySize }, + { "GetLinguistLangSize", (PVOID*) &pGetLinguistLangSize }, + { "NlsConvertIntegerToString", (PVOID*) &pNlsConvertIntegerToString }, + { "ValidateLCType", (PVOID*) &pValidateLCType }, + { "ValidateLocale", (PVOID*) &pValidateLocale }, + { "GetNlsSectionName", (PVOID*) &pGetNlsSectionName }, + { "GetUserDefaultLangID", (PVOID*) &pGetUserDefaultLangID }, + { "GetCPFileNameFromRegistry", (PVOID*) &pGetCPFileNameFromRegistry }, + { "CreateNlsSecurityDescriptor", (PVOID*) &pCreateNlsSecurityDescriptor }, +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +BaseSrvDelayLoadKernel32(VOID) +{ + NTSTATUS Status; + ULONG i; + ANSI_STRING ProcedureName; + + /* Only do this once */ + if (BaseSrvKernel32DelayLoadComplete) return STATUS_SUCCESS; + + /* Loop all imports */ + for (i = 0; i < RTL_NUMBER_OF(BaseSrvKernel32Imports); i++) + { + /* Only look them up once */ + if (!*BaseSrvKernel32Imports[i].FunctionPointer) + { + /* If we haven't loaded the DLL yet, do it now */ + if (!BaseSrvKernel32DllHandle) + { + Status = LdrLoadDll(0, + 0, + &BaseSrvKernel32DllPath, + &BaseSrvKernel32DllHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to load %wZ\n", &BaseSrvKernel32DllPath); + return Status; + } + } + + /* Get the address of the routine being looked up*/ + RtlInitAnsiString(&ProcedureName, BaseSrvKernel32Imports[i].FunctionName); + Status = LdrGetProcedureAddress(BaseSrvKernel32DllHandle, + &ProcedureName, + 0, + BaseSrvKernel32Imports[i].FunctionPointer); + DPRINT1("NLS: Found %Z at 0x%p\n", + &ProcedureName, + BaseSrvKernel32Imports[i].FunctionPointer); + if (!NT_SUCCESS(Status)) break; + } + } + + /* Did we find them all? */ + if (i == RTL_NUMBER_OF(BaseSrvKernel32Imports)) + { + /* Excellent */ + BaseSrvKernel32DelayLoadComplete = TRUE; + return STATUS_SUCCESS; + } + + /* Nope, fail */ + return Status; +} + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvNlsSetUserInfo) @@ -28,10 +117,147 @@ } CSR_API(BaseSrvNlsCreateSection) - -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; +{ + NTSTATUS Status; + HANDLE SectionHandle, ProcessHandle, FileHandle; + ULONG LocaleId; + UNICODE_STRING NlsSectionName; + PWCHAR NlsFileName; + UCHAR SecurityDescriptor[52]; + OBJECT_ATTRIBUTES ObjectAttributes; + PBASE_NLS_CREATE_SECTION NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsCreateSection; + + /* Load kernel32 first and import the NLS routines */ + Status = BaseSrvDelayLoadKernel32(); + if (!NT_SUCCESS(Status)) return Status; + + /* Assume failure */ + NlsMsg->SectionHandle = NULL; + + /* Check and validate the locale ID, if one is present */ + LocaleId = NlsMsg->LocaleId; + DPRINT1("NLS: Create Section with LCID: %lx for Type: %d\n", LocaleId, NlsMsg->Type); + if (LocaleId) + { + if (!pValidateLocale(LocaleId)) return STATUS_INVALID_PARAMETER; + } + + /* Check which NLS section is being created */ + switch (NlsMsg->Type) + { + /* For each one, set the correct filename and object name */ + case 1: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionUnicode"); + NlsFileName = L"unicode.nls"; + break; + case 2: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionLocale"); + NlsFileName = L"locale.nls"; + break; + case 3: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCType"); + NlsFileName = L"ctype.nls"; + break; + case 4: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionSortkey"); + NlsFileName = L"sortkey.nls"; + break; + case 5: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionSortTbls"); + NlsFileName = L"sorttbls.nls"; + break; + case 6: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCP437"); + NlsFileName = L"c_437.nls"; + break; + case 7: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCP1252"); + NlsFileName = L"c_1252.nls"; + break; + case 8: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionLANG_EXCEPT"); + NlsFileName = L"l_except.nls"; + break; + case 9: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 10: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 11: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 12: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionGeo"); + NlsFileName = L"geo.nls"; + break; + default: + DPRINT1("NLS: Invalid NLS type!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Open the specified NLS file */ + Status = pOpenDataFile(&FileHandle, NlsFileName); + if (Status != STATUS_SUCCESS) + { + DPRINT1("NLS: Failed to open file: %lx\n", Status); + return Status; + } + + /* Create an SD for the section object */ + Status = pCreateNlsSecurityDescriptor(&SecurityDescriptor, + sizeof(SecurityDescriptor), + 0x80000000); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: CreateNlsSecurityDescriptor FAILED!: %lx\n", Status); + NtClose(FileHandle); + return Status; + } + + /* Create the section object proper */ + InitializeObjectAttributes(&ObjectAttributes, + &NlsSectionName, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_OPENIF, + NULL, + &SecurityDescriptor); + Status = NtCreateSection(&SectionHandle, + SECTION_MAP_READ, + &ObjectAttributes, + 0, + PAGE_READONLY, + SEC_COMMIT, + FileHandle); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: Failed to create section! %lx\n", Status); + return Status; + } + + /* Open a handle to the calling process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&ProcessHandle, + PROCESS_DUP_HANDLE, + &ObjectAttributes, + &ApiMessage->Header.ClientId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: Failed to open process! %lx\n", Status); + NtClose(SectionHandle); + return Status; + } + + /* Duplicate the handle to the section object into it */ + Status = NtDuplicateObject(NtCurrentProcess(), + SectionHandle, + ProcessHandle, + &NlsMsg->SectionHandle, + 0, + 0, + 3); + NtClose(ProcessHandle); + return Status; } CSR_API(BaseSrvNlsUpdateCacheCount) Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -76,11 +76,13 @@ ((ServerDll->ValidTable) && !(ServerDll->ValidTable[ApiId]))) { /* We are beyond the Maximum API ID, or it doesn't exist */ + DPRINT1("API: %d\n", ApiId); DPRINT1("CSRSS: %lx (%s) is invalid ApiTableIndex for %Z or is an " "invalid API to call from the server.\n", - ServerDll->ValidTable[ApiId], + ApiId, ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? - ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); + ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", + &ServerDll->Name); // DbgBreakPoint(); ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION;

1 0

[ion] 59878: [NLS]. Add NLS files.
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 19:07:10 2013 New Revision: 59878 URL: http://svn.reactos.org/svn/reactos?rev=59878&view=rev Log: [NLS]. Add NLS files. Added: trunk/reactos/media/nls/ctype.nls (with props) trunk/reactos/media/nls/geo.nls (with props) trunk/reactos/media/nls/l_except.nls (with props) trunk/reactos/media/nls/locale.nls (with props) trunk/reactos/media/nls/sortkey.nls (with props) trunk/reactos/media/nls/sorttbls.nls (with props) trunk/reactos/media/nls/unicode.nls (with props) Modified: trunk/reactos/media/nls/CMakeLists.txt Modified: trunk/reactos/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] Thu Aug 29 19:07:10 2013 @@ -60,6 +60,13 @@ c_28604.nls c_28605.nls c_28606.nls + unicode.nls + geo.nls + sorttbls.nls + locale.nls + sortkey.nls + ctype.nls + l_except.nls ) Added: trunk/reactos/media/nls/ctype.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/ctype.nls?rev=59… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/ctype.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/geo.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/geo.nls?rev=59878 ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/geo.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/l_except.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/l_except.nls?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/l_except.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/locale.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/locale.nls?rev=5… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/locale.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/sortkey.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/sortkey.nls?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/sortkey.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/sorttbls.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/sorttbls.nls?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/sorttbls.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/unicode.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/unicode.nls?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/unicode.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[hbelusca] 59877: Formatting fix only.
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: hbelusca Date: Thu Aug 29 18:13:24 2013 New Revision: 59877 URL: http://svn.reactos.org/svn/reactos?rev=59877&view=rev Log: Formatting fix only. Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 18:13:24 2013 @@ -123,7 +123,7 @@ "BaseSetTermsrvClientTimeZone", "BaseSxsCreateActivationContext", "BaseRegisterThread", - "BaseNlsGetUserInfo", + "BaseNlsGetUserInfo", };

1 0

[aandrejevic] 59876: [SOFT386] Implement the CLC, STC, CLI, STI, CLD and STD instructions.
by aandrejevic＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: aandrejevic Date: Thu Aug 29 17:48:32 2013 New Revision: 59876 URL: http://svn.reactos.org/svn/reactos?rev=59876&view=rev Log: [SOFT386] Implement the CLC, STC, CLI, STI, CLD and STD instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 17:48:32 2013 @@ -272,12 +272,12 @@ NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xF8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xF9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xFA NOT SUPPORTED - NULL, // TODO: OPCODE 0xFB NOT SUPPORTED - NULL, // TODO: OPCODE 0xFC NOT SUPPORTED - NULL, // TODO: OPCODE 0xFD NOT SUPPORTED + Soft386OpcodeClearCarry, + Soft386OpcodeSetCarry, + Soft386OpcodeClearInt, + Soft386OpcodeSetInt, + Soft386OpcodeClearDir, + Soft386OpcodeSetDir, NULL, // TODO: OPCODE 0xFE NOT SUPPORTED NULL, // TODO: OPCODE 0xFF NOT SUPPORTED }; @@ -740,3 +740,117 @@ /* Return success */ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeClearCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF8); + + /* Clear CF and return success */ + State->Flags.Cf = FALSE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF9); + + /* Set CF and return success*/ + State->Flags.Cf = TRUE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeClearInt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFA); + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Check IOPL */ + if (State->Flags.Iopl >= State->SegmentRegs[SOFT386_REG_CS].Dpl) + { + /* Clear the interrupt flag */ + State->Flags.If = FALSE; + } + else + { + /* General Protection Fault */ + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + } + else + { + /* Just clear the interrupt flag */ + State->Flags.If = FALSE; + } + + /* Return success */ + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetInt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFB); + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Check IOPL */ + if (State->Flags.Iopl >= State->SegmentRegs[SOFT386_REG_CS].Dpl) + { + /* Set the interrupt flag */ + State->Flags.If = TRUE; + } + else + { + /* General Protection Fault */ + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + } + else + { + /* Just set the interrupt flag */ + State->Flags.If = TRUE; + } + + /* Return success */ + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeClearDir(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFC); + + /* Clear DF and return success */ + State->Flags.Df = FALSE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetDir(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFD); + + /* Set DF and return success*/ + State->Flags.Df = TRUE; + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 17:48:32 2013 @@ -87,4 +87,52 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeClearCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeClearInt +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetInt +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeClearDir +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetDir +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

1 0

[ion] 59875: moar failz
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 17:46:26 2013 New Revision: 59875 URL: http://svn.reactos.org/svn/reactos?rev=59875&view=rev Log: moar failz Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 17:46:26 2013 @@ -392,6 +392,7 @@ /* Bail out */ DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", __FUNCTION__, + dwFlags, 0x1C); BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); return FALSE;

1 0

[ion] 59874: fix a dprint
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 17:44:34 2013 New Revision: 59874 URL: http://svn.reactos.org/svn/reactos?rev=59874&view=rev Log: fix a dprint Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 17:44:34 2013 @@ -390,7 +390,9 @@ /* More than one flag is set... */ default: /* Bail out */ - DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", 0x1C); + DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", + __FUNCTION__, + 0x1C); BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); return FALSE; }

1 0

[hbelusca] 59873: Fix variable naming.
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: hbelusca Date: Thu Aug 29 17:40:21 2013 New Revision: 59873 URL: http://svn.reactos.org/svn/reactos?rev=59873&view=rev Log: Fix variable naming. Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 17:40:21 2013 @@ -130,7 +130,7 @@ ULONG CodePage; ULONG dwCreationFlags; PCHAR CmdLine; - PCHAR appName; + PCHAR AppName; PCHAR PifFile; PCHAR CurDirectory; PCHAR Env;

1 0

[ion] 59872: [BASESRV]: Stubplement all the APIs so that our IDs match with Windows. Windows kernel32 now dies when calling NLSCreateSection.
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 17:00:10 2013 New Revision: 59872 URL: http://svn.reactos.org/svn/reactos?rev=59872&view=rev Log: [BASESRV]: Stubplement all the APIs so that our IDs match with Windows. Windows kernel32 now dies when calling NLSCreateSection. Added: trunk/reactos/subsystems/win/basesrv/nls.c (with props) Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 17:00:10 2013 @@ -22,33 +22,32 @@ BasepCreateThread, BasepGetTempFile, BasepExitProcess, - // BasepDebugProcess, - // BasepCheckVDM, - // BasepUpdateVDMEntry, - // BasepGetNextVDMCommand, - // BasepExitVDM, - // BasepIsFirstVDM, - // BasepGetVDMExitCode, - // BasepSetReenterCount, + BasepDebugProcess, + BasepCheckVDM, + BasepUpdateVDMEntry, + BasepGetNextVDMCommand, + BasepExitVDM, + BasepIsFirstVDM, + BasepGetVDMExitCode, + BasepSetReenterCount, BasepSetProcessShutdownParam, BasepGetProcessShutdownParam, - // BasepNlsSetUserInfo, - // BasepNlsSetMultipleUserInfo, - // BasepNlsCreateSection, - // BasepSetVDMCurDirs, - // BasepGetVDMCurDirs, - // BasepBatNotification, - // BasepRegisterWowExec, + BasepNlsSetUserInfo, + BasepNlsSetMultipleUserInfo, + BasepNlsCreateSection, + BasepSetVDMCurDirs, + BasepGetVDMCurDirs, + BasepBatNotification, + BasepRegisterWowExec, BasepSoundSentryNotification, - // BasepRefreshIniFileMapping, + BasepRefreshIniFileMapping, BasepDefineDosDevice, - // BasepSetTermsrvAppInstallMode, - // BasepNlsUpdateCacheCount, - // BasepSetTermsrvClientTimeZone, - // BasepSxsCreateActivationContext, - // BasepRegisterThread, - // BasepNlsGetUserInfo, - + BasepSetTermsrvAppInstallMode, + BasepNlsUpdateCacheCount, + BasepSetTermsrvClientTimeZone, + BasepSxsCreateActivationContext, + BasepRegisterThread, + BasepNlsGetUserInfo, BasepMaxApiNumber } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMa… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Thu Aug 29 17:00:10 2013 @@ -8,6 +8,8 @@ init.c proc.c sndsntry.c + vdm.c + nls.c basesrv.rc ${CMAKE_CURRENT_BINARY_DIR}/basesrv.def) 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] Thu Aug 29 17:00:10 2013 @@ -21,8 +21,34 @@ CSR_API(BaseSrvExitProcess); CSR_API(BaseSrvGetProcessShutdownParam); CSR_API(BaseSrvSetProcessShutdownParam); +CSR_API(BaseSrvDebugProcess); +CSR_API(BaseSrvRegisterThread); +CSR_API(BaseSrvSxsCreateActivationContext); +CSR_API(BaseSrvSetTermsrvAppInstallMode); +CSR_API(BaseSrvSetTermsrvClientTimeZone); /* sndsntry.c */ CSR_API(BaseSrvSoundSentryNotification); +/* vdm.c */ +CSR_API(BaseSrvCheckVDM); +CSR_API(BaseSrvUpdateVDMEntry); +CSR_API(BaseSrvGetNextVDMCommand); +CSR_API(BaseSrvExitVDM); +CSR_API(BaseSrvIsFirstVDM); +CSR_API(BaseSrvGetVDMExitCode); +CSR_API(BaseSrvSetReenterCount); +CSR_API(BaseSrvSetVDMCurDirs); +CSR_API(BaseSrvGetVDMCurDirs); +CSR_API(BaseSrvBatNotification); +CSR_API(BaseSrvRegisterWowExec); +CSR_API(BaseSrvRefreshIniFileMapping); + +/* nls.c */ +CSR_API(BaseSrvNlsSetUserInfo); +CSR_API(BaseSrvNlsSetMultipleUserInfo); +CSR_API(BaseSrvNlsCreateSection); +CSR_API(BaseSrvNlsUpdateCacheCount); +CSR_API(BaseSrvNlsGetUserInfo); + /* EOF */ Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 17:00:10 2013 @@ -30,32 +30,32 @@ BaseSrvCreateThread, BaseSrvGetTempFile, BaseSrvExitProcess, - // BaseSrvDebugProcess, - // BaseSrvCheckVDM, - // BaseSrvUpdateVDMEntry, - // BaseSrvGetNextVDMCommand, - // BaseSrvExitVDM, - // BaseSrvIsFirstVDM, - // BaseSrvGetVDMExitCode, - // BaseSrvSetReenterCount, + BaseSrvDebugProcess, + BaseSrvCheckVDM, + BaseSrvUpdateVDMEntry, + BaseSrvGetNextVDMCommand, + BaseSrvExitVDM, + BaseSrvIsFirstVDM, + BaseSrvGetVDMExitCode, + BaseSrvSetReenterCount, BaseSrvSetProcessShutdownParam, BaseSrvGetProcessShutdownParam, - // BaseSrvNlsSetUserInfo, - // BaseSrvNlsSetMultipleUserInfo, - // BaseSrvNlsCreateSection, - // BaseSrvSetVDMCurDirs, - // BaseSrvGetVDMCurDirs, - // BaseSrvBatNotification, - // BaseSrvRegisterWowExec, + BaseSrvNlsSetUserInfo, + BaseSrvNlsSetMultipleUserInfo, + BaseSrvNlsCreateSection, + BaseSrvSetVDMCurDirs, + BaseSrvGetVDMCurDirs, + BaseSrvBatNotification, + BaseSrvRegisterWowExec, BaseSrvSoundSentryNotification, - // BaseSrvRefreshIniFileMapping, + BaseSrvRefreshIniFileMapping, BaseSrvDefineDosDevice, - // BaseSrvSetTermsrvAppInstallMode, - // BaseSrvNlsUpdateCacheCount, - // BaseSrvSetTermsrvClientTimeZone, - // BaseSrvSxsCreateActivationContext, - // BaseSrvRegisterThread, - // BaseSrvNlsGetUserInfo, + BaseSrvSetTermsrvAppInstallMode, + BaseSrvNlsUpdateCacheCount, + BaseSrvSetTermsrvClientTimeZone, + BaseSrvSxsCreateActivationContext, + BaseSrvRegisterThread, + BaseSrvNlsGetUserInfo, }; BOOLEAN BaseServerApiServerValidTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = @@ -64,32 +64,32 @@ TRUE, // BaseSrvCreateThread TRUE, // BaseSrvGetTempFile FALSE, // BaseSrvExitProcess - // FALSE, // BaseSrvDebugProcess - // TRUE, // BaseSrvCheckVDM - // TRUE, // BaseSrvUpdateVDMEntry - // TRUE, // BaseSrvGetNextVDMCommand - // TRUE, // BaseSrvExitVDM - // TRUE, // BaseSrvIsFirstVDM - // TRUE, // BaseSrvGetVDMExitCode - // TRUE, // BaseSrvSetReenterCount + FALSE, // BaseSrvDebugProcess + TRUE, // BaseSrvCheckVDM + TRUE, // BaseSrvUpdateVDMEntry + TRUE, // BaseSrvGetNextVDMCommand + TRUE, // BaseSrvExitVDM + TRUE, // BaseSrvIsFirstVDM + TRUE, // BaseSrvGetVDMExitCode + TRUE, // BaseSrvSetReenterCount TRUE, // BaseSrvSetProcessShutdownParam TRUE, // BaseSrvGetProcessShutdownParam - // TRUE, // BaseSrvNlsSetUserInfo - // TRUE, // BaseSrvNlsSetMultipleUserInfo - // TRUE, // BaseSrvNlsCreateSection - // TRUE, // BaseSrvSetVDMCurDirs - // TRUE, // BaseSrvGetVDMCurDirs - // TRUE, // BaseSrvBatNotification - // TRUE, // BaseSrvRegisterWowExec + TRUE, // BaseSrvNlsSetUserInfo + TRUE, // BaseSrvNlsSetMultipleUserInfo + TRUE, // BaseSrvNlsCreateSection + TRUE, // BaseSrvSetVDMCurDirs + TRUE, // BaseSrvGetVDMCurDirs + TRUE, // BaseSrvBatNotification + TRUE, // BaseSrvRegisterWowExec TRUE, // BaseSrvSoundSentryNotification - // TRUE, // BaseSrvRefreshIniFileMapping + TRUE, // BaseSrvRefreshIniFileMapping TRUE, // BaseSrvDefineDosDevice - // FALSE, // BaseSrvSetTermsrvAppInstallMode - // FALSE, // BaseSrvNlsUpdateCacheCount - // FALSE, // BaseSrvSetTermsrvClientTimeZone - // FALSE, // BaseSrvSxsCreateActivationContext - // FALSE, // BaseSrvRegisterThread - // FALSE, // BaseSrvNlsGetUserInfo + FALSE, // BaseSrvSetTermsrvAppInstallMode + FALSE, // BaseSrvNlsUpdateCacheCount + FALSE, // BaseSrvSetTermsrvClientTimeZone + FALSE, // BaseSrvSxsCreateActivationContext + FALSE, // BaseSrvRegisterThread + FALSE, // BaseSrvNlsGetUserInfo }; PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = @@ -98,32 +98,32 @@ "BaseCreateThread", "BaseGetTempFile", "BaseExitProcess", - // "BaseDebugProcess", - // "BaseCheckVDM", - // "BaseUpdateVDMEntry", - // "BaseGetNextVDMCommand", - // "BaseExitVDM", - // "BaseIsFirstVDM", - // "BaseGetVDMExitCode", - // "BaseSetReenterCount", + "BaseDebugProcess", + "BaseCheckVDM", + "BaseUpdateVDMEntry", + "BaseGetNextVDMCommand", + "BaseExitVDM", + "BaseIsFirstVDM", + "BaseGetVDMExitCode", + "BaseSetReenterCount", "BaseSetProcessShutdownParam", "BaseGetProcessShutdownParam", - // "BaseNlsSetUserInfo", - // "BaseNlsSetMultipleUserInfo", - // "BaseNlsCreateSection", - // "BaseSetVDMCurDirs", - // "BaseGetVDMCurDirs", - // "BaseBatNotification", - // "BaseRegisterWowExec", + "BaseNlsSetUserInfo", + "BaseNlsSetMultipleUserInfo", + "BaseNlsCreateSection", + "BaseSetVDMCurDirs", + "BaseGetVDMCurDirs", + "BaseBatNotification", + "BaseRegisterWowExec", "BaseSoundSentryNotification", - // "BaseRefreshIniFileMapping", + "BaseRefreshIniFileMapping", "BaseDefineDosDevice", - // "BaseSetTermsrvAppInstallMode", - // "BaseNlsUpdateCacheCount", - // "BaseSetTermsrvClientTimeZone", - // "BaseSxsCreateActivationContext", - // "BaseRegisterThread", - // "BaseNlsGetUserInfo", + "BaseSetTermsrvAppInstallMode", + "BaseNlsUpdateCacheCount", + "BaseSetTermsrvClientTimeZone", + "BaseSxsCreateActivationContext", + "BaseRegisterThread", + "BaseNlsGetUserInfo", }; Added: 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 (added) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Thu Aug 29 17:00:10 2013 @@ -0,0 +1,49 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/vdm.c + * PURPOSE: Virtual DOS Machines (VDM) Support + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "basesrv.h" + +#define NDEBUG +#include <debug.h> + +/* PUBLIC SERVER APIS *********************************************************/ + +CSR_API(BaseSrvNlsSetUserInfo) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvNlsSetMultipleUserInfo) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvNlsCreateSection) + +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvNlsUpdateCacheCount) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvNlsGetUserInfo) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win/basesrv/nls.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Thu Aug 29 17:00:10 2013 @@ -14,6 +14,35 @@ #include <debug.h> /* PUBLIC SERVER APIS *********************************************************/ + +CSR_API(BaseSrvDebugProcess) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvRegisterThread) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} +CSR_API(BaseSrvSxsCreateActivationContext) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvSetTermsrvAppInstallMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvSetTermsrvClientTimeZone) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} CSR_API(BaseSrvGetTempFile) { 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] Thu Aug 29 17:00:10 2013 @@ -13,4 +13,78 @@ #define NDEBUG #include <debug.h> +/* PUBLIC SERVER APIS *********************************************************/ + +CSR_API(BaseSrvCheckVDM) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvUpdateVDMEntry) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvGetNextVDMCommand) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvExitVDM) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvIsFirstVDM) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvGetVDMExitCode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvSetReenterCount) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvSetVDMCurDirs) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvGetVDMCurDirs) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvBatNotification) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvRegisterWowExec) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvRefreshIniFileMapping) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */

1 0

[ion] 59871: [KERNEL32]: Fix a bug in QueryActCtx
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 16:42:14 2013 New Revision: 59871 URL: http://svn.reactos.org/svn/reactos?rev=59871&view=rev Log: [KERNEL32]: Fix a bug in QueryActCtx Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 16:42:14 2013 @@ -336,6 +336,7 @@ BaseSetLastNTError(STATUS_INVALID_PARAMETER_3); return FALSE; } + break; default: @@ -373,7 +374,7 @@ } /* These 3 flags are mutually exclusive -- only one should be present */ - switch (dwFlags & (QUERY_ACTCTX_FLAG_VALID & ~ QUERY_ACTCTX_FLAG_NO_ADDREF)) + switch (dwFlags & (QUERY_ACTCTX_FLAG_VALID & ~QUERY_ACTCTX_FLAG_NO_ADDREF)) { /* Convert into native format */ case QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX: @@ -401,6 +402,10 @@ } /* Now call the native API */ + DPRINT1("SXS: %s() Calling Native API with Native Flags %lx for Win32 Flags %lx\n", + __FUNCTION__, + NativeFlags, + dwFlags); Status = RtlQueryInformationActivationContext(NativeFlags, hActCtx, pvSubInstance,

1 0

[hbelusca] 59870: [KERNEL32] Use GetSystemDirectoryW for building the path to console.dll
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: hbelusca Date: Thu Aug 29 14:31:06 2013 New Revision: 59870 URL: http://svn.reactos.org/svn/reactos?rev=59870&view=rev Log: [KERNEL32] Use GetSystemDirectoryW for building the path to console.dll Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Thu Aug 29 14:31:06 2013 @@ -64,8 +64,8 @@ { WCHAR szBuffer[MAX_PATH]; - GetWindowsDirectoryW(szBuffer, MAX_PATH); - wcscat(szBuffer, L"\\system32\\console.dll"); + GetSystemDirectoryW(szBuffer, MAX_PATH); + wcscat(szBuffer, L"\\console.dll"); ConsoleLibrary = LoadLibraryW(szBuffer); if (ConsoleLibrary == NULL)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs