Module: wine Branch: master Commit: af30447348937acc69b218d13a483008029fcb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af30447348937acc69b218d13a...
Author: Marcus Meissner meissner@suse.de Date: Thu Nov 9 15:40:55 2006 +0100
dmusic: Replaced && 0xfff... by & 0xff.
---
dlls/dmusic/collection.c | 4 ++-- dlls/dmusic/dmusic_main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index cb1be18..82c1622 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -715,8 +715,8 @@ static HRESULT WINAPI IDirectMusicCollec if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) && 0x0000FFFF, This->pDesc->vVersion.dwVersionMS && 0x0000FFFF, \ - (This->pDesc->vVersion.dwVersionLS >> 8) && 0x0000FFFF, This->pDesc->vVersion.dwVersionLS && 0x0000FFFF); + TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, \ + (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); if (This->pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 427a41f..1eb508f 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -219,8 +219,8 @@ const char *debugstr_fourcc (DWORD fourc const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("'%i,%i,%i,%i'", - (int)((version->dwVersionMS && 0xFFFF0000) >> 8), (int)(version->dwVersionMS && 0x0000FFFF), - (int)((version->dwVersionLS && 0xFFFF0000) >> 8), (int)(version->dwVersionLS && 0x0000FFFF)); + (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), + (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); }
/* returns name of given GUID */