Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59759: [NETAPI32] - NetUserAdd: Open the accounts domain with DOMAIN_READ_PASSWORD_PARAMETERS access. This is needed in order to check whether the password matches the password requirements...
by ekohl＠svn.reactos.org 17 Aug '13

17 Aug '13

Author: ekohl Date: Sat Aug 17 13:18:02 2013 New Revision: 59759 URL: http://svn.reactos.org/svn/reactos?rev=59759&view=rev Log: [NETAPI32] - NetUserAdd: Open the accounts domain with DOMAIN_READ_PASSWORD_PARAMETERS access. This is needed in order to check whether the password matches the password requirements of the domain. - Start implementing NetUserGetGroups. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Aug 17 13:18:02 2013 @@ -20,7 +20,7 @@ /* * TODO: - * Implement NetUserGetGroups + * Implement NetUserGetGroups (WIP) * Implement NetUserSetGroups * NetUserGetLocalGroups does not support LG_INCLUDE_INDIRECT yet. * Add missing information levels. @@ -2056,7 +2056,7 @@ /* Open the Account Domain */ Status = OpenAccountDomain(ServerHandle, (servername != NULL) ? &ServerName : NULL, - DOMAIN_CREATE_USER | DOMAIN_LOOKUP, + DOMAIN_CREATE_USER | DOMAIN_LOOKUP | DOMAIN_READ_PASSWORD_PARAMETERS, &DomainHandle); if (!NT_SUCCESS(Status)) { @@ -2621,15 +2621,160 @@ LPDWORD entriesread, LPDWORD totalentries) { - FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + UNICODE_STRING ServerName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE AccountDomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + PSID AccountDomainSid = NULL; + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + PGROUP_MEMBERSHIP GroupMembership = NULL; + ULONG GroupCount; + + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, totalentries); + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&UserName, username); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the Account Domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &AccountDomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP | DOMAIN_GET_ALIAS_MEMBERSHIP, + AccountDomainSid, + &AccountDomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(AccountDomainHandle, + 1, + &UserName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Fail, if it is not a user account */ + if (Use[0] != SidTypeUser) + { + ERR("Account is not a User!\n"); + ApiStatus = NERR_UserNotFound; + goto done; + } + + /* Open the user object */ + Status = SamOpenUser(AccountDomainHandle, + USER_LIST_GROUPS, + RelativeIds[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the group memberships of this user */ + Status = SamGetGroupsForUser(UserHandle, + &GroupMembership, + &GroupCount); + if (!NT_SUCCESS(Status)) + { + ERR("SamGetGroupsForUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* If there is no group membership, we're done */ + if (GroupCount == 0) + { + ApiStatus = NERR_Success; + goto done; + } + + +done: + + if (GroupMembership != NULL) + SamFreeMemory(GroupMembership); + + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (AccountDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + + if (AccountDomainHandle != NULL) + SamCloseHandle(AccountDomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (ApiStatus != NERR_Success && ApiStatus != ERROR_MORE_DATA) + { + *entriesread = 0; + *totalentries = 0; + } + else + { +// *entriesread = Count; +// *totalentries = Count; + } + +// *bufptr = (LPBYTE)Buffer; + + return ApiStatus; + +#if 0 *bufptr = NULL; *entriesread = 0; *totalentries = 0; return ERROR_INVALID_LEVEL; +#endif }

1 0

[akhaldi] 59758: [PSDK] * Annotate dbghelp.h.
by akhaldi＠svn.reactos.org 17 Aug '13

17 Aug '13

Author: akhaldi Date: Sat Aug 17 11:20:05 2013 New Revision: 59758 URL: http://svn.reactos.org/svn/reactos?rev=59758&view=rev Log: [PSDK] * Annotate dbghelp.h. Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sat Aug 17 11:20:05 2013 @@ -668,7 +668,11 @@ } DUMMYUNIONNAME; } MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; -typedef BOOL (WINAPI* MINIDUMP_CALLBACK_ROUTINE)(PVOID, const PMINIDUMP_CALLBACK_INPUT, PMINIDUMP_CALLBACK_OUTPUT); +typedef BOOL +(WINAPI* MINIDUMP_CALLBACK_ROUTINE)( + _Inout_ PVOID, + _In_ const PMINIDUMP_CALLBACK_INPUT, + _Inout_ PMINIDUMP_CALLBACK_OUTPUT); typedef struct _MINIDUMP_CALLBACK_INFORMATION { @@ -887,12 +891,25 @@ LastReservedStream = 0xffff } MINIDUMP_STREAM_TYPE; -BOOL WINAPI MiniDumpWriteDump(HANDLE, DWORD, HANDLE, MINIDUMP_TYPE, - const PMINIDUMP_EXCEPTION_INFORMATION, - const PMINIDUMP_USER_STREAM_INFORMATION, - const PMINIDUMP_CALLBACK_INFORMATION); -BOOL WINAPI MiniDumpReadDumpStream(PVOID, ULONG, PMINIDUMP_DIRECTORY*, PVOID*, - ULONG*); +BOOL +WINAPI +MiniDumpWriteDump( + _In_ HANDLE, + _In_ DWORD, + _In_ HANDLE, + _In_ MINIDUMP_TYPE, + _In_opt_ const PMINIDUMP_EXCEPTION_INFORMATION, + _In_opt_ const PMINIDUMP_USER_STREAM_INFORMATION, + _In_opt_ const PMINIDUMP_CALLBACK_INFORMATION); + +BOOL +WINAPI +MiniDumpReadDumpStream( + _In_ PVOID, + _In_ ULONG, + _Outptr_result_maybenull_ PMINIDUMP_DIRECTORY*, + _Outptr_result_maybenull_ PVOID*, + _Out_opt_ ULONG*); #include <poppack.h> @@ -904,23 +921,111 @@ #define SLMFLAG_VIRTUAL 0x1 #define SLMFLAG_NO_SYMBOLS 0x4 -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PCSTR, DWORD64, ULONG, PVOID); -BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PCWSTR, DWORD64, ULONG, PVOID); -BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PCSTR, DWORD64, PVOID); -BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(PCWSTR, DWORD64, PVOID); -BOOL WINAPI SymEnumerateModulesW64(HANDLE, PSYM_ENUMMODULES_CALLBACKW64, PVOID); -BOOL WINAPI SymGetModuleInfo64(HANDLE, DWORD64, PIMAGEHLP_MODULE64); -BOOL WINAPI SymGetModuleInfoW64(HANDLE, DWORD64, PIMAGEHLP_MODULEW64); -DWORD64 WINAPI SymGetModuleBase64(HANDLE, DWORD64); -DWORD64 WINAPI SymLoadModule64(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD); -DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, - PMODLOAD_DATA, DWORD); -DWORD64 WINAPI SymLoadModuleExW(HANDLE, HANDLE, PCWSTR, PCWSTR, DWORD64, DWORD, - PMODLOAD_DATA, DWORD); -BOOL WINAPI SymUnloadModule64(HANDLE, DWORD64); +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACK64)( + _In_ PCSTR, + _In_ DWORD64, + _In_ ULONG, + _In_opt_ PVOID); + +BOOL +WINAPI +EnumerateLoadedModules64( + _In_ HANDLE, + _In_ PENUMLOADED_MODULES_CALLBACK64, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)( + _In_ PCWSTR, + _In_ DWORD64, + _In_ ULONG, + _In_opt_ PVOID); + +BOOL +WINAPI +EnumerateLoadedModulesW64( + _In_ HANDLE, + _In_ PENUMLOADED_MODULES_CALLBACKW64, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACK64)( + _In_ PCSTR, + _In_ DWORD64, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateModules64( + _In_ HANDLE, + _In_ PSYM_ENUMMODULES_CALLBACK64, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)( + _In_ PCWSTR, + _In_ DWORD64, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateModulesW64( + _In_ HANDLE, + _In_ PSYM_ENUMMODULES_CALLBACKW64, + _In_opt_ PVOID); + +BOOL +WINAPI +SymGetModuleInfo64( + _In_ HANDLE, + _In_ DWORD64, + _Out_ PIMAGEHLP_MODULE64); + +BOOL +WINAPI +SymGetModuleInfoW64( + _In_ HANDLE, + _In_ DWORD64, + _Out_ PIMAGEHLP_MODULEW64); + +DWORD64 WINAPI SymGetModuleBase64(_In_ HANDLE, _In_ DWORD64); + +DWORD64 +WINAPI +SymLoadModule64( + _In_ HANDLE, + _In_opt_ HANDLE, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ DWORD64, + _In_ DWORD); + +DWORD64 +WINAPI +SymLoadModuleEx( + _In_ HANDLE, + _In_opt_ HANDLE, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ DWORD64, + _In_ DWORD, + _In_opt_ PMODLOAD_DATA, + _In_opt_ DWORD); + +DWORD64 +WINAPI +SymLoadModuleExW( + _In_ HANDLE, + _In_opt_ HANDLE, + _In_opt_ PCWSTR, + _In_opt_ PCWSTR, + _In_ DWORD64, + _In_ DWORD, + _In_opt_ PMODLOAD_DATA, + _In_opt_ DWORD); + +BOOL WINAPI SymUnloadModule64(_In_ HANDLE, _In_ DWORD64); /************************* * Symbol Handling * @@ -1086,83 +1191,494 @@ #define SYMSEARCH_RECURSE 0x02 #define SYMSEARCH_GLOBALSONLY 0x04 -BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); -BOOL WINAPI SymGetTypeInfoEx(HANDLE, DWORD64, PIMAGEHLP_GET_TYPE_INFO_PARAMS); -typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW, ULONG, PVOID); -BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); -BOOL WINAPI SymEnumTypesW(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); -BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); -BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); -BOOL WINAPI SymFromToken(HANDLE, DWORD64, DWORD, PSYMBOL_INFO); -BOOL WINAPI SymFromTokenW(HANDLE, DWORD64, DWORD, PSYMBOL_INFOW); -BOOL WINAPI SymFromName(HANDLE, PCSTR, PSYMBOL_INFO); -BOOL WINAPI SymFromNameW(HANDLE, PCWSTR, PSYMBOL_INFOW); -BOOL WINAPI SymGetSymFromAddr64(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64); -BOOL WINAPI SymGetSymFromName64(HANDLE, PCSTR, PIMAGEHLP_SYMBOL64); -BOOL WINAPI SymGetTypeFromName(HANDLE, ULONG64, PCSTR, PSYMBOL_INFO); -BOOL WINAPI SymGetTypeFromNameW(HANDLE, ULONG64, PCWSTR, PSYMBOL_INFOW); -BOOL WINAPI SymGetSymNext64(HANDLE, PIMAGEHLP_SYMBOL64); -BOOL WINAPI SymGetSymNextW64(HANDLE, PIMAGEHLP_SYMBOLW64); -BOOL WINAPI SymGetSymPrev64(HANDLE, PIMAGEHLP_SYMBOL64); -BOOL WINAPI SymGetSymPrevW64(HANDLE, PIMAGEHLP_SYMBOLW64); -BOOL WINAPI SymEnumSym(HANDLE,ULONG64,PSYM_ENUMERATESYMBOLS_CALLBACK,PVOID); -BOOL WINAPI SymEnumSymbols(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBACK, - PVOID); -BOOL WINAPI SymEnumSymbolsW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW, - PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)(PCSTR, DWORD64, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64W)(PCWSTR, DWORD64, ULONG, PVOID); -BOOL WINAPI SymEnumerateSymbols64(HANDLE, ULONG64, PSYM_ENUMSYMBOLS_CALLBACK64, PVOID); -BOOL WINAPI SymEnumerateSymbolsW64(HANDLE, ULONG64, PSYM_ENUMSYMBOLS_CALLBACK64W, PVOID); -BOOL WINAPI SymEnumSymbolsForAddr(HANDLE, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); -BOOL WINAPI SymEnumSymbolsForAddrW(HANDLE, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); -typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)(HANDLE, ULONG, ULONG64, ULONG64); -BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); -BOOL WINAPI SymRegisterCallbackW64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); -BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64, PSTR, DWORD); -BOOL WINAPI SymMatchString(PCSTR, PCSTR, BOOL); -BOOL WINAPI SymMatchStringA(PCSTR, PCSTR, BOOL); -BOOL WINAPI SymMatchStringW(PCWSTR, PCWSTR, BOOL); -BOOL WINAPI SymSearch(HANDLE, ULONG64, DWORD, DWORD, PCSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID, DWORD); -BOOL WINAPI SymSearchW(HANDLE, ULONG64, DWORD, DWORD, PCWSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID, DWORD); -DWORD WINAPI UnDecorateSymbolName(PCSTR, PSTR, DWORD, DWORD); -DWORD WINAPI UnDecorateSymbolNameW(PCWSTR, PWSTR, DWORD, DWORD); -BOOL WINAPI SymGetScope(HANDLE, ULONG64, DWORD, PSYMBOL_INFO); -BOOL WINAPI SymGetScopeW(HANDLE, ULONG64, DWORD, PSYMBOL_INFOW); -BOOL WINAPI SymFromIndex(HANDLE, ULONG64, DWORD, PSYMBOL_INFO); -BOOL WINAPI SymFromIndexW(HANDLE, ULONG64, DWORD, PSYMBOL_INFOW); -BOOL WINAPI SymAddSymbol(HANDLE, ULONG64, PCSTR, DWORD64, DWORD, DWORD); -BOOL WINAPI SymAddSymbolW(HANDLE, ULONG64, PCWSTR, DWORD64, DWORD, DWORD); -BOOL WINAPI SymDeleteSymbol(HANDLE, ULONG64, PCSTR, DWORD64, DWORD); -BOOL WINAPI SymDeleteSymbolW(HANDLE, ULONG64, PCWSTR, DWORD64, DWORD); +BOOL +WINAPI +SymGetTypeInfo( + _In_ HANDLE, + _In_ DWORD64, + _In_ ULONG, + _In_ IMAGEHLP_SYMBOL_TYPE_INFO, + _Out_ PVOID); + +BOOL +WINAPI +SymGetTypeInfoEx( + _In_ HANDLE, + _In_ DWORD64, + _Inout_ PIMAGEHLP_GET_TYPE_INFO_PARAMS); + +typedef BOOL +(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)( + _In_ PSYMBOL_INFO, + _In_ ULONG, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)( + _In_ PSYMBOL_INFOW, + _In_ ULONG, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumTypes( + _In_ HANDLE, + _In_ ULONG64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumTypesW( + _In_ HANDLE, + _In_ ULONG64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACKW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymFromAddr( + _In_ HANDLE, + _In_ DWORD64, + _Out_opt_ DWORD64*, + _Inout_ SYMBOL_INFO*); + +BOOL +WINAPI +SymFromAddrW( + _In_ HANDLE, + _In_ DWORD64, + _Out_opt_ DWORD64*, + _Inout_ SYMBOL_INFOW*); + +BOOL +WINAPI +SymFromToken( + _In_ HANDLE, + _In_ DWORD64, + _In_ DWORD, + _Inout_ PSYMBOL_INFO); + +BOOL +WINAPI +SymFromTokenW( + _In_ HANDLE, + _In_ DWORD64, + _In_ DWORD, + _Inout_ PSYMBOL_INFOW); + +BOOL WINAPI SymFromName(_In_ HANDLE, _In_ PCSTR, _Inout_ PSYMBOL_INFO); +BOOL WINAPI SymFromNameW(_In_ HANDLE, _In_ PCWSTR, _Inout_ PSYMBOL_INFOW); + +BOOL +WINAPI +SymGetSymFromAddr64( + _In_ HANDLE, + _In_ DWORD64, + _Out_opt_ PDWORD64, + _Inout_ PIMAGEHLP_SYMBOL64); + +BOOL +WINAPI +SymGetSymFromName64( + _In_ HANDLE, + _In_ PCSTR, + _Inout_ PIMAGEHLP_SYMBOL64); + +BOOL +WINAPI +SymGetTypeFromName( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCSTR, + _Inout_ PSYMBOL_INFO); + +BOOL +WINAPI +SymGetTypeFromNameW( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCWSTR, + _Inout_ PSYMBOL_INFOW); + +BOOL WINAPI SymGetSymNext64(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOL64); +BOOL WINAPI SymGetSymNextW64(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOLW64); +BOOL WINAPI SymGetSymPrev64(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOL64); +BOOL WINAPI SymGetSymPrevW64(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOLW64); + +BOOL +WINAPI +SymEnumSym( + _In_ HANDLE, + _In_ ULONG64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSymbols( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSymbolsW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACKW, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)( + _In_ PCSTR, + _In_ DWORD64, + _In_ ULONG, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64W)( + _In_ PCWSTR, + _In_ DWORD64, + _In_ ULONG, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateSymbols64( + _In_ HANDLE, + _In_ ULONG64, + _In_ PSYM_ENUMSYMBOLS_CALLBACK64, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateSymbolsW64( + _In_ HANDLE, + _In_ ULONG64, + _In_ PSYM_ENUMSYMBOLS_CALLBACK64W, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSymbolsForAddr( + _In_ HANDLE, + _In_ DWORD64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSymbolsForAddrW( + _In_ HANDLE, + _In_ DWORD64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACKW, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)( + _In_ HANDLE, + _In_ ULONG, + _In_opt_ ULONG64, + _In_opt_ ULONG64); + +BOOL +WINAPI +SymRegisterCallback64( + _In_ HANDLE, + _In_ PSYMBOL_REGISTERED_CALLBACK64, + _In_ ULONG64); + +BOOL +WINAPI +SymRegisterCallbackW64( + _In_ HANDLE, + _In_ PSYMBOL_REGISTERED_CALLBACK64, + _In_ ULONG64); + +BOOL +WINAPI +SymUnDName64( + _In_ PIMAGEHLP_SYMBOL64, + _Out_writes_(UnDecNameLength) PSTR, + _In_ DWORD UnDecNameLength); + +BOOL WINAPI SymMatchString(_In_ PCSTR, _In_ PCSTR, _In_ BOOL); +BOOL WINAPI SymMatchStringA(_In_ PCSTR, _In_ PCSTR, _In_ BOOL); +BOOL WINAPI SymMatchStringW(_In_ PCWSTR, _In_ PCWSTR, _In_ BOOL); + +BOOL +WINAPI +SymSearch( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ DWORD, + _In_opt_ DWORD, + _In_opt_ PCSTR, + _In_opt_ DWORD64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACK, + _In_opt_ PVOID, + _In_ DWORD); + +BOOL +WINAPI +SymSearchW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ DWORD, + _In_opt_ DWORD, + _In_opt_ PCWSTR, + _In_opt_ DWORD64, + _In_ PSYM_ENUMERATESYMBOLS_CALLBACKW, + _In_opt_ PVOID, + _In_ DWORD); + +DWORD +WINAPI +UnDecorateSymbolName( + _In_ PCSTR, + _Out_writes_(maxStringLength) PSTR, + _In_ DWORD maxStringLength, + _In_ DWORD); + +DWORD +WINAPI +UnDecorateSymbolNameW( + _In_ PCWSTR, + _Out_writes_(maxStringLength) PWSTR, + _In_ DWORD maxStringLength, + _In_ DWORD); + +BOOL +WINAPI +SymGetScope( + _In_ HANDLE, + _In_ ULONG64, + _In_ DWORD, + _Inout_ PSYMBOL_INFO); + +BOOL +WINAPI +SymGetScopeW( + _In_ HANDLE, + _In_ ULONG64, + _In_ DWORD, + _Inout_ PSYMBOL_INFOW); + +BOOL +WINAPI +SymFromIndex( + _In_ HANDLE, + _In_ ULONG64, + _In_ DWORD, + _Inout_ PSYMBOL_INFO); + +BOOL +WINAPI +SymFromIndexW( + _In_ HANDLE, + _In_ ULONG64, + _In_ DWORD, + _Inout_ PSYMBOL_INFOW); + +BOOL +WINAPI +SymAddSymbol( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCSTR, + _In_ DWORD64, + _In_ DWORD, + _In_ DWORD); + +BOOL +WINAPI +SymAddSymbolW( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCWSTR, + _In_ DWORD64, + _In_ DWORD, + _In_ DWORD); + +BOOL +WINAPI +SymDeleteSymbol( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_ DWORD64, + _In_ DWORD); + +BOOL +WINAPI +SymDeleteSymbolW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_ DWORD64, + _In_ DWORD); /************************* * Source Files * *************************/ -typedef BOOL (CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACK)(PSOURCEFILE, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACKW)(PSOURCEFILEW, PVOID); - -BOOL WINAPI SymEnumSourceFiles(HANDLE, ULONG64, PCSTR, PSYM_ENUMSOURCEFILES_CALLBACK, - PVOID); -BOOL WINAPI SymEnumSourceFilesW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMSOURCEFILES_CALLBACKW, PVOID); -BOOL WINAPI SymGetLineFromAddr64(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64); -BOOL WINAPI SymGetLineFromAddrW64(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINEW64); -BOOL WINAPI SymGetLinePrev64(HANDLE, PIMAGEHLP_LINE64); -BOOL WINAPI SymGetLinePrevW64(HANDLE, PIMAGEHLP_LINEW64); -BOOL WINAPI SymGetLineNext64(HANDLE, PIMAGEHLP_LINE64); -BOOL WINAPI SymGetLineNextW64(HANDLE, PIMAGEHLP_LINEW64); -BOOL WINAPI SymGetLineFromName64(HANDLE, PCSTR, PCSTR, DWORD, PLONG, PIMAGEHLP_LINE64); -BOOL WINAPI SymGetLineFromNameW64(HANDLE, PCWSTR, PCWSTR, DWORD, PLONG, PIMAGEHLP_LINEW64); -ULONG WINAPI SymGetFileLineOffsets64(HANDLE, PCSTR, PCSTR, PDWORD64, ULONG); -BOOL WINAPI SymGetSourceFile(HANDLE, ULONG64, PCSTR, PCSTR, PSTR, DWORD); -BOOL WINAPI SymGetSourceFileW(HANDLE, ULONG64, PCWSTR, PCWSTR, PWSTR, DWORD); -BOOL WINAPI SymGetSourceFileToken(HANDLE, ULONG64, PCSTR, PVOID*, DWORD*); -BOOL WINAPI SymGetSourceFileTokenW(HANDLE, ULONG64, PCWSTR, PVOID*, DWORD*); -BOOL WINAPI SymGetSourceFileFromToken(HANDLE, PVOID, PCSTR, PSTR, DWORD); -BOOL WINAPI SymGetSourceFileFromTokenW(HANDLE, PVOID, PCWSTR, PWSTR, DWORD); -BOOL WINAPI SymGetSourceVarFromToken(HANDLE, PVOID, PCSTR, PCSTR, PSTR, DWORD); -BOOL WINAPI SymGetSourceVarFromTokenW(HANDLE, PVOID, PCWSTR, PCWSTR, PWSTR, DWORD); + +typedef BOOL +(CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACK)( + _In_ PSOURCEFILE, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACKW)( + _In_ PSOURCEFILEW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSourceFiles( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_ PSYM_ENUMSOURCEFILES_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSourceFilesW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_ PSYM_ENUMSOURCEFILES_CALLBACKW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymGetLineFromAddr64( + _In_ HANDLE, + _In_ DWORD64, + _Out_ PDWORD, + _Out_ PIMAGEHLP_LINE64); + +BOOL +WINAPI +SymGetLineFromAddrW64( + _In_ HANDLE, + _In_ DWORD64, + _Out_ PDWORD, + _Out_ PIMAGEHLP_LINEW64); + +BOOL WINAPI SymGetLinePrev64(_In_ HANDLE, _Inout_ PIMAGEHLP_LINE64); +BOOL WINAPI SymGetLinePrevW64(_In_ HANDLE, _Inout_ PIMAGEHLP_LINEW64); +BOOL WINAPI SymGetLineNext64(_In_ HANDLE, _Inout_ PIMAGEHLP_LINE64); +BOOL WINAPI SymGetLineNextW64(_In_ HANDLE, _Inout_ PIMAGEHLP_LINEW64); + +BOOL +WINAPI +SymGetLineFromName64( + _In_ HANDLE, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ DWORD, + _Out_ PLONG, + _Inout_ PIMAGEHLP_LINE64); + +BOOL +WINAPI +SymGetLineFromNameW64( + _In_ HANDLE, + _In_opt_ PCWSTR, + _In_opt_ PCWSTR, + _In_ DWORD, + _Out_ PLONG, + _Inout_ PIMAGEHLP_LINEW64); + +ULONG +WINAPI +SymGetFileLineOffsets64( + _In_ HANDLE, + _In_opt_ PCSTR, + _In_ PCSTR, + _Out_writes_(BufferLines) PDWORD64, + _In_ ULONG BufferLines); + +BOOL +WINAPI +SymGetSourceFile( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_ PCSTR, + _Out_writes_(Size) PSTR, + _In_ DWORD Size); + +BOOL +WINAPI +SymGetSourceFileW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_ PCWSTR, + _Out_writes_(Size) PWSTR, + _In_ DWORD Size); + +BOOL +WINAPI +SymGetSourceFileToken( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCSTR, + _Outptr_ PVOID*, + _Out_ DWORD*); + +BOOL +WINAPI +SymGetSourceFileTokenW( + _In_ HANDLE, + _In_ ULONG64, + _In_ PCWSTR, + _Outptr_ PVOID*, + _Out_ DWORD*); + +BOOL +WINAPI +SymGetSourceFileFromToken( + _In_ HANDLE, + _In_ PVOID, + _In_opt_ PCSTR, + _Out_writes_(Size) PSTR, + _In_ DWORD Size); + +BOOL +WINAPI +SymGetSourceFileFromTokenW( + _In_ HANDLE, + _In_ PVOID, + _In_opt_ PCWSTR, + _Out_writes_(Size) PWSTR, + _In_ DWORD Size); + +BOOL +WINAPI +SymGetSourceVarFromToken( + _In_ HANDLE, + _In_ PVOID, + _In_opt_ PCSTR, + _In_ PCSTR, + _Out_writes_(Size) PSTR, + _In_ DWORD Size); + +BOOL +WINAPI +SymGetSourceVarFromTokenW( + _In_ HANDLE, + _In_ PVOID, + _In_opt_ PCWSTR, + _In_ PCWSTR, + _Out_writes_(Size) PWSTR, + _In_ DWORD Size); typedef struct _SRCCODEINFO { @@ -1186,66 +1702,349 @@ DWORD64 Address; } SRCCODEINFOW, *PSRCCODEINFOW; -typedef BOOL (CALLBACK* PSYM_ENUMLINES_CALLBACK)(PSRCCODEINFO, PVOID); -typedef BOOL (CALLBACK* PSYM_ENUMLINES_CALLBACKW)(PSRCCODEINFOW, PVOID); -BOOL WINAPI SymEnumLines(HANDLE, ULONG64, PCSTR, PCSTR, PSYM_ENUMLINES_CALLBACK, PVOID); -BOOL WINAPI SymEnumLinesW(HANDLE, ULONG64, PCWSTR, PCWSTR, PSYM_ENUMLINES_CALLBACKW, PVOID); -BOOL WINAPI SymEnumSourceLines(HANDLE, ULONG64, PCSTR, PCSTR, DWORD, DWORD, PSYM_ENUMLINES_CALLBACK, PVOID); -BOOL WINAPI SymEnumSourceLinesW(HANDLE, ULONG64, PCWSTR, PCWSTR, DWORD, DWORD, PSYM_ENUMLINES_CALLBACKW, PVOID); +typedef BOOL +(CALLBACK* PSYM_ENUMLINES_CALLBACK)( + _In_ PSRCCODEINFO, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK* PSYM_ENUMLINES_CALLBACKW)( + _In_ PSRCCODEINFOW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumLines( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ PSYM_ENUMLINES_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumLinesW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_opt_ PCWSTR, + _In_ PSYM_ENUMLINES_CALLBACKW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSourceLines( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_opt_ DWORD, + _In_ DWORD, + _In_ PSYM_ENUMLINES_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumSourceLinesW( + _In_ HANDLE, + _In_ ULONG64, + _In_opt_ PCWSTR, + _In_opt_ PCWSTR, + _In_opt_ DWORD, + _In_ DWORD, + _In_ PSYM_ENUMLINES_CALLBACKW, + _In_opt_ PVOID); /************************* * File & image handling * *************************/ -BOOL WINAPI SymInitialize(HANDLE, PCSTR, BOOL); -BOOL WINAPI SymInitializeW(HANDLE, PCWSTR, BOOL); -BOOL WINAPI SymCleanup(HANDLE); - -HANDLE WINAPI FindDebugInfoFile(PCSTR, PCSTR, PSTR); -typedef BOOL (CALLBACK *PFIND_DEBUG_FILE_CALLBACK)(HANDLE, PCSTR, PVOID); -typedef BOOL (CALLBACK *PFIND_DEBUG_FILE_CALLBACKW)(HANDLE, PCWSTR, PVOID); -HANDLE WINAPI FindDebugInfoFileEx(PCSTR, PCSTR, PSTR, PFIND_DEBUG_FILE_CALLBACK, PVOID); -HANDLE WINAPI FindDebugInfoFileExW(PCWSTR, PCWSTR, PWSTR, PFIND_DEBUG_FILE_CALLBACKW, PVOID); -HANDLE WINAPI SymFindDebugInfoFile(HANDLE, PCSTR, PSTR, PFIND_DEBUG_FILE_CALLBACK, PVOID); -HANDLE WINAPI SymFindDebugInfoFileW(HANDLE, PCWSTR, PWSTR, PFIND_DEBUG_FILE_CALLBACKW, PVOID); -typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACK)(PCSTR, PVOID); -typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACKW)(PCWSTR, PVOID); + +BOOL WINAPI SymInitialize(_In_ HANDLE, _In_opt_ PCSTR, _In_ BOOL); +BOOL WINAPI SymInitializeW(_In_ HANDLE, _In_opt_ PCWSTR, _In_ BOOL); +BOOL WINAPI SymCleanup(_In_ HANDLE); + +HANDLE +WINAPI +FindDebugInfoFile( + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR); + +typedef BOOL +(CALLBACK *PFIND_DEBUG_FILE_CALLBACK)( + _In_ HANDLE, + _In_ PCSTR, + _In_ PVOID); + +typedef BOOL +(CALLBACK *PFIND_DEBUG_FILE_CALLBACKW)( + _In_ HANDLE, + _In_ PCWSTR, + _In_ PVOID); + +HANDLE +WINAPI +FindDebugInfoFileEx( + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR, + _In_opt_ PFIND_DEBUG_FILE_CALLBACK, + _In_opt_ PVOID); + +HANDLE +WINAPI +FindDebugInfoFileExW( + _In_ PCWSTR, + _In_ PCWSTR, + _Out_writes_(MAX_PATH + 1) PWSTR, + _In_opt_ PFIND_DEBUG_FILE_CALLBACKW, + _In_opt_ PVOID); + +HANDLE +WINAPI +SymFindDebugInfoFile( + _In_ HANDLE, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR, + _In_opt_ PFIND_DEBUG_FILE_CALLBACK, + _In_opt_ PVOID); + +HANDLE +WINAPI +SymFindDebugInfoFileW( + _In_ HANDLE, + _In_ PCWSTR, + _Out_writes_(MAX_PATH + 1) PWSTR, + _In_opt_ PFIND_DEBUG_FILE_CALLBACKW, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PFINDFILEINPATHCALLBACK)( + _In_ PCSTR, + _In_ PVOID); + +typedef BOOL +(CALLBACK *PFINDFILEINPATHCALLBACKW)( + _In_ PCWSTR, + _In_ PVOID); + BOOL WINAPI FindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, PSTR, PFINDFILEINPATHCALLBACK, PVOID); -BOOL WINAPI SymFindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, - PSTR, PFINDFILEINPATHCALLBACK, PVOID); -BOOL WINAPI SymFindFileInPathW(HANDLE, PCWSTR, PCWSTR, PVOID, DWORD, DWORD, DWORD, - PWSTR, PFINDFILEINPATHCALLBACKW, PVOID); -HANDLE WINAPI FindExecutableImage(PCSTR, PCSTR, PSTR); -typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACK)(HANDLE, PCSTR, PVOID); -typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACKW)(HANDLE, PCWSTR, PVOID); -HANDLE WINAPI FindExecutableImageEx(PCSTR, PCSTR, PSTR, PFIND_EXE_FILE_CALLBACK, PVOID); -HANDLE WINAPI FindExecutableImageExW(PCWSTR, PCWSTR, PWSTR, PFIND_EXE_FILE_CALLBACKW, PVOID); -HANDLE WINAPI SymFindExecutableImage(HANDLE, PCSTR, PSTR, PFIND_EXE_FILE_CALLBACK, PVOID); -HANDLE WINAPI SymFindExecutableImageW(HANDLE, PCWSTR, PWSTR, PFIND_EXE_FILE_CALLBACKW, PVOID); -PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID); -PVOID WINAPI ImageDirectoryEntryToDataEx(PVOID, BOOLEAN, USHORT, PULONG, - PIMAGE_SECTION_HEADER *); -PVOID WINAPI ImageDirectoryEntryToData(PVOID, BOOLEAN, USHORT, PULONG); -PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection(PIMAGE_NT_HEADERS, PVOID, ULONG); -PVOID WINAPI ImageRvaToVa(PIMAGE_NT_HEADERS, PVOID, ULONG, PIMAGE_SECTION_HEADER*); -BOOL WINAPI SymGetSearchPath(HANDLE, PSTR, DWORD); -BOOL WINAPI SymGetSearchPathW(HANDLE, PWSTR, DWORD); -BOOL WINAPI SymSetSearchPath(HANDLE, PCSTR); -BOOL WINAPI SymSetSearchPathW(HANDLE, PCWSTR); -DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE); -BOOL WINAPI MakeSureDirectoryPathExists(PCSTR); -BOOL WINAPI SearchTreeForFile(PCSTR, PCSTR, PSTR); -BOOL WINAPI SearchTreeForFileW(PCWSTR, PCWSTR, PWSTR); -typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACK)(PCSTR, PVOID); -typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACKW)(PCWSTR, PVOID); -BOOL WINAPI EnumDirTree(HANDLE, PCSTR, PCSTR, PSTR, PENUMDIRTREE_CALLBACK, PVOID); -BOOL WINAPI EnumDirTreeW(HANDLE, PCWSTR, PCWSTR, PWSTR, PENUMDIRTREE_CALLBACKW, PVOID); -BOOL WINAPI SymMatchFileName(PCSTR, PCSTR, PSTR*, PSTR*); -BOOL WINAPI SymMatchFileNameW(PCWSTR, PCWSTR, PWSTR*, PWSTR*); -PCHAR WINAPI SymSetHomeDirectory(HANDLE, PCSTR); -PWSTR WINAPI SymSetHomeDirectoryW(HANDLE, PCWSTR); -PCHAR WINAPI SymGetHomeDirectory(DWORD, PSTR, size_t); -PWSTR WINAPI SymGetHomeDirectoryW(DWORD, PWSTR, size_t); + +BOOL +WINAPI +SymFindFileInPath( + _In_ HANDLE, + _In_opt_ PCSTR, + _In_ PCSTR, + _In_opt_ PVOID, + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _Out_writes_(MAX_PATH + 1) PSTR, + _In_opt_ PFINDFILEINPATHCALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymFindFileInPathW( + _In_ HANDLE, + _In_opt_ PCWSTR, + _In_ PCWSTR, + _In_opt_ PVOID, + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _Out_writes_(MAX_PATH + 1) PWSTR, + _In_opt_ PFINDFILEINPATHCALLBACKW, + _In_opt_ PVOID); + +HANDLE +WINAPI +FindExecutableImage( + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR); + +typedef BOOL +(CALLBACK *PFIND_EXE_FILE_CALLBACK)( + _In_ HANDLE, + _In_ PCSTR, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PFIND_EXE_FILE_CALLBACKW)( + _In_ HANDLE, + _In_ PCWSTR, + _In_opt_ PVOID); + +HANDLE +WINAPI +FindExecutableImageEx( + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR, + _In_opt_ PFIND_EXE_FILE_CALLBACK, + _In_opt_ PVOID); + +HANDLE +WINAPI +FindExecutableImageExW( + _In_ PCWSTR, + _In_ PCWSTR, + _Out_writes_(MAX_PATH + 1) PWSTR, + _In_opt_ PFIND_EXE_FILE_CALLBACKW, + _In_opt_ PVOID); + +HANDLE +WINAPI +SymFindExecutableImage( + _In_ HANDLE, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR, + _In_ PFIND_EXE_FILE_CALLBACK, + _In_ PVOID); + +HANDLE +WINAPI +SymFindExecutableImageW( + _In_ HANDLE, + _In_ PCWSTR, + _Out_writes_(MAX_PATH + 1) PWSTR, + _In_ PFIND_EXE_FILE_CALLBACKW, + _In_ PVOID); + +PIMAGE_NT_HEADERS WINAPI ImageNtHeader(_In_ PVOID); + +PVOID +WINAPI +ImageDirectoryEntryToDataEx( + _In_ PVOID, + _In_ BOOLEAN, + _In_ USHORT, + _Out_ PULONG, + _Out_opt_ PIMAGE_SECTION_HEADER *); + +PVOID +WINAPI +ImageDirectoryEntryToData( + _In_ PVOID, + _In_ BOOLEAN, + _In_ USHORT, + _Out_ PULONG); + +PIMAGE_SECTION_HEADER +WINAPI +ImageRvaToSection( + _In_ PIMAGE_NT_HEADERS, + _In_ PVOID, + _In_ ULONG); + +PVOID +WINAPI +ImageRvaToVa( + _In_ PIMAGE_NT_HEADERS, + _In_ PVOID, + _In_ ULONG, + _In_opt_ PIMAGE_SECTION_HEADER*); + +BOOL +WINAPI +SymGetSearchPath( + _In_ HANDLE, + _Out_writes_(SearchPathLength) PSTR, + _In_ DWORD SearchPathLength); + +BOOL +WINAPI +SymGetSearchPathW( + _In_ HANDLE, + _Out_writes_(SearchPathLength) PWSTR, + _In_ DWORD SearchPathLength); + +BOOL WINAPI SymSetSearchPath(_In_ HANDLE, _In_opt_ PCSTR); +BOOL WINAPI SymSetSearchPathW(_In_ HANDLE, _In_opt_ PCWSTR); +DWORD WINAPI GetTimestampForLoadedLibrary(_In_ HMODULE); +BOOL WINAPI MakeSureDirectoryPathExists(_In_ PCSTR); + +BOOL +WINAPI +SearchTreeForFile( + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_(MAX_PATH + 1) PSTR); + +BOOL +WINAPI +SearchTreeForFileW( + _In_ PCWSTR, + _In_ PCWSTR, + _Out_writes_(MAX_PATH + 1) PWSTR); + +typedef BOOL +(CALLBACK *PENUMDIRTREE_CALLBACK)( + _In_ PCSTR, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PENUMDIRTREE_CALLBACKW)( + _In_ PCWSTR, + _In_opt_ PVOID); + +BOOL +WINAPI +EnumDirTree( + _In_opt_ HANDLE, + _In_ PCSTR, + _In_ PCSTR, + _Out_writes_opt_(MAX_PATH + 1) PSTR, + _In_opt_ PENUMDIRTREE_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +EnumDirTreeW( + _In_opt_ HANDLE, + _In_ PCWSTR, + _In_ PCWSTR, + _Out_writes_opt_(MAX_PATH + 1) PWSTR, + _In_opt_ PENUMDIRTREE_CALLBACKW, + _In_opt_ PVOID); + +BOOL +WINAPI +SymMatchFileName( + _In_ PCSTR, + _In_ PCSTR, + _Outptr_opt_ PSTR*, + _Outptr_opt_ PSTR*); + +BOOL +WINAPI +SymMatchFileNameW( + _In_ PCWSTR, + _In_ PCWSTR, + _Outptr_opt_ PWSTR*, + _Outptr_opt_ PWSTR*); + +PCHAR WINAPI SymSetHomeDirectory(_In_opt_ HANDLE, _In_opt_ PCSTR); +PWSTR WINAPI SymSetHomeDirectoryW(_In_opt_ HANDLE, _In_opt_ PCWSTR); + +PCHAR +WINAPI +SymGetHomeDirectory( + _In_ DWORD, + _Out_writes_(size) PSTR, + _In_ size_t size); + +PWSTR +WINAPI +SymGetHomeDirectoryW( + _In_ DWORD, + _Out_writes_(size) PWSTR, + _In_ size_t size); + #define hdBase 0 #define hdSym 1 #define hdSrc 2 @@ -1254,7 +2053,13 @@ /************************* * Context management * *************************/ -BOOL WINAPI SymSetContext(HANDLE, PIMAGEHLP_STACK_FRAME, PIMAGEHLP_CONTEXT); + +BOOL +WINAPI +SymSetContext( + _In_ HANDLE, + _In_ PIMAGEHLP_STACK_FRAME, + _In_opt_ PIMAGEHLP_CONTEXT); /************************* @@ -1325,22 +2130,57 @@ KDHELP64 KdHelp; } STACKFRAME64, *LPSTACKFRAME64; -typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE64) - (HANDLE, DWORD64, PVOID, DWORD, PDWORD); -typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE64)(HANDLE, DWORD64); -typedef DWORD64 (CALLBACK *PGET_MODULE_BASE_ROUTINE64)(HANDLE, DWORD64); -typedef DWORD64 (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE64)(HANDLE, HANDLE, LPADDRESS64); -BOOL WINAPI StackWalk64(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, - PREAD_PROCESS_MEMORY_ROUTINE64, - PFUNCTION_TABLE_ACCESS_ROUTINE64, - PGET_MODULE_BASE_ROUTINE64, - PTRANSLATE_ADDRESS_ROUTINE64); - -PVOID WINAPI SymFunctionTableAccess64(HANDLE, DWORD64); - -typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK64)(HANDLE, ULONG64, ULONG64); - -BOOL WINAPI SymRegisterFunctionEntryCallback64(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK64, ULONG64); +typedef BOOL +(CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE64)( + _In_ HANDLE, + _In_ DWORD64, + _Out_writes_bytes_(nSize) PVOID, + _In_ DWORD nSize, + _Out_ PDWORD); + +typedef PVOID +(CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE64)( + _In_ HANDLE, + _In_ DWORD64); + +typedef DWORD64 +(CALLBACK *PGET_MODULE_BASE_ROUTINE64)( + _In_ HANDLE, + _In_ DWORD64); + +typedef DWORD64 +(CALLBACK *PTRANSLATE_ADDRESS_ROUTINE64)( + _In_ HANDLE, + _In_ HANDLE, + _In_ LPADDRESS64); + +BOOL +WINAPI +StackWalk64( + _In_ DWORD, + _In_ HANDLE, + _In_ HANDLE, + _Inout_ LPSTACKFRAME64, + _Inout_ PVOID, + _In_opt_ PREAD_PROCESS_MEMORY_ROUTINE64, + _In_opt_ PFUNCTION_TABLE_ACCESS_ROUTINE64, + _In_opt_ PGET_MODULE_BASE_ROUTINE64, + _In_opt_ PTRANSLATE_ADDRESS_ROUTINE64); + +PVOID WINAPI SymFunctionTableAccess64(_In_ HANDLE, _In_ DWORD64); + +typedef PVOID +(CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK64)( + _In_ HANDLE, + _In_ ULONG64, + _In_ ULONG64); + +BOOL +WINAPI +SymRegisterFunctionEntryCallback64( + _In_ HANDLE, + _In_ PSYMBOL_FUNCENTRY_CALLBACK64, + _In_ ULONG64); /************************* * Version, global stuff * @@ -1357,7 +2197,7 @@ } API_VERSION, *LPAPI_VERSION; LPAPI_VERSION WINAPI ImagehlpApiVersion(void); -LPAPI_VERSION WINAPI ImagehlpApiVersionEx(LPAPI_VERSION); +LPAPI_VERSION WINAPI ImagehlpApiVersionEx(_In_ LPAPI_VERSION); typedef struct _IMAGE_DEBUG_INFORMATION { @@ -1395,14 +2235,20 @@ } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; -PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); - -BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); - -DWORD WINAPI SymGetOptions(void); -DWORD WINAPI SymSetOptions(DWORD); - -BOOL WINAPI SymSetParentWindow(HWND); +PIMAGE_DEBUG_INFORMATION +WINAPI +MapDebugInformation( + _In_opt_ HANDLE, + _In_ PCSTR, + _In_opt_ PCSTR, + _In_ ULONG); + +BOOL WINAPI UnmapDebugInformation(_Out_ PIMAGE_DEBUG_INFORMATION); + +DWORD WINAPI SymGetOptions(void); +DWORD WINAPI SymSetOptions(_In_ DWORD); + +BOOL WINAPI SymSetParentWindow(_In_ HWND); /************************* * Version, global stuff * @@ -1485,45 +2331,215 @@ #else -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PCSTR, ULONG, ULONG, PVOID); -typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE, DWORD); -typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE)(HANDLE, DWORD); -typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE, DWORD, PVOID, DWORD, PDWORD); -typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PCSTR, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, ULONG, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, ULONG, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK)(HANDLE, ULONG, PVOID, PVOID); -typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)(HANDLE, DWORD, PVOID); -typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE)(HANDLE, HANDLE, LPADDRESS); - -BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); -BOOL WINAPI StackWalk(DWORD, HANDLE, HANDLE, LPSTACKFRAME, PVOID, PREAD_PROCESS_MEMORY_ROUTINE, PFUNCTION_TABLE_ACCESS_ROUTINE, PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); -BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID); -BOOL WINAPI SymEnumerateSymbols(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACK, PVOID); -BOOL WINAPI SymEnumerateSymbolsW(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACKW, PVOID); -PVOID WINAPI SymFunctionTableAccess(HANDLE, DWORD); -BOOL WINAPI SymGetLineFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINE); -BOOL WINAPI SymGetLineFromAddrW(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINEW); -BOOL WINAPI SymGetLineFromName(HANDLE, PCSTR, PCSTR, DWORD, PLONG, PIMAGEHLP_LINE); -BOOL WINAPI SymGetLineNext(HANDLE, PIMAGEHLP_LINE); -BOOL WINAPI SymGetLineNextW(HANDLE, PIMAGEHLP_LINEW); -BOOL WINAPI SymGetLinePrev(HANDLE, PIMAGEHLP_LINE); -BOOL WINAPI SymGetLinePrevW(HANDLE, PIMAGEHLP_LINEW); -DWORD WINAPI SymGetModuleBase(HANDLE, DWORD); -BOOL WINAPI SymGetModuleInfo(HANDLE, DWORD, PIMAGEHLP_MODULE); -BOOL WINAPI SymGetModuleInfoW(HANDLE, DWORD, PIMAGEHLP_MODULEW); -BOOL WINAPI SymGetSymFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_SYMBOL); -BOOL WINAPI SymGetSymFromName(HANDLE, PCSTR, PIMAGEHLP_SYMBOL); -BOOL WINAPI SymGetSymNext(HANDLE, PIMAGEHLP_SYMBOL); -BOOL WINAPI SymGetSymNextW(HANDLE, PIMAGEHLP_SYMBOLW); -BOOL WINAPI SymGetSymPrev(HANDLE, PIMAGEHLP_SYMBOL); -BOOL WINAPI SymGetSymPrevW(HANDLE, PIMAGEHLP_SYMBOLW); -DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); -BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); -BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK, PVOID); -BOOL WINAPI SymRefreshModuleList(HANDLE); -BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); -BOOL WINAPI SymUnloadModule(HANDLE, DWORD); +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACK)( + _In_ PCSTR, + _In_ ULONG, + _In_ ULONG, + _In_opt_ PVOID); + +typedef PVOID +(CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE)( + _In_ HANDLE, + _In_ DWORD); + +typedef DWORD +(CALLBACK *PGET_MODULE_BASE_ROUTINE)( + _In_ HANDLE, + _In_ DWORD); + +typedef BOOL +(CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE)( + _In_ HANDLE, + _In_ DWORD, + _Out_writes_bytes_(nSize) PVOID, + _In_ DWORD nSize, + _Out_ PDWORD); + +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACK)( + _In_ PCSTR, + _In_ ULONG, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)( + _In_ PCSTR, + _In_ ULONG, + _In_ ULONG, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)( + _In_ PCWSTR, + _In_ ULONG, + _In_ ULONG, + _In_opt_ PVOID); + +typedef BOOL +(CALLBACK *PSYMBOL_REGISTERED_CALLBACK)( + _In_ HANDLE, + _In_ ULONG, + _In_opt_ PVOID, + _In_opt_ PVOID); + +typedef PVOID +(CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)( + _In_ HANDLE, + _In_ DWORD, + _In_opt_ PVOID); + +typedef DWORD +(CALLBACK *PTRANSLATE_ADDRESS_ROUTINE)( + _In_ HANDLE, + _In_ HANDLE, + _Out_ LPADDRESS); + +BOOL +WINAPI +EnumerateLoadedModules( + _In_ HANDLE, + _In_ PENUMLOADED_MODULES_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +StackWalk( + _In_ DWORD, + _In_ HANDLE, + _In_ HANDLE, + _Inout_ LPSTACKFRAME, + _Inout_ PVOID, + _In_opt_ PREAD_PROCESS_MEMORY_ROUTINE, + _In_opt_ PFUNCTION_TABLE_ACCESS_ROUTINE, + _In_opt_ PGET_MODULE_BASE_ROUTINE, + _In_opt_ PTRANSLATE_ADDRESS_ROUTINE); + +BOOL +WINAPI +SymEnumerateModules( + _In_ HANDLE, + _In_ PSYM_ENUMMODULES_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateSymbols( + _In_ HANDLE, + _In_ ULONG, + _In_ PSYM_ENUMSYMBOLS_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymEnumerateSymbolsW( + _In_ HANDLE, + _In_ ULONG, + _In_ PSYM_ENUMSYMBOLS_CALLBACKW, + _In_opt_ PVOID); + +PVOID WINAPI SymFunctionTableAccess(_In_ HANDLE, _In_ DWORD); + +BOOL +WINAPI +SymGetLineFromAddr( + _In_ HANDLE, + _In_ DWORD, + _Out_ PDWORD, + _Out_ PIMAGEHLP_LINE); + +BOOL +WINAPI +SymGetLineFromAddrW( + _In_ HANDLE, + _In_ DWORD, + _Out_ PDWORD, + _Out_ PIMAGEHLP_LINEW); + +BOOL +WINAPI +SymGetLineFromName( + _In_ HANDLE, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ DWORD, + _Out_ PLONG, + _Inout_ PIMAGEHLP_LINE); + +BOOL WINAPI SymGetLineNext(_In_ HANDLE, _Inout_ PIMAGEHLP_LINE); +BOOL WINAPI SymGetLineNextW(_In_ HANDLE, _Inout_ PIMAGEHLP_LINEW); +BOOL WINAPI SymGetLinePrev(_In_ HANDLE, _Inout_ PIMAGEHLP_LINE); +BOOL WINAPI SymGetLinePrevW(_In_ HANDLE, _Inout_ PIMAGEHLP_LINEW); +DWORD WINAPI SymGetModuleBase(_In_ HANDLE, _In_ DWORD); + +BOOL +WINAPI +SymGetModuleInfo( + _In_ HANDLE, + _In_ DWORD, + _Out_ PIMAGEHLP_MODULE); + +BOOL +WINAPI +SymGetModuleInfoW( + _In_ HANDLE, + _In_ DWORD, + _Out_ PIMAGEHLP_MODULEW); + +BOOL +WINAPI +SymGetSymFromAddr( + _In_ HANDLE, + _In_ DWORD, + _Out_opt_ PDWORD, + _Inout_ PIMAGEHLP_SYMBOL); + +BOOL +WINAPI +SymGetSymFromName( + _In_ HANDLE, + _In_ PCSTR, + _Inout_ PIMAGEHLP_SYMBOL); + +BOOL WINAPI SymGetSymNext(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOL); +BOOL WINAPI SymGetSymNextW(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOLW); +BOOL WINAPI SymGetSymPrev(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOL); +BOOL WINAPI SymGetSymPrevW(_In_ HANDLE, _Inout_ PIMAGEHLP_SYMBOLW); + +DWORD +WINAPI +SymLoadModule( + _In_ HANDLE, + _In_opt_ HANDLE, + _In_opt_ PCSTR, + _In_opt_ PCSTR, + _In_ DWORD, + _In_ DWORD); + +BOOL +WINAPI +SymRegisterCallback( + _In_ HANDLE, + _In_ PSYMBOL_REGISTERED_CALLBACK, + _In_opt_ PVOID); + +BOOL +WINAPI +SymRegisterFunctionEntryCallback( + _In_ HANDLE, + _In_ PSYMBOL_FUNCENTRY_CALLBACK, + _In_opt_ PVOID); + +BOOL WINAPI SymRefreshModuleList(_In_ HANDLE); + +BOOL +WINAPI +SymUnDName( + _In_ PIMAGEHLP_SYMBOL, + _Out_writes_(UnDecNameLength) PSTR, + _In_ DWORD UnDecNameLength); + +BOOL WINAPI SymUnloadModule(_In_ HANDLE, _In_ DWORD); #endif

1 0

[aandrejevic] 59757: [SOFT386] Add definition for Soft386Interrupt. Implement Soft386DumpState.
by aandrejevic＠svn.reactos.org 17 Aug '13

17 Aug '13

Author: aandrejevic Date: Sat Aug 17 01:41:22 2013 New Revision: 59757 URL: http://svn.reactos.org/svn/reactos?rev=59757&view=rev Log: [SOFT386] Add definition for Soft386Interrupt. Implement Soft386DumpState. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Sat Aug 17 01:41:22 2013 @@ -289,6 +289,10 @@ NTAPI Soft386Reset(PSOFT386_STATE State); +VOID +NTAPI +Soft386Interrupt(PSOFT386_STATE State, UCHAR Number); + #endif // _SOFT386_H_ /* EOF */ Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Sat Aug 17 01:41:22 2013 @@ -69,8 +69,94 @@ NTAPI Soft386DumpState(PSOFT386_STATE State) { - // TODO: NOT IMPLEMENTED!!! - UNIMPLEMENTED; + DPRINT1("\nCPU currently executing in %s mode at %04X:%08X\n" + "Time Stamp Counter = %016X\n", + (State->ControlRegisters[0] & SOFT386_CR0_PE) ? "protected" : "real", + State->SegmentRegs[SOFT386_REG_CS].Selector, + State->InstPtr.Long, + State->TimeStampCounter); + DPRINT1("\nGeneral purpose registers:\n" + "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" + "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", + State->GeneralRegs[SOFT386_REG_EAX].Long, + State->GeneralRegs[SOFT386_REG_ECX].Long, + State->GeneralRegs[SOFT386_REG_EDX].Long, + State->GeneralRegs[SOFT386_REG_EBX].Long, + State->GeneralRegs[SOFT386_REG_ESP].Long, + State->GeneralRegs[SOFT386_REG_EBP].Long, + State->GeneralRegs[SOFT386_REG_ESI].Long, + State->GeneralRegs[SOFT386_REG_EDI].Long); + DPRINT1("\nSegment registers:\n" + "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", + State->SegmentRegs[SOFT386_REG_ES].Selector, + State->SegmentRegs[SOFT386_REG_ES].Base, + State->SegmentRegs[SOFT386_REG_ES].Limit, + State->SegmentRegs[SOFT386_REG_ES].Dpl, + State->SegmentRegs[SOFT386_REG_CS].Selector, + State->SegmentRegs[SOFT386_REG_CS].Base, + State->SegmentRegs[SOFT386_REG_CS].Limit, + State->SegmentRegs[SOFT386_REG_CS].Dpl, + State->SegmentRegs[SOFT386_REG_SS].Selector, + State->SegmentRegs[SOFT386_REG_SS].Base, + State->SegmentRegs[SOFT386_REG_SS].Limit, + State->SegmentRegs[SOFT386_REG_SS].Dpl, + State->SegmentRegs[SOFT386_REG_DS].Selector, + State->SegmentRegs[SOFT386_REG_DS].Base, + State->SegmentRegs[SOFT386_REG_DS].Limit, + State->SegmentRegs[SOFT386_REG_DS].Dpl, + State->SegmentRegs[SOFT386_REG_FS].Selector, + State->SegmentRegs[SOFT386_REG_FS].Base, + State->SegmentRegs[SOFT386_REG_FS].Limit, + State->SegmentRegs[SOFT386_REG_FS].Dpl, + State->SegmentRegs[SOFT386_REG_GS].Selector, + State->SegmentRegs[SOFT386_REG_GS].Base, + State->SegmentRegs[SOFT386_REG_GS].Limit, + State->SegmentRegs[SOFT386_REG_GS].Dpl); + DPRINT1("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", + State->Flags.Long, + State->Flags.Cf ? "CF" : "cf", + State->Flags.Pf ? "PF" : "pf", + State->Flags.Af ? "AF" : "af", + State->Flags.Zf ? "ZF" : "zf", + State->Flags.Sf ? "SF" : "sf", + State->Flags.Tf ? "TF" : "tf", + State->Flags.If ? "IF" : "if", + State->Flags.Df ? "DF" : "df", + State->Flags.Of ? "OF" : "of", + State->Flags.Nt ? "NT" : "nt", + State->Flags.Rf ? "RF" : "rf", + State->Flags.Vm ? "VM" : "vm", + State->Flags.Ac ? "AC" : "ac", + State->Flags.Vif ? "VIF" : "vif", + State->Flags.Vip ? "VIP" : "vip", + State->Flags.Iopl); + DPRINT1("\nControl Registers:\n" + "CR0 = %08X\tCR1 = %08X\tCR2 = %08X\tCR3 = %08X\n" + "CR4 = %08X\tCR5 = %08X\tCR6 = %08X\tCR7 = %08X\n", + State->ControlRegisters[SOFT386_REG_CR0], + State->ControlRegisters[SOFT386_REG_CR1], + State->ControlRegisters[SOFT386_REG_CR2], + State->ControlRegisters[SOFT386_REG_CR3], + State->ControlRegisters[SOFT386_REG_CR4], + State->ControlRegisters[SOFT386_REG_CR5], + State->ControlRegisters[SOFT386_REG_CR6], + State->ControlRegisters[SOFT386_REG_CR7]); + DPRINT1("\nDebug Registers:\n" + "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\tDR3 = %08X\n" + "DR4 = %08X\tDR5 = %08X\tDR6 = %08X\tDR7 = %08X\n", + State->DebugRegisters[SOFT386_REG_DR0], + State->DebugRegisters[SOFT386_REG_DR1], + State->DebugRegisters[SOFT386_REG_DR2], + State->DebugRegisters[SOFT386_REG_DR3], + State->DebugRegisters[SOFT386_REG_DR4], + State->DebugRegisters[SOFT386_REG_DR5], + State->DebugRegisters[SOFT386_REG_DR6], + State->DebugRegisters[SOFT386_REG_DR7]); } VOID @@ -108,7 +194,7 @@ State->Idtr.Address = 0; /* Initialize CR0 */ - State->ControlRegisters[0] |= SOFT386_CR0_ET; + State->ControlRegisters[SOFT386_REG_CR0] |= SOFT386_CR0_ET; /* Restore the callbacks */ State->MemReadCallback = MemReadCallback; @@ -116,3 +202,11 @@ State->IoReadCallback = IoReadCallback; State->IoWriteCallback = IoWriteCallback; } + +VOID +NTAPI +Soft386Interrupt(PSOFT386_STATE State, UCHAR Number) +{ + // TODO: NOT IMPLEMENTED!!! + UNIMPLEMENTED; +}

1 0

[akhaldi] 59756: [PSDK] * Annotate objbase.h.
by akhaldi＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: akhaldi Date: Fri Aug 16 22:05:23 2013 New Revision: 59756 URL: http://svn.reactos.org/svn/reactos?rev=59756&view=rev Log: [PSDK] * Annotate objbase.h. Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Fri Aug 16 22:05:23 2013 @@ -322,37 +322,108 @@ COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */ } COINIT; -HRESULT WINAPI CoInitialize(LPVOID lpReserved); -HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); +_Check_return_ HRESULT WINAPI CoInitialize(_In_opt_ LPVOID lpReserved); + +_Check_return_ +HRESULT +WINAPI +CoInitializeEx( + _In_opt_ LPVOID lpReserved, + _In_ DWORD dwCoInit); + void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); -HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); +HINSTANCE WINAPI CoLoadLibrary(_In_ LPOLESTR lpszLibName, _In_ BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); -void WINAPI CoFreeLibrary(HINSTANCE hLibrary); +void WINAPI CoFreeLibrary(_In_ HINSTANCE hLibrary); void WINAPI CoFreeUnusedLibraries(void); -void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved); - -HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv); -HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - COSERVERINFO* pServerInfo, - ULONG cmq, - MULTI_QI* pResults); - -HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults); -HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); - -HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc); -LPVOID WINAPI CoTaskMemAlloc(ULONG size) __WINE_ALLOC_SIZE(1); -void WINAPI CoTaskMemFree(LPVOID ptr); -LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size); - -HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy); + +void +WINAPI +CoFreeUnusedLibrariesEx( + _In_ DWORD dwUnloadDelay, + _In_ DWORD dwReserved); + +_Check_return_ +HRESULT +WINAPI +CoCreateInstance( + _In_ REFCLSID rclsid, + _In_opt_ LPUNKNOWN pUnkOuter, + _In_ DWORD dwClsContext, + _In_ REFIID iid, + _Outptr_ _At_(*ppv, _Post_readable_size_(_Inexpressible_(varies))) LPVOID *ppv); + +_Check_return_ +HRESULT +WINAPI +CoCreateInstanceEx( + _In_ REFCLSID rclsid, + _In_opt_ LPUNKNOWN pUnkOuter, + _In_ DWORD dwClsContext, + _In_opt_ COSERVERINFO *pServerInfo, + _In_ ULONG cmq, + _Inout_updates_(cmq) MULTI_QI *pResults); + +_Check_return_ +HRESULT +WINAPI +CoGetInstanceFromFile( + _In_opt_ COSERVERINFO *pServerInfo, + _In_opt_ CLSID *pClsid, + _In_opt_ IUnknown *punkOuter, + _In_ DWORD dwClsCtx, + _In_ DWORD grfMode, + _In_ _Null_terminated_ OLECHAR *pwszName, + _In_ DWORD dwCount, + _Inout_updates_(dwCount) MULTI_QI *pResults); + +_Check_return_ +HRESULT +WINAPI +CoGetInstanceFromIStorage( + _In_opt_ COSERVERINFO *pServerInfo, + _In_opt_ CLSID *pClsid, + _In_opt_ IUnknown *punkOuter, + _In_ DWORD dwClsCtx, + _In_ IStorage *pstg, + _In_ DWORD dwCount, + _Inout_updates_(dwCount) MULTI_QI *pResults); + +_Check_return_ +HRESULT +WINAPI +CoGetMalloc( + _In_ DWORD dwMemContext, + _Outptr_ LPMALLOC *lpMalloc); + +_Ret_opt_ +_Post_writable_byte_size_(size) +__drv_allocatesMem(Mem) +_Check_return_ +LPVOID +WINAPI +CoTaskMemAlloc(_In_ ULONG size) __WINE_ALLOC_SIZE(1); + +void +WINAPI +CoTaskMemFree( + _In_opt_ __drv_freesMem(Mem) _Post_invalid_ LPVOID ptr); + +_Ret_opt_ +_Post_writable_byte_size_(size) +_When_(size > 0, __drv_allocatesMem(Mem) _Check_return_) +LPVOID +WINAPI +CoTaskMemRealloc( + _In_opt_ __drv_freesMem(Mem) _Post_invalid_ LPVOID ptr, + _In_ ULONG size); + +HRESULT WINAPI CoRegisterMallocSpy(_In_ LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void); -HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ); +_Check_return_ HRESULT WINAPI CoGetContextToken(_Out_ ULONG_PTR *token); /* class registration flags; passed to CoRegisterClassObject */ typedef enum tagREGCLS @@ -364,60 +435,286 @@ REGCLS_SURROGATE = 8 } REGCLS; -HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv); -HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsContext,DWORD flags,LPDWORD lpdwRegister); -HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister); -HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid); -HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid); -HRESULT WINAPI CoRegisterSurrogate(LPSURROGATE pSurrogate); -HRESULT WINAPI CoSuspendClassObjects(void); -HRESULT WINAPI CoResumeClassObjects(void); +_Check_return_ +HRESULT +WINAPI +CoGetClassObject( + _In_ REFCLSID rclsid, + _In_ DWORD dwClsContext, + _In_opt_ COSERVERINFO *pServerInfo, + _In_ REFIID iid, + _Outptr_ LPVOID *ppv); + +_Check_return_ +HRESULT +WINAPI +CoRegisterClassObject( + _In_ REFCLSID rclsid, + _In_ LPUNKNOWN pUnk, + _In_ DWORD dwClsContext, + _In_ DWORD flags, + _Out_ LPDWORD lpdwRegister); + +_Check_return_ +HRESULT +WINAPI +CoRevokeClassObject( + _In_ DWORD dwRegister); + +_Check_return_ +HRESULT +WINAPI +CoGetPSClsid( + _In_ REFIID riid, + _Out_ CLSID *pclsid); + +_Check_return_ +HRESULT +WINAPI +CoRegisterPSClsid( + _In_ REFIID riid, + _In_ REFCLSID rclsid); + +_Check_return_ HRESULT WINAPI CoRegisterSurrogate(_In_ LPSURROGATE pSurrogate); +_Check_return_ HRESULT WINAPI CoSuspendClassObjects(void); +_Check_return_ HRESULT WINAPI CoResumeClassObjects(void); ULONG WINAPI CoAddRefServerProcess(void); ULONG WINAPI CoReleaseServerProcess(void); /* marshalling */ -HRESULT WINAPI CoCreateFreeThreadedMarshaler(LPUNKNOWN punkOuter, LPUNKNOWN* ppunkMarshal); -HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID iid, LPVOID* ppv); -HRESULT WINAPI CoGetMarshalSizeMax(ULONG* pulSize, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags); -HRESULT WINAPI CoGetStandardMarshal(REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL* ppMarshal); -HRESULT WINAPI CoMarshalHresult(LPSTREAM pstm, HRESULT hresult); -HRESULT WINAPI CoMarshalInterface(LPSTREAM pStm, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags); -HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, LPUNKNOWN pUnk, LPSTREAM* ppStm); -HRESULT WINAPI CoReleaseMarshalData(LPSTREAM pStm); -HRESULT WINAPI CoDisconnectObject(LPUNKNOWN lpUnk, DWORD reserved); -HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult); -HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv); -HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases); -BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk); + +_Check_return_ +HRESULT +WINAPI +CoCreateFreeThreadedMarshaler( + _In_opt_ LPUNKNOWN punkOuter, + _Outptr_ LPUNKNOWN *ppunkMarshal); + +_Check_return_ +HRESULT +WINAPI +CoGetInterfaceAndReleaseStream( + _In_ LPSTREAM pStm, + _In_ REFIID iid, + _Outptr_ LPVOID *ppv); + +_Check_return_ +HRESULT +WINAPI +CoGetMarshalSizeMax( + _Out_ ULONG *pulSize, + _In_ REFIID riid, + _In_ LPUNKNOWN pUnk, + _In_ DWORD dwDestContext, + _In_opt_ LPVOID pvDestContext, + _In_ DWORD mshlflags); + +_Check_return_ +HRESULT +WINAPI +CoGetStandardMarshal( + _In_ REFIID riid, + _In_ LPUNKNOWN pUnk, + _In_ DWORD dwDestContext, + _In_opt_ LPVOID pvDestContext, + _In_ DWORD mshlflags, + _Outptr_ LPMARSHAL *ppMarshal); + +HRESULT WINAPI CoMarshalHresult(_In_ LPSTREAM pstm, _In_ HRESULT hresult); + +_Check_return_ +HRESULT +WINAPI +CoMarshalInterface( + _In_ LPSTREAM pStm, + _In_ REFIID riid, + _In_ LPUNKNOWN pUnk, + _In_ DWORD dwDestContext, + _In_opt_ LPVOID pvDestContext, + _In_ DWORD mshlflags); + +_Check_return_ +HRESULT +WINAPI +CoMarshalInterThreadInterfaceInStream( + _In_ REFIID riid, + _In_ LPUNKNOWN pUnk, + _Outptr_ LPSTREAM *ppStm); + +_Check_return_ HRESULT WINAPI CoReleaseMarshalData(_In_ LPSTREAM pStm); + +_Check_return_ +HRESULT +WINAPI +CoDisconnectObject( + _In_ LPUNKNOWN lpUnk, + _In_ DWORD reserved); + +HRESULT WINAPI CoUnmarshalHresult(_In_ LPSTREAM pstm, _Out_ HRESULT *phresult); + +_Check_return_ +HRESULT +WINAPI +CoUnmarshalInterface( + _In_ LPSTREAM pStm, + _In_ REFIID riid, + _Outptr_ LPVOID *ppv); + +_Check_return_ +HRESULT +WINAPI +CoLockObjectExternal( + _In_ LPUNKNOWN pUnk, + _In_ BOOL fLock, + _In_ BOOL fLastUnlockReleases); + +BOOL WINAPI CoIsHandlerConnected(_In_ LPUNKNOWN pUnk); /* security */ -HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3); -HRESULT WINAPI CoGetCallContext(REFIID riid, void** ppInterface); -HRESULT WINAPI CoSwitchCallContext(IUnknown *pContext, IUnknown **ppOldContext); -HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc); - -HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilities); -HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities); -HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy); - -HRESULT WINAPI CoImpersonateClient(void); -HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities); -HRESULT WINAPI CoRevertToSelf(void); + +_Check_return_ +HRESULT +WINAPI +CoInitializeSecurity( + _In_opt_ PSECURITY_DESCRIPTOR pSecDesc, + _In_ LONG cAuthSvc, + _In_reads_opt_(cAuthSvc) SOLE_AUTHENTICATION_SERVICE *asAuthSvc, + _In_opt_ void *pReserved1, + _In_ DWORD dwAuthnLevel, + _In_ DWORD dwImpLevel, + _In_opt_ void *pReserved2, + _In_ DWORD dwCapabilities, + _In_opt_ void *pReserved3); + +_Check_return_ +HRESULT +WINAPI +CoGetCallContext( + _In_ REFIID riid, + _Outptr_ void **ppInterface); + +_Check_return_ +HRESULT +WINAPI +CoSwitchCallContext( + _In_opt_ IUnknown *pContext, + _Outptr_ IUnknown **ppOldContext); + +_Check_return_ +HRESULT +WINAPI +CoQueryAuthenticationServices( + _Out_ DWORD *pcAuthSvc, + _Outptr_result_buffer_(*pcAuthSvc) SOLE_AUTHENTICATION_SERVICE **asAuthSvc); + +_Check_return_ +HRESULT +WINAPI +CoQueryProxyBlanket( + _In_ IUnknown *pProxy, + _Out_opt_ DWORD *pwAuthnSvc, + _Out_opt_ DWORD *pAuthzSvc, + _Outptr_opt_ OLECHAR **pServerPrincName, + _Out_opt_ DWORD *pAuthnLevel, + _Out_opt_ DWORD *pImpLevel, + _Out_opt_ RPC_AUTH_IDENTITY_HANDLE *pAuthInfo, + _Out_opt_ DWORD *pCapabilities); + +_Check_return_ +HRESULT +WINAPI +CoSetProxyBlanket( + _In_ IUnknown *pProxy, + _In_ DWORD dwAuthnSvc, + _In_ DWORD dwAuthzSvc, + _In_opt_ OLECHAR *pServerPrincName, + _In_ DWORD dwAuthnLevel, + _In_ DWORD dwImpLevel, + _In_opt_ RPC_AUTH_IDENTITY_HANDLE pAuthInfo, + _In_ DWORD dwCapabilities); + +_Check_return_ +HRESULT +WINAPI CoCopyProxy( + _In_ IUnknown *pProxy, + _Outptr_ IUnknown **ppCopy); + +_Check_return_ HRESULT WINAPI CoImpersonateClient(void); + +_Check_return_ +HRESULT +WINAPI +CoQueryClientBlanket( + _Out_opt_ DWORD *pAuthnSvc, + _Out_opt_ DWORD *pAuthzSvc, + _Outptr_opt_ OLECHAR **pServerPrincName, + _Out_opt_ DWORD *pAuthnLevel, + _Out_opt_ DWORD *pImpLevel, + _Outptr_opt_ RPC_AUTHZ_HANDLE *pPrivs, + _Inout_opt_ DWORD *pCapabilities); + +_Check_return_ HRESULT WINAPI CoRevertToSelf(void); /* misc */ -HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew); -HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew); -HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, LPVOID lpvReserved); -HRESULT WINAPI CoGetObjectContext(REFIID riid, LPVOID *ppv); - -HRESULT WINAPI CoCreateGuid(GUID* pguid); -BOOL WINAPI CoIsOle1Class(REFCLSID rclsid); - -BOOL WINAPI CoDosDateTimeToFileTime(WORD nDosDate, WORD nDosTime, FILETIME* lpFileTime); -BOOL WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime); -HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime); -HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter); -HRESULT WINAPI CoRegisterChannelHook(REFGUID ExtensionGuid, IChannelHook *pChannelHook); + +_Check_return_ +HRESULT +WINAPI +CoGetTreatAsClass( + _In_ REFCLSID clsidOld, + _Out_ LPCLSID pClsidNew); + +_Check_return_ +HRESULT +WINAPI +CoTreatAsClass( + _In_ REFCLSID clsidOld, + _In_ REFCLSID clsidNew); + +HRESULT +WINAPI +CoAllowSetForegroundWindow( + _In_ IUnknown *pUnk, + _In_opt_ LPVOID lpvReserved); + +_Check_return_ +HRESULT +WINAPI +CoGetObjectContext( + _In_ REFIID riid, + _Outptr_ LPVOID *ppv); + +_Check_return_ HRESULT WINAPI CoCreateGuid(_Out_ GUID *pguid); +BOOL WINAPI CoIsOle1Class(_In_ REFCLSID rclsid); + +BOOL +WINAPI +CoDosDateTimeToFileTime( + _In_ WORD nDosDate, + _In_ WORD nDosTime, + _Out_ FILETIME *lpFileTime); + +BOOL +WINAPI +CoFileTimeToDosDateTime( + _In_ FILETIME *lpFileTime, + _Out_ WORD *lpDosDate, + _Out_ WORD *lpDosTime); + +HRESULT WINAPI CoFileTimeNow(_Out_ FILETIME *lpFileTime); + +_Check_return_ +HRESULT +WINAPI +CoRegisterMessageFilter( + _In_opt_ LPMESSAGEFILTER lpMessageFilter, + _Outptr_opt_result_maybenull_ LPMESSAGEFILTER *lplpMessageFilter); + +HRESULT +WINAPI +CoRegisterChannelHook( + _In_ REFGUID ExtensionGuid, + _In_ IChannelHook *pChannelHook); typedef enum tagCOWAIT_FLAGS { @@ -425,22 +722,68 @@ COWAIT_ALERTABLE = 0x00000002 } COWAIT_FLAGS; -HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHandles,LPHANDLE pHandles,LPDWORD lpdwindex); +_Check_return_ +HRESULT +WINAPI +CoWaitForMultipleHandles( + _In_ DWORD dwFlags, + _In_ DWORD dwTimeout, + _In_ ULONG cHandles, + _In_reads_(cHandles) LPHANDLE pHandles, + _Out_ LPDWORD lpdwindex); /***************************************************************************** * GUID API */ -HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*); -HRESULT WINAPI CLSIDFromString(LPCOLESTR, LPCLSID); -HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid); -HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID); - -INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); + +_Check_return_ +HRESULT +WINAPI +StringFromCLSID( + _In_ REFCLSID id, + _Outptr_ LPOLESTR*); + +_Check_return_ +HRESULT +WINAPI +CLSIDFromString( + _In_ LPCOLESTR, + _Out_ LPCLSID); + +_Check_return_ +HRESULT +WINAPI +CLSIDFromProgID( + _In_ LPCOLESTR progid, + _Out_ LPCLSID riid); + +_Check_return_ +HRESULT +WINAPI +ProgIDFromCLSID( + _In_ REFCLSID clsid, + _Outptr_ LPOLESTR *lplpszProgID); + +_Check_return_ +INT +WINAPI +StringFromGUID2( + _In_ REFGUID id, + _Out_writes_to_(cmax, return) LPOLESTR str, + _In_ INT cmax); /***************************************************************************** * COM Server dll - exports */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; + +_Check_return_ +HRESULT +WINAPI +DllGetClassObject( + _In_ REFCLSID rclsid, + _In_ REFIID riid, + _Outptr_ LPVOID *ppv) DECLSPEC_HIDDEN; + HRESULT WINAPI DllCanUnloadNow(void) DECLSPEC_HIDDEN; /* shouldn't be here, but is nice for type checking */ @@ -453,27 +796,134 @@ /***************************************************************************** * Data Object */ -HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder); -HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, LPVOID* ppv); + +HRESULT +WINAPI +CreateDataAdviseHolder( + _Outptr_ LPDATAADVISEHOLDER *ppDAHolder); + +HRESULT +WINAPI +CreateDataCache( + _In_opt_ LPUNKNOWN pUnkOuter, + _In_ REFCLSID rclsid, + _In_ REFIID iid, + _Out_ LPVOID *ppv); /***************************************************************************** * Moniker API */ -HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID iidResult, LPVOID* ppvResult); -HRESULT WINAPI CoGetObject(LPCWSTR pszName, BIND_OPTS *pBindOptions, REFIID riid, void **ppv); -HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk); -HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc); -HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, LPMONIKER* ppmk); -HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk); -HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite); -HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk); -HRESULT WINAPI CreateObjrefMoniker(LPUNKNOWN punk, LPMONIKER * ppmk); -HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER * ppmk); -HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid); -HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot); -HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName, ULONG * pchEaten, LPMONIKER * ppmk); -HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon); -HRESULT WINAPI MonikerRelativePathTo(LPMONIKER pmkSrc, LPMONIKER pmkDest, LPMONIKER * ppmkRelPath, BOOL dwReserved); + +_Check_return_ +HRESULT +WINAPI +BindMoniker( + _In_ LPMONIKER pmk, + _In_ DWORD grfOpt, + _In_ REFIID iidResult, + _Outptr_ LPVOID *ppvResult); + +_Check_return_ +HRESULT +WINAPI +CoGetObject( + _In_ LPCWSTR pszName, + _In_opt_ BIND_OPTS *pBindOptions, + _In_ REFIID riid, + _Outptr_ void **ppv); + +_Check_return_ HRESULT WINAPI CreateAntiMoniker(_Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +CreateBindCtx( + _In_ DWORD reserved, + _Outptr_ LPBC *ppbc); + +_Check_return_ +HRESULT +WINAPI +CreateClassMoniker( + _In_ REFCLSID rclsid, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +CreateFileMoniker( + _In_ LPCOLESTR lpszPathName, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +CreateGenericComposite( + _In_opt_ LPMONIKER pmkFirst, + _In_opt_ LPMONIKER pmkRest, + _Outptr_ LPMONIKER *ppmkComposite); + +_Check_return_ +HRESULT +WINAPI +CreateItemMoniker( + _In_ LPCOLESTR lpszDelim, + _In_ LPCOLESTR lpszItem, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +CreateObjrefMoniker( + _In_opt_ LPUNKNOWN punk, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +CreatePointerMoniker( + _In_opt_ LPUNKNOWN punk, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +GetClassFile( + _In_ LPCOLESTR filePathName, + _Out_ CLSID *pclsid); + +_Check_return_ +HRESULT +WINAPI +GetRunningObjectTable( + _In_ DWORD reserved, + _Outptr_ LPRUNNINGOBJECTTABLE *pprot); + +_Check_return_ +HRESULT +WINAPI +MkParseDisplayName( + _In_ LPBC pbc, + _In_ LPCOLESTR szUserName, + _Out_ ULONG *pchEaten, + _Outptr_ LPMONIKER *ppmk); + +_Check_return_ +HRESULT +WINAPI +MonikerCommonPrefixWith( + _In_ IMoniker *pmkThis, + _In_ IMoniker *pmkOther, + _Outptr_ IMoniker **ppmkCommon); + +_Check_return_ +HRESULT +WINAPI +MonikerRelativePathTo( + _In_ LPMONIKER pmkSrc, + _In_ LPMONIKER pmkDest, + _Outptr_ LPMONIKER *ppmkRelPath, + _In_ BOOL dwReserved); /***************************************************************************** * Storage API @@ -510,17 +960,99 @@ const WCHAR* pwcsTemplateFile; } STGOPTIONS; -HRESULT WINAPI StringFromIID(REFIID rclsid, LPOLESTR *lplpsz); -HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen); -HRESULT WINAPI StgCreateStorageEx(const WCHAR*,DWORD,DWORD,DWORD,STGOPTIONS*,void*,REFIID,void**); -HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn); -HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt); -HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen); -HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcwName,DWORD grfMode,DWORD stgfmt,DWORD grfAttrs,STGOPTIONS *pStgOptions, void *reserved, REFIID riid, void **ppObjectOpen); - -HRESULT WINAPI StgCreateDocfileOnILockBytes(ILockBytes *plkbyt,DWORD grfMode, DWORD reserved, IStorage** ppstgOpen); -HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstgOpen); -HRESULT WINAPI StgSetTimes( OLECHAR const *lpszName, FILETIME const *pctime, FILETIME const *patime, FILETIME const *pmtime); +_Check_return_ +HRESULT +WINAPI +StringFromIID( + _In_ REFIID rclsid, + _Outptr_ LPOLESTR *lplpsz); + +_Check_return_ +HRESULT +WINAPI +StgCreateDocfile( + _In_opt_ _Null_terminated_ LPCOLESTR pwcsName, + _In_ DWORD grfMode, + _Reserved_ DWORD reserved, + _Outptr_ IStorage **ppstgOpen); + +_Check_return_ +HRESULT +WINAPI +StgCreateStorageEx( + _In_opt_ _Null_terminated_ const WCHAR*, + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _Inout_opt_ STGOPTIONS*, + _In_opt_ void*, + _In_ REFIID, + _Outptr_ void**); + +_Check_return_ +HRESULT +WINAPI +StgIsStorageFile( + _In_ _Null_terminated_ LPCOLESTR fn); + +_Check_return_ +HRESULT +WINAPI +StgIsStorageILockBytes( + _In_ ILockBytes *plkbyt); + +_Check_return_ +HRESULT +WINAPI +StgOpenStorage( + _In_opt_ _Null_terminated_ const OLECHAR *pwcsName, + _In_opt_ IStorage *pstgPriority, + _In_ DWORD grfMode, + _In_opt_z_ SNB snbExclude, + _In_ DWORD reserved, + _Outptr_ IStorage **ppstgOpen); + +_Check_return_ +HRESULT +WINAPI +StgOpenStorageEx( + _In_ _Null_terminated_ const WCHAR *pwcwName, + _In_ DWORD grfMode, + _In_ DWORD stgfmt, + _In_ DWORD grfAttrs, + _Inout_opt_ STGOPTIONS *pStgOptions, + _In_opt_ void *reserved, + _In_ REFIID riid, + _Outptr_ void **ppObjectOpen); + +_Check_return_ +HRESULT +WINAPI +StgCreateDocfileOnILockBytes( + _In_ ILockBytes *plkbyt, + _In_ DWORD grfMode, + _In_ DWORD reserved, + _Outptr_ IStorage **ppstgOpen); + +_Check_return_ +HRESULT +WINAPI +StgOpenStorageOnILockBytes( + _In_ ILockBytes *plkbyt, + _In_opt_ IStorage *pstgPriority, + _In_ DWORD grfMode, + _In_opt_z_ SNB snbExclude, + _Reserved_ DWORD reserved, + _Outptr_ IStorage **ppstgOpen); + +_Check_return_ +HRESULT +WINAPI +StgSetTimes( + _In_ _Null_terminated_ OLECHAR const *lpszName, + _In_opt_ FILETIME const *pctime, + _In_opt_ FILETIME const *patime, + _In_opt_ FILETIME const *pmtime); #ifdef __cplusplus }

1 0

[akhaldi] 59755: [CRT] * Annotate mbstring_s.h. * Update _mbsnbcpy_s() annotation in mbstring.h.
by akhaldi＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: akhaldi Date: Fri Aug 16 21:13:36 2013 New Revision: 59755 URL: http://svn.reactos.org/svn/reactos?rev=59755&view=rev Log: [CRT] * Annotate mbstring_s.h. * Update _mbsnbcpy_s() annotation in mbstring.h. Modified: trunk/reactos/include/crt/mbstring.h trunk/reactos/include/crt/sec_api/mbstring_s.h Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… ============================================================================== --- trunk/reactos/include/crt/mbstring.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbstring.h [iso-8859-1] Fri Aug 16 21:13:36 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_MBSTRING #define _INC_MBSTRING @@ -390,13 +391,13 @@ _In_ size_t _Count); _CRTIMP - int + errno_t __cdecl _mbsnbcpy_s( - _Out_writes_z_(size) unsigned char* dst, - _In_ size_t size, - _In_z_ const unsigned char* src, - _In_ size_t n); + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount); _CRTIMP unsigned char* Modified: trunk/reactos/include/crt/sec_api/mbstring_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/mbstri… ============================================================================== --- trunk/reactos/include/crt/sec_api/mbstring_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/mbstring_s.h [iso-8859-1] Fri Aug 16 21:13:36 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_MBSTRING_S #define _INC_MBSTRING_S @@ -16,37 +17,246 @@ #ifndef _MBSTRING_S_DEFINED #define _MBSTRING_S_DEFINED - _CRTIMP errno_t __cdecl _mbscat_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src); - _CRTIMP errno_t __cdecl _mbscat_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbscpy_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src); - _CRTIMP errno_t __cdecl _mbscpy_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbslwr_s(unsigned char *_Str,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _mbslwr_s_l(unsigned char *_Str,size_t _SizeInBytes,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsnbcat_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsnbcat_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsnbcpy_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsnbcpy_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsnbset_s(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Ch,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsnbset_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Ch,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsncat_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsncat_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsncpy_s(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsncpy_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,const unsigned char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsnset_s(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbsnset_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Val,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsset_s(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Val); - _CRTIMP errno_t __cdecl _mbsset_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,unsigned int _Val,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbstok_s(unsigned char *_Str,const unsigned char *_Delim,unsigned char **_Context); - _CRTIMP unsigned char *__cdecl _mbstok_s_l(unsigned char *_Str,const unsigned char *_Delim,unsigned char **_Context,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbsupr_s(unsigned char *_Str,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _mbsupr_s_l(unsigned char *_Str,size_t _SizeInBytes,_locale_t _Locale); - _CRTIMP errno_t __cdecl _mbccpy_s(unsigned char *_Dst,size_t _DstSizeInBytes,int *_PCopied,const unsigned char *_Src); - _CRTIMP errno_t __cdecl _mbccpy_s_l(unsigned char *_Dst,size_t _DstSizeInBytes,int *_PCopied,const unsigned char *_Src,_locale_t _Locale); -#endif + + _CRTIMP + errno_t + __cdecl + _mbscat_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src); + + _CRTIMP + errno_t + __cdecl + _mbscat_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbscpy_s( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src); + + _CRTIMP + errno_t + __cdecl + _mbscpy_s_l( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbslwr_s( + _Inout_updates_opt_z_(_SizeInBytes) unsigned char *_Str, + _In_ size_t _SizeInBytes); + + _CRTIMP + errno_t + __cdecl + _mbslwr_s_l( + _Inout_updates_opt_z_(_SizeInBytes) unsigned char *_Str, + _In_ size_t _SizeInBytes, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsnbcat_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsnbcat_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsnbcpy_s( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsnbcpy_s_l( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsnbset_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Ch, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsnbset_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Ch, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsncat_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsncat_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsncpy_s( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsncpy_s_l( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const unsigned char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsnset_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + errno_t + __cdecl + _mbsnset_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Val, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsset_s( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Val); + + _CRTIMP + errno_t + __cdecl + _mbsset_s_l( + _Inout_updates_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_ unsigned int _Val, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char * + __cdecl + _mbstok_s( + _Inout_opt_z_ unsigned char *_Str, + _In_z_ const unsigned char *_Delim, + _Inout_ _Deref_prepost_opt_z_ unsigned char **_Context); + + _Check_return_ + _CRTIMP + unsigned char * + __cdecl + _mbstok_s_l( + _Inout_opt_z_ unsigned char *_Str, + _In_z_ const unsigned char *_Delim, + _Inout_ _Deref_prepost_opt_z_ unsigned char **_Context, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbsupr_s( + _Inout_updates_z_(_SizeInBytes) unsigned char *_Str, + _In_ size_t _SizeInBytes); + + _CRTIMP + errno_t + __cdecl + _mbsupr_s_l( + _Inout_updates_z_(_SizeInBytes) unsigned char *_Str, + _In_ size_t _SizeInBytes, + _In_opt_ _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _mbccpy_s( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _Out_opt_ int *_PCopied, + _In_z_ const unsigned char *_Src); + + _CRTIMP + errno_t + __cdecl + _mbccpy_s_l( + _Out_writes_z_(_DstSizeInBytes) unsigned char *_Dst, + _In_ size_t _DstSizeInBytes, + _Out_opt_ int *_PCopied, + _In_z_ const unsigned char *_Src, + _In_opt_ _locale_t _Locale); + +#endif /* _MBSTRING_S_DEFINED */ #ifdef __cplusplus } #endif -#endif -#endif +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_MBSTRING_S */

1 0

[aandrejevic] 59754: [NTVDM] Fix the INT 12h handler to call the correct function (DosOpenFile not DosCreateFile).
by aandrejevic＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: aandrejevic Date: Fri Aug 16 19:40:02 2013 New Revision: 59754 URL: http://svn.reactos.org/svn/reactos?rev=59754&view=rev Log: [NTVDM] Fix the INT 12h handler to call the correct function (DosOpenFile not DosCreateFile). Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Fri Aug 16 19:40:02 2013 @@ -1665,10 +1665,10 @@ case 0x3D: { WORD FileHandle; - WORD ErrorCode = DosCreateFile(&FileHandle, - (LPCSTR)(ULONG_PTR)BaseAddress - + TO_LINEAR(DataSegment, LOWORD(Edx)), - LOBYTE(Eax)); + WORD ErrorCode = DosOpenFile(&FileHandle, + (LPCSTR)(ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx)), + LOBYTE(Eax)); if (ErrorCode == 0) {

1 0

[aandrejevic] 59753: [NTVDM] Remove the "new emulator" started in emulator.c in favor of Soft386.
by aandrejevic＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: aandrejevic Date: Fri Aug 16 19:33:04 2013 New Revision: 59753 URL: http://svn.reactos.org/svn/reactos?rev=59753&view=rev Log: [NTVDM] Remove the "new emulator" started in emulator.c in favor of Soft386. Modified: branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/registers.c Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Aug 16 19:33:04 2013 @@ -24,7 +24,7 @@ softx86_ctx EmulatorContext; softx87_ctx FpuEmulatorContext; #else -EMULATOR_CONTEXT EmulatorContext; +SOFT386_STATE EmulatorContext; #endif static BOOLEAN A20Line = FALSE; @@ -241,8 +241,8 @@ StackSegment = EmulatorContext.state->segment_reg[SX86_SREG_SS].val; StackPointer = EmulatorContext.state->general_reg[SX86_REG_SP].val; #else - StackSegment = EmulatorContext.Registers[EMULATOR_REG_SS].LowWord; - StackPointer = EmulatorContext.Registers[EMULATOR_REG_SP].LowWord; + StackSegment = EmulatorContext.SegmentRegs[SOFT386_REG_SS].LowWord; + StackPointer = EmulatorContext.SegmentRegs[SOFT386_REG_SP].LowWord; #endif /* Get the stack */ @@ -475,7 +475,14 @@ return EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val; } #else - return EmulatorContext.Registers[Register].Long; + if (Register < EMULATOR_REG_ES) + { + return EmulatorContext.GeneralRegs[Register].Long; + } + else + { + return EmulatorContext.SegmentRegs[Register - EMULATOR_REG_ES].Selector; + } #endif } @@ -484,7 +491,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->reg_ip; #else - return EmulatorContext.InstructionPointer.Long; + return EmulatorContext.InstPtr.Long; #endif } Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Aug 16 19:33:04 2013 @@ -14,8 +14,10 @@ #include "ntvdm.h" #ifndef NEW_EMULATOR -#include <softx86/softx86.h> -#include <softx86/softx87.h> +#include <softx86.h> +#include <softx87.h> +#else +#include <soft386.h> #endif /* DEFINES ********************************************************************/ @@ -38,38 +40,7 @@ #define EMULATOR_FLAG_VIP (1 << 20) #define EMULATOR_FLAG_ID (1 << 21) -/* CR0 */ -#define EMULATOR_CR0_PE (1 << 0) -#define EMULATOR_CR0_MP (1 << 1) -#define EMULATOR_CR0_EM (1 << 2) -#define EMULATOR_CR0_TS (1 << 3) -#define EMULATOR_CR0_ET (1 << 4) -#define EMULATOR_CR0_NE (1 << 5) -#define EMULATOR_CR0_WP (1 << 16) -#define EMULATOR_CR0_AM (1 << 18) -#define EMULATOR_CR0_NW (1 << 29) -#define EMULATOR_CR0_CD (1 << 30) -#define EMULATOR_CR0_PG (1 << 31) - -/* GDT Access byte */ -#define GDT_SEG_ACCESSED (1 << 0) -#define GDT_DATA_WRITEABLE (1 << 1) -#define GDT_CODE_READABLE (1 << 1) -#define GDT_CONFORMING (1 << 2) -#define GDT_DIRECTION (1 << 2) -#define GDT_CODE_SEGMENT (1 << 3) -#define GDT_PRESENT (1 << 7) - -/* GDT flags */ -#define GDT_32BIT_SEGMENT (1 << 2) -#define GDT_PAGE_GRANULARITY (1 << 3) - /* Common definitions */ -#define EMULATOR_NUM_GENERAL_REGS 8 -#define EMULATOR_NUM_SEGMENT_REGS 6 -#define EMULATOR_NUM_CONTROL_REGS 8 -#define EMULATOR_NUM_DEBUG_REGS 8 -#define MAX_GDT_ENTRIES 8192 #define EMULATOR_BOP 0xC4C4 #define EMULATOR_INT_BOP 0xBEEF #define STACK_INT_NUM 0 @@ -114,65 +85,11 @@ EMULATOR_REG_GS }; -typedef union -{ - struct - { - BYTE LowByte; - BYTE HighByte; - }; - WORD LowWord; - DWORD Long; -} EMULATOR_REGISTER, *PEMULATOR_REGISTER; - -typedef struct -{ - ULONG Limit : 16; - ULONG Base : 24; - ULONG AccessByte : 8; - ULONG LimitHigh : 4; - ULONG Flags : 4; - ULONG BaseHigh : 8; -} EMULATOR_GDT_ENTRY; - -typedef struct -{ - ULONG Offset : 16; - ULONG Selector : 16; - ULONG Zero : 8; - ULONG TypeAndAttributes : 8; - ULONG OffsetHigh : 16; -} EMULATOR_IDT_ENTRY; - -typedef struct -{ - WORD Size; - DWORD Address; -} EMULATOR_TABLE_REGISTER; - -typedef struct -{ - EMULATOR_REGISTER Registers[EMULATOR_NUM_GENERAL_REGS - + EMULATOR_NUM_SEGMENT_REGS]; - EMULATOR_REGISTER Flags; - EMULATOR_REGISTER InstructionPointer; - EMULATOR_REGISTER ControlRegisters[EMULATOR_NUM_CONTROL_REGS]; - EMULATOR_REGISTER DebugRegisters[EMULATOR_NUM_DEBUG_REGS]; - ULONGLONG TimeStampCounter; - BOOLEAN OperandSizeOverload; - BOOLEAN AddressSizeOverload; - EMULATOR_TABLE_REGISTER Gdtr, Idtr; - EMULATOR_GDT_ENTRY CachedDescriptors[EMULATOR_NUM_SEGMENT_REGS]; - UINT ExceptionCount; -} EMULATOR_CONTEXT, *PEMULATOR_CONTEXT; - -typedef VOID (*EMULATOR_OPCODE_HANDLER)(PEMULATOR_CONTEXT Context, BYTE Opcode); - #ifndef NEW_EMULATOR extern softx86_ctx EmulatorContext; extern softx87_ctx FpuEmulatorContext; #else -extern EMULATOR_CONTEXT EmulatorContext; +extern SOFT386_STATE EmulatorContext; #endif /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Fri Aug 16 19:33:04 2013 @@ -21,7 +21,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_AX].val; #else - return EmulatorContext.Registers[EMULATOR_REG_AX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long; #endif } @@ -32,7 +32,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_AX].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_AX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long = Value; #endif } @@ -43,7 +43,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_AX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord; #endif } @@ -54,7 +54,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_AX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord = Value; #endif } @@ -65,7 +65,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi; #else - return EmulatorContext.Registers[EMULATOR_REG_AX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte; #endif } @@ -76,7 +76,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi = Value; #else - EmulatorContext.Registers[EMULATOR_REG_AX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte = Value; #endif } @@ -87,7 +87,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_AX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte; #endif } @@ -98,7 +98,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_AX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte = Value; #endif } @@ -109,7 +109,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BX].val; #else - return EmulatorContext.Registers[EMULATOR_REG_BX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long; #endif } @@ -120,7 +120,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BX].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long = Value; #endif } @@ -131,7 +131,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_BX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord; #endif } @@ -142,7 +142,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord = Value; #endif } @@ -153,7 +153,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi; #else - return EmulatorContext.Registers[EMULATOR_REG_BX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte; #endif } @@ -164,7 +164,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte = Value; #endif } @@ -175,7 +175,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_BX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte; #endif } @@ -186,7 +186,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte = Value; #endif } @@ -199,7 +199,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_CX].val; #else - return EmulatorContext.Registers[EMULATOR_REG_CX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long; #endif } @@ -210,7 +210,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_CX].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_CX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long = Value; #endif } @@ -221,7 +221,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_CX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord; #endif } @@ -232,7 +232,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_CX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord = Value; #endif } @@ -243,7 +243,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi; #else - return EmulatorContext.Registers[EMULATOR_REG_CX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte; #endif } @@ -254,7 +254,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi = Value; #else - EmulatorContext.Registers[EMULATOR_REG_CX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte = Value; #endif } @@ -265,7 +265,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_CX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte; #endif } @@ -276,7 +276,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_CX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte = Value; #endif } @@ -289,7 +289,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DX].val; #else - return EmulatorContext.Registers[EMULATOR_REG_DX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long; #endif } @@ -300,7 +300,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DX].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long = Value; #endif } @@ -311,7 +311,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_DX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord; #endif } @@ -322,7 +322,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord = Value; #endif } @@ -333,7 +333,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi; #else - return EmulatorContext.Registers[EMULATOR_REG_DX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte; #endif } @@ -344,7 +344,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte = Value; #endif } @@ -355,7 +355,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_DX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte; #endif } @@ -366,7 +366,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte = Value; #endif } @@ -409,7 +409,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BP].val; #else - return EmulatorContext.Registers[EMULATOR_REG_BP].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long; #endif } @@ -420,7 +420,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BP].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BP].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long = Value; #endif } @@ -431,7 +431,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_BP].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord; #endif } @@ -442,7 +442,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_BP].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord = Value; #endif } @@ -455,7 +455,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_SI].val; #else - return EmulatorContext.Registers[EMULATOR_REG_SI].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long; #endif } @@ -466,7 +466,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_SI].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_SI].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long = Value; #endif } @@ -477,7 +477,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_SI].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord; #endif } @@ -488,7 +488,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_SI].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord = Value; #endif } @@ -501,7 +501,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DI].val; #else - return EmulatorContext.Registers[EMULATOR_REG_DI].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long; #endif } @@ -512,7 +512,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DI].val = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DI].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long = Value; #endif } @@ -523,7 +523,7 @@ #ifndef NEW_EMULATOR return EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo; #else - return EmulatorContext.Registers[EMULATOR_REG_DI].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord; #endif } @@ -534,7 +534,7 @@ #ifndef NEW_EMULATOR EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo = Value; #else - EmulatorContext.Registers[EMULATOR_REG_DI].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord = Value; #endif }

1 0

[aandrejevic] 59752: [SOFT386] Start implementing a new emulator library to provide 386/486 emulation support to NTVDM and perhaps other components aswell.
by aandrejevic＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: aandrejevic Date: Fri Aug 16 19:21:02 2013 New Revision: 59752 URL: http://svn.reactos.org/svn/reactos?rev=59752&view=rev Log: [SOFT386] Start implementing a new emulator library to provide 386/486 emulation support to NTVDM and perhaps other components aswell. Added: branches/ntvdm/include/reactos/libs/soft386/ branches/ntvdm/include/reactos/libs/soft386/soft386.h (with props) branches/ntvdm/lib/soft386/ branches/ntvdm/lib/soft386/CMakeLists.txt (with props) branches/ntvdm/lib/soft386/soft386.c (with props) Modified: branches/ntvdm/lib/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/CMakeLists.txt Added: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h (added) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Fri Aug 16 19:21:02 2013 @@ -0,0 +1,294 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: soft386.h + * PURPOSE: Header file for Soft386. + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _SOFT386_H_ +#define _SOFT386_H_ + +/* INCLUDES *******************************************************************/ + +#include <windows.h> +#include <debug.h> + +/* DEFINES ********************************************************************/ + +#define SOFT386_NUM_GEN_REGS 8 +#define SOFT386_NUM_SEG_REGS 6 +#define SOFT386_NUM_CTRL_REGS 8 +#define SOFT386_NUM_DBG_REGS 8 + +#define SOFT386_CR0_PE (1 << 0) +#define SOFT386_CR0_MP (1 << 1) +#define SOFT386_CR0_EM (1 << 2) +#define SOFT386_CR0_TS (1 << 3) +#define SOFT386_CR0_ET (1 << 4) +#define SOFT386_CR0_NE (1 << 5) +#define SOFT386_CR0_WP (1 << 16) +#define SOFT386_CR0_AM (1 << 18) +#define SOFT386_CR0_NW (1 << 29) +#define SOFT386_CR0_CD (1 << 30) +#define SOFT386_CR0_PG (1 << 31) + +struct _SOFT386_STATE; +typedef struct _SOFT386_STATE SOFT386_STATE; +typedef struct _SOFT386_STATE *PSOFT386_STATE; + +enum _SOFT386_GEN_REGS +{ + SOFT386_REG_EAX, + SOFT386_REG_ECX, + SOFT386_REG_EDX, + SOFT386_REG_EBX, + SOFT386_REG_ESP, + SOFT386_REG_EBP, + SOFT386_REG_ESI, + SOFT386_REG_EDI +}; + +enum _SOFT386_SEG_REGS +{ + SOFT386_REG_ES, + SOFT386_REG_CS, + SOFT386_REG_SS, + SOFT386_REG_DS, + SOFT386_REG_FS, + SOFT386_REG_GS +}; + +enum _SOFT386_CTRL_REGS +{ + SOFT386_REG_CR0, + SOFT386_REG_CR1, + SOFT386_REG_CR2, + SOFT386_REG_CR3, + SOFT386_REG_CR4, + SOFT386_REG_CR5, + SOFT386_REG_CR6, + SOFT386_REG_CR7 +}; + +enum _SOFT386_DBG_REGS +{ + SOFT386_REG_DR0, + SOFT386_REG_DR1, + SOFT386_REG_DR2, + SOFT386_REG_DR3, + SOFT386_REG_DR4, + SOFT386_REG_DR5, + SOFT386_REG_DR6, + SOFT386_REG_DR7 +}; + +typedef +BOOLEAN +(NTAPI *SOFT386_MEM_READ_PROC) +( + PSOFT386_STATE State, + ULONG Address, + LPVOID Buffer, + ULONG Size +); + +typedef +BOOLEAN +(NTAPI *SOFT386_MEM_WRITE_PROC) +( + PSOFT386_STATE State, + ULONG Address, + LPVOID Buffer, + ULONG Size +); + +typedef +VOID +(NTAPI *SOFT386_IO_READ_PROC) +( + PSOFT386_STATE State, + ULONG Port, + LPVOID Buffer, + ULONG Size +); + +typedef +VOID +(NTAPI *SOFT386_IO_WRITE_PROC) +( + PSOFT386_STATE State, + ULONG Port, + LPVOID Buffer, + ULONG Size +); + +typedef union _SOFT386_REG +{ + struct + { + UCHAR LowByte; + UCHAR HighByte; + }; + USHORT LowWord; + ULONG Long; +} SOFT386_REG, *PSOFT386_REG; + +typedef struct _SOFT386_SEG_REG +{ + USHORT Selector; + + /* Descriptor cache */ + ULONG Accessed : 1; + ULONG ReadWrite : 1; + ULONG DirConf : 1; + ULONG Executable : 1; + ULONG SystemType : 1; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG Size : 1; + ULONG Limit; + ULONG Base; +} SOFT386_SEG_REG, *PSOFT386_SEG_REG; + +typedef struct +{ + ULONG Limit : 16; + ULONG Base : 24; + ULONG Accessed : 1; + ULONG ReadWrite : 1; + ULONG DirConf : 1; + ULONG Executable : 1; + ULONG SystemType : 1; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG LimitHigh : 4; + ULONG Avl : 1; + ULONG Reserved : 1; + ULONG Size : 1; + ULONG Granularity : 1; + ULONG BaseHigh : 8; +} SOFT386_GDT_ENTRY; + +typedef struct +{ + ULONG Offset : 16; + ULONG Selector : 16; + ULONG Zero : 8; + ULONG Type : 4; + ULONG Storage : 1; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG OffsetHigh : 16; +} SOFT386_IDT_ENTRY; + +typedef struct _SOFT386_TABLE_REG +{ + USHORT Size; + ULONG Address; +} SOFT386_TABLE_REG, *PSOFT386_TABLE_REG; + +typedef union _SOFT386_FLAGS_REG +{ + ULONG Long; + struct + { + ULONG Cf : 1; + ULONG AlwaysSet : 1; + ULONG Pf : 1; + ULONG Reserved0 : 1; + ULONG Af : 1; + ULONG Reserved1 : 1; + ULONG Zf : 1; + ULONG Sf : 1; + ULONG Tf : 1; + ULONG If : 1; + ULONG Df : 1; + ULONG Of : 1; + ULONG Iopl : 2; + ULONG Nt : 1; + ULONG Reserved2 : 1; + ULONG Rf : 1; + ULONG Vm : 1; + ULONG Ac : 1; + ULONG Vif : 1; + ULONG Vip : 1; + ULONG Id : 1; + }; +} SOFT386_FLAGS_REG, *PSOFT386_FLAGS_REG; + +typedef struct _SOFT386_TSS +{ + ULONG Link; + ULONG Esp0; + ULONG Ss0; + ULONG Esp1; + ULONG Ss1; + ULONG Esp2; + ULONG Ss2; + ULONG Cr3; + ULONG Eip; + ULONG Eflags; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + ULONG Es; + ULONG Cs; + ULONG Ss; + ULONG Ds; + ULONG Fs; + ULONG Gs; + ULONG Ldtr; + ULONG IopbOffset; +} SOFT386_TSS, *PSOFT386_TSS; + +struct _SOFT386_STATE +{ + SOFT386_MEM_READ_PROC MemReadCallback; + SOFT386_MEM_WRITE_PROC MemWriteCallback; + SOFT386_IO_READ_PROC IoReadCallback; + SOFT386_IO_WRITE_PROC IoWriteCallback; + SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS]; + SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS]; + SOFT386_REG InstPtr; + SOFT386_FLAGS_REG Flags; + SOFT386_TABLE_REG Gdtr, Idtr, Ldtr, Tss; + ULONGLONG TimeStampCounter; + ULONG ControlRegisters[SOFT386_NUM_CTRL_REGS]; + ULONG DebugRegisters[SOFT386_NUM_DBG_REGS]; +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +Soft386Continue(PSOFT386_STATE State); + +VOID +NTAPI +Soft386StepInto(PSOFT386_STATE State); + +VOID +NTAPI +Soft386StepOver(PSOFT386_STATE State); + +VOID +NTAPI +Soft386StepOut(PSOFT386_STATE State); + +VOID +NTAPI +Soft386DumpState(PSOFT386_STATE State); + +VOID +NTAPI +Soft386Reset(PSOFT386_STATE State); + +#endif // _SOFT386_H_ + +/* EOF */ Propchange: branches/ntvdm/include/reactos/libs/soft386/soft386.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/CMakeLists.txt?rev=59… ============================================================================== --- branches/ntvdm/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/lib/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013 @@ -20,6 +20,7 @@ add_subdirectory(sdk) add_subdirectory(smlib) add_subdirectory(tdilib) +add_subdirectory(soft386) else() Added: branches/ntvdm/lib/soft386/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/CMakeLists.tx… ============================================================================== --- branches/ntvdm/lib/soft386/CMakeLists.txt (added) +++ branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013 @@ -0,0 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/soft386) + +list(APPEND SOURCE + soft386.c) + +add_library(soft386 ${SOURCE}) Propchange: branches/ntvdm/lib/soft386/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c (added) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Fri Aug 16 19:21:02 2013 @@ -0,0 +1,118 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: soft386.c + * PURPOSE: Functions meant for use by the host. + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#include "soft386.h" + +/* DEFINES ********************************************************************/ + +typedef enum +{ + SOFT386_STEP_INTO, + SOFT386_STEP_OVER, + SOFT386_STEP_OUT, + SOFT386_CONTINUE +} SOFT386_EXEC_CMD; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static +VOID +NTAPI +Soft386ExecutionControl(PSOFT386_STATE State, INT Command) +{ + // TODO: NOT IMPLEMENTED!!! + UNIMPLEMENTED; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +NTAPI +Soft386Continue(PSOFT386_STATE State) +{ + /* Call the internal function */ + Soft386ExecutionControl(State, SOFT386_CONTINUE); +} + +VOID +NTAPI +Soft386StepInto(PSOFT386_STATE State) +{ + /* Call the internal function */ + Soft386ExecutionControl(State, SOFT386_STEP_INTO); +} + +VOID +NTAPI +Soft386StepOver(PSOFT386_STATE State) +{ + /* Call the internal function */ + Soft386ExecutionControl(State, SOFT386_STEP_OVER); +} + +VOID +NTAPI +Soft386StepOut(PSOFT386_STATE State) +{ + /* Call the internal function */ + Soft386ExecutionControl(State, SOFT386_STEP_OUT); +} + +VOID +NTAPI +Soft386DumpState(PSOFT386_STATE State) +{ + // TODO: NOT IMPLEMENTED!!! + UNIMPLEMENTED; +} + +VOID +NTAPI +Soft386Reset(PSOFT386_STATE State) +{ + INT i; + SOFT386_MEM_READ_PROC MemReadCallback = State->MemReadCallback; + SOFT386_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; + SOFT386_IO_READ_PROC IoReadCallback = State->IoReadCallback; + SOFT386_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; + + /* Clear the entire structure */ + RtlZeroMemory(State, sizeof(*State)); + + /* Initialize the registers */ + State->Flags.AlwaysSet = 1; + State->InstPtr.LowWord = 0xFFF0; + + /* Initialize segments */ + for (i = 0; i < SOFT386_NUM_SEG_REGS; i++) + { + /* Set the selector, base and limit, other values don't apply in real mode */ + State->SegmentRegs[i].Selector = 0; + State->SegmentRegs[i].Base = 0; + State->SegmentRegs[i].Limit = 0xFFFF; + } + + /* Initialize the code segment */ + State->SegmentRegs[SOFT386_REG_CS].Selector = 0xF000; + State->SegmentRegs[SOFT386_REG_CS].Base = 0xFFFF0000; + + /* Initialize the IDT */ + State->Idtr.Size = 0x3FF; + State->Idtr.Address = 0; + + /* Initialize CR0 */ + State->ControlRegisters[0] |= SOFT386_CR0_ET; + + /* Restore the callbacks */ + State->MemReadCallback = MemReadCallback; + State->MemWriteCallback = MemWriteCallback; + State->IoReadCallback = IoReadCallback; + State->IoWriteCallback = IoWriteCallback; +} Propchange: branches/ntvdm/lib/soft386/soft386.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013 @@ -1,5 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/softx86) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/soft386) spec2def(ntvdm.exe ntvdm.spec) @@ -18,7 +19,7 @@ add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE) -target_link_libraries(ntvdm softx86 softx87) +target_link_libraries(ntvdm softx86 softx87 soft386) add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll) add_dependencies(ntvdm softx86 softx87) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)

1 0

[spetreolle] 59751: [NTVDM] Report VGA card as present.
by spetreolle＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: spetreolle Date: Fri Aug 16 18:33:24 2013 New Revision: 59751 URL: http://svn.reactos.org/svn/reactos?rev=59751&view=rev Log: [NTVDM] Report VGA card as present. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Aug 16 18:33:24 2013 @@ -907,6 +907,24 @@ break; } + /* Display combination code */ + case 0x1A: + { + switch(LOBYTE(Eax)) + { + case 0x00: /* Get Display combiantion code */ + EmulatorSetRegister(EMULATOR_REG_AX, MAKEWORD(0x1A, 0x1A)); + EmulatorSetRegister(EMULATOR_REG_BX, MAKEWORD(0x08, 0x0)); /* VGA w/ color analog display */ + break; + case 0x01: /* Set Display combination code */ + DPRINT1("Set Display combination code - Unsupported\n"); + break; + default: + break; + } + break; + } + default: { DPRINT1("BIOS Function INT 10h, AH = 0x%02X NOT IMPLEMENTED\n",

1 0

[akhaldi] 59750: [CRT] * Annotate string_s.h.
by akhaldi＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: akhaldi Date: Fri Aug 16 14:51:13 2013 New Revision: 59750 URL: http://svn.reactos.org/svn/reactos?rev=59750&view=rev Log: [CRT] * Annotate string_s.h. Modified: trunk/reactos/include/crt/sec_api/string_s.h Modified: trunk/reactos/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/string… ============================================================================== --- trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] Fri Aug 16 14:51:13 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_STRING_S #define _INC_STRING_S @@ -14,46 +15,299 @@ extern "C" { #endif - _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); - _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); - _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - - _CRTIMP errno_t __cdecl strncat_s(char *_Dst,size_t _DstSizeInChars,const char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _strncat_s_l(char *_Dst,size_t _DstSizeInChars,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _SizeInBytes, const char *_Src); - _CRTIMP errno_t __cdecl strncpy_s(char *_Dst,size_t _DstSizeInChars,const char *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _strncpy_s_l(char *_Dst,size_t _DstSizeInChars,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl strtok_s(char *_Str,const char *_Delim,char **_Context); - _CRTIMP char *__cdecl _strtok_s_l(char *_Str,const char *_Delim,char **_Context,_locale_t _Locale); + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strset_s( + _Inout_updates_z_(_DstSize) char *_Dst, + _In_ size_t _DstSize, + _In_ int _Value); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strerror_s( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_opt_z_ const char *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strnset_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strncat_s( + _Inout_updates_z_(_DstSizeInChars) char *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strncat_s_l( + _Inout_updates_z_(_DstSizeInChars) char *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strcpy_s( + _Out_writes_z_(_SizeInBytes) char *_Dst, + _In_ size_t _SizeInBytes, + _In_z_ const char *_Src); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strncpy_s( + _Out_writes_z_(_DstSizeInChars) char *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strncpy_s_l( + _Out_writes_z_(_DstSizeInChars) char *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + char * + __cdecl + strtok_s( + _Inout_opt_z_ char *_Str, + _In_z_ const char *_Delim, + _Inout_ _Deref_prepost_opt_z_ char **_Context); + + _Check_return_ + _CRTIMP + char * + __cdecl + _strtok_s_l( + _Inout_opt_z_ char *_Str, + _In_z_ const char *_Delim, + _Inout_ _Deref_prepost_opt_z_ char **_Context, + _In_opt_ _locale_t _Locale); #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED - _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context); - _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); - _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); - _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); - _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); - - _CRTIMP errno_t __cdecl wcsncat_s(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsncat_s_l(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsncpy_s_l(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcstok_s_l(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsset_s_l(wchar_t *_Str,size_t _SizeInChars,unsigned int _Val,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsnset_s_l(wchar_t *_Str,size_t _SizeInChars,unsigned int _Val, size_t _Count,_locale_t _Locale); - -#endif + + _Check_return_ + _CRTIMP + wchar_t * + __cdecl + wcstok_s( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim, + _Inout_ _Deref_prepost_opt_z_ wchar_t **_Context); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ int _ErrNum); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + __wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buffer, + _In_ size_t _SizeInWords, + _In_z_ const wchar_t *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsnset_s( + _Inout_updates_z_(_DstSizeInWords) wchar_t *_Dst, + _In_ size_t _DstSizeInWords, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsset_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_ wchar_t _Val); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s_l( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s_l( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncat_s( + _Inout_updates_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsncat_s_l( + _Inout_updates_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncpy_s( + _Out_writes_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsncpy_s_l( + _Out_writes_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t * + __cdecl + _wcstok_s_l( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim, + _Inout_ _Deref_prepost_opt_z_ wchar_t **_Context, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsset_s_l( + _Inout_updates_z_(_SizeInChars) wchar_t *_Str, + _In_ size_t _SizeInChars, + _In_ unsigned int _Val, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsnset_s_l( + _Inout_updates_z_(_SizeInChars) wchar_t *_Str, + _In_ size_t _SizeInChars, + _In_ unsigned int _Val, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + +#endif /* _WSTRING_S_DEFINED */ #ifdef __cplusplus } #endif -#endif -#endif + +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_STRING_S */

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