March 2014 - Wine-commits - list.winehq.org

Michael Stefaniuc : avifil32: Merge IAVIStream into the WAVFile object.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 5c12f6bdc972a1fd9e0998894501948c6b8bd784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c12f6bdc972a1fd9e0998894… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 3 22:10:31 2014 +0100 avifil32: Merge IAVIStream into the WAVFile object. --- dlls/avifil32/wavfile.c | 132 +++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c12f6bdc972a1fd9e099…

1 0

Michael Stefaniuc : avifil32: Avoid forward declarations of COM methods.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 9f2f30c4124817dc294891f3b09259c825f06e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2f30c4124817dc294891f3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 3 22:12:34 2014 +0100 avifil32: Avoid forward declarations of COM methods. --- dlls/avifil32/wavfile.c | 174 +++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 105 deletions(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 00b18b3..60dab03 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -87,84 +87,6 @@ typedef struct { /***********************************************************************/ -static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface); -static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface); -static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size); -static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam); -static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi); -static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size); -static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size); -static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface); -static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); - -static const struct IAVIFileVtbl iwavft = { - IAVIFile_fnQueryInterface, - IAVIFile_fnAddRef, - IAVIFile_fnRelease, - IAVIFile_fnInfo, - IAVIFile_fnGetStream, - IAVIFile_fnCreateStream, - IAVIFile_fnWriteData, - IAVIFile_fnReadData, - IAVIFile_fnEndRecord, - IAVIFile_fnDeleteStream -}; - -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile*iface,REFIID refiid,LPVOID*obj); -static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile*iface); -static ULONG WINAPI IPersistFile_fnRelease(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile*iface,CLSID*pClassID); -static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile*iface,LPCOLESTR pszFileName,DWORD dwMode); -static HRESULT WINAPI IPersistFile_fnSave(IPersistFile*iface,LPCOLESTR pszFileName,BOOL fRemember); -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName); -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); - -static const struct IPersistFileVtbl iwavpft = { - IPersistFile_fnQueryInterface, - IPersistFile_fnAddRef, - IPersistFile_fnRelease, - IPersistFile_fnGetClassID, - IPersistFile_fnIsDirty, - IPersistFile_fnLoad, - IPersistFile_fnSave, - IPersistFile_fnSaveCompleted, - IPersistFile_fnGetCurFile -}; - -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iwavst = { - IAVIStream_fnQueryInterface, - IAVIStream_fnAddRef, - IAVIStream_fnRelease, - IAVIStream_fnCreate, - IAVIStream_fnInfo, - IAVIStream_fnFindSample, - IAVIStream_fnReadFormat, - IAVIStream_fnSetFormat, - IAVIStream_fnRead, - IAVIStream_fnWrite, - IAVIStream_fnDelete, - IAVIStream_fnReadData, - IAVIStream_fnWriteData, - IAVIStream_fnSetInfo -}; - typedef struct _IAVIFileImpl { IUnknown IUnknown_inner; IAVIFile IAVIFile_iface; @@ -273,33 +195,6 @@ static const IUnknownVtbl unk_vtbl = IUnknown_fnRelease }; -HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) -{ - IAVIFileImpl *pfile; - HRESULT hr; - - *ret_iface = NULL; - - pfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIFileImpl)); - if (pfile == NULL) - return AVIERR_MEMORY; - - pfile->IUnknown_inner.lpVtbl = &unk_vtbl; - pfile->IAVIFile_iface.lpVtbl = &iwavft; - pfile->IPersistFile_iface.lpVtbl = &iwavpft; - pfile->IAVIStream_iface.lpVtbl = &iwavst; - pfile->ref = 1; - if (outer_unk) - pfile->outer_unk = outer_unk; - else - pfile->outer_unk = &pfile->IUnknown_inner; - - hr = IUnknown_QueryInterface(&pfile->IUnknown_inner, riid, ret_iface); - IUnknown_Release(&pfile->IUnknown_inner); - - return hr; -} - static inline IAVIFileImpl *impl_from_IAVIFile(IAVIFile *iface) { return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIFile_iface); @@ -515,6 +410,19 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO return AVIERR_OK; } +static const struct IAVIFileVtbl iwavft = { + IAVIFile_fnQueryInterface, + IAVIFile_fnAddRef, + IAVIFile_fnRelease, + IAVIFile_fnInfo, + IAVIFile_fnGetStream, + IAVIFile_fnCreateStream, + IAVIFile_fnWriteData, + IAVIFile_fnReadData, + IAVIFile_fnEndRecord, + IAVIFile_fnDeleteStream +}; + /***********************************************************************/ static inline IAVIFileImpl *impl_from_IPersistFile(IPersistFile *iface) @@ -673,6 +581,18 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p return AVIERR_OK; } +static const struct IPersistFileVtbl iwavpft = { + IPersistFile_fnQueryInterface, + IPersistFile_fnAddRef, + IPersistFile_fnRelease, + IPersistFile_fnGetClassID, + IPersistFile_fnIsDirty, + IPersistFile_fnLoad, + IPersistFile_fnSave, + IPersistFile_fnSaveCompleted, + IPersistFile_fnGetCurFile +}; + /***********************************************************************/ static inline IAVIFileImpl *impl_from_IAVIStream(IAVIStream *iface) @@ -1039,6 +959,50 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, return E_FAIL; } +static const struct IAVIStreamVtbl iwavst = { + IAVIStream_fnQueryInterface, + IAVIStream_fnAddRef, + IAVIStream_fnRelease, + IAVIStream_fnCreate, + IAVIStream_fnInfo, + IAVIStream_fnFindSample, + IAVIStream_fnReadFormat, + IAVIStream_fnSetFormat, + IAVIStream_fnRead, + IAVIStream_fnWrite, + IAVIStream_fnDelete, + IAVIStream_fnReadData, + IAVIStream_fnWriteData, + IAVIStream_fnSetInfo +}; + +HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) +{ + IAVIFileImpl *pfile; + HRESULT hr; + + *ret_iface = NULL; + + pfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pfile)); + if (!pfile) + return AVIERR_MEMORY; + + pfile->IUnknown_inner.lpVtbl = &unk_vtbl; + pfile->IAVIFile_iface.lpVtbl = &iwavft; + pfile->IPersistFile_iface.lpVtbl = &iwavpft; + pfile->IAVIStream_iface.lpVtbl = &iwavst; + pfile->ref = 1; + if (outer_unk) + pfile->outer_unk = outer_unk; + else + pfile->outer_unk = &pfile->IUnknown_inner; + + hr = IUnknown_QueryInterface(&pfile->IUnknown_inner, riid, ret_iface); + IUnknown_Release(&pfile->IUnknown_inner); + + return hr; +} + /***********************************************************************/ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)

1 0

Stefan Leichter : comdlg32: Update version resource to values reported from XP.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 73a2408f27a7454f9fccd3558dd20286d52eda25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a2408f27a7454f9fccd3558… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Mar 3 23:19:30 2014 +0100 comdlg32: Update version resource to values reported from XP. --- dlls/comdlg32/comdlg32.rc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 6942194..32eded5 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -497,8 +497,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Common Dialog Boxes" #define WINE_FILENAME_STR "comdlg32.dll" -#define WINE_FILEVERSION 4,0,0,950 /* Maybe 4.1.0.980 for win98?? */ -#define WINE_FILEVERSION_STR "4.0" +#define WINE_FILEVERSION 6,0,2900,5512 +#define WINE_FILEVERSION_STR "6.00.2900.5512" +#define WINE_PRODUCTVERSION 6,0,2900,5512 +#define WINE_PRODUCTVERSION_STR "6.00.2900.5512" #include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : msxml3: Added partial implementation of IVBSAXContentHandler for MXWriter.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: d745e612accdb831112e0363ed3e483ec0c76aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d745e612accdb831112e0363e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 4 10:57:26 2014 +0400 msxml3: Added partial implementation of IVBSAXContentHandler for MXWriter. --- dlls/msxml3/mxwriter.c | 186 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 33 +++++++- 2 files changed, 216 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d745e612accdb831112e0…

1 0

Stefan Dösinger : ole32: Make CoCreateInstance hookable for Steam.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 97569e4e4ac4200b49aa40fea3264cebccb63549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97569e4e4ac4200b49aa40fea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:36 2014 +0100 ole32: Make CoCreateInstance hookable for Steam. --- dlls/ole32/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4429627..8ded196 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3146,7 +3146,7 @@ HRESULT WINAPI CoResumeClassObjects(void) * SEE ALSO * CoGetClassObject() */ -HRESULT WINAPI CoCreateInstance( +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext,

1 0

Stefan Dösinger : user32: Make SetWindowTextA/ W hookable.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: ece57889d6de006ffaa24569dac6fe0090182d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece57889d6de006ffaa24569d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:37 2014 +0100 user32: Make SetWindowTextA/W hookable. --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 29f2365..9e30321 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2739,7 +2739,7 @@ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) * SetWindowTextA (USER32.@) * SetWindowText (USER32.@) */ -BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextA( HWND hwnd, LPCSTR lpString ) { if (is_broadcast(hwnd)) { @@ -2756,7 +2756,7 @@ BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) /******************************************************************* * SetWindowTextW (USER32.@) */ -BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString ) +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString ) { if (is_broadcast(hwnd)) {

1 0

Stefan Dösinger : d3d9: Make ResetEx and PresentEx hookable.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 7f675174c8a25cc04ad09702dfb6a7d649d74576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f675174c8a25cc04ad09702d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:38 2014 +0100 d3d9: Make ResetEx and PresentEx hookable. --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 73ac97f..66bee95 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3066,7 +3066,7 @@ static HRESULT WINAPI d3d9_device_ComposeRects(IDirect3DDevice9Ex *iface, return E_NOTIMPL; } -static HRESULT WINAPI d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { @@ -3185,7 +3185,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex return E_NOTIMPL; } -static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);

1 0

Stefan Dösinger : winmm: Make some joystick functions hookable.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 858bb223b4db0b58479f2205083de4cef0e0b5c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858bb223b4db0b58479f22050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:39 2014 +0100 winmm: Make some joystick functions hookable. --- dlls/winmm/joystick.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 996a4fa..ddd556d 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -136,7 +136,7 @@ MMRESULT WINAPI joyConfigChanged(DWORD flags) /************************************************************************** * joyGetNumDevs [WINMM.@] */ -UINT WINAPI joyGetNumDevs(void) +UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) { UINT ret = 0; int i; @@ -152,7 +152,7 @@ UINT WINAPI joyGetNumDevs(void) /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) { if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; @@ -166,7 +166,7 @@ MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) { JOYCAPSW jcw; MMRESULT ret; @@ -215,7 +215,7 @@ MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) /************************************************************************** * joyGetPosEx [WINMM.@] */ -MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) { TRACE("(%d, %p);\n", wID, lpInfo);

1 0

Matteo Bruni : d3dx9: Turn D3DXCreateEffectEx FIXME into a TRACE, improve it a bit.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: c6fefc20a64fec183466bd5bec6d1d5161951a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fefc20a64fec183466bd5be… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:11 2014 +0100 d3dx9: Turn D3DXCreateEffectEx FIXME into a TRACE, improve it a bit. --- dlls/d3dx9_36/effect.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a4325af..03118b5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5294,8 +5294,10 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s struct ID3DXEffectImpl *object; HRESULT hr; - FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, - skip_constants, flags, pool, effect, compilation_errors); + TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p," + " skip_constants %p, flags %#x, pool %p, effect %p, compilation_errors %p.\n", + device, srcdata, srcdatalen, defines, include, + skip_constants, flags, pool, effect, compilation_errors); if (compilation_errors) *compilation_errors = NULL; @@ -5310,6 +5312,9 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (!effect) return D3D_OK; + if (skip_constants) + FIXME("skip_constants is not NULL, not supported yet.\n"); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY;

1 0

Matteo Bruni : d3dx9: Always use type-> Rows as D3DXPC_MATRIX_ROWS parameters size.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 8b5cd9edbcc94267d5ed6ae0ba6b8d34b19ee341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5cd9edbcc94267d5ed6ae0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:12 2014 +0100 d3dx9: Always use type->Rows as D3DXPC_MATRIX_ROWS parameters size. --- dlls/d3dx9_36/shader.c | 8 ++++---- dlls/d3dx9_36/tests/shader.c | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 955c2ad..68e7474 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1775,7 +1775,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = }; static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, struct ctab_constant *constant, - BOOL is_element, WORD index, WORD max, DWORD *offset, DWORD nameoffset, UINT regset) + BOOL is_element, WORD index, WORD max_index, DWORD *offset, DWORD nameoffset, UINT regset) { const D3DXSHADER_TYPEINFO *type = (LPD3DXSHADER_TYPEINFO)(ctab + typeoffset); const D3DXSHADER_STRUCTMEMBERINFO *memberinfo = NULL; @@ -1824,7 +1824,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru for (i = 0; i < count; ++i) { hr = parse_ctab_constant_type(ctab, memberinfo ? memberinfo[i].TypeInfo : typeoffset, - &constant->constants[i], memberinfo == NULL, index + size, max, offset, + &constant->constants[i], memberinfo == NULL, index + size, max_index, offset, memberinfo ? memberinfo[i].Name : nameoffset, regset); if (hr != D3D_OK) goto error; @@ -1859,7 +1859,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru case D3DXPC_MATRIX_ROWS: offsetdiff = type->Rows * 4; - size = is_element ? type->Rows : max(type->Rows, type->Columns); + size = type->Rows; break; case D3DXPC_MATRIX_COLUMNS: @@ -1893,7 +1893,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru if (offset) *offset += offsetdiff * 4; } - constant->desc.RegisterCount = max(0, min(max - index, size)); + constant->desc.RegisterCount = max(0, min(max_index - index, size)); constant->desc.Bytes = 4 * constant->desc.Elements * type->Rows * type->Columns; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 74ada6e..80c0f64 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -120,7 +120,7 @@ static const DWORD ctab_matrices[] = { 0x000000ac, 0x00000058, 0x00070002, 0x00000001, 0x00000064, 0x00000000, /* Constant 1 desc (fmatrix3x1) */ 0x00000074, 0x00000002, 0x00000004, 0x00000080, 0x00000000, /* Constant 2 desc (fmatrix4x4) */ - 0x00000090, 0x00040002, 0x00000003, 0x0000009c, 0x00000000, /* Constant 3 desc (imatrix2x3) */ + 0x00000090, 0x00040002, 0x00000002, 0x0000009c, 0x00000000, /* Constant 3 desc (imatrix2x3) */ 0x74616D66, 0x33786972, 0xab003178, /* Constant 1 name */ 0x00030003, 0x00010003, 0x00000001, 0x00000000, /* Constant 1 type desc */ 0x74616D66, 0x34786972, 0xab003478, /* Constant 2 name */ @@ -133,8 +133,9 @@ static const DWORD ctab_matrices[] = { static const D3DXCONSTANT_DESC ctab_matrices_expected[] = { {"fmatrix4x4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, - {"imatrix2x3", D3DXRS_FLOAT4, 4, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, NULL}, - {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, NULL}}; + {"imatrix2x3", D3DXRS_FLOAT4, 4, 2, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, NULL}, + {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, NULL}, +}; static const DWORD ctab_matrices2[] = { 0xfffe0200, /* vs_2_0 */

1 0