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

Dmitry Timoshkov : mciavi32: Read the stream header in order to determine its type.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 1e942d6b1fd3446d029d88f106c81a9acace256b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e942d6b1fd3446d029d88f10… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 25 21:27:37 2008 +0900 mciavi32: Read the stream header in order to determine its type. --- dlls/mciavi32/mmoutput.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 8c8bdc2..f7118ff 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -28,8 +28,6 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK { MMCKINFO mmckInfo; - mmioRead(wma->hFile, (LPSTR)&wma->ash_audio, sizeof(wma->ash_audio)); - TRACE("ash.fccType='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_audio.fccType)), HIBYTE(LOWORD(wma->ash_audio.fccType)), LOBYTE(HIWORD(wma->ash_audio.fccType)), @@ -91,8 +89,6 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK { MMCKINFO mmckInfo; - mmioRead(wma->hFile, (LPSTR)&wma->ash_video, sizeof(wma->ash_video)); - TRACE("ash.fccType='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_video.fccType)), HIBYTE(LOWORD(wma->ash_video.fccType)), LOBYTE(HIWORD(wma->ash_video.fccType)), @@ -261,6 +257,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) MMCKINFO mmckHead; MMCKINFO mmckList; MMCKINFO mmckInfo; + AVIStreamHeader strh; struct AviListBuild alb; DWORD stream_n; @@ -320,34 +317,40 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) continue; } - TRACE("Stream #%d fccType %4.4s\n", stream_n, (LPSTR)&mmckStream.fccType); + mmioRead(wma->hFile, (LPSTR)&strh, sizeof(strh)); + + TRACE("Stream #%d fccType %4.4s\n", stream_n, (LPSTR)&strh.fccType); - if (mmckStream.fccType == streamtypeVIDEO) + if (strh.fccType == streamtypeVIDEO) { TRACE("found video stream\n"); if (wma->inbih) WARN("ignoring another video stream\n"); else { + wma->ash_audio = strh; + if (!MCIAVI_GetInfoVideo(wma, &mmckList, &mmckStream)) return FALSE; wma->video_stream_n = stream_n; } } - else if (mmckStream.fccType == streamtypeAUDIO) + else if (strh.fccType == streamtypeAUDIO) { TRACE("found audio stream\n"); if (wma->lpWaveFormat) WARN("ignoring another audio stream\n"); else { + wma->ash_video = strh; + if (!MCIAVI_GetInfoAudio(wma, &mmckList, &mmckStream)) return FALSE; wma->audio_stream_n = stream_n; } } else - TRACE("Unsupported stream type %4.4s\n", (LPSTR)&mmckStream.fccType); + TRACE("Unsupported stream type %4.4s\n", (LPSTR)&strh.fccType); mmioAscend(wma->hFile, &mmckList, 0); }

1 0

Dmitry Timoshkov : winmm: Add another test confirming that mmioDescend does set fccType of non RIFF/ LIST chunks to 0.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 4d2a2860a56532f181dc672f6ecb18b07a07a8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2a2860a56532f181dc672f6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 25 21:26:42 2008 +0900 winmm: Add another test confirming that mmioDescend does set fccType of non RIFF/LIST chunks to 0. --- dlls/winmm/tests/mmio.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5fac90a..e945891 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -30,9 +30,15 @@ static DWORD RIFF_buf[] = { - FOURCC_RIFF, 7*sizeof(DWORD)+sizeof(MainAVIHeader), mmioFOURCC('A','V','I',' '), - FOURCC_LIST, sizeof(DWORD)+sizeof(MMCKINFO)+sizeof(MainAVIHeader), listtypeAVIHEADER, - ckidAVIMAINHDR, sizeof(MainAVIHeader), 0xdeadbeef, 0xdeadbeef, + FOURCC_RIFF, 32*sizeof(DWORD), mmioFOURCC('A','V','I',' '), + FOURCC_LIST, 29*sizeof(DWORD), listtypeAVIHEADER, ckidAVIMAINHDR, + sizeof(MainAVIHeader), 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, + 0xdeadbeef, 0xdeadbeef, 0xdeadbeef,0xdeadbeef, + 0xdeadbeef, 0xdeadbeef, 0xdeadbeef,0xdeadbeef, + 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, + FOURCC_LIST, 10*sizeof(DWORD),listtypeSTREAMHEADER, ckidSTREAMHEADER, + 7*sizeof(DWORD), streamtypeVIDEO, 0xdeadbeef, 0xdeadbeef, + 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -83,6 +89,25 @@ static void test_mmioDescend(char *fname) (LPCSTR)&ck.ckid, ck.cksize, (LPCSTR)&ck.fccType, ck.dwDataOffset, ck.dwFlags); + /* Skip chunk data */ + mmioSeek(hmmio, ck.cksize, SEEK_CUR); + + ret = mmioDescend(hmmio, &ckList, &ckList, 0); + ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); + ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList.ckid); + ok(ckList.fccType == listtypeSTREAMHEADER, "wrong fccType: %04x\n", ckList.fccType); + trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n", + (LPCSTR)&ckList.ckid, ckList.cksize, (LPCSTR)&ckList.fccType, + ckList.dwDataOffset, ckList.dwFlags); + + ret = mmioDescend(hmmio, &ck, &ckList, 0); + ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); + ok(ck.ckid == ckidSTREAMHEADER, "wrong ckid: %04x\n", ck.ckid); + ok(ck.fccType == 0, "wrong fccType: %04x\n", ck.fccType); + trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n", + (LPCSTR)&ck.ckid, ck.cksize, (LPCSTR)&ck.fccType, + ck.dwDataOffset, ck.dwFlags); + /* test various mmioDescend flags */ mmioSeek(hmmio, 0, SEEK_SET);

1 0

Alistair Leslie-Hughes : mapi32: Skip tests on error.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 1124555a3754eb8feaaa8b47a4ecae373b13ab74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1124555a3754eb8feaaa8b47a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 25 15:17:13 2008 +1000 mapi32: Skip tests on error. --- dlls/mapi32/tests/prop.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index adc1d85..a2b9289 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -824,13 +824,16 @@ static void test_ScCopyRelocProps(void) sc = pScCopyProps(1, &pvProp, buffer, &ulCount); ok(sc == S_OK, "wrong ret %d\n", sc); - ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); - ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); - ok(lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*), - "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); - ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %d\n", ulCount); - ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), - "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); + if(sc == S_OK) + { + ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); + ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); + ok(lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*), + "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); + ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %d\n", ulCount); + ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), + "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); + } memcpy(buffer2, buffer, sizeof(buffer)); @@ -845,18 +848,21 @@ static void test_ScCopyRelocProps(void) lpResProp = (LPSPropValue)buffer2; ok(sc == S_OK, "wrong ret %d\n", sc); - ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); - ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); - ok(lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*), - "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); - /* Native has a bug whereby it calculates the size correctly when copying - * but when relocating does not (presumably it uses UlPropSize() which - * ignores multivalue pointers). Wine returns the correct value. - */ - ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5, - "wrong count %d\n", ulCount); - ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), - "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); + if(sc == S_OK) + { + ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); + ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); + ok(lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*), + "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); + /* Native has a bug whereby it calculates the size correctly when copying + * but when relocating does not (presumably it uses UlPropSize() which + * ignores multivalue pointers). Wine returns the correct value. + */ + ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5, + "wrong count %d\n", ulCount); + ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), + "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); + } /* Native crashes with lpNew or lpOld set to NULL so skip testing this */ }

1 0

Guy Albertelli : comctl32: listview: Implement LVS_NOCOLUMNHEADER support for WM_STYLECHANGED message.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 6de37643396de6d21e3483c7289fa2d8104fac5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de37643396de6d21e3483c72… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Jun 24 23:01:30 2008 -0400 comctl32: listview: Implement LVS_NOCOLUMNHEADER support for WM_STYLECHANGED message. When switching LVS_NOCOLUMNHEADER on/off change the style of the header control HDS_HIDDEN. --- dlls/comctl32/listview.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6596ea2..6b16a7b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9420,6 +9420,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { UINT uNewView = lpss->styleNew & LVS_TYPEMASK; UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); @@ -9481,8 +9482,26 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, } if (uNewView == LVS_REPORT) - ShowWindow(infoPtr->hwndHeader, (lpss->styleNew & LVS_NOCOLUMNHEADER) ? SW_HIDE : SW_SHOWNORMAL); - + { + if ((lpss->styleOld ^ lpss->styleNew) & LVS_NOCOLUMNHEADER) + { + if (lpss->styleNew & LVS_NOCOLUMNHEADER) + { + /* Turn off the header control */ + style = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); + TRACE("Hide header control, was 0x%08x\n", style); + SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, style | HDS_HIDDEN); + } else { + /* Turn on the header control */ + if ((style = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE)) & HDS_HIDDEN) + { + TRACE("Show header control, was 0x%08x\n", style); + SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, (style & ~HDS_HIDDEN) | WS_VISIBLE); + } + } + } + } + if ( (uNewView == LVS_ICON || uNewView == LVS_SMALLICON) && (uNewView != uOldView || ((lpss->styleNew ^ lpss->styleOld) & LVS_ALIGNMASK)) ) LISTVIEW_Arrange(infoPtr, LVA_DEFAULT);

1 0

Guy Albertelli : comctl32: listview: Show the header when updating header size if not LVS_NOCOLUMNHEADER.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: ff9bb5aec36622f56c083a1cc73e598b92ffff17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9bb5aec36622f56c083a1cc… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Jun 24 22:58:32 2008 -0400 comctl32: listview: Show the header when updating header size if not LVS_NOCOLUMNHEADER. --- dlls/comctl32/listview.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d85c3b8..6596ea2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1638,6 +1638,7 @@ static void LISTVIEW_UpdateHeaderSize(const LISTVIEW_INFO *infoPtr, INT nNewScro SetWindowPos(infoPtr->hwndHeader,0, point[0].x,point[0].y,point[1].x,point[1].y, + (infoPtr->dwStyle & LVS_NOCOLUMNHEADER) ? SWP_HIDEWINDOW : SWP_SHOWWINDOW | SWP_NOZORDER | SWP_NOACTIVATE); } @@ -9266,7 +9267,11 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedra LISTVIEW_SaveTextMetrics(infoPtr); if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT) + { SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(fRedraw, 0)); + LISTVIEW_UpdateSize(infoPtr); + LISTVIEW_UpdateScroll(infoPtr); + } if (fRedraw) LISTVIEW_InvalidateList(infoPtr); @@ -9377,7 +9382,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - else if (uView == LVS_REPORT && !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER)) + else if (uView == LVS_REPORT) { HDLAYOUT hl; WINDOWPOS wp; @@ -9386,7 +9391,9 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); - SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, + wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) + ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); infoPtr->rcList.top = max(wp.cy, 0); @@ -9465,7 +9472,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, hl.prc = &infoPtr->rcList; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, + wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) + ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); } LISTVIEW_UpdateItemSize(infoPtr);

1 0

Guy Albertelli : comctl32: listview: Change header control create act like native for LVS_NOCOLUMNHEAD.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 4b34260a73a249b59b52a41f64e90a2b3ce2b411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b34260a73a249b59b52a41f6… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Jun 24 22:58:14 2008 -0400 comctl32: listview: Change header control create act like native for LVS_NOCOLUMNHEAD. The native control issues the CreateWindowEx call with the HDS_HIDDEN as part of the style and not by issuing the SetWindowLong call. --- dlls/comctl32/listview.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5501d1f..d85c3b8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7998,6 +7998,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); UINT uView = lpcs->style & LVS_TYPEMASK; + DWORD dFlags = WS_CHILD | HDS_HORZ | HDS_FULLDRAG | HDS_DRAGDROP; TRACE("(lpcs=%p)\n", lpcs); @@ -8005,9 +8006,12 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); + /* setup creation flags */ + dFlags |= (LVS_NOSORTHEADER & lpcs->style) ? 0 : HDS_BUTTONS; + dFlags |= (LVS_NOCOLUMNHEADER & lpcs->style) ? HDS_HIDDEN : 0; + /* create header */ - infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL, - WS_CHILD | HDS_HORZ | HDS_FULLDRAG | (DWORD)((LVS_NOSORTHEADER & lpcs->style)?0:HDS_BUTTONS), + infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL, dFlags, 0, 0, 0, 0, hwnd, NULL, lpcs->hInstance, NULL); if (!infoPtr->hwndHeader) return -1; @@ -8027,12 +8031,8 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); } - else - { - /* set HDS_HIDDEN flag to hide the header bar */ - SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, - GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE) | HDS_HIDDEN); - } + LISTVIEW_UpdateSize(infoPtr); + LISTVIEW_UpdateScroll(infoPtr); } OpenThemeData(hwnd, themeClass);

1 0

Roy Shea : dsound/tests: Added additional tests of IDirectSound_CreateSoundBuffer.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 4a4d8caed3154726736e9ba7be62dd5dd6dd3cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4d8caed3154726736e9ba7b… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Jun 24 10:29:50 2008 -0700 dsound/tests: Added additional tests of IDirectSound_CreateSoundBuffer. --- dlls/dsound/tests/dsound.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index fc15bad..4b84eb9 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -401,16 +401,42 @@ static HRESULT test_primary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() should have failed: %s\n", DXGetErrorString8(rc)); + /* DSOUND: Error: NULL pointer is invalid */ /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," "dsbo=%p\n",DXGetErrorString8(rc),primary); - ZeroMemory(&bufdesc, sizeof(bufdesc)); - /* DSOUND: Error: Invalid size */ /* DSOUND: Error: Invalid buffer description */ + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc)-1; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok(rc==DSERR_INVALIDPARAM && primary==0, + "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," + "primary=%p\n",DXGetErrorString8(rc),primary); + + /* DSOUND: Error: DSBCAPS_PRIMARYBUFFER flag with non-NULL lpwfxFormat */ + /* DSOUND: Error: Invalid buffer description pointer */ + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + bufdesc.lpwfxFormat=&wfx; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok(rc==DSERR_INVALIDPARAM && primary==0, + "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," + "primary=%p\n",DXGetErrorString8(rc),primary); + + /* DSOUND: Error: No DSBCAPS_PRIMARYBUFFER flag with NULL lpwfxFormat */ + /* DSOUND: Error: Invalid buffer description pointer */ + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=0; + bufdesc.lpwfxFormat=NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound_CreateSoundBuffer() should have failed: rc=%s,"

1 0

Zac Brown : ntdll/tests: Add tests for (Rtl) IsTextUnicode to verify that IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS are not mutually exclusive .
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: e24e7e7852704a3d4594d2fe7b3ad6913697c5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24e7e7852704a3d4594d2fe7… Author: Zac Brown <zac(a)zacbrown.org> Date: Tue Jun 24 09:57:11 2008 -0700 ntdll/tests: Add tests for (Rtl)IsTextUnicode to verify that IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS are not mutually exclusive. --- dlls/ntdll/tests/rtlstr.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index aa4a391..74ba8ea 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1678,7 +1678,11 @@ static void test_RtlIsTextUnicode(void) { char ascii[] = "A simple string"; WCHAR unicode[] = {'A',' ','U','n','i','c','o','d','e',' ','s','t','r','i','n','g',0}; + WCHAR unicode_no_controls[] = {'A','U','n','i','c','o','d','e','s','t','r','i','n','g',0}; + /* String with both byte-reversed and standard Unicode control characters. */ + WCHAR mixed_controls[] = {'\t',0x9000,0x0d00,'\n',0}; WCHAR *be_unicode; + WCHAR *be_unicode_no_controls; int flags; int i; @@ -1721,7 +1725,81 @@ static void test_RtlIsTextUnicode(void) todo_wine ok(flags == (IS_TEXT_UNICODE_REVERSE_CONTROLS | IS_TEXT_UNICODE_REVERSE_SIGNATURE), "Expected flags 0xc0, obtained %x\n", flags); + + /* build byte reversed unicode string with no control chars */ + be_unicode_no_controls = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); + ok(be_unicode_no_controls != NULL, "Expeced HeapAlloc to succeed.\n"); + be_unicode_no_controls[0] = 0xfffe; + for (i = 0; i < sizeof(unicode_no_controls)/sizeof(unicode_no_controls[0]); i++) + be_unicode_no_controls[i + 1] = (unicode_no_controls[i] >> 8) | ((unicode_no_controls[i] & 0xff) << 8); + + + /* The following tests verify that the tests for */ + /* IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS */ + /* are not mutually exclusive. Regardless of whether the strings */ + /* contain an indication of endianness, the tests are still */ + /* run if the flag is passed to (Rtl)IsTextUnicode. */ + + /* Test IS_TEXT_UNICODE_CONTROLS flag */ + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on byte-reversed Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + todo_wine + { + ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should pass on Unicode string lacking control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); + } + + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls) + 2, &flags), + "Test should not pass with standard Unicode string.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + todo_wine + { + ok(pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); + } + + /* Test IS_TEXT_UNICODE_REVERSE_CONTROLS flag */ + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), + "Test should pass with byte-reversed Unicode string containing control characters.\n"); + todo_wine + ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing byte-reversed control characters.\n"); + todo_wine + ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); + + /* Test with flags for both byte-reverse and standard Unicode characters */ + flags = IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on string containing both byte-reversed and standard control characters.\n"); + todo_wine + ok(flags == (IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS), "Expected flags 0x44, obtained %x\n", flags); + HeapFree(GetProcessHeap(), 0, be_unicode); + HeapFree(GetProcessHeap(), 0, be_unicode_no_controls); } static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-',

1 0

Alexander Dorofeyev : quartz: Do not ignore current position in IEnumRegFiltersImpl_Next.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 2d8f7268abae9c3a7086e62cf9cbcf95125c6d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8f7268abae9c3a7086e62cf… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jun 24 16:44:57 2008 +0300 quartz: Do not ignore current position in IEnumRegFiltersImpl_Next. --- dlls/quartz/enumregfilters.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c index 2816f08..f8d7820 100644 --- a/dlls/quartz/enumregfilters.c +++ b/dlls/quartz/enumregfilters.c @@ -152,7 +152,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF for(i = 0; i < cFetched; i++) { /* The string in the REGFILTER structure must be allocated in the same block as the REGFILTER structure itself */ - ppRegFilter[i] = CoTaskMemAlloc(sizeof(REGFILTER)+(strlenW(This->RegFilters[i].Name)+1)*sizeof(WCHAR)); + ppRegFilter[i] = CoTaskMemAlloc(sizeof(REGFILTER)+(strlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR)); if (!ppRegFilter[i]) { while(i) @@ -162,9 +162,10 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF } return E_OUTOFMEMORY; } - ppRegFilter[i]->Clsid = This->RegFilters[i].Clsid; + ppRegFilter[i]->Clsid = This->RegFilters[This->uIndex + i].Clsid; ppRegFilter[i]->Name = (WCHAR*)((char*)ppRegFilter[i]+sizeof(REGFILTER)); - CopyMemory(ppRegFilter[i]->Name, This->RegFilters[i].Name, (strlenW(This->RegFilters[i].Name)+1)*sizeof(WCHAR)); + CopyMemory(ppRegFilter[i]->Name, This->RegFilters[This->uIndex + i].Name, + (strlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR)); } This->uIndex += cFetched;

1 0

Alexander Dorofeyev : quartz: Prevent heap corruption if IPropertyBag_Read fails.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 1aff73455dd3607a44389d2a44fea81f23dcfc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aff73455dd3607a44389d2a4… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jun 24 16:45:19 2008 +0300 quartz: Prevent heap corruption if IPropertyBag_Read fails. --- dlls/quartz/filtermapper.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 24055d6..da6d59f 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1040,7 +1040,6 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters( if (SUCCEEDED(hrSub)) { - V_VT(&var) = VT_ARRAY | VT_UI1; hrSub = IPropertyBag_Read(pPropBag, wszFilterDataName, &var, NULL); }

1 0