January 2012 - Wine-Commits

Aric Stewart : wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback.
by Alexandre Julliard Jan. 17, 2012

Jan. 17, 2012

Module: wine Branch: master Commit: ab735065288c808eb904133fdc51680b6296c1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab735065288c808eb904133fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:29 2012 -0600 wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback. --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index ceab21e..79e06a5 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -179,7 +179,7 @@ static void trackingCallback( return; } - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); @@ -230,12 +230,12 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } - LeaveCriticalSection(&This->tf.filter.csFilter); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); error: + LeaveCriticalSection(&This->tf.csReceive); if (pOutSample) IMediaSample_Release(pOutSample); @@ -278,7 +278,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam OSStatus err = noErr; LONGLONG tStart, tStop; - EnterCriticalSection(&This->tf.filter.csFilter); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { @@ -316,7 +315,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam hr = This->decodeHR; error: - LeaveCriticalSection(&This->tf.filter.csFilter); return hr; }

1 0

Aric Stewart : wineqtdecoder: Do not invert height.
by Alexandre Julliard Jan. 17, 2012

Jan. 17, 2012

Module: wine Branch: master Commit: 9aa3c74503b924e5b251901add6e34e2035cbdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa3c74503b924e5b251901ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:07 2012 -0600 wineqtdecoder: Do not invert height. --- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- dlls/wineqtdecoder/qtutils.c | 5 +++-- dlls/wineqtdecoder/qtvdecoder.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 17f173c..362f535 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -767,12 +767,13 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) pvi = (VIDEOINFOHEADER *)amt.pbFormat; pvi->bmiHeader.biSize = sizeof (BITMAPINFOHEADER); pvi->bmiHeader.biWidth = outputWidth; - pvi->bmiHeader.biHeight = -outputHeight; + pvi->bmiHeader.biHeight = outputHeight; pvi->bmiHeader.biPlanes = 1; pvi->bmiHeader.biBitCount = 24; pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = outputWidth * outputHeight * outputDepth; - filter->outputSize = outputWidth * outputHeight * outputDepth; + filter->outputSize = pvi->bmiHeader.biSizeImage; amt.lSampleSize = 0; pixelBufferOptions = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index a1e8f05..19ba90c 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -126,7 +126,6 @@ typedef struct { HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStream) { LPBYTE pPixels = NULL; - LPBYTE out = NULL; size_t bytesPerRow = 0, height = 0, width = 0; OSType actualType; int i; @@ -143,9 +142,11 @@ HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStrea height = CVPixelBufferGetHeight(pixelBuffer); width = CVPixelBufferGetWidth(pixelBuffer); - for (out = pbDstStream, i = 0; i < height; i++) + for (i = 1; i <= height; i++) { int j; + LPBYTE out = pbDstStream + ((height - i) * width * 3); + for (j = 0; j < width; j++) { *((DWORD*)out) = (((ARGBPixelPtr)pPixels)[j].r) << 16 diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3690087..ceab21e 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -442,8 +442,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION bmi->biCompression = BI_RGB; bmi->biBitCount = 24; outpmt->subtype = MEDIASUBTYPE_RGB24; - if (bmi->biHeight > 0) - bmi->biHeight = -bmi->biHeight; return S_OK; }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.37
by Jeremy Newman Jan. 16, 2012

Jan. 16, 2012

Module: website Branch: master Commit: 8de779a9bfaeaa27afa4ef9a64baa98d9dd3d7a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=8de779a9bfaeaa27afa4ef… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jan 15 13:43:43 2012 +0100 Polish translation for release 1.3.37 --- news/pl/2012011301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012011301.xml b/news/pl/2012011301.xml new file mode 100644 index 0000000..322dc8a --- /dev/null +++ b/news/pl/2012011301.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 13, 2012</date> +<title>Wydano Wine 1.3.37</title> +<body> + Wydanie rozwojowe Wine 1.3.37 jest już dostępne. + <a href="{$root}/announce/1.3.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Ukończenie silnika DIB.</li> + <li>Ulepszenia do biblioteki uruchomieniowej C++.</li> + <li>Kilka poprawek w sterownikach dźwiękowych.</li> + <li>Usunięto niepotrzebne opcje Direct3D z WineCfg.</li> + <li>Kilka poprawek we wbudowanym Internet Explorer.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : user32: Fix a pointer cast warning.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 50480c72f32d5c5913ddfb1de1f76f5d23f33398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50480c72f32d5c5913ddfb1de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 18:07:09 2012 +0100 user32: Fix a pointer cast warning. --- dlls/user32/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 905bda1..6a76cb8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -943,7 +943,7 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); if (rc == ERROR_SUCCESS) { - layout = (HKL)strtoulW(szKeyName,NULL,16); + layout = (HKL)(ULONG_PTR)strtoulW(szKeyName,NULL,16); if (baselayout != 0 && layout == (HKL)baselayout) baselayout = 0; /* found in the registry do not add again */ if (nBuff && layouts)

1 0

Piotr Caban : urlmon/tests: Added Uri IMarshal_MarshalInterface tests.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: c6a72ce150519b9e1faadc41e53d8dc4f3111334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72ce150519b9e1faadc41e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:18 2012 +0100 urlmon/tests: Added Uri IMarshal_MarshalInterface tests. --- dlls/urlmon/tests/uri.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e570965..4f1db15 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10691,6 +10691,7 @@ static void test_IPersistStream(void) IUri *uri; IPersistStream *persist_stream; IStream *stream; + IMarshal *marshal; DWORD props, props_no, dw_data[6]; WCHAR str_data[1024]; ULARGE_INTEGER size, max_size; @@ -10821,6 +10822,57 @@ static void test_IPersistStream(void) wine_dbgstr_w(raw_uri)); SysFreeString(raw_uri); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface(IID_IMarshal) failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLEWEAK); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NOPING); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "%d) MarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == E_INVALIDARG, "%d) GetUnmarshalClass returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == S_OK, "%d) GetUnmarshalClass failed 0x%08x, expected S_OK.\n", i, hr); + ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetUnmarshalClass returned incorrect CLSID.\n", i); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_CUR, &size); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Read(stream, (void*)dw_data, 3*sizeof(DWORD), NULL); + ok(hr == S_OK, "%d) Read failed 0x%08x, expected S_OK.\n", i, hr); + ok(dw_data[0]-2 == U(size).LowPart, "%d) Structure size is %d, expected %d\n", + i, dw_data[0]-2, U(size).LowPart); + ok(dw_data[1] == MSHCTX_LOCAL, "%d) Incorrect value %d, expected MSHCTX_LOCAL.\n", + i, dw_data[1]); + ok(dw_data[2] == dw_data[0]-8, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], dw_data[0]-8); + if(!test->str_props[Uri_PROPERTY_PATH].value[0] && + (test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_FTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTPS)) + U(max_size).LowPart += 3*sizeof(DWORD); + ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], U(max_size).LowPart); + + IMarshal_Release(marshal); IStream_Release(stream); IPersistStream_Release(persist_stream); IUri_Release(uri);

1 0

Piotr Caban : urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: c1fb15d1f8dab0d9ec2233ab8683c71ef4a96ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fb15d1f8dab0d9ec2233ab8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:32 2012 +0100 urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests. --- dlls/urlmon/tests/uri.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4f1db15..9a27e59 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10871,6 +10871,26 @@ static void test_IPersistStream(void) U(max_size).LowPart += 3*sizeof(DWORD); ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", i, dw_data[2], U(max_size).LowPart); + IMarshal_Release(marshal); + IUri_Release(uri); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IUri_GetRawUri(uri, &raw_uri); + ok(hr == S_OK, "%d) GetRawUri failed 0x%08x, expected S_OK.\n", i, hr); + ok(!strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].value, raw_uri) + || broken(test->str_props[Uri_PROPERTY_RAW_URI].broken_value + && !strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].broken_value, raw_uri)), + "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, + wine_dbgstr_w(raw_uri)); + SysFreeString(raw_uri); IMarshal_Release(marshal); IStream_Release(stream);

1 0

Aric Stewart : wineqtdecoder: Improve and differentiate Sample Time and MediaTime.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 2ea8f8a4a062b2f2832d60afce377bcc1da7725c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea8f8a4a062b2f2832d60afc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:13:12 2012 -0600 wineqtdecoder: Improve and differentiate Sample Time and MediaTime. --- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a42f984..17f173c 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -467,6 +467,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) do { LONGLONG tStart=0, tStop=0; + LONGLONG mStart=0, mStop=0; float time; GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); @@ -485,6 +486,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) TRACE("In loop at time %ld\n",movie_time); TRACE("In Next time %ld\n",next_time); + mStart = movie_time; + mStop = next_time; + time = (float)movie_time / tr.scale; tStart = time * 10000000; time = (float)next_time / tr.scale; @@ -539,11 +543,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pAudio_Pin->queue, sample); TRACE("Audio Delivered (%x)\n",hr); @@ -597,11 +598,8 @@ audio_error: IMediaSample_SetActualDataLength(sample, This->outputSize); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pVideo_Pin->queue, sample); TRACE("Video Delivered (%x)\n",hr);

1 0

Andrew Eikum : dsound: Don' t launch a separate thread for the mmdevapi enumerator.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 6d391df4aaefaef1e13ff2dd3571f96fdff6405d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d391df4aaefaef1e13ff2dd3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 10:44:38 2012 -0600 dsound: Don't launch a separate thread for the mmdevapi enumerator. --- dlls/dsound/dsound_main.c | 133 +++++++++++++++------------------------------ 1 files changed, 43 insertions(+), 90 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index cc9f44c..c0d2b33 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,17 +88,6 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -static IMMDeviceEnumerator *g_devenum; -static CRITICAL_SECTION g_devenum_lock; -static CRITICAL_SECTION_DEBUG g_devenum_lock_debug = -{ - 0, 0, &g_devenum_lock, - { &g_devenum_lock_debug.ProcessLocksList, &g_devenum_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_devenum_lock") } -}; -static CRITICAL_SECTION g_devenum_lock = { &g_devenum_lock_debug, -1, 0, 0, 0, 0 }; -static HANDLE g_devenum_thread; - WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ @@ -190,83 +179,29 @@ static const char * get_device_id(LPCGUID pGuid) return debugstr_guid(pGuid); } -/* The MMDeviceEnumerator object has to be created & destroyed - * from the same thread. */ -static DWORD WINAPI devenum_thread_proc(void *arg) +static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) { - HANDLE evt = arg; - HRESULT hr; - MSG msg; + HRESULT hr, init_hr; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - if(FAILED(hr)){ - ERR("CoInitializeEx failed: %08x\n", hr); - return 1; - } + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - ERR("CoCreateInstance failed: %08x\n", hr); CoUninitialize(); - return 1; - } - - SetEvent(evt); - - PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); - - while(GetMessageW(&msg, NULL, 0, 0)){ - if(msg.hwnd) - DispatchMessageW(&msg); - else - ERR("Unknown message: %04x\n", msg.message); + *devenum = NULL; + ERR("CoCreateInstance failed: %08x\n", hr); + return hr; } - IMMDeviceEnumerator_Release(g_devenum); - g_devenum = NULL; - CoUninitialize(); - - return 0; + return init_hr; } -static IMMDeviceEnumerator *get_mmdevenum(void) +static void release_mmdevenum(IMMDeviceEnumerator *devenum, HRESULT init_hr) { - HANDLE events[2]; - DWORD wait; - - EnterCriticalSection(&g_devenum_lock); - - if(g_devenum){ - LeaveCriticalSection(&g_devenum_lock); - return g_devenum; - } - - events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); - - g_devenum_thread = CreateThread(NULL, 0, devenum_thread_proc, - events[0], 0, NULL); - if(!g_devenum_thread){ - LeaveCriticalSection(&g_devenum_lock); - CloseHandle(events[0]); - return NULL; - } - - events[1] = g_devenum_thread; - wait = WaitForMultipleObjects(2, events, FALSE, INFINITE); - CloseHandle(events[0]); - if(wait != WAIT_OBJECT_0){ - if(wait == 1 + WAIT_OBJECT_0){ - CloseHandle(g_devenum_thread); - g_devenum_thread = NULL; - } - LeaveCriticalSection(&g_devenum_lock); - return NULL; - } - - LeaveCriticalSection(&g_devenum_lock); - - return g_devenum; + IMMDeviceEnumerator_Release(devenum); + if(SUCCEEDED(init_hr)) + CoUninitialize(); } static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, @@ -326,16 +261,16 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) IMMDeviceEnumerator *devenum; EDataFlow flow = (EDataFlow)-1; ERole role = (ERole)-1; - HRESULT hr; + HRESULT hr, init_hr; TRACE("(%s,%p)\n", get_device_id(pGuidSrc),pGuidDest); if(!pGuidSrc || !pGuidDest) return DSERR_INVALIDPARAM; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DSERR_GENERIC; + return init_hr; if(IsEqualGUID(&DSDEVID_DefaultPlayback, pGuidSrc)){ role = eMultimedia; @@ -358,15 +293,20 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) flow, role, &device); if(FAILED(hr)){ WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + release_mmdevenum(devenum, init_hr); return DSERR_NODRIVER; } hr = get_mmdevice_guid(device, NULL, pGuidDest); IMMDevice_Release(device); + release_mmdevenum(devenum, init_hr); + return (hr == S_OK) ? DS_OK : hr; } + release_mmdevenum(devenum, init_hr); + *pGuidDest = *pGuidSrc; return DS_OK; @@ -424,22 +364,24 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) IMMDeviceEnumerator *devenum; IMMDeviceCollection *coll; UINT count, i; - HRESULT hr; + HRESULT hr, init_hr; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DSERR_GENERIC; + return init_hr; hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ WARN("EnumAudioEndpoints failed: %08x\n", hr); + release_mmdevenum(devenum, init_hr); return hr; } hr = IMMDeviceCollection_GetCount(coll, &count); if(FAILED(hr)){ IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); WARN("GetCount failed: %08x\n", hr); return hr; } @@ -457,14 +399,20 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) continue; } - if(IsEqualGUID(&guid, tgt)) + if(IsEqualGUID(&guid, tgt)){ + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); return DS_OK; + } IMMDevice_Release(*device); } WARN("No device with GUID %s found!\n", wine_dbgstr_guid(tgt)); + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return DSERR_INVALIDPARAM; } @@ -519,19 +467,20 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, IMMDevice *defdev = NULL; UINT count, i, n; BOOL keep_going; - HRESULT hr; + HRESULT hr, init_hr; static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; static const WCHAR empty_drv[] = {0}; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DS_OK; + return init_hr; - hr = IMMDeviceEnumerator_EnumAudioEndpoints(g_devenum, flow, + hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ + release_mmdevenum(devenum, init_hr); WARN("EnumAudioEndpoints failed: %08x\n", hr); return DS_OK; } @@ -539,12 +488,15 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, hr = IMMDeviceCollection_GetCount(coll, &count); if(FAILED(hr)){ IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); WARN("GetCount failed: %08x\n", hr); return DS_OK; } - if(count == 0) + if(count == 0){ + release_mmdevenum(devenum, init_hr); return DS_OK; + } TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); keep_going = cb(NULL, primary_desc, empty_drv, user); @@ -583,6 +535,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, IMMDevice_Release(defdev); IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return (keep_going == TRUE) ? S_OK : S_FALSE; } @@ -862,7 +816,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACE("DLL_PROCESS_DETACH\n"); DeleteCriticalSection(&DSOUND_renderers_lock); DeleteCriticalSection(&DSOUND_capturers_lock); - DeleteCriticalSection(&g_devenum_lock); break; default: TRACE("UNKNOWN REASON\n");

1 0

Andrew Eikum : winmm: Only start the devices thread when necessary.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 04ab858fefdd64380594c545f288df805c2d58ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ab858fefdd64380594c545f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 10:44:02 2012 -0600 winmm: Only start the devices thread when necessary. --- dlls/winmm/lolvldrv.c | 2 +- dlls/winmm/waveform.c | 94 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index b8f1b54..9ee0235 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -531,7 +531,7 @@ static void MMDRV_Init(void) TRACE("()\n"); - init_hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 383c75f..59fc0a2 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -464,12 +464,12 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, } static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, - EDataFlow flow) + EDataFlow flow, IMMDeviceEnumerator *devenum) { IMMDeviceCollection *devcoll; HRESULT hr; - hr = IMMDeviceEnumerator_EnumAudioEndpoints(g_devenum, flow, + hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &devcoll); if(FAILED(hr)) return hr; @@ -494,7 +494,7 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, count = 0; /* make sure that device 0 is the default device */ - hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(g_devenum, + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, flow, eConsole, &def_dev); if(SUCCEEDED(hr)){ WINMM_InitMMDevice(flow, def_dev, &(*devices)[0], 0); @@ -528,27 +528,39 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, static HRESULT WINMM_InitMMDevices(void) { - HRESULT hr; + HRESULT hr, init_hr; + IMMDeviceEnumerator *devenum = NULL; + + if(g_outmmdevices_count || g_inmmdevices_count) + return S_FALSE; + + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if(FAILED(hr)) - return hr; + goto exit; - hr = WINMM_EnumDevices(&g_out_mmdevices, &g_outmmdevices_count, eRender); + hr = WINMM_EnumDevices(&g_out_mmdevices, &g_outmmdevices_count, eRender, devenum); if(FAILED(hr)){ g_outmmdevices_count = 0; g_inmmdevices_count = 0; - return hr; + goto exit; } - hr = WINMM_EnumDevices(&g_in_mmdevices, &g_inmmdevices_count, eCapture); + hr = WINMM_EnumDevices(&g_in_mmdevices, &g_inmmdevices_count, eCapture, devenum); if(FAILED(hr)){ g_inmmdevices_count = 0; - return hr; + goto exit; } - return S_OK; +exit: + if(devenum) + IMMDeviceEnumerator_Release(devenum); + if(SUCCEEDED(init_hr)) + CoUninitialize(); + + return hr; } static inline BOOL WINMM_IsMapper(UINT device) @@ -2040,10 +2052,19 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) return 1; } + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + if(FAILED(hr)){ + ERR("CoCreateInstance failed: %08x\n", hr); + CoUninitialize(); + return 1; + } + g_devices_hwnd = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); if(!g_devices_hwnd){ ERR("CreateWindow failed: %d\n", GetLastError()); + IMMDeviceEnumerator_Release(g_devenum); CoUninitialize(); return 1; } @@ -2076,6 +2097,8 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) DestroyWindow(g_devices_hwnd); + IMMDeviceEnumerator_Release(g_devenum); + CoUninitialize(); return 0; @@ -2140,7 +2163,8 @@ static BOOL WINMM_StartDevicesThread(void) */ UINT WINAPI waveOutGetNumDevs(void) { - if(!WINMM_StartDevicesThread()) + HRESULT hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; TRACE("count: %u\n", g_outmmdevices_count); @@ -2159,9 +2183,6 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -2189,10 +2210,12 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, UINT uSize) { WAVEOUTCAPSW mapper_caps, *caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -2784,7 +2807,8 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, */ UINT WINAPI waveInGetNumDevs(void) { - if(!WINMM_StartDevicesThread()) + HRESULT hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; TRACE("count: %u\n", g_inmmdevices_count); @@ -2798,10 +2822,12 @@ UINT WINAPI waveInGetNumDevs(void) UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) { WAVEINCAPSW mapper_caps, *caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpCaps) @@ -2843,9 +2869,6 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3155,9 +3178,12 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, UINT WINAPI mixerGetNumDevs(void) { + HRESULT hr; + TRACE("\n"); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; return g_outmmdevices_count + g_inmmdevices_count; @@ -3199,10 +3225,12 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize { WINMM_MMDevice *mmdevice; MIXERCAPSW caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpCaps) @@ -3241,11 +3269,13 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, { WINMM_MMDevice *mmdevice; MMRESULT mr; + HRESULT hr; TRACE("(%p, %d, %lx, %lx, %x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lphMix) @@ -3289,10 +3319,12 @@ UINT WINAPI mixerClose(HMIXER hMix) UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) { WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpid, fdwID); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpid) @@ -3315,10 +3347,12 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW DWORD fdwDetails) { WINMM_ControlDetails details; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpmcdW) @@ -3500,10 +3534,12 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, DWORD fdwControls) { WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %08x)\n", hmix, lpmlcW, fdwControls); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(fdwControls & ~(MIXER_GETLINECONTROLSF_ALL | @@ -3716,10 +3752,12 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo { UINT mmdev_index; WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmliW, fdwInfo); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW))

1 0

Aric Stewart : wineqtdecoder: Include cbAlign in the requested buffer size.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 40220e7205f16eba941613b37bef2c309c252592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40220e7205f16eba941613b37… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 11:35:13 2012 -0600 wineqtdecoder: Include cbAlign in the requested buffer size. --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 553a486..3690087 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -492,7 +492,7 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc ppropInputRequest->cbAlign = 1; if (ppropInputRequest->cbBuffer < This->outputSize) - ppropInputRequest->cbBuffer = This->outputSize; + ppropInputRequest->cbBuffer = This->outputSize + ppropInputRequest->cbAlign; if (!ppropInputRequest->cBuffers) ppropInputRequest->cBuffers = 1;

1 0