Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 58427: [LSASRV] - Get all procedure addresses of the loaded authentication packages and keep them in the authentication package entry. - Implement parts of the lda dispatch table (allocate ...
by ekohl＠svn.reactos.org 04 Mar '13

04 Mar '13

Author: ekohl Date: Mon Mar 4 21:32:44 2013 New Revision: 58427 URL: http://svn.reactos.org/svn/reactos?rev=58427&view=rev Log: [LSASRV] - Get all procedure addresses of the loaded authentication packages and keep them in the authentication package entry. - Implement parts of the lda dispatch table (allocate heap and free heap) and pass the table to LsaApInitializePackage call. - Implement authentication package lookup by name. [MSV1_0] - Store the dispatch table entries passed to the LsaApInitializePackage call and use them to allocate a STRING to return the package name. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -13,29 +13,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - -typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PVOID /*PLSA_DISPATCH_TABLE*/, +typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); +typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); + +typedef struct LSA_DISPATCH_TABLE +{ + PVOID /*PLSA_CREATE_LOGON_SESSION */ CreateLogonSession; + PVOID /*PLSA_DELETE_LOGON_SESSION */ DeleteLogonSession; + PVOID /*PLSA_ADD_CREDENTIAL */ AddCredential; + PVOID /*PLSA_GET_CREDENTIALS */ GetCredentials; + PVOID /*PLSA_DELETE_CREDENTIAL */ DeleteCredential; + PLSA_ALLOCATE_LSA_HEAP AllocateLsaHeap; + PLSA_FREE_LSA_HEAP FreeLsaHeap; + PVOID /*PLSA_ALLOCATE_CLIENT_BUFFER */ AllocateClientBuffer; + PVOID /*PLSA_FREE_CLIENT_BUFFER */ FreeClientBuffer; + PVOID /*PLSA_COPY_TO_CLIENT_BUFFER */ CopyToClientBuffer; + PVOID /*PLSA_COPY_FROM_CLIENT_BUFFER */ CopyFromClientBuffer; +} LSA_DISPATCH_TABLE, *PLSA_DISPATCH_TABLE; + + +typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, + PVOID *, PULONG, PNTSTATUS); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, + PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PVOID/*PLSA_CLIENT_REQUEST*/, + PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); +typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PVOID /*PLSA_CLIENT_REQUEST*/, + SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, + PVOID /*PLSA_TOKEN_INFORMATION_TYPE*/, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, + PUNICODE_STRING *, PVOID /*PSECPKG_PRIMARY_CRED*/, PVOID /*PSECPKG_SUPPLEMENTAL_CRED_ARRAY **/); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX)(PVOID /*PLSA_CLIENT_REQUEST*/, + SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, + PVOID /*PLSA_TOKEN_INFORMATION_TYPE*/, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, + PUNICODE_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, + DWORD, DWORD, PHANDLE); typedef struct _AUTH_PACKAGE { LIST_ENTRY Entry; PSTRING Name; + ULONG Id; PVOID ModuleHandle; PLSA_AP_INITIALIZE_PACKAGE LsaApInitializePackage; -// PLSA_AP_CALL_PACKAGE LsaApCallPackage; -// PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; -// PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; -// PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; -// PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; -// PLSA_AP_LOGON_USER LsaApLogonUser; + PLSA_AP_CALL_PACKAGE LsaApCallPackage; + PLSA_AP_CALL_PACKAGE_PASSTHROUGH LsaApCallPackagePassthrough; + PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; + PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; + PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; + PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; + PLSA_AP_LOGON_USER LsaApLogonUser; } AUTH_PACKAGE, *PAUTH_PACKAGE; /* GLOBALS *****************************************************************/ static LIST_ENTRY PackageListHead; static ULONG PackageId; +static LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ @@ -90,8 +128,80 @@ goto done; } + RtlInitAnsiString(&ProcName, "LsaApCallPackage"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackage); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApCallPackagePassthrough"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackagePassthrough); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApCallPackageUntrusted"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackageUntrusted); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApLogonTerminated"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonTerminated); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApLogonUserEx2"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUserEx2); + if (!NT_SUCCESS(Status)) + { + RtlInitAnsiString(&ProcName, "LsaApLogonUserEx"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUserEx); + if (!NT_SUCCESS(Status)) + { + RtlInitAnsiString(&ProcName, "LsaApLogonUser"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUser); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + } + + /* Initialize the current package */ Status = Package->LsaApInitializePackage(*Id, - NULL, + &DispatchTable, NULL, NULL, &Package->Name); @@ -101,6 +211,9 @@ goto done; } + TRACE("Package Name: %s\n", Package->Name->Buffer); + + Package->Id = *Id; *Id++; InsertTailList(&PackageListHead, &Package->Entry); @@ -113,11 +226,36 @@ if (Package->ModuleHandle != NULL) LdrUnloadDll(Package->ModuleHandle); + if (Package->Name != NULL) + { + if (Package->Name->Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Package->Name->Buffer); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Package->Name); + } + RtlFreeHeap(RtlGetProcessHeap(), 0, Package); } } return Status; +} + + +static +PVOID +NTAPI +LsapAllocateHeap(ULONG Size) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Size); +} + +static +VOID +NTAPI +LsapFreeHeap(PVOID Ptr) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, Ptr); } @@ -132,6 +270,19 @@ InitializeListHead(&PackageListHead); PackageId = 0; + + /* Initialize the dispatch table */ + DispatchTable.CreateLogonSession = NULL; + DispatchTable.DeleteLogonSession = NULL; + DispatchTable.AddCredential = NULL; + DispatchTable.GetCredentials = NULL; + DispatchTable.DeleteCredential = NULL; + DispatchTable.AllocateLsaHeap = &LsapAllocateHeap; + DispatchTable.FreeLsaHeap = &LsapFreeHeap; + DispatchTable.AllocateClientBuffer = NULL; + DispatchTable.FreeClientBuffer = NULL; + DispatchTable.CopyToClientBuffer = NULL; + DispatchTable.CopyFromClientBuffer = NULL; /* Add registered authentication packages */ Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, @@ -144,4 +295,30 @@ return STATUS_SUCCESS; } + +NTSTATUS +LsapLookupAuthenticationPackageByName(IN PSTRING PackageName, + OUT PULONG PackageId) +{ + PLIST_ENTRY ListEntry; + PAUTH_PACKAGE Package; + + ListEntry = PackageListHead.Flink; + while (ListEntry != &PackageListHead) + { + Package = CONTAINING_RECORD(ListEntry, AUTH_PACKAGE, Entry); + + if ((PackageName->Length == Package->Name->Length) && + (_strnicmp(PackageName->Buffer, Package->Name->Buffer, Package->Name->Length) == 0)) + { + *PackageId = Package->Id; + return STATUS_SUCCESS; + } + + ListEntry = ListEntry->Flink; + } + + return STATUS_NO_SUCH_PACKAGE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -61,6 +61,9 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { + PVOID LocalAuthInfo = NULL; + NTSTATUS Status = STATUS_SUCCESS; + TRACE("(%p %p)\n", RequestMsg, LogonContext); TRACE("LogonType: %lu\n", RequestMsg->LogonUser.Request.LogonType); @@ -68,6 +71,48 @@ TRACE("AuthenticationInformation: %p\n", RequestMsg->LogonUser.Request.AuthenticationInformation); TRACE("AuthenticationInformationLength: %lu\n", RequestMsg->LogonUser.Request.AuthenticationInformationLength); + LocalAuthInfo = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RequestMsg->LogonUser.Request.AuthenticationInformationLength); + if (LocalAuthInfo == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Read the authentication info from the callers adress space */ + Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, + RequestMsg->LogonUser.Request.AuthenticationInformation, + LocalAuthInfo, + RequestMsg->LogonUser.Request.AuthenticationInformationLength, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + + if (RequestMsg->LogonUser.Request.LogonType == Interactive || + RequestMsg->LogonUser.Request.LogonType == Batch || + RequestMsg->LogonUser.Request.LogonType == Service) + { + PMSV1_0_INTERACTIVE_LOGON LogonInfo; + ULONG_PTR PtrOffset; + + LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)LocalAuthInfo; + + /* Fix-up pointers in the authentication info */ + PtrOffset = (ULONG_PTR)LocalAuthInfo - (ULONG_PTR)RequestMsg->LogonUser.Request.AuthenticationInformation; + + LogonInfo->LogonDomainName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->LogonDomainName.Buffer + PtrOffset); + LogonInfo->UserName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->UserName.Buffer + PtrOffset); + LogonInfo->Password.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->Password.Buffer + PtrOffset); + + TRACE("Domain: %S\n", LogonInfo->LogonDomainName.Buffer); + TRACE("User: %S\n", LogonInfo->UserName.Buffer); + TRACE("Password: %S\n", LogonInfo->Password.Buffer); + } + else + { + FIXME("LogonType %lu is not supported yet!\n", RequestMsg->LogonUser.Request.LogonType); + } @@ -78,7 +123,11 @@ // QUOTA_LIMITS Quotas; RequestMsg->LogonUser.Reply.SubStatus = STATUS_SUCCESS; - return STATUS_SUCCESS; +done: + if (LocalAuthInfo != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalAuthInfo); + + return Status; } @@ -86,13 +135,25 @@ LsapLookupAuthenticationPackage(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { + STRING PackageName; + ULONG PackageId; + NTSTATUS Status; + TRACE("(%p %p)\n", RequestMsg, LogonContext); - TRACE("PackageName: %s\n", RequestMsg->LookupAuthenticationPackage.Request.PackageName); - RequestMsg->LookupAuthenticationPackage.Reply.Package = 0x12345678; - - return STATUS_SUCCESS; + PackageName.Length = RequestMsg->LookupAuthenticationPackage.Request.PackageNameLength; + PackageName.MaximumLength = LSASS_MAX_PACKAGE_NAME_LENGTH + 1; + PackageName.Buffer = RequestMsg->LookupAuthenticationPackage.Request.PackageName; + + Status = LsapLookupAuthenticationPackageByName(&PackageName, + &PackageId); + if (NT_SUCCESS(Status)) + { + RequestMsg->LookupAuthenticationPackage.Reply.Package = PackageId; + } + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -85,6 +85,10 @@ NTSTATUS LsapInitAuthPackages(VOID); +NTSTATUS +LsapLookupAuthenticationPackageByName(IN PSTRING PackageName, + OUT PULONG PackageId); + /* authport.c */ NTSTATUS StartAuthenticationPort(VOID); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -11,6 +11,11 @@ #include "msv1_0.h" WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + + +/* GLOBALS *****************************************************************/ + +LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ @@ -80,10 +85,35 @@ IN PLSA_STRING Confidentiality OPTIONAL, OUT PLSA_STRING *AuthenticationPackageName) { + PANSI_STRING NameString; + PCHAR NameBuffer; + TRACE("(%lu %p %p %p %p)\n", AuthenticationPackageId, LsaDispatchTable, Database, Confidentiality, AuthenticationPackageName); + /* Get the dispatch table entries */ + DispatchTable.AllocateLsaHeap = LsaDispatchTable->AllocateLsaHeap; + DispatchTable.FreeLsaHeap = LsaDispatchTable->FreeLsaHeap; + + + /* Return the package name */ + NameString = DispatchTable.AllocateLsaHeap(sizeof(LSA_STRING)); + if (NameString == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + NameBuffer = DispatchTable.AllocateLsaHeap(sizeof(MSV1_0_PACKAGE_NAME)); + if (NameBuffer == NULL) + { + DispatchTable.FreeLsaHeap(NameString); + return STATUS_INSUFFICIENT_RESOURCES; + } + + strcpy(NameBuffer, MSV1_0_PACKAGE_NAME); + + RtlInitAnsiString(NameString, NameBuffer); + + *AuthenticationPackageName = (PLSA_STRING)NameString; return STATUS_SUCCESS; }

1 0

[akhaldi] 58426: [CRT] * Annotate assert.h.
by akhaldi＠svn.reactos.org 04 Mar '13

04 Mar '13

Author: akhaldi Date: Mon Mar 4 21:24:47 2013 New Revision: 58426 URL: http://svn.reactos.org/svn/reactos?rev=58426&view=rev Log: [CRT] * Annotate assert.h. Modified: trunk/reactos/include/crt/assert.h Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Mon Mar 4 21:24:47 2013 @@ -20,8 +20,21 @@ extern "C" { #endif - _CRTIMP void __cdecl _assert(const char *_Message,const char *_File,unsigned _Line); - _CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); + _CRTIMP + void + __cdecl + _assert( + _In_z_ const char *_Message, + _In_z_ const char *_File, + _In_ unsigned _Line); + + _CRTIMP + void + __cdecl + _wassert( + _In_z_ const wchar_t *_Message, + _In_z_ const wchar_t *_File, + _In_ unsigned _Line); #ifdef __cplusplus }

1 0

[akhaldi] 58425: [SAL] * Add _Deref_post_opt_valid_, _Deref_pre_opt_valid_, _Deref_pre_z_, _Deref_prepost_opt_valid_, _Deref_prepost_z_, _Out_writes_all_ and _Out_writes_all_opt_ annotations.
by akhaldi＠svn.reactos.org 04 Mar '13

04 Mar '13

Author: akhaldi Date: Mon Mar 4 16:32:18 2013 New Revision: 58425 URL: http://svn.reactos.org/svn/reactos?rev=58425&view=rev Log: [SAL] * Add _Deref_post_opt_valid_, _Deref_pre_opt_valid_, _Deref_pre_z_, _Deref_prepost_opt_valid_, _Deref_prepost_z_, _Out_writes_all_ and _Out_writes_all_opt_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Mon Mar 4 16:32:18 2013 @@ -475,7 +475,7 @@ //#define _Deref_post_opt_count_(size) //#define _Deref_post_opt_count_c_(size) //#define _Deref_post_opt_count_x_(size) -//#define _Deref_post_opt_valid_ +#define _Deref_post_opt_valid_ _SAL11_NAME(_Deref_post_opt_valid_) _Group_([SA_Post(Deref=1,Null=SA_Maybe,Notref=1)] [SA_Post(Valid=SA_Yes)]) //#define _Deref_post_opt_valid_bytecap_(size) //#define _Deref_post_opt_valid_bytecap_c_(size) //#define _Deref_post_opt_valid_bytecap_x_(size) @@ -531,7 +531,7 @@ //#define _Deref_pre_opt_count_(size) //#define _Deref_pre_opt_count_c_(size) //#define _Deref_pre_opt_count_x_(size) -//#define _Deref_pre_opt_valid_ +#define _Deref_pre_opt_valid_ _SAL11_NAME(_Deref_pre_opt_valid_) _Group_([SA_Pre(Deref=1,Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)]) //#define _Deref_pre_opt_valid_bytecap_(size) //#define _Deref_pre_opt_valid_bytecap_c_(size) //#define _Deref_pre_opt_valid_bytecap_x_(size) @@ -554,7 +554,7 @@ //#define _Deref_pre_valid_cap_c_(size) //#define _Deref_pre_valid_cap_x_(size) //#define _Deref_pre_writeonly_ -//#define _Deref_pre_z_ +#define _Deref_pre_z_ _SAL11_NAME(_Deref_pre_z_) _Group_([SA_Pre(Deref=1,Null=SA_No,Notref=1)] [SA_Pre(Deref=1,NullTerminated=SA_Yes)] [SA_Pre(Valid=SA_Yes)]) //#define _Deref_pre_z_bytecap_(size) //#define _Deref_pre_z_bytecap_c_(size) //#define _Deref_pre_z_bytecap_x_(size) @@ -577,7 +577,7 @@ //#define _Deref_prepost_opt_cap_x_(size) //#define _Deref_prepost_opt_count_(size) //#define _Deref_prepost_opt_count_x_(size) -//#define _Deref_prepost_opt_valid_ +#define _Deref_prepost_opt_valid_ _SAL11_NAME(_Deref_prepost_opt_valid_) _Group_(_Deref_pre_opt_valid_ _Deref_post_opt_valid_) //#define _Deref_prepost_opt_valid_bytecap_(size) //#define _Deref_prepost_opt_valid_bytecap_x_(size) //#define _Deref_prepost_opt_valid_cap_(size) @@ -590,7 +590,7 @@ //#define _Deref_prepost_valid_bytecap_x_(size) //#define _Deref_prepost_valid_cap_(size) //#define _Deref_prepost_valid_cap_x_(size) -//#define _Deref_prepost_z_ +#define _Deref_prepost_z_ _SAL11_NAME(_Deref_prepost_z_) _Group_(_Deref_pre_z_ _Deref_post_z_) //#define _Deref_prepost_z_bytecap_(size) //#define _Deref_prepost_z_cap_(size) //#define _Deref_ret_bound_ @@ -777,8 +777,8 @@ //#define _Out_ptrdiff_cap_(size) #define _Out_range_(lb,ub) _SAL2_NAME(_Out_range_) _Group_(_Post_ _SA_annotes2(SAL_range, lb, ub)) #define _Out_writes_(size) _SAL2_NAME(_Out_writes_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)]) -//#define _Out_writes_all_(size) -//#define _Out_writes_all_opt_(size) +#define _Out_writes_all_(size) _SAL2_NAME(_Out_writes_all_) _Group_(_Out_writes_to_(_Old_(size), _Old_(size))) +#define _Out_writes_all_opt_(size) _SAL2_NAME(_Out_writes_all_opt_) _Group_(_Out_writes_to_opt_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_(size) _SAL2_NAME(_Out_writes_bytes_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_all_(size) _SAL2_NAME(_Out_writes_bytes_all_) _Group_(_Out_writes_bytes_to_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_all_opt_(size) _SAL2_NAME(_Out_writes_bytes_all_opt_) _Group_(_Out_writes_bytes_to_opt_(_Old_(size), _Old_(size)))

1 0

[spetreolle] 58424: [TRANSLATION] Erdem Ersoy : - Fix Turkish translation of solitaire and winmine. - Fix typos of Turkish spider resource file and Ukrainian winmine resource file. CORE-6991 #resol...
by spetreolle＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: spetreolle Date: Sun Mar 3 23:24:55 2013 New Revision: 58424 URL: http://svn.reactos.org/svn/reactos?rev=58424&view=rev Log: [TRANSLATION] Erdem Ersoy : - Fix Turkish translation of solitaire and winmine. - Fix typos of Turkish spider resource file and Ukrainian winmine resource file. CORE-6991 #resolve #comment Committed in r58424, thanks. Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -4,7 +4,7 @@ * FILE: base/applications/games/solitaire/lang/tr-TR.rc * PURPOSE: Turkish Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - * TRANSLATOR: Erdem ERSOY (eersoy93) + * TRANSLATOR: Erdem Ersoy (eersoy93) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -18,10 +18,10 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "KaÄÄ±tlar", -1, 7, 7, 90, 40 - AUTORADIOBUTTON "&Tekli Ã§ekme", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&ÃÃ§lÃ¼ Ã§ekme", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + AUTORADIOBUTTON "&Tekli Ã§ek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&ÃÃ§lÃ¼ Ã§ek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - AUTOCHECKBOX "&ZamanÄ± gÃ¶ster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&SÃ¼reyi gÃ¶ster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED AUTOCHECKBOX "&Durum Ã§ubuÄu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 35, 97, 50, 14 Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -3,7 +3,7 @@ * LICENSE: See COPYING in top level directory * FILE: base/applications/games/spider/lang/tr-TR.rc * PURPOSE: Turkish Language File for Spider Solitaire - * TRANSLATOR: Erdem ERSOY (eersoy93) + * TRANSLATOR: Erdem Ersoy (eersoy93) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -2,7 +2,8 @@ * WineMine * Turkish Language Support * - * Copyright 2006 Fatih AÃ¾Ã½cÃ½ + * Copyright 2006 Fatih AÅÄ±cÄ± + * Copyright 2013 Erdem Ersoy (eersoy93) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,40 +23,40 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_APPNAME, "Wine MayÃ½n TarlasÃ½" + IDS_APPNAME, "Wine MayÄ±n TarlasÄ±" IDS_NOBODY, "HiÃ§ kimse" - IDS_ABOUT, "Telif hakkÃ½ 2000, Joshua Thielen" + IDS_ABOUT, "Telif hakkÄ±: Joshua Thielen, 2000" END MENU_WINEMINE MENU BEGIN POPUP "&SeÃ§enekler" BEGIN - MENUITEM "&Yeni\tF2", IDM_NEW + MENUITEM "&Yeni\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&Soru ÃÃ¾areti", IDM_MARKQ + MENUITEM "&Soru Ä°mi", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "&Acemi", IDM_BEGINNER - MENUITEM "&GeliÃ¾miÃ¾", IDM_ADVANCED - MENUITEM "&Uzman", IDM_EXPERT - MENUITEM "&Ãzel", IDM_CUSTOM + MENUITEM "&BaÅlangÄ±Ã§", IDM_BEGINNER + MENUITEM "&Orta", IDM_ADVANCED + MENUITEM "&Ä°leri", IDM_EXPERT + MENUITEM "&Ãzel", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&ÃÃ½kÃ½Ã¾\tAlt+X", IDM_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tAlt+X", IDM_EXIT END POPUP "&Bilgi" BEGIN - MENUITEM "&En KÃ½sa SÃ¼reler", IDM_TIMES - MENUITEM "&HakkÃ½nda", IDM_ABOUT + MENUITEM "&En KÄ±sa SÃ¼reler", IDM_TIMES + MENUITEM "&HakkÄ±nda", IDM_ABOUT END END DLG_TIMES DIALOGEX 0, 0, 160, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "En KÃ½sa SÃ¼reler" +CAPTION "En KÄ±sa SÃ¼reler" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "En KÃ½sa SÃ¼reler", -1, 10, 10, 140, 45 - LTEXT "Acemi", -1, 20, 20, 40, 8 - LTEXT "GeliÃ¾miÃ¾", -1, 20, 30, 40, 8 - LTEXT "Uzman", -1, 20, 40, 40, 8 + GROUPBOX "En KÄ±sa SÃ¼reler", -1, 10, 10, 140, 45 + LTEXT "BaÅlangÄ±Ã§", -1, 20, 20, 40, 8 + LTEXT "Orta", -1, 20, 30, 40, 8 + LTEXT "Ä°leri", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -70,9 +71,9 @@ CAPTION "Tebrikler!" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "LÃ¼tfen adÃ½nÃ½zÃ½ girin", -1, 10, 10, 150, 10 + LTEXT "LÃ¼tfen adÄ±nÄ±zÄ± giriniz:", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15 + DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15 END DLG_CUSTOM DIALOGEX 0, 0, 100, 100 @@ -80,12 +81,12 @@ CAPTION "Ãzel Oyun" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "SatÃ½rlar", -1, 5, 5, 30, 10 + LTEXT "SatÄ±rlar", -1, 5, 5, 30, 10 LTEXT "SÃ¼tunlar", -1, 5, 35, 30, 10 - LTEXT "MayÃ½nlar", -1, 5, 65, 30, 10 + LTEXT "MayÄ±nlar", -1, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Tamam", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Ãptal", IDCANCEL, 40, 50, 50, 15 + DEFPUSHBUTTON "Tamam", IDOK, 40, 30, 50, 15 + PUSHBUTTON "VazgeÃ§", IDCANCEL, 40, 50, 50, 15 END Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -1,4 +1,3 @@ -/* /* * WineMine * Ukrainian Language Support

1 0

[akhaldi] 58423: [CRT] * Annotate stdlib.h.
by akhaldi＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: akhaldi Date: Sun Mar 3 22:28:47 2013 New Revision: 58423 URL: http://svn.reactos.org/svn/reactos?rev=58423&view=rev Log: [CRT] * Annotate stdlib.h. Modified: trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Mar 3 22:28:47 2013 @@ -25,6 +25,10 @@ #else #define NULL ((void *)0) #endif +#endif + +#ifndef MB_LEN_MAX +#define MB_LEN_MAX 5 #endif #define EXIT_SUCCESS 0 @@ -137,8 +141,8 @@ #include <errno.h> _CRTIMP unsigned long *__cdecl __doserrno(void); #define _doserrno (*__doserrno()) - errno_t __cdecl _set_doserrno(unsigned long _Value); - errno_t __cdecl _get_doserrno(unsigned long *_Value); + errno_t __cdecl _set_doserrno(_In_ unsigned long _Value); + errno_t __cdecl _get_doserrno(_Out_ unsigned long *_Value); _CRTIMP extern char *_sys_errlist[]; _CRTIMP extern int _sys_nerr; @@ -180,10 +184,10 @@ _CRTIMP extern wchar_t *_wpgmptr; #endif /* !_M_CEE_PURE */ - _CRTIMP errno_t __cdecl _get_environ(char***); - _CRTIMP errno_t __cdecl _get_wenviron(wchar_t***); - _CRTIMP errno_t __cdecl _get_pgmptr(char **_Value); - _CRTIMP errno_t __cdecl _get_wpgmptr(wchar_t **_Value); + _CRTIMP errno_t __cdecl _get_environ(_Out_ char***); + _CRTIMP errno_t __cdecl _get_wenviron(_Out_ wchar_t***); + _CRTIMP errno_t __cdecl _get_pgmptr(_Deref_out_z_ char **_Value); + _CRTIMP errno_t __cdecl _get_wpgmptr(_Deref_out_z_ wchar_t **_Value); #ifdef _M_CEE_PURE _CRTIMP int* __cdecl __p__fmode(); @@ -191,8 +195,8 @@ #else _CRTIMP extern int _fmode; #endif /* !_M_CEE_PURE */ - _CRTIMP errno_t __cdecl _set_fmode(int _Mode); - _CRTIMP errno_t __cdecl _get_fmode(int *_PMode); + _CRTIMP errno_t __cdecl _set_fmode(_In_ int _Mode); + _CRTIMP errno_t __cdecl _get_fmode(_Out_ int *_PMode); #ifdef _M_CEE_PURE _CRTIMP unsigned int* __cdecl __p__osplatform(); @@ -213,11 +217,11 @@ _CRTIMP extern unsigned int _winminor; #endif /* !_M_CEE_PURE */ - errno_t __cdecl _get_osplatform(unsigned int *_Value); - errno_t __cdecl _get_osver(unsigned int *_Value); - errno_t __cdecl _get_winver(unsigned int *_Value); - errno_t __cdecl _get_winmajor(unsigned int *_Value); - errno_t __cdecl _get_winminor(unsigned int *_Value); + errno_t __cdecl _get_osplatform(_Out_ unsigned int *_Value); + errno_t __cdecl _get_osver(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winver(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winmajor(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winminor(_Out_ unsigned int *_Value); #ifndef _countof #ifndef __cplusplus @@ -233,8 +237,8 @@ #ifndef _CRT_TERMINATE_DEFINED #define _CRT_TERMINATE_DEFINED - __declspec(noreturn) void __cdecl exit(int _Code); - _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code); + __declspec(noreturn) void __cdecl exit(_In_ int _Code); + _CRTIMP __declspec(noreturn) void __cdecl _exit(_In_ int _Code); #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */ /* C99 function name */ __declspec(noreturn) void __cdecl _Exit(int); /* Declare to get noreturn attribute. */ @@ -251,212 +255,1080 @@ #endif #endif - _CRTIMP unsigned int __cdecl _set_abort_behavior(unsigned int _Flags,unsigned int _Mask); + _CRTIMP unsigned int __cdecl _set_abort_behavior(_In_ unsigned int _Flags, _In_ unsigned int _Mask); #ifndef _CRT_ABS_DEFINED #define _CRT_ABS_DEFINED - int __cdecl abs(int _X); - long __cdecl labs(long _X); + int __cdecl abs(_In_ int _X); + long __cdecl labs(_In_ long _X); #endif #if _INTEGRAL_MAX_BITS >= 64 __MINGW_EXTENSION __int64 __cdecl _abs64(__int64); #endif int __cdecl atexit(void (__cdecl *)(void)); + #ifndef _CRT_ATOF_DEFINED #define _CRT_ATOF_DEFINED - double __cdecl atof(const char *_String); - double __cdecl _atof_l(const char *_String,_locale_t _Locale); -#endif - int __cdecl atoi(const char *_Str); - _CRTIMP int __cdecl _atoi_l(const char *_Str,_locale_t _Locale); - long __cdecl atol(const char *_Str); - _CRTIMP long __cdecl _atol_l(const char *_Str,_locale_t _Locale); + + _Check_return_ + double + __cdecl + atof( + _In_z_ const char *_String); + + _Check_return_ + double + __cdecl + _atof_l( + _In_z_ const char *_String, + _In_opt_ _locale_t _Locale); + +#endif /* _CRT_ATOF_DEFINED */ + + _Check_return_ + int + __cdecl + atoi( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoi_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + long + __cdecl + atol( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + long + __cdecl + _atol_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + #ifndef _CRT_ALGO_DEFINED #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -#endif + + _Check_return_ + void* + __cdecl + bsearch( + _In_ const void *_Key, + _In_reads_bytes_(_NumOfElements * _SizeOfElements) const void *_Base, + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *)); + + void + __cdecl + qsort( + _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) void *_Base, + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *)); + +#endif /* _CRT_ALGO_DEFINED */ #if !defined(__GNUC__) && !defined(__clang__) - unsigned short __cdecl _byteswap_ushort(unsigned short _Short); - unsigned long __cdecl _byteswap_ulong (unsigned long _Long); + + _Check_return_ + unsigned short + __cdecl + _byteswap_ushort( + _In_ unsigned short _Short); + + _Check_return_ + unsigned long + __cdecl + _byteswap_ulong( + _In_ unsigned long _Long); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64); -#endif -#endif - - div_t __cdecl div(int _Numerator,int _Denominator); - char *__cdecl getenv(const char *_VarName); - _CRTIMP char *__cdecl _itoa(int _Value,char *_Dest,int _Radix); + _Check_return_ + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _byteswap_uint64( + _In_ unsigned __int64 _Int64); +#endif + +#endif /* !defined(__GNUC__) && !defined(__clang__) */ + + _Check_return_ + div_t + __cdecl + div( + _In_ int _Numerator, + _In_ int _Denominator); + + _Check_return_ + char* + __cdecl + getenv( + _In_z_ const char *_VarName); + + _CRTIMP + char* + __cdecl + _itoa( + _In_ int _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP char *__cdecl _i64toa(__int64 _Val,char *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP char *__cdecl _ui64toa(unsigned __int64 _Val,char *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _atoi64(const char *_String); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _atoi64_l(const char *_String,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _strtoi64(const char *_String,char **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _strtoi64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _strtoui64(const char *_String,char **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _strtoui64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); -#endif - ldiv_t __cdecl ldiv(long _Numerator,long _Denominator); - _CRTIMP char *__cdecl _ltoa(long _Value,char *_Dest,int _Radix); - int __cdecl mblen(const char *_Ch,size_t _MaxCount); - _CRTIMP int __cdecl _mblen_l(const char *_Ch,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbstrlen(const char *_Str); - _CRTIMP size_t __cdecl _mbstrlen_l(const char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbstrnlen(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbstrnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); - int __cdecl mbtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes); - _CRTIMP int __cdecl _mbtowc_l(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes,_locale_t _Locale); - size_t __cdecl mbstowcs(wchar_t *_Dest,const char *_Source,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbstowcs_l(wchar_t *_Dest,const char *_Source,size_t _MaxCount,_locale_t _Locale); - int __cdecl rand(void); - _CRTIMP int __cdecl _set_error_mode(int _Mode); - void __cdecl srand(unsigned int _Seed); - double __cdecl strtod(const char *_Str,char **_EndPtr); - float __cdecl strtof(const char *nptr, char **endptr); + + __MINGW_EXTENSION + _CRTIMP + char* + __cdecl + _i64toa( + _In_ __int64 _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + __MINGW_EXTENSION + _CRTIMP + char* + __cdecl + _ui64toa( + _In_ unsigned __int64 _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _atoi64( + _In_z_ const char *_String); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _atoi64_l( + _In_z_ const char *_String, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _strtoi64( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _strtoi64_l( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _strtoui64( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _strtoui64_l( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + + ldiv_t + __cdecl + ldiv( + _In_ long _Numerator, + _In_ long _Denominator); + + _CRTIMP + char* + __cdecl + _ltoa( + _In_ long _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + + _Check_return_ + int + __cdecl + mblen( + _In_reads_bytes_opt_(_MaxCount) _Pre_opt_z_ const char *_Ch, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mblen_l( + _In_reads_bytes_opt_(_MaxCount) _Pre_opt_z_ const char *_Ch, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrlen( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrlen_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Success_(return>0) + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrnlen( + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrnlen_l( + _In_z_ const char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + int + __cdecl + mbtowc( + _Pre_notnull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SrcSizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SrcSizeInBytes); + + _CRTIMP + int + __cdecl + _mbtowc_l( + _Pre_notnull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SrcSizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SrcSizeInBytes, + _In_opt_ _locale_t _Locale); + + size_t + __cdecl + mbstowcs( + _Out_writes_opt_z_(_MaxCount) wchar_t *_Dest, + _In_z_ const char *_Source, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _mbstowcs_l( + _Out_writes_opt_z_(_MaxCount) wchar_t *_Dest, + _In_z_ const char *_Source, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + rand(void); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _set_error_mode( + _In_ int _Mode); + + void + __cdecl + srand( + _In_ unsigned int _Seed); + + _Check_return_ + double + __cdecl + strtod( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr); + + float + __cdecl + strtof( + const char *nptr, + char **endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl strtof (const char * __restrict__, char ** __restrict__); long double __cdecl strtold(const char * __restrict__, char ** __restrict__); #endif /* __NO_ISOCEXT */ - _CRTIMP double __cdecl _strtod_l(const char *_Str,char **_EndPtr,_locale_t _Locale); - long __cdecl strtol(const char *_Str,char **_EndPtr,int _Radix); - _CRTIMP long __cdecl _strtol_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); - unsigned long __cdecl strtoul(const char *_Str,char **_EndPtr,int _Radix); - _CRTIMP unsigned long __cdecl _strtoul_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); + + _Check_return_ + _CRTIMP + double + __cdecl + _strtod_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_opt_ _locale_t _Locale); + + _Check_return_ + long + __cdecl + strtol( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + long + __cdecl + _strtol_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + unsigned long + __cdecl + strtoul( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + unsigned long + __cdecl + _strtoul_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + #ifndef _CRT_SYSTEM_DEFINED #define _CRT_SYSTEM_DEFINED - int __cdecl system(const char *_Command); -#endif - _CRTIMP char *__cdecl _ultoa(unsigned long _Value,char *_Dest,int _Radix); - int __cdecl wctomb(char *_MbCh,wchar_t _WCh); - _CRTIMP int __cdecl _wctomb_l(char *_MbCh,wchar_t _WCh,_locale_t _Locale); - size_t __cdecl wcstombs(char *_Dest,const wchar_t *_Source,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcstombs_l(char *_Dest,const wchar_t *_Source,size_t _MaxCount,_locale_t _Locale); + int + __cdecl + system( + _In_opt_z_ const char *_Command); +#endif + + _CRTIMP + char* + __cdecl + _ultoa( + _In_ unsigned long _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + + int + __cdecl + wctomb( + _Out_writes_opt_z_(MB_LEN_MAX) char *_MbCh, + _In_ wchar_t _WCh); + + _CRTIMP + int + __cdecl + _wctomb_l( + _Pre_maybenull_ _Post_z_ char *_MbCh, + _In_ wchar_t _WCh, + _In_opt_ _locale_t _Locale); + + size_t + __cdecl + wcstombs( + _Out_writes_opt_z_(_MaxCount) char *_Dest, + _In_z_ const wchar_t *_Source, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _wcstombs_l( + _Out_writes_opt_z_(_MaxCount) char *_Dest, + _In_z_ const wchar_t *_Source, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); #ifndef _CRT_ALLOCATION_DEFINED #define _CRT_ALLOCATION_DEFINED - void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements); - void __cdecl free(void *_Memory); - void *__cdecl malloc(size_t _Size); - void *__cdecl realloc(void *_Memory,size_t _NewSize); - _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NumOfElements * _SizeOfElements) + void* + __cdecl + calloc( + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements); + + void + __cdecl + free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + malloc( + _In_ size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + void* + __cdecl + realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size); + /* Make sure that X86intrin.h doesn't produce here collisions. */ #if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) #pragma push_macro("_aligned_free") #pragma push_macro("_aligned_malloc") #undef _aligned_free #undef _aligned_malloc - _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); + + _CRTIMP + void + __cdecl + _aligned_free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment); + #pragma pop_macro("_aligned_free") #pragma pop_macro("_aligned_malloc") #endif - _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); -#endif + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_offset_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + +#endif /* _CRT_ALLOCATION_DEFINED */ #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED - _CRTIMP wchar_t *__cdecl _itow(int _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ltow(long _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ultow(unsigned long _Value,wchar_t *_Dest,int _Radix); - double __cdecl wcstod(const wchar_t *_Str,wchar_t **_EndPtr); - float __cdecl wcstof(const wchar_t *nptr, wchar_t **endptr); + _CRTIMP + wchar_t* + __cdecl + _itow( + _In_ int _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ltow( + _In_ long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ultow( + _In_ unsigned long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _Check_return_ + double + __cdecl + wcstod( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr); + + float + __cdecl + wcstof( + const wchar_t *nptr, + wchar_t **endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__); long double __cdecl wcstold(const wchar_t * __restrict__, wchar_t ** __restrict__); #endif /* __NO_ISOCEXT */ - _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); - long __cdecl wcstol(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP long __cdecl _wcstol_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - unsigned long __cdecl wcstoul(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wgetenv(const wchar_t *_VarName); + + _Check_return_ + _CRTIMP + double + __cdecl + _wcstod_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_opt_ _locale_t _Locale); + + _Check_return_ + long + __cdecl + wcstol( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + long + __cdecl + _wcstol_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + unsigned long + __cdecl + wcstoul( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + unsigned long + __cdecl + _wcstoul_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wgetenv( + _In_z_ const wchar_t *_VarName); + #ifndef _CRT_WSYSTEM_DEFINED #define _CRT_WSYSTEM_DEFINED - _CRTIMP int __cdecl _wsystem(const wchar_t *_Command); -#endif - _CRTIMP double __cdecl _wtof(const wchar_t *_Str); - _CRTIMP double __cdecl _wtof_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _wtoi(const wchar_t *_Str); - _CRTIMP int __cdecl _wtoi_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP long __cdecl _wtol(const wchar_t *_Str); - _CRTIMP long __cdecl _wtol_l(const wchar_t *_Str,_locale_t _Locale); + _CRTIMP + int + __cdecl + _wsystem( + _In_opt_z_ const wchar_t *_Command); +#endif + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _i64tow(__int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _ui64tow(unsigned __int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64(const wchar_t *_Str); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64_l(const wchar_t *_Str,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *_Str ,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); -#endif -#endif + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _i64tow( + _In_ __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _ui64tow( + _In_ unsigned __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64( + _In_z_ const wchar_t *_Str); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#endif /* _WSTDLIB_DEFINED */ #ifndef _POSIX_ #define _CVTBUFSIZE (309+40) - _CRTIMP char *__cdecl _fullpath(char *_FullPath,const char *_Path,size_t _SizeInBytes); - _CRTIMP char *__cdecl _ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl _fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl _gcvt(double _Val,int _NumOfDigits,char *_DstBuf); - _CRTIMP int __cdecl _atodbl(_CRT_DOUBLE *_Result,char *_Str); - _CRTIMP int __cdecl _atoldbl(_LDOUBLE *_Result,char *_Str); - _CRTIMP int __cdecl _atoflt(_CRT_FLOAT *_Result,char *_Str); - _CRTIMP int __cdecl _atodbl_l(_CRT_DOUBLE *_Result,char *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _atoldbl_l(_LDOUBLE *_Result,char *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _atoflt_l(_CRT_FLOAT *_Result,char *_Str,_locale_t _Locale); - unsigned long __cdecl _lrotl(unsigned long _Val,int _Shift); - unsigned long __cdecl _lrotr(unsigned long _Val,int _Shift); - _CRTIMP void __cdecl _makepath(char *_Path,const char *_Drive,const char *_Dir,const char *_Filename,const char *_Ext); - _onexit_t __cdecl _onexit(_onexit_t _Func); + + _Check_return_ + _CRTIMP + char* + __cdecl + _fullpath( + _Out_writes_opt_z_(_SizeInBytes) char *_FullPath, + _In_z_ const char *_Path, + _In_ size_t _SizeInBytes); + + _Check_return_ + _CRTIMP + char* + __cdecl + _ecvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _Check_return_ + _CRTIMP + char* + __cdecl + _fcvt( + _In_ double _Val, + _In_ int _NumOfDec, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _CRTIMP + char* + __cdecl + _gcvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Pre_notnull_ _Post_z_ char *_DstBuf); + + _Check_return_ + _CRTIMP + int + __cdecl + _atodbl( + _Out_ _CRT_DOUBLE *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoldbl( + _Out_ _LDOUBLE *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoflt( + _Out_ _CRT_FLOAT *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atodbl_l( + _Out_ _CRT_DOUBLE *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoldbl_l( + _Out_ _LDOUBLE *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoflt_l( + _Out_ _CRT_FLOAT *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + unsigned long + __cdecl + _lrotl( + _In_ unsigned long _Val, + _In_ int _Shift); + + unsigned long + __cdecl + _lrotr( + _In_ unsigned long _Val, + _In_ int _Shift); + + _CRTIMP + void + __cdecl + _makepath( + _Pre_notnull_ _Post_z_ char *_Path, + _In_opt_z_ const char *_Drive, + _In_opt_z_ const char *_Dir, + _In_opt_z_ const char *_Filename, + _In_opt_z_ const char *_Ext); + + _onexit_t + __cdecl + _onexit( + _In_opt_ _onexit_t _Func); #ifndef _CRT_PERROR_DEFINED #define _CRT_PERROR_DEFINED - void __cdecl perror(const char *_ErrMsg); -#endif - _CRTIMP int __cdecl _putenv(const char *_EnvString); + void + __cdecl + perror( + _In_opt_z_ const char *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _putenv( + _In_z_ const char *_EnvString); + #if !defined(__GNUC__) && !defined(__clang__) - unsigned int __cdecl _rotl(unsigned int _Val,int _Shift); + + unsigned int + __cdecl + _rotl( + _In_ unsigned int _Val, + _In_ int _Shift); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val,int _Shift); -#endif - unsigned int __cdecl _rotr(unsigned int _Val,int _Shift); + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _rotl64( + _In_ unsigned __int64 _Val, + _In_ int _Shift); +#endif + + unsigned int + __cdecl + _rotr( + _In_ unsigned int _Val, + _In_ int _Shift); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _rotr64(unsigned __int64 _Val,int _Shift); -#endif -#endif - _CRTIMP void __cdecl _searchenv(const char *_Filename,const char *_EnvVar,char *_ResultPath); - _CRTIMP void __cdecl _splitpath(const char *_FullPath,char *_Drive,char *_Dir,char *_Filename,char *_Ext); - _CRTIMP void __cdecl _swab(char *_Buf1,char *_Buf2,int _SizeInBytes); + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _rotr64( + _In_ unsigned __int64 _Val, + _In_ int _Shift); +#endif + +#endif /* !defined(__GNUC__) && !defined(__clang__) */ + + _CRTIMP + void + __cdecl + _searchenv( + _In_z_ const char *_Filename, + _In_z_ const char *_EnvVar, + _Pre_notnull_ _Post_z_ char *_ResultPath); + + _CRTIMP + void + __cdecl + _splitpath( + _In_z_ const char *_FullPath, + _Pre_maybenull_ _Post_z_ char *_Drive, + _Pre_maybenull_ _Post_z_ char *_Dir, + _Pre_maybenull_ _Post_z_ char *_Filename, + _Pre_maybenull_ _Post_z_ char *_Ext); + + _CRTIMP + void + __cdecl + _swab( + _Inout_updates_(_SizeInBytes) _Post_readable_size_(_SizeInBytes) char *_Buf1, + _Inout_updates_(_SizeInBytes) _Post_readable_size_(_SizeInBytes) char *_Buf2, + int _SizeInBytes); #ifndef _WSTDLIBP_DEFINED #define _WSTDLIBP_DEFINED - _CRTIMP wchar_t *__cdecl _wfullpath(wchar_t *_FullPath,const wchar_t *_Path,size_t _SizeInWords); - _CRTIMP void __cdecl _wmakepath(wchar_t *_ResultPath,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wfullpath( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_FullPath, + _In_z_ const wchar_t *_Path, + _In_ size_t _SizeInWords); + + _CRTIMP + void + __cdecl + _wmakepath( + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath, + _In_opt_z_ const wchar_t *_Drive, + _In_opt_z_ const wchar_t *_Dir, + _In_opt_z_ const wchar_t *_Filename, + _In_opt_z_ const wchar_t *_Ext); + #ifndef _CRT_WPERROR_DEFINED #define _CRT_WPERROR_DEFINED - _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); -#endif - _CRTIMP int __cdecl _wputenv(const wchar_t *_EnvString); - _CRTIMP void __cdecl _wsearchenv(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath); - _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); -#endif - - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _beep(unsigned _Frequency,unsigned _Duration); + _CRTIMP + void + __cdecl + _wperror( + _In_opt_z_ const wchar_t *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _wputenv( + _In_z_ const wchar_t *_EnvString); + + _CRTIMP + void + __cdecl + _wsearchenv( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_EnvVar, + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath); + + _CRTIMP + void + __cdecl + _wsplitpath( + _In_z_ const wchar_t *_FullPath, + _Pre_maybenull_ _Post_z_ wchar_t *_Drive, + _Pre_maybenull_ _Post_z_ wchar_t *_Dir, + _Pre_maybenull_ _Post_z_ wchar_t *_Filename, + _Pre_maybenull_ _Post_z_ wchar_t *_Ext); + +#endif /* _WSTDLIBP_DEFINED */ + + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _beep( + _In_ unsigned _Frequency, + _In_ unsigned _Duration); + /* Not to be confused with _set_error_mode (int). */ - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode(int _Mode); - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep(unsigned long _Duration); -#endif - -#ifndef NO_OLDNAMES + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _seterrormode( + _In_ int _Mode); + + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _sleep( + _In_ unsigned long _Duration); + +#endif /* _POSIX_ */ + +#ifndef NO_OLDNAMES #ifndef _POSIX_ #if 0 #ifndef __cplusplus @@ -467,24 +1339,88 @@ #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif -#endif -#endif +#endif /* NOMINMAX */ +#endif /* __cplusplus */ #endif #define sys_errlist _sys_errlist #define sys_nerr _sys_nerr #define environ _environ - _CRTIMP char *__cdecl ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl gcvt(double _Val,int _NumOfDigits,char *_DstBuf); - _CRTIMP char *__cdecl itoa(int _Val,char *_DstBuf,int _Radix); - _CRTIMP char *__cdecl ltoa(long _Val,char *_DstBuf,int _Radix); - _CRTIMP int __cdecl putenv(const char *_EnvString); - _CRTIMP void __cdecl swab(char *_Buf1,char *_Buf2,int _SizeInBytes); - _CRTIMP char *__cdecl ultoa(unsigned long _Val,char *_Dstbuf,int _Radix); - onexit_t __cdecl onexit(onexit_t _Func); -#endif -#endif + + _Check_return_ + _CRTIMP + char* + __cdecl + ecvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _Check_return_ + _CRTIMP + char* + __cdecl + fcvt( + _In_ double _Val, + _In_ int _NumOfDec, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _CRTIMP + char* + __cdecl + gcvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Pre_notnull_ _Post_z_ char *_DstBuf); + + _CRTIMP + char* + __cdecl + itoa( + _In_ int _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _CRTIMP + char* + __cdecl + ltoa( + _In_ long _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + int + __cdecl + putenv( + _In_z_ const char *_EnvString); + + _CRTIMP + void + __cdecl + swab( + _Inout_updates_z_(_SizeInBytes) char *_Buf1, + _Inout_updates_z_(_SizeInBytes) char *_Buf2, + _In_ int _SizeInBytes); + + _CRTIMP + char* + __cdecl + ultoa( + _In_ unsigned long _Val, + _Pre_notnull_ _Post_z_ char *_Dstbuf, + _In_ int _Radix); + + onexit_t + __cdecl + onexit( + _In_opt_ onexit_t _Func); + +#endif /* _POSIX_ */ +#endif /* NO_OLDNAMES */ #if !defined __NO_ISOCEXT /* externs in static libmingwex.a */

1 0

[akhaldi] 58422: [SAL] * Add _Inout_opt_z_, _Inout_z_, _Out_writes_bytes_all_opt_, _Post_maybez_, _Prepost_opt_z_ and _Prepost_z_ annotations.
by akhaldi＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: akhaldi Date: Sun Mar 3 21:33:22 2013 New Revision: 58422 URL: http://svn.reactos.org/svn/reactos?rev=58422&view=rev Log: [SAL] * Add _Inout_opt_z_, _Inout_z_, _Out_writes_bytes_all_opt_, _Post_maybez_, _Prepost_opt_z_ and _Prepost_z_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sun Mar 3 21:33:22 2013 @@ -681,7 +681,7 @@ //#define _Inout_opt_count_c_(size) //#define _Inout_opt_count_x_(size) //#define _Inout_opt_ptrdiff_count_(size) -//#define _Inout_opt_z_ +#define _Inout_opt_z_ _SAL2_NAME(_Inout_opt_z_) _Group_(_Prepost_opt_z_) //#define _Inout_opt_z_bytecap_(size) //#define _Inout_opt_z_bytecap_c_(size) //#define _Inout_opt_z_bytecap_x_(size) @@ -707,7 +707,7 @@ //#define _Inout_updates_to_(size,count) //#define _Inout_updates_to_opt_(size,count) #define _Inout_updates_z_(size) _SAL2_NAME(_Inout_updates_z_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) -//#define _Inout_z_ +#define _Inout_z_ _SAL2_NAME(_Inout_z_) _Group_(_Prepost_z_) //#define _Inout_z_bytecap_(size) //#define _Inout_z_bytecap_c_(size) //#define _Inout_z_bytecap_x_(size) @@ -781,7 +781,7 @@ //#define _Out_writes_all_opt_(size) #define _Out_writes_bytes_(size) _SAL2_NAME(_Out_writes_bytes_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_all_(size) _SAL2_NAME(_Out_writes_bytes_all_) _Group_(_Out_writes_bytes_to_(_Old_(size), _Old_(size))) -//#define _Out_writes_bytes_all_opt_(size) +#define _Out_writes_bytes_all_opt_(size) _SAL2_NAME(_Out_writes_bytes_all_opt_) _Group_(_Out_writes_bytes_to_opt_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_opt_(size) _SAL2_NAME(_Out_writes_bytes_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_to_(size,count) _SAL2_NAME(_Out_writes_bytes_to_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count)) #define _Out_writes_bytes_to_opt_(size,count) _SAL2_NAME(_Out_writes_bytes_to_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count) ) @@ -867,7 +867,7 @@ #define _Post_equal_to_(expr) _SAL2_NAME(_Post_equal_to_) _Group_(_Out_range_(==,expr)) #define _Post_invalid_ _SAL2_NAME(_Post_invalid_) _Group_([SA_Post(Deref=1,Valid=SA_No)]) #define _Post_maybenull_ _SAL2_NAME(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) -//#define _Post_maybez_ +#define _Post_maybez_ _SAL11_NAME(_Post_maybez_) _Group_([SA_Post(NullTerminated=SA_Maybe)]) #define _Post_notnull_ _SAL2_NAME(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Post_null_ #define _Post_ptr_invalid_ _SAL2_NAME(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) @@ -973,9 +973,9 @@ //#define _Prepost_opt_count_c_(size) //#define _Prepost_opt_count_x_(size) #define _Prepost_opt_valid_ _SAL2_NAME(_Prepost_opt_valid_) _Group_(_Pre_opt_valid_ _Post_valid_) -//#define _Prepost_opt_z_ +#define _Prepost_opt_z_ _SAL11_NAME(_Prepost_opt_z_) _Group_(_Pre_opt_z_ _Post_z_) #define _Prepost_valid_ _SAL11_NAME(_Prepost_valid_) _Group_(_Pre_valid_ _Post_valid_) -//#define _Prepost_z_ +#define _Prepost_z_ _SAL2_NAME(_Prepost_z_) _Group_(_Pre_z_ _Post_z_) #define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ #define _Maybe_raises_SEH_exception_

1 0

[ekohl] 58421: [LSASRV] - Add authentication package loader code. - Load registered authentication packages before the rpc server is started.
by ekohl＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: ekohl Date: Sun Mar 3 19:43:33 2013 New Revision: 58421 URL: http://svn.reactos.org/svn/reactos?rev=58421&view=rev Log: [LSASRV] - Add authentication package loader code. - Load registered authentication packages before the rpc server is started. Added: trunk/reactos/dll/win32/lsasrv/authpackage.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -8,6 +8,7 @@ spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + authpackage.c authport.c database.c lookup.c Added: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c (added) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -1,0 +1,147 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/authpackage.c + * PURPOSE: Authenticaton package management routines + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + + +typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PVOID /*PLSA_DISPATCH_TABLE*/, + PLSA_STRING, PLSA_STRING, PLSA_STRING *); + +typedef struct _AUTH_PACKAGE +{ + LIST_ENTRY Entry; + PSTRING Name; + PVOID ModuleHandle; + + PLSA_AP_INITIALIZE_PACKAGE LsaApInitializePackage; +// PLSA_AP_CALL_PACKAGE LsaApCallPackage; +// PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; +// PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; +// PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; +// PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; +// PLSA_AP_LOGON_USER LsaApLogonUser; +} AUTH_PACKAGE, *PAUTH_PACKAGE; + +/* GLOBALS *****************************************************************/ + +static LIST_ENTRY PackageListHead; +static ULONG PackageId; + +/* FUNCTIONS ***************************************************************/ + +static +NTSTATUS +NTAPI +LsapAddAuthPackage(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PAUTH_PACKAGE Package = NULL; + UNICODE_STRING PackageName; + STRING ProcName; + PULONG Id; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsapAddAuthPackage()\n"); + + PackageName.Length = (USHORT)ValueLength - sizeof(WCHAR); + PackageName.MaximumLength = (USHORT)ValueLength; + PackageName.Buffer = ValueData; + + Id = (PULONG)Context; + + Package = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(AUTH_PACKAGE)); + if (Package == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = LdrLoadDll(NULL, + NULL, + &PackageName, + &Package->ModuleHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrLoadDll failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApInitializePackage"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApInitializePackage); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = Package->LsaApInitializePackage(*Id, + NULL, + NULL, + NULL, + &Package->Name); + if (!NT_SUCCESS(Status)) + { + TRACE("Package->LsaApInitializePackage() failed (Status 0x%08lx)\n", Status); + goto done; + } + + *Id++; + + InsertTailList(&PackageListHead, &Package->Entry); + +done: + if (!NT_SUCCESS(Status)) + { + if (Package != NULL) + { + if (Package->ModuleHandle != NULL) + LdrUnloadDll(Package->ModuleHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Package); + } + } + + return Status; +} + + +NTSTATUS +LsapInitAuthPackages(VOID) +{ + RTL_QUERY_REGISTRY_TABLE AuthPackageTable[] = { + {LsapAddAuthPackage, 0, L"Authentication Packages", NULL, REG_NONE, NULL, 0}, + {NULL, 0, NULL, NULL, REG_NONE, NULL, 0}}; + + NTSTATUS Status; + + InitializeListHead(&PackageListHead); + PackageId = 0; + + /* Add registered authentication packages */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"Lsa", + AuthPackageTable, + &PackageId, + NULL); + + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/authpackage.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/authpackage.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -20,6 +20,7 @@ { HANDLE hEvent; DWORD dwError; + NTSTATUS Status; TRACE("LsapInitLsa() called\n"); @@ -28,6 +29,22 @@ /* Initialize the LSA database */ LsapInitDatabase(); + + /* Initialize registered authentication packages */ + Status = LsapInitAuthPackages(); + if (!NT_SUCCESS(Status)) + { + ERR("LsapInitAuthPackages() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Start the authentication port thread */ + Status = StartAuthenticationPort(); + if (!NT_SUCCESS(Status)) + { + ERR("StartAuthenticationPort() failed (Status 0x%08lx)\n", Status); + return Status; + } /* Start the RPC server */ LsarStartRpcServer(); @@ -61,8 +78,6 @@ /* NOTE: Do not close the event handle!!!! */ - StartAuthenticationPort(); - return STATUS_SUCCESS; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -19,10 +19,12 @@ #include <ndk/kefuncs.h> #include <ndk/lpctypes.h> #include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> +#include <ndk/umfuncs.h> #include <ntsam.h> #include <ntlsa.h> @@ -79,6 +81,9 @@ extern PSID AccountDomainSid; extern UNICODE_STRING AccountDomainName; +/* authpackage.c */ +NTSTATUS +LsapInitAuthPackages(VOID); /* authport.c */ NTSTATUS

1 0

[ekohl] 58420: [MSV1_0] Add authentication package stub and add it to the registry.
by ekohl＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: ekohl Date: Sun Mar 3 19:11:22 2013 New Revision: 58420 URL: http://svn.reactos.org/svn/reactos?rev=58420&view=rev Log: [MSV1_0] Add authentication package stub and add it to the registry. Added: trunk/reactos/dll/win32/msv1_0/ (with props) trunk/reactos/dll/win32/msv1_0/CMakeLists.txt (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.c (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.h (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.rc (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.spec (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/cmake/baseaddress.cmake trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -768,6 +768,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","00010415",2,"214" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","0001041F",2,"440" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","00020408",2,"319" + +; Lsa +HKLM,"SYSTEM\CurrentControlSet\Control\Lsa","Authentication Packages",0x00010000, \ + "msv1_0" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -2,6 +2,7 @@ set(baseaddress_kernel32 0x77da0000) set(baseaddress_msvcrt 0x77d10000) set(baseaddress_advapi32 0x77c60000) +set(baseaddress_msv1_0 0x77c40000) set(baseaddress_gdi32 0x77bf0000) set(baseaddress_user32 0x77a60000) set(baseaddress_dhcpcsvc 0x77a10000) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -107,6 +107,7 @@ add_subdirectory(mssign32) add_subdirectory(mssip32) add_subdirectory(mstask) +add_subdirectory(msv1_0) add_subdirectory(msvcrt) add_subdirectory(msvcrt20) add_subdirectory(msvcrt40) Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 3 19:11:22 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,19 @@ + +#include_directories( +# ${CMAKE_CURRENT_BINARY_DIR}) + +spec2def(msv1_0.dll msv1_0.spec) + +list(APPEND SOURCE + msv1_0.c + msv1_0.rc + ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def) + +add_library(msv1_0 SHARED ${SOURCE}) +set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0) +target_link_libraries(msv1_0 wine ${PSEH_LIB}) +add_importlibs(msv1_0 kernel32 ntdll) +add_pch(msv1_0 msv1_0.h) +add_dependencies(msv1_0 psdk) +add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,126 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/msv1_0/msv1_0.c + * PURPOSE: Main file + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "msv1_0.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + + +/* FUNCTIONS ***************************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackagePassthrough(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackageUntrusted(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApInitializePackage(IN ULONG AuthenticationPackageId, + IN PLSA_DISPATCH_TABLE LsaDispatchTable, + IN PLSA_STRING Database OPTIONAL, + IN PLSA_STRING Confidentiality OPTIONAL, + OUT PLSA_STRING *AuthenticationPackageName) +{ + TRACE("(%lu %p %p %p %p)\n", + AuthenticationPackageId, LsaDispatchTable, Database, + Confidentiality, AuthenticationPackageName); + + + return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +VOID +NTAPI +LsaApLogonTerminated(IN PLUID LogonId) +{ + TRACE("()\n"); +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, + IN SECURITY_LOGON_TYPE LogonType, + IN PVOID AuthenticationInformation, + IN PVOID ClientAuthenticationBase, + IN ULONG AuthenticationInformationLength, + OUT PVOID *ProfileBuffer, + OUT PULONG ProfileBufferLength, + OUT PLUID LogonId, + OUT PNTSTATUS SubStatus, + OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, + OUT PVOID *TokenInformation, + OUT PLSA_UNICODE_STRING *AccountName, + OUT PLSA_UNICODE_STRING *AuthenticatingAuthority) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,33 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/msv1_0/msv1_0.h + * PURPOSE: Common header file + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> + +#include <sspi.h> +#include <ntsecapi.h> +#include <ntsecpkg.h> + +#include <wine/debug.h> + +/* EOF */ Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.rc… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.rc (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.rc [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Authentication Package\0" +#define REACTOS_STR_INTERNAL_NAME "msv1_0\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msv1_0.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.sp… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.spec (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.spec [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,18 @@ +@ stdcall LsaApCallPackage(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApCallPackagePassthrough(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApCallPackageUntrusted(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApInitializePackage(long ptr ptr ptr ptr) +@ stdcall LsaApLogonTerminated(ptr) +@ stdcall LsaApLogonUser(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub LsaApLogonUserEx +@ stub LsaApLogonUserEx2 +@ stub Msv1_0ExportSubAuthenticationRoutine +@ stub Msv1_0SubAuthenticationPresent +@ stub MsvGetLogonAttemptCount +@ stub MsvSamLogoff +@ stub MsvSamValidate +@ stub MsvValidateTarget +@ stub SpInitialize +@ stub SpInstanceInit +@ stub SpLsaModeInitiaize +@ stub SpUserModeInitiaize Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[hbelusca] 58419: [CONSOLE.DLL] Use a new unique sample text for fonts and colors overview. [CONSRV] Remove few DPRINTs.
by hbelusca＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: hbelusca Date: Sun Mar 3 17:39:44 2013 New Revision: 58419 URL: http://svn.reactos.org/svn/reactos?rev=58419&view=rev Log: [CONSOLE.DLL] Use a new unique sample text for fonts and colors overview. [CONSRV] Remove few DPRINTs. Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/cpl/console/resource.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/settings.c Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "ÐÐ¾Ð½Ð·Ð¾Ð»Ð°" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÐºÐ¾Ð½Ð·Ð¾Ð»Ð°ÑÐ°." IDS_APPLY_SHORTCUT_ALL "ÐÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° &Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°ÑÐ°, Ð·Ð°Ð¿ÑÑÐ½Ð°Ð»Ð° ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Ð ÐµÑÐµÑÑÑÐ½Ð¸ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ" END Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -141,6 +141,5 @@ IDS_CPLNAME "Konzole" IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole." IDS_APPLY_SHORTCUT_ALL "ZmÄnit zÃ¡&stupce, kterÃ½ spustil toto okno" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "RastrovÃ¡ pÃsma" END Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsole" IDS_CPLDESCRIPTION "Konfiguriert die Konsoleneigenschaften." IDS_APPLY_SHORTCUT_ALL "Modifiziere die &VerknÃ¼pfung, die das Fenster startete" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Rasterschriften" END Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -140,6 +140,5 @@ IDS_CPLNAME "Consola" IDS_CPLDESCRIPTION "Configurar propiedades de la consola." IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fuentes Raster" END Modified: branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configurer les propriÃ©tÃ©s de la console." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Polices Raster" END Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "×©××¨×ª ××¤×§×××" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsol" IDS_CPLDESCRIPTION "Konfigurasi properti konsol." IDS_APPLY_SHORTCUT_ALL "Modifikasi &jalan pintas yang memulai jendela ini" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Font Raster" END Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configura le proprietÃ della console." IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsoll" IDS_CPLDESCRIPTION "Konfigurere Konsoll innstillinger." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -142,6 +142,5 @@ IDS_CPLNAME "Konsola" IDS_CPLDESCRIPTION "Konfiguruje wÅaÅciwoÅci konsoli." IDS_APPLY_SHORTCUT_ALL "Zmodyfikuj skrÃ³t, ktÃ³ry wywoÅaÅ to okno" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Czcionki rastrowe" END Modified: branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "Linie de comandÄ" IDS_CPLDESCRIPTION "Configurarea proprietÄÈilor pentru programe linie de comandÄ." IDS_APPLY_SHORTCUT_ALL "ModificÄ &scurtÄtura care a pornit aplicaÈia" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fonturi rastre" END Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -137,6 +137,5 @@ IDS_CPLNAME "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸." IDS_APPLY_SHORTCUT_ALL "&ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ»ÑÐº, ÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð±ÑÐ»Ð¾ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-07 5:00\nSYSTEM32 <DIR> 10-01-07 5:00" IDS_RASTERFONTS "Ð Ð°ÑÑÑÐ¾Ð²ÑÐµ ÑÑÐ¸ÑÑÑ" END Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -139,6 +139,5 @@ IDS_CPLNAME "Konzola" IDS_CPLDESCRIPTION "Nastavuje vlastnosti Konzoly." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "RasterovÃ© pÃsma" END Modified: branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "ÐÐ¾Ð½ÑÐ¾Ð»Ñ" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾ÑÐ²Ð°Ð½Ð½Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÐµÐ¹ ÐºÐ¾Ð½ÑÐ¾Ð»Ñ." IDS_APPLY_SHORTCUT_ALL "ÐÐ¼ÑÐ½Ð° &ÑÑÐ»Ð¸ÐºÐ°, ÑÐºÐ¸Ð¹ Ð·Ð°Ð¿ÑÑÑÐ¸Ð² ÑÐµ Ð²ÑÐºÐ½Ð¾" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Ð Ð°ÑÑÑÐ¾Ð²Ñ ÑÑÐ¸ÑÑÐ¸" END Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -142,6 +142,5 @@ IDS_CPLNAME "æ§å¶å°" IDS_CPLDESCRIPTION "éç½®æ§å¶å°å±æ§ã" IDS_APPLY_SHORTCUT_ALL "ä¿®æ¹å¯å¨æ¤çªå£çå¿«æ·æ¹å¼(&S)" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster åä½" END Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -8,31 +8,15 @@ #include "console.h" -// TODO: Use ReactOS output -const TCHAR szPreviewText[] = \ +const TCHAR szPreviewText[] = _T("C:\\ReactOS> dir \n") \ - _T("SYSTEM <DIR> 10-01-99 5:00a\n") \ - _T("SYSTEM32 <DIR> 10-01-99 5:00a\n") \ - _T("README TXT 26926 10-01-99 5:00a\n") \ - _T("WINDOWS BMP 46080 10-01-99 5:00a\n") \ - _T("NOTEPAD EXE 337232 10-01-99 5:00a\n") \ - _T("CLOCK AVI 39594 10-01-99 5:00p\n") \ - _T("WIN INI 7005 10-01-99 5:00a\n"); -/* -const TCHAR szPreviewText[] = \ - _T("C:\\ReactOS> dir \n") \ - _T("02-18-13 05:00a <DIR> system \n") \ - _T("02-18-13 05:00a <DIR> system32 \n") \ - _T("02-18-13 05:00a 26926 readme.txt \n") \ - _T("02-18-13 05:00a 3321856 explorer.exe\n") \ - _T("02-18-13 05:00a 256 setuplog. \n") \ - _T("02-18-13 05:00a 18736 vgafonts.cab\n") \ - _T("02-18-13 05:00a 256 win.ini \n") \ - _T("README TXT 26926 10-01-99 5:00a\n") \ - _T("CLOCK AVI 39594 10-01-99 5:00p\n") \ - _T("WIN INI 7005 10-01-99 5:00a\n"); -*/ -// IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + _T("SYSTEM <DIR> 03-03-13 5:00a\n") \ + _T("SYSTEM32 <DIR> 03-03-13 5:00a\n") \ + _T("readme txt 1739 03-03-13 5:00a\n") \ + _T("explorer exe 3329536 03-03-13 5:00a\n") \ + _T("vgafonts cab 18736 03-03-13 5:00a\n") \ + _T("setuplog txt 313 03-03-13 5:00a\n") \ + _T("win ini 7005 03-03-13 5:00a\n"); VOID Modified: branches/ros-csrss/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/resou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -86,5 +86,4 @@ #define IDC_STATIC_COLOR16 627 // String IDs -#define IDS_SCREEN_TEXT 700 -#define IDS_RASTERFONTS 701 +#define IDS_RASTERFONTS 700 Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -66,8 +66,6 @@ IN USHORT ScreenAttrib, IN USHORT PopupAttrib) { - DPRINT("ConSrvCreateScreenBuffer\n"); - if (Console == NULL || Buffer == NULL) return STATUS_INVALID_PARAMETER; Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -521,7 +521,6 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); - DPRINT1("SrvOpenConsole - Checkpoint 1\n"); DPRINT1("ProcessData = 0x%p ; ProcessData->Console = 0x%p\n", ProcessData, ProcessData->Console); if (ProcessData->Console) @@ -532,9 +531,9 @@ PCONSOLE Console = ProcessData->Console; Object_t *Object; + DPRINT1("SrvOpenConsole - Checkpoint 1\n"); + EnterCriticalSection(&Console->Lock); DPRINT1("SrvOpenConsole - Checkpoint 2\n"); - EnterCriticalSection(&Console->Lock); - DPRINT1("SrvOpenConsole - Checkpoint 3\n"); if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT) { @@ -632,7 +631,6 @@ /* Set the Property Dialog Handler */ ProcessData->PropDispatcher = AllocConsoleRequest->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher; @@ -734,7 +732,6 @@ /* Set the Property Dialog Handler */ TargetProcessData->PropDispatcher = AttachConsoleRequest->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", TargetProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -1800,7 +1800,6 @@ (PVOID)Console); if (NULL != NewWindow) { - DPRINT1("CreateWindowExW succeeded\n"); SetConsoleWndConsoleLeaderCID(Console); SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); @@ -1818,7 +1817,6 @@ SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)Console->hIconSm); } - DPRINT1("Show window\n"); ShowWindow(NewWindow, (int)wParam); } return (LRESULT)NewWindow; @@ -2132,7 +2130,6 @@ if (IconPath) { HICON hIcon = NULL, hIconSm = NULL; - DPRINT1("Extracting icons\n"); PrivateExtractIconExW(IconPath, IconIndex, &hIcon, Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -745,7 +745,6 @@ /* Set the Property Dialog Handler */ ProcessData->PropDispatcher = ConnectInfo->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -142,8 +142,6 @@ * i.e. %SystemRoot%_<some_path>_<some_app.exe> */ - DPRINT1("ConSrvOpenUserSettings entered\n"); - /* Open the registry key where we saved the console properties */ if (!OpenUserRegistryPathPerProcessId(ProcessId, &hKey, samDesired)) { @@ -209,7 +207,7 @@ &hKey, KEY_READ, FALSE)) { - DPRINT1("ConSrvOpenUserSettings failed\n"); + DPRINT("ConSrvOpenUserSettings failed\n"); return FALSE; } @@ -426,8 +424,6 @@ ConSrvGetDefaultSettings(IN OUT PCONSOLE_INFO ConsoleInfo, IN DWORD ProcessId) { - DPRINT1("ConSrvGetDefaultSettings(0x%p)\n", ConsoleInfo); - if (ConsoleInfo == NULL) return; /// HKCU,"Console","LoadConIme",0x00010003,1

1 0

[tkreuzer] 58418: [WIN32K] Properly handle glyph positions and take target coordinate transformation into account when caching glyphs. (This is suboptimal, since we might cache duplicates of the sa...
by tkreuzer＠svn.reactos.org 03 Mar '13

03 Mar '13

Author: tkreuzer Date: Sun Mar 3 17:20:44 2013 New Revision: 58418 URL: http://svn.reactos.org/svn/reactos?rev=58418&view=rev Log: [WIN32K] Properly handle glyph positions and take target coordinate transformation into account when caching glyphs. (This is suboptimal, since we might cache duplicates of the same glyphs, but it works). Fixes CORE-4657. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Mar 3 17:20:44 2013 @@ -59,6 +59,7 @@ FT_Face Face; FT_BitmapGlyph BitmapGlyph; int Height; + MATRIX mxWorldToDevice; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; static LIST_ENTRY FontCacheListHead; static UINT FontCacheNumEntries; @@ -161,14 +162,10 @@ VOID FtSetCoordinateTransform( FT_Face face, - PDC pdc) + PMATRIX pmx) { FT_Matrix ftmatrix; - PMATRIX pmx; FLOATOBJ efTemp; - - /* Get the DC's world-to-device transformation matrix */ - pmx = DC_pmxWorldToDevice(pdc); /* Create a freetype matrix, by converting to 16.16 fixpoint format */ efTemp = pmx->efM11; @@ -1343,12 +1340,24 @@ return FALSE; } +static +BOOL +SameScaleMatrix( + PMATRIX pmx1, + PMATRIX pmx2) +{ + return (FLOATOBJ_Equal(&pmx1->efM11, &pmx2->efM11) && + FLOATOBJ_Equal(&pmx1->efM12, &pmx2->efM12) && + FLOATOBJ_Equal(&pmx1->efM21, &pmx2->efM21) && + FLOATOBJ_Equal(&pmx1->efM22, &pmx2->efM22)); +} FT_BitmapGlyph APIENTRY ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, - INT Height) + INT Height, + PMATRIX pmx) { PLIST_ENTRY CurrentEntry; PFONT_CACHE_ENTRY FontEntry; @@ -1357,9 +1366,10 @@ while (CurrentEntry != &FontCacheListHead) { FontEntry = (PFONT_CACHE_ENTRY)CurrentEntry; - if (FontEntry->Face == Face && - FontEntry->GlyphIndex == GlyphIndex && - FontEntry->Height == Height) + if ((FontEntry->Face == Face) && + (FontEntry->GlyphIndex == GlyphIndex) && + (FontEntry->Height == Height) && + (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; CurrentEntry = CurrentEntry->Flink; } @@ -1379,6 +1389,7 @@ FT_Face Face, INT GlyphIndex, INT Height, + PMATRIX pmx, FT_GlyphSlot GlyphSlot, FT_Render_Mode RenderMode) { @@ -1428,6 +1439,7 @@ NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; + NewEntry->mxWorldToDevice = *pmx; InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); if (FontCacheNumEntries++ > MAX_FONT_CACHE) @@ -1585,7 +1597,7 @@ /* FIXME: Should set character height if neg */ // (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? // dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); -// FtSetCoordinateTransform(face, dc); +// FtSetCoordinateTransform(face, DC_pmxWorldToDevice(dc)); TEXTOBJ_UnlockText(TextObj); @@ -2132,6 +2144,7 @@ BOOL use_kerning; FT_Render_Mode RenderMode; BOOLEAN Render; + PMATRIX pmxWorldToDevice; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -2186,7 +2199,9 @@ DPRINT1("Error in setting pixel sizes: %u\n", error); } - FtSetCoordinateTransform(face, dc); + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -2199,7 +2214,8 @@ glyph_index = FT_Get_Char_Index(face, *String); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -2209,8 +2225,12 @@ } glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, + glyph, + RenderMode); if (!realglyph) { DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); @@ -2470,7 +2490,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(Face, dc); + FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc)); IntUnLockFreeType; if (0 != Error) { @@ -3117,6 +3137,24 @@ ExFreePoolWithTag(Info, GDITAG_TEXT); return Count; +} + +LONG +FORCEINLINE +ScaleLong(LONG lValue, PFLOATOBJ pef) +{ + FLOATOBJ efTemp; + + /* Check if we have scaling different from 1 */ + if (!FLOATOBJ_Equal(pef, (PFLOATOBJ)&gef1)) + { + /* Need to multiply */ + FLOATOBJ_SetLong(&efTemp, lValue); + FLOATOBJ_Mul(&efTemp, pef); + lValue = FLOATOBJ_GetLong(&efTemp); + } + + return lValue; } BOOL @@ -3165,6 +3203,8 @@ POINT Start; BOOL DoBreak = FALSE; USHORT DxShift; + PMATRIX pmxWorldToDevice; + LONG fixAscender, fixDescender; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3328,18 +3368,22 @@ goto fail; } - FtSetCoordinateTransform(face, dc); + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); /* * Process the vertical alignment and determine the yoff. */ + fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); + fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); + if (pdcattr->lTextAlign & TA_BASELINE) yoff = 0; else if (pdcattr->lTextAlign & TA_BOTTOM) - yoff = -face->size->metrics.descender >> 6; + yoff = -fixDescender >> 6; else /* TA_TOP */ - yoff = face->size->metrics.ascender >> 6; + yoff = fixAscender >> 6; use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -3377,7 +3421,8 @@ glyph_index = FT_Get_Char_Index(face, *TempText); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -3386,8 +3431,12 @@ } glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, + glyph, + RenderMode); if (!realglyph) { DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); @@ -3453,7 +3502,8 @@ glyph_index = FT_Get_Char_Index(face, *String); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -3466,6 +3516,7 @@ realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, glyph, RenderMode); if (!realglyph) @@ -3491,8 +3542,8 @@ { DestRect.left = BackgroundLeft; DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); - DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); + DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); + DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); IntEngBitBlt( &psurf->SurfObj, @@ -3777,6 +3828,7 @@ UINT i, glyph_index, BufferSize; HFONT hFont = 0; NTSTATUS Status = STATUS_SUCCESS; + PMATRIX pmxWorldToDevice; if (pwch) { @@ -3823,6 +3875,9 @@ pdcattr = dc->pdcattr; hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); + + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -3866,7 +3921,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(face, dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++) { @@ -3951,6 +4006,7 @@ FT_CharMap charmap, found = NULL; UINT i, glyph_index, BufferSize; HFONT hFont = 0; + PMATRIX pmxWorldToDevice; if (pwc) { @@ -3991,6 +4047,8 @@ pdcattr = dc->pdcattr; hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -4034,7 +4092,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(face, dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++) {

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