August 2015 - Wine-Commits - list.winehq.org

Daniel Lehman : kernel32/tests: Add tests for Invariant.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 72922cd1eac5ece5a3c05f5361ba6e30c31dfc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72922cd1eac5ece5a3c05f536… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 26 00:06:07 2015 -0700 kernel32/tests: Add tests for Invariant. --- dlls/kernel32/tests/locale.c | 185 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c48a620..1e4fd2a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4317,6 +4317,190 @@ static void test_EnumSystemGeoID(void) } } +struct invariant_entry { + const char *name; + int id; + const char *expect; +}; + +#define X(x) #x, x +static const struct invariant_entry invariant_list[] = { + { X(LOCALE_ILANGUAGE), "007f" }, + { X(LOCALE_SENGLANGUAGE), "Invariant Language" }, + { X(LOCALE_SABBREVLANGNAME), "IVL" }, + { X(LOCALE_SNATIVELANGNAME), "Invariant Language" }, + { X(LOCALE_ICOUNTRY), "1" }, + { X(LOCALE_SENGCOUNTRY), "Invariant Country" }, + { X(LOCALE_SABBREVCTRYNAME), "IVC" }, + { X(LOCALE_SNATIVECTRYNAME), "Invariant Country" }, + { X(LOCALE_IDEFAULTLANGUAGE), "0409" }, + { X(LOCALE_IDEFAULTCOUNTRY), "1" }, + { X(LOCALE_IDEFAULTCODEPAGE), "437" }, + { X(LOCALE_IDEFAULTANSICODEPAGE), "1252" }, + { X(LOCALE_IDEFAULTMACCODEPAGE), "10000" }, + { X(LOCALE_SLIST), "," }, + { X(LOCALE_IMEASURE), "0" }, + { X(LOCALE_SDECIMAL), "." }, + { X(LOCALE_STHOUSAND), "," }, + { X(LOCALE_SGROUPING), "3;0" }, + { X(LOCALE_IDIGITS), "2" }, + { X(LOCALE_ILZERO), "1" }, + { X(LOCALE_INEGNUMBER), "1" }, + { X(LOCALE_SNATIVEDIGITS), "0123456789" }, + { X(LOCALE_SCURRENCY), "\x00a4" }, + { X(LOCALE_SINTLSYMBOL), "XDR" }, + { X(LOCALE_SMONDECIMALSEP), "." }, + { X(LOCALE_SMONTHOUSANDSEP), "," }, + { X(LOCALE_SMONGROUPING), "3;0" }, + { X(LOCALE_ICURRDIGITS), "2" }, + { X(LOCALE_IINTLCURRDIGITS), "2" }, + { X(LOCALE_ICURRENCY), "0" }, + { X(LOCALE_INEGCURR), "0" }, + { X(LOCALE_SDATE), "/" }, + { X(LOCALE_STIME), ":" }, + { X(LOCALE_SSHORTDATE), "MM/dd/yyyy" }, + { X(LOCALE_SLONGDATE), "dddd, dd MMMM yyyy" }, + { X(LOCALE_STIMEFORMAT), "HH:mm:ss" }, + { X(LOCALE_IDATE), "0" }, + { X(LOCALE_ILDATE), "1" }, + { X(LOCALE_ITIME), "1" }, + { X(LOCALE_ITIMEMARKPOSN), "0" }, + { X(LOCALE_ICENTURY), "1" }, + { X(LOCALE_ITLZERO), "1" }, + { X(LOCALE_IDAYLZERO), "1" }, + { X(LOCALE_IMONLZERO), "1" }, + { X(LOCALE_S1159), "AM" }, + { X(LOCALE_S2359), "PM" }, + { X(LOCALE_ICALENDARTYPE), "1" }, + { X(LOCALE_IOPTIONALCALENDAR), "0" }, + { X(LOCALE_IFIRSTDAYOFWEEK), "6" }, + { X(LOCALE_IFIRSTWEEKOFYEAR), "0" }, + { X(LOCALE_SDAYNAME1), "Monday" }, + { X(LOCALE_SDAYNAME2), "Tuesday" }, + { X(LOCALE_SDAYNAME3), "Wednesday" }, + { X(LOCALE_SDAYNAME4), "Thursday" }, + { X(LOCALE_SDAYNAME5), "Friday" }, + { X(LOCALE_SDAYNAME6), "Saturday" }, + { X(LOCALE_SDAYNAME7), "Sunday" }, + { X(LOCALE_SABBREVDAYNAME1), "Mon" }, + { X(LOCALE_SABBREVDAYNAME2), "Tue" }, + { X(LOCALE_SABBREVDAYNAME3), "Wed" }, + { X(LOCALE_SABBREVDAYNAME4), "Thu" }, + { X(LOCALE_SABBREVDAYNAME5), "Fri" }, + { X(LOCALE_SABBREVDAYNAME6), "Sat" }, + { X(LOCALE_SABBREVDAYNAME7), "Sun" }, + { X(LOCALE_SMONTHNAME1), "January" }, + { X(LOCALE_SMONTHNAME2), "February" }, + { X(LOCALE_SMONTHNAME3), "March" }, + { X(LOCALE_SMONTHNAME4), "April" }, + { X(LOCALE_SMONTHNAME5), "May" }, + { X(LOCALE_SMONTHNAME6), "June" }, + { X(LOCALE_SMONTHNAME7), "July" }, + { X(LOCALE_SMONTHNAME8), "August" }, + { X(LOCALE_SMONTHNAME9), "September" }, + { X(LOCALE_SMONTHNAME10), "October" }, + { X(LOCALE_SMONTHNAME11), "November" }, + { X(LOCALE_SMONTHNAME12), "December" }, + { X(LOCALE_SMONTHNAME13), "" }, + { X(LOCALE_SABBREVMONTHNAME1), "Jan" }, + { X(LOCALE_SABBREVMONTHNAME2), "Feb" }, + { X(LOCALE_SABBREVMONTHNAME3), "Mar" }, + { X(LOCALE_SABBREVMONTHNAME4), "Apr" }, + { X(LOCALE_SABBREVMONTHNAME5), "May" }, + { X(LOCALE_SABBREVMONTHNAME6), "Jun" }, + { X(LOCALE_SABBREVMONTHNAME7), "Jul" }, + { X(LOCALE_SABBREVMONTHNAME8), "Aug" }, + { X(LOCALE_SABBREVMONTHNAME9), "Sep" }, + { X(LOCALE_SABBREVMONTHNAME10), "Oct" }, + { X(LOCALE_SABBREVMONTHNAME11), "Nov" }, + { X(LOCALE_SABBREVMONTHNAME12), "Dec" }, + { X(LOCALE_SABBREVMONTHNAME13), "" }, + { X(LOCALE_SPOSITIVESIGN), "+" }, + { X(LOCALE_SNEGATIVESIGN), "-" }, + { X(LOCALE_IPOSSIGNPOSN), "3" }, + { X(LOCALE_INEGSIGNPOSN), "0" }, + { X(LOCALE_IPOSSYMPRECEDES), "1" }, + { X(LOCALE_IPOSSEPBYSPACE), "0" }, + { X(LOCALE_INEGSYMPRECEDES), "1" }, + { X(LOCALE_INEGSEPBYSPACE), "0" }, + { X(LOCALE_SISO639LANGNAME), "iv" }, + { X(LOCALE_SISO3166CTRYNAME), "IV" }, + { X(LOCALE_IDEFAULTEBCDICCODEPAGE), "037" }, + { X(LOCALE_IPAPERSIZE), "9" }, + { X(LOCALE_SENGCURRNAME), "International Monetary Fund" }, + { X(LOCALE_SNATIVECURRNAME), "International Monetary Fund" }, + { X(LOCALE_SYEARMONTH), "yyyy MMMM" }, + { X(LOCALE_IDIGITSUBSTITUTION), "1" }, + { X(LOCALE_SNAME), "" }, + { X(LOCALE_SSCRIPTS), "Latn;" }, + { 0 } +}; +#undef X + +static void test_invariant(void) +{ + int ret; + int len; + char buffer[BUFFER_SIZE]; + const struct invariant_entry *ptr = invariant_list; + + if (!GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer))) + { + win_skip("GetLocaleInfoA(LOCALE_INVARIANT) not supported\n"); /* win2k */ + return; + } + + while (ptr->name) + { + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|ptr->id, buffer, sizeof(buffer)); + if (!ret && (ptr->id == LOCALE_SNAME || ptr->id == LOCALE_SSCRIPTS)) + win_skip("not supported\n"); /* winxp/win2k3 */ + else + { + len = strlen(ptr->expect)+1; /* include \0 */ + ok(ret == len, "For id %d, expected ret == %d, got %d, error %d\n", + ptr->id, len, ret, GetLastError()); + ok(!strcmp(buffer, ptr->expect), "For id %d, Expected %s, got '%s'\n", + ptr->id, ptr->expect, buffer); + } + + ptr++; + } + + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + { + /* some locales translate these */ + static const char lang[] = "Invariant Language (Invariant Country)"; + static const char cntry[] = "Invariant Country"; + static const char sortm[] = "Math Alphanumerics"; + static const char sortd[] = "Default"; /* win2k3 */ + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer)); + len = lstrlenA(lang) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, lang), "Expected %s, got '%s'\n", lang, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SCOUNTRY, buffer, sizeof(buffer)); + len = lstrlenA(cntry) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, cntry), "Expected %s, got '%s'\n", cntry, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SSORTNAME, buffer, sizeof(buffer)); + if (ret == lstrlenA(sortm)+1) + ok(!strcmp(buffer, sortm), "Expected %s, got '%s'\n", sortm, buffer); + else if (ret == lstrlenA(sortd)+1) /* win2k3 */ + ok(!strcmp(buffer, sortd), "Expected %s, got '%s'\n", sortd, buffer); + else + ok(0, "Expected ret == %d or %d, got %d, error %d\n", + lstrlenA(sortm)+1, lstrlenA(sortd)+1, ret, GetLastError()); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -4356,6 +4540,7 @@ START_TEST(locale) test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); + test_invariant(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Andrew Eikum : xaudio2: Implement the audio mixing thread.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: a4fd0a7080f7ad32126c864389ab05d91b2f25fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fd0a7080f7ad32126c86438… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 27 09:31:12 2015 -0500 xaudio2: Implement the audio mixing thread. --- dlls/xaudio2_7/xaudio_dll.c | 348 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 344 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4fd0a7080f7ad32126c8…

1 0

Andrew Eikum : xaudio2: Fix return value for RegisterForCallbacks.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 997843700a1ce6a2b9f616687ee697357abe4749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997843700a1ce6a2b9f616687… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 27 09:30:55 2015 -0500 xaudio2: Fix return value for RegisterForCallbacks. --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 5aa34b5..94b42eb 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1297,7 +1297,7 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, LeaveCriticalSection(&This->lock); - return E_NOTIMPL; + return S_OK; } static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,

1 0

Stefan Dösinger : d3d9/tests: Fix backbuffer read vs flip in test_vertex_blending.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 0933332c73b29ebace1299c266ebd1a051b94041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0933332c73b29ebace1299c26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 27 23:05:01 2015 +0200 d3d9/tests: Fix backbuffer read vs flip in test_vertex_blending. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0796013..d49d3b2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19263,9 +19263,6 @@ static void test_vertex_blending(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - point = tests[i].quad_points; while (point->x != -1 && point->y != -1) { @@ -19281,6 +19278,9 @@ static void test_vertex_blending(void) ok(color_match(color, 0x00000000, 1), "Unexpected quad at %dx%d.\n", point->x, point->y); ++point; } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); } refcount = IDirect3DDevice9_Release(device);

1 0

Jacek Caban : ieframe/tests: Fixed random test failures.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 0037257389cafbedde951acf6dfbac2dd7b74264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0037257389cafbedde951acf6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 11:37:01 2015 +0200 ieframe/tests: Fixed random test failures. --- dlls/ieframe/tests/webbrowser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d928135..e95fd5e 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2926,6 +2926,7 @@ static void test_download(DWORD flags) if(use_container_olecmd) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); + SET_EXPECT(GetOverridesKeyPath); /* Called randomly on some VMs. */ trace("Downloading...\n"); while(!*b && GetMessageW(&msg, NULL, 0, 0)) { @@ -3015,6 +3016,7 @@ static void test_download(DWORD flags) if(use_container_olecmd) CHECK_CALLED(Exec_UPDATECOMMANDS); CLEAR_CALLED(QueryStatus_STOP); + CLEAR_CALLED(GetOverridesKeyPath); } static void test_Refresh(IWebBrowser2 *webbrowser, BOOL use_refresh2)

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::GetState.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: d2ae1054018a8018f80b650497cb3d4db820e43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ae1054018a8018f80b65049… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 27 09:33:19 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::GetState. --- dlls/xaudio2_7/xaudio_dll.c | 23 +++++++++++++++++++++++ include/xaudio2.idl | 1 + 2 files changed, 24 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 26670b7..530318c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -655,7 +655,30 @@ static void WINAPI XA2SRC_GetState(IXAudio2SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState, UINT32 Flags) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, %p, 0x%x\n", This, pVoiceState, Flags); + + EnterCriticalSection(&This->lock); + + if(!(Flags & XAUDIO2_VOICE_NOSAMPLESPLAYED)){ + ALint bufpos = 0; + + alGetSourcei(This->al_src, AL_SAMPLE_OFFSET, &bufpos); + + pVoiceState->SamplesPlayed = This->played_frames + bufpos; + }else + pVoiceState->SamplesPlayed = 0; + + if(This->nbufs) + pVoiceState->pCurrentBufferContext = This->buffers[This->first_buf].xa2buffer.pContext; + else + pVoiceState->pCurrentBufferContext = NULL; + + pVoiceState->BuffersQueued = This->nbufs; + + LeaveCriticalSection(&This->lock); + + TRACE("returning %s, queued: %u\n", wine_dbgstr_longlong(pVoiceState->SamplesPlayed), This->nbufs); } static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 9213f41..4dca600 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -567,6 +567,7 @@ const UINT32 XAUDIO2_VOICE_MUSIC = 16; const UINT32 XAUDIO2_PLAY_TAILS = 32; const UINT32 XAUDIO2_END_OF_STREAM = 64; const UINT32 XAUDIO2_SEND_USEFILTER = 128; +const UINT32 XAUDIO2_VOICE_NOSAMPLESPLAYED = 256; const XAUDIO2_FILTER_TYPE XAUDIO2_DEFAULT_FILTER_TYPE = LowPassFilter; const float XAUDIO2_DEFAULT_FILTER_FREQUENCY = XAUDIO2_MAX_FILTER_FREQUENCY;

1 0

Stefan Dösinger : dxgi/tests: We don' t need a custom window class.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 142bcb5d3cfa562d793d2b3f49e0df6cb99db16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=142bcb5d3cfa562d793d2b3f4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 27 23:05:02 2015 +0200 dxgi/tests: We don't need a custom window class. --- dlls/dxgi/tests/device.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 1f5ce0c..c0eda12 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -396,7 +396,6 @@ static void test_createswapchain(void) IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; - WNDCLASSA wc = {0}; UINT i; const struct refresh_rates refresh_list[] = @@ -414,11 +413,6 @@ static void test_createswapchain(void) return; } - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "dxgi_test_wc"; - - RegisterClassA(&wc); - creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; creation_desc.BufferDesc.Height = 600; @@ -431,7 +425,7 @@ static void test_createswapchain(void) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindowA("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0;

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SubmitSourceBuffer.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: e43ca169ee7883e9f1e821159d63b5d9fa689f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43ca169ee7883e9f1e821159… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 27 09:32:48 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::SubmitSourceBuffer. --- dlls/xaudio2_7/xaudio_dll.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8097ba3..26670b7 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -584,7 +584,49 @@ static HRESULT WINAPI XA2SRC_SubmitSourceBuffer(IXAudio2SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2Buffer *buf; + UINT32 buf_idx; + TRACE("%p, %p, %p\n", This, pBuffer, pBufferWMA); + + if(TRACE_ON(xaudio2)){ + TRACE("Flags: 0x%x\n", pBuffer->Flags); + TRACE("AudioBytes: %u\n", pBuffer->AudioBytes); + TRACE("pAudioData: %p\n", pBuffer->pAudioData); + TRACE("PlayBegin: %u\n", pBuffer->PlayBegin); + TRACE("PlayLength: %u\n", pBuffer->PlayLength); + TRACE("LoopBegin: %u\n", pBuffer->LoopBegin); + TRACE("LoopLength: %u\n", pBuffer->LoopLength); + TRACE("LoopCount: %u\n", pBuffer->LoopCount); + TRACE("pContext: %p\n", pBuffer->pContext); + } + + EnterCriticalSection(&This->lock); + + if(This->nbufs >= XAUDIO2_MAX_QUEUED_BUFFERS){ + TRACE("Too many buffers queued!\n"); + LeaveCriticalSection(&This->lock); + return XAUDIO2_E_INVALID_CALL; + } + + buf_idx = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; + buf = &This->buffers[buf_idx]; + memset(buf, 0, sizeof(*buf)); + + /* API contract: pAudioData must remain valid until this buffer is played, + * but pBuffer itself may be reused immediately */ + memcpy(&buf->xa2buffer, pBuffer, sizeof(*pBuffer)); + + buf->offs_bytes = 0; + buf->latest_al_buf = -1; + + ++This->nbufs; + + TRACE("%p: queued buffer %u (%u bytes), now %u buffers held\n", + This, buf_idx, buf->xa2buffer.AudioBytes, This->nbufs); + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0

Stefan Dösinger : ddraw/tests: Properly clean up in test_texcoordindex.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 9427d1d553059b0a7b88295095979fa64b87e574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9427d1d553059b0a7b8829509… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 28 00:22:36 2015 +0200 ddraw/tests: Properly clean up in test_texcoordindex. --- dlls/ddraw/tests/ddraw4.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index eed5f334..6ac725d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9415,7 +9415,7 @@ static void test_texcoordindex(void) } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); IDirect3D3_Release(d3d); @@ -9545,10 +9545,14 @@ static void test_texcoordindex(void) color = get_surface_color(rt, 480, 360); ok(compare_color(color, 0x00ffff00, 2), "Got unexpected color 0x%08x.\n", color); - IDirectDrawSurface7_Release(texture1); - IDirectDrawSurface7_Release(texture2); + IDirect3DTexture2_Release(texture2); + IDirect3DTexture2_Release(texture1); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface1); + + destroy_viewport(device, viewport); - IDirectDrawSurface7_Release(rt); + IDirectDrawSurface4_Release(rt); IDirectDraw_Release(ddraw); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11: Move d3d11 device implementation to top of file.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: c9ce47c6a993b048b2adef8174b21729e5d0204a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ce47c6a993b048b2adef817… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 28 00:39:16 2015 +0200 d3d11: Move d3d11 device implementation to top of file. Just to use d311 device static methods in d3d10 device freely. --- dlls/d3d11/device.c | 3714 +++++++++++++++++++++++++-------------------------- 1 file changed, 1857 insertions(+), 1857 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9ce47c6a993b048b2ade…

1 0