wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

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

16 Jan '13

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

Stefan Dösinger : d3d8/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: ce31e40f242353c45e1e60081ad4e5a6655325ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce31e40f242353c45e1e60081… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:16 2013 +0100 d3d8/tests: Create a plain DS surface in test_reset_resources. --- dlls/d3d8/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 87d3f9e..ca34b81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3252,12 +3252,9 @@ static void test_reset_resources(void) goto done; } - hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture8_Release(texture); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, &surface); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture);

1 0

Stefan Dösinger : d3d9/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: ab36ab7d11f7fcafe1cea7c1cd7135a0472ffdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab36ab7d11f7fcafe1cea7c1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:15 2013 +0100 d3d9/tests: Create a plain DS surface in test_reset_resources. r200 does not support depth textures. --- dlls/d3d9/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a0997d6..cabdec5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3523,12 +3523,9 @@ static void test_reset_resources(void) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, + D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface);

1 0

Jacek Caban : atl100: Added stubs for AtlAxDialogBox[AW].
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 59881c142ed990f1dcba15cc366b144d1f992cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59881c142ed990f1dcba15cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 16 12:50:06 2013 +0100 atl100: Added stubs for AtlAxDialogBox[AW]. --- dlls/atl/atl.spec | 4 ++-- dlls/atl100/atl100.spec | 4 ++-- dlls/atl100/atl_ax.c | 22 ++++++++++++++++++++++ dlls/atl80/atl80.spec | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 7b36397..1a167a7 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -26,8 +26,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 2de1102..1732052 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -18,8 +18,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index bd0881f..4874d39 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -1350,3 +1350,25 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) return IOleObject_QueryInterface( This->control, &IID_IUnknown, (void**) pUnk ); } + +/*********************************************************************** + * AtlAxDialogBoxW [atl100.35] + * + */ +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} + +/*********************************************************************** + * AtlAxDialogBoxA [atl100.36] + * + */ +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 620c719..dfc9c43 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -20,8 +20,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl

1 0

Jacek Caban : mshtml: Remove duplicated property entries in preprocess_dispex_data.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: bce6ee2b84629e2ce51f45ea2309ca29bf29bb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce6ee2b84629e2ce51f45ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 16 12:36:08 2013 +0100 mshtml: Remove duplicated property entries in preprocess_dispex_data. --- dlls/mshtml/dispex.c | 16 ++++++++++++++++ dlls/mshtml/tests/jstest.html | 13 +++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 793bbb9..ed799d2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -373,6 +373,22 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); + for(i = 1; i < data->func_cnt && data->funcs[i-1].id != data->funcs[i].id; i++); + if(i < data->func_cnt) { + unsigned j = i--; + + /* We have at least one duplicated property. This may happen if more than one + * interface implements the same property. We have to remove these duplicated + * entries. */ + + while(j < data->func_cnt) { + while(j+1 < data->func_cnt && data->funcs[j+1].id == data->funcs[j].id) + j++; + data->funcs[i++] = data->funcs[j++]; + } + data->func_cnt = i; + } + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2bd87b1..ebf2861 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -165,6 +165,18 @@ function test_override_functions() { ok(tmp === "test", "div.addBehavior() = " + tmp); } +function test_forin() { + var cnt=0; + + document.body.innerHTML = '<a id="aid"></a>'; + + for(var x in document.getElementById("aid")) { + cnt++; + } + + ok(cnt > 100, "cnt = " + cnt); +} + var globalVar = false; function runTests() { @@ -185,6 +197,7 @@ function runTests() { test_attribute_collection(); test_arg_conv(); test_override_functions(); + test_forin(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

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

16 Jan '13

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

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

16 Jan '13

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

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

16 Jan '13

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 : dbghelp: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

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 : kernel32/tests: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 1b440629a646bc44220517e62dfed99bf53cec5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b440629a646bc44220517e62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:53:55 2013 +0100 kernel32/tests: Add ARM64 support. --- dlls/kernel32/tests/file.c | 2 ++ dlls/kernel32/tests/loader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0166fff..ce25cb9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1787,6 +1787,8 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e503171..a884779 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -64,6 +64,8 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ +#elif defined __aarch64__ + IMAGE_FILE_MACHINE_ARM64, /* Machine */ #else # error You must specify the machine type #endif

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013