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

Dmitry Timoshkov : gdiplus: Add missing 'break'.
by Alexandre Julliard July 26, 2012

July 26, 2012

Module: wine Branch: master Commit: 9697829511b91b0207bada9284ca25a3e7f3f9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9697829511b91b0207bada928… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 26 11:29:25 2012 +0900 gdiplus: Add missing 'break'. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c20eee5..9972f40 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3578,6 +3578,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); gdipformat = bitmap->format; + break; } } if (!gdipformat)

1 0

Michael Stefaniuc : mlang/tests: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard July 26, 2012

July 26, 2012

Module: wine Branch: master Commit: 3a51439fc9036729ebc4b45d146985c9a05263c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a51439fc9036729ebc4b45d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 26 11:23:34 2012 +0200 mlang/tests: Simplify the "pointer to start of array" idiom. --- dlls/mlang/tests/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7ff4ec3..91463f9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -677,7 +677,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) n = 0; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - cpinfo_cmp(&cpinfo[0], &cpinfo2); + cpinfo_cmp(cpinfo, &cpinfo2); if (0) { @@ -782,7 +782,7 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) n = 0; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - scriptinfo_cmp(&sinfo[0], &sinfo2); + scriptinfo_cmp(sinfo, &sinfo2); if (0) { @@ -861,7 +861,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) dwCodePages = 0; processed = 0; - ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); ok(processed == 1, "expected 1, got %d\n", processed);

1 0

Alexandre Julliard : msvcr90/tests: Fix tests for errno values.
by Alexandre Julliard July 26, 2012

July 26, 2012

Module: wine Branch: master Commit: 9e76bcf33151410da9460dbd2b3fc9d5e7efccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e76bcf33151410da9460dbd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:06:37 2012 +0200 msvcr90/tests: Fix tests for errno values. --- dlls/msvcr90/tests/msvcr90.c | 94 ++++++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e76bcf33151410da9460…

1 0

Lucas Zawacki : Portuguese translation for release 1.5.9
by Jeremy Newman July 26, 2012

July 26, 2012

Module: website Branch: master Commit: 56e0cd8f43d85e57098abd9cac5e68cb5ce7b686 URL: http://source.winehq.org/git/website.git/?a=commit;h=56e0cd8f43d85e57098abd… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Jul 24 16:04:37 2012 -0300 Portuguese translation for release 1.5.9 --- news/pt/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012071701.xml b/news/pt/2012071701.xml new file mode 100644 index 0000000..7fd6938 --- /dev/null +++ b/news/pt/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>17 de Julho de 2012</date> +<title>Wine 1.5.9 lançado</title> +<body> +<p> A versão de desenvolvmento 1.5.9 já está disponível.</p> +<p> <a href="{$root}/announce/1.5.9">Novidades</a> nesta versão: +<ul> + <li>Suporte a tabelas GPOS de fontes no Uniscribe.</li> + <li>Suporte ao XRandr 1.2 e 1.3.</li> + <li>Melhoras no parser do compilador HLSL.</li> + <li>Mais algoritmos de troca de chaves suportados no Mac OS.</li> + <li>Relay tracing na arquitetura ARM.</li> + <li>Várias correções de bugs.</li> +</ul></p> +<p><p>O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</p></body></news>

1 0

Alexandre Julliard : patches: Avoid deadlocks when uncompressing large patches.
by Alexandre Julliard July 26, 2012

July 26, 2012

Module: tools Branch: master Commit: 4a01b75984f9120fe7b87881311b79f9c8b17d4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=4a01b75984f9120fe7b87881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 14:31:20 2012 +0200 patches: Avoid deadlocks when uncompressing large patches. --- patches/filter | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/filter b/patches/filter index bed4dca..dbdb9ec 100755 --- a/patches/filter +++ b/patches/filter @@ -20,7 +20,7 @@ use strict; use Email::MIME; -use IPC::Open2; +use File::Temp; use Encode; my $debug = 0; @@ -127,16 +127,18 @@ sub decode_parts(@) $name =~ /\.bz2$/ || $name =~ /\.gz$/) { - my $cmd = "gunzip -c"; + my ($file, $filename) = File::Temp::tempfile(); + my $cmd = "gunzip -c >$filename"; if ($type =~ /^application\/x-bzip2/ || $name =~ /\.bz2$/) { - $cmd = "bunzip2 -c"; + $cmd = "bunzip2 -c >$filename"; } - open2( *READ, *WRITE, $cmd) or die "cannot run $cmd"; + open WRITE, "|$cmd" or die "cannot run $cmd"; print WRITE $part->body; close WRITE; - push @lines, filter_patch(<READ>); - close READ; + push @lines, filter_patch(<$file>); + close $file; + unlink $filename; } elsif ($type =~ /^multipart/) {

1 0

Dmitry Timoshkov : gdiplus: Retrieve image palette from WIC.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: dce93479ea26c3317a362be93d9f523b9b563e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce93479ea26c3317a362be93… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:24:58 2012 +0900 gdiplus: Retrieve image palette from WIC. --- dlls/gdiplus/image.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a5b560d..111bafd 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Google (Evan Stade) + * Copyright (C) 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 @@ -41,6 +42,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) +static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + ColorPalette *palette = NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) return NULL; + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + if (hr == S_OK) + { + hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + if (hr == S_OK) + { + UINT count; + BOOL mono, gray; + + IWICPalette_IsBlackWhite(wic_palette, &mono); + IWICPalette_IsGrayscale(wic_palette, &gray); + + IWICPalette_GetColorCount(wic_palette, &count); + palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); + IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); + + if (mono) + palette->Flags = 0; + else if (gray) + palette->Flags = PaletteFlagsGrayScale; + else + palette->Flags = PaletteFlagsHalftone; + } + IWICPalette_Release(wic_palette); + } + IWICImagingFactory_Release(factory); + return palette; +} + static INT ipicture_pixel_height(IPicture *pic) { HDC hdcref; @@ -2994,6 +3035,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader *block_reader; WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; + ColorPalette *palette = NULL; int i; UINT width, height, frame_count; BitmapData lockeddata; @@ -3102,6 +3144,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader_Release(block_reader); } + palette = get_palette(frame); IWICBitmapFrameDecode_Release(frame); } @@ -3119,8 +3162,16 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; - if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) - bitmap->image.palette->Flags = 0; + if (palette) + { + GdipFree(bitmap->image.palette); + bitmap->image.palette = palette; + } + else + { + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) + bitmap->image.palette->Flags = 0; + } /* Pin the source stream */ IStream_AddRef(stream); }

1 0

Jacek Caban : mshtml: Added runtimeStyle tests.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 140cd1b9145f3de57c329422b14c976e0ebbf9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=140cd1b9145f3de57c329422b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 15:16:29 2012 +0200 mshtml: Added runtimeStyle tests. --- dlls/mshtml/tests/style.c | 113 +++++++++++++++++++++++++++++++++------------ 1 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 262c4d1..b44950c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -255,6 +255,33 @@ static void _test_style_remove_attribute(unsigned line, IHTMLStyle *style, const ok_(__FILE__,line)(b == exb, "removeAttribute returned %x, expected %x\n", b, exb); } +#define set_text_decoration(a,b) _set_text_decoration(__LINE__,a,b) +static void _set_text_decoration(unsigned line, IHTMLStyle *style, const char *v) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(v); + hres = IHTMLStyle_put_textDecoration(style, str); + ok_(__FILE__,line)(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); +} + +#define test_text_decoration(a,b) _test_text_decoration(__LINE__,a,b) +static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char *exdec) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + if(exdec) + ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); + else + ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -738,35 +765,15 @@ static void test_body_style(IHTMLStyle *style) ok(hres == E_INVALIDARG, "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - str = a2bstr("none"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("underline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("overline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("line-through"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("blink"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - ok(!strcmp_wa(str, "blink"), "str != blink\n"); - SysFreeString(str); + set_text_decoration(style, "none"); + test_text_decoration(style, "none"); + set_text_decoration(style, "underline"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "line-through"); + set_text_decoration(style, "blink"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "blink"); + test_text_decoration(style, "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -2335,6 +2342,53 @@ static void basic_style_test(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +static const char runtimestyle_test_str[] = + "<html><head><style>body {text-decoration: auto}</style></head><body></body></html>"; + +static void runtimestyle_test(IHTMLDocument2 *doc) +{ + IHTMLStyle *style, *runtime_style; + IHTMLElement2 *elem2; + IHTMLElement *elem; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + elem2 = get_elem2_iface((IUnknown*)elem); + + hres = IHTMLElement2_get_runtimeStyle(elem2, &runtime_style); + ok(hres == S_OK, "get_runtimeStyle failed: %08x\n", hres); + + hres = IHTMLElement_get_style(elem, &style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + test_text_decoration(style, NULL); + test_text_decoration(runtime_style, NULL); + set_text_decoration(style, "underline"); + test_text_decoration(style, "underline"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(broken(!str) || !strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + set_text_decoration(runtime_style, "blink"); + test_text_decoration(runtime_style, "blink"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + todo_wine + ok(!strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLStyle_Release(runtime_style); + IHTMLStyle_Release(style); + IHTMLElement2_Release(elem2); + IHTMLElement_Release(elem); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -2495,6 +2549,7 @@ START_TEST(style) CoInitialize(NULL); run_test(basic_test_str, basic_style_test); + run_test(runtimestyle_test_str, runtimestyle_test); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: get_runtimeStyle hackish implementation.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 9ccc5f487b844b55bf714c22e74f84babf21c752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccc5f487b844b55bf714c22e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 14:47:13 2012 +0200 mshtml: Added IHTMLElement2::get_runtimeStyle hackish implementation. --- dlls/mshtml/htmlelem.c | 4 ++++ dlls/mshtml/htmlelem2.c | 20 ++++++++++++++++++-- dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5c38ebb..02551db 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1563,6 +1563,10 @@ void HTMLElement_destructor(HTMLDOMNode *iface) This->style->elem = NULL; IHTMLStyle_Release(&This->style->IHTMLStyle_iface); } + if(This->runtime_style) { + This->runtime_style->elem = NULL; + IHTMLStyle_Release(&This->runtime_style->IHTMLStyle_iface); + } if(This->attrs) { HTMLDOMAttribute *attr; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 4550681..e2e5c13 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlstyle.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1188,8 +1189,23 @@ static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, LONG coo static HRESULT WINAPI HTMLElement2_get_runtimeStyle(IHTMLElement2 *iface, IHTMLStyle **p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p): hack\n", This, p); + + /* We can't implement correct behavior on top of Gecko (although we could + try a bit harder). Making runtimeStyle behave like regular style is + enough for most use cases. */ + if(!This->runtime_style) { + HRESULT hres; + + hres = HTMLStyle_Create(This, &This->runtime_style); + if(FAILED(hres)) + return hres; + } + + *p = &This->runtime_style->IHTMLStyle_iface; + IHTMLStyle_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_behaviorUrns(IHTMLElement2 *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3d67402..1e068b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -721,6 +721,7 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + assert(!This->elem); if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); release_dispex(&This->dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index abc9794..91cbbfe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -634,6 +634,7 @@ typedef struct { nsIDOMHTMLElement *nselem; HTMLStyle *style; + HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; } HTMLElement;

1 0

Dmitry Timoshkov : gdiplus: Add 8bppIndexed to the list of supported formats.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 45cdafc5e8bd813ea4ddf93913b1deef53119183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cdafc5e8bd813ea4ddf9391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:25:54 2012 +0900 gdiplus: Add 8bppIndexed to the list of supported formats. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 111bafd..81fa16b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3006,6 +3006,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * static const WICPixelFormatGUID * const wic_pixel_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, @@ -3017,6 +3018,7 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = { static const PixelFormat wic_gdip_formats[] = { PixelFormat1bppIndexed, PixelFormat1bppIndexed, + PixelFormat8bppIndexed, PixelFormat16bppRGB555, PixelFormat24bppRGB, PixelFormat32bppRGB,

1 0

Henri Verbeet : wined3d: Call core GL functions through gl_info. gl_ops as well.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 894d1618912367be91594fe213f9db09f88f8768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894d1618912367be91594fe21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:27 2012 +0200 wined3d: Call core GL functions through gl_info.gl_ops as well. --- dlls/wined3d/arb_program_shader.c | 99 ++-- dlls/wined3d/ati_fragment_shader.c | 11 +- dlls/wined3d/buffer.c | 15 +- dlls/wined3d/context.c | 160 ++-- dlls/wined3d/device.c | 89 ++- dlls/wined3d/directx.c | 181 +++--- dlls/wined3d/drawprim.c | 161 ++-- dlls/wined3d/gl_compat.c | 84 +- dlls/wined3d/nvidia_texture_shader.c | 41 +- dlls/wined3d/state.c | 1436 ++++++++++++++++++---------------- dlls/wined3d/surface.c | 435 ++++++----- dlls/wined3d/swapchain.c | 49 +- dlls/wined3d/texture.c | 52 +- dlls/wined3d/utils.c | 267 ++++--- dlls/wined3d/wined3d_gl.h | 692 ---------------- dlls/wined3d/wined3d_private.h | 9 +- 16 files changed, 1622 insertions(+), 2159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=894d1618912367be91594…

1 0