December 2005 - Wine-commits

lostwages/ news/2005122301.xml wwn/wn20051223_ ...
by WineHQ 24 Dec '05

24 Dec '05

ChangeSet ID: 21960 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:13:37 Added files: news : 2005122301.xml wwn : wn20051223_302.xml Log message: WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21960 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005122301.xml Added 1.1 +0 -0 lostwages/wwn/wn20051223_302.xml

1 0

lostwages/ include/winehq.conf news/2005122201.xml
by WineHQ 22 Dec '05

22 Dec '05

ChangeSet ID: 21959 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/22 13:22:09 Modified files: include : winehq.conf Added files: news : 2005122201.xml Log message: news about Wine-0.9.4 Patch: http://cvs.winehq.org/patch.py?id=21959 Old revision New revision Changes Path 1.27 1.28 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005122201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.27 lostwages/include/winehq.conf:1.28 --- lostwages/include/winehq.conf:1.27 22 Dec 2005 19:22: 9 -0000 +++ lostwages/include/winehq.conf 22 Dec 2005 19:22: 9 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.3 +snapshot_date: 0.9.4 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2005122201.xml diff -u -p /dev/null lostwages/news/2005122201.xml:1.1 --- /dev/null 22 Dec 2005 19:22: 9 -0000 +++ lostwages/news/2005122201.xml 22 Dec 2005 19:22: 9 -0000 @@ -0,0 +1,30 @@ +<news> + <date>December 22, 2005</date> + <title>Wine 0.9.4 Released</title> + <body> + +Just in time for Christmas, a new CVS snapshot is out, wine-0.9.4. As +you might have noticed, we're seeing more snapshots now that we're in beta. +We'll cover that process in more detail in this week's Wine Weekly News. Until +then, happy compiling! + +Alexandre noted the following changes: +<ul> + <li>Improvements to the IDL compiler.</li> + <li>Some infrastructure work for loadable driver support.</li> + <li>The usual assortment of Direct3D improvements.</li> + <li>IME support in the edit control.</li> + <li>Better support for AVI animations.</li> + <li>Debugging support improvements.</li> + <li>Relay traces now work on NX platforms.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.4.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.108">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

Tag wine-0.9.4 : Alexandre Julliard : Release 0.9.4
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/tags/wine-0.9.4 Tag: f153d54a9b4f9681c93e085136e19026c876f994 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=f153d54a9b4f9681c93e085136… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4

1 0

Alexandre Julliard : Release 0.9.4.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 4d05f2444a51c2eb4bf75afd9d6784368ebb9e71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d05f2444a51c2eb4bf75af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4. --- ANNOUNCE | 20 + ChangeLog | 1128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1148 insertions(+), 20 deletions(-)

1 0

Michael Jung : shell32: Added some test to document native ITEMIDLIST format.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 259fd0340752477dbed99d5fdb6d82276911a838 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=259fd0340752477dbed99d5… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Dec 22 17:16:11 2005 +0100 shell32: Added some test to document native ITEMIDLIST format. --- dlls/shell32/tests/shlfolder.c | 150 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8c0d7f7..7a51844 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1059,6 +1059,155 @@ void test_FolderShortcut(void) { IPersistFolder3_Release(pPersistFolder3); } +#include "pshpack1.h" +struct FileStructA { + BYTE type; + BYTE dummy; + DWORD dwFileSize; + WORD uFileDate; /* In our current implementation this is */ + WORD uFileTime; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastWriteTime) */ + WORD uFileAttribs; + CHAR szName[1]; +}; + +struct FileStructW { + WORD cbLen; /* Length of this element. */ + BYTE abFooBar1[6]; /* Beyond any recognition. */ + WORD uDate; /* FileTimeToDosDate(WIN32_FIND_DATA->ftCreationTime)? */ + WORD uTime; /* (this is currently speculation) */ + WORD uDate2; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastAccessTime)? */ + WORD uTime2; /* (this is currently speculation) */ + BYTE abFooBar2[4]; /* Beyond any recognition. */ + WCHAR wszName[1]; /* The long filename in unicode. */ + /* Just for documentation: Right after the unicode string: */ + WORD cbOffset; /* FileStructW's offset from the beginning of the SHITMEID. + * SHITEMID->cb == uOffset + cbLen */ +}; +#include "poppack.h" + +void test_ITEMIDLIST_format(void) { + WCHAR wszPersonal[MAX_PATH]; + LPSHELLFOLDER psfDesktop, psfPersonal; + LPITEMIDLIST pidlPersonal, pidlFile; + HANDLE hFile; + HRESULT hr; + BOOL bResult; + WCHAR wszFile[3][17] = { { 'e','v','e','n','_',0 }, { 'o','d','d','_',0 }, + { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; + int i; + + if(!pSHGetSpecialFolderPathW) return; + + bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %08lx\n", GetLastError()); + if (!bResult) return; + + bResult = SetCurrentDirectoryW(wszPersonal); + ok(bResult, "SetCurrentDirectory failed! Last error: %ld\n", GetLastError()); + if (!bResult) return; + + hr = SHGetDesktopFolder(&psfDesktop); + ok(SUCCEEDED(hr), "SHGetDesktopFolder failed! hr: %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszPersonal, NULL, &pidlPersonal, NULL); + ok(SUCCEEDED(hr), "psfDesktop->ParseDisplayName failed! hr = %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfDesktop); + return; + } + + hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, + (LPVOID*)&psfPersonal); + IShellFolder_Release(psfDesktop); + ILFree(pidlPersonal); + ok(SUCCEEDED(hr), "psfDesktop->BindToObject failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + for (i=0; i<3; i++) { + CHAR szFile[MAX_PATH]; + struct FileStructA *pFileStructA; + WORD cbOffset; + + WideCharToMultiByte(CP_ACP, 0, wszFile[i], -1, szFile, MAX_PATH, NULL, NULL); + + hFile = CreateFileW(wszFile[i], GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_FLAG_WRITE_THROUGH, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%ld)\n", GetLastError()); + if (hFile == INVALID_HANDLE_VALUE) { + IShellFolder_Release(psfPersonal); + return; + } + CloseHandle(hFile); + + hr = IShellFolder_ParseDisplayName(psfPersonal, NULL, NULL, wszFile[i], NULL, &pidlFile, NULL); + DeleteFileW(wszFile[i]); + ok(SUCCEEDED(hr), "psfPersonal->ParseDisplayName failed! hr: %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfPersonal); + return; + } + + pFileStructA = (struct FileStructA *)pidlFile->mkid.abID; + ok(pFileStructA->type == 0x32, "PIDLTYPE should be 0x32!\n"); + ok(pFileStructA->dummy == 0x00, "Dummy Byte should be 0x00!\n"); + ok(pFileStructA->dwFileSize == 0, "Filesize should be zero!\n"); + + if (i < 2) /* First two file names are already in valid 8.3 format */ + ok(!strcmp(szFile, (CHAR*)&pidlFile->mkid.abID[12]), "Wrong file name!\n"); + else + /* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably + * can't implement this correctly, since unix filesystems don't support + * this nasty short/long filename stuff. So we'll probably stay with our + * current habbit of storing the long filename here, which seems to work + * just fine. */ + todo_wine { ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); } + + if (i == 0) /* First file name has an even number of chars. No need for alignment. */ + todo_wine { ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', + "Alignment byte, where there shouldn't be!\n"); } + + if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] == '\0', + "There should be an alignment byte, but isn't!\n"); + + /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ + cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); + todo_wine { ok (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW), + "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); } + + if (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) + { + struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + + ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, + "FileStructW's offset and length should add up to the PIDL's length!\n"); + + if (pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen) { + /* Since we just created the file, time of creation, + * time of last access and time of last write access just be the same. + * These tests seem to fail sometimes (on WinXP), if the test is run again shortly + * after the first run. I do remember something with NTFS keeping the creation time + * if a file is deleted and then created again within a couple of seconds or so. + * Might be the reason. */ + ok (pFileStructA->uFileDate == pFileStructW->uDate && + pFileStructA->uFileTime == pFileStructW->uTime, + "Last write time should match creation time!\n"); + + ok (pFileStructA->uFileDate == pFileStructW->uDate2 && + pFileStructA->uFileTime == pFileStructW->uTime2, + "Last write time should match last access time!\n"); + + ok (!lstrcmpW(wszFile[i], pFileStructW->wszName), + "The filename should be stored in unicode at this position!\n"); + } + } + + ILFree(pidlFile); + } +} + START_TEST(shlfolder) { init_function_pointers(); @@ -1074,6 +1223,7 @@ START_TEST(shlfolder) test_SHGetPathFromIDList(); test_CallForAttributes(); test_FolderShortcut(); + test_ITEMIDLIST_format(); OleUninitialize(); }

1 0

Ulrich Czekalla : ole32: Return error instead of asserting if storage file is corrupt.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 707fa2c3a25421a0a805ab466cdc90e3ddc89ed4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=707fa2c3a25421a0a805ab4… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Dec 22 17:15:05 2005 +0100 ole32: Return error instead of asserting if storage file is corrupt. --- dlls/ole32/stg_stream.c | 37 +++++++++++++------------------------ dlls/ole32/storage32.c | 32 +++++++++++++++++++++----------- dlls/ole32/storage32.h | 2 +- include/winerror.h | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 928028b..40f0e81 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -273,7 +273,7 @@ static HRESULT WINAPI StgStreamImpl_Read */ if (This->smallBlockChain!=0) { - SmallBlockChainStream_ReadAt(This->smallBlockChain, + res = SmallBlockChainStream_ReadAt(This->smallBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -282,7 +282,7 @@ static HRESULT WINAPI StgStreamImpl_Read } else if (This->bigBlockChain!=0) { - BlockChainStream_ReadAt(This->bigBlockChain, + res = BlockChainStream_ReadAt(This->bigBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -300,30 +300,19 @@ static HRESULT WINAPI StgStreamImpl_Read goto end; } - /* - * We should always be able to read the proper amount of data from the - * chain. - */ - assert(bytesToReadFromBuffer == *pcbRead); - - /* - * Advance the pointer for the number of positions read. - */ - This->currentPosition.u.LowPart += *pcbRead; - - if(*pcbRead != cb) + if (SUCCEEDED(res)) { - WARN("read %ld instead of the required %ld bytes !\n", *pcbRead, cb); - /* - * this used to return S_FALSE, however MSDN docu says that an app should - * be prepared to handle error in case of stream end reached, as *some* - * implementations *might* return an error (IOW: most do *not*). - * As some program fails on returning S_FALSE, I better use S_OK here. - */ - res = S_OK; + /* + * We should always be able to read the proper amount of data from the + * chain. + */ + assert(bytesToReadFromBuffer == *pcbRead); + + /* + * Advance the pointer for the number of positions read. + */ + This->currentPosition.u.LowPart += *pcbRead; } - else - res = S_OK; end: TRACE("<-- %08lx\n", res); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 708d994..c9d696e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3414,7 +3414,8 @@ BlockChainStream* Storage32Impl_SmallBlo ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; ULONG propertyIndex; - BOOL successRead, successWrite; + BOOL successWrite; + HRESULT successRead; StgProperty chainProperty; BYTE *buffer; BlockChainStream *bbTempChain = NULL; @@ -3463,7 +3464,7 @@ BlockChainStream* Storage32Impl_SmallBlo offset.u.LowPart += This->smallBlockSize; - } while (successRead && successWrite); + } while (SUCCEEDED(successRead) && successWrite); HeapFree(GetProcessHeap(),0,buffer); assert(cbTotalRead == cbTotalWritten); @@ -4397,6 +4398,9 @@ BOOL BlockChainStream_ReadAt(BlockChainS blockNoInSequence--; } + if ((blockNoInSequence > 0) && (blockIndex == BLOCK_END_OF_CHAIN)) + return FALSE; /* We failed to find the starting block */ + This->lastBlockNoInSequenceIndex = blockIndex; /* @@ -5098,13 +5102,14 @@ ULONG SmallBlockChainStream_GetNextFreeB * bytesRead may be NULL. * Failure will be returned if the specified number of bytes has not been read. */ -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, void* buffer, ULONG* bytesRead) { + HRESULT rc = S_OK; ULARGE_INTEGER offsetInBigBlockFile; ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->smallBlockSize; @@ -5127,9 +5132,9 @@ BOOL SmallBlockChainStream_ReadAt( while ( (blockNoInSequence > 0) && (blockIndex != BLOCK_END_OF_CHAIN)) { - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; blockNoInSequence--; } @@ -5158,27 +5163,32 @@ BOOL SmallBlockChainStream_ReadAt( /* * Read those bytes in the buffer from the small block file. + * The small block has already been identified so it shouldn't fail + * unless the file is corrupt. */ - BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, + if (!BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, offsetInBigBlockFile, bytesToReadInBuffer, bufferWalker, - &bytesReadFromBigBlockFile); + &bytesReadFromBigBlockFile)) + return STG_E_DOCFILECORRUPT; assert(bytesReadFromBigBlockFile == bytesToReadInBuffer); /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; + bufferWalker += bytesToReadInBuffer; size -= bytesToReadInBuffer; *bytesRead += bytesToReadInBuffer; offsetInBlock = 0; /* There is no offset on the next block */ } - return (size == 0); + return rc; } /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4061a06..0472524 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -667,7 +667,7 @@ void SmallBlockChainStream_FreeBlock( ULONG SmallBlockChainStream_GetNextFreeBlock( SmallBlockChainStream* This); -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, diff --git a/include/winerror.h b/include/winerror.h index bf866da..b824c79 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1691,6 +1691,7 @@ #define STG_E_SHAREREQUIRED _HRESULT_TYPEDEF_(0x80030106L) #define STG_E_NOTFILEBASEDSTORAGE _HRESULT_TYPEDEF_(0x80030107L) #define STG_E_EXTANTMARSHALLINGS _HRESULT_TYPEDEF_(0x80030108L) +#define STG_E_DOCFILECORRUPT _HRESULT_TYPEDEF_(0x80030109L) #define STG_E_STATUS_COPY_PROTECTION_FAILURE _HRESULT_TYPEDEF_(0x80030305L) #define STG_E_CSS_AUTHENTICATION_FAILURE _HRESULT_TYPEDEF_(0x80030306L)

1 0

Dmitry Timoshkov : mciavi32: Rewrite asynchronous MCI_PLAY command handling.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 43cbb44f4fe9ebd68cf86d8dec5a70df6c5e92ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43cbb44f4fe9ebd68cf86d8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 17:15:33 2005 +0100 mciavi32: Rewrite asynchronous MCI_PLAY command handling. Rewrite asynchronous MCI_PLAY command handling in MCIAVI driver, make it more responsive to commands in the MCI_MODE_PLAY state by checking hStopEvent even if the time frame between frames has expired. --- dlls/mciavi32/mciavi.c | 155 +++++++++++++++++++--------------------- dlls/mciavi32/private_mciavi.h | 1 2 files changed, 75 insertions(+), 81 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 8f1074c..a1f04f9 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -44,74 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); -/* =================================================================== - * =================================================================== - * FIXME: should be using the new mmThreadXXXX functions from WINMM - * instead of those - * it would require to add a wine internal flag to mmThreadCreate - * in order to pass a 32 bit function instead of a 16 bit one - * =================================================================== - * =================================================================== */ - -struct SCA { - MCIDEVICEID wDevID; - UINT wMsg; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; -}; - -/************************************************************************** - * MCI_SCAStarter [internal] - */ -static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) -{ - struct SCA* sca = (struct SCA*)arg; - DWORD ret; - - TRACE("In thread before async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - HeapFree(GetProcessHeap(), 0, sca); - return ret; -} - -/************************************************************************** - * MCI_SendCommandAsync [internal] - */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD_PTR dwParam2, UINT size) -{ - HANDLE handle; - struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); - - if (sca == 0) - return MCIERR_OUT_OF_MEMORY; - - sca->wDevID = wDevID; - sca->wMsg = wMsg; - sca->dwParam1 = dwParam1; - - if (size && dwParam2) { - sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); - /* copy structure passed by program in dwParam2 to be sure - * we can still use it whatever the program does - */ - memcpy((LPVOID)sca->dwParam2, (LPVOID)dwParam2, size); - } else { - sca->dwParam2 = dwParam2; - } - - if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { - WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); - return MCI_SCAStarter(&sca); - } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); - return 0; -} - /*======================================================================* * MCI AVI implemantation * *======================================================================*/ @@ -152,6 +84,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, return 0; InitializeCriticalSection(&wma->cs); + wma->ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); @@ -184,6 +117,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDev mciSetDriverData(dwDevID, 0); mciFreeCommandResource(wma->wCommandTable); + CloseHandle(wma->ack_event); CloseHandle(wma->hStopEvent); LeaveCriticalSection(&wma->cs); @@ -393,6 +327,61 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD return dwRet; } +static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms); + +struct MCIAVI_play_data +{ + MCIDEVICEID wDevID; + DWORD flags; + MCI_PLAY_PARMS params; +}; + +/* + * MCIAVI_mciPlay_thread + * + * FIXME: probably should use a common worker thread created at the driver + * load time and queue all async commands to it. + */ +static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) +{ + struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; + DWORD ret; + + TRACE("In thread before async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + ret = MCIAVI_mciPlay(data->wDevID, data->flags | MCI_WAIT, &data->params); + TRACE("In thread after async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + + HeapFree(GetProcessHeap(), 0, data); + return ret; +} + +/* + * MCIAVI_mciPlay_async + */ +static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) +{ + HANDLE handle, ack_event = wma->ack_event; + struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); + + if (!data) return MCIERR_OUT_OF_MEMORY; + + data->wDevID = wma->wDevID; + data->flags = dwFlags; + memcpy(&data->params, lpParams, sizeof(MCI_PLAY_PARMS)); + + if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) + { + WARN("Couldn't create thread for async play, playing synchronously\n"); + return MCIAVI_mciPlay_thread(data); + } + SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); + /* wait until the thread starts up, so the app could see a changed status */ + WaitForSingleObject(ack_event, INFINITE); + TRACE("Async play has started\n"); + return 0; +} + /*************************************************************************** * MCIAVI_mciPlay [internal] */ @@ -429,10 +418,8 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, LeaveCriticalSection(&wma->cs); - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, - (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } + if (!(dwFlags & MCI_WAIT)) + return MCIAVI_mciPlay_async(wma, dwFlags, lpParms); if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) ShowWindow(wma->hWndPaint, SW_SHOWNA); @@ -460,16 +447,20 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->dwStatus == MCI_MODE_PLAY) { LeaveCriticalSection(&wma->cs); + SetEvent(wma->ack_event); return 0; } if (wma->dwToVideoFrame <= wma->dwCurrVideoFrame) { dwRet = 0; + SetEvent(wma->ack_event); goto mci_play_done; } wma->dwStatus = MCI_MODE_PLAY; + /* signal the state change */ + SetEvent(wma->ack_event); if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_DGV_PLAY_REVERSE|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) FIXME("Unsupported flag %08lx\n", dwFlags); @@ -492,6 +483,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; + DWORD ret; tc = GetTickCount(); @@ -504,7 +496,6 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->lpWaveFormat) { HANDLE events[2]; - DWORD ret; events[0] = wma->hStopEvent; events[1] = wma->hEvent; @@ -522,15 +513,15 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, delta = GetTickCount() - tc; if (delta < frameTime) - { - DWORD ret; + delta = frameTime - delta; + else + delta = 0; - LeaveCriticalSection(&wma->cs); - ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, frameTime - delta, - QS_ALLINPUT, MWMO_INPUTAVAILABLE); - EnterCriticalSection(&wma->cs); - if (ret == WAIT_OBJECT_0) break; - } + LeaveCriticalSection(&wma->cs); + ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, delta, + QS_ALLINPUT, MWMO_INPUTAVAILABLE); + EnterCriticalSection(&wma->cs); + if (ret == WAIT_OBJECT_0) break; if (wma->dwCurrVideoFrame < dwToFrame) wma->dwCurrVideoFrame++; @@ -618,6 +609,8 @@ static DWORD MCIAVI_mciStop(UINT wDevID, EnterCriticalSection(&wma->cs); + TRACE("current status %04lx\n", wma->dwStatus); + switch (wma->dwStatus) { case MCI_MODE_PLAY: case MCI_MODE_RECORD: diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 2cbed11..cd11f76 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -80,6 +80,7 @@ typedef struct { /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent; + HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; extern HINSTANCE MCIAVI_hInstance;

1 0

Alexandre Julliard : user/tests: Remove todo_wine from a few tests that (usually) succeed.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 0e6b4c43de329e298058bb4eb98e6140e3b13231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e6b4c43de329e298058bb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 17:15:54 2005 +0100 user/tests: Remove todo_wine from a few tests that (usually) succeed. --- dlls/user/tests/msg.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 449f604..3cdaf5e 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -6775,9 +6775,7 @@ static void test_PeekMessage(void) qs_all_input &= ~QS_RAWINPUT; qs_input &= ~QS_RAWINPUT; } -todo_wine { ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); -} trace("signalling to send message\n"); SetEvent(info.hevent[EV_SENDMSG]); @@ -6790,13 +6788,11 @@ todo_wine { ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); qstatus = GetQueueStatus(qs_all_input); -todo_wine { ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), "wrong qstatus %08lx\n", qstatus); -} while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + ok_sequence(WmUser, "WmUser", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus);

1 0

Dmitry Timoshkov : user32/tests: Add a PeekMessage test.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: b61b82011e616eb369dbfb01c036d6c796866ea5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b61b82011e616eb369dbfb0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 13:58:11 2005 +0100 user32/tests: Add a PeekMessage test. --- dlls/user/tests/msg.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 284 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 5d54386..449f604 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdio.h> -#define _WIN32_WINNT 0x0500 /* For WM_CHANGEUISTATE */ +#define _WIN32_WINNT 0x0501 /* For WM_CHANGEUISTATE,QS_RAWINPUT */ #include "windef.h" #include "winbase.h" @@ -6680,6 +6680,288 @@ static void test_edit_messages(void) /**************************** End of Edit test ******************************/ +static const struct message WmChar[] = { + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +static const struct message WmKeyDownUp[] = { + { WM_KEYDOWN, sent|wparam|lparam, 'N', 0x00000001 }, + { WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 }, + { 0 } +}; + +static const struct message WmUserChar[] = { + { WM_USER, sent }, + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +#define EV_START_STOP 0 +#define EV_SENDMSG 1 +#define EV_ACK 2 + +struct thread_info_2 +{ + HWND hwnd; + HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */ +}; + +static DWORD CALLBACK send_msg_thread_2(void *param) +{ + DWORD ret; + struct thread_info_2 *info = param; + + trace("thread: waiting for start\n"); + WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE); + trace("thread: looping\n"); + + while (1) + { + ret = WaitForMultipleObjects(2, info->hevent, FALSE, INFINITE); + + switch (ret) + { + case WAIT_OBJECT_0 + EV_START_STOP: + trace("thread: exiting\n"); + return 0; + + case WAIT_OBJECT_0 + EV_SENDMSG: + trace("thread: sending message\n"); + SendNotifyMessageA(info->hwnd, WM_USER, 0, 0); + SetEvent(info->hevent[EV_ACK]); + break; + + default: + trace("unexpected return: %04lx\n", ret); + assert(0); + break; + } + } + return 0; +} + +static void test_PeekMessage(void) +{ + MSG msg; + HANDLE hthread; + DWORD tid, qstatus; + UINT qs_all_input = QS_ALLINPUT; + UINT qs_input = QS_INPUT; + struct thread_info_2 info; + + info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ShowWindow(info.hwnd, SW_SHOW); + UpdateWindow(info.hwnd); + + info.hevent[EV_START_STOP] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_SENDMSG] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_ACK] = CreateEventA(NULL, 0, 0, NULL); + + hthread = CreateThread(NULL, 0, send_msg_thread_2, &info, 0, &tid); + + trace("signalling to start looping\n"); + SetEvent(info.hevent[EV_START_STOP]); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_sequence(); + + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(qs_all_input); + if (GetLastError() == ERROR_INVALID_FLAGS) + { + trace("QS_RAWINPUT not supported on this platform\n"); + qs_all_input &= ~QS_RAWINPUT; + qs_input &= ~QS_RAWINPUT; + } +todo_wine { + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + /* pass invalid QS_xxxx flags */ + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(0xffffffff); + ok(qstatus == 0, "GetQueueStatus should fail: %08lx\n", qstatus); + ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); + + keybd_event('N', 0, 0, 0); + keybd_event('N', 0, KEYEVENTF_KEYUP, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + InvalidateRect(info.hwnd, NULL, FALSE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (qs_input << 16))) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_PAINT)) DispatchMessageA(&msg); + ok_sequence(WmPaint, "WmPaint", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, WM_CHAR, WM_CHAR, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmUserChar, "WmUserChar", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_KEY << 16))) DispatchMessage(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16))) DispatchMessage(&msg); + ok_sequence(WmKeyDownUp, "WmKeyDownUp", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to exit\n"); + SetEvent(info.hevent[EV_START_STOP]); + + WaitForSingleObject(hthread, INFINITE); + + CloseHandle(hthread); + CloseHandle(info.hevent[0]); + CloseHandle(info.hevent[1]); + CloseHandle(info.hevent[2]); + + DestroyWindow(info.hwnd); +} + + START_TEST(msg) { BOOL ret; @@ -6723,6 +7005,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_PeekMessage(); test_scrollwindowex(); test_messages(); test_mdi_messages();

1 0

Raphael Junqueira : opengl: Fix last wgl regression.
by Alexandre Julliard 22 Dec '05

22 Dec '05

Module: wine Branch: refs/heads/master Commit: 2d708edc5f715c2957790b3f926cf308f679de59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d708edc5f715c2957790b3… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 22 13:54:01 2005 +0100 opengl: Fix last wgl regression. Fix wgl regression: test glx server version and extensions to use (and not use glXQueryDrawable on older glx implementations). --- dlls/opengl32/wgl.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/opengl32/wgl_ext.c | 13 +++- dlls/opengl32/wgl_ext.h | 13 ++++ 3 files changed, 133 insertions(+), 40 deletions(-)

1 0