January 2013 - Wine-Commits

André Hentschel : dbghelp: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: ce8640cbef378c484483efa5b07420f7d7ebc829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8640cbef378c484483efa5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:55:14 2013 +0100 dbghelp: Add ARM64 support. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_arm64.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 6 +- include/cvconst.h | 7 ++ 4 files changed, 201 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 7c4f73a..fcbe40f 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -7,6 +7,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ cpu_arm.c \ + cpu_arm64.c \ cpu_i386.c \ cpu_ppc.c \ cpu_sparc.c \ diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c new file mode 100644 index 0000000..26407f7 --- /dev/null +++ b/dlls/dbghelp/cpu_arm64.c @@ -0,0 +1,189 @@ +/* + * File cpu_arm64.c + * + * Copyright (C) 2009 Eric Pouech + * Copyright (C) 2010-2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + switch (ca) + { +#ifdef __aarch64__ + 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->X29; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; + } +} + +static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + FIXME("not done for ARM64\n"); + return FALSE; +} + +static unsigned arm64_map_dwarf_register(unsigned regno) +{ + if (regno <= 30) return CV_ARM64_X0 + regno; + if (regno == 31) return CV_ARM64_SP; + + FIXME("Don't know how to map register %d\n", regno); + return CV_ARM64_NOREG; +} + +static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ +#ifdef __aarch64__ + switch (regno) + { + + case CV_ARM64_X0 + 0: *size = sizeof(ctx->X0); return &ctx->X0; + case CV_ARM64_X0 + 1: *size = sizeof(ctx->X1); return &ctx->X1; + case CV_ARM64_X0 + 2: *size = sizeof(ctx->X2); return &ctx->X2; + case CV_ARM64_X0 + 3: *size = sizeof(ctx->X3); return &ctx->X3; + case CV_ARM64_X0 + 4: *size = sizeof(ctx->X4); return &ctx->X4; + case CV_ARM64_X0 + 5: *size = sizeof(ctx->X5); return &ctx->X5; + case CV_ARM64_X0 + 6: *size = sizeof(ctx->X6); return &ctx->X6; + case CV_ARM64_X0 + 7: *size = sizeof(ctx->X7); return &ctx->X7; + case CV_ARM64_X0 + 8: *size = sizeof(ctx->X8); return &ctx->X8; + case CV_ARM64_X0 + 9: *size = sizeof(ctx->X9); return &ctx->X9; + case CV_ARM64_X0 + 10: *size = sizeof(ctx->X10); return &ctx->X10; + case CV_ARM64_X0 + 11: *size = sizeof(ctx->X11); return &ctx->X11; + case CV_ARM64_X0 + 12: *size = sizeof(ctx->X12); return &ctx->X12; + case CV_ARM64_X0 + 13: *size = sizeof(ctx->X13); return &ctx->X13; + case CV_ARM64_X0 + 14: *size = sizeof(ctx->X14); return &ctx->X14; + case CV_ARM64_X0 + 15: *size = sizeof(ctx->X15); return &ctx->X15; + case CV_ARM64_X0 + 16: *size = sizeof(ctx->X16); return &ctx->X16; + case CV_ARM64_X0 + 17: *size = sizeof(ctx->X17); return &ctx->X17; + case CV_ARM64_X0 + 18: *size = sizeof(ctx->X18); return &ctx->X18; + case CV_ARM64_X0 + 19: *size = sizeof(ctx->X19); return &ctx->X19; + case CV_ARM64_X0 + 20: *size = sizeof(ctx->X20); return &ctx->X20; + case CV_ARM64_X0 + 21: *size = sizeof(ctx->X21); return &ctx->X21; + case CV_ARM64_X0 + 22: *size = sizeof(ctx->X22); return &ctx->X22; + case CV_ARM64_X0 + 23: *size = sizeof(ctx->X23); return &ctx->X23; + case CV_ARM64_X0 + 24: *size = sizeof(ctx->X24); return &ctx->X24; + case CV_ARM64_X0 + 25: *size = sizeof(ctx->X25); return &ctx->X25; + case CV_ARM64_X0 + 26: *size = sizeof(ctx->X26); return &ctx->X26; + case CV_ARM64_X0 + 27: *size = sizeof(ctx->X27); return &ctx->X27; + case CV_ARM64_X0 + 28: *size = sizeof(ctx->X28); return &ctx->X28; + case CV_ARM64_X0 + 29: *size = sizeof(ctx->X29); return &ctx->X29; + case CV_ARM64_X0 + 30: *size = sizeof(ctx->X30); return &ctx->X30; + + case CV_ARM64_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; + case CV_ARM64_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; + case CV_ARM64_PSTATE: *size = sizeof(ctx->PState); return &ctx->PState; + } +#endif + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static const char* arm64_fetch_regname(unsigned regno) +{ + switch (regno) + { + case CV_ARM64_X0 + 0: return "x0"; + case CV_ARM64_X0 + 1: return "x1"; + case CV_ARM64_X0 + 2: return "x2"; + case CV_ARM64_X0 + 3: return "x3"; + case CV_ARM64_X0 + 4: return "x4"; + case CV_ARM64_X0 + 5: return "x5"; + case CV_ARM64_X0 + 6: return "x6"; + case CV_ARM64_X0 + 7: return "x7"; + case CV_ARM64_X0 + 8: return "x8"; + case CV_ARM64_X0 + 9: return "x9"; + case CV_ARM64_X0 + 10: return "x10"; + case CV_ARM64_X0 + 11: return "x11"; + case CV_ARM64_X0 + 12: return "x12"; + case CV_ARM64_X0 + 13: return "x13"; + case CV_ARM64_X0 + 14: return "x14"; + case CV_ARM64_X0 + 15: return "x15"; + case CV_ARM64_X0 + 16: return "x16"; + case CV_ARM64_X0 + 17: return "x17"; + case CV_ARM64_X0 + 18: return "x18"; + case CV_ARM64_X0 + 19: return "x19"; + case CV_ARM64_X0 + 20: return "x20"; + case CV_ARM64_X0 + 21: return "x21"; + case CV_ARM64_X0 + 22: return "x22"; + case CV_ARM64_X0 + 23: return "x23"; + case CV_ARM64_X0 + 24: return "x24"; + case CV_ARM64_X0 + 25: return "x25"; + case CV_ARM64_X0 + 26: return "x26"; + case CV_ARM64_X0 + 27: return "x27"; + case CV_ARM64_X0 + 28: return "x28"; + case CV_ARM64_X0 + 29: return "x29"; + case CV_ARM64_X0 + 30: return "x30"; + + case CV_ARM64_SP: return "sp"; + case CV_ARM64_PC: return "pc"; + case CV_ARM64_PSTATE: return "cpsr"; + } + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static BOOL arm64_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) +{ + if (ctx->ContextFlags && (flags & ThreadWriteInstructionWindow)) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __aarch64__ + ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); +#endif + } + + return TRUE; +} + +static BOOL arm64_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ + return FALSE; +} + +DECLSPEC_HIDDEN struct cpu cpu_arm64 = { + IMAGE_FILE_MACHINE_ARM64, + 8, + CV_ARM64_X0 + 29, + arm64_get_addr, + arm64_stack_walk, + NULL, + arm64_map_dwarf_register, + arm64_fetch_context_reg, + arm64_fetch_regname, + arm64_fetch_minidump_thread, + arm64_fetch_minidump_module, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 358902b..9f3b82f 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm, cpu_arm64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, &cpu_arm64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -165,6 +165,8 @@ struct cpu* dbghelp_current_cpu = &cpu_sparc #elif defined(__arm__) &cpu_arm +#elif defined(__aarch64__) + &cpu_arm64 #else #error define support for your CPU #endif diff --git a/include/cvconst.h b/include/cvconst.h index 84ff3a0..8b48f78 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -677,6 +677,13 @@ enum CV_HREG_e CV_SPARC_Y = 45, CV_SPARC_WIM = 46, CV_SPARC_TBR = 47, + + /* Wine extension */ + CV_ARM64_NOREG = CV_REG_NONE, + CV_ARM64_X0 = 10, /* this includes X0 to X30 */ + CV_ARM64_SP = 41, + CV_ARM64_PC = 42, + CV_ARM64_PSTATE = 43, }; typedef enum

1 0

André Hentschel : winedbg: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: d62d7474d43949d71ac34e2157c2fdb83341e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62d7474d43949d71ac34e215… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:56:51 2013 +0100 winedbg: Add ARM64 support. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_arm64.c | 309 +++++++++++++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 36 +++++ programs/winedbg/tgt_active.c | 2 + programs/winedbg/winedbg.c | 4 + 5 files changed, 352 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d62d7474d43949d71ac34…

1 0

André Hentschel : winetest: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: fcc204c989928e4304f3b93a7bbcfba8129c036e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc204c989928e4304f3b93a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:57:34 2013 +0100 winetest: Add ARM64 support. --- programs/winetest/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cc73f94..427b6b4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -319,6 +319,8 @@ static void print_version (void) static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; +#elif defined(__aarch64__) + static const char platform[] = "arm64"; #else # error CPU unknown #endif

1 0

Eric Pouech : Various background processes must be launched detached from current console (if any).
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: d1ccbceb4dea9e25912108058d7c29e49709ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ccbceb4dea9e25912108058… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 14 21:20:06 2013 +0100 Various background processes must be launched detached from current console (if any). --- dlls/appwiz.cpl/addons.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/ieframe/intshcut.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/rpc.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 2 +- dlls/shell32/shelllink.c | 2 +- programs/wineboot/wineboot.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4eb37c7..2a47b84 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -630,7 +630,7 @@ static void run_winebrowser(const WCHAR *url) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); heap_free(args); if (ret) { CloseHandle(pi.hThread); diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c07b333..87041e4 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -656,7 +656,7 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface, if (!This->initialized) return DIERR_NOTINITIALIZED; - if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) return HRESULT_FROM_WIN32(GetLastError()); return DI_OK; diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 7107a0a..71373c7 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -108,7 +108,7 @@ static BOOL run_winemenubuilder( const WCHAR *args ) si.cb = sizeof(si); Wow64DisableWow64FsRedirection( &redir ); - ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); heap_free( buffer ); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 1d7f219..8d4e98f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -146,7 +146,7 @@ static BOOL start_rpcss(void) strcatW( cmd, rpcss ); Wow64DisableWow64FsRedirection( &redir ); - rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); if (rslt) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9b57206..5c981bb 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1680,7 +1680,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* FIXME: Win2003 supports a ServerExecutable value that is passed into * CreateProcess */ - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) { WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index f079ff4..540c1c4 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -92,7 +92,7 @@ static BOOL start_rpcss(void) lstrcatW( cmd, rpcss ); Wow64DisableWow64FsRedirection( &redir ); - rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); if (rslt) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index e325e2e..e2889ba 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -439,7 +439,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) si.cb = sizeof(si); Wow64DisableWow64FsRedirection( &redir ); - ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0be773b..7b68747 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -851,7 +851,7 @@ static BOOL start_services_process(void) strcatW(path, services); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - if (!CreateProcessW(path, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcessW(path, path, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) { WINE_ERR("Couldn't start services.exe: error %u\n", GetLastError()); return FALSE;

1 0

Stefan Dösinger : ddraw/tests: Add basic tests for DrawIndexedPrimitiveStrided.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: a8469a458f2503e7683f45be02ab09af701e36ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8469a458f2503e7683f45be0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:17 2013 +0100 ddraw/tests: Add basic tests for DrawIndexedPrimitiveStrided. --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 68 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3d81d1d..76ed55d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1,5 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers + * Copyright 2012-2013 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2965,6 +2966,77 @@ static void test_coop_level_multi_window(void) DestroyWindow(window1); } +static void test_draw_strided(void) +{ + static struct vec3 position[] = + { + {-1.0, -1.0, 0.0}, + {-1.0, 1.0, 0.0}, + { 1.0, 1.0, 0.0}, + { 1.0, -1.0, 0.0}, + }; + static DWORD diffuse[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + }; + static WORD indices[] = + { + 0, 1, 2, 2, 3, 0 + }; + + IDirectDrawSurface4 *rt; + IDirect3DDevice3 *device; + D3DCOLOR color; + HWND window; + HRESULT hr; + D3DDRAWPRIMITIVESTRIDEDDATA strided; + IDirect3DViewport3 *viewport; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + memset(&strided, 0x55, sizeof(strided)); + strided.position.lpvData = position; + strided.position.dwStride = sizeof(*position); + strided.diffuse.lpvData = diffuse; + strided.diffuse.dwStride = sizeof(*diffuse); + hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE, + &strided, 4, indices, 6, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2990,4 +3062,5 @@ START_TEST(ddraw4) test_coop_level_surf_create(); test_vb_discard(); test_coop_level_multi_window(); + test_draw_strided(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5668dc7..6b6f6d6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Stefan Dösinger for CodeWeavers + * Copyright 2006, 2012-2013 Stefan Dösinger for CodeWeavers * Copyright 2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -2774,6 +2774,71 @@ static void test_coop_level_multi_window(void) DestroyWindow(window1); } +static void test_draw_strided(void) +{ + static struct vec3 position[] = + { + {-1.0, -1.0, 0.0}, + {-1.0, 1.0, 0.0}, + { 1.0, 1.0, 0.0}, + { 1.0, -1.0, 0.0}, + }; + static DWORD diffuse[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + }; + static WORD indices[] = + { + 0, 1, 2, 2, 3, 0 + }; + + IDirectDrawSurface7 *rt; + IDirect3DDevice7 *device; + D3DCOLOR color; + HWND window; + HRESULT hr; + D3DDRAWPRIMITIVESTRIDEDDATA strided; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + memset(&strided, 0x55, sizeof(strided)); + strided.position.lpvData = position; + strided.position.dwStride = sizeof(*position); + strided.diffuse.lpvData = diffuse; + strided.diffuse.dwStride = sizeof(*diffuse); + hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE, + &strided, 4, indices, 6, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2806,4 +2871,5 @@ START_TEST(ddraw7) test_coop_level_surf_create(); test_vb_discard(); test_coop_level_multi_window(); + test_draw_strided(); }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetServer.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

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

Hans Leidekker : advapi32: Improve the stub for CreateRestrictedToken.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

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

André Hentschel : include: Add ARM64 endianness.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

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

Alexandre Julliard : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

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 : winegcc: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

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