November 2008 - Wine-commits

Henri Verbeet : wined3d: Const correctness fixes for utils.c.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: eb78c2a0822039a34959f8d4571492a1646a1da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb78c2a0822039a34959f8d45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:08 2008 +0100 wined3d: Const correctness fixes for utils.c. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++++---------- dlls/wined3d/ati_fragment_shader.c | 22 ++++++++++++---------- dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/utils.c | 30 ++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 5 files changed, 57 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb78c2a0822039a34959f…

1 0

Henri Verbeet : wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: cfb3bea895c58bd541797788668260c0b7d46d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb3bea895c58bd5417977886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const. --- dlls/wined3d/arb_program_shader.c | 110 +++++++++++++--------- dlls/wined3d/glsl_shader.c | 186 +++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 180 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb3bea895c58bd541797…

1 0

Alexandre Julliard : winetest: Add expiration of winetest. exe builds after 6 months.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: tools Branch: master Commit: a4fdd65143c223aea88c5a947e2b4d442ed452f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a4fdd65143c223aea88c5a94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 15:39:14 2008 +0100 winetest: Add expiration of winetest.exe builds after 6 months. --- winetest/winetest.cron | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 09edd1a..e0aa806 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -19,5 +19,7 @@ if [ ! -f $lock ]; then do tar cfj $i.tar.bz2 $i && rm -rf $i done) + # remove 6-month old test builds + (cd builds && find . -mtime +180 -name winetest\*.exe -print0 | xargs -0 rm -f) rm $lock fi

1 0

Alexandre Julliard : winetest: Add script to build winetest. exe from a cron job.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: tools Branch: master Commit: 607991e304d5487b10663b83b52fca4f6445920e URL: http://source.winehq.org/git/tools.git/?a=commit;h=607991e304d5487b10663b83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 15:42:25 2008 +0100 winetest: Add script to build winetest.exe from a cron job. --- winetest/make-winetest | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest new file mode 100755 index 0000000..d2b155a --- /dev/null +++ b/winetest/make-winetest @@ -0,0 +1,111 @@ +#!/bin/sh +# +# Script to build the published winetest.exe on winehq.org. +# This should normally be run from a cron job. +# +# Copyright 2008 Alexandre Julliard +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# + +set -e + +usage() +{ + echo "Usage: $0 [options]" + echo "" + echo "Options:" + echo " -h, --help Display this message" + echo " -f, --force Force rebuild even if up-to-date" + echo "" +} + +force=0 + +while [ $# -gt 0 ] +do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -f|--force) + force=1 + shift + ;; + *) + echo "Unknown option $1" + usage + exit 1 + ;; + esac +done + +destdir="/home/winehq/opt/winetest/builds" +desturl="http://test.winehq.org/builds" +servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" + +mingw=i586-mingw32msvc +logfile=LOG + +# if the log file exists, either a build is in progress or one has failed +if [ -f $logfile -a $force -eq 0 ] +then + exit 1 +fi + +( + (cd wine && git pull) || exit + head=$(cd wine && git rev-parse --short=12 HEAD) || exit + + if [ -f $destdir/winetest-$head.exe -a $force -eq 0 ] + then + exit 0 + fi + + # first build the native tools + + test -d build-native || + (mkdir build-native && + cd build-native && + ../wine/configure --without-x --without-freetype) || exit + + (cd build-native && make depend && make tools) || exit + + # then cross-compile the tests + + test -d build-mingw || + (mkdir build-mingw && + cd build-mingw && + ../wine/configure --host=$mingw --with-wine-tools=../build-native --without-x --without-freetype) || exit + + (cd build-mingw && + make depend && + make include && + make -C dlls testsubdirs && + cd programs/winetest && + echo "$desturl/winetest-$head.exe" > tests.url && + uname -a > build.nfo && + make dist) || exit + + # install everything + + mv -f build-mingw/programs/winetest/winetest-dist.exe $destdir/winetest-$head.exe + ln -sf winetest-$head.exe $destdir/winetest-latest.exe + rm -f $servicedir/*.cookie $servicedir/*.url + sha1sum $destdir/winetest-latest.exe | cut -c1-40 > $servicedir/winetest-$head.cookie + echo "$desturl/winetest-$head.exe" > $servicedir/winetest-$head.url + + echo "winetest-$head.exe built successfully." + +) >$logfile 2>&1 && rm -f $logfile + +# if the log file is still here, something failed +if [ -f $logfile ] +then + cat $logfile + exit 1 +fi

1 0

Alexandre Julliard : winetest: Point to the winetest.exe builds on winehq.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: tools Branch: master Commit: 60c4f3646b1dc6b8cd96a247265d7516770a5973 URL: http://source.winehq.org/git/tools.git/?a=commit;h=60c4f3646b1dc6b8cd96a247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 24 17:15:19 2008 +0100 winetest: Point to the winetest.exe builds on winehq. --- winetest/build-index | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 9d55f28..165309c 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -270,7 +270,7 @@ foreach my $build (@builds) print OUT <<"EOF"; </table></div> <div class="navbar"> -To run the tests on your Windows machine, download the <a href="http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/winetest-latest.exe">latest winetest.exe</a> build. +To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. </div> </body></html> EOF

1 0

Alexandre Julliard : winetest: Make the test url always point to the local winetest.exe build.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: tools Branch: master Commit: a79f045017d8669d5c38469f31a3ace7f879da48 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a79f045017d8669d5c38469f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 15:37:03 2008 +0100 winetest: Make the test url always point to the local winetest.exe build. --- winetest/gather | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/winetest/gather b/winetest/gather index 9f5ff3f..fef9396 100755 --- a/winetest/gather +++ b/winetest/gather @@ -112,7 +112,6 @@ exit 2 unless defined $outdated; # Read in the data my %alltests; # union of test names -my $url = ""; # archive url of winetest.exe foreach my $file (glob "$datadir/$build/*/summary.txt") { (my $dir = $file) =~ s|^\Q$datadir/$build\E/(.*?)/summary.txt$|$1|; (my $id, my @tag) = split /_/, $dir; @@ -154,7 +153,6 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { close TEST; next; } - $url = "href=\"" . escapeHTML($archive) . "\"" if (!$url && $archive =~ /^http:\/\//); while (<TEST>) { my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, @@ -452,7 +450,7 @@ print OUT <<"EOF"; <p class="legend">This <span class="result pass also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work.</p> </div> <div class="main"> -<h1>Main summary for build <a $url title="$build">$short_build</a></h1> +<h1>Main summary for build <a href="/builds/winetest-$short_build.exe" title="$build">$short_build</a></h1> <table class="report"> $header_footer <tbody onDblClick="clone();">

1 0

Henri Verbeet : wined3d: Make some functions static.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: f552c90c303457a89f2e21f52e0c42d60f41f050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f552c90c303457a89f2e21f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 11:57:40 2008 +0100 wined3d: Make some functions static. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f948b6a..7266cad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); @@ -480,7 +479,8 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchai return GL_BACK; } -ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { +static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, ref + 1); @@ -544,7 +544,8 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { IWineD3DSurface IWineD3DResource parts follow **************************************************** */ -void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { +static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) +{ /* TODO: check for locks */ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBaseTexture *baseTexture = NULL; @@ -674,7 +675,8 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) { +static void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; TRACE("(%p) : returning %p\n", This, &This->glDescription); *glDescription = &This->glDescription; @@ -1395,7 +1397,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { return WINED3D_OK; } -HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { +static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; WINED3DLOCKED_RECT lock; HRESULT hr; @@ -1491,7 +1494,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { return WINED3D_OK; } -HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) { +static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,hDC); @@ -1736,7 +1740,9 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ return WINED3D_OK; } -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *This) { +static HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, + UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *This) +{ BYTE *source, *dest; TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert,This); @@ -2424,7 +2430,8 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { #include <errno.h> #include <stdio.h> -HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { +static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) +{ FILE* f = NULL; UINT i, y; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -2570,7 +2577,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch /** * Slightly inefficient way to handle multiple dirty rects but it works :) */ -HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect) { +static HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBaseTexture *baseTexture = NULL; @@ -3747,8 +3755,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT return IWineD3DBaseSurfaceImpl_Blt(iface, DestRect, SrcSurface, SrcRect, Flags, DDBltFx, Filter); } -HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, - IWineD3DSurface *Source, const RECT *rsrc, DWORD trans) { +static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, + IWineD3DSurface *Source, const RECT *rsrc, DWORD trans) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DSurfaceImpl *srcImpl = (IWineD3DSurfaceImpl *) Source; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; @@ -3808,7 +3817,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, D return IWineD3DBaseSurfaceImpl_BltFast(iface, dstx, dsty, Source, rsrc, trans); } -HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { +static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; RGBQUAD col[256]; IWineD3DPaletteImpl *pal = This->palette; @@ -4697,7 +4707,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3D_OK; } -HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) { +static HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DSwapChain *swapchain = NULL;

1 0

Henri Verbeet : wined3d: Slightly reduce the scope of fragment_palette_conversion.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: f0a816e8cb87b176ccf1a3f266fe22c6d36edb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a816e8cb87b176ccf1a3f26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 11:57:39 2008 +0100 wined3d: Slightly reduce the scope of fragment_palette_conversion. --- dlls/wined3d/surface.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1827838..f948b6a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2178,15 +2178,6 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] } } -const char *fragment_palette_conversion = - "!!ARBfp1.0\n" - "TEMP index;\n" - "PARAM constants = { 0.996, 0.00195, 0, 0 };\n" /* { 255/256, 0.5/255*255/256, 0, 0 } */ - "TEX index, fragment.texcoord[0], texture[0], 2D;\n" /* The alpha-component contains the palette index */ - "MAD index.a, index.a, constants.x, constants.y;\n" /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ - "TEX result.color, index.a, texture[1], 1D;\n" /* use the alpha-component as a index in the palette to get the final color */ - "END"; - /* This function is used in case of 8bit paletted textures to upload the palette. It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other extensions like ATI_fragment_shaders is possible. @@ -2213,6 +2204,19 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve /* Create the fragment program if we don't have it */ if(!device->paletteConversionShader) { + const char *fragment_palette_conversion = + "!!ARBfp1.0\n" + "TEMP index;\n" + /* { 255/256, 0.5/255*255/256, 0, 0 } */ + "PARAM constants = { 0.996, 0.00195, 0, 0 };\n" + /* The alpha-component contains the palette index */ + "TEX index, fragment.texcoord[0], texture[0], 2D;\n" + /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ + "MAD index.a, index.a, constants.x, constants.y;\n" + /* Use the alpha-component as an index in the palette to get the final color */ + "TEX result.color, index.a, texture[1], 1D;\n" + "END"; + glEnable(GL_FRAGMENT_PROGRAM_ARB); GL_EXTCALL(glGenProgramsARB(1, &device->paletteConversionShader)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, device->paletteConversionShader));

1 0

Henri Verbeet : wined3d: Don't call IWineD3DSurfaceImpl_GetData() from surface_gdi.c.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 49b55f677efbdb95381e9708eca685b6e8951c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b55f677efbdb95381e9708e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 11:57:39 2008 +0100 wined3d: Don't call IWineD3DSurfaceImpl_GetData() from surface_gdi.c. --- dlls/wined3d/surface.c | 12 +----------- dlls/wined3d/surface_base.c | 14 ++++++++++++++ dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index beb9f6d..1827838 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -680,16 +680,6 @@ void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor * *glDescription = &This->glDescription; } -/* TODO: think about moving this down to resource? */ -const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - /* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the future */ - if (This->resource.pool != WINED3DPOOL_SYSTEMMEM) { - FIXME(" (%p)Attempting to get system memory for a non-system memory texture\n", iface); - } - return (CONST void*)(This->resource.allocatedMemory); -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { IWineD3DSwapChainImpl *swapchain; @@ -4801,7 +4791,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, IWineD3DSurfaceImpl_GetGlDesc, - IWineD3DSurfaceImpl_GetData, + IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, IWineD3DSurfaceImpl_ModifyLocation, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 5ae80f9..64f05e2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1818,3 +1818,17 @@ void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) { ERR("Should not be called on base texture\n"); return; } + +/* TODO: think about moving this down to resource? */ +const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + + /* This should only be called for sysmem textures, it may be a good idea + * to extend this to all pools at some point in the future */ + if (This->resource.pool != WINED3DPOOL_SYSTEMMEM) + { + FIXME("(%p) Attempting to get system memory for a non-system memory texture\n", iface); + } + return This->resource.allocatedMemory; +} diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a17c007..6266366 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -679,7 +679,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineGDISurfaceImpl_GetGlDesc, - IWineD3DSurfaceImpl_GetData, + IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, IWineGDISurfaceImpl_ModifyLocation, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3701e8..64daf8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1490,8 +1490,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst IWineD3DSurface *Source, const RECT *rsrc, DWORD trans); HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags); void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface); - -const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); +const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface); void get_drawable_size_swapchain(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height);

1 0

Henri Verbeet : wined3d: Use IDL to generate wined3d.h.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: a6917b143d4d5be0809c162f2adc3e4eb17adfc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6917b143d4d5be0809c162f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 11:57:39 2008 +0100 wined3d: Use IDL to generate wined3d.h. --- .gitignore | 1 + dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/ddraw/clipper.c | 2 + dlls/ddraw/ddraw_private.h | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/Makefile.in | 13 +- include/wine/wined3d.idl | 3429 ++++++++++++++++++++++++++++++++++++++ include/wine/wined3d_caps.h | 590 ------- include/wine/wined3d_interface.h | 1634 ------------------ include/wine/wined3d_types.h | 1480 ---------------- tools/make_makefiles | 25 +- 13 files changed, 3463 insertions(+), 3723 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6917b143d4d5be0809c1…

1 0