October 2012 - Wine-Commits

Jörg Höhle : mciseq: Fix memory leak when MCI_OPEN fails.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 2b54cb54936aebc9858c3c549b5264d5ad38bd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b54cb54936aebc9858c3c549… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 18 18:26:26 2012 +0200 mciseq: Fix memory leak when MCI_OPEN fails. --- dlls/mciseq/mcimidi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e0d8164..066820d 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -797,6 +797,10 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp if (wmm->hFile != 0) mmioClose(wmm->hFile, 0); wmm->hFile = 0; + HeapFree(GetProcessHeap(), 0, wmm->tracks); + HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); } else { wmm->dwPositionMS = 0; wmm->dwStatus = MCI_MODE_STOP;

1 0

Jörg Höhle : mciseq: Create player thread in the synchronous case too.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 010019df064cfe1e9efee5ac6ee9e1e0954bd4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010019df064cfe1e9efee5ac6… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Thu Oct 4 12:34:07 2012 +0200 mciseq: Create player thread in the synchronous case too. --- dlls/mciseq/mcimidi.c | 156 +++++++++++++++++++++---------------------------- 1 files changed, 66 insertions(+), 90 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 2a65027..e6927ac 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -62,6 +62,7 @@ typedef struct tagWINE_MCIMIDI { HMIDI hMidi; int nUseCount; /* Incremented for each shared open */ HANDLE hCallback; /* Callback handle for pending notification */ + HANDLE hThread; /* Player thread */ HMMIO hFile; /* mmio file handle open as Element */ LPWSTR lpstrElementName; /* Name of file (if any) */ LPWSTR lpstrCopyright; @@ -77,79 +78,10 @@ typedef struct tagWINE_MCIMIDI { MCI_MIDITRACK* tracks; /* Content of each track */ DWORD dwPulse; DWORD dwPositionMS; + DWORD dwEndMS; DWORD dwStartTicks; } WINE_MCIMIDI; -/* =================================================================== - * =================================================================== - * 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 - * =================================================================== - * =================================================================== */ - -struct SCA { - UINT wDevID; - UINT wMsg; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; -}; - -/* EPP DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2); */ - -/************************************************************************** - * MCI_SCAStarter [internal] - */ -static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) -{ - struct SCA* sca = arg; - DWORD ret; - - TRACE("In thread before async command (%08x,%u,%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,%u,%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_PTR 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 MIDI implementation * *======================================================================*/ @@ -831,8 +763,8 @@ static DWORD MIDI_mciStop(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS if (oldstat == MCI_MODE_PAUSE) dwRet = midiOutReset((HMIDIOUT)wmm->hMidi); - while (wmm->dwStatus != MCI_MODE_STOP) - Sleep(10); + if ((dwFlags & MCI_WAIT) && wmm->hThread) + WaitForSingleObject(wmm->hThread, INFINITE); } /* sanity reset */ @@ -863,6 +795,7 @@ static DWORD MIDI_mciClose(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS wmm->hFile = 0; TRACE("hFile closed !\n"); } + if (wmm->hThread) CloseHandle(wmm->hThread); HeapFree(GetProcessHeap(), 0, wmm->tracks); HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); @@ -905,12 +838,12 @@ static MCI_MIDITRACK* MIDI_mciFindNextEvent(WINE_MCIMIDI* wmm, LPDWORD hiPulse) /************************************************************************** * MIDI_player [internal] */ -static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwStartMS, DWORD dwEndMS, DWORD dwFlags) +static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) { DWORD dwRet; WORD doPlay, nt; MCI_MIDITRACK* mmt; - DWORD hiPulse; + DWORD hiPulse, dwStartMS = wmm->dwPositionMS; HANDLE oldcb = NULL; /* init tracks */ @@ -934,7 +867,6 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwStartMS, DWORD dwEndMS, DWOR wmm->dwPulse = 0; wmm->dwTempo = 500000; - wmm->dwStatus = MCI_MODE_PLAY; wmm->dwPositionMS = 0; wmm->wStartedPlaying = FALSE; @@ -944,7 +876,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwStartMS, DWORD dwEndMS, DWOR */ while (((volatile WINE_MCIMIDI*)wmm)->dwStatus == MCI_MODE_PAUSE); - doPlay = (wmm->dwPositionMS >= dwStartMS && wmm->dwPositionMS <= dwEndMS); + doPlay = (wmm->dwPositionMS >= dwStartMS && wmm->dwPositionMS <= wmm->dwEndMS); TRACE("wmm->dwStatus=%d, doPlay=%c\n", wmm->dwStatus, doPlay ? 'T' : 'F'); @@ -1142,12 +1074,54 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwStartMS, DWORD dwEndMS, DWOR return dwRet; } +static DWORD CALLBACK MIDI_Starter(void *ptr) +{ + WINE_MCIMIDI* wmm = ptr; + return MIDI_player(wmm, MCI_NOTIFY); +} + +static DWORD ensurePlayerThread(WINE_MCIMIDI* wmm) +{ + if (1) { + DWORD dwRet; + + switch (wmm->dwStatus) { + default: + return MCIERR_NONAPPLICABLE_FUNCTION; + case MCI_MODE_PAUSE: + return MIDI_mciResume(wmm, 0, NULL); + case MCI_MODE_PLAY: + /* the player was not stopped, use it */ + return 0; + case MCI_MODE_STOP: + break; + } + wmm->dwStatus = MCI_MODE_PLAY; + if (wmm->hThread) { + WaitForSingleObject(wmm->hThread, INFINITE); + CloseHandle(wmm->hThread); + wmm->hThread = 0; + } + wmm->hThread = CreateThread(NULL, 0, MIDI_Starter, wmm, 0, NULL); + if (!wmm->hThread) { + dwRet = MCIERR_OUT_OF_MEMORY; + } else { + SetThreadPriority(wmm->hThread, THREAD_PRIORITY_TIME_CRITICAL); + dwRet = 0; + } + if (dwRet) + wmm->dwStatus = MCI_MODE_STOP; + return dwRet; + } +} + /************************************************************************** * MIDI_mciPlay [internal] */ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { DWORD dwStartMS, dwEndMS; + DWORD dwRet; HANDLE oldcb; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); @@ -1157,19 +1131,6 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP return MCIERR_FILE_NOT_FOUND; } - if (wmm->dwStatus != MCI_MODE_STOP) { - if (wmm->dwStatus == MCI_MODE_PAUSE) { - /* FIXME: parameters (start/end) in lpParams may not be used */ - return MIDI_mciResume(wmm, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); - } - WARN("Can't play: device is not stopped !\n"); - return MCIERR_INTERNAL; - } - - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmm->wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } - if (lpParms && (dwFlags & MCI_TO)) { dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); /* FIXME: if (dwEndMS > length) return MCIERR_OUTOFRANGE; */ @@ -1184,13 +1145,28 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP if (dwEndMS < dwStartMS) return MCIERR_OUTOFRANGE; + if (dwFlags & MCI_FROM) { + /* Stop with MCI_NOTIFY_ABORTED and set new position. */ + MIDI_mciStop(wmm, MCI_WAIT, NULL); + wmm->dwPositionMS = dwStartMS; + } /* else use existing player. */ + wmm->dwEndMS = dwEndMS; + TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); oldcb = InterlockedExchangePointer(&wmm->hCallback, (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); - return MIDI_player(wmm, dwStartMS, dwEndMS, dwFlags); + dwRet = ensurePlayerThread(wmm); + + if (!dwRet && (dwFlags & MCI_WAIT)) { + WaitForSingleObject(wmm->hThread, INFINITE); + GetExitCodeThread(wmm->hThread, &dwRet); + /* STATUS_PENDING cannot happen. It folds onto MCIERR_UNRECOGNIZED_KEYWORD */ + } + /* The player thread performs notification at exit. */ + return dwRet; } /**************************************************************************

1 0

Jörg Höhle : mciseq: Send MCI_PLAY notifications like w2k-w7 do.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 310b2a5114e2c5060f75973f4ae72c696f7c1a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=310b2a5114e2c5060f75973f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Oct 1 21:53:04 2012 +0200 mciseq: Send MCI_PLAY notifications like w2k-w7 do. --- dlls/mciseq/mcimidi.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e6927ac..e77d3f8 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1150,13 +1150,18 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP MIDI_mciStop(wmm, MCI_WAIT, NULL); wmm->dwPositionMS = dwStartMS; } /* else use existing player. */ - wmm->dwEndMS = dwEndMS; + if (wmm->dwEndMS != dwEndMS) { + oldcb = InterlockedExchangePointer(&wmm->hCallback, NULL); + if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); + wmm->dwEndMS = dwEndMS; + } TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); - oldcb = InterlockedExchangePointer(&wmm->hCallback, - (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); - if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); + if ((dwFlags & MCI_NOTIFY) && lpParms) { + oldcb = InterlockedExchangePointer(&wmm->hCallback, HWND_32(LOWORD(lpParms->dwCallback))); + if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_SUPERSEDED); + } dwRet = ensurePlayerThread(wmm);

1 0

Jörg Höhle : mciseq: Separate player loop from MCI_PLAY command.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 4dbceec8f9a2af781d216bb265ec3ca9987db237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbceec8f9a2af781d216bb26… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Thu Oct 4 12:02:35 2012 +0200 mciseq: Separate player loop from MCI_PLAY command. --- dlls/mciseq/mcimidi.c | 97 +++++++++++++++++++++++++++---------------------- 1 files changed, 53 insertions(+), 44 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 066820d..86ce66c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -903,55 +903,15 @@ static MCI_MIDITRACK* MIDI_mciFindNextEvent(WINE_MCIMIDI* wmm, LPDWORD hiPulse) } /************************************************************************** - * MIDI_mciPlay [internal] + * MIDI_player [internal] */ -static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwStartMS, DWORD dwEndMS, DWORD dwFlags) { - DWORD dwStartMS, dwEndMS; - DWORD dwRet = 0; + DWORD dwRet; WORD doPlay, nt; MCI_MIDITRACK* mmt; DWORD hiPulse; - HANDLE oldcb; - - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); - - if (wmm->hFile == 0) { - WARN("Can't play: no file %s!\n", debugstr_w(wmm->lpstrElementName)); - return MCIERR_FILE_NOT_FOUND; - } - - if (wmm->dwStatus != MCI_MODE_STOP) { - if (wmm->dwStatus == MCI_MODE_PAUSE) { - /* FIXME: parameters (start/end) in lpParams may not be used */ - return MIDI_mciResume(wmm, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); - } - WARN("Can't play: device is not stopped !\n"); - return MCIERR_INTERNAL; - } - - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmm->wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } - - if (lpParms && (dwFlags & MCI_FROM)) { - dwStartMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwFrom); - } else { - dwStartMS = wmm->dwPositionMS; - } - - if (lpParms && (dwFlags & MCI_TO)) { - dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - dwEndMS = 0xFFFFFFFFul; - } - - TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); - - oldcb = InterlockedExchangePointer(&wmm->hCallback, - (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); - if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); - oldcb = NULL; + HANDLE oldcb = NULL; /* init tracks */ for (nt = 0; nt < wmm->nTracks; nt++) { @@ -1183,6 +1143,55 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP } /************************************************************************** + * MIDI_mciPlay [internal] + */ +static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + DWORD dwStartMS, dwEndMS; + HANDLE oldcb; + + TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + + if (wmm->hFile == 0) { + WARN("Can't play: no file %s!\n", debugstr_w(wmm->lpstrElementName)); + return MCIERR_FILE_NOT_FOUND; + } + + if (wmm->dwStatus != MCI_MODE_STOP) { + if (wmm->dwStatus == MCI_MODE_PAUSE) { + /* FIXME: parameters (start/end) in lpParams may not be used */ + return MIDI_mciResume(wmm, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); + } + WARN("Can't play: device is not stopped !\n"); + return MCIERR_INTERNAL; + } + + if (!(dwFlags & MCI_WAIT)) { + return MCI_SendCommandAsync(wmm->wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); + } + + if (lpParms && (dwFlags & MCI_FROM)) { + dwStartMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwFrom); + } else { + dwStartMS = wmm->dwPositionMS; + } + + if (lpParms && (dwFlags & MCI_TO)) { + dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + } else { + dwEndMS = 0xFFFFFFFFul; + } + + TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); + + oldcb = InterlockedExchangePointer(&wmm->hCallback, + (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); + if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); + + return MIDI_player(wmm, dwStartMS, dwEndMS, dwFlags); +} + +/************************************************************************** * MIDI_mciPause [internal] */ static DWORD MIDI_mciPause(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)

1 0

Jörg Höhle : mciseq: Play returns MCIERR_OUTOFRANGE as required.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 0e675165f15f463f16a3d0ad9520e95c8905fca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e675165f15f463f16a3d0ad9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 1 21:35:23 2011 +0100 mciseq: Play returns MCIERR_OUTOFRANGE as required. --- dlls/mciseq/mcimidi.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 86ce66c..2a65027 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1170,17 +1170,19 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP return MCI_SendCommandAsync(wmm->wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } + if (lpParms && (dwFlags & MCI_TO)) { + dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + /* FIXME: if (dwEndMS > length) return MCIERR_OUTOFRANGE; */ + } else { + dwEndMS = 0xFFFFFFFFul; /* FIXME: dwEndMS = length; */ + } if (lpParms && (dwFlags & MCI_FROM)) { dwStartMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwFrom); } else { dwStartMS = wmm->dwPositionMS; } - - if (lpParms && (dwFlags & MCI_TO)) { - dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - dwEndMS = 0xFFFFFFFFul; - } + if (dwEndMS < dwStartMS) + return MCIERR_OUTOFRANGE; TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS);

1 0

Jörg Höhle : mciseq: Map MMSYSERR_* to MCIERR_* error codes.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 4a823fdf00d39e6667ec46c94c5dd89846c76fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a823fdf00d39e6667ec46c94… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 14 16:46:32 2012 +0200 mciseq: Map MMSYSERR_* to MCIERR_* error codes. --- dlls/mciseq/mcimidi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e77d3f8..3b544c3 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -86,6 +86,22 @@ typedef struct tagWINE_MCIMIDI { * MCI MIDI implementation * *======================================================================*/ +static DWORD mmr2mci(DWORD ret) +{ + switch (ret) { + case MMSYSERR_ALLOCATED: + return MCIERR_SEQ_PORT_INUSE; + case MMSYSERR_NOMEM: + return MCIERR_OUT_OF_MEMORY; + case MMSYSERR_BADDEVICEID: /* wine*.drv disabled */ + return MCIERR_SEQ_PORT_NONEXISTENT; + case MIDIERR_INVALIDSETUP: /* from midimap.dll without snd-seq module */ + return MCIERR_SEQ_PORT_MAPNODEVICE; + default: + return ret; + } +} + static DWORD MIDI_mciResume(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); /************************************************************************** @@ -862,7 +878,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) dwRet = midiOutOpen((LPHMIDIOUT)&wmm->hMidi, wmm->wPort, 0L, 0L, CALLBACK_NULL); if (dwRet != MMSYSERR_NOERROR) { - return dwRet; + return mmr2mci(dwRet); } wmm->dwPulse = 0; @@ -1071,7 +1087,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) /* Let the potentially asynchronous commands support FAILURE notification. */ if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); - return dwRet; + return mmr2mci(dwRet); } static DWORD CALLBACK MIDI_Starter(void *ptr)

1 0

Jacek Caban : vbscript: Added CStr implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 470137b6d36eb87cd4cb4bfc9cd09c9c4642ee5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=470137b6d36eb87cd4cb4bfc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 8 14:38:25 2012 +0200 vbscript: Added CStr implementation. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 76a035b..7d60a49 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -402,8 +402,16 @@ static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_string(arg, &str); + if(FAILED(hres)) + return hres; + + return return_bstr(res, str); } static inline WCHAR hex_char(unsigned n) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 47fae0c..ff188ab 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -38,6 +38,18 @@ Call ok(getVT(vbFriday) = "VT_I2", "getVT(vbFriday) = " & getVT(vbFriday)) Call ok(vbSaturday = 7, "vbSaturday = " & vbSaturday) Call ok(getVT(vbSaturday) = "VT_I2", "getVT(vbSaturday) = " & getVT(vbSaturday)) +Sub TestCStr(arg, exval) + dim x + x = CStr(arg) + Call ok(getVT(x) = "VT_BSTR*", "getVT(x) = " & getVT(x)) + Call ok(x = exval, "CStr(" & arg & ") = " & x) +End Sub + +TestCStr "test", "test" +TestCStr 3, "3" +TestCStr 3.5, "3.5" +if isEnglishLang then TestCStr true, "True" + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0

Michael Stefaniuc : msrle32: Don' t bother using the register storage class specifier.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: c046d30fb70b4cdd53d7ecb5e19d4ddc3fe2afc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c046d30fb70b4cdd53d7ecb5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 8 13:26:08 2012 +0200 msrle32: Don't bother using the register storage class specifier. --- dlls/msrle32/msrle32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index e157027..acd3866 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -42,7 +42,7 @@ static HINSTANCE MSRLE32_hModule = 0; #define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) static inline WORD ColorCmp(WORD clr1, WORD clr2) { - register UINT a = (clr1-clr2); + UINT a = clr1 - clr2; return SQR(a); } static inline WORD Intensity(RGBQUAD clr) @@ -1535,7 +1535,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) { /* swap buffer for current and previous frame */ /* Don't free and alloc new -- costs to much time and they are of equal size ! */ - register LPWORD pTmp = pi->pPrevFrame; + LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp;

1 0

Michael Stefaniuc : imaadp32.acm: Don' t bother using the register storage class specifier.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 07d602c4f1876048f86f613167af33b00defa09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d602c4f1876048f86f61316… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 8 13:17:56 2012 +0200 imaadp32.acm: Don't bother using the register storage class specifier. --- dlls/imaadp32.acm/imaadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 0d7ed32..19c2ae2 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -136,7 +136,7 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) { - register WAVEFORMATEX* pwfx = &awfx->wfx; + WAVEFORMATEX* pwfx = &awfx->wfx; /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample * have been initialized... */

1 0

Jacek Caban : mshtml: Return dispinterface from PHEventSink::QueryInterface .
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 6ae3418aaf873b85f4508a8920e565d039e7b817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae3418aaf873b85f4508a892… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 8 15:00:50 2012 +0200 mshtml: Return dispinterface from PHEventSink::QueryInterface. --- dlls/mshtml/pluginhost.c | 14 ++++++++++++++ dlls/mshtml/tests/activex.c | 5 +++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 0f68c25..4f088ad 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -485,6 +485,7 @@ struct PHEventSink { ITypeInfo *typeinfo; GUID iid; DWORD cookie; + BOOL is_dispiface; sink_entry_t *handlers; DWORD handlers_cnt; @@ -548,6 +549,9 @@ static HRESULT WINAPI PHEventSink_QueryInterface(IDispatch *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IDispatch)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; + }else if(This->is_dispiface && IsEqualGUID(riid, &This->iid)) { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = &This->IDispatch_iface; }else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -670,6 +674,7 @@ static PHEventSink *create_event_sink(PluginHost *plugin_host, ITypeInfo *typein PHEventSink *ret; IConnectionPoint *cp; TYPEATTR *typeattr; + TYPEKIND typekind; GUID guid; HRESULT hres; @@ -677,9 +682,17 @@ static PHEventSink *create_event_sink(PluginHost *plugin_host, ITypeInfo *typein if(FAILED(hres)) return NULL; + typekind = typeattr->typekind; guid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + TRACE("guid %s typekind %d\n", debugstr_guid(&guid), typekind); + + if(typekind != TKIND_INTERFACE && typekind != TKIND_DISPATCH) { + WARN("invalid typekind %d\n", typekind); + return NULL; + } + hres = IUnknown_QueryInterface(plugin_host->plugin_unk, &IID_IConnectionPointContainer, (void**)&cp_container); if(FAILED(hres)) { WARN("Could not get IConnectionPointContainer iface: %08x\n", hres); @@ -699,6 +712,7 @@ static PHEventSink *create_event_sink(PluginHost *plugin_host, ITypeInfo *typein ret->ref = 1; ret->host = plugin_host; ret->iid = guid; + ret->is_dispiface = typekind == TKIND_DISPATCH; ITypeInfo_AddRef(typeinfo); ret->typeinfo = typeinfo; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index e861d37..0bb2837 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -331,6 +331,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie) { + DispActiveXTest *ax_test; IDispatchEx *dispex; HRESULT hres; @@ -342,6 +343,10 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatchEx, (void**)&dispex); ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDispatchEx) returned: %08x\n", hres); + hres = IUnknown_QueryInterface(pUnkSink, &DIID_DispActiveXTest, (void**)&ax_test); + ok(hres == S_OK, "Could not get DispActiveXTest iface: %08x\n", hres); + DispActiveXTest_Release(ax_test); + *pdwCookie = 0xdeadbeef; return S_OK; }

1 0