February 2008 - Wine-Commits

Andrew Talbot : dmime: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: be2f48cdd4ec24fd69ebf3125d334f1948dee80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2f48cdd4ec24fd69ebf3125… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 15:19:10 2008 +0000 dmime: Assign to structs instead of using memcpy. --- dlls/dmime/segment.c | 22 +++++++++++----------- dlls/dmime/segtriggertrack.c | 4 ++-- dlls/dmime/seqtrack.c | 4 ++-- dlls/dmime/sysextrack.c | 4 ++-- dlls/dmime/tempotrack.c | 6 +++--- dlls/dmime/timesigtrack.c | 4 ++-- dlls/dmime/wavetrack.c | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index badc334..64ffb51 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -541,12 +541,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_GetDescriptor static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -554,9 +554,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -579,11 +579,11 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p,%p, %p)\n", This, pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicSegment, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicSegment; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -771,7 +771,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_Release (LPPERSISTST static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicSegment, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicSegment; return S_OK; } @@ -1302,9 +1302,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicSegment, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicSegment; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Tracks); - + return IDirectMusicSegment8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 06237e0..0e341ae 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -237,7 +237,7 @@ static ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSIS static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicSegTriggerTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicSegTriggerTrack; return S_OK; } @@ -527,7 +527,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicSegTriggerTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSegTriggerTrack; track->ref = 0; /* will be inited by QueryInterface */ list_init (&track->Items); diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index e2eaecf..6e8823d 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID *ppobj, track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicSeqTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSeqTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicSeqTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 3ec8c6c..d69d9ff 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID *ppob track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicSysExTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSysExTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicSysExTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index ea46632..5573a5a 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -310,7 +310,7 @@ static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicTempoTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicTempoTrack; return S_OK; } @@ -352,7 +352,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA ERR(": no more memory\n"); return E_OUTOFMEMORY; } - memcpy(&pNewItem->item, &item, sizeof(DMUS_IO_TEMPO_ITEM)); + pNewItem->item = item; list_add_tail (&This->Items, &pNewItem->entry); pNewItem = NULL; StreamCount += sizeof(item); @@ -414,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID *ppob track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicTempoTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicTempoTrack; track->ref = 0; /* will be inited by QueryInterface */ track->enabled = TRUE; list_init (&track->Items); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index f64e9e1..2ef1cb2 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID *pp track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicTimeSigTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicTimeSigTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index fadfafa..f257d12 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -285,8 +285,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID *ppobj track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicWaveTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicWaveTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicWaveTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

Andrew Talbot : dmloader: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 4cd6ef739d4699f4ccfa53c3256af5c46f06193b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd6ef739d4699f4ccfa53c32… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 16:58:32 2008 +0000 dmloader: Assign to structs instead of using memcpy. --- dlls/dmloader/container.c | 18 +++++++++--------- dlls/dmloader/loader.c | 32 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index d4fc4d9..98fbf51 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -120,7 +120,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject result = DMUS_S_STRING_TRUNCATED; } if (pDesc) - memcpy (pDesc, &pContainedObject->Desc, sizeof(DMUS_OBJECTDESC)); + *pDesc = pContainedObject->Desc; return result; } dwCount++; @@ -171,10 +171,10 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_GetDescriptor ERR(": pDesc bad write pointer\n"); return E_POINTER; } - + DM_STRUCT_INIT(pDesc); - memcpy (pDesc, &This->Desc, sizeof(DMUS_OBJECTDESC)); - + *pDesc = This->Desc; + return S_OK; } @@ -199,7 +199,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_SetDescriptor } if (pDesc->dwValidData & DMUS_OBJ_OBJECT) { - memcpy (&This->Desc.guidObject, &pDesc->guidObject, sizeof(GUID)); + This->Desc.guidObject = pDesc->guidObject; dwNewFlags |= DMUS_OBJ_OBJECT; } if (pDesc->dwValidData & DMUS_OBJ_NAME) { @@ -276,7 +276,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescript TRACE_(dmfile)(": container form\n"); /* set guidClass */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicContainer, sizeof(CLSID)); + pDesc->guidClass = CLSID_DirectMusicContainer; do { IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; @@ -490,7 +490,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINER_FORM: { TRACE_(dmfile)(": container form\n"); - memcpy (&This->Desc.guidClass, &CLSID_DirectMusicContainer, sizeof(CLSID)); + This->Desc.guidClass = CLSID_DirectMusicContainer; This->Desc.dwValidData |= DMUS_OBJ_CLASS; do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); @@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST TRACE_(dmdump)(": contained object header: \n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); /* copy guidClass */ pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pNewEntry->Desc.guidClass, &tmpObjectHeader.guidClassID, sizeof(GUID)); + pNewEntry->Desc.guidClass = tmpObjectHeader.guidClassID; /* store flags */ pNewEntry->dwFlags = tmpObjectHeader.dwFlags; break; @@ -648,7 +648,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST if (!IsEqualCLSID (&pNewEntry->Desc.guidClass, &tmpReferenceHeader.guidClassID)) ERR(": object header declares different CLSID than reference header?\n"); /* it shouldn't be necessary to copy guidClass, since it was set in contained object header already... yet if they happen to be different, I'd rather stick to this one */ - memcpy (&pNewEntry->Desc.guidClass, &tmpReferenceHeader.guidClassID, sizeof(GUID)); + pNewEntry->Desc.guidClass = tmpReferenceHeader.guidClassID; pNewEntry->Desc.dwValidData |= tmpReferenceHeader.dwValidData; break; } diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b920d9c..8f1f2c2 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -492,7 +492,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (L DMUS_OBJECTDESC Desc; DM_STRUCT_INIT(&Desc); Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_DATE; - memcpy (&Desc.guidClass, rguidClass, sizeof(GUID)); + Desc.guidClass = *rguidClass; strcpyW (Desc.wszFileName, FileData.cFileName); FileTimeToLocalFileTime (&FileData.ftCreationTime, &Desc.ftDate); IDirectMusicLoader8_SetObject (iface, &Desc); @@ -690,15 +690,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDI LPWINE_LOADER_ENTRY pObjectEntry; ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); - + DM_STRUCT_INIT(pDesc); - + LIST_FOR_EACH (pEntry, This->pObjects) { pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); - + if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || IsEqualGUID (rguidClass, &pObjectEntry->Desc.guidClass)) { if (dwCount == dwIndex) { - memcpy (pDesc, &pObjectEntry->Desc, sizeof(DMUS_OBJECTDESC)); + *pDesc = pObjectEntry->Desc; /* we aren't supposed to reveal this info */ pDesc->dwValidData &= ~(DMUS_OBJ_MEMORY | DMUS_OBJ_STREAM); pDesc->pbMemData = NULL; @@ -744,12 +744,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFi ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); DMUS_OBJECTDESC ObjDesc; WCHAR wszLoaderSearchPath[MAX_PATH]; - + TRACE("(%p, %s, %s, %s, %p): wrapping to IDirectMusicLoaderImpl_GetObject\n", This, debugstr_dmguid(rguidClassID), debugstr_dmguid(iidInterfaceID), debugstr_w(pwzFilePath), ppObject); - + DM_STRUCT_INIT(&ObjDesc); ObjDesc.dwValidData = DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_CLASS; /* I believe I've read somewhere in MSDN that this function requires either full path or relative path */ - memcpy (&ObjDesc.guidClass, rguidClassID, sizeof(CLSID)); + ObjDesc.guidClass = *rguidClassID; /* OK, MSDN says that search order is the following: - current directory (DONE) - windows search path (FIXME: how do I get that?) @@ -817,8 +817,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob /* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */ DM_STRUCT_INIT(&Desc); Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_OBJECT; - memcpy (&Desc.guidClass, &CLSID_DirectMusicCollection, sizeof(CLSID)); - memcpy (&Desc.guidObject, &GUID_DefaultGMCollection, sizeof(GUID)); + Desc.guidClass = CLSID_DirectMusicCollection; + Desc.guidObject = GUID_DefaultGMCollection; DMUSIC_GetDefaultGMPath (Desc.wszFileName); IDirectMusicLoader_SetObject ((LPDIRECTMUSICLOADER8)obj, &Desc); /* and now the workaroundTM for "invalid" default DLS; basically, @@ -939,10 +939,10 @@ HRESULT WINAPI DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { TRACE(": (%p)\n", This); GetCurrentDirectoryW (MAX_PATH, wszCurrent); - + for (i = 0; i < sizeof(classes)/sizeof(REFCLSID); i++) { LPWINE_LOADER_OPTION pNewSetting = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_OPTION)); - memcpy (&pNewSetting->guidClass, classes[i], sizeof(CLSID)); + pNewSetting->guidClass = *classes[i]; strcpyW (pNewSetting->wszSearchPath, wszCurrent); pNewSetting->bCache = TRUE; list_add_tail (This->pClassSettings, &pNewSetting->entry); @@ -954,10 +954,10 @@ HRESULT WINAPI DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { HRESULT WINAPI DMUSIC_CopyDescriptor (LPDMUS_OBJECTDESC pDst, LPDMUS_OBJECTDESC pSrc) { TRACE(": copy \n%s", debugstr_DMUS_OBJECTDESC(pSrc)); /* copy field by field */ - if (pSrc->dwValidData & DMUS_OBJ_CLASS) memcpy (&pDst->guidClass, &pSrc->guidClass, sizeof(CLSID)); - if (pSrc->dwValidData & DMUS_OBJ_OBJECT) memcpy (&pDst->guidObject, &pSrc->guidObject, sizeof(GUID)); - if (pSrc->dwValidData & DMUS_OBJ_DATE) memcpy (&pDst->ftDate, &pSrc->ftDate, sizeof(FILETIME)); - if (pSrc->dwValidData & DMUS_OBJ_VERSION) memcpy (&pDst->vVersion, &pSrc->vVersion, sizeof(DMUS_VERSION)); + if (pSrc->dwValidData & DMUS_OBJ_CLASS) pDst->guidClass = pSrc->guidClass; + if (pSrc->dwValidData & DMUS_OBJ_OBJECT) pDst->guidObject = pSrc->guidObject; + if (pSrc->dwValidData & DMUS_OBJ_DATE) pDst->ftDate = pSrc->ftDate; + if (pSrc->dwValidData & DMUS_OBJ_VERSION) pDst->vVersion = pSrc->vVersion; if (pSrc->dwValidData & DMUS_OBJ_NAME) strcpyW (pDst->wszName, pSrc->wszName); if (pSrc->dwValidData & DMUS_OBJ_CATEGORY) strcpyW (pDst->wszCategory, pSrc->wszCategory); if (pSrc->dwValidData & DMUS_OBJ_FILENAME) strcpyW (pDst->wszFileName, pSrc->wszFileName);

1 0

Mikołaj Zalewski : comctl32: datetime: Support literals in apostrophes.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 41025d56e3c3653f9f6975b391555c291c52409b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41025d56e3c3653f9f6975b39… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Feb 22 22:32:47 2008 +0100 comctl32: datetime: Support literals in apostrophes. --- dlls/comctl32/datetime.c | 57 +++++++++++++++++++++++---------------- dlls/comctl32/tests/datetime.c | 13 +++++++++ 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 100cd74..b46c495 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -133,8 +133,8 @@ extern int MONTHCAL_MonthLength(int month, int year); static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); extern void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to); -static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', '\'', 0}; -static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1,-1}; +static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', 0}; +static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; static DWORD @@ -205,6 +205,7 @@ DATETIME_UseFormat (DATETIME_INFO *infoPtr, LPCWSTR formattxt) { unsigned int i; int j, k, len; + BOOL inside_literal = FALSE; /* inside '...' */ int *nrFields = &infoPtr->nrFields; *nrFields = 0; @@ -214,27 +215,37 @@ DATETIME_UseFormat (DATETIME_INFO *infoPtr, LPCWSTR formattxt) for (i = 0; formattxt[i]; i++) { TRACE ("\n%d %c:", i, formattxt[i]); - for (j = 0; j < len; j++) { - if (allowedformatchars[j]==formattxt[i]) { - TRACE ("%c[%d,%x]", allowedformatchars[j], *nrFields, infoPtr->fieldspec[*nrFields]); - if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) { - infoPtr->fieldspec[*nrFields] = (j<<4) + 1; - break; - } - if (infoPtr->fieldspec[*nrFields] >> 4 != j) { - (*nrFields)++; - infoPtr->fieldspec[*nrFields] = (j<<4) + 1; - break; - } - if ((infoPtr->fieldspec[*nrFields] & 0x0f) == maxrepetition[j]) { - (*nrFields)++; - infoPtr->fieldspec[*nrFields] = (j<<4) + 1; - break; - } - infoPtr->fieldspec[*nrFields]++; - break; - } /* if allowedformatchar */ - } /* for j */ + if (!inside_literal) { + for (j = 0; j < len; j++) { + if (allowedformatchars[j]==formattxt[i]) { + TRACE ("%c[%d,%x]", allowedformatchars[j], *nrFields, infoPtr->fieldspec[*nrFields]); + if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) { + infoPtr->fieldspec[*nrFields] = (j<<4) + 1; + break; + } + if (infoPtr->fieldspec[*nrFields] >> 4 != j) { + (*nrFields)++; + infoPtr->fieldspec[*nrFields] = (j<<4) + 1; + break; + } + if ((infoPtr->fieldspec[*nrFields] & 0x0f) == maxrepetition[j]) { + (*nrFields)++; + infoPtr->fieldspec[*nrFields] = (j<<4) + 1; + break; + } + infoPtr->fieldspec[*nrFields]++; + break; + } /* if allowedformatchar */ + } /* for j */ + } + else + j = len; + + if (formattxt[i] == '\'') + { + inside_literal = !inside_literal; + continue; + } /* char is not a specifier: handle char like a string */ if (j == len) { diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 76fdccc..b194cc1 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -193,6 +193,8 @@ static HWND create_datetime_control(DWORD style, DWORD exstyle) static void test_dtm_set_format(HWND hWndDateTime) { + CHAR txt[256]; + SYSTEMTIME systime; LRESULT r; r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL); @@ -203,6 +205,17 @@ static void test_dtm_set_format(HWND hWndDateTime) expect(1, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_format_seq, "test_dtm_set_format", FALSE); + + r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, + (LPARAM)"'hh' hh"); + expect(1, r); + ZeroMemory(&systime, sizeof(systime)); + systime.wYear = 2000; + systime.wMonth = systime.wDay = 1; + r = SendMessage(hWndDateTime, DTM_SETSYSTEMTIME, 0, (LPARAM)&systime); + expect(1, r); + GetWindowText(hWndDateTime, txt, 256); + todo_wine ok(strcmp(txt, "hh 12") == 0, "String mismatch (\"%s\" vs \"hh 12\")\n", txt); flush_sequences(sequences, NUM_MSG_SEQUENCES); }

1 0

Alexander Dorofeyev : d3d8/tests: Add a P8 texture test.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 57d506f6546daf60a4e6fd326cbe56a5f2a2b4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d506f6546daf60a4e6fd326… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 24 20:46:11 2008 +0200 d3d8/tests: Add a P8 texture test. --- dlls/d3d8/tests/visual.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 205 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1345fd7..601a33c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -910,6 +910,209 @@ static void alpha_test(IDirect3DDevice8 *device) } } +static void p8_texture_test(IDirect3DDevice8 *device) +{ + IDirect3D8 *d3d = NULL; + HRESULT hr; + IDirect3DTexture8 *texture = NULL; + D3DLOCKED_RECT lr; + unsigned char *data; + DWORD color, red, green, blue; + PALETTEENTRY table[256]; + D3DCAPS8 caps; + UINT i; + float quad[] = { + -1.0, 0, 0.1, 0.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, 0, 0.1, 1.0, 0.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + float quad2[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + -1.0, 0, 0.1, 0.0, 1.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + 1.0, 0, 0.1, 1.0, 1.0, + }; + + IDirect3DDevice8_GetDirect3D(device, &d3d); + + if(IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_TEXTURE, D3DFMT_P8) != D3D_OK) { + skip("D3DFMT_P8 textures not supported\n"); + goto out; + } + + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, + D3DPOOL_MANAGED, &texture); + ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); + if(!texture) { + skip("Failed to create D3DFMT_P8 texture\n"); + goto out; + } + + memset(&lr, 0, sizeof(lr)); + hr = IDirect3DTexture8_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); + data = lr.pBits; + *data = 1; + + hr = IDirect3DTexture8_UnlockRect(texture, 0); + ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + + /* The first part of the test should work both with and without D3DPTEXTURECAPS_ALPHAPALETTE; + alpha of every entry is set to 1.0, which MS says is required when there's no + D3DPTEXTURECAPS_ALPHAPALETTE capability */ + for (i = 0; i < 256; i++) { + table[i].peRed = table[i].peGreen = table[i].peBlue = 0; + table[i].peFlags = 0xff; + } + table[1].peRed = 0xff; + hr = IDirect3DDevice8_SetPaletteEntries(device, 0, table); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPaletteEntries failed, hr = %08x\n", hr); + + table[1].peRed = 0; + table[1].peBlue = 0xff; + hr = IDirect3DDevice8_SetPaletteEntries(device, 1, table); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPaletteEntries failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr = %08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "SetVertexShader failed, hr = %#08x\n", hr); + + hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 1); + ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr = %08x\n", hr); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); + + color = getPixelColor(device, 32, 32); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(red == 0xff && blue == 0 && green == 0, + "got color %08x, expected 0x00ff0000\n", color); + + todo_wine { + color = getPixelColor(device, 32, 320); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(red == 0 && blue == 0xff && green == 0, + "got color %08x, expected 0x000000ff\n", color); + } + + /* Test palettes with alpha */ + IDirect3DDevice8_GetDeviceCaps(device, &caps); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_ALPHAPALETTE)) { + skip("no D3DPTEXTURECAPS_ALPHAPALETTE capability, tests with alpha in palette will be skipped\n"); + } else { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + + for (i = 0; i < 256; i++) { + table[i].peRed = table[i].peGreen = table[i].peBlue = 0; + table[i].peFlags = 0xff; + } + table[1].peRed = 0xff; + table[1].peFlags = 0x80; + hr = IDirect3DDevice8_SetPaletteEntries(device, 0, table); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPaletteEntries failed, hr = %08x\n", hr); + + table[1].peRed = 0; + table[1].peBlue = 0xff; + table[1].peFlags = 0x80; + hr = IDirect3DDevice8_SetPaletteEntries(device, 1, table); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPaletteEntries failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr = %08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "SetVertexShader failed, hr = %#08x\n", hr); + + hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 1); + ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr = %08x\n", hr); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); + + todo_wine { + color = getPixelColor(device, 32, 32); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(red >= 0x7e && red <= 0x81 && blue == 0 && green == 0, + "got color %08x, expected 0x00800000 or near\n", color); + + color = getPixelColor(device, 32, 320); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(red == 0 && blue >= 0x7e && blue <= 0x81 && green == 0, + "got color %08x, expected 0x00000080 or near\n", color); + } + } + + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); + +out: + if(texture) IDirect3DTexture8_Release(texture); + IDirect3D8_Release(d3d); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -981,6 +1184,8 @@ START_TEST(visual) skip("No vs.1.1 support\n"); } + p8_texture_test(device_ptr); + cleanup: if(device_ptr) { D3DDEVICE_CREATION_PARAMETERS creation_parameters;

1 0

Anatoly Lyutin : user32: Added some tests for scrollbar.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: b6241e4ad81ace16f8a1dff8da7d9312ba033c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6241e4ad81ace16f8a1dff8d… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Fri Feb 22 17:03:26 2008 +0300 user32: Added some tests for scrollbar. --- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/scroll.c | 163 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 9fd26ec..c3794cc 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -21,6 +21,7 @@ CTESTS = \ monitor.c \ msg.c \ resource.c \ + scroll.c \ static.c \ sysparams.c \ text.c \ diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c new file mode 100644 index 0000000..5832b51 --- /dev/null +++ b/dlls/user32/tests/scroll.c @@ -0,0 +1,163 @@ +/* + * Unit tests for scrollbar + * + * Copyright 2008 Lyutin Anatoly (Etersoft) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <windows.h> + +#include "wine/test.h" + +static HWND hScroll, hMainWnd; + +static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + switch(msg) + { + + case WM_CREATE: + { + hScroll = CreateWindowA( "SCROLLBAR", "", WS_CHILD | WS_VISIBLE, 0, 0, 120, 100, hWnd, (HMENU)100, GetModuleHandleA(0), 0 ); + + return 0; + } + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0; +} + +static void scrollbar_test1(void) +{ + BOOL ret; + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_DISABLE_BOTH ); + ok( ret, "The scrollbar should be disabled.\n" ); + todo_wine + { + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + } + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "The scrollbar should be enabled.\n" ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + +} + +static void scrollbar_test2(void) +{ + int ret; + + trace("The scrollbar is disabled.\n"); + + EnableWindow( hScroll, FALSE ); + ok( !IsWindowEnabled( hScroll ), "The scroll should be disabled.\n" ); + + ret = SetScrollPos( hScroll, SB_CTL, 30, TRUE); + ok( !ret, "The position should not be set.\n" ); + + ret = GetScrollPos( hScroll, SB_CTL); + ok( !ret, "The position should be equal to zero\n"); + + ret = SetScrollRange( hScroll, SB_CTL, 0, 100, TRUE ); + ok( ret, "The range should be set.\n" ); + + ret = SetScrollPos( hScroll, SB_CTL, 30, TRUE); + ok( !ret , "The position should not be set.\n" ); + + ret = GetScrollPos( hScroll, SB_CTL); + ok( ret == 30, "The position should be set!!!\n"); + + trace("The scrollbar is enabled.\n"); + + EnableWindow( hScroll, TRUE ); + ok( IsWindowEnabled( hScroll ), "The scroll should be enabled.\n" ); + + ret = SetScrollPos( hScroll, SB_CTL, 30, TRUE); + ok( ret == 30, "The position should be set.\n" ); + + ret = GetScrollPos( hScroll, SB_CTL); + ok( ret == 30, "The position should not be equal to zero\n"); + + ret = SetScrollRange( hScroll, SB_CTL, 0, 100, TRUE ); + ok( ret, "The range should be set.\n" ); + + ret = SetScrollPos( hScroll, SB_CTL, 30, TRUE); + ok( ret == 30, "The position should be set.\n" ); + + ret = GetScrollPos( hScroll, SB_CTL); + ok( ret == 30, "The position should not be equal to zero\n"); +} + +static void scrollbar_test3(void) +{ + BOOL ret; + + ret = ShowScrollBar( hScroll, SB_CTL, FALSE ); + ok( ret, "The ShowScrollBar() should not failed.\n" ); + ok( !IsWindowVisible( hScroll ), "The scrollbar window should not be visible\n" ); + + ret = ShowScrollBar( hScroll, SB_CTL, TRUE ); + ok( ret, "The ShowScrollBar() should not failed.\n" ); + ok( !IsWindowVisible( hScroll ), "The scrollbar window should be visible\n" ); + + ret = ShowScrollBar( NULL, SB_CTL, TRUE ); + todo_wine + { + ok( !ret, "The ShowScrollBar() should failed.\n" ); + } + +} + +START_TEST ( scroll ) +{ + WNDCLASSA wc; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = MyWndProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowExA( 0, "MyTestWnd", "Scroll", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); + + if ( !ok( hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n" ) ) + return; + + assert( hScroll ); + + scrollbar_test1(); + scrollbar_test2(); + scrollbar_test3(); + + DestroyWindow(hScroll); + DestroyWindow(hMainWnd); +}

1 0

Anatoly Lyutin : user32: Fix return value in ShowScrollBar according with test.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: a871830dd397ec6b605c2b34e2c4d02f1177d1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a871830dd397ec6b605c2b34e… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Fri Feb 22 17:03:32 2008 +0300 user32: Fix return value in ShowScrollBar according with test. --- dlls/user32/scroll.c | 3 +++ dlls/user32/tests/scroll.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index bd2feb9..6f52754 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1998,6 +1998,9 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV */ BOOL WINAPI ShowScrollBar(HWND hwnd, INT nBar, BOOL fShow) { + if ( !hwnd ) + return FALSE; + SCROLL_ShowScrollBar( hwnd, nBar, (nBar == SB_VERT) ? 0 : fShow, (nBar == SB_HORZ) ? 0 : fShow ); return TRUE; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 5832b51..3bc407a 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -123,10 +123,7 @@ static void scrollbar_test3(void) ok( !IsWindowVisible( hScroll ), "The scrollbar window should be visible\n" ); ret = ShowScrollBar( NULL, SB_CTL, TRUE ); - todo_wine - { - ok( !ret, "The ShowScrollBar() should failed.\n" ); - } + ok( !ret, "The ShowScrollBar() should failed.\n" ); }

1 0

Stefan Dösinger : d3d9: Fix a ok line.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 3ed963dc5d24573c08729e0c91d6098dfa9e7618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed963dc5d24573c08729e0c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 12 18:31:45 2008 +0100 d3d9: Fix a ok line. --- dlls/d3d9/tests/visual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index be45ac6..fdafb88 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1397,7 +1397,8 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) ok((unsigned char)(color) == ((unsigned char)test_data[i].color[j]) && abs( ((unsigned char)(color>>8)) - (unsigned char)(test_data[i].color[j]>>8) ) < 13 && abs( ((unsigned char)(color>>16)) - (unsigned char)(test_data[i].color[j]>>16) ) < 13, - "fog ps%i vs%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); + "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", + test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); } }

1 0

Gerald Pfeifer : d3dx8: Simplify D3DXMatrixInverse().
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 6766f9c1a02f736777c9d6d3948b0c224226f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6766f9c1a02f736777c9d6d39… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 24 16:39:08 2008 +0100 d3dx8: Simplify D3DXMatrixInverse(). --- dlls/d3dx8/math.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 6573c68..a65a934 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -114,7 +114,7 @@ D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONS { int a, i, j; D3DXVECTOR4 v, vec[3]; - FLOAT cofactor, det; + FLOAT det; det = D3DXMatrixfDeterminant(pm); if ( !det ) return NULL; @@ -134,19 +134,12 @@ D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONS } } D3DXVec4Cross(&v, &vec[0], &vec[1], &vec[2]); - for (j=0; j<4; j++) - { - switch(j) - { - case 0: cofactor = v.x; break; - case 1: cofactor = v.y; break; - case 2: cofactor = v.z; break; - case 3: cofactor = v.w; break; - } - pout->u.m[j][i] = pow(-1.0f, i) * cofactor / det; - } + pout->u.m[0][i] = pow(-1.0f, i) * v.x / det; + pout->u.m[1][i] = pow(-1.0f, i) * v.y / det; + pout->u.m[2][i] = pow(-1.0f, i) * v.z / det; + pout->u.m[3][i] = pow(-1.0f, i) * v.w / det; } - return pout; + return pout; } D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup)

1 0

Stefan Dösinger : d3d9: ATI drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 708e217506b82f7d159aaa929315956a6f8dd9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=708e217506b82f7d159aaa929… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 12 18:27:56 2008 +0100 d3d9: ATI drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly. --- dlls/d3d9/tests/visual.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f799af8..be45ac6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6468,10 +6468,14 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) skip("D3DTEXOPCAPS_BUMPENVMAP not set, skipping bumpmap tests\n"); return; } else { + /* This check is disabled, some Windows drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly. + * They report that it is not supported, but after that bump mapping works properly. So just test + * if the format is generally supported, and check the BUMPENVMAP flag + */ IDirect3D9 *d3d9; IDirect3DDevice9_GetDirect3D(device, &d3d9); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_LEGACYBUMPMAP, + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_V8U8); IDirect3D9_Release(d3d9); if(FAILED(hr)) {

1 0

Stefan Dösinger : d3d9: Add a non-shader reversed fog test.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 9850e4b52972ae862999464773fefd8a05c651d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9850e4b52972ae86299946477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 12 18:20:10 2008 +0100 d3d9: Add a non-shader reversed fog test. --- dlls/d3d9/tests/visual.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e2a001f..f799af8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -630,8 +630,10 @@ static void fog_test(IDirect3DDevice9 *device) { HRESULT hr; DWORD color; + BYTE r, g, b; float start = 0.0f, end = 1.0f; D3DCAPS9 caps; + int i; /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { @@ -662,6 +664,27 @@ static void fog_test(IDirect3DDevice9 *device) {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; + struct vertex rev_fog_quads[] = { + {-1.0, -1.0, 0.1, 0x000000ff}, + {-1.0, 0.0, 0.1, 0x000000ff}, + { 0.0, 0.0, 0.1, 0x000000ff}, + { 0.0, -1.0, 0.1, 0x000000ff}, + + { 0.0, -1.0, 0.9, 0x000000ff}, + { 0.0, 0.0, 0.9, 0x000000ff}, + { 1.0, 0.0, 0.9, 0x000000ff}, + { 1.0, -1.0, 0.9, 0x000000ff}, + + { 0.0, 0.0, 0.4, 0x000000ff}, + { 0.0, 1.0, 0.4, 0x000000ff}, + { 1.0, 1.0, 0.4, 0x000000ff}, + { 1.0, 0.0, 0.4, 0x000000ff}, + + {-1.0, 0.0, 0.7, 0x000000ff}, + {-1.0, 1.0, 0.7, 0x000000ff}, + { 0.0, 1.0, 0.7, 0x000000ff}, + { 0.0, 0.0, 0.7, 0x000000ff}, + }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; memset(&caps, 0, sizeof(caps)); @@ -817,6 +840,71 @@ static void fog_test(IDirect3DDevice9 *device) color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + /* Test "reversed" fog without shaders. With shaders this fails on a few Windows D3D implementations, + * but without shaders it seems to work everywhere + */ + end = 0.2; + start = 0.8; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); + ok(hr == D3D_OK, "Setting fog start returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); + ok(hr == D3D_OK, "Setting fog end returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok( hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %s\n", DXGetErrorString9(hr)); + + /* Test reversed fog without shaders. ATI cards have problems with reversed fog and shaders, so + * it doesn't seem very important for games. ATI cards also have problems with reversed table fog, + * so skip this for now + */ + for(i = 0; i < 1 /*2 - Table fog test disabled, fails on ATI */; i++) { + const char *mode = (i ? "table" : "vertex"); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, i == 0 ? D3DFOG_LINEAR : D3DFOG_NONE); + ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, i == 0 ? D3DFOG_NONE : D3DFOG_LINEAR); + ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_BeginScene(device); + ok( hr == D3D_OK, "IDirect3DDDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + WORD Indices2[] = { 0, 1, 2, 2, 3, 0, + 4, 5, 6, 6, 7, 4, + 8, 9, 10, 10, 11, 8, + 12, 13, 14, 14, 15, 12}; + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, + 16 /* NumVerts */, 8 /*PrimCount */, Indices2, D3DFMT_INDEX16, rev_fog_quads, + sizeof(rev_fog_quads[0])); + + hr = IDirect3DDevice9_EndScene(device); + ok( hr == D3D_OK, "IDirect3DDDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 160, 360); + ok(color == 0x0000FF00, "Reversed %s fog: z=0.1 has color 0x%08x, expected 0x0000ff00\n", mode, color); + + color = getPixelColor(device, 160, 120); + r = (color & 0x00ff0000) >> 16; + g = (color & 0x0000ff00) >> 8; + b = (color & 0x000000ff); + ok(r == 0x00 && g >= 0x29 && g <= 0x2d && b >= 0xd2 && b <= 0xd6, + "Reversed %s fog: z=0.7 has color 0x%08x, expected\n", mode, color); + + color = getPixelColor(device, 480, 120); + r = (color & 0x00ff0000) >> 16; + g = (color & 0x0000ff00) >> 8; + b = (color & 0x000000ff); + ok(r == 0x00 && g >= 0xa8 && g <= 0xac && b >= 0x53 && b <= 0x57, + "Reversed %s fog: z=0.4 has color 0x%08x, expected\n", mode, color); + + color = getPixelColor(device, 480, 360); + ok(color == 0x000000ff, "Reversed %s fog: z=0.9 has color 0x%08x, expected 0x000000ff\n", mode, color); + + if(!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping reversed table fog test\n"); + break; + } + } /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %s\n", DXGetErrorString9(hr));

1 0