August 2014 - Wine-commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Always allow only one correct test result, add todo_wine where necessary.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 8f9df3afde238397ebe29bbe6441f804f19cb2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9df3afde238397ebe29bbe6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 30 18:00:19 2014 +0200 kernel32/tests: Always allow only one correct test result, add todo_wine where necessary. --- dlls/kernel32/tests/pipe.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1cdc2ee..bdac564 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -153,20 +153,13 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - if (readden != sizeof(obuf)) /* Linux only returns the first message */ - ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); } else { - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); } - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n"); if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { @@ -188,21 +181,13 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - if (readden != sizeof(obuf)) /* Linux only returns the first message */ - /* should return all 23 bytes */ - ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); } else { - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); } - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n"); if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { @@ -241,14 +226,8 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); - else - todo_wine ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); @@ -277,12 +256,8 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n"); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");

1 0

Erich E. Hoover : dwmapi: Add stub for DwmInvalidateIconicBitmaps.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: cf4404cfbb00cb8fa8a7031d7eee4c1dea2d954c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4404cfbb00cb8fa8a7031d7… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Aug 9 16:30:53 2014 -0600 dwmapi: Add stub for DwmInvalidateIconicBitmaps. --- dlls/dwmapi/dwmapi.spec | 1 + dlls/dwmapi/dwmapi_main.c | 12 ++++++++++++ include/dwmapi.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 5f74970..764f04c 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -33,6 +33,7 @@ @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stdcall DwmGetWindowAttribute(ptr long ptr long) +@ stdcall DwmInvalidateIconicBitmaps(ptr) @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8cc46f0..6ee45af 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -108,6 +108,18 @@ HRESULT WINAPI DwmFlush(void) } /********************************************************************** + * DwmInvalidateIconicBitmaps (DWMAPI.@) + */ +HRESULT WINAPI DwmInvalidateIconicBitmaps(HWND hwnd) +{ + static BOOL once; + + if (!once++) FIXME("(%p) stub\n", hwnd); + + return E_NOTIMPL; +} + +/********************************************************************** * DwmSetWindowAttribute (DWMAPI.@) */ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) diff --git a/include/dwmapi.h b/include/dwmapi.h index f85999a..db13b5f 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -116,6 +116,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD);

1 0

André Hentschel : wpcap: Implement pcap_findalldevs_ex.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: e141ecf89de094f16bc37d6a11fa0505dc5ff6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e141ecf89de094f16bc37d6a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:04:46 2014 +0200 wpcap: Implement pcap_findalldevs_ex. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 90b0647a..da545a8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -116,6 +116,12 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) return ret; } +int CDECL wine_pcap_findalldevs_ex(char *source, void *auth, pcap_if_t **alldevs, char *errbuf) +{ + FIXME("(%s %p %p %p): partial stub\n", debugstr_a(source), auth, alldevs, errbuf); + return wine_pcap_findalldevs(alldevs, errbuf); +} + void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) { TRACE("(%p)\n", alldevs); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 540089d..c7d2cd1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -25,7 +25,7 @@ @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -@ stub pcap_findalldevs_ex +@ cdecl pcap_findalldevs_ex(ptr ptr ptr ptr) wine_pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ cdecl pcap_freecode(ptr) wine_pcap_freecode @ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle

1 0

André Hentschel : wpcap: Add version resource.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 3a372f26e9c35d1edab4cdb58a97e57cae373e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a372f26e9c35d1edab4cdb58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:05:10 2014 +0200 wpcap: Add version resource. --- dlls/wpcap/Makefile.in | 2 ++ dlls/wpcap/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 5caffbc..e44613f 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -4,3 +4,5 @@ EXTRALIBS = @LIBPCAP@ C_SRCS = \ wpcap.c + +RC_SRCS = version.rc diff --git a/dlls/wpcap/version.rc b/dlls/wpcap/version.rc new file mode 100644 index 0000000..d60cec4 --- /dev/null +++ b/dlls/wpcap/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "wpcap.dll Dynamic Link Library - based on libpcap 1.0" +#define WINE_FILENAME_STR "wpcap.dll" +#define WINE_FILEVERSION 4,1,0,2980 +#define WINE_FILEVERSION_STR "4.1.0.2980" +#define WINE_PRODUCTVERSION 4,1,0,2980 +#define WINE_PRODUCTVERSION_STR "4.1.0.2980" + +#include "wine/wine_common_ver.rc"

1 0

Jactry Zeng : riched20: Pass count of character into ME_WordBreakProc() instead of count of byte.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 063b3bc9dbe359611bbe4bc39245649a9576ef8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=063b3bc9dbe359611bbe4bc39… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Aug 20 16:11:52 2014 +0800 riched20: Pass count of character into ME_WordBreakProc() instead of count of byte. --- dlls/riched20/string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 12e4ad7..44726b3 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -125,8 +125,7 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); - /* convert number of bytes to number of characters. */ - len /= sizeof(WCHAR); + switch (code) { case WB_ISDELIMITER: @@ -154,7 +153,7 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len, code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */

1 0

Gerald Pfeifer : cmd: Remove fslashW.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 51d217e6df3f112e8b1fd62356a0a3687d231f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d217e6df3f112e8b1fd6235… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:18:38 2014 +0200 cmd: Remove fslashW. --- programs/cmd/builtins.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cb7dfef..f7db4a9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -100,7 +100,6 @@ static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; -static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'};

1 0

Gerald Pfeifer : uninstaller: Remove BackSlashW.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 1f140313348e1227afc70057f5a9e7f9ca810b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f140313348e1227afc70057f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:20:37 2014 +0200 uninstaller: Remove BackSlashW. --- programs/uninstaller/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 0a60c93..6b16e5d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -49,7 +49,6 @@ static int FetchUninstallInformation(void); static void UninstallProgram(void); static int cmp_by_name(const void *a, const void *b); -static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\',

1 0

Gerald Pfeifer : winex11.drv: Remove colour_is_brighter.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: fe79e62a9f38316af8a78af3eb42a782ffb8eda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe79e62a9f38316af8a78af3e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:23:03 2014 +0200 winex11.drv: Remove colour_is_brighter. --- dlls/winex11.drv/palette.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cd90885..cf049c5 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -782,12 +782,6 @@ static int X11DRV_SysPaletteLookupPixel( COLORREF col, BOOL skipReserved ) } -static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) -{ - return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) > - (c2.rgbRed * c2.rgbRed + c2.rgbGreen * c2.rgbGreen + c2.rgbBlue * c2.rgbBlue); -} - /*********************************************************************** * X11DRV_PALETTE_GetColor *

1 0

Gerald Pfeifer : winex11.drv: Remove wxr_color_shifts.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: b0e508a9d3475a0231267b33d7206629dadb9fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e508a9d3475a0231267b33d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:16:34 2014 +0200 winex11.drv: Remove wxr_color_shifts. --- dlls/winex11.drv/xrender.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ca2d3da..d2a1c45 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -102,23 +102,6 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; -static const ColorShifts wxr_color_shifts[WXR_NB_FORMATS] = -{ - /* format phys red phys green phys blue log red log green log blue */ -/* WXR_FORMAT_MONO */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_GRAY */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_X1R5G5B5 */ { {10,5,31}, { 5,5,31}, { 0,5,31}, {10,5,31}, { 5,5,31}, { 0,5,31} }, -/* WXR_FORMAT_X1B5G5R5 */ { { 0,5,31}, { 5,5,31}, {10,5,31}, { 0,5,31}, { 5,5,31}, {10,5,31} }, -/* WXR_FORMAT_R5G6B5 */ { {11,5,31}, { 5,6,63}, { 0,5,31}, {11,5,31}, { 5,6,63}, { 0,5,31} }, -/* WXR_FORMAT_B5G6R5 */ { { 0,5,31}, { 5,6,63}, {11,5,31}, { 0,5,31}, { 5,6,63}, {11,5,31} }, -/* WXR_FORMAT_R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8 */ { { 0,8,255}, { 8,8,255}, {16,8,255}, { 0,8,255}, { 8,8,255}, {16,8,255} }, -/* WXR_FORMAT_A8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8A8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -/* WXR_FORMAT_X8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8X8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -}; - static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */];

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to upload_palette().
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 3a160432f801b4528b0d5e8d3e9446cfc0093347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a160432f801b4528b0d5e8d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:51 2014 +0200 wined3d: Pass a texture instead of a surface to upload_palette(). --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d6214a..3d3816f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7278,10 +7278,10 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_texture *texture, struct wined3d_context *context) { - const struct wined3d_palette *palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL; - struct wined3d_device *device = surface->resource.device; + const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; @@ -7538,7 +7538,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(surface, context); + upload_palette(surface->container, context); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");

1 0