June 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Use a backup device context for swapchains created on the desktop window.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 0922237c8308f583b9dd27bed386223be87c7057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0922237c8308f583b9dd27be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:28 2019 -0500 wined3d: Use a backup device context for swapchains created on the desktop window. This patch was written by "naur". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18490 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/d3d8/tests/visual.c | 7 +------ dlls/d3d9/tests/visual.c | 7 +------ dlls/wined3d/context.c | 8 +++++++- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 81442e9..a395467 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18028,7 +18028,7 @@ static void test_desktop_window(void) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, "Failed to create swapchain, hr %#x.\n", hr); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8a90ec..1d7a7c7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29338,7 +29338,7 @@ static void test_desktop_window(void) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, "Failed to create swapchain, hr %#x.\n", hr); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a35b180..fc7c3cc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11024,12 +11024,7 @@ static void test_desktop_window(void) DestroyWindow(window); device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); - todo_wine ok(!!device, "Failed to create a D3D device.\n"); - if (!device) - { - IDirect3D8_Release(d3d); - return; - } + ok(!!device, "Failed to create a D3D device.\n"); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bed74f1..5ba07a3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25813,12 +25813,7 @@ static void test_desktop_window(void) DestroyWindow(window); device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); - todo_wine ok(!!device, "Failed to create a D3D device.\n"); - if (!device) - { - IDirect3D9_Release(d3d); - return; - } + ok(!!device, "Failed to create a D3D device.\n"); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b293b4..619b5ff 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1961,10 +1961,16 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; - if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + if (context_gl->window == GetDesktopWindow()) { + TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); + context_gl->dc = NULL; + } + else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) WARN("Failed to retrieve device context, trying swapchain backup.\n"); + if (!context_gl->dc) + { if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) { ERR("Failed to retrieve a device context.\n");

1 0

Alexandre Julliard : Release 4.11.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 07afb240a87d097c83ca5263c61145a170894a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07afb240a87d097c83ca5263… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 23:42:46 2019 +0200 Release 4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 1013 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 5 files changed, 460 insertions(+), 576 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07afb240a87d097c83ca…

1 0

Tag wine-4.11 : Alexandre Julliard : Release 4.11
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: refs/tags/wine-4.11 Tag: 0f062598c79fde0131924ac2d08d813d660e6e20 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0f062598c79fde0131924ac2d08… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 23:42:46 2019 +0200 Release 4.11

1 0

Zebediah Figura : d3d8/tests: Test creating and rendering to a swapchain on the desktop window.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 835d668dc3dcee75679d2404cce20d7d005f0c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=835d668dc3dcee75679d2404… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:27 2019 -0500 d3d8/tests: Test creating and rendering to a swapchain on the desktop window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 474dc69..a35b180 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11001,6 +11001,50 @@ done: DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + IDirect3DDevice8_Release(device); + DestroyWindow(window); + + device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); + todo_wine ok(!!device, "Failed to create a D3D device.\n"); + if (!device) + { + IDirect3D8_Release(d3d); + return; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D8_Release(d3d); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11077,4 +11121,5 @@ START_TEST(visual) test_color_vertex(); test_sysmem_draw(); test_alphatest(); + test_desktop_window(); }

1 0

Zebediah Figura : d3d9/tests: Test creating and rendering to a swapchain on the desktop window.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 6bca414844c6d1ae21dcc6d05a65536f72267802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bca414844c6d1ae21dcc6d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:26 2019 -0500 d3d9/tests: Test creating and rendering to a swapchain on the desktop window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 053636d..bed74f1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25790,6 +25790,50 @@ static void test_nrm_instruction(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + IDirect3DDevice9_Release(device); + DestroyWindow(window); + + device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); + todo_wine ok(!!device, "Failed to create a D3D device.\n"); + if (!device) + { + IDirect3D9_Release(d3d); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D9_Release(d3d); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -25932,4 +25976,5 @@ START_TEST(visual) test_color_vertex(); test_sysmem_draw(); test_nrm_instruction(); + test_desktop_window(); }

1 0

Zebediah Figura : d3d11/tests: Test creating and rendering to a swapchain on the desktop window.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: ee163e350bf35f30eb38dbb97386b9b08cc2f7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee163e350bf35f30eb38dbb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:24 2019 -0500 d3d11/tests: Test creating and rendering to a swapchain on the desktop window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8c2f64..b8a90ec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29290,6 +29290,85 @@ static void test_standard_pattern(void) release_test_context(&test_context); } +static void test_desktop_window(void) +{ + ID3D11RenderTargetView *backbuffer_rtv; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *backbuffer; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = GetDesktopWindow(); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + ID3D11Device_Release(device); + return; + } + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + check_texture_color(backbuffer, 0xff0000ff, 1); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11RenderTargetView_Release(backbuffer_rtv); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -29448,6 +29527,7 @@ START_TEST(d3d11) queue_test(test_staging_buffers); queue_test(test_render_a8); queue_test(test_standard_pattern); + queue_test(test_desktop_window); run_queued_tests(); }

1 0

Alexandre Julliard : shlwapi: Add -import flag on functions imported from kernelbase.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 0b71919d9b81e5fab88ba1cde2ca616649a7ed3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b71919d9b81e5fab88ba1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 12:09:11 2019 +0200 shlwapi: Add -import flag on functions imported from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 362 +++++++++++++++++++++++----------------------- 1 file changed, 181 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b71919d9b81e5fab88b…

1 0

Alexandre Julliard : winebuild: Add -import entry point flag to generate hotpatchable import thunks.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: cf619dd419ca371602d44f19236cf557b222eddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf619dd419ca371602d44f19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 12:08:44 2019 +0200 winebuild: Add -import entry point flag to generate hotpatchable import thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 1 + tools/winebuild/build.h | 31 +++++++------- tools/winebuild/import.c | 5 +++ tools/winebuild/parser.c | 1 + tools/winebuild/spec32.c | 90 +++++++++++++++++++++++++++++++--------- tools/winebuild/winebuild.man.in | 7 ++++ 6 files changed, 101 insertions(+), 34 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index c2fa929..7b9115e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -591,6 +591,7 @@ sub update_spec_file($) $flags = $parent{flags}; $flags =~ s/-ordinal\s*// if $descr{ordinal} eq "@"; $flags =~ s/-noname\s*// if $descr{ordinal} eq "@"; + $flags =~ s/-import\s*//; if ($descr{flags} =~ /-private/) # preserve -private flag { $flags = "-private " . $flags unless $flags =~ /-private/; diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ad6e2a8..43a0dd2 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -168,21 +168,22 @@ struct strarray }; /* entry point flags */ -#define FLAG_NORELAY 0x01 /* don't use relay debugging for this function */ -#define FLAG_NONAME 0x02 /* don't export function by name */ -#define FLAG_RET16 0x04 /* function returns a 16-bit value */ -#define FLAG_RET64 0x08 /* function returns a 64-bit value */ -#define FLAG_REGISTER 0x10 /* use register calling convention */ -#define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ -#define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ -#define FLAG_THISCALL 0x80 /* use thiscall calling convention */ -#define FLAG_FASTCALL 0x100 /* use fastcall calling convention */ - -#define FLAG_FORWARD 0x200 /* function is a forwarded name */ -#define FLAG_EXT_LINK 0x400 /* function links to an external symbol */ -#define FLAG_EXPORT32 0x800 /* 32-bit export in 16-bit spec file */ - -#define FLAG_CPU(cpu) (0x01000 << (cpu)) +#define FLAG_NORELAY 0x0001 /* don't use relay debugging for this function */ +#define FLAG_NONAME 0x0002 /* don't export function by name */ +#define FLAG_RET16 0x0004 /* function returns a 16-bit value */ +#define FLAG_RET64 0x0008 /* function returns a 64-bit value */ +#define FLAG_REGISTER 0x0010 /* use register calling convention */ +#define FLAG_PRIVATE 0x0020 /* function is private (cannot be imported) */ +#define FLAG_ORDINAL 0x0040 /* function should be imported by ordinal */ +#define FLAG_THISCALL 0x0080 /* use thiscall calling convention */ +#define FLAG_FASTCALL 0x0100 /* use fastcall calling convention */ +#define FLAG_IMPORT 0x0200 /* export is imported from another module */ + +#define FLAG_FORWARD 0x1000 /* function is a forwarded name */ +#define FLAG_EXT_LINK 0x2000 /* function links to an external symbol */ +#define FLAG_EXPORT32 0x4000 /* 32-bit export in 16-bit spec file */ + +#define FLAG_CPU(cpu) (0x10000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) #define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7cf0655..8c32b73 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -838,6 +838,11 @@ static void output_immediate_imports(void) for (j = 0; j < import->nb_imports; j++) { struct import_func *func = &import->imports[j]; + if (i) + { + if (func->name) output( "__imp_%s:\n", asm_name( func->name )); + else if (func->export_name) output( "__imp_%s:\n", asm_name( func->export_name )); + } if (func->name) output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", get_asm_ptr_keyword(), import->c_name, func->name ); diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bec9f52..3191efa 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -70,6 +70,7 @@ static const char * const FlagNames[] = "ordinal", /* FLAG_ORDINAL */ "thiscall", /* FLAG_THISCALL */ "fastcall", /* FLAG_FASTCALL */ + "import", /* FLAG_IMPORT */ NULL }; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f1dedcc..855e6d8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -379,9 +379,11 @@ static void output_relay_debug( DLLSPEC *spec ) void output_exports( DLLSPEC *spec ) { int i, fwd_size = 0; + int needs_imports = 0; int needs_relay = has_relays( spec ); int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); + const char *name; if (!nr_exports) return; @@ -430,6 +432,13 @@ void output_exports( DLLSPEC *spec ) output( "\t%s .L__wine_spec_forwards+%u\n", func_ptr, fwd_size ); fwd_size += strlen(odp->link_name) + 1; } + else if ((odp->flags & FLAG_IMPORT) && (target_cpu == CPU_x86 || target_cpu == CPU_x86_64)) + { + name = odp->name ? odp->name : odp->export_name; + if (name) output( "\t%s %s_%s\n", func_ptr, asm_name("__wine_spec_imp"), name ); + else output( "\t%s %s_%u\n", func_ptr, asm_name("__wine_spec_imp"), i ); + needs_imports = 1; + } else if (odp->flags & FLAG_EXT_LINK) { output( "\t%s %s_%s\n", func_ptr, asm_name("__wine_spec_ext_link"), odp->link_name ); @@ -503,32 +512,75 @@ void output_exports( DLLSPEC *spec ) /* output relays */ - if (target_platform == PLATFORM_WINDOWS) + if (needs_relay) { - if (!needs_relay) return; - output( "\t.data\n" ); - output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + if (target_platform == PLATFORM_WINDOWS) + { + output( "\t.data\n" ); + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + } + else + { + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( ".L__wine_spec_exports_end:\n" ); + } + + output( ".L__wine_spec_relay_descr:\n" ); + output( "\t%s 0xdeb90002\n", get_asm_ptr_keyword() ); /* magic */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* relay func */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* private data */ + output( "\t%s __wine_spec_relay_entry_points\n", get_asm_ptr_keyword() ); + output( "\t%s .L__wine_spec_relay_entry_point_offsets\n", get_asm_ptr_keyword() ); + output( "\t%s .L__wine_spec_relay_args_string\n", get_asm_ptr_keyword() ); + + output_relay_debug( spec ); } - else + else if (target_platform != PLATFORM_WINDOWS) { - output( "\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_exports_end:\n" ); - if (!needs_relay) - { + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( ".L__wine_spec_exports_end:\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); - return; - } } - output( ".L__wine_spec_relay_descr:\n" ); - output( "\t%s 0xdeb90002\n", get_asm_ptr_keyword() ); /* magic */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* relay func */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* private data */ - output( "\t%s __wine_spec_relay_entry_points\n", get_asm_ptr_keyword() ); - output( "\t%s .L__wine_spec_relay_entry_point_offsets\n", get_asm_ptr_keyword() ); - output( "\t%s .L__wine_spec_relay_args_string\n", get_asm_ptr_keyword() ); + /* output import thunks */ - output_relay_debug( spec ); + if (!needs_imports) return; + output( "\t.text\n" ); + for (i = spec->base; i <= spec->limit; i++) + { + ORDDEF *odp = spec->ordinals[i]; + if (!odp) continue; + if (!(odp->flags & FLAG_IMPORT)) continue; + + name = odp->name ? odp->name : odp->export_name; + + output( "\t.align %d\n", get_alignment(4) ); + output( "\t.long 0x90909090,0x90909090\n" ); + if (name) output( "%s_%s:\n", asm_name("__wine_spec_imp"), name ); + else output( "%s_%u:\n", asm_name("__wine_spec_imp"), i ); + output_cfi( ".cfi_startproc" ); + + switch (target_cpu) + { + case CPU_x86: + output( "\t.byte 0x8b,0xff,0x55,0x8b,0xec,0x5d\n" ); /* hotpatch prolog */ + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tjmp *__imp_%s-1b(%%eax)\n", asm_name( get_link_name( odp ))); + needs_get_pc_thunk = 1; + } + else output( "\tjmp *__imp_%s\n", asm_name( get_link_name( odp ))); + break; + case CPU_x86_64: + output( "\t.byte 0x48\n" ); /* hotpatch prolog */ + output( "\tjmp *__imp_%s(%%rip)\n", asm_name( get_link_name( odp ))); + break; + default: + assert(0); + } + output_cfi( ".cfi_endproc" ); + } } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index e9386f9..1b9b1b0 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -315,6 +315,13 @@ The function uses the calling convention (first two parameters in %ecx/%edx registers on i386). .TP +.B -import +The function is imported from another module. This can be used instead +of a +.I forward +specification when an application expects to find the function's +implementation inside the dll. +.TP .RE .BI -arch= cpu\fR[\fB,\fIcpu\fR] The entry point is only available on the specified CPU

1 0

Alexandre Julliard : api-ms-win-core-kernel32-legacy-l1-1-1: Use proper forwards.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: dc8a941a7cd95c0974634a72790da948c8bbc75b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8a941a7cd95c0974634a72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 12:00:16 2019 +0200 api-ms-win-core-kernel32-legacy-l1-1-1: Use proper forwards. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 946e3de..fd1a0bc 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -29,9 +29,9 @@ @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId -@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) +@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx @ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask -@ stdcall GetNumaProcessorNodeEx(ptr ptr) +@ stdcall GetNumaProcessorNodeEx(ptr ptr) kernel32.GetNumaProcessorNodeEx @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA @ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA @ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA

1 0

Alexandre Julliard : svrapi: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 8a00b3fc8b6f2413f1a780c4fb0b1806141e1487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a00b3fc8b6f2413f1a780c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:49:56 2019 +0200 svrapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/svrapi/Makefile.in | 2 ++ dlls/svrapi/svrapi_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in index 21ff8d1..c9467f2 100644 --- a/dlls/svrapi/Makefile.in +++ b/dlls/svrapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = svrapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ svrapi_main.c diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c index f4ac475..8c7b007 100644 --- a/dlls/svrapi/svrapi_main.c +++ b/dlls/svrapi/svrapi_main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0