Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-28 21:49:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]: One last fix to CONSRV_API_CONNECTINFO. We now have compatibility with Windows and kernel32 is much much happier.

Browse source 
[CONSRV]: Implement Case11 of BaseSrvNlsCreateSection, but we seem to be getting bogus locale IDs.

svn path=/trunk/; revision=59916
This commit is contained in:
Alex Ionescu 2013-08-31 08:30:00 +00:00
parent aa796920ad
commit 0a79700b0d
3 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/reactos/subsys/win/conmsg.h
View file

@ -164,7 +164,7 @@ typedef struct _CONSOLE_START_INFO
DWORD dwHotKey; DWORD dwHotKey;
DWORD dwStartupFlags; DWORD dwStartupFlags;
CONSOLE_PROPERTIES; CONSOLE_PROPERTIES;
BOOL ConsoleNeeded; // Used for GUI apps only. BOOLEAN ConsoleNeeded; // Used for GUI apps only.
LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE CtrlDispatcher;
LPTHREAD_START_ROUTINE ImeDispatcher; LPTHREAD_START_ROUTINE ImeDispatcher;
LPTHREAD_START_ROUTINE PropDispatcher; LPTHREAD_START_ROUTINE PropDispatcher;

4
reactos/subsystems/win/basesrv/basesrv.h
View file

@ -43,8 +43,8 @@ typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage,
typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage,
UINT Base, UINT Base,
ULONG Unknown, ULONG Unknown,
LPSTR BaseName, LPWSTR BaseName,
LPSTR Result, LPWSTR Result,
ULONG ResultSize ULONG ResultSize
); );

32
reactos/subsystems/win/basesrv/nls.c
View file

@ -151,6 +151,8 @@ CSR_API(BaseSrvNlsCreateSection)
PWCHAR NlsFileName; PWCHAR NlsFileName;
UCHAR SecurityDescriptor[52]; UCHAR SecurityDescriptor[52];
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
WCHAR FileNameBuffer[32];
WCHAR NlsSectionNameBuffer[32];
PBASE_NLS_CREATE_SECTION NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsCreateSection; PBASE_NLS_CREATE_SECTION NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsCreateSection;
/* Load kernel32 first and import the NLS routines */ /* Load kernel32 first and import the NLS routines */
@ -211,8 +213,34 @@ CSR_API(BaseSrvNlsCreateSection)
DPRINT1("This type not yet supported\n"); DPRINT1("This type not yet supported\n");
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
case 11: case 11:
DPRINT1("This type not yet supported\n"); /* Get the filename for this locale */
return STATUS_NOT_IMPLEMENTED; if (!pGetCPFileNameFromRegistry(NlsMsg->LocaleId,
FileNameBuffer,
RTL_NUMBER_OF(FileNameBuffer)))
{
DPRINT1("File name query failed\n");
return STATUS_INVALID_PARAMETER;
}
/* Get the name of the section for this locale */
DPRINT1("File name: %S\n", FileNameBuffer);
Status = pGetNlsSectionName(NlsMsg->LocaleId,
10,
0,
L"\\NLS\\NlsSectionCP",
NlsSectionNameBuffer,
RTL_NUMBER_OF(NlsSectionNameBuffer));
if (!NT_SUCCESS(Status))
{
DPRINT1("Section name query failed: %lx\n", Status);
return Status;
}
/* Setup the name and go open it */
NlsFileName = FileNameBuffer;
DPRINT1("Section name: %S\n", NlsSectionNameBuffer);
RtlInitUnicodeString(&NlsSectionName, NlsSectionNameBuffer);
break;
case 12: case 12:
RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionGeo"); RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionGeo");
NlsFileName = L"geo.nls"; NlsFileName = L"geo.nls";