Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67741: [NTVDM] - Make the Sda pointer point to the right place. - Fix a buffer overflow.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 00:20:54 2015 New Revision: 67741 URL: http://svn.reactos.org/svn/reactos?rev=67741&view=rev Log: [NTVDM] - Make the Sda pointer point to the right place. - Fix a buffer overflow. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 15 00:20:54 2015 @@ -52,16 +52,22 @@ static BOOLEAN DosChangeDrive(BYTE Drive) { - WCHAR DirectoryPath[DOS_CMDLINE_LENGTH]; + CHAR DirectoryPath[DOS_CMDLINE_LENGTH + 1]; /* Make sure the drive exists */ if (Drive > (LastDrive - 'A')) return FALSE; + RtlZeroMemory(DirectoryPath, sizeof(DirectoryPath)); + /* Find the path to the new current directory */ - swprintf(DirectoryPath, L"%c\\%S", Drive + 'A', &CurrentDirectories[Drive * DOS_DIR_LENGTH]); + snprintf(DirectoryPath, + DOS_CMDLINE_LENGTH, + "%c\\%s", + Drive + 'A', + &CurrentDirectories[Drive * DOS_DIR_LENGTH]); /* Change the current directory of the process */ - if (!SetCurrentDirectory(DirectoryPath)) return FALSE; + if (!SetCurrentDirectoryA(DirectoryPath)) return FALSE; /* Set the current drive */ CurrentDrive = Drive; @@ -2013,7 +2019,7 @@ } /* Initialize the list of lists */ - SysVars = (PDOS_SYSVARS)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, 0); + SysVars = (PDOS_SYSVARS)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(SysVars)); RtlZeroMemory(SysVars, sizeof(DOS_SYSVARS)); SysVars->FirstMcb = FIRST_MCB_SEGMENT; SysVars->FirstSft = MAKELONG(DOS_DATA_OFFSET(Sft), DOS_DATA_SEGMENT); @@ -2034,7 +2040,7 @@ sizeof(NullDriverRoutine)); /* Initialize the swappable data area */ - Sda = (PDOS_SDA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, sizeof(DOS_SYSVARS)); + Sda = (PDOS_SDA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(Sda)); RtlZeroMemory(Sda, sizeof(DOS_SDA)); /* Set the current PSP to the system PSP */

1 0

[tkreuzer] 67740: [MSHTML/OLEAUT32] Make msvc.S compile on ARM, too
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:33:27 2015 New Revision: 67740 URL: http://svn.reactos.org/svn/reactos?rev=67740&view=rev Log: [MSHTML/OLEAUT32] Make msvc.S compile on ARM, too Modified: trunk/reactos/dll/win32/mshtml/msvc.S trunk/reactos/dll/win32/oleaut32/msvc.S Modified: trunk/reactos/dll/win32/mshtml/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/msvc.S?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/msvc.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/msvc.S [iso-8859-1] Thu May 14 22:33:27 2015 @@ -1,3 +1,18 @@ + +#ifdef _M_ARM + +#include <kxarm.h> + + MACRO + DEFINE_WRAPPER_FUNC $n, $off, $x + LCLS _FuncName +_FuncName SETS "_wrapper_func_":CC:"$n" + NESTED_ENTRY $_FuncName + __assertfail + NESTED_END $_FuncName + MEND + +#else #include <asm.inc> @@ -23,102 +38,104 @@ #endif ENDM -DEFINE_WRAPPER_FUNC 3, 12, 24 -DEFINE_WRAPPER_FUNC 4, 16, 32 -DEFINE_WRAPPER_FUNC 5, 20, 40 -DEFINE_WRAPPER_FUNC 6, 24, 48 -DEFINE_WRAPPER_FUNC 7, 28, 56 -DEFINE_WRAPPER_FUNC 8, 32, 64 -DEFINE_WRAPPER_FUNC 9, 36, 72 -DEFINE_WRAPPER_FUNC 10, 40, 80 -DEFINE_WRAPPER_FUNC 11, 44, 88 -DEFINE_WRAPPER_FUNC 12, 48, 96 -DEFINE_WRAPPER_FUNC 13, 52, 104 -DEFINE_WRAPPER_FUNC 14, 56, 112 -DEFINE_WRAPPER_FUNC 15, 60, 120 -DEFINE_WRAPPER_FUNC 16, 64, 128 -DEFINE_WRAPPER_FUNC 17, 68, 136 -DEFINE_WRAPPER_FUNC 18, 72, 144 -DEFINE_WRAPPER_FUNC 19, 76, 152 -DEFINE_WRAPPER_FUNC 20, 80, 160 -DEFINE_WRAPPER_FUNC 21, 84, 168 -DEFINE_WRAPPER_FUNC 22, 88, 176 -DEFINE_WRAPPER_FUNC 23, 92, 184 -DEFINE_WRAPPER_FUNC 24, 96, 192 -DEFINE_WRAPPER_FUNC 25, 100, 200 -DEFINE_WRAPPER_FUNC 26, 104, 208 -DEFINE_WRAPPER_FUNC 27, 108, 216 -DEFINE_WRAPPER_FUNC 28, 112, 224 -DEFINE_WRAPPER_FUNC 29, 116, 232 -DEFINE_WRAPPER_FUNC 30, 120, 240 -DEFINE_WRAPPER_FUNC 31, 124, 248 -DEFINE_WRAPPER_FUNC 32, 128, 256 -DEFINE_WRAPPER_FUNC 33, 132, 264 -DEFINE_WRAPPER_FUNC 34, 136, 272 -DEFINE_WRAPPER_FUNC 35, 140, 280 -DEFINE_WRAPPER_FUNC 36, 144, 288 -DEFINE_WRAPPER_FUNC 37, 148, 296 -DEFINE_WRAPPER_FUNC 38, 152, 304 -DEFINE_WRAPPER_FUNC 39, 156, 312 -DEFINE_WRAPPER_FUNC 40, 160, 320 -DEFINE_WRAPPER_FUNC 41, 164, 328 -DEFINE_WRAPPER_FUNC 42, 168, 336 -DEFINE_WRAPPER_FUNC 43, 172, 344 -DEFINE_WRAPPER_FUNC 44, 176, 352 -DEFINE_WRAPPER_FUNC 45, 180, 360 -DEFINE_WRAPPER_FUNC 46, 184, 368 -DEFINE_WRAPPER_FUNC 47, 188, 376 -DEFINE_WRAPPER_FUNC 48, 192, 384 -DEFINE_WRAPPER_FUNC 49, 196, 392 -DEFINE_WRAPPER_FUNC 50, 200, 400 -DEFINE_WRAPPER_FUNC 51, 204, 408 -DEFINE_WRAPPER_FUNC 52, 208, 416 -DEFINE_WRAPPER_FUNC 53, 212, 424 -DEFINE_WRAPPER_FUNC 54, 216, 432 -DEFINE_WRAPPER_FUNC 55, 220, 440 -DEFINE_WRAPPER_FUNC 56, 224, 448 -DEFINE_WRAPPER_FUNC 57, 228, 456 -DEFINE_WRAPPER_FUNC 58, 232, 464 -DEFINE_WRAPPER_FUNC 59, 236, 472 -DEFINE_WRAPPER_FUNC 60, 240, 480 -DEFINE_WRAPPER_FUNC 61, 244, 488 -DEFINE_WRAPPER_FUNC 62, 248, 496 -DEFINE_WRAPPER_FUNC 63, 252, 504 -DEFINE_WRAPPER_FUNC 64, 256, 512 -DEFINE_WRAPPER_FUNC 65, 260, 520 -DEFINE_WRAPPER_FUNC 66, 264, 528 -DEFINE_WRAPPER_FUNC 67, 268, 536 -DEFINE_WRAPPER_FUNC 68, 272, 544 -DEFINE_WRAPPER_FUNC 69, 276, 552 -DEFINE_WRAPPER_FUNC 70, 280, 560 -DEFINE_WRAPPER_FUNC 71, 284, 568 -DEFINE_WRAPPER_FUNC 72, 288, 576 -DEFINE_WRAPPER_FUNC 73, 292, 584 -DEFINE_WRAPPER_FUNC 74, 296, 592 -DEFINE_WRAPPER_FUNC 75, 300, 600 -DEFINE_WRAPPER_FUNC 76, 304, 608 -DEFINE_WRAPPER_FUNC 77, 308, 616 -DEFINE_WRAPPER_FUNC 78, 312, 624 -DEFINE_WRAPPER_FUNC 79, 316, 632 -DEFINE_WRAPPER_FUNC 80, 320, 640 -DEFINE_WRAPPER_FUNC 81, 324, 648 -DEFINE_WRAPPER_FUNC 82, 328, 656 -DEFINE_WRAPPER_FUNC 83, 332, 664 -DEFINE_WRAPPER_FUNC 84, 336, 672 -DEFINE_WRAPPER_FUNC 85, 340, 680 -DEFINE_WRAPPER_FUNC 86, 344, 688 -DEFINE_WRAPPER_FUNC 87, 348, 696 -DEFINE_WRAPPER_FUNC 88, 352, 704 -DEFINE_WRAPPER_FUNC 89, 356, 712 -DEFINE_WRAPPER_FUNC 90, 360, 720 -DEFINE_WRAPPER_FUNC 91, 364, 728 -DEFINE_WRAPPER_FUNC 92, 368, 736 -DEFINE_WRAPPER_FUNC 93, 372, 744 -DEFINE_WRAPPER_FUNC 94, 376, 752 -DEFINE_WRAPPER_FUNC 95, 380, 760 -DEFINE_WRAPPER_FUNC 96, 384, 768 -DEFINE_WRAPPER_FUNC 97, 388, 776 -DEFINE_WRAPPER_FUNC 98, 392, 784 -DEFINE_WRAPPER_FUNC 99, 396, 792 +#endif -END + DEFINE_WRAPPER_FUNC 3, 12, 24 + DEFINE_WRAPPER_FUNC 4, 16, 32 + DEFINE_WRAPPER_FUNC 5, 20, 40 + DEFINE_WRAPPER_FUNC 6, 24, 48 + DEFINE_WRAPPER_FUNC 7, 28, 56 + DEFINE_WRAPPER_FUNC 8, 32, 64 + DEFINE_WRAPPER_FUNC 9, 36, 72 + DEFINE_WRAPPER_FUNC 10, 40, 80 + DEFINE_WRAPPER_FUNC 11, 44, 88 + DEFINE_WRAPPER_FUNC 12, 48, 96 + DEFINE_WRAPPER_FUNC 13, 52, 104 + DEFINE_WRAPPER_FUNC 14, 56, 112 + DEFINE_WRAPPER_FUNC 15, 60, 120 + DEFINE_WRAPPER_FUNC 16, 64, 128 + DEFINE_WRAPPER_FUNC 17, 68, 136 + DEFINE_WRAPPER_FUNC 18, 72, 144 + DEFINE_WRAPPER_FUNC 19, 76, 152 + DEFINE_WRAPPER_FUNC 20, 80, 160 + DEFINE_WRAPPER_FUNC 21, 84, 168 + DEFINE_WRAPPER_FUNC 22, 88, 176 + DEFINE_WRAPPER_FUNC 23, 92, 184 + DEFINE_WRAPPER_FUNC 24, 96, 192 + DEFINE_WRAPPER_FUNC 25, 100, 200 + DEFINE_WRAPPER_FUNC 26, 104, 208 + DEFINE_WRAPPER_FUNC 27, 108, 216 + DEFINE_WRAPPER_FUNC 28, 112, 224 + DEFINE_WRAPPER_FUNC 29, 116, 232 + DEFINE_WRAPPER_FUNC 30, 120, 240 + DEFINE_WRAPPER_FUNC 31, 124, 248 + DEFINE_WRAPPER_FUNC 32, 128, 256 + DEFINE_WRAPPER_FUNC 33, 132, 264 + DEFINE_WRAPPER_FUNC 34, 136, 272 + DEFINE_WRAPPER_FUNC 35, 140, 280 + DEFINE_WRAPPER_FUNC 36, 144, 288 + DEFINE_WRAPPER_FUNC 37, 148, 296 + DEFINE_WRAPPER_FUNC 38, 152, 304 + DEFINE_WRAPPER_FUNC 39, 156, 312 + DEFINE_WRAPPER_FUNC 40, 160, 320 + DEFINE_WRAPPER_FUNC 41, 164, 328 + DEFINE_WRAPPER_FUNC 42, 168, 336 + DEFINE_WRAPPER_FUNC 43, 172, 344 + DEFINE_WRAPPER_FUNC 44, 176, 352 + DEFINE_WRAPPER_FUNC 45, 180, 360 + DEFINE_WRAPPER_FUNC 46, 184, 368 + DEFINE_WRAPPER_FUNC 47, 188, 376 + DEFINE_WRAPPER_FUNC 48, 192, 384 + DEFINE_WRAPPER_FUNC 49, 196, 392 + DEFINE_WRAPPER_FUNC 50, 200, 400 + DEFINE_WRAPPER_FUNC 51, 204, 408 + DEFINE_WRAPPER_FUNC 52, 208, 416 + DEFINE_WRAPPER_FUNC 53, 212, 424 + DEFINE_WRAPPER_FUNC 54, 216, 432 + DEFINE_WRAPPER_FUNC 55, 220, 440 + DEFINE_WRAPPER_FUNC 56, 224, 448 + DEFINE_WRAPPER_FUNC 57, 228, 456 + DEFINE_WRAPPER_FUNC 58, 232, 464 + DEFINE_WRAPPER_FUNC 59, 236, 472 + DEFINE_WRAPPER_FUNC 60, 240, 480 + DEFINE_WRAPPER_FUNC 61, 244, 488 + DEFINE_WRAPPER_FUNC 62, 248, 496 + DEFINE_WRAPPER_FUNC 63, 252, 504 + DEFINE_WRAPPER_FUNC 64, 256, 512 + DEFINE_WRAPPER_FUNC 65, 260, 520 + DEFINE_WRAPPER_FUNC 66, 264, 528 + DEFINE_WRAPPER_FUNC 67, 268, 536 + DEFINE_WRAPPER_FUNC 68, 272, 544 + DEFINE_WRAPPER_FUNC 69, 276, 552 + DEFINE_WRAPPER_FUNC 70, 280, 560 + DEFINE_WRAPPER_FUNC 71, 284, 568 + DEFINE_WRAPPER_FUNC 72, 288, 576 + DEFINE_WRAPPER_FUNC 73, 292, 584 + DEFINE_WRAPPER_FUNC 74, 296, 592 + DEFINE_WRAPPER_FUNC 75, 300, 600 + DEFINE_WRAPPER_FUNC 76, 304, 608 + DEFINE_WRAPPER_FUNC 77, 308, 616 + DEFINE_WRAPPER_FUNC 78, 312, 624 + DEFINE_WRAPPER_FUNC 79, 316, 632 + DEFINE_WRAPPER_FUNC 80, 320, 640 + DEFINE_WRAPPER_FUNC 81, 324, 648 + DEFINE_WRAPPER_FUNC 82, 328, 656 + DEFINE_WRAPPER_FUNC 83, 332, 664 + DEFINE_WRAPPER_FUNC 84, 336, 672 + DEFINE_WRAPPER_FUNC 85, 340, 680 + DEFINE_WRAPPER_FUNC 86, 344, 688 + DEFINE_WRAPPER_FUNC 87, 348, 696 + DEFINE_WRAPPER_FUNC 88, 352, 704 + DEFINE_WRAPPER_FUNC 89, 356, 712 + DEFINE_WRAPPER_FUNC 90, 360, 720 + DEFINE_WRAPPER_FUNC 91, 364, 728 + DEFINE_WRAPPER_FUNC 92, 368, 736 + DEFINE_WRAPPER_FUNC 93, 372, 744 + DEFINE_WRAPPER_FUNC 94, 376, 752 + DEFINE_WRAPPER_FUNC 95, 380, 760 + DEFINE_WRAPPER_FUNC 96, 384, 768 + DEFINE_WRAPPER_FUNC 97, 388, 776 + DEFINE_WRAPPER_FUNC 98, 392, 784 + DEFINE_WRAPPER_FUNC 99, 396, 792 + + END Modified: trunk/reactos/dll/win32/oleaut32/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/msvc.S?… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/msvc.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/msvc.S [iso-8859-1] Thu May 14 22:33:27 2015 @@ -1,7 +1,15 @@ + +#ifdef _M_ARM + +#include <kxarm.h> + + LEAF_ENTRY call_method + __assertfail + LEAF_END call_method + +#elif defined(_M_AMD64) #include <asm.inc> - -#ifdef _M_AMD64 .code64 PUBLIC call_method @@ -10,6 +18,8 @@ ret #else + +#include <asm.inc> .code32 PUBLIC _call_method @@ -41,4 +51,4 @@ ret #endif -END + END

1 0

[tkreuzer] 67739: [KS] "Fix" ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:33:15 2015 New Revision: 67739 URL: http://svn.reactos.org/svn/reactos?rev=67739&view=rev Log: [KS] "Fix" ARM build Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec trunk/reactos/drivers/ksfilter/ks/msvc.S Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Thu May 14 22:33:15 2015 @@ -7,7 +7,7 @@ @ stdcall -i386 ?IndirectedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease @ stdcall -i386 ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ(ptr) INonDelegatedUnknown_fnAddRef @ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) INonDelegatedUnknown_fnQueryInterface -@ stdcall ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease +@ stdcall -i386 ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease @ stdcall -private DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr) Modified: trunk/reactos/drivers/ksfilter/ks/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/msvc.S… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/msvc.S [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/msvc.S [iso-8859-1] Thu May 14 22:33:15 2015 @@ -1,3 +1,7 @@ + +#ifdef _M_ARM + +#else #include <asm.inc> @@ -38,5 +42,6 @@ DEFINE_ALIAS ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ, INonDelegatedUnknown_fnAddRef DEFINE_ALIAS ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z, INonDelegatedUnknown_fnQueryInterface #endif +#endif -END + END

1 0

[tkreuzer] 67738: [VIDEOPRT] Fix ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:33:03 2015 New Revision: 67738 URL: http://svn.reactos.org/svn/reactos?rev=67738&view=rev Log: [VIDEOPRT] Fix ARM build Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Thu May 14 22:33:03 2015 @@ -135,6 +135,15 @@ /* Return success */ return STATUS_SUCCESS; } +#else +NTSTATUS +NTAPI +IntInitializeVideoAddressSpace(VOID) +{ + UNIMPLEMENTED; + NT_ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} #endif #if defined(_M_IX86)

1 0

[tkreuzer] 67737: [RPCRT4] Fix ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:32:49 2015 New Revision: 67737 URL: http://svn.reactos.org/svn/reactos?rev=67737&view=rev Log: [RPCRT4] Fix ARM build Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Thu May 14 22:32:49 2015 @@ -35,7 +35,7 @@ -DCOM_NO_WINDOWS_H -DMSWMSG) -if(MSVC) +if(MSVC AND NOT ARCH STREQUAL "arm") add_asm_files(rpcrt4_asm msvc.S) endif() Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Thu May 14 22:32:49 2015 @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * + * * TODO: Handle non-i386 architectures */ @@ -150,6 +150,30 @@ thunk->call_stubless = call_stubless_func; } +#elif defined(__arm__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC(call_stubless_func, + "DCD 0xDEFC\n\t" // _assertfail + "" ); + +#include "pshpack1.h" +struct thunk +{ + DWORD assertfail; +}; +#include "poppack.h" + +static const struct thunk thunk_template = +{ + { 0xDEFC } /* _assertfail */ +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + *thunk = thunk_template; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Thu May 14 22:32:49 2015 @@ -156,6 +156,13 @@ static const BYTE opcodes[16] = { 0x48, 0x8b, 0x49, 0x20, 0x48, 0x8b, 0x01, 0xff, 0xa0, 0, 0, 0, 0, 0x48, 0x8d, 0x36 }; +#elif defined(__arm__) +typedef struct +{ + DWORD offset; +} vtbl_method_t; +static const BYTE opcodes[1]; + #else #warning You must implement delegated proxies/stubs for your CPU Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Thu May 14 22:32:49 2015 @@ -1062,6 +1062,13 @@ __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +#elif defined(__arm__) +LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size) +{ + FIXME("Not implemented for ARM\n"); + assert(FALSE); + return 0; +} #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size) @@ -1389,7 +1396,7 @@ pRpcMsg->BufferLength = stubMsg.BufferLength; /* allocate buffer for [out] and [ret] params */ - Status = I_RpcGetBuffer(pRpcMsg); + Status = I_RpcGetBuffer(pRpcMsg); if (Status) RpcRaiseException(Status); stubMsg.Buffer = pRpcMsg->Buffer;

1 0

[tkreuzer] 67736: [KERNEL32/KSECDD/GDI32/BMFD/DBGHELP/HALARM/SETUPLDR] Fix ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:32:35 2015 New Revision: 67736 URL: http://svn.reactos.org/svn/reactos?rev=67736&view=rev Log: [KERNEL32/KSECDD/GDI32/BMFD/DBGHELP/HALARM/SETUPLDR] Fix ARM build Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/drivers/crypto/ksecdd/random.c trunk/reactos/hal/halarm/CMakeLists.txt trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu May 14 22:32:35 2015 @@ -243,11 +243,17 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) -concatenate_files( - ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${_freeldr_pe_output_file}) - -add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) +if(NOT ARCH STREQUAL "arm") + + concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys + ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin + ${_freeldr_pe_output_file}) + + add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) +else() + add_custom_target(setupldr ALL DEPENDS ${_freeldr_pe_output_file}) +endif() + add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] Thu May 14 22:32:35 2015 @@ -33,7 +33,7 @@ #ifdef __arm__ case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; - case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->Fpscr; return TRUE; #endif default: addr->Mode = -1; return FALSE; @@ -116,7 +116,7 @@ /* set frame information */ frame->AddrStack.Offset = context->Sp; frame->AddrReturn.Offset = context->Lr; - frame->AddrFrame.Offset = context->Fp; + frame->AddrFrame.Offset = context->Fpscr; frame->AddrPC.Offset = context->Pc; frame->Far = TRUE; @@ -169,8 +169,8 @@ case CV_ARM_R0 + 8: *size = sizeof(ctx->R8); return &ctx->R8; case CV_ARM_R0 + 9: *size = sizeof(ctx->R9); return &ctx->R9; case CV_ARM_R0 + 10: *size = sizeof(ctx->R10); return &ctx->R10; - case CV_ARM_R0 + 11: *size = sizeof(ctx->Fp); return &ctx->Fp; - case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip; + case CV_ARM_R0 + 11: *size = sizeof(ctx->Fpscr); return &ctx->Fpscr; + //case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip; case CV_ARM_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; case CV_ARM_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu May 14 22:32:35 2015 @@ -90,6 +90,10 @@ list(APPEND ASM_SOURCE client/amd64/fiber.S client/amd64/thread.S) +elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE + client/arm/fiber.S + client/arm/thread.S) endif() add_asm_files(kernel32_asm ${ASM_SOURCE}) Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu May 14 22:32:35 2015 @@ -62,8 +62,14 @@ DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); DbgPrint("EFLAGS: %.8x\n", pc->EFlags); +#elif defined(_M_ARM) + DbgPrint("PC: %08lx LR: %08lx SP: %08lx\n", pc->Pc); + DbgPrint("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", pc->R0, pc->R1, pc->R2, pc->R3); + DbgPrint("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", pc->R4, pc->R5, pc->R6, pc->R7); + DbgPrint("R8: %08lx R9: %08lx R10: %08lx R11: %08lx\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %08lx CPSR: %08lx FPSCR: %08lx\n", pc->R12, pc->Cpsr, pc->R1, pc->Fpscr, pc->R3); #else -#warning Unknown architecture +#error "Unknown architecture" #endif } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Thu May 14 22:32:35 2015 @@ -606,6 +606,33 @@ /* Give it some room for the Parameter */ Context->Rsp -= sizeof(PVOID); +#elif defined(_M_ARM) + DPRINT("BaseInitializeContext: %p\n", Context); + + // FIXME: check if this is correct! + /* Setup the Initial Win32 Thread Context */ + Context->R0 = (ULONG_PTR)StartAddress; + Context->R1 = (ULONG_PTR)Parameter; + Context->Sp = (ULONG_PTR)StackAddress; + + if (ContextType == 1) /* For Threads */ + { + Context->Pc = (ULONG_PTR)BaseThreadStartupThunk; + } + else if (ContextType == 2) /* For Fibers */ + { + Context->Pc = (ULONG_PTR)BaseFiberStartup; + } + else /* For first thread in a Process */ + { + Context->Pc = (ULONG_PTR)BaseProcessStartThunk; + } + + /* Set the Context Flags */ + Context->ContextFlags = CONTEXT_FULL; + + /* Give it some room for the Parameter */ + Context->Sp -= sizeof(PVOID); #else #warning Unknown architecture UNIMPLEMENTED; @@ -907,7 +934,7 @@ OUT PHANDLE JobHandle) { NTSTATUS Status; - + /* Validate that there's a name */ if ((ApplicationName) && *(ApplicationName)) { Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Thu May 14 22:32:35 2015 @@ -43,8 +43,13 @@ ULONG64 Ctr0; ULONG64 Ctr1; } KSEC_MACHINE_SPECIFIC_COUNTERS, *PKSEC_MACHINE_SPECIFIC_COUNTERS; +#elif defined(_M_ARM) +typedef struct _KSEC_MACHINE_SPECIFIC_COUNTERS +{ + ULONG Ccr; +} KSEC_MACHINE_SPECIFIC_COUNTERS, *PKSEC_MACHINE_SPECIFIC_COUNTERS; #else -typedef ULONG KSEC_MACHINE_SPECIFIC_COUNTERS; +typedef ULONG KSEC_MACHINE_SPECIFIC_COUNTERS, *PKSEC_MACHINE_SPECIFIC_COUNTERS; #endif typedef struct _KSEC_ENTROPY_DATA Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Thu May 14 22:32:35 2015 @@ -76,6 +76,11 @@ MachineSpecificCounters->Pmc1 = __readpmc(1); } #endif +#elif defined(_M_ARM) +/* FIXME: this should go into a public header (from ksarm.h) */ +#define CP15_PMCCNTR 15, 0, 9, 13, 0 + /* Read the Cycle Counter Register */ + MachineSpecificCounters->Ccr = _MoveFromCoprocessor(CP15_PMCCNTR); #else #error Implement me! #endif Modified: trunk/reactos/hal/halarm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halarm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/CMakeLists.txt [iso-8859-1] Thu May 14 22:32:35 2015 @@ -15,3 +15,5 @@ add_library(hal SHARED ${SOURCES}) + +set_module_type(hal kerneldll ENTRYPOINT 0) Modified: trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h [iso-8859-1] Thu May 14 22:32:35 2015 @@ -19,8 +19,8 @@ #else // FIXME: BE #define GETVAL(x) \ - sizeof(x) == 1 ? (x) : \ - sizeof(x) == 2 ? (((PCHAR)&(x))[0] + (((PCHAR)&(x))[1] << 8)) : \ + (sizeof(x) == 1) ? (x) : \ + (sizeof(x) == 2) ? (((PCHAR)&(x))[0] + (((PCHAR)&(x))[1] << 8)) : \ (((PCHAR)&(x))[0] + (((PCHAR)&(x))[1] << 8) + (((PCHAR)&(x))[2] << 16) + \ (((PCHAR)&(x))[3] << 24)) @@ -121,13 +121,13 @@ } FONTDIRENTRY, *PFONTDIRENTRY; typedef struct _DIRENTRY -{ +{ WORD fontOrdinal; FONTDIRENTRY fde; } DIRENTRY, *PDIRENTRY; typedef struct _FONTGROUPHDR -{ +{ WORD NumberOfFonts; DIRENTRY ade[1]; } FONTGROUPHDR, *PFONTGROUPHDR; Modified: trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/gdi… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h [iso-8859-1] Thu May 14 22:32:35 2015 @@ -138,8 +138,14 @@ BOOL WINAPI SetWorldTransformForMetafile(HDC hdc, const XFORM *pxform); #define SetWorldTransform SetWorldTransformForMetafile +#ifdef _M_ARM +#define DbgRaiseAssertionFailure() __emit(0xdefc) +#else +#define DbgRaiseAssertionFailure() __int2c() +#endif // _M_ARM + #undef ASSERT -#define ASSERT(x) if (!(x)) __int2c() +#define ASSERT(x) if (!(x)) DbgRaiseAssertionFailure() #endif /* __WINE_GDI_PRIVATE_H */ Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Thu May 14 22:32:35 2015 @@ -516,7 +516,7 @@ const char *file, unsigned line) { - __int2c(); + DbgRaiseAssertionFailure(); } double

1 0

[tkreuzer] 67735: [NTOSKRNL] Fix ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:31:58 2015 New Revision: 67735 URL: http://svn.reactos.org/svn/reactos?rev=67735&view=rev Log: [NTOSKRNL] Fix ARM build Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/kd/arm/kdbg.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/exp.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ke/arm/usercall.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -1597,7 +1597,9 @@ { AlignmentFixupCount += Prcb->KeAlignmentFixupCount; ExceptionDispatchCount += Prcb->KeExceptionDispatchCount; +#ifndef _M_ARM FloatingEmulationCount += Prcb->KeFloatingEmulationCount; +#endif // _M_ARM } } @@ -2353,7 +2355,7 @@ DPRINT1("NtFlushInstructionCache() is not implemented\n"); for (;;); #elif defined(_M_ARM) - __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); + //__asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); #else #error Unknown architecture #endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Thu May 14 22:31:58 2015 @@ -18,7 +18,7 @@ // #define KD_BREAKPOINT_TYPE ULONG #define KD_BREAKPOINT_SIZE sizeof(ULONG) -//#define KD_BREAKPOINT_VALUE +#define KD_BREAKPOINT_VALUE 0xDEFE // // Maximum IRQs @@ -59,7 +59,7 @@ // All architectures but x86 have it in the PRCB's KeContextSwitches // #define KeGetContextSwitches(Prcb) \ - CONTAINING_RECORD(Prcb, KIPCR, PrcbData)->ContextSwitches + (Prcb)->KeContextSwitches // // Macro to get the second level cache size field name which differs between @@ -71,7 +71,7 @@ // Returns the Interrupt State from a Trap Frame. // ON = TRUE, OFF = FALSE // -//#define KeGetTrapFrameInterruptState(TrapFrame) +#define KeGetTrapFrameInterruptState(TrapFrame) 0 FORCEINLINE BOOLEAN @@ -162,7 +162,7 @@ #define KiEndInterrupt(x,y) #define KiGetLinkedTrapFrame(x) \ - (PKTRAP_FRAME)((x)->PreviousTrapFrame) + (PKTRAP_FRAME)((x)->TrapFrame) #define KiGetPreviousMode(tf) \ - ((tf->Spsr & CPSR_MODES) == CPSR_USER_MODE) ? UserMode: KernelMode + ((tf->Cpsr & CPSRM_MASK) == CPSRM_USER) ? UserMode: KernelMode Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Thu May 14 22:31:58 2015 @@ -383,7 +383,7 @@ IN ULONG Cpu) { /* Check if a new thread needs to be scheduled on a different CPU */ - if ((NewThread) && !(KeGetPcr()->Number == Cpu)) + if ((NewThread) && !(KeGetCurrentPrcb()->Number == Cpu)) { /* Send an IPI to request delivery */ KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); @@ -534,7 +534,7 @@ if (NeedApc) { /* Check if it's on another CPU */ - if (KeGetPcr()->Number != Processor) + if (KeGetCurrentPrcb()->Number != Processor) { /* Send an IPI to request delivery */ KiIpiSend(AFFINITY_MASK(Processor), IPI_APC); Modified: trunk/reactos/ntoskrnl/kd/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/arm/kdbg.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd/arm/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/arm/kdbg.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -55,24 +55,24 @@ // // Disable interrupts // - WRITE_REGISTER_ULONG(UART_PL011_CR, 0); + WRITE_REGISTER_ULONG((PULONG)UART_PL011_CR, 0); // // Set the baud rate // - WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); - WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); + WRITE_REGISTER_ULONG((PULONG)UART_PL011_IBRD, Divider); + WRITE_REGISTER_ULONG((PULONG)UART_PL011_FBRD, Fraction); // // Set 8 bits for data, 1 stop bit, no parity, FIFO enabled // - WRITE_REGISTER_ULONG(UART_PL011_LCRH, + WRITE_REGISTER_ULONG((PULONG)UART_PL011_LCRH, UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); // // Clear and enable FIFO // - WRITE_REGISTER_ULONG(UART_PL011_CR, + WRITE_REGISTER_ULONG((PULONG)UART_PL011_CR, UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | UART_PL011_CR_RXE); @@ -101,12 +101,12 @@ // // Wait for ready // - while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); - + while ((READ_REGISTER_ULONG((PULONG)UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + // // Send the character // - WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend); + WRITE_REGISTER_ULONG((PULONG)UART_PL01x_DR, ByteToSend); } /* EOF */ Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -46,7 +46,7 @@ #elif defined(_ARM_) #define KPCR_SELF_PCR_OFFSET 0 -#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) +#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KIPCR, Prcb) #define KPCR_CONTAINED_PRCB_OFFSET 0 #define KPCR_INITIAL_STACK_OFFSET FIELD_OFFSET(KPCR, InitialStack) #define KPCR_STACK_LIMIT_OFFSET FIELD_OFFSET(KPCR, StackLimit) @@ -510,9 +510,16 @@ KPCR_CONTAINED_PRCB_OFFSET, 0, 0, +#if defined(_M_ARM) + _WARN("KPCR_INITIAL_STACK_OFFSET, KPCR_STACK_LIMIT_OFFSET and KPRCB_PCR_PAGE_OFFSET not properly defined on ARM") + 0, + 0, + 0, +#else KPCR_INITIAL_STACK_OFFSET, KPCR_STACK_LIMIT_OFFSET, KPRCB_PCR_PAGE_OFFSET, +#endif FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), #if defined(_X86_) // Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -67,10 +67,26 @@ // // Save some critical stuff we use // + __debugbreak(); +#if 0 ProcessorState->SpecialRegisters.ControlRegister = KeArmControlRegisterGet(); ProcessorState->SpecialRegisters.LockdownRegister = KeArmLockdownRegisterGet(); ProcessorState->SpecialRegisters.CacheRegister = KeArmCacheRegisterGet(); ProcessorState->SpecialRegisters.StatusRegister = KeArmStatusRegisterGet(); +#endif +} + +VOID +NTAPI +KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) +{ + __debugbreak(); +#if 0 + KeArmControlRegisterSet(ProcessorState->SpecialRegisters.ControlRegister); + KeArmLockdownRegisterSet(ProcessorState->SpecialRegisters.LockdownRegister); + KeArmCacheRegisterSet(ProcessorState->SpecialRegisters.CacheRegister); + KeArmStatusRegisterSet(ProcessorState->SpecialRegisters.StatusRegister); +#endif } BOOLEAN @@ -170,30 +186,14 @@ KiSaveProcessorControlState(State); } -/* - * @implemented - */ -NTSTATUS -NTAPI -KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) -{ - // - // Nothing to do on ARM - // - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) -{ - // - // Nothing to do on ARM - // - return STATUS_SUCCESS; +VOID +NTAPI +KeFlushIoBuffers( + _In_ PMDL Mdl, + _In_ BOOLEAN ReadOperation, + _In_ BOOLEAN DmaOperation) +{ + DbgBreakPoint(); } /* SYSTEM CALLS NOT VALID ON THIS CPU *****************************************/ Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -9,7 +9,6 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#include <internal/arm/ksarm.h> #define NDEBUG #include <debug.h> @@ -24,13 +23,13 @@ IN KPROCESSOR_MODE PreviousMode) { KIRQL OldIrql; - + // // Do this at APC_LEVEL // OldIrql = KeGetCurrentIrql(); if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); - + // // Start with the Control flags // @@ -39,30 +38,20 @@ // // So this basically means all the special stuff // - if (PreviousMode == UserMode) - { - // - // ARM has register banks - // - TrapFrame->UserSp = Context->Sp; - TrapFrame->UserLr = Context->Lr; - } - else - { - // - // ARM has register banks - // - TrapFrame->SvcSp = Context->Sp; - TrapFrame->SvcLr = Context->Lr; - } - + + // + // ARM has register banks + // + TrapFrame->Sp = Context->Sp; + TrapFrame->Lr = Context->Lr; + // // The rest is already in the right mode // TrapFrame->Pc = Context->Pc; - TrapFrame->Spsr = Context->Psr; - } - + TrapFrame->Cpsr = Context->Cpsr; + } + // // Now do the integers // @@ -75,21 +64,21 @@ TrapFrame->R1 = Context->R1; TrapFrame->R2 = Context->R2; TrapFrame->R3 = Context->R3; - TrapFrame->R4 = Context->R4; - TrapFrame->R5 = Context->R5; - TrapFrame->R6 = Context->R6; - TrapFrame->R7 = Context->R7; - TrapFrame->R8 = Context->R8; - TrapFrame->R0 = Context->R9; - TrapFrame->R10 = Context->R10; - TrapFrame->R11 = Context->R11; + ExceptionFrame->R4 = Context->R4; + ExceptionFrame->R5 = Context->R5; + ExceptionFrame->R6 = Context->R6; + ExceptionFrame->R7 = Context->R7; + ExceptionFrame->R8 = Context->R8; + ExceptionFrame->R9 = Context->R9; + ExceptionFrame->R10 = Context->R10; + ExceptionFrame->R11 = Context->R11; TrapFrame->R12 = Context->R12; } - + // // Restore IRQL // - if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -99,13 +88,13 @@ IN OUT PCONTEXT Context) { KIRQL OldIrql; - + // // Do this at APC_LEVEL // OldIrql = KeGetCurrentIrql(); if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); - + // // Start with the Control flags // @@ -114,30 +103,20 @@ // // So this basically means all the special stuff // - if (KiGetPreviousMode(TrapFrame) == UserMode) - { - // - // ARM has register banks - // - Context->Sp = TrapFrame->UserSp; - Context->Lr = TrapFrame->UserLr; - } - else - { - // - // ARM has register banks - // - Context->Sp = TrapFrame->SvcSp; - Context->Lr = TrapFrame->SvcLr; - } - + + // + // ARM has register banks + // + Context->Sp = TrapFrame->Sp; + Context->Lr = TrapFrame->Lr; + // // The rest is already in the right mode // Context->Pc = TrapFrame->Pc; - Context->Psr = TrapFrame->Spsr; - } - + Context->Cpsr = TrapFrame->Cpsr; + } + // // Now do the integers // @@ -150,21 +129,21 @@ Context->R1 = TrapFrame->R1; Context->R2 = TrapFrame->R2; Context->R3 = TrapFrame->R3; - Context->R4 = TrapFrame->R4; - Context->R5 = TrapFrame->R5; - Context->R6 = TrapFrame->R6; - Context->R7 = TrapFrame->R7; - Context->R8 = TrapFrame->R8; - Context->R0 = TrapFrame->R9; - Context->R10 = TrapFrame->R10; - Context->R11 = TrapFrame->R11; + Context->R4 = ExceptionFrame->R4; + Context->R5 = ExceptionFrame->R5; + Context->R6 = ExceptionFrame->R6; + Context->R7 = ExceptionFrame->R7; + Context->R8 = ExceptionFrame->R8; + Context->R0 = ExceptionFrame->R9; + Context->R10 = ExceptionFrame->R10; + Context->R11 = ExceptionFrame->R11; Context->R12 = TrapFrame->R12; } - + // // Restore IRQL // - if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -182,7 +161,7 @@ /* Set the context flags */ Context.ContextFlags = CONTEXT_FULL; - + /* Check if User Mode or if the kernel debugger is enabled */ if ((PreviousMode == UserMode) || (KeGetPcr()->KdVersionBlock)) { @@ -281,3 +260,12 @@ PreviousMode); return; } + +NTSTATUS +NTAPI +KeRaiseUserException( + _In_ NTSTATUS ExceptionCode) +{ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -12,6 +12,13 @@ #define NDEBUG #include <debug.h> +VOID +NTAPI +KdPortPutByteEx( + PCPPORT PortInformation, + UCHAR ByteToSend +); + /* GLOBALS ********************************************************************/ KINTERRUPT KxUnexpectedInterrupt; @@ -44,15 +51,16 @@ PKIPCR Pcr = (PKIPCR)KeGetPcr(); ULONG PageDirectory[2]; ULONG i; - + /* Set the default NX policy (opt-in) */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; /* Initialize spinlocks and DPC data */ KiInitSpinLocks(Prcb, Number); - + /* Set stack pointers */ - Pcr->InitialStack = IdleStack; + //Pcr->InitialStack = IdleStack; + Pcr->Prcb.SpBase = IdleStack; // ??? /* Check if this is the Boot CPU */ if (!Number) @@ -64,22 +72,23 @@ /* Copy the template code */ KxUnexpectedInterrupt.DispatchCode[i] = ((PULONG)KiInterruptTemplate)[i]; } - + /* Set DMA coherency */ KiDmaIoCoherency = 0; - + /* Sweep D-Cache */ HalSweepDcache(); - + /* Set boot-level flags */ KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM; KeFeatureBits = 0; - KeProcessorLevel = (USHORT)(Pcr->ProcessorId >> 8); - KeProcessorRevision = (USHORT)(Pcr->ProcessorId & 0xFF); - + /// FIXME: just a wild guess + KeProcessorLevel = (USHORT)(Pcr->Prcb.ProcessorState.ArchState.Cp15_Cr0_CpuId >> 8); + KeProcessorRevision = (USHORT)(Pcr->Prcb.ProcessorState.ArchState.Cp15_Cr0_CpuId & 0xFF); +#if 0 /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; - +#endif /* Lower to APC_LEVEL */ KeLowerIrql(APC_LEVEL); @@ -160,9 +169,9 @@ LoaderBlock->Prcb = 0; } -C_ASSERT((PKIPCR)KeGetPcr() == (PKIPCR)0xFFDFF000); -C_ASSERT((FIELD_OFFSET(KIPCR, FirstLevelDcacheSize) & 4) == 0); -C_ASSERT(sizeof(KIPCR) <= PAGE_SIZE); +//C_ASSERT((PKIPCR)KeGetPcr() == (PKIPCR)0xFFDFF000); +//C_ASSERT((FIELD_OFFSET(KIPCR, FirstLevelDcacheSize) & 4) == 0); +//C_ASSERT(sizeof(KIPCR) <= PAGE_SIZE); VOID NTAPI @@ -173,109 +182,127 @@ IN PVOID InterruptStack) { ULONG i; - + /* Set the Current Thread */ - Pcr->PrcbData.CurrentThread = IdleThread; + Pcr->Prcb.CurrentThread = IdleThread; /* Set pointers to ourselves */ Pcr->Self = (PKPCR)Pcr; - Pcr->Prcb = &Pcr->PrcbData; + Pcr->CurrentPrcb = &Pcr->Prcb; /* Set the PCR Version */ Pcr->MajorVersion = PCR_MAJOR_VERSION; Pcr->MinorVersion = PCR_MINOR_VERSION; /* Set the PCRB Version */ - Pcr->PrcbData.MajorVersion = 1; - Pcr->PrcbData.MinorVersion = 1; + Pcr->Prcb.MajorVersion = 1; + Pcr->Prcb.MinorVersion = 1; /* Set the Build Type */ - Pcr->PrcbData.BuildType = 0; + Pcr->Prcb.BuildType = 0; #ifndef CONFIG_SMP - Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR; + Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif #if DBG - Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG; + Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; #endif /* Set the Processor Number and current Processor Mask */ - Pcr->PrcbData.Number = (UCHAR)ProcessorNumber; - Pcr->PrcbData.SetMember = 1 << ProcessorNumber; + Pcr->Prcb.Number = (UCHAR)ProcessorNumber; + Pcr->Prcb.SetMember = 1 << ProcessorNumber; /* Set the PRCB for this Processor */ - KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; + KiProcessorBlock[ProcessorNumber] = Pcr->CurrentPrcb; /* Start us out at PASSIVE_LEVEL */ - Pcr->Irql = PASSIVE_LEVEL; + Pcr->CurrentIrql = PASSIVE_LEVEL; /* Set the stacks */ - Pcr->PanicStack = PanicStack; - Pcr->InterruptStack = InterruptStack; - + Pcr->Prcb.PanicStackBase = (ULONG)PanicStack; + Pcr->Prcb.IsrStack = InterruptStack; +#if 0 /* Setup the processor set */ - Pcr->PrcbData.MultiThreadProcessorSet = Pcr->PrcbData.SetMember; - + Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; +#endif + /* Copy cache information from the loader block */ - Pcr->FirstLevelDcacheSize = KeLoaderBlock->u.Arm.FirstLevelDcacheSize; - Pcr->SecondLevelDcacheSize = KeLoaderBlock->u.Arm.SecondLevelDcacheSize; - Pcr->FirstLevelIcacheSize = KeLoaderBlock->u.Arm.FirstLevelIcacheSize; - Pcr->SecondLevelIcacheSize = KeLoaderBlock->u.Arm.SecondLevelIcacheSize; - Pcr->FirstLevelDcacheFillSize = KeLoaderBlock->u.Arm.FirstLevelDcacheFillSize; - Pcr->SecondLevelDcacheFillSize = KeLoaderBlock->u.Arm.SecondLevelDcacheFillSize; - Pcr->FirstLevelIcacheFillSize = KeLoaderBlock->u.Arm.FirstLevelIcacheFillSize; - Pcr->SecondLevelIcacheFillSize = KeLoaderBlock->u.Arm.SecondLevelIcacheFillSize; + Pcr->Prcb.Cache[FirstLevelDcache].Type = CacheData; + Pcr->Prcb.Cache[FirstLevelDcache].Level = 1; + Pcr->Prcb.Cache[FirstLevelDcache].Associativity = 0; // FIXME + Pcr->Prcb.Cache[FirstLevelDcache].LineSize = KeLoaderBlock->u.Arm.FirstLevelDcacheFillSize; + Pcr->Prcb.Cache[FirstLevelDcache].Size = KeLoaderBlock->u.Arm.FirstLevelDcacheSize; + + Pcr->Prcb.Cache[SecondLevelDcache].Type = CacheData; + Pcr->Prcb.Cache[SecondLevelDcache].Level = 2; + Pcr->Prcb.Cache[SecondLevelDcache].Associativity = 0; // FIXME + Pcr->Prcb.Cache[SecondLevelDcache].LineSize = KeLoaderBlock->u.Arm.SecondLevelDcacheFillSize; + Pcr->Prcb.Cache[SecondLevelDcache].Size = KeLoaderBlock->u.Arm.SecondLevelDcacheSize; + + Pcr->Prcb.Cache[FirstLevelIcache].Type = CacheInstruction; + Pcr->Prcb.Cache[FirstLevelIcache].Level = 1; + Pcr->Prcb.Cache[FirstLevelIcache].Associativity = 0; // FIXME + Pcr->Prcb.Cache[FirstLevelIcache].LineSize = KeLoaderBlock->u.Arm.FirstLevelIcacheFillSize; + Pcr->Prcb.Cache[FirstLevelIcache].Size = KeLoaderBlock->u.Arm.FirstLevelIcacheSize; + + Pcr->Prcb.Cache[SecondLevelIcache].Type = CacheInstruction; + Pcr->Prcb.Cache[SecondLevelIcache].Level = 2; + Pcr->Prcb.Cache[SecondLevelIcache].Associativity = 0; // FIXME + Pcr->Prcb.Cache[SecondLevelIcache].LineSize = KeLoaderBlock->u.Arm.SecondLevelIcacheFillSize; + Pcr->Prcb.Cache[SecondLevelIcache].Size = KeLoaderBlock->u.Arm.SecondLevelIcacheSize; /* Set global d-cache fill and alignment values */ - if (!Pcr->SecondLevelDcacheSize) + if (Pcr->Prcb.Cache[SecondLevelDcache].Size == 0) { /* Use the first level */ - Pcr->DcacheFillSize = Pcr->FirstLevelDcacheSize; + Pcr->Prcb.Cache[GlobalDcache] = Pcr->Prcb.Cache[FirstLevelDcache]; } else { /* Use the second level */ - Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize; - } - + Pcr->Prcb.Cache[GlobalDcache] = Pcr->Prcb.Cache[SecondLevelDcache]; + } + /* Set the alignment */ - Pcr->DcacheAlignment = Pcr->DcacheFillSize - 1; - + //Pcr->DcacheAlignment = Pcr->DcacheFillSize - 1; + /* Set global i-cache fill and alignment values */ - if (!Pcr->SecondLevelIcacheSize) + if (Pcr->Prcb.Cache[SecondLevelIcache].Size == 0) { /* Use the first level */ - Pcr->IcacheFillSize = Pcr->FirstLevelIcacheSize; + Pcr->Prcb.Cache[GlobalIcache] = Pcr->Prcb.Cache[FirstLevelIcache]; } else { /* Use the second level */ - Pcr->IcacheFillSize = Pcr->SecondLevelIcacheSize; - } - + Pcr->Prcb.Cache[GlobalIcache] = Pcr->Prcb.Cache[SecondLevelIcache]; + } + /* Set the alignment */ - Pcr->IcacheAlignment = Pcr->IcacheFillSize - 1; - + //Pcr->IcacheAlignment = Pcr->IcacheFillSize - 1; + /* Set processor information */ - Pcr->ProcessorId = KeArmIdCodeRegisterGet().AsUlong; - + //Pcr->ProcessorId = KeArmIdCodeRegisterGet().AsUlong; + /* Set all interrupt routines to unexpected interrupts as well */ for (i = 0; i < MAXIMUM_VECTOR; i++) { /* Point to the same template */ - Pcr->InterruptRoutine[i] = (PVOID)&KxUnexpectedInterrupt.DispatchCode; + Pcr->Idt[i] = (PVOID)&KxUnexpectedInterrupt.DispatchCode; } /* Set default stall factor */ Pcr->StallScaleFactor = 50; - + /* Setup software interrupts */ - Pcr->InterruptRoutine[PASSIVE_LEVEL] = KiPassiveRelease; - Pcr->InterruptRoutine[APC_LEVEL] = KiApcInterrupt; - Pcr->InterruptRoutine[DISPATCH_LEVEL] = KiDispatchInterrupt; + Pcr->Idt[PASSIVE_LEVEL] = KiPassiveRelease; + Pcr->Idt[APC_LEVEL] = KiApcInterrupt; + Pcr->Idt[DISPATCH_LEVEL] = KiDispatchInterrupt; +#if 0 Pcr->ReservedVectors = (1 << PASSIVE_LEVEL) | (1 << APC_LEVEL) | (1 << DISPATCH_LEVEL) | (1 << IPI_LEVEL); +#endif } VOID @@ -283,7 +310,7 @@ { /* Detect ARM version */ KeIsArmV6 = KeArmIdCodeRegisterGet().Architecture >= 7; - + /* Set the number of TLB entries and ASIDs */ KeNumberTbEntries = 64; if (__ARMV6__) @@ -310,7 +337,7 @@ /* Flush the TLB */ KeFlushTb(); - + /* Save the loader block and get the current CPU */ KeLoaderBlock = LoaderBlock; Cpu = KeNumberProcessors; @@ -327,7 +354,7 @@ /* Skip initial setup if this isn't the Boot CPU */ if (Cpu) goto AppCpuInit; - + /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE); KiInitializePcr(Cpu, @@ -339,22 +366,20 @@ /* Now sweep caches */ HalSweepIcache(); HalSweepDcache(); - + /* Set us as the current process */ InitialThread->ApcState.Process = InitialProcess; - + AppCpuInit: /* Setup CPU-related fields */ - Pcr->Number = Cpu; - Pcr->SetMember = 1 << Cpu; - Pcr->SetMemberCopy = 1 << Cpu; - Pcr->PrcbData.SetMember = 1 << Cpu; - + Pcr->Prcb.Number = Cpu; + Pcr->Prcb.SetMember = 1 << Cpu; + /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock); /* Set active processors */ - KeActiveProcessors |= Pcr->SetMember; + KeActiveProcessors |= Pcr->Prcb.SetMember; KeNumberProcessors++; /* Check if this is the boot CPU */ @@ -369,12 +394,12 @@ /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); - + /* Set the exception address to high */ ControlRegister = KeArmControlRegisterGet(); ControlRegister.HighVectors = TRUE; KeArmControlRegisterSet(ControlRegister); - + /* Setup the exception vector table */ RtlCopyMemory((PVOID)0xFFFF0000, &KiArmVectorTable, 14 * sizeof(PVOID)); @@ -382,8 +407,8 @@ KiInitializeKernel((PKPROCESS)LoaderBlock->Process, (PKTHREAD)LoaderBlock->Thread, (PVOID)LoaderBlock->KernelStack, - Pcr->Prcb, - Pcr->Prcb->Number, + &Pcr->Prcb, + Pcr->Prcb.Number, KeLoaderBlock); /* Set the priority of this thread to 0 */ @@ -412,7 +437,7 @@ va_start(args, fmt); i = vsprintf(Buffer, fmt, args); va_end(args); - + /* Output the message */ while (*String != 0) { @@ -423,6 +448,6 @@ KdPortPutByteEx(NULL, *String); String++; } - + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -70,19 +70,19 @@ PKUINIT_FRAME InitFrame; InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KUINIT_FRAME)); - + // // Setup the Trap Frame and Exception frame // TrapFrame = &InitFrame->TrapFrame; ExceptionFrame = &InitFrame->ExceptionFrame; - + /// // Zero out the trap frame and exception frame // RtlZeroMemory(TrapFrame, sizeof(KTRAP_FRAME)); RtlZeroMemory(ExceptionFrame, sizeof(KEXCEPTION_FRAME)); - + // // Set up a trap frame from the context // @@ -97,12 +97,12 @@ // //TrapFrame->PreviousMode = UserMode; Thread->PreviousMode = UserMode; - + // // Clear the return address // - ExceptionFrame->Lr = 0; - + ExceptionFrame->Return = 0; + // // Context switch frame to setup below // @@ -116,22 +116,22 @@ PKKINIT_FRAME InitFrame; InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KKINIT_FRAME)); - + // // Set the previous mode as kernel // Thread->PreviousMode = KernelMode; - + // // Context switch frame to setup below // CtxSwitchFrame = &InitFrame->CtxSwitchFrame; } - + // // Now setup the context switch frame // - CtxSwitchFrame->Lr = (ULONG)KiThreadStartup; + CtxSwitchFrame->Return = (ULONG)KiThreadStartup; CtxSwitchFrame->R11 = (ULONG)(ExceptionFrame ? ExceptionFrame : CtxSwitchFrame); // @@ -141,7 +141,7 @@ CtxSwitchFrame->R5 = (ULONG)StartContext; CtxSwitchFrame->R6 = (ULONG)StartRoutine; CtxSwitchFrame->R7 = (ULONG)SystemRoutine; - + // // Save back the new value of the kernel stack // @@ -221,7 +221,7 @@ ARM_TTB_REGISTER TtbRegister; /* We are on the new thread stack now */ - NewThread = Pcr->PrcbData.CurrentThread; + NewThread = Pcr->Prcb.CurrentThread; /* Now we are the new thread. Check if it's in a new process */ OldProcess = OldThread->ApcState.Process; @@ -236,11 +236,8 @@ /* Increase thread context switches */ NewThread->ContextSwitches++; - /* Load data from switch frame */ - Pcr->NtTib.ExceptionList = SwitchFrame->ExceptionList; - /* DPCs shouldn't be active */ - if (Pcr->PrcbData.DpcRoutineActive) + if (Pcr->Prcb.DpcRoutineActive) { /* Crash the machine */ KeBugCheckEx(ATTEMPTED_SWITCH_FROM_DPC, @@ -276,20 +273,21 @@ /* Save APC bypass disable */ SwitchFrame->ApcBypassDisable = OldThreadAndApcFlag & 3; - SwitchFrame->ExceptionList = Pcr->NtTib.ExceptionList; /* Increase context switch count and check if tracing is enabled */ - Pcr->ContextSwitches++; + Pcr->Prcb.KeContextSwitches++; +#if 0 if (Pcr->PerfGlobalGroupMask) { /* We don't support this yet on x86 either */ DPRINT1("WMI Tracing not supported\n"); ASSERT(FALSE); } +#endif // 0 /* Get thread pointers */ OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); - NewThread = Pcr->PrcbData.CurrentThread; + NewThread = Pcr->Prcb.CurrentThread; /* Get the old thread and set its kernel stack */ OldThread->KernelStack = SwitchFrame; @@ -303,8 +301,7 @@ KiDispatchInterrupt(VOID) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); - PKPRCB Prcb = &Pcr->PrcbData; - PVOID OldHandler; + PKPRCB Prcb = &Pcr->Prcb; PKTHREAD NewThread, OldThread; /* Disable interrupts */ @@ -315,17 +312,10 @@ (Prcb->TimerRequest) || (Prcb->DeferredReadyListHead.Next)) { - /* Switch to safe execution context */ - OldHandler = Pcr->NtTib.ExceptionList; - Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - /* Retire DPCs while under the DPC stack */ //KiRetireDpcListInDpcStack(Prcb, Prcb->DpcStack); // FIXME!!! // KiRetireDpcList(Prcb); - - /* Restore context */ - Pcr->NtTib.ExceptionList = OldHandler; } /* Re-enable interrupts */ @@ -339,7 +329,7 @@ KiQuantumEnd(); } else if (Prcb->NextThread) - { + { /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -9,7 +9,6 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#include <internal/arm/ksarm.h> #define NDEBUG #include <debug.h> @@ -22,13 +21,13 @@ PKPCR Pcr = (PKPCR)KeGetPcr(); PKPRCB Prcb = Pcr->Prcb; PKTHREAD OldThread, NewThread; - + // // Loop forever... that's why this is an idle loop // DPRINT1("[IDLE LOOP]\n"); while (TRUE); - + while (TRUE) { // @@ -36,7 +35,7 @@ // _disable(); _enable(); - + // // Check if there's DPC work to do // @@ -48,13 +47,13 @@ // Clear the pending interrupt // HalClearSoftwareInterrupt(DISPATCH_LEVEL); - + // // Retire DPCs // KiRetireDpcList(Prcb); } - + // // Check if there's a thread to schedule // @@ -64,15 +63,15 @@ // Out with the old, in with the new... // OldThread = Prcb->CurrentThread; - NewThread = Prcb->NextThread; + NewThread = Prcb->NextThread; Prcb->CurrentThread = NewThread; Prcb->NextThread = NULL; - + // // Update thread state // NewThread->State = Running; - + // // Swap to the new thread // On ARM we call KiSwapContext instead of KiSwapContextInternal, @@ -101,19 +100,19 @@ DPRINT1("Swapping from: %p (%16s) to %p (%16s)\n", OldProcess, ((PEPROCESS)OldProcess)->ImageFileName, NewProcess, ((PEPROCESS)NewProcess)->ImageFileName); - + // // Update the page directory base // TtbRegister.AsUlong = NewProcess->DirectoryTableBase[0]; ASSERT(TtbRegister.Reserved == 0); KeArmTranslationTableRegisterSet(TtbRegister); - + // // FIXME: Flush the TLB // - - + + DPRINT1("Survived!\n"); while (TRUE); } @@ -126,15 +125,15 @@ PKIPCR Pcr = (PKIPCR)KeGetPcr(); PKPRCB Prcb = Pcr->Prcb; PKPROCESS OldProcess, NewProcess; - + DPRINT1("SWAP\n"); while (TRUE); - + // // Increase context switch count // Pcr->ContextSwitches++; - + // // Check if WMI tracing is enabled // @@ -146,7 +145,7 @@ DPRINT1("WMI Tracing not supported\n"); ASSERT(FALSE); } - + // // Check if the processes are also different // @@ -167,7 +166,7 @@ ASSERT(FALSE); } } - + // // Increase thread context switches // @@ -199,7 +198,7 @@ (ULONG_PTR)OldThread->InitialStack, 0); } - + // // Kernel APCs may be pending // @@ -217,7 +216,7 @@ return TRUE; } } - + // // Return // @@ -231,20 +230,20 @@ KPROCESSOR_MODE PreviousMode; KEXCEPTION_FRAME ExceptionFrame; PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame; - + DPRINT1("[APC TRAP]\n"); while (TRUE); - + // // Isolate previous mode // PreviousMode = KiGetPreviousMode(TrapFrame); - + // // FIXME-USER: Handle APC interrupt while in user-mode // if (PreviousMode == UserMode) ASSERT(FALSE); - + // // Disable interrupts // @@ -254,12 +253,12 @@ // Clear APC interrupt // HalClearSoftwareInterrupt(APC_LEVEL); - + // // Re-enable interrupts // _enable(); - + // // Deliver APCs // @@ -273,17 +272,17 @@ PKIPCR Pcr; PKPRCB Prcb; PKTHREAD NewThread, OldThread; - + DPRINT1("[DPC TRAP]\n"); while (TRUE); - + // // Get the PCR and disable interrupts // Pcr = (PKIPCR)KeGetPcr(); Prcb = Pcr->Prcb; _disable(); - + // //Check if we have to deliver DPCs, timers, or deferred threads // @@ -296,12 +295,12 @@ // KiRetireDpcList(Prcb); } - + // // Re-enable interrupts // _enable(); - + // // Check for quantum end // @@ -314,12 +313,12 @@ KiQuantumEnd(); return; } - + // // Check if we have a thread to swap to // if (Prcb->NextThread) - { + { // // Next is now current // @@ -327,18 +326,18 @@ NewThread = Prcb->NextThread; Prcb->CurrentThread = NewThread; Prcb->NextThread = NULL; - + // // Update thread states // NewThread->State = Running; OldThread->WaitReason = WrDispatchInt; - + // // Make the old thread ready // KxQueueReadyThread(OldThread, Prcb); - + // // Swap to the new thread // On ARM we call KiSwapContext instead of KiSwapContextInternal, @@ -355,23 +354,23 @@ IN ULONG Reserved) { KIRQL OldIrql, Irql; - ULONG InterruptCause, InterruptMask; + ULONG InterruptCause;//, InterruptMask; PKIPCR Pcr; PKTRAP_FRAME OldTrapFrame; - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + ASSERT(TrapFrame->Reserved == 0xBADB0D00); // // Increment interrupt count // Pcr = (PKIPCR)KeGetPcr(); - Pcr->Prcb->InterruptCount++; - + Pcr->Prcb.InterruptCount++; + // // Get the old IRQL // OldIrql = KeGetCurrentIrql(); - TrapFrame->OldIrql = OldIrql; - + TrapFrame->PreviousIrql = OldIrql; + // // Get the interrupt source // @@ -381,14 +380,17 @@ // // Get the new IRQL and Interrupt Mask // - Irql = Pcr->IrqlMask[InterruptCause]; - InterruptMask = Pcr->IrqlTable[Irql]; - + /// FIXME: use a global table in ntoskrnl instead of HAL? + //Irql = Pcr->IrqlMask[InterruptCause]; + //InterruptMask = Pcr->IrqlTable[Irql]; + Irql = 0; + __debugbreak(); + // // Raise to the new IRQL // KfRaiseIrql(Irql); - + // // The clock ISR wants the trap frame as a parameter // @@ -399,7 +401,7 @@ // Check if this interrupt is at DISPATCH or higher // if (Irql > DISPATCH_LEVEL) - { + { // // FIXME-TODO: Switch to interrupt stack // @@ -417,11 +419,13 @@ // // Call the registered interrupt routine // - Pcr->InterruptRoutine[Irql](); + /// FIXME: this should probably go into a table in ntoskrnl + //Pcr->InterruptRoutine[Irql](); + __debugbreak(); ASSERT(KeGetCurrentThread()->TrapFrame == TrapFrame); KeGetCurrentThread()->TrapFrame = OldTrapFrame; // DPRINT1("[ISR RETURN]\n"); - + // // Restore IRQL and interrupts // @@ -433,15 +437,15 @@ KiPrefetchAbortHandler(IN PKTRAP_FRAME TrapFrame) { PVOID Address = (PVOID)KeArmFaultAddressRegisterGet(); - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + ASSERT(TrapFrame->Reserved == 0xBADB0D00); ULONG Instruction = *(PULONG)TrapFrame->Pc; ULONG DebugType, Parameter0; EXCEPTION_RECORD ExceptionRecord; - + DPRINT1("[PREFETCH ABORT] (%x) @ %p/%p/%p\n", - KeArmInstructionFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); - while (TRUE); - + KeArmInstructionFaultStatusRegisterGet(), Address, TrapFrame->Lr, TrapFrame->Pc); + while (TRUE); + // // What we *SHOULD* do is look at the instruction fault status register // and see if it's equal to 2 (debug trap). Unfortunately QEMU doesn't seem @@ -469,7 +473,7 @@ // Parameter0 = STATUS_SUCCESS; } - + // // Build the exception record // @@ -478,14 +482,14 @@ ExceptionRecord.ExceptionRecord = NULL; ExceptionRecord.ExceptionAddress = (PVOID)TrapFrame->Pc; ExceptionRecord.NumberParameters = 3; - + // // Build the parameters // ExceptionRecord.ExceptionInformation[0] = Parameter0; ExceptionRecord.ExceptionInformation[1] = TrapFrame->R1; ExceptionRecord.ExceptionInformation[2] = TrapFrame->R2; - + // // Dispatch the exception // @@ -500,7 +504,7 @@ // return STATUS_SUCCESS; } - + // // Unhandled // @@ -514,12 +518,12 @@ { NTSTATUS Status; PVOID Address = (PVOID)KeArmFaultAddressRegisterGet(); - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); - + ASSERT(TrapFrame->Reserved == 0xBADB0D00); + DPRINT1("[ABORT] (%x) @ %p/%p/%p\n", - KeArmFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); - while (TRUE); - + KeArmFaultStatusRegisterGet(), Address, TrapFrame->Lr, TrapFrame->Pc); + while (TRUE); + // // Check if this is a page fault // @@ -546,33 +550,33 @@ PKTHREAD Thread; KPROCESSOR_MODE PreviousMode; ULONG Instruction; - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); - - DPRINT1("[SWI] @ %p/%p\n", TrapFrame->SvcLr, TrapFrame->Pc); - while (TRUE); - + ASSERT(TrapFrame->Reserved == 0xBADB0D00); + + DPRINT1("[SWI] @ %p/%p\n", TrapFrame->Lr, TrapFrame->Pc); + while (TRUE); + // // Get the current thread // Thread = KeGetCurrentThread(); - + // // Isolate previous mode // PreviousMode = KiGetPreviousMode(TrapFrame); - + // // Save old previous mode // TrapFrame->PreviousMode = PreviousMode; - TrapFrame->PreviousTrapFrame = (ULONG_PTR)Thread->TrapFrame; - + TrapFrame->TrapFrame = (ULONG_PTR)Thread->TrapFrame; + // // Save previous mode and trap frame // Thread->TrapFrame = TrapFrame; Thread->PreviousMode = PreviousMode; - + // // Read the opcode // @@ -587,12 +591,12 @@ NTSTATUS KiUndefinedExceptionHandler(IN PKTRAP_FRAME TrapFrame) { - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); - + ASSERT(TrapFrame->Reserved == 0xBADB0D00); + // // This should never happen // - DPRINT1("[UNDEF] @ %p/%p\n", TrapFrame->SvcLr, TrapFrame->Pc); + DPRINT1("[UNDEF] @ %p/%p\n", TrapFrame->Lr, TrapFrame->Pc); UNIMPLEMENTED; ASSERT(FALSE); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -9,7 +9,6 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#include <internal/arm/ksarm.h> #define NDEBUG #include <debug.h> @@ -92,20 +91,20 @@ PVOID* Argument; PVOID Arguments[0x11]; // Maximum 17 arguments KIRQL OldIrql; - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); - + ASSERT(TrapFrame->Reserved == 0xBADB0D00); + // // Increase count of system calls // - Pcr = (PKPCR)KeGetPcr(); - Pcr->Prcb->KeSystemCalls++; - + Pcr = KeGetPcr(); + Pcr->CurrentPrcb->KeSystemCalls++; + // // Get the system call ID // Id = Instruction & 0xFFFFF; //DPRINT1("[SWI] (%x) %p (%d) \n", Id, Thread, Thread->PreviousMode); - + // // Get the descriptor table // @@ -113,7 +112,7 @@ Offset = ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); ServiceTable += Offset; DescriptorTable = (PVOID)ServiceTable; - + // // Get the service call number and validate it // @@ -126,12 +125,12 @@ UNIMPLEMENTED; ASSERT(FALSE); } - + // // Save the function responsible for handling this system call // SystemCall = (PVOID)DescriptorTable->Base[Number]; - + // // Check if this is a GUI call // @@ -143,13 +142,13 @@ UNIMPLEMENTED; ASSERT(FALSE); } - + // // Check how many arguments this system call takes // ArgumentCount = DescriptorTable->Number[Number] / 4; ASSERT(ArgumentCount <= 17); - + // // Copy the register-arguments first // First four arguments are in a1, a2, a3, a4 @@ -163,7 +162,7 @@ Arguments[i] = *Argument; Argument++; } - + // // If more than four, we'll have some on the user stack // @@ -178,7 +177,7 @@ // FIXME-USER: Validate the user stack // ASSERT(FALSE); - Argument = (PVOID*)TrapFrame->UserSp; + Argument = (PVOID*)TrapFrame->Sp; } else { @@ -200,18 +199,18 @@ Argument++; } } - + // // We can safely enable interrupts here // _enable(); - + // // Do the system call and save result in EAX // TrapFrame->R0 = KiSyscallHandlers[ArgumentCount]((PVOID)SystemCall, (PVOID)Arguments); - + // // Check if this was a user call // @@ -226,9 +225,9 @@ // // Forcibly put us in a sane state // - KeGetPcr()->Irql = 0; + KeGetPcr()->CurrentIrql = 0; _disable(); - + // // Fail // @@ -238,7 +237,7 @@ 0, 0); } - + // // Make sure we're not attached and that APCs are not disabled // @@ -255,11 +254,11 @@ 0); } } - + // // Restore the old trap frame // - Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->PreviousTrapFrame; + Thread->TrapFrame = KiGetLinkedTrapFrame(TrapFrame); } VOID @@ -275,19 +274,19 @@ ULONG_PTR Stack; ULONG ContextLength; DPRINT1("User APC: %p %p %p\n", NormalContext, SystemArgument1, SystemArgument2); - + // // Build the user mode context // Context.ContextFlags = CONTEXT_FULL; KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); - + // // Setup the context on the user stack // ContextLength = sizeof(CONTEXT); Stack = (ULONG_PTR)(Context.Sp & ~7) - ContextLength; - + // // Make sure the stack is valid, and copy the context // @@ -301,7 +300,40 @@ TrapFrame->R1 = (ULONG)SystemArgument1; TrapFrame->R2 = (ULONG)SystemArgument2; TrapFrame->R3 = (ULONG)NormalRoutine; - TrapFrame->R8 = Stack; - TrapFrame->UserSp = Stack; - TrapFrame->UserLr = (ULONG)KeUserApcDispatcher; -} + TrapFrame->Sp = Stack; + TrapFrame->Lr = (ULONG)KeUserApcDispatcher; +} + +NTSTATUS +NTAPI +KeUserModeCallback(IN ULONG RoutineIndex, + IN PVOID Argument, + IN ULONG ArgumentLength, + OUT PVOID *Result, + OUT PULONG ResultLength) +{ + NT_ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KiCallUserMode( + IN PVOID *OutputBuffer, + IN PULONG OutputLength) +{ + NT_ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtCallbackReturn( + _In_ PVOID Result, + _In_ ULONG ResultLength, + _In_ NTSTATUS CallbackStatus) +{ + NT_ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=6773… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -167,6 +167,9 @@ if (InterlockedBitTestAndReset((PLONG)&Prcb->IpiFrozen, IPI_SYNCH_REQUEST)) { +#ifdef _M_ARM + DbgBreakPoint(); +#else (void)InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { @@ -179,6 +182,7 @@ while (0 != InterlockedCompareExchangeUL(&Prcb->SignalDone->TargetSet, 0, 0)); } (void)InterlockedExchangePointer((PVOID*)&Prcb->SignalDone, NULL); +#endif // _M_ARM } #endif return TRUE; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -530,7 +530,12 @@ NodePrcb = KiProcessorBlock[Process->ThreadSeed]; /* Calculate affinity mask */ +#ifdef _M_ARM + DbgBreakPoint(); + Set = 0; +#else Set = ~NodePrcb->MultiThreadProcessorSet; +#endif Mask = (ULONG)(Node->ProcessorMask & Process->Affinity); Set &= Mask; if (Set) Mask = Set; Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -725,7 +725,7 @@ #elif _M_AMD64 #define KiGetCurrentReadySummary() __readgsdword(FIELD_OFFSET(KIPCR, Prcb.ReadySummary)) #else -#error Implement me! +#define KiGetCurrentReadySummary() KeGetCurrentPrcb()->ReadySummary #endif /* Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -1555,6 +1555,10 @@ DbgPrint("MM:***RIP %p, EFL %p\n", TrapFrame->Rip, TrapFrame->EFlags); DbgPrint("MM:***RAX %p, RCX %p RDX %p\n", TrapFrame->Rax, TrapFrame->Rcx, TrapFrame->Rdx); DbgPrint("MM:***RBX %p, RSI %p RDI %p\n", TrapFrame->Rbx, TrapFrame->Rsi, TrapFrame->Rdi); +#elif defined(_M_ARM) + DbgPrint("MM:***PC %p\n", TrapFrame->Pc); + DbgPrint("MM:***R0 %p, R1 %p R2 %p, R3 %p\n", TrapFrame->R0, TrapFrame->R1, TrapFrame->R2, TrapFrame->R3); + DbgPrint("MM:***R11 %p, R12 %p SP %p, LR %p\n", TrapFrame->R11, TrapFrame->R12, TrapFrame->Sp, TrapFrame->Lr); #endif } Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -117,6 +117,10 @@ /* Template PTE for prototype page */ MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; +MMPTE ValidKernelPteLocal = {{0}}; +MMPDE ValidKernelPdeLocal = {{0}}; +MMPTE MmDecommittedPte = {{0}}; + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -290,3 +294,29 @@ } } +VOID +NTAPI +MmGetPageFileMapping( + PEPROCESS Process, + PVOID Address, + SWAPENTRY* SwapEntry) +{ + NT_ASSERT(FALSE); +} + +BOOLEAN +NTAPI +MmIsDisabledPage(PEPROCESS Process, PVOID Address) +{ + NT_ASSERT(FALSE); + return FALSE; +} + +VOID +NTAPI +INIT_FUNCTION +MiInitializeSessionSpaceLayout(VOID) +{ + NT_ASSERT(FALSE); +} + Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Thu May 14 22:31:58 2015 @@ -506,7 +506,7 @@ #endif -#ifdef _AMD64_ +#if defined(_M_AMD64) || defined(_M_ARM) VOID NTAPI RtlpGetStackLimits(

1 0

[tkreuzer] 67734: [FRAMEDYN] Separate exports by architecture and add ARM exports
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:31:25 2015 New Revision: 67734 URL: http://svn.reactos.org/svn/reactos?rev=67734&view=rev Log: [FRAMEDYN] Separate exports by architecture and add ARM exports Modified: trunk/reactos/dll/win32/framedyn/framedyn.spec Modified: trunk/reactos/dll/win32/framedyn/framedyn.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] Thu May 14 22:31:25 2015 @@ -1,160 +1,778 @@ -@ thiscall -arch=win32 ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi # protected: void __thiscall CHString::AllocBeforeWrite(int) + +# **************** x86 exports **************** +@ thiscall -arch=i386 ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi # protected: void __thiscall CHString::AllocBeforeWrite(int) +@ thiscall -arch=i386 ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) +@ thiscall -arch=i386 ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const +@ thiscall -arch=i386 ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv +@ thiscall -arch=i386 ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall -arch=i386 ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ +@ thiscall -arch=i386 ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc +@ thiscall -arch=i386 ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh +@ thiscall -arch=i386 ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw +@ thiscall -arch=i386 ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi +@ thiscall -arch=i386 ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall -arch=i386 ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) +@ thiscall -arch=i386 ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const +@ thiscall -arch=i386 ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const +@ thiscall -arch=i386 ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +@ thiscall -arch=i386 ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +@ thiscall -arch=i386 ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +@ thiscall -arch=i386 ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) +@ thiscall -arch=i386 ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) +@ thiscall -arch=i386 ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const +@ thiscall -arch=i386 ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw # public: int __thiscall CHString::Find(unsigned short)const +@ thiscall -arch=i386 ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const +@ thiscall -arch=i386 ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) +@ thiscall -arch=i386 ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) +@ thiscall -arch=i386 ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) +@ thiscall -arch=i386 ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +@ thiscall -arch=i386 ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) +@ thiscall -arch=i386 ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) +@ thiscall -arch=i386 ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const +@ thiscall -arch=i386 ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const +@ thiscall -arch=i386 ?GetBuffer@CHString@@QAEPAGH@Z(long) _ZN8CHString9GetBufferEi # public: unsigned short * __thiscall CHString::GetBuffer(int) +@ thiscall -arch=i386 ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi # public: unsigned short * __thiscall CHString::GetBufferSetLength(int) +@ thiscall -arch=i386 ?GetData@CHString@@IBEPAUCHStringData@@XZ() _ZNK8CHString7GetDataEv # protected: struct CHStringData * __thiscall CHString::GetData(void)const +@ thiscall -arch=i386 ?GetLength@CHString@@QBEHXZ() _ZNK8CHString9GetLengthEv # public: int __thiscall CHString::GetLength(void)const +@ thiscall -arch=i386 ?Init@CHString@@IAEXXZ() _ZN8CHString4InitEv # protected: void __thiscall CHString::Init(void) +@ thiscall -arch=i386 ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const +@ thiscall -arch=i386 ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const +@ thiscall -arch=i386 ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) +@ thiscall -arch=i386 ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +@ thiscall -arch=i386 ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) +@ thiscall -arch=i386 ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) +@ thiscall -arch=i386 ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) +@ thiscall -arch=i386 ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) +@ thiscall -arch=i386 ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const +@ thiscall -arch=i386 ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const +@ thiscall -arch=i386 ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) +@ thiscall -arch=i386 ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) +@ thiscall -arch=i386 ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) +@ thiscall -arch=i386 ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const +@ thiscall -arch=i386 ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const +@ stdcall -arch=i386 ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +@ thiscall -arch=i386 ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) +@ thiscall -arch=i386 ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +@ thiscall -arch=i386 ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +@ thiscall -arch=i386 ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) +@ thiscall -arch=i386 ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) +@ thiscall -arch=i386 ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) +@ thiscall -arch=i386 ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const +@ thiscall -arch=i386 ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) +@ thiscall -arch=i386 ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) +@ thiscall -arch=i386 ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +@ thiscall -arch=i386 ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +@ thiscall -arch=i386 ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) +@ thiscall -arch=i386 ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const +@ thiscall -arch=i386 ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor +@ stdcall -arch=i386 ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) +@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) +@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) +@ stdcall -arch=i386 ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) +@ stdcall -arch=i386 ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) +@ thiscall -arch=i386 ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) +@ thiscall -arch=i386 ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) +@ thiscall -arch=i386 ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl # protected: virtual long __thiscall Provider::ValidateMethodFlags(long) +@ thiscall -arch=i386 ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl # protected: virtual long __thiscall Provider::ValidateQueryFlags(long) + +# **************** win64 exports **************** @ thiscall -arch=win64 ?AllocBeforeWrite@CHString@@IEAAXH@Z(long) _ZN8CHString16AllocBeforeWriteEi # protected: void __thiscall CHString::AllocBeforeWrite(int) -@ thiscall -arch=win32 ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) @ thiscall -arch=win64 ?AllocBuffer@CHString@@IEAAXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) -@ thiscall -arch=win32 ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const @ thiscall -arch=win64 ?AllocCopy@CHString@@IEBAXAEAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const -@ thiscall -arch=win32 ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv @ thiscall -arch=win64 ?AllocSysString@CHString@@QEBAPEAGXZ() _ZNK8CHString14AllocSysStringEv -@ thiscall -arch=win32 ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw @ thiscall -arch=win64 ?AssignCopy@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw -@ thiscall -arch=win32 ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ @ thiscall -arch=win64 ??0CHString@@QEAA@AEBV0@@Z(ptr) _ZN8CHStringC1ERKS_ -@ thiscall -arch=win32 ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc @ thiscall -arch=win64 ??0CHString@@QEAA@PEBD@Z(str) _ZN8CHStringC1EPKc -@ thiscall -arch=win32 ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh @ thiscall -arch=win64 ??0CHString@@QEAA@PEBE@Z(str) _ZN8CHStringC1EPKh -@ thiscall -arch=win32 ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw @ thiscall -arch=win64 ??0CHString@@QEAA@PEBG@Z(wstr) _ZN8CHStringC1EPKw -@ thiscall -arch=win32 ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi @ thiscall -arch=win64 ??0CHString@@QEAA@PEBGH@Z(wstr long) _ZN8CHStringC1EPKwi -@ thiscall -arch=win32 ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi @ thiscall -arch=win64 ??0CHString@@QEAA@GH@Z(long long) _ZN8CHStringC1Ewi -@ thiscall -arch=win32 ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) @ thiscall -arch=win64 ??0CHString@@QEAA@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) -@ thiscall -arch=win32 ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const @ thiscall -arch=win64 ?Collate@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const -@ thiscall -arch=win32 ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const @ thiscall -arch=win64 ?Compare@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const -@ thiscall -arch=win32 ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const @ thiscall -arch=win64 ?CompareNoCase@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const -@ thiscall -arch=win32 ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) @ thiscall -arch=win64 ?ConcatCopy@CHString@@IEAAXHPEBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) -@ thiscall -arch=win32 ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) @ thiscall -arch=win64 ?ConcatInPlace@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) -@ thiscall -arch=win32 ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) @ thiscall -arch=win64 ?CopyBeforeWrite@CHString@@IEAAXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) -@ thiscall -arch=win32 ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) @ thiscall -arch=win64 ?Empty@CHString@@QEAAXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) -@ thiscall -arch=win32 ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const @ thiscall -arch=win64 ?Find@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const -@ thiscall -arch=win32 ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw # public: int __thiscall CHString::Find(unsigned short)const @ thiscall -arch=win64 ?Find@CHString@@QEBAHG@Z(long) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short)const -@ thiscall -arch=win32 ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const @ thiscall -arch=win64 ?FindOneOf@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const -@ thiscall -arch=win32 ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) @ thiscall -arch=win64 ?Format@CHString@@QEAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) -@ thiscall -arch=win32 ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) @ thiscall -arch=win64 ?Format@CHString@@QEAAXPEBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) -@ thiscall -arch=win32 ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) @ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) -@ thiscall -arch=win32 ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) @ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXPEBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) -@ thiscall -arch=win32 ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) @ thiscall -arch=win64 ?FormatV@CHString@@QEAAXPEBGPEAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) -@ thiscall -arch=win32 ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) @ thiscall -arch=win64 ?FreeExtra@CHString@@QEAAXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) -@ thiscall -arch=win32 ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const @ thiscall -arch=win64 ?GetAllocLength@CHString@@QEBAHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const -@ thiscall -arch=win32 ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const @ thiscall -arch=win64 ?GetAt@CHString@@QEBAGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const -@ thiscall -arch=win32 ?GetBuffer@CHString@@QAEPAGH@Z(long) _ZN8CHString9GetBufferEi # public: unsigned short * __thiscall CHString::GetBuffer(int) @ thiscall -arch=win64 ?GetBuffer@CHString@@QEAAPEAGH@Z(long) _ZN8CHString9GetBufferEi # public: unsigned short * __thiscall CHString::GetBuffer(int) -@ thiscall -arch=win32 ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi # public: unsigned short * __thiscall CHString::GetBufferSetLength(int) @ thiscall -arch=win64 ?GetBufferSetLength@CHString@@QEAAPEAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi # public: unsigned short * __thiscall CHString::GetBufferSetLength(int) -@ thiscall -arch=win32 ?GetData@CHString@@IBEPAUCHStringData@@XZ() _ZNK8CHString7GetDataEv # protected: struct CHStringData * __thiscall CHString::GetData(void)const @ thiscall -arch=win64 ?GetData@CHString@@IEBAPEAUCHStringData@@XZ() _ZNK8CHString7GetDataEv # protected: struct CHStringData * __thiscall CHString::GetData(void)const -@ thiscall -arch=win32 ?GetLength@CHString@@QBEHXZ() _ZNK8CHString9GetLengthEv # public: int __thiscall CHString::GetLength(void)const @ thiscall -arch=win64 ?GetLength@CHString@@QEBAHXZ() _ZNK8CHString9GetLengthEv # public: int __thiscall CHString::GetLength(void)const -@ thiscall -arch=win32 ?Init@CHString@@IAEXXZ() _ZN8CHString4InitEv # protected: void __thiscall CHString::Init(void) @ thiscall -arch=win64 ?Init@CHString@@IEAAXXZ() _ZN8CHString4InitEv # protected: void __thiscall CHString::Init(void) -@ thiscall -arch=win32 ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const @ thiscall -arch=win64 ?IsEmpty@CHString@@QEBAHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const -@ thiscall -arch=win32 ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const @ thiscall -arch=win64 ?Left@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const -@ thiscall -arch=win32 ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) @ thiscall -arch=win64 ?LoadStringW@CHString@@QEAAHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) -@ thiscall -arch=win32 ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) @ thiscall -arch=win64 ?LoadStringW@CHString@@IEAAHIPEAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) -@ thiscall -arch=win32 ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) @ thiscall -arch=win64 ?LockBuffer@CHString@@QEAAPEAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) -@ thiscall -arch=win32 ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) @ thiscall -arch=win64 ?MakeLower@CHString@@QEAAXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) -@ thiscall -arch=win32 ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) @ thiscall -arch=win64 ?MakeReverse@CHString@@QEAAXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) -@ thiscall -arch=win32 ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) @ thiscall -arch=win64 ?MakeUpper@CHString@@QEAAXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) -@ thiscall -arch=win32 ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const @ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const -@ thiscall -arch=win32 ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const @ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const -@ thiscall -arch=win32 ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) @ thiscall -arch=win64 ?Release@CHString@@KAXPEAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) -@ thiscall -arch=win32 ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) @ thiscall -arch=win64 ?Release@CHString@@IEAAXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) -@ thiscall -arch=win32 ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) @ thiscall -arch=win64 ?ReleaseBuffer@CHString@@QEAAXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) -@ thiscall -arch=win32 ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const @ thiscall -arch=win64 ?ReverseFind@CHString@@QEBAHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const -@ thiscall -arch=win32 ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const @ thiscall -arch=win64 ?Right@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const -@ stdcall -arch=win32 ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) @ stdcall -arch=win64 ?SafeStrlen@CHString@@KAHPEBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) -@ thiscall -arch=win32 ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) @ thiscall -arch=win64 ?SetAt@CHString@@QEAAXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) -@ thiscall -arch=win32 ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const @ thiscall -arch=win64 ?SpanExcluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const -@ thiscall -arch=win32 ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const @ thiscall -arch=win64 ?SpanIncluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const -@ thiscall -arch=win32 ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) @ thiscall -arch=win64 ?TrimLeft@CHString@@QEAAXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) -@ thiscall -arch=win32 ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) @ thiscall -arch=win64 ?TrimRight@CHString@@QEAAXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) -@ thiscall -arch=win32 ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) @ thiscall -arch=win64 ?UnlockBuffer@CHString@@QEAAXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) -@ thiscall -arch=win32 ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const @ thiscall -arch=win64 ??BCHString@@QEBAPEBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const -@ thiscall -arch=win32 ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) -@ thiscall -arch=win32 ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) -@ thiscall -arch=win32 ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) -@ thiscall -arch=win32 ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) @ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) -@ thiscall -arch=win32 ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) @ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) -@ thiscall -arch=win32 ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const @ thiscall -arch=win64 ??ACHString@@QEBAGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const -@ thiscall -arch=win32 ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor @ thiscall -arch=win64 ??1CHString@@QEAA@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor -@ stdcall -arch=win32 ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) @ stdcall -arch=win64 ??H@YA?AVCHString@@GAEBV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) -@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) @ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) -@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) @ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@PEBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) -@ stdcall -arch=win32 ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) @ stdcall -arch=win64 ??H@YA?AVCHString@@PEBGAEBV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) -@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) @ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) -@ thiscall -arch=win32 ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) @ thiscall -arch=win64 ?Flush@Provider@@MEAAXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) -@ thiscall -arch=win32 ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) @ thiscall -arch=win64 ?ValidateDeletionFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) -@ thiscall -arch=win32 ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl # protected: virtual long __thiscall Provider::ValidateMethodFlags(long) @ thiscall -arch=win64 ?ValidateMethodFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl # protected: virtual long __thiscall Provider::ValidateMethodFlags(long) -@ thiscall -arch=win32 ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl # protected: virtual long __thiscall Provider::ValidateQueryFlags(long) @ thiscall -arch=win64 ?ValidateQueryFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl # protected: virtual long __thiscall Provider::ValidateQueryFlags(long) + +# **************** arm exports **************** +;@ cdecl -arch=arm ??0CAutoEvent@@QAA@XZ() +;@ cdecl -arch=arm ??0CFrameworkQuery@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CFrameworkQuery@@QAA@XZ() +;@ cdecl -arch=arm ??0CFrameworkQueryEx@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CFrameworkQueryEx@@QAA@XZ() +;@ cdecl -arch=arm ??0CHPtrArray@@QAA@XZ() +@ cdecl -arch=arm ??0CHString@@QAA@ABV0@@Z() +@ cdecl -arch=arm ??0CHString@@QAA@GH@Z() +@ cdecl -arch=arm ??0CHString@@QAA@PBD@Z() +@ cdecl -arch=arm ??0CHString@@QAA@PBE@Z() +@ cdecl -arch=arm ??0CHString@@QAA@PBG@Z() +@ cdecl -arch=arm ??0CHString@@QAA@PBGH@Z() +@ cdecl -arch=arm ??0CHString@@QAA@XZ() +;@ cdecl -arch=arm ??0CHStringArray@@QAA@XZ() +;@ cdecl -arch=arm ??0CInstance@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CInstance@@QAA@PAUIWbemClassObject@@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ??0CObjectPathParser@@QAA@W4ObjectParserFlags@@@Z() +;@ cdecl -arch=arm ??0CRegistry@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CRegistry@@QAA@XZ() +;@ cdecl -arch=arm ??0CRegistrySearch@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CRegistrySearch@@QAA@XZ() +;@ cdecl -arch=arm ??0CThreadBase@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CThreadBase@@QAA@W4THREAD_SAFETY_MECHANISM@0@@Z() +;@ cdecl -arch=arm ??0CWbemGlueFactory@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CWbemGlueFactory@@QAA@PAJ@Z() +;@ cdecl -arch=arm ??0CWbemGlueFactory@@QAA@XZ() +;@ cdecl -arch=arm ??0CWbemProviderGlue@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CWbemProviderGlue@@QAA@PAJ@Z() +;@ cdecl -arch=arm ??0CWbemProviderGlue@@QAA@XZ() +;@ cdecl -arch=arm ??0CWinMsgEvent@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0CWinMsgEvent@@QAA@XZ() +;@ cdecl -arch=arm ??0CreateMutexAsProcess@@QAA@PBG@Z() +;@ cdecl -arch=arm ??0KeyRef@@QAA@PBGPBUtagVARIANT@@@Z() +;@ cdecl -arch=arm ??0KeyRef@@QAA@XZ() +;@ cdecl -arch=arm ??0MethodContext@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0MethodContext@@QAA@PAUIWbemContext@@PAVCWbemProviderGlue@@@Z() +;@ cdecl -arch=arm ??0ParsedObjectPath@@QAA@XZ() +;@ cdecl -arch=arm ??0Provider@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0Provider@@QAA@PBG0@Z() +;@ cdecl -arch=arm ??0ProviderLog@@QAA@ABV0@@Z() +;@ cdecl -arch=arm ??0ProviderLog@@QAA@XZ() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@ABJ@Z() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@ABU_FILETIME@@@Z() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@ABU_SYSTEMTIME@@@Z() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@ABUtm@@@Z() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@QAG@Z() +;@ cdecl -arch=arm ??0WBEMTime@@QAA@XZ() +;@ cdecl -arch=arm ??0WBEMTimeSpan@@QAA@ABJ@Z() +;@ cdecl -arch=arm ??0WBEMTimeSpan@@QAA@ABU_FILETIME@@@Z() +;@ cdecl -arch=arm ??0WBEMTimeSpan@@QAA@HHHHHHH@Z() +;@ cdecl -arch=arm ??0WBEMTimeSpan@@QAA@QAG@Z() +;@ cdecl -arch=arm ??0WBEMTimeSpan@@QAA@XZ() +;@ cdecl -arch=arm ??0_Lockit@std@@QAA@XZ() +;@ cdecl -arch=arm ??1CAutoEvent@@QAA@XZ() +;@ cdecl -arch=arm ??1CFrameworkQuery@@QAA@XZ() +;@ cdecl -arch=arm ??1CFrameworkQueryEx@@QAA@XZ() +;@ cdecl -arch=arm ??1CHPtrArray@@QAA@XZ() +@ cdecl -arch=arm ??1CHString@@QAA@XZ() +;@ cdecl -arch=arm ??1CHStringArray@@QAA@XZ() +;@ cdecl -arch=arm ??1CInstance@@UAA@XZ() +;@ cdecl -arch=arm ??1CObjectPathParser@@QAA@XZ() +;@ cdecl -arch=arm ??1CRegistry@@QAA@XZ() +;@ cdecl -arch=arm ??1CRegistrySearch@@QAA@XZ() +;@ cdecl -arch=arm ??1CThreadBase@@UAA@XZ() +;@ cdecl -arch=arm ??1CWbemGlueFactory@@QAA@XZ() +;@ cdecl -arch=arm ??1CWbemProviderGlue@@QAA@XZ() +;@ cdecl -arch=arm ??1CWinMsgEvent@@QAA@XZ() +;@ cdecl -arch=arm ??1CreateMutexAsProcess@@QAA@XZ() +;@ cdecl -arch=arm ??1KeyRef@@QAA@XZ() +;@ cdecl -arch=arm ??1MethodContext@@UAA@XZ() +;@ cdecl -arch=arm ??1ParsedObjectPath@@QAA@XZ() +;@ cdecl -arch=arm ??1Provider@@UAA@XZ() +;@ cdecl -arch=arm ??1ProviderLog@@UAA@XZ() +;@ cdecl -arch=arm ??1_Lockit@std@@QAA@XZ() +;@ cdecl -arch=arm ??4CAutoEvent@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CFrameworkQuery@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CFrameworkQueryEx@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CHPtrArray@@QAAAAV0@ABV0@@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@ABV0@@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@D@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@G@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@PAV0@@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@PBD@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@PBE@Z() +@ cdecl -arch=arm ??4CHString@@QAAABV0@PBG@Z() +;@ cdecl -arch=arm ??4CHStringArray@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CInstance@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CObjectPathParser@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CRegistry@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CRegistrySearch@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CThreadBase@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CWbemGlueFactory@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CWbemProviderGlue@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CWinMsgEvent@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4CreateMutexAsProcess@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4KeyRef@@QAAAAU0@ABU0@@Z() +;@ cdecl -arch=arm ??4MethodContext@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4ParsedObjectPath@@QAAAAU0@ABU0@@Z() +;@ cdecl -arch=arm ??4Provider@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4ProviderLog@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAABV0@ABJ@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAABV0@ABU_FILETIME@@@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAABV0@ABU_SYSTEMTIME@@@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAABV0@ABUtm@@@Z() +;@ cdecl -arch=arm ??4WBEMTime@@QAAABV0@QAG@Z() +;@ cdecl -arch=arm ??4WBEMTimeSpan@@QAAAAV0@ABV0@@Z() +;@ cdecl -arch=arm ??4WBEMTimeSpan@@QAAABV0@ABJ@Z() +;@ cdecl -arch=arm ??4WBEMTimeSpan@@QAAABV0@ABU_FILETIME@@@Z() +;@ cdecl -arch=arm ??4WBEMTimeSpan@@QAAABV0@QAG@Z() +;@ cdecl -arch=arm ??8WBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??8WBEMTimeSpan@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??9WBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??9WBEMTimeSpan@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??ACHPtrArray@@QAAAAPAXH@Z() +;@ cdecl -arch=arm ??ACHPtrArray@@QBAPAXH@Z() +@ cdecl -arch=arm ??ACHString@@QBAGH@Z() +;@ cdecl -arch=arm ??ACHStringArray@@QAAAAVCHString@@H@Z() +;@ cdecl -arch=arm ??ACHStringArray@@QBA?AVCHString@@H@Z() +@ cdecl -arch=arm ??BCHString@@QBAPBGXZ() +;@ cdecl -arch=arm ??GWBEMTime@@QAA?AVWBEMTimeSpan@@ABV0@@Z() +;@ cdecl -arch=arm ??GWBEMTime@@QBA?AV0@ABVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ??GWBEMTimeSpan@@QBA?AV0@ABV0@@Z() +@ cdecl -arch=arm ??H@YA?AVCHString@@ABV0@0@Z() +@ cdecl -arch=arm ??H@YA?AVCHString@@ABV0@G@Z() +@ cdecl -arch=arm ??H@YA?AVCHString@@ABV0@PBG@Z() +@ cdecl -arch=arm ??H@YA?AVCHString@@GABV0@@Z() +@ cdecl -arch=arm ??H@YA?AVCHString@@PBGABV0@@Z() +;@ cdecl -arch=arm ??HWBEMTime@@QBA?AV0@ABVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ??HWBEMTimeSpan@@QBA?AV0@ABV0@@Z() +;@ cdecl -arch=arm ??MWBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??MWBEMTimeSpan@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??NWBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??NWBEMTimeSpan@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??OWBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??OWBEMTimeSpan@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??PWBEMTime@@QBAHABV0@@Z() +;@ cdecl -arch=arm ??PWBEMTimeSpan@@QBAHABV0@@Z() +@ cdecl -arch=arm ??YCHString@@QAAABV0@ABV0@@Z() +@ cdecl -arch=arm ??YCHString@@QAAABV0@D@Z() +@ cdecl -arch=arm ??YCHString@@QAAABV0@G@Z() +@ cdecl -arch=arm ??YCHString@@QAAABV0@PBG@Z() +;@ cdecl -arch=arm ??YWBEMTime@@QAAABV0@ABVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ??YWBEMTimeSpan@@QAAABV0@ABV0@@Z() +;@ cdecl -arch=arm ??ZWBEMTime@@QAAABV0@ABVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ??ZWBEMTimeSpan@@QAAABV0@ABV0@@Z() +;@ extern -arch=arm ??_7CFrameworkQueryEx@@6B@ +;@ extern -arch=arm ??_7CInstance@@6B@ +;@ extern -arch=arm ??_7CThreadBase@@6B@ +;@ extern -arch=arm ??_7CWbemGlueFactory@@6B@ +;@ extern -arch=arm ??_7CWbemProviderGlue@@6BIWbemProviderInit@@@ +;@ extern -arch=arm ??_7CWbemProviderGlue@@6BIWbemServices@@@ +;@ extern -arch=arm ??_7CWinMsgEvent@@6B@ +;@ extern -arch=arm ??_7MethodContext@@6B@ +;@ extern -arch=arm ??_7Provider@@6B@ +;@ cdecl -arch=arm ??_7ProviderLog@@6B@() +;@ cdecl -arch=arm ??_FCObjectPathParser@@QAAXXZ() +;@ cdecl -arch=arm ??_FCThreadBase@@QAAXXZ() +;@ cdecl -arch=arm ?Add@CHPtrArray@@QAAHPAX@Z() +;@ cdecl -arch=arm ?Add@CHStringArray@@QAAHPBG@Z() +;@ cdecl -arch=arm ?AddFlushPtr@CWbemProviderGlue@@AAAXPAX@Z() +;@ cdecl -arch=arm ?AddKeyRef@ParsedObjectPath@@QAAHPAUKeyRef@@@Z() +;@ cdecl -arch=arm ?AddKeyRef@ParsedObjectPath@@QAAHPBGPBUtagVARIANT@@@Z() +;@ cdecl -arch=arm ?AddKeyRefEx@ParsedObjectPath@@QAAHPBGPBUtagVARIANT@@@Z() +;@ cdecl -arch=arm ?AddNamespace@ParsedObjectPath@@QAAHPBG@Z() +;@ cdecl -arch=arm ?AddProviderToMap@CWbemProviderGlue@@CAPAVProvider@@PBG0PAV2@@Z() +;@ cdecl -arch=arm ?AddRef@CInstance@@QAAJXZ() +;@ cdecl -arch=arm ?AddRef@CThreadBase@@QAAJXZ() +;@ cdecl -arch=arm ?AddRef@CWbemGlueFactory@@UAAKXZ() +;@ cdecl -arch=arm ?AddRef@CWbemProviderGlue@@UAAKXZ() +;@ cdecl -arch=arm ?AddRef@MethodContext@@QAAJXZ() +;@ cdecl -arch=arm ?AddToFactoryMap@CWbemProviderGlue@@KAXPBVCWbemGlueFactory@@PAJ@Z() +;@ cdecl -arch=arm ?AllPropertiesAreRequired@CFrameworkQuery@@QAA_NXZ() +@ cdecl -arch=arm ?AllocBeforeWrite@CHString@@IAAXH@Z() +@ cdecl -arch=arm ?AllocBuffer@CHString@@IAAXH@Z() +@ cdecl -arch=arm ?AllocCopy@CHString@@IBAXAAV1@HHH@Z() +@ cdecl -arch=arm ?AllocSysString@CHString@@QBAPAGXZ() +;@ cdecl -arch=arm ?Append@CHPtrArray@@QAAHABV1@@Z() +;@ cdecl -arch=arm ?Append@CHStringArray@@QAAHABV1@@Z() +@ cdecl -arch=arm ?AssignCopy@CHString@@IAAXHPBG@Z() +;@ cdecl -arch=arm ?BeginRead@CThreadBase@@QAAHK@Z() +;@ cdecl -arch=arm ?BeginWrite@CThreadBase@@QAAHK@Z() +;@ cdecl -arch=arm ?CancelAsyncCall@CWbemProviderGlue@@UAAJPAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?CancelAsyncRequest@CWbemProviderGlue@@UAAJJ@Z() +;@ cdecl -arch=arm ?CheckAndAddToList@CRegistrySearch@@AAAXPAVCRegistry@@VCHString@@1AAVCHPtrArray@@11H@Z() +;@ cdecl -arch=arm ?CheckFileSize@ProviderLog@@AAAXAAT_LARGE_INTEGER@@ABVCHString@@@Z() +;@ cdecl -arch=arm ?CheckImpersonationLevel@CWbemProviderGlue@@CAJXZ() +;@ cdecl -arch=arm ?Clear@WBEMTime@@QAAXXZ() +;@ cdecl -arch=arm ?Clear@WBEMTimeSpan@@QAAXXZ() +;@ cdecl -arch=arm ?ClearKeys@ParsedObjectPath@@QAAXXZ() +;@ cdecl -arch=arm ?Close@CRegistry@@QAAXXZ() +;@ cdecl -arch=arm ?CloseSubKey@CRegistry@@AAAXXZ() +@ cdecl -arch=arm ?Collate@CHString@@QBAHPBG@Z() +;@ cdecl -arch=arm ?Commit@CInstance@@QAAJXZ() +;@ cdecl -arch=arm ?Commit@Provider@@IAAJPAVCInstance@@_N@Z() +@ cdecl -arch=arm ?Compare@CHString@@QBAHPBG@Z() +@ cdecl -arch=arm ?CompareNoCase@CHString@@QBAHPBG@Z() +@ cdecl -arch=arm ?ConcatCopy@CHString@@IAAXHPBGH0@Z() +@ cdecl -arch=arm ?ConcatInPlace@CHString@@IAAXHPBG@Z() +;@ cdecl -arch=arm ?Copy@CHPtrArray@@QAAXABV1@@Z() +;@ cdecl -arch=arm ?Copy@CHStringArray@@QAAXABV1@@Z() +@ cdecl -arch=arm ?CopyBeforeWrite@CHString@@IAAXXZ() +;@ cdecl -arch=arm ?Create@CWbemGlueFactory@@SAPAV1@PAJ@Z() +;@ cdecl -arch=arm ?Create@CWbemGlueFactory@@SAPAV1@XZ() +;@ cdecl -arch=arm ?CreateClassEnum@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIEnumWbemClassObject@@@Z() +;@ cdecl -arch=arm ?CreateClassEnumAsync@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?CreateInstance@CWbemGlueFactory@@UAAJPAUIUnknown@@ABU_GUID@@PAPAX@Z() +;@ cdecl -arch=arm ?CreateInstanceEnum@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIEnumWbemClassObject@@@Z() +;@ cdecl -arch=arm ?CreateInstanceEnum@Provider@@AAAJPAVMethodContext@@J@Z() +;@ cdecl -arch=arm ?CreateInstanceEnumAsync@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?CreateMsgProvider@CWinMsgEvent@@CAXXZ() +;@ cdecl -arch=arm ?CreateMsgWindow@CWinMsgEvent@@CAPAUHWND__@@XZ() +;@ cdecl -arch=arm ?CreateNewInstance@Provider@@IAAPAVCInstance@@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?CreateOpen@CRegistry@@QAAJPAUHKEY__@@PBGPAGKKPAU_SECURITY_ATTRIBUTES@@PAK@Z() +;@ cdecl -arch=arm ?CtrlHandlerRoutine@CWinMsgEvent@@CAHK@Z() +;@ cdecl -arch=arm ?DecrementMapCount@CWbemProviderGlue@@KAJPAJ@Z() +;@ cdecl -arch=arm ?DecrementMapCount@CWbemProviderGlue@@KAJPBVCWbemGlueFactory@@@Z() +;@ cdecl -arch=arm ?DecrementObjectCount@CWbemProviderGlue@@SAJXZ() +;@ cdecl -arch=arm ?DeleteClass@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?DeleteClassAsync@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?DeleteCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBG@Z() +;@ cdecl -arch=arm ?DeleteCurrentKeyValue@CRegistry@@QAAKPBG@Z() +;@ cdecl -arch=arm ?DeleteInstance@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?DeleteInstance@Provider@@AAAJPAUParsedObjectPath@@JPAVMethodContext@@@Z() +;@ cdecl -arch=arm ?DeleteInstance@Provider@@MAAJABVCInstance@@J@Z() +;@ cdecl -arch=arm ?DeleteInstanceAsync@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?DeleteKey@CRegistry@@QAAJPAVCHString@@@Z() +;@ cdecl -arch=arm ?DeleteValue@CRegistry@@QAAJPBG@Z() +;@ cdecl -arch=arm ?Destroy@CWbemGlueFactory@@QAAXXZ() +;@ cdecl -arch=arm ?DestroyMsgWindow@CWinMsgEvent@@CAXXZ() +;@ cdecl -arch=arm ?ElementAt@CHPtrArray@@QAAAAPAXH@Z() +;@ cdecl -arch=arm ?ElementAt@CHStringArray@@QAAAAVCHString@@H@Z() +@ cdecl -arch=arm ?Empty@CHString@@QAAXXZ() +;@ cdecl -arch=arm ?Empty@CObjectPathParser@@AAAXXZ() +;@ cdecl -arch=arm ?EndRead@CThreadBase@@QAAXXZ() +;@ cdecl -arch=arm ?EndWrite@CThreadBase@@QAAXXZ() +;@ cdecl -arch=arm ?EnumerateAndGetValues@CRegistry@@QAAJAAKAAPAGAAPAE@Z() +;@ cdecl -arch=arm ?EnumerateInstances@Provider@@MAAJPAVMethodContext@@J@Z() +;@ cdecl -arch=arm ?ExecMethod@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAUIWbemClassObject@@PAPAU3@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?ExecMethod@Provider@@AAAJPAUParsedObjectPath@@PAGJPAVCInstance@@2PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?ExecMethod@Provider@@MAAJABVCInstance@@QAGPAV2@2J@Z() +;@ cdecl -arch=arm ?ExecMethodAsync@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAUIWbemClassObject@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?ExecNotificationQuery@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAPAUIEnumWbemClassObject@@@Z() +;@ cdecl -arch=arm ?ExecNotificationQueryAsync@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?ExecQuery@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAPAUIEnumWbemClassObject@@@Z() +;@ cdecl -arch=arm ?ExecQuery@Provider@@MAAJPAVMethodContext@@AAVCFrameworkQuery@@J@Z() +;@ cdecl -arch=arm ?ExecQueryAsync@CWbemProviderGlue@@UAAJQAG0JPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?ExecuteQuery@Provider@@AAAJPAVMethodContext@@AAVCFrameworkQuery@@J@Z() +;@ cdecl -arch=arm ?FillInstance@CWbemProviderGlue@@SAJPAVCInstance@@PBG@Z() +;@ cdecl -arch=arm ?FillInstance@CWbemProviderGlue@@SAJPAVMethodContext@@PAVCInstance@@@Z() +@ cdecl -arch=arm ?Find@CHString@@QBAHG@Z() +@ cdecl -arch=arm ?Find@CHString@@QBAHPBG@Z() +@ cdecl -arch=arm ?FindOneOf@CHString@@QBAHPBG@Z() +@ cdecl -arch=arm ?Flush@Provider@@MAAXXZ() +;@ cdecl -arch=arm ?FlushAll@CWbemProviderGlue@@AAAXXZ() +@ cdecl -arch=arm ?Format@CHString@@QAAXIZZ() +@ cdecl -arch=arm ?Format@CHString@@QAAXPBGZZ() +@ cdecl -arch=arm ?FormatMessageW@CHString@@QAAXIZZ() +@ cdecl -arch=arm ?FormatMessageW@CHString@@QAAXPBGZZ() +@ cdecl -arch=arm ?FormatV@CHString@@QAAXPBGPAD@Z() +;@ cdecl -arch=arm ?FrameworkLogin@CWbemProviderGlue@@SAXPBGPAVProvider@@0@Z() +;@ cdecl -arch=arm ?FrameworkLoginDLL@CWbemProviderGlue@@SAHPBG@Z() +;@ cdecl -arch=arm ?FrameworkLoginDLL@CWbemProviderGlue@@SAHPBGPAJ@Z() +;@ cdecl -arch=arm ?FrameworkLogoff@CWbemProviderGlue@@SAXPBG0@Z() +;@ cdecl -arch=arm ?FrameworkLogoffDLL@CWbemProviderGlue@@SAHPBG@Z() +;@ cdecl -arch=arm ?FrameworkLogoffDLL@CWbemProviderGlue@@SAHPBGPAJ@Z() +;@ cdecl -arch=arm ?Free@CObjectPathParser@@QAAXPAUParsedObjectPath@@@Z() +;@ cdecl -arch=arm ?FreeExtra@CHPtrArray@@QAAXXZ() +@ cdecl -arch=arm ?FreeExtra@CHString@@QAAXXZ() +;@ cdecl -arch=arm ?FreeExtra@CHStringArray@@QAAXXZ() +;@ cdecl -arch=arm ?FreeSearchList@CRegistrySearch@@QAAHHAAVCHPtrArray@@@Z() +;@ cdecl -arch=arm ?GetAllDerivedInstances@CWbemProviderGlue@@SAJPBGPAV?$TRefPointerCollection@VCInstance@@@@PAVMethodContext@@0@Z() +;@ cdecl -arch=arm ?GetAllDerivedInstancesAsynch@CWbemProviderGlue@@SAJPBGPAVProvider@@P6AJ1PAVCInstance@@PAVMethodContext@@PAX@Z034@Z() +;@ cdecl -arch=arm ?GetAllInstances@CWbemProviderGlue@@SAJPBGPAV?$TRefPointerCollection@VCInstance@@@@0PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetAllInstancesAsynch@CWbemProviderGlue@@SAJPBGPAVProvider@@P6AJ1PAVCInstance@@PAVMethodContext@@PAX@Z034@Z() +@ cdecl -arch=arm ?GetAllocLength@CHString@@QBAHXZ() +;@ cdecl -arch=arm ?GetAt@CHPtrArray@@QBAPAXH@Z() +@ cdecl -arch=arm ?GetAt@CHString@@QBAGH@Z() +;@ cdecl -arch=arm ?GetAt@CHStringArray@@QBA?AVCHString@@H@Z() +;@ cdecl -arch=arm ?GetBSTR@WBEMTime@@QBAPAGXZ() +;@ cdecl -arch=arm ?GetBSTR@WBEMTimeSpan@@QBAPAGXZ() +@ cdecl -arch=arm ?GetBuffer@CHString@@QAAPAGH@Z() +@ cdecl -arch=arm ?GetBufferSetLength@CHString@@QAAPAGH@Z() +;@ cdecl -arch=arm ?GetByte@CInstance@@QBA_NPBGAAE@Z() +;@ cdecl -arch=arm ?GetCHString@CInstance@@QBA_NPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCSDVersion@CWbemProviderGlue@@SAPBGXZ() +;@ cdecl -arch=arm ?GetClassNameW@CRegistry@@QAAPAGXZ() +;@ cdecl -arch=arm ?GetClassObjectInterface@CInstance@@QAAPAUIWbemClassObject@@XZ() +;@ cdecl -arch=arm ?GetClassObjectInterface@Provider@@AAAPAUIWbemClassObject@@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetComputerNameW@CWbemProviderGlue@@CAXAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentBinaryKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGPAEPAK@Z() +;@ cdecl -arch=arm ?GetCurrentBinaryKeyValue@CRegistry@@QAAKPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentBinaryKeyValue@CRegistry@@QAAKPBGPAEPAK@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAK@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPBGAAK@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentKeyValue@CRegistry@@QAAKPBGAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?GetCurrentRawKeyValue@CRegistry@@AAAKPAUHKEY__@@PBGPAXPAK3@Z() +;@ cdecl -arch=arm ?GetCurrentRawSubKeyValue@CRegistry@@AAAKPBGPAXPAK2@Z() +;@ cdecl -arch=arm ?GetCurrentSubKeyCount@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetCurrentSubKeyName@CRegistry@@QAAKAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentSubKeyPath@CRegistry@@QAAKAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentSubKeyValue@CRegistry@@QAAKPBGAAK@Z() +;@ cdecl -arch=arm ?GetCurrentSubKeyValue@CRegistry@@QAAKPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetCurrentSubKeyValue@CRegistry@@QAAKPBGPAXPAK@Z() +;@ cdecl -arch=arm ?GetDMTF@WBEMTime@@QBAPAGH@Z() +;@ cdecl -arch=arm ?GetDMTFNonNtfs@WBEMTime@@QBAPAGXZ() +;@ cdecl -arch=arm ?GetDOUBLE@CInstance@@QBA_NPBGAAN@Z() +;@ cdecl -arch=arm ?GetDWORD@CInstance@@QBA_NPBGAAK@Z() +;@ cdecl -arch=arm ?GetData@CHPtrArray@@QAAPAPAXXZ() +;@ cdecl -arch=arm ?GetData@CHPtrArray@@QBAPAPBXXZ() +@ cdecl -arch=arm ?GetData@CHString@@IBAPAUCHStringData@@XZ() +;@ cdecl -arch=arm ?GetData@CHStringArray@@QAAPAVCHString@@XZ() +;@ cdecl -arch=arm ?GetData@CHStringArray@@QBAPBVCHString@@XZ() +;@ cdecl -arch=arm ?GetDateTime@CInstance@@QBA_NPBGAAVWBEMTime@@@Z() +;@ cdecl -arch=arm ?GetEmbeddedObject@CInstance@@QBA_NPBGPAPAV1@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetEmptyInstance@CWbemProviderGlue@@SAJPAVMethodContext@@PBGPAPAVCInstance@@1@Z() +;@ cdecl -arch=arm ?GetEmptyInstance@CWbemProviderGlue@@SAJPBGPAPAVCInstance@@0@Z() +;@ cdecl -arch=arm ?GetFILETIME@WBEMTime@@QBAHPAU_FILETIME@@@Z() +;@ cdecl -arch=arm ?GetFILETIME@WBEMTimeSpan@@QBAHPAU_FILETIME@@@Z() +;@ cdecl -arch=arm ?GetIWBEMContext@MethodContext@@UAAPAUIWbemContext@@XZ() +;@ cdecl -arch=arm ?GetInstanceByPath@CWbemProviderGlue@@SAJPBGPAPAVCInstance@@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetInstanceFromCIMOM@CWbemProviderGlue@@CAJPBG0PAVMethodContext@@PAPAVCInstance@@@Z() +;@ cdecl -arch=arm ?GetInstanceKeysByPath@CWbemProviderGlue@@SAJPBGPAPAVCInstance@@PAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetInstancePropertiesByPath@CWbemProviderGlue@@SAJPBGPAPAVCInstance@@PAVMethodContext@@AAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?GetInstancesByQuery@CWbemProviderGlue@@SAJPBGPAV?$TRefPointerCollection@VCInstance@@@@PAVMethodContext@@0@Z() +;@ cdecl -arch=arm ?GetInstancesByQueryAsynch@CWbemProviderGlue@@SAJPBGPAVProvider@@P6AJ1PAVCInstance@@PAVMethodContext@@PAX@Z034@Z() +;@ cdecl -arch=arm ?GetKeyString@ParsedObjectPath@@QAAPAGXZ() +@ cdecl -arch=arm ?GetLength@CHString@@QBAHXZ() +;@ cdecl -arch=arm ?GetLocalComputerName@Provider@@IAAABVCHString@@XZ() +;@ cdecl -arch=arm ?GetLocalInstancePath@Provider@@IAA_NPBVCInstance@@AAVCHString@@@Z() +;@ cdecl -arch=arm ?GetLocalOffsetForDate@WBEMTime@@SAJABJ@Z() +;@ cdecl -arch=arm ?GetLocalOffsetForDate@WBEMTime@@SAJPBU_FILETIME@@@Z() +;@ cdecl -arch=arm ?GetLocalOffsetForDate@WBEMTime@@SAJPBU_SYSTEMTIME@@@Z() +;@ cdecl -arch=arm ?GetLocalOffsetForDate@WBEMTime@@SAJPBUtm@@@Z() +;@ cdecl -arch=arm ?GetLongestClassStringSize@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetLongestSubKeySize@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetLongestValueData@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetLongestValueName@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetMapCountPtr@CWbemProviderGlue@@KAPAJPBVCWbemGlueFactory@@@Z() +;@ cdecl -arch=arm ?GetMethodContext@CInstance@@QBAPAVMethodContext@@XZ() +;@ cdecl -arch=arm ?GetNamespace@CFrameworkQuery@@IAAABVCHString@@XZ() +;@ cdecl -arch=arm ?GetNamespace@Provider@@IAAABVCHString@@XZ() +;@ cdecl -arch=arm ?GetNamespaceConnection@CWbemProviderGlue@@SAPAUIWbemServices@@PBG@Z() +;@ cdecl -arch=arm ?GetNamespaceConnection@CWbemProviderGlue@@SAPAUIWbemServices@@PBGPAVMethodContext@@@Z() +;@ cdecl -arch=arm ?GetNamespacePart@ParsedObjectPath@@QAAPAGXZ() +;@ cdecl -arch=arm ?GetOSMajorVersion@CWbemProviderGlue@@SAKXZ() +;@ cdecl -arch=arm ?GetObject@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIWbemClassObject@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?GetObject@Provider@@AAAJPAUParsedObjectPath@@PAVMethodContext@@J@Z() +;@ cdecl -arch=arm ?GetObject@Provider@@MAAJPAVCInstance@@J@Z() +;@ cdecl -arch=arm ?GetObject@Provider@@MAAJPAVCInstance@@JAAVCFrameworkQuery@@@Z() +;@ cdecl -arch=arm ?GetObjectAsync@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?GetParentNamespacePart@ParsedObjectPath@@QAAPAGXZ() +;@ cdecl -arch=arm ?GetPlatform@CWbemProviderGlue@@SAKXZ() +;@ cdecl -arch=arm ?GetPropertyBitMask@CFrameworkQueryEx@@QAAXABVCHPtrArray@@PAX@Z() +;@ cdecl -arch=arm ?GetProviderGlue@MethodContext@@AAAPAVCWbemProviderGlue@@XZ() +;@ cdecl -arch=arm ?GetProviderName@Provider@@IAAABVCHString@@XZ() +;@ cdecl -arch=arm ?GetQuery@CFrameworkQuery@@QAAABVCHString@@XZ() +;@ cdecl -arch=arm ?GetQueryClassName@CFrameworkQuery@@QAAPAGXZ() +;@ cdecl -arch=arm ?GetRelativePath@CObjectPathParser@@SAPAGPAG@Z() +;@ cdecl -arch=arm ?GetRequiredProperties@CFrameworkQuery@@QAAXAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?GetSYSTEMTIME@WBEMTime@@QBAHPAU_SYSTEMTIME@@@Z() +;@ cdecl -arch=arm ?GetSize@CHPtrArray@@QBAHXZ() +;@ cdecl -arch=arm ?GetSize@CHStringArray@@QBAHXZ() +;@ cdecl -arch=arm ?GetStatus@CInstance@@QBA_NPBGAA_NAAG@Z() +;@ cdecl -arch=arm ?GetStatusObject@CWbemProviderGlue@@CAPAUIWbemClassObject@@PAVMethodContext@@PBG@Z() +;@ cdecl -arch=arm ?GetStatusObject@MethodContext@@QAAPAUIWbemClassObject@@XZ() +;@ cdecl -arch=arm ?GetStringArray@CInstance@@QBA_NPBGAAPAUtagSAFEARRAY@@@Z() +;@ cdecl -arch=arm ?GetStructtm@WBEMTime@@QBAHPAUtm@@@Z() +;@ cdecl -arch=arm ?GetTime@WBEMTime@@QBA_KXZ() +;@ cdecl -arch=arm ?GetTime@WBEMTimeSpan@@QBA_KXZ() +;@ cdecl -arch=arm ?GetTimeSpan@CInstance@@QBA_NPBGAAVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ?GetUpperBound@CHPtrArray@@QBAHXZ() +;@ cdecl -arch=arm ?GetUpperBound@CHStringArray@@QBAHXZ() +;@ cdecl -arch=arm ?GetValueCount@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?GetValuesForProp@CFrameworkQuery@@QAAJPBGAAV?$vector@V_bstr_t@@V?$allocator@V_bstr_t@@@std@@@std@@@Z() +;@ cdecl -arch=arm ?GetValuesForProp@CFrameworkQuery@@QAAJPBGAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?GetValuesForProp@CFrameworkQueryEx@@QAAJPBGAAV?$vector@HV?$allocator@H@std@@@std@@@Z() +;@ cdecl -arch=arm ?GetValuesForProp@CFrameworkQueryEx@@QAAJPBGAAV?$vector@V_variant_t@@V?$allocator@V_variant_t@@@std@@@std@@@Z() +;@ cdecl -arch=arm ?GetVariant@CInstance@@QBA_NPBGAAUtagVARIANT@@@Z() +;@ cdecl -arch=arm ?GetWBEMINT16@CInstance@@QBA_NPBGAAF@Z() +;@ cdecl -arch=arm ?GetWBEMINT64@CInstance@@QBA_NPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?GetWBEMINT64@CInstance@@QBA_NPBGAA_J@Z() +;@ cdecl -arch=arm ?GetWBEMINT64@CInstance@@QBA_NPBGAA_K@Z() +;@ cdecl -arch=arm ?GetWCHAR@CInstance@@QBA_NPBGPAPAG@Z() +;@ cdecl -arch=arm ?GetWORD@CInstance@@QBA_NPBGAAG@Z() +;@ cdecl -arch=arm ?Getbool@CInstance@@QBA_NPBGAA_N@Z() +;@ cdecl -arch=arm ?GethKey@CRegistry@@QAAPAUHKEY__@@XZ() +;@ cdecl -arch=arm ?Gettime_t@WBEMTime@@QBAHPAJ@Z() +;@ cdecl -arch=arm ?Gettime_t@WBEMTimeSpan@@QBAHPAJ@Z() +;@ cdecl -arch=arm ?IncrementMapCount@CWbemProviderGlue@@KAJPAJ@Z() +;@ cdecl -arch=arm ?IncrementMapCount@CWbemProviderGlue@@KAJPBVCWbemGlueFactory@@@Z() +;@ cdecl -arch=arm ?IncrementObjectCount@CWbemProviderGlue@@SAXXZ() +;@ cdecl -arch=arm ?Init2@CFrameworkQuery@@QAAXPAUIWbemClassObject@@@Z() +;@ cdecl -arch=arm ?Init@CFrameworkQuery@@QAAJPAUParsedObjectPath@@PAUIWbemContext@@PBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?Init@CFrameworkQuery@@QAAJQAG0JAAVCHString@@@Z() +@ cdecl -arch=arm ?Init@CHString@@IAAXXZ() +;@ cdecl -arch=arm ?Init@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?InitComputerName@Provider@@CAXXZ() +;@ cdecl -arch=arm ?InitEx@CFrameworkQueryEx@@UAAJQAG0JAAVCHString@@@Z() +;@ cdecl -arch=arm ?Initialize@CWbemProviderGlue@@UAAJPAGJ00PAUIWbemServices@@PAUIWbemContext@@PAUIWbemProviderInitSink@@@Z() +;@ cdecl -arch=arm ?InsertAt@CHPtrArray@@QAAXHPAV1@@Z() +;@ cdecl -arch=arm ?InsertAt@CHPtrArray@@QAAXHPAXH@Z() +;@ cdecl -arch=arm ?InsertAt@CHStringArray@@QAAXHPAV1@@Z() +;@ cdecl -arch=arm ?InsertAt@CHStringArray@@QAAXHPBGH@Z() +;@ cdecl -arch=arm ?InternalGetNamespaceConnection@CWbemProviderGlue@@AAAPAUIWbemServices@@PBG@Z() +;@ cdecl -arch=arm ?Is3TokenOR@CFrameworkQueryEx@@QAAHPBG0AAUtagVARIANT@@1@Z() +;@ cdecl -arch=arm ?IsClass@ParsedObjectPath@@QAAHXZ() +;@ cdecl -arch=arm ?IsDerivedFrom@CWbemProviderGlue@@SA_NPBG0PAVMethodContext@@0@Z() +@ cdecl -arch=arm ?IsEmpty@CHString@@QBAHXZ() +;@ cdecl -arch=arm ?IsExtended@CFrameworkQueryEx@@UAA_NXZ() +;@ cdecl -arch=arm ?IsInList@CFrameworkQuery@@IAAKABVCHStringArray@@PBG@Z() +;@ cdecl -arch=arm ?IsInstance@ParsedObjectPath@@QAAHXZ() +;@ cdecl -arch=arm ?IsLocal@ParsedObjectPath@@QAAHPBG@Z() +;@ cdecl -arch=arm ?IsLoggingOn@ProviderLog@@QAA?AW4LogLevel@1@PAVCHString@@@Z() +;@ cdecl -arch=arm ?IsNTokenAnd@CFrameworkQueryEx@@QAAHAAVCHStringArray@@AAVCHPtrArray@@@Z() +;@ cdecl -arch=arm ?IsNull@CInstance@@QBA_NPBG@Z() +;@ cdecl -arch=arm ?IsObject@ParsedObjectPath@@QAAHXZ() +;@ cdecl -arch=arm ?IsOk@WBEMTime@@QBA_NXZ() +;@ cdecl -arch=arm ?IsOk@WBEMTimeSpan@@QBA_NXZ() +;@ cdecl -arch=arm ?IsPropertyRequired@CFrameworkQuery@@QAA_NPBG@Z() +;@ cdecl -arch=arm ?IsReference@CFrameworkQuery@@IAAHPBG@Z() +;@ cdecl -arch=arm ?IsRelative@ParsedObjectPath@@QAAHPBG0@Z() +;@ cdecl -arch=arm ?KeysOnly@CFrameworkQuery@@QAA_NXZ() +@ cdecl -arch=arm ?Left@CHString@@QBA?AV1@H@Z() +@ cdecl -arch=arm ?LoadStringW@CHString@@IAAHIPAGI@Z() +@ cdecl -arch=arm ?LoadStringW@CHString@@QAAHI@Z() +;@ cdecl -arch=arm ?LocalLogMessage@ProviderLog@@QAAXPBG0HW4LogLevel@1@@Z() +;@ cdecl -arch=arm ?LocalLogMessage@ProviderLog@@QAAXPBGHW4LogLevel@1@0ZZ() +;@ cdecl -arch=arm ?LocateKeyByNameOrValueName@CRegistrySearch@@QAAHPAUHKEY__@@PBG1PAPBGKAAVCHString@@3@Z() +;@ cdecl -arch=arm ?Lock@CThreadBase@@AAAXXZ() +@ cdecl -arch=arm ?LockBuffer@CHString@@QAAPAGXZ() +;@ cdecl -arch=arm ?LockFactoryMap@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?LockProviderMap@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?LockServer@CWbemGlueFactory@@UAAJH@Z() +;@ cdecl -arch=arm ?LogError@CInstance@@IBAXPBG00J@Z() +;@ cdecl -arch=arm ?MakeLocalPath@Provider@@IAA?AVCHString@@ABV2@@Z() +@ cdecl -arch=arm ?MakeLower@CHString@@QAAXXZ() +@ cdecl -arch=arm ?MakeReverse@CHString@@QAAXXZ() +@ cdecl -arch=arm ?MakeUpper@CHString@@QAAXXZ() +@ cdecl -arch=arm ?Mid@CHString@@QBA?AV1@H@Z() +@ cdecl -arch=arm ?Mid@CHString@@QBA?AV1@HH@Z() +;@ cdecl -arch=arm ?MsgWndProc@CWinMsgEvent@@CAJPAUHWND__@@IIJ@Z() +;@ cdecl -arch=arm ?NextSubKey@CRegistry@@QAAKXZ() +;@ cdecl -arch=arm ?NextToken@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?NormalizePath@@YAKPBG00KAAVCHString@@@Z() +;@ cdecl -arch=arm ?NullOutUnsetProperties@CWbemProviderGlue@@AAAJPAUIWbemClassObject@@PAPAU2@ABUtagVARIANT@@@Z() +;@ cdecl -arch=arm ?OnFinalRelease@CThreadBase@@MAAXXZ() +;@ cdecl -arch=arm ?Open@CRegistry@@QAAJPAUHKEY__@@PBGK@Z() +;@ cdecl -arch=arm ?OpenAndEnumerateSubKeys@CRegistry@@QAAJPAUHKEY__@@PBGK@Z() +;@ cdecl -arch=arm ?OpenCurrentUser@CRegistry@@QAAKPBGK@Z() +;@ cdecl -arch=arm ?OpenLocalMachineKeyAndReadValue@CRegistry@@QAAJPBG0AAVCHString@@@Z() +;@ cdecl -arch=arm ?OpenNamespace@CWbemProviderGlue@@UAAJQAGJPAUIWbemContext@@PAPAUIWbemServices@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?OpenSubKey@CRegistry@@AAAKXZ() +;@ cdecl -arch=arm ?Parse@CObjectPathParser@@QAAHPBGPAPAUParsedObjectPath@@@Z() +;@ cdecl -arch=arm ?PreProcessPutInstanceParms@CWbemProviderGlue@@AAAJPAUIWbemClassObject@@PAPAU2@PAUIWbemContext@@@Z() +;@ cdecl -arch=arm ?PrepareToReOpen@CRegistry@@AAAXXZ() +;@ cdecl -arch=arm ?PutClass@CWbemProviderGlue@@UAAJPAUIWbemClassObject@@JPAUIWbemContext@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?PutClassAsync@CWbemProviderGlue@@UAAJPAUIWbemClassObject@@JPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?PutInstance@CWbemProviderGlue@@UAAJPAUIWbemClassObject@@JPAUIWbemContext@@PAPAUIWbemCallResult@@@Z() +;@ cdecl -arch=arm ?PutInstance@Provider@@AAAJPAUIWbemClassObject@@JPAVMethodContext@@@Z() +;@ cdecl -arch=arm ?PutInstance@Provider@@MAAJABVCInstance@@J@Z() +;@ cdecl -arch=arm ?PutInstanceAsync@CWbemProviderGlue@@UAAJPAUIWbemClassObject@@JPAUIWbemContext@@PAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?QueryInterface@CWbemGlueFactory@@UAAJABU_GUID@@PAPAX@Z() +;@ cdecl -arch=arm ?QueryInterface@CWbemProviderGlue@@UAAJABU_GUID@@PAPAX@Z() +;@ cdecl -arch=arm ?QueryObjectSink@CWbemProviderGlue@@UAAJJPAPAUIWbemObjectSink@@@Z() +;@ cdecl -arch=arm ?QueryPostProcess@MethodContext@@UAAXXZ() +;@ cdecl -arch=arm ?RegisterForMessage@CWinMsgEvent@@IAAXIH@Z() +# @ cdecl -arch=arm ?Release@CHString@@QAAXXZ() # FIXME! +# @ cdecl -arch=arm ?Release@CHString@@SAXPAUCHStringData@@@Z() # FIXME! +;@ cdecl -arch=arm ?Release@CInstance@@QAAJXZ() +;@ cdecl -arch=arm ?Release@CThreadBase@@QAAJXZ() +;@ cdecl -arch=arm ?Release@CWbemGlueFactory@@UAAKXZ() +;@ cdecl -arch=arm ?Release@CWbemProviderGlue@@UAAKXZ() +;@ cdecl -arch=arm ?Release@MethodContext@@QAAJXZ() +@ cdecl -arch=arm ?ReleaseBuffer@CHString@@QAAXH@Z() +;@ cdecl -arch=arm ?RemoveAll@CHPtrArray@@QAAXXZ() +;@ cdecl -arch=arm ?RemoveAll@CHStringArray@@QAAXXZ() +;@ cdecl -arch=arm ?RemoveAt@CHPtrArray@@QAAXHH@Z() +;@ cdecl -arch=arm ?RemoveAt@CHStringArray@@QAAXHH@Z() +;@ cdecl -arch=arm ?RemoveFromFactoryMap@CWbemProviderGlue@@KAXPBVCWbemGlueFactory@@@Z() +;@ cdecl -arch=arm ?Reset@CFrameworkQuery@@AAAXXZ() +@ cdecl -arch=arm ?ReverseFind@CHString@@QBAHG@Z() +;@ cdecl -arch=arm ?RewindSubKeys@CRegistry@@QAAXXZ() +@ cdecl -arch=arm ?Right@CHString@@QBA?AV1@H@Z() +@ cdecl -arch=arm ?SafeStrlen@CHString@@KAHPBG@Z() +;@ cdecl -arch=arm ?SearchAndBuildList@CRegistrySearch@@QAAHVCHString@@AAVCHPtrArray@@00HPAUHKEY__@@@Z() +;@ cdecl -arch=arm ?SearchMapForProvider@CWbemProviderGlue@@CAPAVProvider@@PBG0@Z() +;@ cdecl -arch=arm ?SetAt@CHPtrArray@@QAAXHPAX@Z() +@ cdecl -arch=arm ?SetAt@CHString@@QAAXHG@Z() +;@ cdecl -arch=arm ?SetAt@CHStringArray@@QAAXHPBG@Z() +;@ cdecl -arch=arm ?SetAtGrow@CHPtrArray@@QAAXHPAX@Z() +;@ cdecl -arch=arm ?SetAtGrow@CHStringArray@@QAAXHPBG@Z() +;@ cdecl -arch=arm ?SetByte@CInstance@@QAA_NPBGE@Z() +;@ cdecl -arch=arm ?SetCHString@CInstance@@QAA_NPBG0@Z() +;@ cdecl -arch=arm ?SetCHString@CInstance@@QAA_NPBGABVCHString@@@Z() +;@ cdecl -arch=arm ?SetCHString@CInstance@@QAA_NPBGPBD@Z() +;@ cdecl -arch=arm ?SetCHStringResourceHandle@@YAXPAUHINSTANCE__@@@Z() +;@ cdecl -arch=arm ?SetCharSplat@CInstance@@QAA_NPBG0@Z() +;@ cdecl -arch=arm ?SetCharSplat@CInstance@@QAA_NPBGK@Z() +;@ cdecl -arch=arm ?SetCharSplat@CInstance@@QAA_NPBGPBD@Z() +;@ cdecl -arch=arm ?SetClassName@ParsedObjectPath@@QAAHPBG@Z() +;@ cdecl -arch=arm ?SetCreationClassName@Provider@@IAA_NPAVCInstance@@@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAK@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPAUHKEY__@@PBGAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPBGAAK@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValue@CRegistry@@QAAKPBGAAVCHStringArray@@@Z() +;@ cdecl -arch=arm ?SetCurrentKeyValueExpand@CRegistry@@QAAKPAUHKEY__@@PBGAAVCHString@@@Z() +;@ cdecl -arch=arm ?SetDMTF@WBEMTime@@QAAHQAG@Z() +;@ cdecl -arch=arm ?SetDOUBLE@CInstance@@QAA_NPBGN@Z() +;@ cdecl -arch=arm ?SetDWORD@CInstance@@QAA_NPBGK@Z() +;@ cdecl -arch=arm ?SetDateTime@CInstance@@QAA_NPBGABVWBEMTime@@@Z() +;@ cdecl -arch=arm ?SetDefaultValues@CRegistry@@AAAXXZ() +;@ cdecl -arch=arm ?SetEmbeddedObject@CInstance@@QAA_NPBGAAV1@@Z() +;@ cdecl -arch=arm ?SetKeyFromParsedObjectPath@Provider@@AAAHPAVCInstance@@PAUParsedObjectPath@@@Z() +;@ cdecl -arch=arm ?SetNull@CInstance@@QAA_NPBG@Z() +;@ cdecl -arch=arm ?SetPlatformID@CRegistry@@CAHXZ() +;@ cdecl -arch=arm ?SetSize@CHPtrArray@@QAAXHH@Z() +;@ cdecl -arch=arm ?SetSize@CHStringArray@@QAAXHH@Z() +;@ cdecl -arch=arm ?SetStatusObject@CWbemProviderGlue@@SA_NPAVMethodContext@@PBG1JPBUtagSAFEARRAY@@2@Z() +;@ cdecl -arch=arm ?SetStatusObject@MethodContext@@QAA_NPAUIWbemClassObject@@@Z() +;@ cdecl -arch=arm ?SetStringArray@CInstance@@QAA_NPBGABUtagSAFEARRAY@@@Z() +;@ cdecl -arch=arm ?SetTimeSpan@CInstance@@QAA_NPBGABVWBEMTimeSpan@@@Z() +;@ cdecl -arch=arm ?SetVariant@CInstance@@QAA_NPBGABUtagVARIANT@@@Z() +;@ cdecl -arch=arm ?SetWBEMINT16@CInstance@@QAA_NPBGABF@Z() +;@ cdecl -arch=arm ?SetWBEMINT64@CInstance@@QAA_NPBGABVCHString@@@Z() +;@ cdecl -arch=arm ?SetWBEMINT64@CInstance@@QAA_NPBG_J@Z() +;@ cdecl -arch=arm ?SetWBEMINT64@CInstance@@QAA_NPBG_K@Z() +;@ cdecl -arch=arm ?SetWCHARSplat@CInstance@@QAA_NPBG0@Z() +;@ cdecl -arch=arm ?SetWORD@CInstance@@QAA_NPBGG@Z() +;@ cdecl -arch=arm ?Setbool@CInstance@@QAA_NPBG_N@Z() +;@ cdecl -arch=arm ?Signal@CAutoEvent@@QAAHXZ() +@ cdecl -arch=arm ?SpanExcluding@CHString@@QBA?AV1@PBG@Z() +@ cdecl -arch=arm ?SpanIncluding@CHString@@QBA?AV1@PBG@Z() +@ cdecl -arch=arm ?TrimLeft@CHString@@QAAXXZ() +@ cdecl -arch=arm ?TrimRight@CHString@@QAAXXZ() +;@ cdecl -arch=arm ?UnInit@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?UnRegisterAllMessages@CWinMsgEvent@@IAAXXZ() +;@ cdecl -arch=arm ?UnRegisterMessage@CWinMsgEvent@@IAA_NIH@Z() +;@ cdecl -arch=arm ?Unlock@CThreadBase@@AAAXXZ() +@ cdecl -arch=arm ?UnlockBuffer@CHString@@QAAXXZ() +;@ cdecl -arch=arm ?UnlockFactoryMap@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?UnlockProviderMap@CWbemProviderGlue@@CAXXZ() +;@ cdecl -arch=arm ?Unparse@CObjectPathParser@@SAHPAUParsedObjectPath@@PAPAG@Z() +@ cdecl -arch=arm ?ValidateDeletionFlags@Provider@@MAAJJ@Z() +;@ cdecl -arch=arm ?ValidateEnumerationFlags@Provider@@MAAJJ@Z() +;@ cdecl -arch=arm ?ValidateFlags@Provider@@IAAJJW4FlagDefs@1@@Z() +;@ cdecl -arch=arm ?ValidateGetObjFlags@Provider@@MAAJJ@Z() +;@ cdecl -arch=arm ?ValidateIMOSPointer@Provider@@AAAHXZ() +@ cdecl -arch=arm ?ValidateMethodFlags@Provider@@MAAJJ@Z() +;@ cdecl -arch=arm ?ValidatePutInstanceFlags@Provider@@MAAJJ@Z() +@ cdecl -arch=arm ?ValidateQueryFlags@Provider@@MAAJJ@Z() +;@ cdecl -arch=arm ?Wait@CAutoEvent@@QAAKK@Z() +;@ cdecl -arch=arm ?WindowsDispatch@CWinMsgEvent@@CAXXZ() +;@ cdecl -arch=arm ?Zero@CObjectPathParser@@AAAXXZ() +;@ cdecl -arch=arm ?begin_parse@CObjectPathParser@@AAAHXZ() +;@ extern -arch=arm ?captainsLog@@3VProviderLog@@A +;@ cdecl -arch=arm ?dwThreadProc@CWinMsgEvent@@CAKPAX@Z() +;@ extern -arch=arm ?g_cs@@3VCCritSec@@A +;@ cdecl -arch=arm ?ident_becomes_class@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?ident_becomes_ns@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?initFailed@Provider@@SAHXZ() +;@ extern -arch=arm ?initFailed_@Provider@@0HA +;@ cdecl -arch=arm ?key_const@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?keyref@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?keyref_list@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?keyref_term@CObjectPathParser@@AAAHXZ() +;@ extern -arch=arm ?m_FlushPtrs@CWbemProviderGlue@@0V?$set@PAXU?$less@PAX@std@@V?$allocator@PAX@2@@std@@A +;@ extern -arch=arm ?m_csFlushPtrs@CWbemProviderGlue@@0VCCritSec@@A +;@ extern -arch=arm ?m_csStatusObject@CWbemProviderGlue@@0VCCritSec@@A +;@ extern -arch=arm ?m_pStatusObject@CWbemProviderGlue@@0PAUIWbemClassObject@@A +;@ extern -arch=arm ?mg_aeCreateWindow@CWinMsgEvent@@0VCAutoEvent@@A +;@ extern -arch=arm ?mg_csMapLock@CWinMsgEvent@@0VCCritSec@@A +;@ extern -arch=arm ?mg_csWindowLock@CWinMsgEvent@@0VCCritSec@@A +;@ extern -arch=arm ?mg_hDevNotify@CWinMsgEvent@@0PAXA +;@ extern -arch=arm ?mg_hThreadPumpHandle@CWinMsgEvent@@0PAXA +;@ extern -arch=arm ?mg_hWnd@CWinMsgEvent@@0PAUHWND__@@A +;@ extern -arch=arm ?mg_oSinkMap@CWinMsgEvent@@0V?$multimap@IPAVCWinMsgEvent@@U?$less@I@std@@V?$allocator@PAVCWinMsgEvent@@@3@@std@@A +;@ cdecl -arch=arm ?myRegCreateKeyEx@CRegistry@@AAAJPAUHKEY__@@PBGKPAGKKQAU_SECURITY_ATTRIBUTES@@PAPAU2@PAK@Z() +;@ cdecl -arch=arm ?myRegDeleteKey@CRegistry@@AAAJPAUHKEY__@@PBG@Z() +;@ cdecl -arch=arm ?myRegDeleteValue@CRegistry@@AAAJPAUHKEY__@@PBG@Z() +;@ cdecl -arch=arm ?myRegEnumKey@CRegistry@@AAAJPAUHKEY__@@KPAGK@Z() +;@ cdecl -arch=arm ?myRegEnumValue@CRegistry@@AAAJPAUHKEY__@@KPAGPAK22PAE2@Z() +;@ cdecl -arch=arm ?myRegOpenKeyEx@CRegistry@@AAAJPAUHKEY__@@PBGKKPAPAU2@@Z() +;@ cdecl -arch=arm ?myRegQueryInfoKey@CRegistry@@AAAJPAUHKEY__@@PAGPAK22222222PAU_FILETIME@@@Z() +;@ cdecl -arch=arm ?myRegQueryValueEx@CRegistry@@AAAJPAUHKEY__@@PBGPAK2PAE2@Z() +;@ cdecl -arch=arm ?myRegSetValueEx@CRegistry@@AAAJPAUHKEY__@@PBGKKPBEK@Z() +;@ cdecl -arch=arm ?ns_list@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?ns_list_rest@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?ns_or_class@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?ns_or_server@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?objref@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?objref_rest@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?optional_objref@CObjectPathParser@@AAAHXZ() +;@ cdecl -arch=arm ?propname@CObjectPathParser@@AAAHXZ() +;@ extern -arch=arm ?s_bInitted@CWbemProviderGlue@@0HA +;@ extern -arch=arm ?s_csFactoryMap@CWbemProviderGlue@@0VCCritSec@@A +;@ extern -arch=arm ?s_csProviderMap@CWbemProviderGlue@@0VCCritSec@@A +;@ extern -arch=arm ?s_dwMajorVersion@CWbemProviderGlue@@0KA +;@ extern -arch=arm ?s_dwPlatform@CRegistry@@0KA +;@ extern -arch=arm ?s_dwPlatform@CWbemProviderGlue@@0KA +;@ extern -arch=arm ?s_fPlatformSet@CRegistry@@0HA +;@ extern -arch=arm ?s_factorymap@CWbemProviderGlue@@0V?$map@PBXPAJU?$less@PBX@std@@V?$allocator@PAJ@2@@std@@A +;@ extern -arch=arm ?s_lObjects@CWbemProviderGlue@@0JA +;@ extern -arch=arm ?s_providersmap@CWbemProviderGlue@@0V?$map@VCHString@@PAXU?$less@VCHString@@@std@@V?$allocator@PAX@3@@std@@A +;@ extern -arch=arm ?s_strComputerName@Provider@@0VCHString@@A +;@ extern -arch=arm ?s_wstrCSDVersion@CWbemProviderGlue@@0PAGA +;@ cdecl -arch=arm DoCmd()

1 0

[tkreuzer] 67733: [CMAKE] Exclude some modules from ARM build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:31:12 2015 New Revision: 67733 URL: http://svn.reactos.org/svn/reactos?rev=67733&view=rev Log: [CMAKE] Exclude some modules from ARM build Modified: trunk/reactos/base/setup/CMakeLists.txt trunk/reactos/drivers/base/CMakeLists.txt trunk/reactos/drivers/bus/CMakeLists.txt trunk/reactos/subsystems/mvdm/CMakeLists.txt Modified: trunk/reactos/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/setup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/CMakeLists.txt [iso-8859-1] Thu May 14 22:31:12 2015 @@ -2,5 +2,7 @@ add_subdirectory(reactos) add_subdirectory(setup) add_subdirectory(usetup) +if(NOT ARCH STREQUAL "arm") add_subdirectory(vmwinst) +endif() add_subdirectory(welcome) Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.tx… ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Thu May 14 22:31:12 2015 @@ -4,15 +4,19 @@ add_subdirectory(condrv) if(_WINKD_) - if (GDB) - add_subdirectory(kdgdb) - else() - add_subdirectory(kdcom) - add_subdirectory(kdvm) - endif() + if (GDB) + add_subdirectory(kdgdb) + else() + add_subdirectory(kdcom) + if(NOT ARCH STREQUAL "arm") + add_subdirectory(kdvm) + endif() + endif() else() - add_subdirectory(kdrosdbg) + add_subdirectory(kdrosdbg) endif() +if(NOT ARCH STREQUAL "arm") add_subdirectory(nmidebug) +endif() add_subdirectory(null) Modified: trunk/reactos/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/bus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/CMakeLists.txt [iso-8859-1] Thu May 14 22:31:12 2015 @@ -1,5 +1,7 @@ +if(NOT ARCH STREQUAL "arm") add_subdirectory(acpi) +endif() add_subdirectory(isapnp) add_subdirectory(pci) add_subdirectory(pcix) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Thu May 14 22:31:12 2015 @@ -5,6 +5,8 @@ add_subdirectory(config) #add_subdirectory(dos) add_subdirectory(ntvdm) +if(ARCH STREQUAL "i386") add_subdirectory(samples) +endif() add_subdirectory(vdmdbg) #add_subdirectory(wow16)

1 0

[tkreuzer] 67732: [CMAKE] Make sure WIN32 is defined for ARM builds
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:30:56 2015 New Revision: 67732 URL: http://svn.reactos.org/svn/reactos?rev=67732&view=rev Log: [CMAKE] Make sure WIN32 is defined for ARM builds Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67732&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu May 14 22:30:56 2015 @@ -164,7 +164,7 @@ add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm") # _M_ARM is already defined by toolchain - add_definitions(-D_ARM_ -D__arm__) + add_definitions(-D_ARM_ -D__arm__ -DWIN32) if(SARCH STREQUAL "omap-zoom2") add_definitions(-D_ZOOM2_) endif()

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