wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Nikolay Sivov : msxml3: Merge save() tests to a single function.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 59f64b2896cfed6a0d00553cb1c4db6cf5b1be8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f64b2896cfed6a0d00553cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 23:26:55 2011 +0300 msxml3: Merge save() tests to a single function. --- dlls/msxml3/tests/domdoc.c | 103 ++++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 108d610..6948201 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5629,10 +5629,15 @@ static void test_nodeTypeTests( void ) free_bstrs(); } -static void test_DocumentSaveToDocument(void) +static void test_save(void) { IXMLDOMDocument *doc, *doc2; - IXMLDOMElement *pRoot; + IXMLDOMElement *root; + VARIANT file, vDoc; + BSTR sOrig, sNew; + char buffer[100]; + DWORD read = 0; + HANDLE hfile; HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); @@ -5645,86 +5650,53 @@ static void test_DocumentSaveToDocument(void) return; } - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vDoc; - BSTR sOrig; - BSTR sNew; - - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - - hr = IXMLDOMDocument_save(doc, vDoc); - ok(hr == S_OK, "ret %08x\n", hr ); + /* save to IXMLDOMDocument */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc, &sOrig); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc2, &sNew); - ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&vDoc) = VT_UNKNOWN; + V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); + hr = IXMLDOMDocument_save(doc, vDoc); + EXPECT_HR(hr, S_OK); - SysFreeString(sOrig); - SysFreeString(sNew); - } - IXMLDOMElement_Release(pRoot); - } + hr = IXMLDOMDocument_get_xml(doc, &sOrig); + EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc2); - IXMLDOMDocument_Release(doc); -} + hr = IXMLDOMDocument_get_xml(doc2, &sNew); + EXPECT_HR(hr, S_OK); -static void test_DocumentSaveToFile(void) -{ - IXMLDOMDocument *doc; - IXMLDOMElement *pRoot; - HANDLE file; - char buffer[100]; - DWORD read = 0; - HRESULT hr; + ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; + SysFreeString(sOrig); + SysFreeString(sNew); - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vFile; + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc2); - V_VT(&vFile) = VT_BSTR; - V_BSTR(&vFile) = _bstr_("test.xml"); + /* save to path */ + V_VT(&file) = VT_BSTR; + V_BSTR(&file) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, vFile); - ok(hr == S_OK, "ret %08x\n", hr ); - } - } + hr = IXMLDOMDocument_save(doc, file); + EXPECT_HR(hr, S_OK); - IXMLDOMElement_Release(pRoot); IXMLDOMDocument_Release(doc); - file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); - if(file == INVALID_HANDLE_VALUE) - return; + hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(file); + CloseHandle(hfile); DeleteFile("test.xml"); + free_bstrs(); } static void test_testTransforms(void) @@ -8678,8 +8650,7 @@ START_TEST(domdoc) test_cloneNode(); test_xmlTypes(); test_nodeTypeTests(); - test_DocumentSaveToDocument(); - test_DocumentSaveToFile(); + test_save(); test_testTransforms(); test_Namespaces(); test_FormattingXML();

1 0

Eric Pouech : winedbg: Display a valid source file when reporting an error about a missing source file .
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 16 Mar '11

16 Mar '11

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

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

16 Mar '11

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

Eric Pouech : winedbg: Added support for printing WCHAR in print_typed_basic.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: acac3cced4e4cb5621aa25e8802990b0fe34cd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acac3cced4e4cb5621aa25e88… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:18:21 2011 +0100 winedbg: Added support for printing WCHAR in print_typed_basic. --- programs/winedbg/memory.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c1567b..5a54ec1 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -29,6 +29,7 @@ #include "debugger.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -393,18 +394,23 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%Lf", val_real); break; case btChar: + case btWChar: + /* sometimes WCHAR is defined as btChar with size = 2, so discrimate + * Ansi/Unicode based on size, not on basetype + */ if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; - /* FIXME: should do the same for a Unicode character (size == 2) */ print_char: - if (size == 1 && (val_int < 0x20 || val_int > 0x80)) - dbg_printf("%d", (int)val_int); - else if (size == 2) + if (size == 1 && isprint((char)val_int)) + dbg_printf("'%c'", (char)val_int); + else if (size == 2 && isprintW((WCHAR)val_int)) { WCHAR wch = (WCHAR)val_int; + dbg_printf("'"); dbg_outputW(&wch, 1); + dbg_printf("'"); } else - dbg_printf("'%c'", (char)val_int); + dbg_printf("%d", (int)val_int); break; case btBool: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return;

1 0

Andrew Eikum : include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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: Get rid of IWineD3DVolumeTextureImpl.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 16 Mar '11

16 Mar '11

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

Henri Verbeet : wined3d: Use the correct resource_ops in cubetexture_unload ().
by Alexandre Julliard 16 Mar '11

16 Mar '11

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

Henri Verbeet : d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 235dbbb5d7c23b1709244a03194096fe2d5f8056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=235dbbb5d7c23b1709244a031… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:31 2011 +0100 d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD(). --- dlls/d3d8/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 7b5305c..0c7295a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -229,7 +229,7 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(IDirect3DCubeTexture8 *ifac TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - lod = IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); + lod = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); wined3d_mutex_unlock(); return lod;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011