August 2015 - Wine-Commits - list.winehq.org

Jacek Caban : ieframe: Update back/ forward command state in FireNavigateComplete2.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 670459b7bc1d98e263d3875c91849a340982f5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=670459b7bc1d98e263d3875c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:01 2015 +0200 ieframe: Update back/forward command state in FireNavigateComplete2. --- dlls/ieframe/dochost.c | 29 +++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 21 --------------------- dlls/ieframe/shellbrowser.c | 2 ++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3de1d21..a6582b1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -80,6 +80,35 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc) } } +void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +{ + DISPPARAMS dispparams; + VARIANTARG params[2]; + + TRACE("command=%d enable=%d\n", command, enable); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL; + V_BOOL(params) = enable; + + V_VT(params+1) = VT_I4; + V_I4(params+1) = command; + + call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); +} + +void update_navigation_commands(DocHost *dochost) +{ + unsigned pos = dochost->travellog.loading_pos == -1 ? dochost->travellog.position : dochost->travellog.loading_pos; + + on_commandstate_change(dochost, CSC_NAVIGATEBACK, pos > 0 ? VARIANT_TRUE : VARIANT_FALSE); + on_commandstate_change(dochost, CSC_NAVIGATEFORWARD, pos < dochost->travellog.length ? VARIANT_TRUE : VARIANT_FALSE); +} + static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 057c2f6..5806107 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -278,6 +278,7 @@ void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; +void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 74d1bc5..36915e4 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -781,27 +781,6 @@ static void doc_navigate_task_destr(task_header_t *t) heap_free(task); } -void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) -{ - DISPPARAMS dispparams; - VARIANTARG params[2]; - - TRACE("command=%d enable=%d\n", command, enable); - - dispparams.cArgs = 2; - dispparams.cNamedArgs = 0; - dispparams.rgdispidNamedArgs = NULL; - dispparams.rgvarg = params; - - V_VT(params) = VT_BOOL; - V_BOOL(params) = enable; - - V_VT(params+1) = VT_I4; - V_I4(params+1) = command; - - call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); -} - static void doc_navigate_proc(DocHost *This, task_header_t *t) { task_doc_navigate_t *task = (task_doc_navigate_t*)t; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 8145536..f75689e 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -748,6 +748,8 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + update_navigation_commands(This->doc_host); + if(doc_host->travellog.loading_pos != -1) { WARN("histupdate not notified\n"); doc_host->travellog.position = doc_host->travellog.loading_pos;

1 0

Józef Kucia : includes: Add D3D11CreateDeviceAndSwapChain declaration to d3d11.idl.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 02254e04ca04eea070af6237ee2f423a6b75c767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02254e04ca04eea070af6237e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:22 2015 +0200 includes: Add D3D11CreateDeviceAndSwapChain declaration to d3d11.idl. --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3726d32..86fe42a 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -2157,3 +2157,8 @@ cpp_quote(" UINT,UINT,ID3D11Device**,D3D_FEATURE_LEVEL*,ID3D11DeviceContext** cpp_quote("typedef HRESULT (WINAPI *PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,const DXGI_SWAP_CHAIN_DESC*,IDXGISwapChain**,ID3D11Device**,") cpp_quote(" D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") + +[local] HRESULT __stdcall D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, + const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D11Device **device, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context);

1 0

Henri Verbeet : wined3d: Separate loading shader resources and updating their binding points.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: ee9b1311cd84f08a545fa0a9326bd4005e884611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9b1311cd84f08a545fa0a93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:10 2015 +0200 wined3d: Separate loading shader resources and updating their binding points. --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32813e9..79125d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3044,6 +3044,42 @@ static void context_preload_textures(struct wined3d_context *context, const stru } } +static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + buffer_internal_preload(state->cb[i][j], context, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + { + WARN("No resource view bound at index %u, %u.\n", i, entry->resource_idx); + continue; + } + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + buffer_internal_preload(buffer_from_resource(view->resource), context, state); + else + wined3d_texture_load(wined3d_texture_from_resource(view->resource), context, FALSE); + } + } +} + static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3102,7 +3138,6 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } texture = wined3d_texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); context_active_texture(context, gl_info, shader_types[i].base_idx + entry->bind_idx); wined3d_texture_bind(texture, context, FALSE); @@ -3118,7 +3153,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de const struct wined3d_state *state = &device->state; const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; - unsigned int i, j; + unsigned int i; WORD map; if (!context_validate_rt_config(context->gl_info->limits.buffers, @@ -3135,6 +3170,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); + context_load_shader_resources(context, state); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3160,15 +3196,6 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de buffer_get_sysmem(state->index_buffer, context); } - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - buffer_internal_preload(state->cb[i][j], context, state); - } - } - for (i = 0; i < context->numDirtyEntries; ++i) { DWORD rep = context->dirtyArray[i];

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_UpdateSubresource().
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 62a02a047faad817443a4498a11aa07423e2d608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a02a047faad817443a4498a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:11 2015 +0200 d3d10core: Implement d3d10_device_UpdateSubresource(). --- dlls/d3d10core/device.c | 22 +++- dlls/d3d10core/tests/device.c | 269 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 80 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 + 5 files changed, 374 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62a02a047faad817443a4…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_CopyFromMemory().
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 2474f5e33a4cdd6c38c6fe35fc19ba1f18f9d6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2474f5e33a4cdd6c38c6fe35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:12 2015 +0200 d2d1: Implement d2d_bitmap_CopyFromMemory(). --- dlls/d2d1/bitmap.c | 25 ++++++++++- dlls/d2d1/tests/d2d1.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b3348c6..8d22eac 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -143,9 +143,30 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *if static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface, const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch) { - FIXME("iface %p, dst_rect %p, src_data %p, pitch %u stub!\n", iface, dst_rect, src_data, pitch); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ID3D10Device *device; + ID3D10Resource *dst; + D3D10_BOX box; - return E_NOTIMPL; + TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); + + if (dst_rect) + { + box.left = dst_rect->left; + box.top = dst_rect->top; + box.front = 0; + box.right = dst_rect->right; + box.bottom = dst_rect->bottom; + box.back = 1; + } + + ID3D10ShaderResourceView_GetResource(bitmap->view, &dst); + ID3D10ShaderResourceView_GetDevice(bitmap->view, &device); + ID3D10Device_UpdateSubresource(device, dst, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D10Device_Release(device); + ID3D10Resource_Release(dst); + + return S_OK; } static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 739e2fb..dc7b38f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,6 +54,14 @@ static void set_rect(D2D1_RECT_F *rect, float left, float top, float right, floa rect->bottom = bottom; } +static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) { color->r = r; @@ -1998,6 +2006,110 @@ static void test_shared_bitmap(void) CoUninitialize(); } +static void test_bitmap_updates(void) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_RECT_U dst_rect; + ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; + D2D1_RECT_F rect; + D2D1_SIZE_U size; + HWND window; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 320.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + ID2D1Bitmap_Release(bitmap); + + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 240.0f, 320.0f, 480.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + set_rect_u(&dst_rect, 1, 1, 3, 3); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 3, 3, 4); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[6], 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 0, 4, 1); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[10], 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 0, 1, 1, 3); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[2], sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect_u(&dst_rect, 4, 4, 3, 1); + hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect(&rect, 320.0f, 240.0f, 640.0f, 480.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1Bitmap_CopyFromMemory(bitmap, NULL, bitmap_data, 4 * sizeof(*bitmap_data)); + ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr); + set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + + match = compare_surface(surface, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6"); + ok(match, "Surface does not match.\n"); + + ID2D1Bitmap_Release(bitmap); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -2008,4 +2120,5 @@ START_TEST(d2d1) test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap(); + test_bitmap_updates(); }

1 0

Józef Kucia : d3d10: Do not use '\n' in the middle of TRACE.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: f04dfcd21451b3d560625c03fa1566adbc304649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04dfcd21451b3d560625c03f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:24 2015 +0200 d3d10: Do not use '\n' in the middle of TRACE. --- dlls/d3d10/d3d10_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 12c97ce..4600a70 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -139,8 +139,8 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIFactory *factory; HRESULT hr; - TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d,\n" - "\tswapchain_desc %p, swapchain %p, device %p\n", + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, " + "swapchain_desc %p, swapchain %p, device %p\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device);

1 0

Józef Kucia : dxgi: Remove 'stub!' from TRACE message in dxgi_swapchain_ResizeBuffers().
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 9e8b58ee181a98996ebd9a94312a8e363677ecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8b58ee181a98996ebd9a943… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:25 2015 +0200 dxgi: Remove 'stub!' from TRACE message in dxgi_swapchain_ResizeBuffers(). --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cffd3bc..ce09450 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -225,7 +225,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if unsigned int i; HRESULT hr; - TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x stub!\n", + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); if (flags)

1 0

Dmitry Timoshkov : ntdll: Separate image relocation from NtMapViewOfSection.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: e67a00b46694625e3c40386008affac42e7e3847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67a00b46694625e3c4038600… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 15:25:40 2015 +0800 ntdll: Separate image relocation from NtMapViewOfSection. --- dlls/kernel32/tests/loader.c | 10 ----- dlls/ntdll/loader.c | 87 +++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 44 +--------------------- 3 files changed, 87 insertions(+), 54 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 89feeb9..25b7b08 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -799,15 +799,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL size = 0; status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, &size, 1 /* ViewShare */, 0, PAGE_READONLY); - /* FIXME: remove once Wine is fixed */ - if (status != STATUS_IMAGE_NOT_AT_BASE) - { - todo_wine { - ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); - ok(addr2 != 0, "mapped address should be valid\n"); - } - goto wine_is_broken; - } ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); ok(addr2 != 0, "mapped address should be valid\n"); ok(addr2 != addr1, "mapped addresses should be different\n"); @@ -861,7 +852,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL ok(ret, "FreeLibrary error %d\n", GetLastError()); } -wine_is_broken: status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d15b140..4404938 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1656,6 +1656,81 @@ static void set_security_cookie( void *module, SIZE_T len ) } } +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + /* no relocations are performed on non page-aligned binaries */ + if (nt->OptionalHeader.SectionAlignment < page_size) + return STATUS_SUCCESS; + + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && NtCurrentTeb()->Peb->ImageBaseAddress) + return STATUS_SUCCESS; + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if ((nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) || + !relocs->VirtualAddress || !relocs->Size) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (nt->FileHeader.NumberOfSections > sizeof(protect_old)/sizeof(protect_old[0])) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} /****************************************************************************** * load_native_dll (internal) @@ -1681,7 +1756,17 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, &size, &len, ViewShare, 0, PAGE_EXECUTE_READ ); - if (status < 0) goto done; + + /* perform base relocation, if necessary */ + + if (status == STATUS_IMAGE_NOT_AT_BASE) + status = perform_relocations( module, len ); + + if (status != STATUS_SUCCESS) + { + if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); + goto done; + } /* create the MODREF */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fe17518..4d4bc3b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1073,7 +1073,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz struct stat st; struct file_view *view = NULL; char *ptr, *header_end, *header_start; - INT_PTR delta = 0; /* zero-map the whole range */ @@ -1236,47 +1235,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } } - - /* perform base relocation, if necessary */ - - if (ptr != base && - ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || - !NtCurrentTeb()->Peb->ImageBaseAddress) ) - { - IMAGE_BASE_RELOCATION *rel, *end; - const IMAGE_DATA_DIRECTORY *relocs; - - if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) - { - WARN_(module)( "Need to relocate module from %p to %p, but there are no relocation records\n", - base, ptr ); - status = STATUS_CONFLICTING_ADDRESSES; - goto error; - } - - TRACE_(module)( "relocating from %p-%p to %p-%p\n", - base, base + total_size, ptr, ptr + total_size ); - - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); - end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - delta = ptr - base; - - while (rel < end - 1 && rel->SizeOfBlock) - { - if (rel->VirtualAddress >= total_size) - { - WARN_(module)( "invalid address %p in relocation %p\n", ptr + rel->VirtualAddress, rel ); - status = STATUS_ACCESS_VIOLATION; - goto error; - } - rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (!rel) goto error; - } - } - /* set the image protections */ VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); @@ -1313,7 +1271,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz *addr_ptr = ptr; #ifdef VALGRIND_LOAD_PDB_DEBUGINFO - VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta); + VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - base); #endif if (ptr != base) return STATUS_IMAGE_NOT_AT_BASE; return STATUS_SUCCESS;

1 0

Dmitry Timoshkov : msi: Avoid using dialog record after free.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 2ad9312f02b86591073532737f8afac20aed8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad9312f02b86591073532737… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 17:40:05 2015 +0800 msi: Avoid using dialog record after free. --- dlls/msi/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5d3527f..a79ce1f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3664,8 +3664,11 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) if (!dialog->default_font) { dialog->default_font = strdupW(dfv); - msiobj_release( &rec->hdr ); - if (!dialog->default_font) return -1; + if (!dialog->default_font) + { + msiobj_release( &rec->hdr ); + return -1; + } } title = msi_get_deformatted_field( dialog->package, rec, 7 );

1 0

Jacek Caban : ieframe: Fixed and improved navigation command state tests.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: cfbc37c699e3b3b27df4c566014e6dde9c7194b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbc37c699e3b3b27df4c5660… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:21 2015 +0200 ieframe: Fixed and improved navigation command state tests. --- dlls/ieframe/navigate.c | 13 +-- dlls/ieframe/tests/webbrowser.c | 219 ++++++++++++++++++++++++---------------- 2 files changed, 132 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfbc37c699e3b3b27df4c…

1 0