January 2013 - Wine-commits

Hans Leidekker : advapi32: Improve the stub for CreateRestrictedToken.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: bbb29e9d4c1b55f24c60a6449903a6ffb149ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb29e9d4c1b55f24c60a6449… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 16 10:56:47 2013 +0100 advapi32: Improve the stub for CreateRestrictedToken. --- dlls/advapi32/security.c | 16 ++++++++++++++-- dlls/advapi32/tests/security.c | 20 ++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5a74783..954a1c5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -801,13 +801,25 @@ BOOL WINAPI CreateRestrictedToken( PSID_AND_ATTRIBUTES restrictSids, PHANDLE newToken) { + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + DWORD size; + FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", baseToken, flags, nDisableSids, disableSids, nDeletePrivs, deletePrivs, nRestrictSids, restrictSids, newToken); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + size = sizeof(type); + if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE; + if (type == TokenImpersonation) + { + size = sizeof(level); + if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size )) + return FALSE; + } + return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken ); } /* ############################## diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1a19d02..0e0730f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4076,6 +4076,8 @@ static void test_CreateRestrictedToken(void) HANDLE process_token, token, r_token; PTOKEN_GROUPS token_groups, groups2; SID_AND_ATTRIBUTES sattr; + SECURITY_IMPERSONATION_LEVEL level; + TOKEN_TYPE type; BOOL is_member; DWORD size; BOOL ret; @@ -4126,7 +4128,7 @@ static void test_CreateRestrictedToken(void) sattr.Attributes = 0; r_token = NULL; ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); - todo_wine ok(ret, "got error %d\n", GetLastError()); + ok(ret, "got error %d\n", GetLastError()); if (ret) { @@ -4134,7 +4136,7 @@ static void test_CreateRestrictedToken(void) is_member = TRUE; ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); ok(ret, "got error %d\n", GetLastError()); - ok(!is_member, "not a member\n"); + todo_wine ok(!is_member, "not a member\n"); ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", @@ -4149,12 +4151,22 @@ static void test_CreateRestrictedToken(void) break; } - ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, + todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, "got wrong attributes\n"); - ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, + todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, "got wrong attributes\n"); HeapFree(GetProcessHeap(), 0, groups2); + + size = sizeof(type); + ret = GetTokenInformation(r_token, TokenType, &type, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(type == TokenImpersonation, "got type %u\n", type); + + size = sizeof(level); + ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(level == SecurityImpersonation, "got level %u\n", type); } HeapFree(GetProcessHeap(), 0, token_groups);

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetServer.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 77ae1d0fb77a14bb12f2660622b7b760af2fa643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ae1d0fb77a14bb12f266062… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 16 10:57:30 2013 +0100 wmiutils: Implement IWbemPath::SetServer. --- dlls/wmiutils/path.c | 33 +++++++++++++++++++++----- dlls/wmiutils/tests/path.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index f02c9c6..e706372 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -441,10 +441,29 @@ static HRESULT WINAPI path_GetInfo( static HRESULT WINAPI path_SetServer( IWbemPath *iface, - LPCWSTR Name) + LPCWSTR name) { - FIXME("%p, %s\n", iface, debugstr_w(Name)); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + static const ULONGLONG flags = + WBEMPATH_INFO_PATH_HAD_SERVER | WBEMPATH_INFO_V1_COMPLIANT | + WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + heap_free( path->server ); + if (name) + { + if (!(path->server = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + path->len_server = strlenW( path->server ); + path->flags |= flags; + } + else + { + path->server = NULL; + path->len_server = 0; + path->flags &= ~flags; + } + return S_OK; } static HRESULT WINAPI path_GetServer( @@ -457,7 +476,7 @@ static HRESULT WINAPI path_GetServer( TRACE("%p, %p, %p\n", iface, len, name); if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; - if (!path->class) return WBEM_E_NOT_AVAILABLE; + if (!path->server) return WBEM_E_NOT_AVAILABLE; if (*len > path->len_server) strcpyW( name, path->server ); *len = path->len_server + 1; return S_OK; @@ -504,15 +523,15 @@ static HRESULT WINAPI path_RemoveNamespaceAt( } static HRESULT WINAPI path_RemoveAllNamespaces( - IWbemPath *iface) + IWbemPath *iface) { FIXME("%p\n", iface); return E_NOTIMPL; } static HRESULT WINAPI path_GetScopeCount( - IWbemPath *iface, - ULONG *puCount) + IWbemPath *iface, + ULONG *puCount) { FIXME("%p, %p\n", iface, puCount); return E_NOTIMPL; diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 3367690..947defa 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -314,6 +314,7 @@ static void test_IWbemPath_GetClassName(void) ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); hr = IWbemPath_GetClassName( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -361,6 +362,7 @@ static void test_IWbemPath_GetServer(void) ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -433,6 +435,57 @@ static void test_IWbemPath_GetInfo(void) IWbemPath_Release( path ); } +static void test_IWbemPath_SetServer(void) +{ + static const WCHAR serverW[] = {'s','e','r','v','e','r',0}; + IWbemPath *path; + WCHAR buf[16]; + ULONG len; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_SetServer( path, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + hr = IWbemPath_SetServer( path, serverW ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, serverW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | + WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | + WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + hr = IWbemPath_SetServer( path, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -442,6 +495,7 @@ START_TEST (path) test_IWbemPath_GetClassName(); test_IWbemPath_GetServer(); test_IWbemPath_GetInfo(); + test_IWbemPath_SetServer(); CoUninitialize(); }

1 0

André Hentschel : include: Add ARM64 endianness.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: f9727320dae5057ae2a5bd53e684009ad529f70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9727320dae5057ae2a5bd53e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:16 2013 +0100 include: Add ARM64 endianness. --- include/basetsd.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 4a59897..f855352 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif @@ -297,6 +297,14 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__AARCH64EB__) +# define WORDS_BIGENDIAN +# define BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS +#elif defined(__AARCH64EL__) || defined(__aarch64__) +# undef WORDS_BIGENDIAN +# undef BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS #elif defined(__MIPSEB__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN

1 0

André Hentschel : libwine: Implemented the wine_call_on_stack function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 16954b3a821f9585f88ce807a2b15d650ec982e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16954b3a821f9585f88ce807a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:58 2013 +0100 libwine: Implemented the wine_call_on_stack function for ARM64. --- libs/wine/port.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 8e8caf8..87e5833 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -156,6 +156,19 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "blx r2\n\t" /* call func */ "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ +#elif defined(__aarch64__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "stp x29, x30, [sp,#-32]!\n\t" /* save return address on stack */ + "str x19, [sp,#16]\n\t" /* save register on stack */ + "mov x19, sp\n\t" /* store old sp in local var */ + "mov sp, x2\n\t" /* stack */ + "mov x2, x0\n\t" /* func -> scratch register */ + "mov x0, x1\n\t" /* arg */ + "blr x2\n\t" /* call func */ + "mov sp, x19\n\t" /* restore old sp from local var */ + "ldr x19, [sp,#16]\n\t" /* restore register from stack */ + "ldp x29, x30, [sp],#32\n\t" /* restore return address */ + "ret") /* return */ #elif defined(__sparc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "save %sp, -96, %sp\n\t" /* push: change register window */

1 0

André Hentschel : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: c2ef2edf850a4cf27cae53b1664d1a40e80eb8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ef2edf850a4cf27cae53b16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:42:12 2013 +0100 libport: Implemented the interlocked_cmpxchg128 function for ARM64. --- libs/port/interlocked.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index eb14daa..143d226 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -313,6 +313,28 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } +#ifdef __aarch64__ +int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + if (dest[0] == compare[0] && dest[1] == compare[1]) + { + dest[0] = xchg_low; + dest[1] = xchg_high; + retv = 1; + } + else + { + compare[0] = dest[0]; + compare[1] = dest[1]; + retv = 0; + } + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} +#endif + int interlocked_xchg( int *dest, int val ) { int retv;

1 0

Alexandre Julliard : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: cf66a1f0eed0d71ad45a365c5c51a8a35df2c591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf66a1f0eed0d71ad45a365c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 12:34:51 2013 +0100 libport: Implemented the interlocked_cmpxchg128 function for ARM64. --- libs/port/interlocked.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 143d226..135bfc1 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -313,28 +313,6 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } -#ifdef __aarch64__ -int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ - int retv; - pthread_mutex_lock( &interlocked_mutex ); - if (dest[0] == compare[0] && dest[1] == compare[1]) - { - dest[0] = xchg_low; - dest[1] = xchg_high; - retv = 1; - } - else - { - compare[0] = dest[0]; - compare[1] = dest[1]; - retv = 0; - } - pthread_mutex_unlock( &interlocked_mutex ); - return retv; -} -#endif - int interlocked_xchg( int *dest, int val ) { int retv; @@ -365,4 +343,26 @@ int interlocked_xchg_add( int *dest, int incr ) return retv; } +#ifdef _WIN64 +int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + if (dest[0] == compare[0] && dest[1] == compare[1]) + { + dest[0] = xchg_low; + dest[1] = xchg_high; + retv = 1; + } + else + { + compare[0] = dest[0]; + compare[1] = dest[1]; + retv = 0; + } + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} +#endif + #endif

1 0

André Hentschel : winebuild: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 3f393a65527d8483c4c8607f2e79d49bcf26c33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f393a65527d8483c4c8607f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:43:01 2013 +0100 winebuild: Add ARM64 support. --- tools/winebuild/build.h | 4 ++-- tools/winebuild/import.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/main.c | 2 ++ tools/winebuild/spec32.c | 5 +++++ tools/winebuild/utils.c | 9 ++++++++- 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 05adf31..3fbf89d 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; enum target_platform @@ -178,7 +178,7 @@ struct strarray #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) -#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64)) +#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64) #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c73b86c..81325e9 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -675,6 +675,17 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tldr PC,[IP,#%d]\n", pos); output( "\t.long %s\n", table ); break; + case CPU_ARM64: + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); + if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); + if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); + if (pos & 0x000f) output( "\tadd x9, x9, #%u\n", pos & 0x000f ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tbr x9\n" ); + output( "1:\t.quad %s\n", table ); + break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) @@ -994,6 +1005,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldmfd SP!, {r0-r3}\n" ); output( "\tmov PC,IP\n"); break; + case CPU_ARM64: + output( "\tstp x29, x30, [sp,#-16]!\n" ); + output( "\tmov x29, sp\n" ); + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tblr x9\n" ); + output( "\tmov x9, x0\n" ); + output( "\tldp x29, x30, [sp],#16\n" ); + output( "\tldp x0, x1, [sp,#16]\n" ); + output( "\tldp x2, x3, [sp,#32]\n" ); + output( "\tldp x4, x5, [sp,#48]\n" ); + output( "\tldp x6, x7, [sp],#80\n" ); + output( "\tbr x9\n" ); /* or "ret x9" */ + output( "1:\t.quad %s\n", asm_name("__wine_spec_delay_load") ); + break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1086,6 +1112,24 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldr PC,[PC,#-4]\n"); output( "\t.long %s\n", asm_name("__wine_delay_load_asm") ); break; + case CPU_ARM64: + output( "\tstp x6, x7, [sp,#-80]!\n" ); + output( "\tstp x4, x5, [sp,#48]\n" ); + output( "\tstp x2, x3, [sp,#32]\n" ); + output( "\tstp x0, x1, [sp,#16]\n" ); + output( "\tmov x0, #%d\n", idx ); + output( "\tmov x1, #16384\n" ); + output( "\tmul x1, x0, x1\n" ); + output( "\tmov x0, x1\n" ); + output( "\tmov x1, #4\n" ); + output( "\tmul x1, x0, x1\n" ); + output( "\tmov x0, x1\n" ); + output( "\tadd x0, x0, #%d\n", j ); + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tbr x9\n" ); + output( "1:\t.quad %s\n", asm_name("__wine_delay_load_asm") ); + break; case CPU_POWERPC: switch(target_platform) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 28ecec8..594b31b 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -59,6 +59,8 @@ enum target_cpu target_cpu = CPU_SPARC; enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; +#elif defined(__aarch64__) +enum target_cpu target_cpu = CPU_ARM64; #else #error Unsupported CPU #endif diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 20fcbc0..f6c8cd2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -39,6 +39,7 @@ #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 +#define IMAGE_FILE_MACHINE_ARM64 0x01C5 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -447,6 +448,7 @@ static void output_asm_constructor( const char *constructor ) output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); break; + case CPU_ARM64: case CPU_POWERPC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); @@ -494,6 +496,7 @@ void output_module( DLLSPEC *spec ) output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tb 1f\n" ); break; + case CPU_ARM64: case CPU_POWERPC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); @@ -518,6 +521,7 @@ void output_module( DLLSPEC *spec ) case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; + case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } @@ -707,6 +711,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; + case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 09f9b73..559e476 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -58,7 +58,9 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM } + { "arm", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, }; /* atexit handler to clean tmp files */ @@ -867,6 +869,7 @@ unsigned int get_alignment(unsigned int align) /* fall through */ case CPU_POWERPC: case CPU_ARM: + case CPU_ARM64: n = 0; while ((1u << n) != align) n++; return n; @@ -885,6 +888,7 @@ unsigned int get_page_size(void) case CPU_x86_64: return 4096; case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; + case CPU_ARM64: return 4096; case CPU_SPARC: return 8192; } /* unreached */ @@ -903,6 +907,7 @@ unsigned int get_ptr_size(void) case CPU_ARM: return 4; case CPU_x86_64: + case CPU_ARM64: return 8; } /* unreached */ @@ -975,6 +980,7 @@ const char *func_declaration( const char *func ) switch(target_cpu) { case CPU_ARM: + case CPU_ARM64: buffer = strmake( ".type %s,%%function", func ); break; default: @@ -1025,6 +1031,7 @@ void output_gnu_stack_note(void) switch(target_cpu) { case CPU_ARM: + case CPU_ARM64: output( "\t.section .note.GNU-stack,\"\",%%progbits\n" ); break; default:

1 0

André Hentschel : winegcc: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 99f722e24f869bfc12424aa25973675e0fe13571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f722e24f869bfc12424aa25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:43:39 2013 +0100 winegcc: Add ARM64 support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 70316c9..a75b3cc 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3550960..2432bf3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -160,7 +160,8 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM } + { "arm", CPU_ARM }, + { "aarch64", CPU_ARM64 } }; static const struct @@ -223,6 +224,8 @@ static const enum target_cpu build_cpu = CPU_SPARC; static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__) static const enum target_cpu build_cpu = CPU_ARM; +#elif defined(__aarch64__) +static const enum target_cpu build_cpu = CPU_ARM64; #else #error Unsupported CPU #endif @@ -344,10 +347,10 @@ static int check_platform( struct options *opts, const char *file ) { if (header[4] == 2) /* 64-bit */ ret = (opts->force_pointer_size == 8 || - (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)); + (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))); else ret = (opts->force_pointer_size == 4 || - (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)); + (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)); } } close( fd ); @@ -370,13 +373,13 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; - if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) + if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)) { strcpy( p, "32" ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) + if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))) { strcpy( p, "64" ); strcat( p, libwine ); @@ -438,7 +441,7 @@ static void compile(struct options* opts, const char* lang) strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); } - if (opts->target_cpu == CPU_x86_64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) { strarray_add(comp_args, "-DWIN64"); strarray_add(comp_args, "-D_WIN64"); @@ -505,7 +508,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D__int8=char"); strarray_add(comp_args, "-D__int16=short"); strarray_add(comp_args, "-D__int32=int"); - if (opts->target_cpu == CPU_x86_64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) strarray_add(comp_args, "-D__int64=long"); else strarray_add(comp_args, "-D__int64=long long"); @@ -1399,6 +1402,8 @@ int main(int argc, char **argv) { if (opts.target_cpu == CPU_x86_64) opts.target_cpu = CPU_x86; + else if (opts.target_cpu == CPU_ARM64) + opts.target_cpu = CPU_ARM; opts.force_pointer_size = 4; raw_linker_arg = 1; }

1 0

André Hentschel : widl: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 3ea316638dc79ba031aadeb7a3c992c1c3235cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea316638dc79ba031aadeb7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:44:33 2013 +0100 widl: Add ARM64 support. --- tools/widl/widl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1718247..5626d13 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -266,7 +266,8 @@ static void set_target( const char *target ) { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, { "powerpc", SYS_WIN32 }, - { "arm", SYS_WIN32 } + { "arm", SYS_WIN32 }, + { "aarch64", SYS_WIN64 } }; unsigned int i;

1 0

André Hentschel : wrc: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 198b70cb9d6f144be83d96a1912dc3b5799988c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198b70cb9d6f144be83d96a19… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:45:06 2013 +0100 wrc: Add ARM64 support. --- tools/wrc/wrc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 7d5ad89..ac1fdcc 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -318,7 +318,8 @@ static void set_target( const char *target ) /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); *p = 0; - if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || !strcmp( cpu, "ia64" )) + if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || + !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" )) pointer_size = 8; else pointer_size = 4;

1 0