March 2011 - Wine-Commits - list.winehq.org

Eric Pouech : winedbg: Display a valid source file when reporting an error about a missing source file .
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 1adbe826012f13cf0208a384adecb9afd41ed22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adbe826012f13cf0208a384a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:55 2011 +0100 winedbg: Display a valid source file when reporting an error about a missing source file. --- programs/winedbg/source.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index e341d48..e564815 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -199,31 +199,39 @@ static int source_display(const char* sourcefile, int start, int end) if (dbg_interactiveP) { char zbuf[256]; - /* - * Still couldn't find it. Ask user for path to add. - */ - snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s': ", sourcefile); - input_read_line(zbuf, tmppath, sizeof(tmppath)); - if (tmppath[strlen(tmppath) - 1] != '/') + for (;;) { - strcat(tmppath, "/"); + size_t len; + /* + * Still couldn't find it. Ask user for path to add. + */ + snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s' (<cr> to end search): ", sourcefile); + input_read_line(zbuf, tmppath, sizeof(tmppath)); + if (!(len = strlen(tmppath))) break; + + /* append '/' if missing at the end */ + if (tmppath[len - 1] != '/' && tmppath[len - 1] != '\\') + tmppath[len++] = '/'; + strcpy(&tmppath[len], basename); + if (GetFileAttributesA(tmppath) != INVALID_FILE_ATTRIBUTES) + break; + dbg_printf("Unable to access file '%s'\n", tmppath); } - /* - * Now append the base file name. - */ - strcat(tmppath, basename); } - else tmppath[0] = '\0'; + else + { + dbg_printf("Unable to access file '%s'\n", sourcefile); + tmppath[0] = '\0'; + } - if (GetFileAttributesA(tmppath) == INVALID_FILE_ATTRIBUTES) + if (!tmppath[0]) { /* * OK, I guess the user doesn't really want to see it * after all. */ ol = source_add_file(sourcefile, NULL); - dbg_printf("Unable to open file '%s'\n", tmppath); return FALSE; } }

1 0

Eric Pouech : winedbg: Also get rid of trailing \r in input_read_line.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 77eefaed583ad3f6c53378c63b364d0dcc6912c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77eefaed583ad3f6c53378c63… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:49 2011 +0100 winedbg: Also get rid of trailing \r in input_read_line. --- programs/winedbg/dbg.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index c7e2c3b..4f2da25 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -507,8 +507,8 @@ int input_read_line(const char* pfx, char* buf, int size) int len = input_fetch_entire_line(pfx, &line); if (len < 0) return 0; - /* remove trailing \n */ - if (len > 0 && line[len - 1] == '\n') len--; + /* remove trailing \n and \r */ + while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r')) len--; len = min(size - 1, len); memcpy(buf, line, len); buf[len] = '\0';

1 0

Roderick Colenbrander : wined3d: Update Nvidia Geforce6+ driver version.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: b1a97099e7983e77479a450a573c268542924a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a97099e7983e77479a450a5… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:39 2011 -0700 wined3d: Update Nvidia Geforce6+ driver version. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c607d99..c5a9ef3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1009,8 +1009,8 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_TNT, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 7186}, {DRIVER_NVIDIA_GEFORCE2MX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 9371}, {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 11, 9745}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 11, 9745}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 12, 6658}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 12, 6658}, }; struct gpu_description

1 0

Andrew Eikum : include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: b14e4e584102df82e52af19bb2fc16f43db3fe1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e4e584102df82e52af19bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 15 15:06:47 2011 -0500 include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW. --- include/ksmedia.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index da69b31..4027596 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -25,6 +25,8 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); #define KSAUDIO_SPEAKER_DIRECTOUT 0 #define KSAUDIO_SPEAKER_MONO SPEAKER_FRONT_CENTER

1 0

Henri Verbeet : wined3d: Use the correct resource_ops in cubetexture_unload ().
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 6110fe3a823ac4f0e67746cd1113485d12604777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6110fe3a823ac4f0e67746cd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:32 2011 +0100 wined3d: Use the correct resource_ops in cubetexture_unload(). --- dlls/wined3d/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4171d55..9a27f5b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -151,7 +151,7 @@ static void cubetexture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->baseTexture.sub_resources[i]; IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); - resource->resource_ops->resource_unload(sub_resource); + sub_resource->resource_ops->resource_unload(sub_resource); surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); }

1 0

Eric Pouech : winegcc: Correctly manage the -V option ( gcc expects to be among the first ones, with -b).
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 34acd88a2ecea59c7adf760d69b6c033baaa20d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34acd88a2ecea59c7adf760d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:17:48 2011 +0100 winegcc: Correctly manage the -V option (gcc expects to be among the first ones, with -b). --- tools/winegcc/winegcc.c | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dcfe778..9849afd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -185,6 +185,7 @@ struct options enum target_cpu target_cpu; enum target_platform target_platform; const char *target; + const char *version; int shared; int use_msvcrt; int nostdinc; @@ -283,30 +284,49 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static char* build_tool_name(struct options *opts, const char* base, const char* deflt) +{ + char* str; + + if (opts->target && opts->version) + { + str = strmake("%s-%s-%s", opts->target, base, opts->version); + } + else if (opts->target) + { + str = strmake("%s-%s", opts->target, base); + } + else if (opts->version) + { + str = strmake("%s-%s", base, opts->version); + } + else + str = xstrdup(deflt); + return str; +} + static const strarray* get_translator(struct options *opts) { - const char *str = NULL; + char *str = NULL; strarray *ret; switch(opts->processor) { case proc_cpp: - if (opts->target) str = strmake( "%s-cpp", opts->target ); - else str = CPP; + str = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - if (opts->target) str = strmake( "%s-gcc", opts->target ); - else str = CC; + str = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - if (opts->target) str = strmake( "%s-g++", opts->target ); - else str = CXX; + str = build_tool_name(opts, "g++", CXX); break; default: assert(0); } ret = strarray_fromstring( str, " " ); + free(str); if (opts->force_pointer_size) strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); return ret; @@ -379,6 +399,8 @@ static void compile(struct options* opts, const char* lang) strarray* comp_args = strarray_alloc(); unsigned int j; int gcc_defs = 0; + char* gcc; + char* gpp; strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) @@ -389,12 +411,16 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; - gcc_defs = strendswith(cc, "gcc") || strendswith(cc, "g++"); + gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); } + free(gcc); + free(gpp); break; } @@ -1114,7 +1140,7 @@ static int is_linker_arg(const char* arg) */ static int is_target_arg(const char* arg) { - return arg[1] == 'b' || arg[2] == 'V'; + return arg[1] == 'b' || arg[1] == 'V'; } @@ -1291,7 +1317,7 @@ int main(int argc, char **argv) raw_linker_arg = 0; if (argv[i][1] == 'c' || argv[i][1] == 'L') raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b') + if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') raw_compiler_arg = raw_linker_arg = 0; /* do a bit of semantic analysis */ @@ -1314,6 +1340,9 @@ int main(int argc, char **argv) case 'b': parse_target_option( &opts, option_arg ); break; + case 'V': + opts.version = xstrdup( option_arg ); + break; case 'c': /* compile or assemble */ if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTextureImpl.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: f77c0e36a43e23028548ed1021ec0c1bcf19c0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77c0e36a43e23028548ed102… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:34 2011 +0100 wined3d: Get rid of IWineD3DVolumeTextureImpl. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 26 ++++++++++++-------------- dlls/wined3d/wined3d_private.h | 20 ++++++-------------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b009b83..735cbca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1139,8 +1139,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, enum wined3d_format_id Format, WINED3DPOOL Pool, void *parent, const struct wined3d_parent_ops *parent_ops, IWineD3DBaseTexture **ppVolumeTexture) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVolumeTextureImpl *object; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DBaseTextureImpl *object; HRESULT hr; TRACE("(%p) : W(%u) H(%u) D(%u), Lvl(%u) Usage(%#x), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3f7090c..a0baef3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -85,7 +85,7 @@ void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *d } } -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) { TRACE("volume %p, container %p.\n", volume, container); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 22f6c27..07a83c3 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -1,6 +1,4 @@ /* - * IWineD3DVolumeTexture implementation - * * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira * Copyright 2005 Oliver Stieber @@ -113,7 +111,7 @@ static const struct wined3d_resource_ops volumetexture_resource_ops = volumetexture_unload, }; -static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) +static void volumetexture_cleanup(IWineD3DBaseTextureImpl *This) { unsigned int i; @@ -141,7 +139,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) @@ -158,7 +156,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTextu static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref); return InterlockedIncrement(&This->resource.ref); } @@ -166,7 +164,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); @@ -182,28 +180,28 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, riid, data, data_size, flags); + return resource_set_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, guid, data, data_size); + return resource_get_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, guid, data, data_size); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return resource_free_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, refguid); + return resource_free_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, refguid); } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD priority) { - return resource_set_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource, priority); + return resource_set_priority(&((IWineD3DBaseTextureImpl *)iface)->resource, priority); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return resource_get_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_priority(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) @@ -213,14 +211,14 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return resource_get_type(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_type(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DBaseTexture *iface) { TRACE("iface %p\n", iface); - return ((IWineD3DVolumeTextureImpl *)iface)->resource.parent; + return ((IWineD3DBaseTextureImpl *)iface)->resource.parent; } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) @@ -318,7 +316,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_AddDirtyRegion, }; -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f45e9e9..8726e2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1965,6 +1965,10 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, + UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, + WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * IWineD3DCubeTexture implementation structure (extends IWineD3DBaseTextureImpl) */ @@ -1986,7 +1990,7 @@ typedef struct IWineD3DVolumeImpl const IWineD3DVolumeVtbl *lpVtbl; struct wined3d_resource resource; - struct IWineD3DVolumeTextureImpl *container; + struct IWineD3DBaseTextureImpl *container; BOOL lockable; BOOL locked; WINED3DBOX lockedBox; @@ -2004,19 +2008,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) DECLSPEC_HIDDEN; - -typedef struct IWineD3DVolumeTextureImpl -{ - /* IUnknown & WineD3DResource/WineD3DBaseTexture Information */ - const IWineD3DBaseTextureVtbl *lpVtbl; - struct wined3d_resource resource; - IWineD3DBaseTextureClass baseTexture; -} IWineD3DVolumeTextureImpl; - -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, - UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, - WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) DECLSPEC_HIDDEN; /***************************************************************************** * Structure for DIB Surfaces (GetDC and GDI surfaces)

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: ed0037854a20beeef2ad4deb47d4a5537f4715b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0037854a20beeef2ad4deb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:33 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/texture.c | 11 +++--- dlls/d3d8/d3d8_private.h | 9 +---- dlls/d3d8/volumetexture.c | 36 +++++++++--------- dlls/d3d9/d3d9_private.h | 9 +---- dlls/d3d9/volumetexture.c | 68 +++++++++++------------------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/volumetexture.c | 56 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.idl | 11 +----- 10 files changed, 80 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed0037854a20beeef2ad4…

1 0

Alexandre Julliard : gdi32: Don't allocate a GDI handle for saved DCs.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 7b970a165778833f8d7cd4ffd877b9b14d2c4938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b970a165778833f8d7cd4ffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 11:41:49 2011 +0100 gdi32: Don't allocate a GDI handle for saved DCs. --- dlls/gdi32/dc.c | 76 ++++++++++++++++----------------------------- dlls/gdi32/gdi_private.h | 4 +- 2 files changed, 29 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b0a7151..d70d2c2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -160,18 +160,27 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) /*********************************************************************** - * free_dc_ptr + * free_dc_state */ -BOOL free_dc_ptr( DC *dc ) +static void free_dc_state( DC *dc ) { - assert( dc->refcount == 1 ); - if (free_gdi_handle( dc->hSelf ) != dc) return FALSE; /* shouldn't happen */ if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); PATH_DestroyGdiPath( &dc->path ); - return HeapFree( GetProcessHeap(), 0, dc ); + HeapFree( GetProcessHeap(), 0, dc ); +} + + +/*********************************************************************** + * free_dc_ptr + */ +void free_dc_ptr( DC *dc ) +{ + assert( dc->refcount == 1 ); + free_gdi_handle( dc->hSelf ); + free_dc_state( dc ); } @@ -373,7 +382,6 @@ void DC_UpdateXforms( DC *dc ) INT CDECL nulldrv_SaveDC( PHYSDEV dev ) { DC *newdc, *dc = get_nulldrv_dc( dev ); - INT ret; if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0; newdc->flags = dc->flags | DC_SAVED; @@ -422,22 +430,8 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; - newdc->thread = GetCurrentThreadId(); - newdc->refcount = 1; - newdc->saveLevel = 0; - newdc->saved_dc = 0; - PATH_InitGdiPath( &newdc->path ); - newdc->pAbortProc = NULL; - newdc->hookProc = NULL; - - if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) - { - HeapFree( GetProcessHeap(), 0, newdc ); - return 0; - } - /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ newdc->hVisRgn = 0; @@ -454,20 +448,19 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hMetaRgn = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( newdc->hMetaRgn, dc->hMetaRgn, 0, RGN_COPY ); } + /* don't bother recomputing hMetaClipRgn, we'll do that in SetDCState */ if (!PATH_AssignGdiPath( &newdc->path, &dc->path )) { release_dc_ptr( dc ); - free_dc_ptr( newdc ); + free_dc_state( newdc ); return 0; } newdc->saved_dc = dc->saved_dc; - dc->saved_dc = newdc->hSelf; - ret = ++dc->saveLevel; - release_dc_ptr( newdc ); - return ret; + dc->saved_dc = newdc; + return ++dc->saveLevel; } @@ -476,8 +469,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) */ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) { - DC *dcs, *dc = get_nulldrv_dc( dev ); - HDC hdcs, first_dcs; + DC *dcs, *first_dcs, *dc = get_nulldrv_dc( dev ); INT save_level; /* find the state level to restore */ @@ -485,21 +477,12 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (abs(level) > dc->saveLevel || level == 0) return FALSE; if (level < 0) level = dc->saveLevel + level + 1; first_dcs = dc->saved_dc; - for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) - { - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - hdcs = dcs->saved_dc; - release_dc_ptr( dcs ); - } + for (dcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + dcs = dcs->saved_dc; /* restore the state */ - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) - { - release_dc_ptr( dcs ); - return FALSE; - } + if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) return FALSE; dc->flags = dcs->flags & ~DC_SAVED; dc->layout = dcs->layout; @@ -577,16 +560,13 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dcs->saved_dc = 0; dc->saveLevel = save_level - 1; - release_dc_ptr( dcs ); - /* now destroy all the saved DCs */ while (first_dcs) { - if (!(dcs = get_dc_ptr( first_dcs ))) break; - hdcs = dcs->saved_dc; - free_dc_ptr( dcs ); - first_dcs = hdcs; + DC *next = first_dcs->saved_dc; + free_dc_state( first_dcs ); + first_dcs = next; } return TRUE; } @@ -841,12 +821,10 @@ BOOL WINAPI DeleteDC( HDC hdc ) while (dc->saveLevel) { - DC * dcs; - HDC hdcs = dc->saved_dc; - if (!(dcs = get_dc_ptr( hdcs ))) break; + DC *dcs = dc->saved_dc; dc->saved_dc = dcs->saved_dc; dc->saveLevel--; - free_dc_ptr( dcs ); + free_dc_state( dcs ); } if (!(dc->flags & DC_SAVED)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 996a435..c9f653e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -253,7 +253,7 @@ typedef struct tagDC LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ INT saveLevel; - HDC saved_dc; + struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ @@ -376,7 +376,7 @@ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* dc.c */ extern DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) DECLSPEC_HIDDEN; -extern BOOL free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; +extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the DC state functions.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: e6d153bbf6e767d2ecea0289827188a19929acbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d153bbf6e767d2ecea02898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 20:17:58 2011 +0100 gdi32: Add null driver entry points for the DC state functions. --- dlls/gdi32/dc.c | 116 +++++++++++++++++----------------------------- dlls/gdi32/driver.c | 11 +++- dlls/gdi32/enhmfdrv/dc.c | 9 ++-- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 58 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6d153bbf6e767d2ecea0…

1 0