July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: ca126c069fcbf388acac0326d18ea3fb6343bb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca126c069fcbf388acac0326d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:09:26 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette. --- dlls/windowscodecs/palette.c | 22 ++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 03f5774a..9d3b8ee 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -115,6 +115,23 @@ static WICColor *generate_gray16_palette(UINT *count) return entries; } +static WICColor *generate_gray256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i<<16) | (i<<8) | i; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -149,6 +166,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedGray256: + colors = generate_gray256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index aba8168..ef21307 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -162,6 +162,19 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } +static void generate_gray256_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i << 16) | (i << 8) | i; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -176,6 +189,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray4, 0, 1, 4, { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, + { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -228,6 +242,8 @@ static void test_predefined_palette(void) if (td[i].type == WICBitmapPaletteTypeFixedGray16) generate_gray16_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedGray256) + generate_gray256_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 63cb0cf6d2ff856bf36066c6d970a8072a444c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63cb0cf6d2ff856bf36066c6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:10:27 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 9d3b8ee..9280aa1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,33 @@ static WICColor *generate_gray256_palette(UINT *count) return entries; } +static WICColor *generate_halftone8_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 16; + entries = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -171,6 +199,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone8: + colors = generate_halftone8_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index ef21307..e92c871 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -175,6 +176,29 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } +static void generate_halftone8_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 16); + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -190,6 +214,7 @@ static void test_predefined_palette(void) { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -244,6 +269,8 @@ static void test_predefined_palette(void) generate_gray16_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedGray256) generate_gray256_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) + generate_halftone8_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone64 palette.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 011d23c535d67877e986d52810253554e616c103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011d23c535d67877e986d5281… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:11:51 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone64 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 9280aa1..a024cd1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -160,6 +160,34 @@ static WICColor *generate_halftone8_palette(UINT *count) return entries; } +static WICColor *generate_halftone64_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 72; + entries = HeapAlloc(GetProcessHeap(), 0, 72 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 64; i++) + { + static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%4]; + entries[i] |= halftone_values[(i/4)%4] << 8; + entries[i] |= halftone_values[(i/16)%4] << 16; + } + + for (i = 64; i < 72; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-64]; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -204,6 +232,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone64: + colors = generate_halftone64_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e92c871..e97ffc6 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -199,6 +199,30 @@ static void generate_halftone8_palette(DWORD *entries, UINT count) } } +static void generate_halftone64_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; + UINT i; + + assert(count == 72); + + for (i = 0; i < 64; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%4]; + entries[i] |= halftone_values[(i/4)%4] << 8; + entries[i] |= halftone_values[(i/16)%4] << 16; + } + + for (i = 64; i < 72; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-64]; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -215,6 +239,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -271,6 +296,8 @@ static void test_predefined_palette(void) generate_gray256_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) generate_halftone8_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) + generate_halftone64_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Henri Verbeet : d3d10core: Always create a wined3d texture for d3d10core textures.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 2b4c72b13b668d38929b1978ab4f6f0c224b4071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4c72b13b668d38929b1978a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:21 2012 +0200 d3d10core: Always create a wined3d texture for d3d10core textures. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 48 +++++++++++------------------------ dlls/d3d10core/texture.c | 36 ++++++++++++-------------- dlls/d3d10core/view.c | 2 +- dlls/dxgi/device.c | 7 +++-- dlls/wined3d/surface.c | 5 +++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 8 files changed, 45 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4c72b13b668d38929b1…

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_Unmap().
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 21a7b18311e6423ccccfcd8f3f17950000be1206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a7b18311e6423ccccfcd8f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:22 2012 +0200 d3d10core: Implement d3d10_texture2d_Unmap(). --- dlls/d3d10core/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 1126e87..5908cd0 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -159,9 +159,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN return E_NOTIMPL; } -static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource) +static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource_idx) { - FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_resource *sub_resource; + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + return; + + wined3d_surface_unmap(wined3d_surface_from_resource(sub_resource)); } static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc)

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_Map().
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 7e2999e70f90144cc9147823de917de3f2ddbf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2999e70f90144cc9147823d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:23 2012 +0200 d3d10core: Implement d3d10_texture2d_Map(). --- dlls/d3d10core/texture.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 5908cd0..718d019 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -150,13 +150,32 @@ static UINT STDMETHODCALLTYPE d3d10_texture2d_GetEvictionPriority(ID3D10Texture2 /* ID3D10Texture2D methods */ -static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource, +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE2D *mapped_texture) { - FIXME("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p stub!\n", - iface, sub_resource, map_type, map_flags, mapped_texture); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_resource *sub_resource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", + iface, sub_resource_idx, map_type, map_flags, mapped_texture); + + if (map_type != D3D10_MAP_READ_WRITE) + FIXME("Ignoring map_type %#x.\n", map_type); + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = wined3d_surface_map(wined3d_surface_from_resource(sub_resource), + &wined3d_map_desc, NULL, 0))) + { + mapped_texture->pData = wined3d_map_desc.data; + mapped_texture->RowPitch = wined3d_map_desc.row_pitch; + } + + return hr; } static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource_idx)

1 0

Jacek Caban : mshtml: Create inner window early in binding process and use it to store current binding callback .
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 25c5082f90e181beb83258ed7d8542822220233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c5082f90e181beb83258ed7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 12 14:25:43 2012 +0200 mshtml: Create inner window early in binding process and use it to store current binding callback. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlwindow.c | 114 ++++++++++++++++++++++++++---------------- dlls/mshtml/mshtml_private.h | 9 ++-- dlls/mshtml/navigate.c | 79 ++++++++++++----------------- dlls/mshtml/nsio.c | 7 ++- dlls/mshtml/persist.c | 10 ++-- 6 files changed, 120 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25c5082f90e181beb8325…

1 0

Jacek Caban : mshtml: Use per-inner window task_magic for binding.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: bbaa307fdf9904aa90ff870079d508f0ebb1c564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbaa307fdf9904aa90ff87007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 12 14:25:58 2012 +0200 mshtml: Use per-inner window task_magic for binding. --- dlls/mshtml/htmlwindow.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/navigate.c | 9 ++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0ced93d..491a453 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -235,6 +235,7 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); + remove_target_tasks(This->task_magic); abort_window_bindings(This); release_script_hosts(This); @@ -2622,6 +2623,8 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); + window->task_magic = get_task_target_magic(); + *ret = window; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f0dde6c..430b744 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -361,6 +361,8 @@ struct HTMLInnerWindow { DWORD global_prop_cnt; DWORD global_prop_size; + LONG task_magic; + nsChannelBSC *bscallback; struct list bindings; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1fe4f9d..bfc8671 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1325,7 +1325,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, stop_request_task_destr, This->window->doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic); return S_OK; } @@ -1679,7 +1679,7 @@ HRESULT async_start_doc_binding(HTMLOuterWindow *window, HTMLInnerWindow *pendin task->pending_window = pending_window; IHTMLWindow2_AddRef(&pending_window->base.IHTMLWindow2_iface); - push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, window->task_magic); + push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic); return S_OK; } @@ -1687,6 +1687,8 @@ void abort_window_bindings(HTMLInnerWindow *window) { BSCallback *iter; + remove_target_tasks(window->task_magic); + while(!list_empty(&window->bindings)) { iter = LIST_ENTRY(window->bindings.next, BSCallback, entry); @@ -1694,9 +1696,6 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_AddRef(&iter->IBindStatusCallback_iface); - if(iter->window && iter->window->doc) - remove_target_tasks(iter->window->doc->basedoc.task_magic); - if(iter->binding) IBinding_Abort(iter->binding); else

1 0

Jacek Caban : mshtml: Don't store outer window in nsChannelBSC.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 5fecc4896f81d4b373125c392e4e17faaa27e070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fecc4896f81d4b373125c392… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 12 14:26:13 2012 +0200 mshtml: Don't store outer window in nsChannelBSC. --- dlls/mshtml/binding.h | 5 +-- dlls/mshtml/htmlwindow.c | 2 - dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 60 ++++++++++++++++++++++------------------- dlls/mshtml/nsio.c | 4 +- dlls/mshtml/persist.c | 4 +- 6 files changed, 39 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fecc4896f81d4b373125…

1 0

Matteo Bruni : d3dcompiler: Add hlsl_report_message function to standardize error messages.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 632703d8cfdaefc9dffeb124970e28d20471a535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632703d8cfdaefc9dffeb1249… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:32 2012 +0200 d3dcompiler: Add hlsl_report_message function to standardize error messages. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 9 +++++ dlls/d3dcompiler_43/hlsl.y | 55 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index ccac936..aa02eb9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -840,7 +840,16 @@ struct hlsl_parse_ctx extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; +enum hlsl_error_level +{ + HLSL_LEVEL_ERROR = 0, + HLSL_LEVEL_WARNING, + HLSL_LEVEL_NOTE, +}; + void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +void hlsl_report_message(const char *filename, DWORD line, DWORD column, + enum hlsl_error_level level, const char *fmt, ...) PRINTF_ATTR(5,6) DECLSPEC_HIDDEN; static inline struct hlsl_ir_deref *deref_from_node(const struct hlsl_ir_node *node) { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 03aa4eb..240eaaf 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -41,10 +41,61 @@ void hlsl_message(const char *fmt, ...) va_end(args); } +static const char *hlsl_get_error_level_name(enum hlsl_error_level level) +{ + const char *names[] = + { + "error", + "warning", + "note", + }; + return names[level]; +} + +void hlsl_report_message(const char *filename, DWORD line, DWORD column, + enum hlsl_error_level level, const char *fmt, ...) +{ + va_list args; + char *string = NULL; + int rc, size = 0; + + while (1) + { + va_start(args, fmt); + rc = vsnprintf(string, size, fmt, args); + va_end(args); + + if (rc >= 0 && rc < size) + break; + + if (rc >= size) + size = rc + 1; + else + size = size ? size * 2 : 32; + + if (!string) + string = d3dcompiler_alloc(size); + else + string = d3dcompiler_realloc(string, size); + if (!string) + { + ERR("Error reallocating memory for a string.\n"); + return; + } + } + + hlsl_message("%s:%u:%u: %s: %s\n", filename, line, column, hlsl_get_error_level_name(level), string); + d3dcompiler_free(string); + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + static void hlsl_error(const char *s) { - hlsl_message("Line %u: %s\n", hlsl_ctx.line_no, s); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, 1, HLSL_LEVEL_ERROR, "%s", s); } static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no)

1 0