January 2016 - Wine-Commits

Alistair Leslie-Hughes : d3d11: Add the Direct3D 11.1 D3D11_FORMAT_SUPPORT enum elements.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: c39c8a367c90d1261ee1857869b3291068fdedd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39c8a367c90d1261ee185786… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 27 20:44:39 2016 +0100 d3d11: Add the Direct3D 11.1 D3D11_FORMAT_SUPPORT enum elements. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index df6ea08..db26229 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1016,7 +1016,11 @@ typedef enum D3D11_FORMAT_SUPPORT D3D11_FORMAT_SUPPORT_SHADER_GATHER = 0x00800000, D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST = 0x01000000, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW = 0x02000000, - D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON = 0x04000000 + D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON = 0x04000000, + D3D11_FORMAT_SUPPORT_DECODER_OUTPUT = 0x08000000, + D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT = 0x10000000, + D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_INPUT = 0x20000000, + D3D11_FORMAT_SUPPORT_VIDEO_ENCODER = 0x40000000, } D3D11_FORMAT_SUPPORT; typedef enum D3D11_CLEAR_FLAG

1 0

Henri Verbeet : wined3d: Require non-NULL rectangles in wined3d_surface_blt().
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 7afeec4bf2908d92be30220871fc70c0b981211f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afeec4bf2908d92be3022087… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:44:38 2016 +0100 wined3d: Require non-NULL rectangles in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 75 +++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7afeec4bf2908d92be302…

1 0

Francois Gouget : shell32/tests: Test handling of nonexistent verbs in ShellExecute() & co.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 2c0daad7865cc778a053090ad75e9b4dd4f0706b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0daad7865cc778a053090ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 15:40:21 2016 +0100 shell32/tests: Test handling of nonexistent verbs in ShellExecute() & co. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3e8c786..a063488 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -976,6 +976,8 @@ static filename_tests_t filename_tests[]= {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, + {"notaverb", "%s\\test file.shlexec", 0x10, SE_ERR_NOASSOC}, + /* Test file masked due to space */ {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */

1 0

Alexandre Julliard : ntdll: Add tests for kernel object names in the various open functions.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 8b2ba27c860da63c503f5d7dee08e2c9c01efd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2ba27c860da63c503f5d7de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 21:24:12 2016 +0900 ntdll: Add tests for kernel object names in the various open functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/sync.c | 11 +- dlls/ntdll/tests/om.c | 449 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/virtual.c | 2 +- 5 files changed, 435 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b2ba27c860da63c503f5…

1 0

Piotr Caban : oleaut32: Update cdguid on data reallocation in WMSFT_compile_custdata.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 17af4fe59255a52beff026d39631fa35378b645e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17af4fe59255a52beff026d39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 27 13:04:19 2016 +0100 oleaut32: Update cdguid on data reallocation in WMSFT_compile_custdata. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2a24b79..af477d5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9280,7 +9280,7 @@ static DWORD WMSFT_compile_custdata(struct list *custdata_list, WMSFT_TLBFile *f { WMSFT_SegContents *cdguids_seg = &file->cdguids_seg; DWORD ret = cdguids_seg->len, offs; - MSFT_CDGuid *cdguid = cdguids_seg->data; + MSFT_CDGuid *cdguid; TLBCustData *cd; if(list_empty(custdata_list)) @@ -9289,8 +9289,10 @@ static DWORD WMSFT_compile_custdata(struct list *custdata_list, WMSFT_TLBFile *f cdguids_seg->len += sizeof(MSFT_CDGuid) * list_count(custdata_list); if(!cdguids_seg->data){ cdguid = cdguids_seg->data = heap_alloc(cdguids_seg->len); - }else + }else { cdguids_seg->data = heap_realloc(cdguids_seg->data, cdguids_seg->len); + cdguid = (MSFT_CDGuid*)((char*)cdguids_seg->data + ret); + } offs = ret + sizeof(MSFT_CDGuid); LIST_FOR_EACH_ENTRY(cd, custdata_list, TLBCustData, entry){

1 0

Nikolay Sivov : dwrite: Return valid metrics for layout created on empty text.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: fbcf15313dad2eef37beda126bf111135d7ceaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcf15313dad2eef37beda126… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 04:17:17 2016 +0300 dwrite: Return valid metrics for layout created on empty text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 130 +++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 25 +-------- 2 files changed, 86 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbcf15313dad2eef37bed…

1 0

Nikolay Sivov : dwrite: Fix parameter validation in CreateTextLayout()/ CreateGdiCompatibleTextLayout().
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 8485fa64ca1377a9527134bc2143fa8998576a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8485fa64ca1377a9527134bc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 04:17:15 2016 +0300 dwrite: Fix parameter validation in CreateTextLayout()/CreateGdiCompatibleTextLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 6 ++++++ dlls/dwrite/main.c | 3 +-- dlls/dwrite/tests/layout.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9fd4baf..620d389 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4282,6 +4282,9 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma *ret = NULL; + if (!format || !str) + return E_INVALIDARG; + layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; @@ -4300,6 +4303,9 @@ HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFor *ret = NULL; + if (!format || !str) + return E_INVALIDARG; + layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 02b353c..a981d34 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1045,9 +1045,9 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); + TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); - if (!format) return E_INVALIDARG; return create_textlayout(string, len, format, max_width, max_height, layout); } @@ -1060,7 +1060,6 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory TRACE("(%p)->(%s:%u %p %f %f %f %p %d %p)\n", This, debugstr_wn(string, len), len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); - if (!format) return E_INVALIDARG; return create_gdicompat_textlayout(string, len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b623414..dd0f785 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -728,25 +728,44 @@ static void test_CreateTextLayout(void) factory = create_factory(); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 0.0, 0.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1.0, 0.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 0.0, 1.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); + layout = (void*)0xdeadbeef; + hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, format, 100.0f, 100.0f, &layout); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 0.0f, 0.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + EXPECT_REF(format, 1); hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -823,20 +842,30 @@ static void test_CreateGdiCompatibleTextLayout(void) factory = create_factory(); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1.0, 0.0, 0.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1.0, 0.0, 1.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, 1.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); /* create with text format */ hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, @@ -844,6 +873,11 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(format, 1); + layout = (void*)0xdeadbeef; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, format, 100.0f, 100.0f, 1.0f, NULL, FALSE, &layout); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(layout == NULL, "got %p\n", layout); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(format, 1);

1 0

Riccardo Bortolato : d3d9: Implement d3d9_device_UpdateSurface() on top of wined3d_device_copy_sub_resource_region().
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 39549a54fcd831aed616a22cc26fa4a7aaaacdaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=39549a54fcd831aed616a22cc… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Jan 27 20:44:40 2016 +0100 d3d9: Implement d3d9_device_UpdateSurface() on top of wined3d_device_copy_sub_resource_region(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 20 ++++++++++++++++++-- dlls/d3d9/tests/device.c | 2 +- dlls/wined3d/device.c | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6047a2c..3b1c859 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1227,16 +1227,32 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_box src_box; HRESULT hr; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", iface, src_surface, src_rect, dst_surface, dst_point); + if (src_rect) + { + src_box.left = src_rect->left; + src_box.top = src_rect->top; + src_box.right = src_rect->right; + src_box.bottom = src_rect->bottom; + src_box.front = 0; + src_box.back = 1; + } + wined3d_mutex_lock(); - hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect, - dst->wined3d_surface, dst_point); + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, + wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, + dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), + src->sub_resource_idx, src_rect ? &src_box : NULL); wined3d_mutex_unlock(); + if (FAILED(hr)) + return D3DERR_INVALIDCALL; + return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ed5f731..39789a8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10163,7 +10163,7 @@ static void test_mipmap_lock(void) hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, surface_dst, NULL); ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface_dst2, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Apparently there's no validation on the container. */ hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 97586f4..177d008 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4027,7 +4027,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top); if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, hr %#x.\n", hr); + WARN("Failed to blit, hr %#x.\n", hr); return hr; }

1 0

Nikolay Sivov : d2d1: Use drawing effect for underlines.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: ec1957c359d7bd96aa996d9689587d974b59e06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1957c359d7bd96aa996d968… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 23:34:00 2016 +0300 d2d1: Use drawing effect for underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7cfbdfa..8353c09 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1679,6 +1679,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; float min_thickness; + ID2D1Brush *brush; D2D1_RECT_F rect; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", @@ -1692,7 +1693,12 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend rect.right = baseline_origin_x + underline->width; rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); - ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, context->brush); + brush = d2d_draw_get_text_brush(context, effect); + + ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush); + + ID2D1Brush_Release(brush); + return S_OK; }

1 0

Alexandre Julliard : wine.inf: Fix the wordpad.exe path in associations.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 41cb62acd902dd81c75b22edb1645edddea14a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cb62acd902dd81c75b22edb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 21:23:02 2016 +0900 wine.inf: Fix the wordpad.exe path in associations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7178140..5d33d17 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -218,13 +218,13 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,rtffile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,rtffile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,wrifile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,wrifile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"

1 0