wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

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

28 Aug '15

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

Stefan Dösinger : dxgi/tests: Test presentation parameter combinations.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: f805fb11f67c73cb7a3a9e71680acf0bafec4126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f805fb11f67c73cb7a3a9e716… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 27 23:05:03 2015 +0200 dxgi/tests: Test presentation parameter combinations. --- dlls/dxgi/factory.c | 30 +++++++- dlls/dxgi/tests/device.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ include/dxgi.idl | 2 + 3 files changed, 215 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f805fb11f67c73cb7a3a9…

1 0

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

28 Aug '15

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

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

28 Aug '15

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 28 Aug '15

28 Aug '15

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

Thomas Faller : winex11.drv: Fix uninitialized memory.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 8c1c7d19fe1bbcb9e9ca9daf5a454a1d15a44c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1c7d19fe1bbcb9e9ca9daf5… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Aug 27 23:19:46 2015 +0200 winex11.drv: Fix uninitialized memory. --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7651590..b7ec06e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1024,6 +1024,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) xev.xclient.send_event = True; xev.xclient.format = 32; xev.xclient.data.l[3] = 1; + xev.xclient.data.l[4] = 0; for (i = 0; i < NB_NET_WM_STATES; i++) {

1 0

Martin Storsjo : ucrtbase: Add stub functions for narrow environment.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: a4d5bf99d4803e9c14f17ccc2f36de4327e3d5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d5bf99d4803e9c14f17ccc2… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Aug 27 23:27:24 2015 +0300 ucrtbase: Add stub functions for narrow environment. --- .../api-ms-win-crt-runtime-l1-1-0.spec | 6 ++--- dlls/msvcrt/data.c | 26 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 77afe01..2f0bb33 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -23,7 +23,7 @@ @ cdecl _c_exit() ucrtbase._c_exit @ cdecl _cexit() ucrtbase._cexit @ cdecl _clearfp() ucrtbase._clearfp -@ stub _configure_narrow_argv +@ cdecl _configure_narrow_argv(long) ucrtbase._configure_narrow_argv @ stub _configure_wide_argv @ cdecl _control87(long long) ucrtbase._control87 @ cdecl _controlfp(long long) ucrtbase._controlfp @@ -40,7 +40,7 @@ @ cdecl _fpreset() ucrtbase._fpreset @ cdecl _get_doserrno(ptr) ucrtbase._get_doserrno @ cdecl _get_errno(ptr) ucrtbase._get_errno -@ stub _get_initial_narrow_environment +@ cdecl _get_initial_narrow_environment() ucrtbase._get_initial_narrow_environment @ stub _get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() ucrtbase._get_invalid_parameter_handler @ stub _get_narrow_winmain_command_line @@ -51,7 +51,7 @@ @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @ cdecl _getpid() ucrtbase._getpid -@ stub _initialize_narrow_environment +@ cdecl _initialize_narrow_environment() ucrtbase._initialize_narrow_environment @ stub _initialize_onexit_table @ stub _initialize_wide_environment @ cdecl _initterm(ptr ptr) ucrtbase._initterm diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index e6989f1..7e75a7f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -640,3 +640,29 @@ void CDECL MSVCRT___set_app_type(int app_type) TRACE("(%d) %s application\n", app_type, app_type == 2 ? "Gui" : "Console"); MSVCRT_app_type = app_type; } + +/********************************************************************* + * _get_initial_narrow_environment (UCRTBASE.@) + */ +char** CDECL _get_initial_narrow_environment(void) +{ + return MSVCRT___argv; +} + +/********************************************************************* + * _configure_narrow_argv (UCRTBASE.@) + */ +int CDECL _configure_narrow_argv(int mode) +{ + TRACE("(%d)\n", mode); + return 0; +} + +/********************************************************************* + * _initialize_narrow_environment (UCRTBASE.@) + */ +int CDECL _initialize_narrow_environment(void) +{ + TRACE("\n"); + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb56408..5623107 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -229,7 +229,7 @@ @ cdecl _close(long) MSVCRT__close @ cdecl _commit(long) MSVCRT__commit @ cdecl _configthreadlocale(long) -@ stub _configure_narrow_argv +@ cdecl _configure_narrow_argv(long) @ stub _configure_wide_argv @ cdecl _control87(long long) @ cdecl _controlfp(long long) @@ -365,7 +365,7 @@ @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() -@ stub _get_initial_narrow_environment +@ cdecl _get_initial_narrow_environment() @ stub _get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() @ stub _get_narrow_winmain_command_line @@ -418,7 +418,7 @@ @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s -@ stub _initialize_narrow_environment +@ cdecl _initialize_narrow_environment() @ stub _initialize_onexit_table @ stub _initialize_wide_environment @ cdecl _initterm(ptr ptr)

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::GetState.
by Alexandre Julliard 28 Aug '15

28 Aug '15

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

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SubmitSourceBuffer.
by Alexandre Julliard 28 Aug '15

28 Aug '15

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

Andrew Eikum : xaudio2: Implement the audio mixing thread.
by Alexandre Julliard 28 Aug '15

28 Aug '15

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

← Newer
1
2
3
4
5
6
7
8
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015