April 2010 - Wine-Commits - list.winehq.org

Jörg Höhle : mciwave: MCI Set Input|Output allows to select wave device.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: e8157bf50bd43ad9dad55d8383332ff9f266adec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8157bf50bd43ad9dad55d838… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Nov 20 20:55:22 2009 +0100 mciwave: MCI Set Input|Output allows to select wave device. --- dlls/mciwave/mciwave.c | 83 ++++++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 37 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 24e75ee..85aae0d 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -47,6 +47,8 @@ typedef struct { WAVEFORMATEX wfxRef; LPWAVEFORMATEX lpWaveFormat; /* Points to wfxRef until set by OPEN or RECORD */ BOOL fInput; /* FALSE = Output, TRUE = Input */ + WORD wInput; /* wave input device */ + WORD wOutput; /* wave output device */ volatile WORD dwStatus; /* one from MCI_MODE_xxxx */ DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */ DWORD dwPosition; /* position in bytes in chunk */ @@ -529,6 +531,7 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P wmw->nUseCount++; + wmw->wInput = wmw->wOutput = WAVE_MAPPER; wmw->fInput = FALSE; wmw->hWave = 0; wmw->dwStatus = MCI_MODE_NOT_READY; @@ -831,8 +834,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, */ mmioSeek(wmw->hFile, wmw->ckWaveData.dwDataOffset + wmw->dwPosition, SEEK_SET); /* >= 0 */ - /* FIXME: how to choose between several output channels ? here mapper is forced */ - dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, + dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, wmw->wOutput, wmw->lpWaveFormat, (DWORD_PTR)WAVE_mciPlayCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != 0) { @@ -1064,11 +1066,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt */ mmioSeek(wmw->hFile, wmw->ckWaveData.dwDataOffset + wmw->dwPosition, SEEK_SET); /* >= 0 */ - /* By default the device will be opened for output, the MCI_CUE function is there to - * change from output to input and back - */ - /* FIXME: how to choose between several output channels ? here mapper is forced */ - dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, + dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, wmw->wInput, wmw->lpWaveFormat, (DWORD_PTR)WAVE_mciRecordCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { @@ -1279,7 +1277,7 @@ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lp /************************************************************************** * WAVE_mciSet [internal] */ -static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) +static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS lpParms) { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); @@ -1337,44 +1335,64 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa default: WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } - if (dwFlags & MCI_WAVE_INPUT) - TRACE("MCI_WAVE_INPUT !\n"); - if (dwFlags & MCI_WAVE_OUTPUT) - TRACE("MCI_WAVE_OUTPUT !\n"); - if (dwFlags & MCI_WAVE_SET_ANYINPUT) - TRACE("MCI_WAVE_SET_ANYINPUT !\n"); - if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) - TRACE("MCI_WAVE_SET_ANYOUTPUT !\n"); + if (dwFlags & MCI_WAVE_INPUT) { + TRACE("MCI_WAVE_INPUT = %d\n", lpParms->wInput); + if (lpParms->wInput >= waveInGetNumDevs()) + return MCIERR_OUTOFRANGE; + if (wmw->wInput != (WORD)lpParms->wInput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wInput = lpParms->wInput; + } + if (dwFlags & MCI_WAVE_OUTPUT) { + TRACE("MCI_WAVE_OUTPUT = %d\n", lpParms->wOutput); + if (lpParms->wOutput >= waveOutGetNumDevs()) + return MCIERR_OUTOFRANGE; + if (wmw->wOutput != (WORD)lpParms->wOutput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wOutput = lpParms->wOutput; + } + if (dwFlags & MCI_WAVE_SET_ANYINPUT) { + TRACE("MCI_WAVE_SET_ANYINPUT\n"); + if (wmw->wInput != (WORD)lpParms->wInput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wInput = WAVE_MAPPER; + } + if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) { + TRACE("MCI_WAVE_SET_ANYOUTPUT\n"); + if (wmw->wOutput != (WORD)lpParms->wOutput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wOutput = WAVE_MAPPER; + } /* Set wave format parameters is refused after Open or Record.*/ if (dwFlags & MCI_WAVE_SET_FORMATTAG) { - TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag); + TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", lpParms->wFormatTag); if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - if (((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag != WAVE_FORMAT_PCM) + if (lpParms->wFormatTag != WAVE_FORMAT_PCM) return MCIERR_OUTOFRANGE; } if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nAvgBytesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nAvgBytesPerSec; + wmw->wfxRef.nAvgBytesPerSec = lpParms->nAvgBytesPerSec; TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); } if (dwFlags & MCI_WAVE_SET_BITSPERSAMPLE) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.wBitsPerSample = ((LPMCI_WAVE_SET_PARMS)lpParms)->wBitsPerSample; + wmw->wfxRef.wBitsPerSample = lpParms->wBitsPerSample; TRACE("MCI_WAVE_SET_BITSPERSAMPLE = %d\n", wmw->wfxRef.wBitsPerSample); } if (dwFlags & MCI_WAVE_SET_BLOCKALIGN) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nBlockAlign = ((LPMCI_WAVE_SET_PARMS)lpParms)->nBlockAlign; + wmw->wfxRef.nBlockAlign = lpParms->nBlockAlign; TRACE("MCI_WAVE_SET_BLOCKALIGN = %d\n", wmw->wfxRef.nBlockAlign); } if (dwFlags & MCI_WAVE_SET_CHANNELS) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nChannels = ((LPMCI_WAVE_SET_PARMS)lpParms)->nChannels; + wmw->wfxRef.nChannels = lpParms->nChannels; TRACE("MCI_WAVE_SET_CHANNELS = %d\n", wmw->wfxRef.nChannels); } if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nSamplesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nSamplesPerSec; + wmw->wfxRef.nSamplesPerSec = lpParms->nSamplesPerSec; TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); } if (dwFlags & MCI_NOTIFY) @@ -1500,21 +1518,12 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_INPUT: - TRACE("MCI_WAVE_INPUT !\n"); - lpParms->dwReturn = 0; - ret = MCIERR_WAVE_INPUTUNSPECIFIED; + lpParms->dwReturn = wmw->wInput; + TRACE("MCI_WAVE_INPUT => %d\n", (signed)wmw->wInput); break; case MCI_WAVE_OUTPUT: - TRACE("MCI_WAVE_OUTPUT !\n"); - { - UINT id; - if (waveOutGetID(wmw->hWave, &id) == MMSYSERR_NOERROR) { - lpParms->dwReturn = id; - } else { - lpParms->dwReturn = 0; - ret = MCIERR_WAVE_OUTPUTUNSPECIFIED; - } - } + lpParms->dwReturn = wmw->wOutput; + TRACE("MCI_WAVE_OUTPUT => %d\n", (signed)wmw->wOutput); break; /* It is always ok to query wave format parameters, * except on auto-open yield MCIERR_UNSUPPORTED_FUNCTION. */ @@ -1705,7 +1714,7 @@ LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, dwParam2, NULL); case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, dwParam2, NULL); case MCI_STOP: return WAVE_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_SET_PARMS) dwParam2); + case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_WAVE_SET_PARMS) dwParam2); case MCI_PAUSE: return WAVE_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_RESUME: return WAVE_mciResume (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return WAVE_mciStatus (dwDevID, dwParam1, (LPMCI_STATUS_PARMS) dwParam2);

1 0

Jörg Höhle : winmm/tests: Add more MCI tests.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: c31bdb98f935aabc68a4fb83caefd0ed753bb710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31bdb98f935aabc68a4fb83c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 29 15:53:02 2010 +0200 winmm/tests: Add more MCI tests. --- dlls/winmm/tests/mci.c | 111 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 102 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c31bdb98f935aabc68a4f…

1 0

Mikhail Maroukhine : rsaenh/tests: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 1d9e32175148b32d4b52b0c0c51890329eaeaba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9e32175148b32d4b52b0c0c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Apr 1 01:41:23 2010 +0700 rsaenh/tests: Fix compiler warnings with flag -Wcast-qual. --- dlls/rsaenh/tests/rsaenh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index a13ca8e..5fe0033 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -476,7 +476,7 @@ static void test_hashes(void) ok(result, "CryptReleaseContext failed 0x%08x\n", GetLastError()); SetLastError(0xdeadbeef); - result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + result = CryptHashData(hHash, (const BYTE *)"data", sizeof("data"), 0); error = GetLastError(); ok(!result, "CryptHashData succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -493,7 +493,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + result = CryptHashData(hHash, (const BYTE *)"data", sizeof("data"), 0); ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); result = CryptDuplicateHash(hHash, NULL, 0, &hHashClone); @@ -504,7 +504,7 @@ static void test_hashes(void) ok(result, "CryptGetHashParam failed 0x%08x\n", GetLastError()); /* add data after duplicating the hash */ - result = CryptHashData(hHash, (BYTE *)"more data", sizeof("more data"), 0); + result = CryptHashData(hHash, (const BYTE *)"more data", sizeof("more data"), 0); ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); result = CryptDestroyHash(hHash);

1 0

Alexandre Julliard : server: Don' t set the Wow64 flag on a Wow6432Node since it's already a 32-bit node.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 0ea2806c3f75fd1e7758bd6b747bc812929c2386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea2806c3f75fd1e7758bd6b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 14:09:12 2010 +0200 server: Don't set the Wow64 flag on a Wow6432Node since it's already a 32-bit node. --- server/registry.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index ff378f5..93d42c9 100644 --- a/server/registry.c +++ b/server/registry.c @@ -537,7 +537,8 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n for (i = ++parent->last_subkey; i > index; i--) parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; - if (is_wow6432node( key->name, key->namelen )) parent->flags |= KEY_WOW64; + if (is_wow6432node( key->name, key->namelen ) && !is_wow6432node( parent->name, parent->namelen )) + parent->flags |= KEY_WOW64; } return key; }

1 0

Jörg Höhle : mciwave: MCI Status returns string resource when appropriate.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: f0baaff46a8a0c0f127ca2a917049a8fec52e5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0baaff46a8a0c0f127ca2a91… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 21 09:24:07 2009 +0100 mciwave: MCI Status returns string resource when appropriate. --- dlls/mciwave/mciwave.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 85aae0d..87dc260 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1518,15 +1518,34 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_INPUT: - lpParms->dwReturn = wmw->wInput; + if (wmw->wInput != (WORD)WAVE_MAPPER) + lpParms->dwReturn = wmw->wInput; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_MAPPER, WAVE_MAPPER_S); + ret = MCI_RESOURCE_RETURNED; + } TRACE("MCI_WAVE_INPUT => %d\n", (signed)wmw->wInput); break; case MCI_WAVE_OUTPUT: - lpParms->dwReturn = wmw->wOutput; + if (wmw->wOutput != (WORD)WAVE_MAPPER) + lpParms->dwReturn = wmw->wOutput; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_MAPPER, WAVE_MAPPER_S); + ret = MCI_RESOURCE_RETURNED; + } TRACE("MCI_WAVE_OUTPUT => %d\n", (signed)wmw->wOutput); break; /* It is always ok to query wave format parameters, * except on auto-open yield MCIERR_UNSUPPORTED_FUNCTION. */ + case MCI_WAVE_STATUS_FORMATTAG: + if (wmw->lpWaveFormat->wFormatTag != WAVE_FORMAT_PCM) + lpParms->dwReturn = wmw->lpWaveFormat->wFormatTag; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_FORMAT_PCM, WAVE_FORMAT_PCM_S); + ret = MCI_RESOURCE_RETURNED; + } + TRACE("MCI_WAVE_FORMATTAG => %lu\n", lpParms->dwReturn); + break; case MCI_WAVE_STATUS_AVGBYTESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nAvgBytesPerSec; TRACE("MCI_WAVE_STATUS_AVGBYTESPERSEC => %lu\n", lpParms->dwReturn); @@ -1543,10 +1562,6 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM lpParms->dwReturn = wmw->lpWaveFormat->nChannels; TRACE("MCI_WAVE_STATUS_CHANNELS => %lu\n", lpParms->dwReturn); break; - case MCI_WAVE_STATUS_FORMATTAG: - lpParms->dwReturn = wmw->lpWaveFormat->wFormatTag; - TRACE("MCI_WAVE_FORMATTAG => %lu\n", lpParms->dwReturn); - break; case MCI_WAVE_STATUS_SAMPLESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nSamplesPerSec; TRACE("MCI_WAVE_STATUS_SAMPLESPERSEC => %lu\n", lpParms->dwReturn);

1 0

Mikhail Maroukhine : quartz: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 0a671deb92000dc18d77c2a2cf32aab04fdbf88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a671deb92000dc18d77c2a2c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 quartz: Fix compiler warnings with flag -Wcast-qual. --- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 68b1908..8469bbc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -203,7 +203,7 @@ static HRESULT AVIDec_ConnectInput(InputPin *pin, const AM_MEDIA_TYPE * pmt) bmi = &format2->bmiHeader; else goto failed; - TRACE("Fourcc: %s\n", debugstr_an((char *)&pmt->subtype.Data1, 4)); + TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS); if (This->hvid) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index faa844b..42ec2ae 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -692,7 +692,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE amt.formattype = FORMAT_WaveFormatEx; break; default: - FIXME("fccType %.4s not handled yet\n", (char *)&pStrHdr->fccType); + FIXME("fccType %.4s not handled yet\n", (const char *)&pStrHdr->fccType); amt.formattype = FORMAT_None; } amt.majortype = MEDIATYPE_Video; @@ -793,7 +793,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); TRACE("bIndexType: %hd\n", pIndex->bIndexType); TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); - TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); if (pIndex->dwReserved[2])

1 0

Mikhail Maroukhine : user32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 5e78bab2660ec74e0c4cb8fa6b67af49e316b25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e78bab2660ec74e0c4cb8fa6… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 user32: Fix compiler warnings with flag -Wcast-qual. --- dlls/user32/cursoricon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6f2359d..fcdb278 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1038,11 +1038,11 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ while (ptr < end) { - if ((!chunk_type && *(DWORD *)ptr == chunk_id ) - || (chunk_type && *(DWORD *)ptr == chunk_type && *((DWORD *)ptr + 2) == chunk_id )) + if ((!chunk_type && *(const DWORD *)ptr == chunk_id ) + || (chunk_type && *(const DWORD *)ptr == chunk_type && *((const DWORD *)ptr + 2) == chunk_id )) { ptr += sizeof(DWORD); - chunk->data_size = (*(DWORD *)ptr + 1) & ~1; + chunk->data_size = (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); if (chunk_type == ANI_LIST_ID || chunk_type == ANI_RIFF_ID) ptr += sizeof(DWORD); chunk->data = ptr; @@ -1051,7 +1051,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ } ptr += sizeof(DWORD); - ptr += (*(DWORD *)ptr + 1) & ~1; + ptr += (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); } }

1 0

Jörg Höhle : winmm: Support MCI "close all" command.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: e89468734d09334f830cf98c255d68ccf2d6293f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89468734d09334f830cf98c2… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 31 16:08:48 2010 +0200 winmm: Support MCI "close all" command. This is not yet generalized to "pause all" or "stop all". --- dlls/winmm/mci.c | 12 +++++++++--- dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 0a15f09..54e9e19 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1224,6 +1224,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, { LPWSTR verb, dev, args; LPWINE_MCIDRIVER wmd = 0; + MCIDEVICEID uDevID; DWORD dwFlags = 0, dwRet = 0; int offset = 0; DWORD_PTR data[MCI_DATA_SIZE]; @@ -1252,6 +1253,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if ((dwRet = MCI_GetString(&dev, &args))) { goto errCleanUp; } + uDevID = strcmpiW(dev, wszAll) ? 0 : MCI_ALL_DEVICE_ID; /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { @@ -1307,6 +1309,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwFlags |= MCI_OPEN_ELEMENT; data[3] = (DWORD_PTR)dev; } + if (MCI_ALL_DEVICE_ID == uDevID) { + dwRet = MCIERR_CANNOT_USE_ALL; + goto errCleanUp; + } if (!strstrW(args, wszSAliasS) && !dev) { dwRet = MCIERR_NEW_REQUIRES_ALIAS; goto errCleanUp; @@ -1320,7 +1326,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, MCI_UnLoadMciDriver(wmd); goto errCleanUp; } - } else if (!(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { + } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; WCHAR buf[128]; @@ -1384,7 +1390,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if (lpstrRet && uRetLen) *lpstrRet = '\0'; TRACE("[%d, %s, %08x, %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s]\n", - wmd->wDeviceID, MCI_MessageToString(MCI_GetMessage(lpCmd)), dwFlags, + wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(MCI_GetMessage(lpCmd)), dwFlags, data[0], debugstr_w((WCHAR *)data[0]), data[1], debugstr_w((WCHAR *)data[1]), data[2], debugstr_w((WCHAR *)data[2]), data[3], debugstr_w((WCHAR *)data[3]), data[4], debugstr_w((WCHAR *)data[4]), data[5], debugstr_w((WCHAR *)data[5])); @@ -1394,7 +1400,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, MCI_UnLoadMciDriver(wmd); /* FIXME: notification is not properly shared across two opens */ } else { - dwRet = MCI_SendCommand(wmd->wDeviceID, MCI_GetMessage(lpCmd), dwFlags, (DWORD_PTR)data); + dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, MCI_GetMessage(lpCmd), dwFlags, (DWORD_PTR)data); } TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, data, lpstrRet, uRetLen); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 0e7ce9d..6bdfefe 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -217,11 +217,11 @@ static void test_openCloseWAVE(HWND hwnd) } err = mciSendString(command_close_all, NULL, 0, NULL); - todo_wine ok(!err,"mci %s (without buffer) returned %s\n", command_close_all, dbg_mcierr(err)); + ok(!err,"mci %s (without buffer) returned %s\n", command_close_all, dbg_mcierr(err)); memset(buf, 0, sizeof(buf)); err = mciSendString(command_close_all, buf, sizeof(buf), hwnd); - todo_wine ok(!err,"mci %s (with output buffer) returned %s\n", command_close_all, dbg_mcierr(err)); + ok(!err,"mci %s (with output buffer) returned %s\n", command_close_all, dbg_mcierr(err)); ok(buf[0] == 0, "mci %s changed output buffer: %s\n", command_close_all, buf); /* No notification left, everything closed already */ test_notification(hwnd, command_close_all, 0); @@ -864,7 +864,7 @@ START_TEST(mci) test_AutoOpenWAVE(hwnd); /* Win9X hangs when exiting with something still open. */ err = mciSendString("close all", NULL, 0, hwnd); - todo_wine ok(!err,"final close all returned %s\n", dbg_mcierr(err)); + ok(!err,"final close all returned %s\n", dbg_mcierr(err)); ok(DeleteFile("tempfile.wav")||ok_saved,"Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); }

1 0

André Hentschel : c2man: Replace link to documentation .sgml.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 7cb303b83f73e72aca58eb56e1872f829659c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb303b83f73e72aca58eb56e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 31 19:19:39 2010 +0200 c2man: Replace link to documentation.sgml. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 62d7e17..4fff8d7 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Generate API documentation. See documentation/documentation.sgml for details. +# Generate API documentation. See http://www.winehq.org/docs/winedev-guide/api-docs for details. # # Copyright (C) 2000 Mike McCormack # Copyright (C) 2003 Jon Griffiths

1 0

Christian Costa : d3dx9_36: Add stub for D3DXLoadVolumeFromMemory.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 60f736af87971143887e526b0ae36bb7dd73163d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f736af87971143887e526b0… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 31 22:45:27 2010 +0200 d3dx9_36: Add stub for D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/Makefile.in | 3 ++- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/volume.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index d7f558b..e38c62a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -21,7 +21,8 @@ C_SRCS = \ sprite.c \ surface.c \ texture.c \ - util.c + util.c \ + volume.c LEX_SRCS = asmshader.l BISON_SRCS = asmshader.y diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 3e64218..a847aac 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -192,7 +192,7 @@ @ stub D3DXLoadVolumeFromFileA @ stub D3DXLoadVolumeFromFileInMemory @ stub D3DXLoadVolumeFromFileW -@ stub D3DXLoadVolumeFromMemory +@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA @ stub D3DXLoadVolumeFromResourceW @ stub D3DXLoadVolumeFromVolume diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c new file mode 100644 index 0000000..1eae9f4 --- /dev/null +++ b/dlls/d3dx9_36/volume.c @@ -0,0 +1,40 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume, + CONST PALETTEENTRY* destpalette, + CONST D3DBOX* destbox, + LPCVOID srcmemory, + D3DFORMAT srcformat, + UINT srcrowpitch, + UINT srcslicepitch, + CONST PALETTEENTRY* srcpalette, + CONST D3DBOX* srcbox, + DWORD filter, + D3DCOLOR colorkey) +{ + FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat, + srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey); + + return E_NOTIMPL; +}

1 0