June 2013 - Wine-Commits - list.winehq.org

Christian Costa : d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 785921ff4965d9004512dc9b53bcc5c31994e24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=785921ff4965d9004512dc9b5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:32:00 2013 +0200 d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability. --- include/d3dx9core.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 252d5db..b6226d6 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -28,15 +28,15 @@ implementing all dlls from d3dx9_24 to d3dx9_36 */ #define D3DX_VERSION 0x0902 #define D3DX_SDK_VERSION 36 -#define D3DXSPRITE_DONOTSAVESTATE 1 -#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 2 -#define D3DXSPRITE_OBJECTSPACE 4 -#define D3DXSPRITE_BILLBOARD 8 -#define D3DXSPRITE_ALPHABLEND 16 -#define D3DXSPRITE_SORT_TEXTURE 32 -#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 64 -#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 -#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 +#define D3DXSPRITE_DONOTSAVESTATE 0x00000001 +#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 +#define D3DXSPRITE_OBJECTSPACE 0x00000004 +#define D3DXSPRITE_BILLBOARD 0x00000008 +#define D3DXSPRITE_ALPHABLEND 0x00000010 +#define D3DXSPRITE_SORT_TEXTURE 0x00000020 +#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 0x00000040 +#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 0x00000080 +#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 0x00000100 /********************************************** ******************** GUIDs *******************

1 0

Dmitry Timoshkov : shlwapi: Correct .spec parameter types for Assoc* APIs.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: f49de6aa087e63d20ae061775bedafe56f45ebc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49de6aa087e63d20ae061775… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 4 15:11:06 2013 +0900 shlwapi: Correct .spec parameter types for Assoc* APIs. --- dlls/shlwapi/shlwapi.spec | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index aad095e..b7aac08 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -548,13 +548,13 @@ @ stdcall AssocCreate(int128 ptr ptr) @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr) -@ stdcall AssocIsDangerous(long) -@ stdcall AssocQueryKeyA(long long str ptr ptr) -@ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr) +@ stdcall AssocIsDangerous(wstr) +@ stdcall AssocQueryKeyA(long long str str ptr) +@ stdcall AssocQueryKeyW(long long wstr wstr ptr) +@ stdcall AssocQueryStringA(long long str str ptr ptr) +@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) +@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) +@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr) @ stdcall ChrCmpIA(long long) @ stdcall ChrCmpIW(long long) @ stdcall ColorAdjustLuma(long long long)

1 0

Christian Costa : strmbase: Display iface in traces and new ref in AddRef and Release for IEnumPins.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 163943058c39e9b63f25066acbe7c5299069ac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163943058c39e9b63f25066ac… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:33:57 2013 +0200 strmbase: Display iface in traces and new ref in AddRef and Release for IEnumPins. --- dlls/strmbase/enumpins.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index eab4d5b..6993bae 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -76,7 +76,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -99,28 +99,27 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); + ULONG ref = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - return refCount; + return ref; } static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); + ULONG ref = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); - return 0; } - else - return refCount; + + return ref; } static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) @@ -129,7 +128,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** HRESULT hr = S_OK; ULONG i = 0; - TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); + TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); if (!ppPins) return E_POINTER; @@ -168,7 +167,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%u)\n", cPins); + TRACE("(%p)->(%u)\n", iface, cPins); if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -184,7 +183,8 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("IEnumPinsImpl::Reset()\n"); + TRACE("(%p)->()\n", iface); + This->Version = This->receive_version(This->base); This->uIndex = 0; @@ -196,7 +196,7 @@ static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum HRESULT hr; IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumPins_Construct(This->base, This->receive_pin, This->receive_pincount, This->receive_version, ppEnum); if (FAILED(hr))

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface ().
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: a4d2660c9b1e24898c81944f9c59078943b563a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d2660c9b1e24898c81944f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:07 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface(). --- dlls/d3d10core/device.c | 14 +++++++------- dlls/d3d8/device.c | 17 ++++++++--------- dlls/d3d9/device.c | 16 ++++++++-------- dlls/ddraw/ddraw.c | 13 ++++++------- dlls/wined3d/texture.c | 22 ++++++++++++---------- include/wine/wined3d.h | 3 +-- 6 files changed, 42 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d2660c9b1e24898c819…

1 0

Henri Verbeet : wined3d: Properly set resource dimensions in wined3d_texture_init().
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 1276a3db041786d47f99c5c651b053d4cdbb8354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1276a3db041786d47f99c5c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:06 2013 +0200 wined3d: Properly set resource dimensions in wined3d_texture_init(). --- dlls/wined3d/texture.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a211976..2cf125f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,13 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, enum wined3d_resource_type resource_type, struct wined3d_device *device, - DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, void *parent, - const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) + DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, UINT width, UINT height, UINT depth, + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { HRESULT hr; hr = resource_init(&texture->resource, device, resource_type, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, 0, 0, 0, 0, + WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, 0, parent, parent_ops, resource_ops); if (FAILED(hr)) { @@ -822,10 +822,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt } } - hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - WINED3D_RTYPE_CUBE_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture2d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, WINED3D_RTYPE_CUBE_TEXTURE, device, + usage, format, pool, edge_length, edge_length, 1, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -948,10 +946,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("Calculated levels = %u.\n", levels); } - hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - WINED3D_RTYPE_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture2d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, WINED3D_RTYPE_TEXTURE, device, + usage, format, pool, width, height, 1, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1221,10 +1217,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U } } - hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - WINED3D_RTYPE_VOLUME_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture3d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, WINED3D_RTYPE_VOLUME_TEXTURE, device, + usage, format, pool, width, height, depth, parent, parent_ops, &texture3d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0

Christian Costa : d3dx9_36: Remove 'relay' in traces for functions that do not forward to another ones.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 550415ec78c66de5a6d0f799571456f4eadac803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550415ec78c66de5a6d0f7995… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:32:08 2013 +0200 d3dx9_36: Remove 'relay' in traces for functions that do not forward to another ones. --- dlls/d3dx9_36/line.c | 2 +- dlls/d3dx9_36/sprite.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 1ec643a..e305eb9 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -85,7 +85,7 @@ static HRESULT WINAPI ID3DXLineImpl_GetDevice(struct ID3DXLine *iface, struct ID { ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - TRACE ("(%p)->(%p): relay\n", This, device); + TRACE ("(%p)->(%p)\n", This, device); if (device == NULL) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 658b6ea..1f7defb 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -123,7 +123,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(struct ID3DXSprite *iface, struc { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); - TRACE("(%p)->(%p): relay\n", This, device); + TRACE("(%p)->(%p)\n", This, device); if(device==NULL) return D3DERR_INVALIDCALL; *device=This->device; @@ -258,7 +258,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Begin(ID3DXSprite *iface, DWORD flags) { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); HRESULT hr; - TRACE("(%p): relay\n", This); + + TRACE("(%p)->(%#x)\n", This, flags); if(flags>D3DXSPRITE_FLAGLIMIT || This->ready) return D3DERR_INVALIDCALL; @@ -384,7 +385,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(ID3DXSprite *iface) ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); SPRITEVERTEX *vertices; int i, count=0, start; - TRACE("(%p)->(): relay\n", This); + + TRACE("(%p)->()\n", This); if(!This->ready) return D3DERR_INVALIDCALL; if(!This->sprite_count) return D3D_OK; @@ -456,7 +458,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_End(ID3DXSprite *iface) { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); - TRACE("(%p)->(): relay\n", This); + TRACE("(%p)->()\n", This); if(!This->ready) return D3DERR_INVALIDCALL; @@ -534,7 +536,7 @@ HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSpr ID3DXSpriteImpl *object; D3DCAPS9 caps; - TRACE("(%p, %p): relay\n", device, sprite); + TRACE("(%p, %p)\n", device, sprite); if(device==NULL || sprite==NULL) return D3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to device_parent_create_swapchain_surface ().
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 13a38e8d5eb2d142ae43b5622dbf1a719fc68b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a38e8d5eb2d142ae43b5622… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:08 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to device_parent_create_swapchain_surface(). --- dlls/d3d10core/device.c | 19 ++++++++----------- dlls/d3d8/device.c | 15 ++++++--------- dlls/d3d9/device.c | 15 ++++++--------- dlls/ddraw/ddraw.c | 13 +++++-------- dlls/dxgi/device.c | 20 ++++++++++++++------ dlls/wined3d/device.c | 18 ++++++++++++++---- dlls/wined3d/swapchain.c | 35 +++++++++++++++++++++-------------- include/wine/wined3d.h | 4 +--- 8 files changed, 75 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13a38e8d5eb2d142ae43b…

1 0

Austin English : bugzilla: Change no bugs found message
by Jeremy Newman June 4, 2013

June 4, 2013

Module: bugzilla Branch: master Commit: 4f21a1d141b2530791bc6504974ba9016ec677bc URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4f21a1d141b2530791bc6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 3 14:16:50 2013 -0700 bugzilla: Change no bugs found message http://bugs.winehq.org/show_bug.cgi?id=33708 -- -Austin >From 7d265e5623b70bbe3ac1463c2dcebfbd4d7f97d6 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Mon, 3 Jun 2013 14:15:48 -0700 Subject: [PATCH] Change no bugs found message --- template/en/default/global/variables.none.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index faf1a54..d04440e 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -36,7 +36,7 @@ "ABug" => "A Bug", "bugs" => "bugs", "Bugs" => "Bugs", - "zeroSearchResults" => "Zarro Boogs found", + "zeroSearchResults" => "No bugs found", "Bugzilla" => "Bugzilla" } %]

1 0

Henri Verbeet : wined3d: Add base format info for some typeless formats.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 48d470f60c9e2388411f3ed688fb440f439f3d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d470f60c9e2388411f3ed68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:34 2013 +0200 wined3d: Add base format info for some typeless formats. --- dlls/wined3d/utils.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7c4f188..b83a05a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,6 +136,17 @@ static const struct wined3d_format_channels formats[] = /* Unsure about them, could not find a Windows driver that supports them */ {WINED3DFMT_R16, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_AL16, 0, 0, 0, 16, 0, 0, 0, 16, 4, 0, 0}, + /* Typeless */ + {WINED3DFMT_R8_TYPELESS, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_R8G8_TYPELESS, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, + {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, + {WINED3DFMT_R16_TYPELESS, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, + {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, + {WINED3DFMT_R16G16B16A16_TYPELESS, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, + {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, + {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, + {WINED3DFMT_R32G32B32_TYPELESS, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, + {WINED3DFMT_R32G32B32A32_TYPELESS, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, }; struct wined3d_format_base_flags

1 0

Christian Costa : d3dxof: Fix list of float and integer in binary mode.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 4102d8a0dc1b02d37d834f17d1925f3b0de6e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4102d8a0dc1b02d37d834f17d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:47 2013 +0200 d3dxof: Fix list of float and integer in binary mode. --- dlls/d3dxof/d3dxof_private.h | 1 + dlls/d3dxof/parsing.c | 30 ++++++++++++++++++------------ dlls/d3dxof/tests/d3dxof.c | 4 ++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 7812fff..cf33ed2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -127,6 +127,7 @@ typedef struct { BOOL txt; DWORD list_nb_elements; BOOL list_type_float; + BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 9335fdc..5df6f4c 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -743,16 +743,26 @@ static WORD parse_TOKEN(parse_buffer * buf) if (buf->list_nb_elements) { - token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; - buf->list_nb_elements--; - { - DWORD integer; + if (buf->list_separator) + { + buf->list_nb_elements--; + buf->list_separator = FALSE; + /* Insert separarator between each values and since list does not accept separator at the end + use a comma so any extra separator will generate an error */ + token = TOKEN_COMMA; + } + else + { + DWORD value; - if (!read_bytes(buf, &integer, 4)) - return TOKEN_ERROR; + if (!read_bytes(buf, &value, 4)) + return TOKEN_ERROR; + *(DWORD*)buf->value = value; - *(DWORD*)buf->value = integer; - } + buf->list_separator = TRUE; + /* Convert list into a serie of their basic type counterpart */ + token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; + } dump_TOKEN(token); return token; } @@ -1288,10 +1298,6 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { buf->pxo->size = buf->cur_pos_data - buf->pxo->pos_data; - /* Skip trailing semicolon */ - while (check_TOKEN(buf) == TOKEN_SEMICOLON) - get_TOKEN(buf); - while (1) { if (check_TOKEN(buf) == TOKEN_OBRACE) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index ecd4ba5..83fd23d 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -921,11 +921,11 @@ static void test_syntax_semicolon_comma(void) /* Test object with a single integer list in binary mode */ ret = test_buffer_object(dxfile, object_syntax_full_integer_list_bin, sizeof(object_syntax_full_integer_list_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test object with mixed integer list and integers + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test integer list followed by a semicolon in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin));

1 0