October 2008 - Wine-commits

Paul Vriens : shell32/tests: Compare instead of assign.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 3d8180a2fc022a598b2eb074fbdb51b92420a508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8180a2fc022a598b2eb074f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 08:55:08 2008 +0200 shell32/tests: Compare instead of assign. --- dlls/shell32/tests/appbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 9991fe2..af7c5f2 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -335,7 +335,7 @@ static void test_setpos(void) do_events_until(got_expected_bottom); - ok(windows[1].allocated_rect.bottom = expected_bottom, "windows[1]'s bottom is %i, expected %i\n", windows[1].allocated_rect.bottom, expected_bottom); + ok(windows[1].allocated_rect.bottom == expected_bottom, "windows[1]'s bottom is %i, expected %i\n", windows[1].allocated_rect.bottom, expected_bottom); test_window_rects(1, 2);

1 0

Paul Vriens : gdi32/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 880f78574721c8780cf6619db08fc6ae8355a3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880f78574721c8780cf6619db… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 11:20:09 2008 +0200 gdi32/tests: Skip some tests on Win9x/WinMe. --- dlls/gdi32/tests/bitmap.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 25f1fe7..3d801e7 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1737,22 +1737,29 @@ static void test_GetDIBits_BI_BITFIELDS(void) memset(dibinfo, 0, sizeof(dibinfo_buf)); dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); - - ok( !bitmasks[0], "red mask is set\n" ); - ok( !bitmasks[1], "green mask is set\n" ); - ok( !bitmasks[2], "blue mask is set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); - - memset(bitmasks, 0, 3*sizeof(DWORD)); - dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; - ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); - - ok( bitmasks[0] != 0, "red mask is not set\n" ); - ok( bitmasks[1] != 0, "green mask is not set\n" ); - ok( bitmasks[2] != 0, "blue mask is not set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + if (ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + win_skip("Win9x/WinMe doesn't handle 0 for the number of scan lines\n"); + else + { + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + memset(bitmasks, 0, 3*sizeof(DWORD)); + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + + ok( bitmasks[0] != 0, "red mask is not set\n" ); + ok( bitmasks[1] != 0, "green mask is not set\n" ); + ok( bitmasks[2] != 0, "blue mask is not set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + } } else skip("not in 16 bpp BI_BITFIELDS mode, skipping that test\n");

1 0

Paul Vriens : inetmib1/tests: Compare instead of assign.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 682890ae4dc9b603356a524e3186aea6bf61c5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682890ae4dc9b603356a524e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 08:54:56 2008 +0200 inetmib1/tests: Compare instead of assign. --- dlls/inetmib1/tests/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index d4d6f16..e00749f 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -364,7 +364,7 @@ static void testQuery(void) * FIXME: don't know if IPv6 addrs are shared with this table. * Don't think so, but I'm not certain. */ - ok(vars2[0].name.idLength = vars[0].name.idLength + 4, + ok(vars2[0].name.idLength == vars[0].name.idLength + 4, "expected length %d, got %d\n", vars[0].name.idLength + 4, vars2[0].name.idLength); /* Make sure the type is right */

1 0

Paul Vriens : msxml3/tests: Compare instead of assign.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 59f8cd533dd92494029250aad8da4d340b4d5959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f8cd533dd92494029250aad… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 08:55:02 2008 +0200 msxml3/tests: Compare instead of assign. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aeb53d7..f985dfd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -995,7 +995,7 @@ todo_wine str = SysAllocString( szOpen ); node = (IXMLDOMNode *) 1; r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); - ok( r = S_FALSE, "getNamedItem found a node that wasn't there\n"); + ok( r == S_FALSE, "getNamedItem found a node that wasn't there\n"); ok( node == NULL, "getNamedItem should have returned NULL\n"); SysFreeString( str );

1 0

Paul Vriens : advapi2/tests: Compare instead of assign.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: b27db86ca4fa0f44eef09a7686c61a7753dcc713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27db86ca4fa0f44eef09a768… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 08:54:48 2008 +0200 advapi2/tests: Compare instead of assign. --- dlls/advapi32/tests/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d28aad1..f961a8b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -564,7 +564,7 @@ static void test_get_displayname(void) displaysize = tempsizeW / 2; ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); ok(!ret, "Expected failure\n"); - ok(displaysize = tempsizeW, "Expected the needed buffersize\n"); + ok(displaysize == tempsizeW, "Expected the needed buffersize\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -573,7 +573,7 @@ static void test_get_displayname(void) displaysize = tempsizeW; ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); ok(!ret, "Expected failure\n"); - ok(displaysize = tempsizeW, "Expected the needed buffersize\n"); + ok(displaysize == tempsizeW, "Expected the needed buffersize\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());

1 0

Christian Costa : d3dxof: Enable referencing of named subobjects too.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 06c8d49e3ec8ce419043ccc66edaa3f8720a6001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c8d49e3ec8ce419043ccc66… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Oct 7 22:54:09 2008 +0200 d3dxof: Enable referencing of named subobjects too. --- dlls/d3dxof/d3dxof.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index a02f99b..af84ef8 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1843,7 +1843,7 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { if (check_TOKEN(buf) == TOKEN_OBRACE) { - int i; + int i, j; get_TOKEN(buf); if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; @@ -1852,9 +1852,13 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) TRACE("Found optional reference %s\n", (char*)buf->value); for (i = 0; i < buf->nb_pxo_globals; i++) { - if (!strcmp(buf->pxo_globals[i*MAX_SUBOBJECTS].name, (char*)buf->value)) - break; + for (j = 0; j < buf->pxo_globals[i*MAX_SUBOBJECTS].nb_subobjects; j++) + { + if (!strcmp(buf->pxo_globals[i*MAX_SUBOBJECTS+j].name, (char*)buf->value)) + goto _exit; + } } +_exit: if (i == buf->nb_pxo_globals) { ERR("Reference to unknown object %s\n", (char*)buf->value);

1 0

Jacek Caban : jscript: Added String. split implementation for non-regexp arguments.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: b67e875eed0b51b6a01015e80f2dc238969577bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67e875eed0b51b6a01015e80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:03:02 2008 -0500 jscript: Added String.split implementation for non-regexp arguments. --- dlls/jscript/string.c | 65 +++++++++++++++++++++++++++++++---------- dlls/jscript/tests/api.js | 30 +++++++++++++++++++ dlls/jscript/tests/regexp.js | 17 +++++++++++ 3 files changed, 96 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ba4c82d..c6d789e 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -846,12 +846,13 @@ static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + match_result_t *match_result = NULL; + DWORD match_cnt, i, match_len = 0; StringInstance *string; - match_result_t *match_result; - DWORD match_cnt, i, len; - const WCHAR *ptr; + const WCHAR *ptr, *ptr2; VARIANT *arg, var; DispatchEx *array; + BSTR match_str = NULL; HRESULT hres; TRACE("\n"); @@ -886,18 +887,38 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } } default: - FIXME("unsupported vt %d\n", V_VT(arg)); - return E_NOTIMPL; + hres = to_string(dispex->ctx, arg, ei, &match_str); + if(FAILED(hres)) + return hres; + + match_len = SysStringLen(match_str); + if(!match_len) { + SysFreeString(match_str); + match_str = NULL; + } } - hres = create_array(dispex->ctx, match_cnt+1, &array); + hres = create_array(dispex->ctx, 0, &array); if(SUCCEEDED(hres)) { ptr = string->str; - for(i=0; i < match_cnt; i++) { - len = match_result[i].str-ptr; + for(i=0;; i++) { + if(match_result) { + if(i == match_cnt) + break; + ptr2 = match_result[i].str; + }else if(match_str) { + ptr2 = strstrW(ptr, match_str); + if(!ptr2) + break; + }else { + if(!*ptr) + break; + ptr2 = ptr+1; + } + V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocStringLen(ptr, len); + V_BSTR(&var) = SysAllocStringLen(ptr, ptr2-ptr); if(!V_BSTR(&var)) { hres = E_OUTOFMEMORY; break; @@ -908,20 +929,32 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(FAILED(hres)) break; - ptr = match_result[i].str + match_result[i].len; + if(match_result) + ptr = match_result[i].str + match_result[i].len; + else if(match_str) + ptr = ptr2 + match_len; + else + ptr++; } } - if(SUCCEEDED(hres)) { - len = (string->str+string->length) - ptr; + if(SUCCEEDED(hres) && (match_str || match_result)) { + DWORD len = (string->str+string->length) - ptr; - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocStringLen(ptr, len); + if(len || match_str) { + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(ptr, len); - hres = jsdisp_propput_idx(array, i, lcid, &var, ei, sp); - SysFreeString(V_BSTR(&var)); + if(V_BSTR(&var)) { + hres = jsdisp_propput_idx(array, i, lcid, &var, ei, sp); + SysFreeString(V_BSTR(&var)); + }else { + hres = E_OUTOFMEMORY; + } + } } + SysFreeString(match_str); heap_free(match_result); if(SUCCEEDED(hres) && retv) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3543357..58847fa 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -200,6 +200,36 @@ ok(r === "-ret-", "r = " + r + " expected '-ret-'"); r = "-[test]-".replace("[test]", replaceFunc3, "test"); ok(r === "-ret-", "r = " + r + " expected '-ret-'"); +r = "1,2,3".split(","); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + + +r = "1,2,3".split(",*"); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1,2,3", "r[0] = " + r[0]); + +r = "123".split(""); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + +r = "123".split(2); +ok(r.length === 2, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "3", "r[1] = " + r[1]); + +r = "1,2,".split(","); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "", "r[2] = " + r[2]); + tmp = "abcd".indexOf("bc",0); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf("bc",1); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index e797723..6809101 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -150,4 +150,21 @@ function replaceFunc2(m, subm, off, str) { r = "[test1] [test2]".replace(/\[([^\[]+)\]/g, replaceFunc2); ok(r === "r0 r1", "r = '" + r + "' expected 'r0 r1'"); +r = "1,,2,3".split(/,+/g); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + +r = "1,,2,3".split(/,+/); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + +r = "1,,2,".split(/,+/); +ok(r.length === 2, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); + reportSuccess();

1 0

Christian Costa : d3dxof: Allow omission of comma which separates array elements.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: b12be1ce781e9c203f3bbb1fd79d691ac448351a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12be1ce781e9c203f3bbb1fd… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Oct 7 22:52:12 2008 +0200 d3dxof: Allow omission of comma which separates array elements. --- dlls/d3dxof/d3dxof.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index a4801f5..553dbf9 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1703,8 +1703,17 @@ static BOOL parse_object_members_list(parse_buffer * buf) { if (k) { - if (get_TOKEN(buf) != TOKEN_COMMA) - return FALSE; + token = check_TOKEN(buf); + if (token == TOKEN_COMMA) + { + get_TOKEN(buf); + } + else + { + /* Allow comma omission */ + if (!((token == TOKEN_FLOAT))) + return FALSE; + } } if (pt->members[i].type == TOKEN_NAME)

1 0

Christian Costa : d3dxof: Enumerate only 2 levels of objects obtained from a reference.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: ded68e8a4f698369801570dca294e489727cc901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded68e8a4f698369801570dca… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Oct 7 22:52:55 2008 +0200 d3dxof: Enumerate only 2 levels of objects obtained from a reference. --- dlls/d3dxof/d3dxof.c | 12 ++++++++++++ dlls/d3dxof/d3dxof_private.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 553dbf9..6d4d496 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1409,6 +1409,12 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (This->cur_enum_object >= This->pobj->nb_childs) return DXFILEERR_NOMOREOBJECTS; + if (This->from_ref && (This->level >= 1)) + { + /* Only 2 levels can enumerated if the object is obtained from a reference */ + return DXFILEERR_NOMOREOBJECTS; + } + if (This->pobj->childs[This->cur_enum_object]->ptarget) { IDirectXFileDataReferenceImpl *object; @@ -1431,6 +1437,8 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface object->pobj = This->pobj->childs[This->cur_enum_object++]; object->cur_enum_object = 0; + object->from_ref = This->from_ref; + object->level = This->level + 1; *ppChildObj = (LPDIRECTXFILEOBJECT)object; } @@ -1590,6 +1598,8 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe object->pobj = This->ptarget; object->cur_enum_object = 0; + object->level = 0; + object->from_ref = TRUE; *ppDataObj = (LPDIRECTXFILEDATA)object; @@ -1981,6 +1991,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE object->pobj = This->buf.pxo; object->cur_enum_object = 0; + object->level = 0; + object->from_ref = FALSE; *ppDataObj = (LPDIRECTXFILEDATA)object; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 99bec1c..3a4735d 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -98,6 +98,8 @@ typedef struct { LONG ref; xobject* pobj; int cur_enum_object; + BOOL from_ref; + ULONG level; } IDirectXFileDataImpl; typedef struct {

1 0

Christian Costa : d3dxof: Store number of subojects for all top level objects.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 9d64f82554d153436b6692e8fcef1432d8ed62b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d64f82554d153436b6692e8f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Oct 7 22:53:38 2008 +0200 d3dxof: Store number of subojects for all top level objects. --- dlls/d3dxof/d3dxof.c | 2 ++ dlls/d3dxof/d3dxof_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6d4d496..a02f99b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1989,6 +1989,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_PARSEERROR; } + This->buf.pxo->nb_subobjects = This->buf.cur_subobject; + object->pobj = This->buf.pxo; object->cur_enum_object = 0; object->level = 0; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 3a4735d..ba403df 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -76,6 +76,7 @@ struct _xobject { ULONG nb_members; xobject_member members[MAX_MEMBERS]; ULONG nb_childs; + ULONG nb_subobjects; struct _xobject * childs[MAX_CHILDS]; };

1 0