December 2012 - Wine-commits

Andrew Talbot : gdiplus: Remove unneeded address-of operator from array name.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: e4351708d5579d6590e4e5a384b9cdb2073b48f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4351708d5579d6590e4e5a38… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 22:42:32 2012 +0000 gdiplus: Remove unneeded address-of operator from array name. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8cec80d..e5678a7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -465,7 +465,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst GetRegionData(hrgn, size, rgndata); - rects = (RECT*)&rgndata->Buffer; + rects = (RECT*)rgndata->Buffer; for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) {

1 0

Andrew Talbot : comctl32: Remove unneeded address-of operators from array names.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: da715453194c7295bf2d7d1460f870e6bd8a42b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da715453194c7295bf2d7d146… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 22:42:28 2012 +0000 comctl32: Remove unneeded address-of operators from array names. --- dlls/comctl32/datetime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d36032f..748e0fc 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -178,7 +178,7 @@ static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYST (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; - limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM)range); if (limits & GDTR_MAX) { @@ -585,7 +585,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) } /* Ensure time is within bounds */ - limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM)range); min = delta < 0; if (limits & (min ? GDTR_MIN : GDTR_MAX))

1 0

Michael Stefaniuc : qmgr: Merge a helper function.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 7183c6953107291e276cd9ee027d87385ed83d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7183c6953107291e276cd9ee0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:57:52 2012 +0100 qmgr: Merge a helper function. --- dlls/qmgr/enum_files.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 05659cf..aeb9d64 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -32,17 +32,6 @@ typedef struct ULONG indexFiles; } EnumBackgroundCopyFilesImpl; -static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) -{ - ULONG i; - - for(i = 0; i < This->numFiles; i++) - IBackgroundCopyFile_Release(This->files[i]); - - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); -} - static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); @@ -77,9 +66,15 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFil { EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; if (ref == 0) - EnumBackgroundCopyFilesDestructor(This); + { + for(i = 0; i < This->numFiles; i++) + IBackgroundCopyFile_Release(This->files[i]); + HeapFree(GetProcessHeap(), 0, This->files); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 49e6d411b07c922a0324026c05bc03e4ad6c80f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e6d411b07c922a0324026c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:53:15 2012 +0100 qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface. --- dlls/qmgr/enum_files.c | 84 +++++++++++++++++++++++++----------------------- dlls/qmgr/qmgr.h | 10 ------ 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index d7f36cd..05659cf 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +typedef struct +{ + IEnumBackgroundCopyFiles IEnumBackgroundCopyFiles_iface; + LONG ref; + IBackgroundCopyFile **files; + ULONG numFiles; + ULONG indexFiles; +} EnumBackgroundCopyFilesImpl; + static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) { ULONG i; @@ -34,37 +43,39 @@ static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef( - IEnumBackgroundCopyFiles* iface) +static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - return InterlockedIncrement(&This->ref); + return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface( - IEnumBackgroundCopyFiles* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface(IEnumBackgroundCopyFiles *iface, + REFIID riid, void **ppv) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyFiles_AddRef(iface); + *ppv = iface; + IEnumBackgroundCopyFiles_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( - IEnumBackgroundCopyFiles* iface) +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -74,13 +85,10 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( } /* Return reference to one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( - IEnumBackgroundCopyFiles* iface, - ULONG celt, - IBackgroundCopyFile **rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next(IEnumBackgroundCopyFiles *iface, + ULONG celt, IBackgroundCopyFile **rgelt, ULONG *pceltFetched) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG fetched; ULONG i; IBackgroundCopyFile *file; @@ -115,11 +123,10 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( } /* Skip over one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( - IEnumBackgroundCopyFiles* iface, - ULONG celt) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip(IEnumBackgroundCopyFiles *iface, + ULONG celt) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); if (celt > This->numFiles - This->indexFiles) { @@ -131,27 +138,24 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( - IEnumBackgroundCopyFiles* iface) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); This->indexFiles = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( - IEnumBackgroundCopyFiles* iface, - IEnumBackgroundCopyFiles **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone(IEnumBackgroundCopyFiles *iface, + IEnumBackgroundCopyFiles **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( - IEnumBackgroundCopyFiles* iface, - ULONG *puCount) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount(IEnumBackgroundCopyFiles *iface, + ULONG *puCount) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); *puCount = This->numFiles; return S_OK; } @@ -181,7 +185,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; + This->IEnumBackgroundCopyFiles_iface.lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; This->ref = 1; /* Create array of files */ @@ -210,6 +214,6 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i } LeaveCriticalSection(&job->cs); - *ppObj = &This->lpVtbl; + *ppObj = &This->IEnumBackgroundCopyFiles_iface; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 4bd1e34..93fcd0e 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -46,16 +46,6 @@ typedef struct struct list entryFromQmgr; } BackgroundCopyJobImpl; -/* Enum background copy files vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyFilesVtbl *lpVtbl; - LONG ref; - IBackgroundCopyFile **files; - ULONG numFiles; - ULONG indexFiles; -} EnumBackgroundCopyFilesImpl; - /* Background copy file vtbl and related data */ typedef struct {

1 0

Francois Gouget : testbot/VMs: Work around the lack of Domain:: get_snapshot_by_name() in older libsys-virt-perl versions.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 804dbf8b1ce6e6b1fe2088e4950a66579d6f5aba URL: http://source.winehq.org/git/tools.git/?a=commit;h=804dbf8b1ce6e6b1fe2088e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:57:48 2012 +0100 testbot/VMs: Work around the lack of Domain::get_snapshot_by_name() in older libsys-virt-perl versions. --- testbot/lib/WineTestBot/VMs.pm | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 4be607a..82ad379 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -277,7 +277,18 @@ sub _GetSnapshot($$) return $ErrMessage if (defined $ErrMessage); my $Snapshot; - eval { $Snapshot = $Domain->get_snapshot_by_name($SnapshotName) }; + eval { + # Work around the lack of get_snapshot_by_name() in older libvirt versions. + foreach my $Snap ($Domain->list_snapshots()) + { + if ($Snap->get_name() eq $SnapshotName) + { + $Snapshot = $Snap; + last; + } + } + $@ = "Snapshot '$SnapshotName' not found" if (!$Snapshot); + }; return ($@->message(), undef, undef) if ($@); return (undef, $Domain, $Snapshot); }

1 0

Francois Gouget : testbot/TestAgent: Fix the Ping() RPC.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 69d6211ba314e2a1504f5394cff96c04c4072dc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=69d6211ba314e2a1504f5394… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:58:12 2012 +0100 testbot/TestAgent: Fix the Ping() RPC. It's not used for the connection setup so it can be implemented normally. --- testbot/lib/WineTestBot/TestAgent.pm | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e0066c5..8bc3e59 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -848,16 +848,6 @@ sub _Connect($) return 1; } -sub _Ping($) -{ - my ($self) = @_; - - # Send the RPC and get the reply - return $self->_SendRawUInt32($RPC_PING) && - $self->_SendListSize(0) && - $self->_RecvList(''); -} - sub _StartRPC($$) { my ($self, $RpcId) = @_; @@ -892,7 +882,11 @@ sub _StartRPC($$) sub Ping($) { my ($self) = @_; - return $self->_StartRPC($RPC_PING); + + # Send the RPC and get the reply + return $self->_StartRPC($RPC_PING) && + $self->_SendListSize(0) && + $self->_RecvList(''); } sub GetVersion($)

1 0

Francois Gouget : testbot/TestAgent: Fix handling of unknown RPCs.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: a4c232a4d7faafc4f43dce2036b43b154d00abae URL: http://source.winehq.org/git/tools.git/?a=commit;h=a4c232a4d7faafc4f43dce20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:58:24 2012 +0100 testbot/TestAgent: Fix handling of unknown RPCs. We must set the error message otherwise it could be uninitialized. --- testbot/src/testagentd/testagentd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index edb1a24..bb50d91 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -862,6 +862,7 @@ static void do_unknown(SOCKET client, uint32_t id) if (recv_list_size(client, &argc)) skip_entries(client, argc); + set_status(ST_ERROR, "unknown RPC %s", rpc_name(id)); send_error(client); }

1 0

Francois Gouget : testbot/TestAgent: Tweak the getfile RPC error handling.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 6dcdc3c5153cbc0a9d179624cb81b8198adf8fb4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6dcdc3c5153cbc0a9d179624… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 21:01:02 2012 +0100 testbot/TestAgent: Tweak the getfile RPC error handling. Send the error message from the do_xxx() function like we do for all other RPCs rather than from the lower level send_file() function. --- testbot/src/testagentd/testagentd.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index bb50d91..6d4589e 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -542,12 +542,12 @@ static int send_file(SOCKET client, int fd, const char* filename) debug(" send_file(%s)\n", filename); if (fstat(fd, &st)) { - set_status(ST_ERROR, "unable to compute the size of '%s': %s", filename, strerror(errno)); - send_error(client); + set_status(ST_ERROR, "unable to get the size of '%s': %s", filename, strerror(errno)); return 0; } size = st.st_size; - send_entry_header(client, 'd', size); + if (!send_entry_header(client, 'd', size)) + return 0; while (size) { @@ -612,12 +612,18 @@ static void do_getfile(SOCKET client) } else { - send_list_size(client, 1); - send_file(client, fd, filename); + if (!send_list_size(client, 1) || + !send_file(client, fd, filename)) + { + /* If the file is not accessible then send_file() will fail and we + * can still salvage the connection by sending the error message + * in place of the file content. In all the other cases the + * connection is broken anyway which send_error() will deal with + * just fine. + */ + send_error(client); + } close(fd); - /* Trying to report the status now would be pointless: either - * the client got all the data fine or the connection is busted. - */ } free(filename); }

1 0

Francois Gouget : testbot/TestAgent: Remove some unneeded checks for a broken connection.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 2ff8c9c40724bdd5771ab92d197c2438639c01c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ff8c9c40724bdd5771ab92d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 21:01:13 2012 +0100 testbot/TestAgent: Remove some unneeded checks for a broken connection. These checks are redundant with the first recv_xxx() or send_xxx() call these functions make (only send_file() is a slightly special case). --- testbot/src/testagentd/testagentd.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 6d4589e..fc3a840 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -215,9 +215,6 @@ static int recv_raw_data(SOCKET client, void* data, uint64_t size) static int recv_raw_uint32(SOCKET client, uint32_t *u32) { - if (broken) - return 0; - if (!recv_raw_data(client, u32, sizeof(*u32))) return 0; *u32 = ntohl(*u32); @@ -228,9 +225,6 @@ static int recv_raw_uint64(SOCKET client, uint64_t *u64) { uint32_t high, low; - if (broken) - return 0; - if (!recv_raw_uint32(client, &high) || !recv_raw_uint32(client, &low)) return 0; *u64 = ((uint64_t)high) << 32 | low; @@ -244,9 +238,6 @@ static int recv_raw_uint64(SOCKET client, uint64_t *u64) static int recv_entry_header(SOCKET client, char *type, uint64_t *size) { - if (broken) - return 0; - return recv_raw_data(client, type, sizeof(*type)) && recv_raw_uint64(client, size); } @@ -259,9 +250,6 @@ static int expect_entry_header(SOCKET client, char type, uint64_t *size) uint64_t hsize; int success; - if (broken) - return 0; - if (!recv_entry_header(client, &htype, &hsize)) return 0;

1 0

Rico Schüller : d3dx9: Improve D3DXMatrixRotationYawPitchRoll().
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 2cb1372350dd93abf7e06a4fb4f5521c9b7a85fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb1372350dd93abf7e06a4fb… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 4 22:10:46 2012 +0100 d3dx9: Improve D3DXMatrixRotationYawPitchRoll(). --- dlls/d3dx9_36/math.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e09dbec..54dda6e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -631,20 +631,37 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) return pout; } -D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +D3DXMATRIX * WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *out, FLOAT yaw, FLOAT pitch, FLOAT roll) { - D3DXMATRIX m; + FLOAT sroll, croll, spitch, cpitch, syaw, cyaw; - TRACE("(%p, %f, %f, %f)\n", pout, yaw, pitch, roll); + TRACE("out %p, yaw %f, pitch %f, roll %f\n", out, yaw, pitch, roll); - D3DXMatrixIdentity(pout); - D3DXMatrixRotationZ(&m, roll); - D3DXMatrixMultiply(pout, pout, &m); - D3DXMatrixRotationX(&m, pitch); - D3DXMatrixMultiply(pout, pout, &m); - D3DXMatrixRotationY(&m, yaw); - D3DXMatrixMultiply(pout, pout, &m); - return pout; + sroll = sinf(roll); + croll = cosf(roll); + spitch = sinf(pitch); + cpitch = cosf(pitch); + syaw = sinf(yaw); + cyaw = cosf(yaw); + + out->u.m[0][0] = sroll * spitch * syaw + croll * cyaw; + out->u.m[0][1] = sroll * cpitch; + out->u.m[0][2] = sroll * spitch * cyaw - croll * syaw; + out->u.m[0][3] = 0.0f; + out->u.m[1][0] = croll * spitch * syaw - sroll * cyaw; + out->u.m[1][1] = croll * cpitch; + out->u.m[1][2] = croll * spitch * cyaw + sroll * syaw; + out->u.m[1][3] = 0.0f; + out->u.m[2][0] = cpitch * syaw; + out->u.m[2][1] = -spitch; + out->u.m[2][2] = cpitch * cyaw; + out->u.m[2][3] = 0.0f; + out->u.m[3][0] = 0.0f; + out->u.m[3][1] = 0.0f; + out->u.m[3][2] = 0.0f; + out->u.m[3][3] = 1.0f; + + return out; } D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle)

1 0