January 2014 - Wine-commits

Frédéric Delanoy : wine/test.h: Fix a typo in comment.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: e46796e7a4e6d5edf359d8f8e3ffd63ec7d3c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46796e7a4e6d5edf359d8f8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:36 2014 +0100 wine/test.h: Fix a typo in comment. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 373fe76..ab10399 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -259,7 +259,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { tls_data *data = get_tls_data();

1 0

Frédéric Delanoy : ntdll: Fix a typo in comment.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 841aabfd8271f6668a9b72eec248b98bf5f3563e URL: http://source.winehq.org/git/wine.git/?a=commit;h=841aabfd8271f6668a9b72eec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:37 2014 +0100 ntdll: Fix a typo in comment. --- dlls/ntdll/debugtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index dfb44af..cbbf744 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -62,7 +62,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { struct debug_info *info = get_info();

1 0

Ken Thomases : winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: ed3ed035197347fd36f6c89fa94ab23aec22bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ed035197347fd36f6c89fa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 20:38:14 2014 -0600 winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed. --- dlls/winemac.drv/window.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5a1d5a7..d63e83f 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2260,6 +2260,12 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT TRACE("got WM_QUERYENDSESSION result %ld from win %p (%u of %u done)\n", result, hwnd, qi->done, qi->count); + if (!result && !IsWindow(hwnd)) + { + TRACE("win %p no longer exists; ignoring apparent refusal\n", hwnd); + result = TRUE; + } + if (!result && qi->result) { qi->result = FALSE; @@ -2360,9 +2366,15 @@ void macdrv_app_quit_requested(const macdrv_event *event) if (!SendMessageCallbackW(qi->wins[i], WM_QUERYENDSESSION, 0, qi->flags, quit_callback, (ULONG_PTR)qi)) { - WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", - qi->wins[i], GetLastError()); - quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, FALSE); + DWORD error = GetLastError(); + BOOL invalid = (error == ERROR_INVALID_WINDOW_HANDLE); + if (invalid) + TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n", + qi->wins[i]); + else + WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", + qi->wins[i], error); + quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, invalid); } }

1 0

Ken Thomases : wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: a05b53894a55b8de1ecfde3815dd10628b8b05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b53894a55b8de1ecfde381… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 21:11:10 2014 -0600 wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed. --- programs/wineboot/shutdown.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index a5f5f5a..52d37e7 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -100,6 +100,14 @@ static void CALLBACK end_session_message_callback( HWND hwnd, UINT msg, ULONG_PT msg == WM_QUERYENDSESSION ? "WM_QUERYENDSESSION" : (msg == WM_ENDSESSION ? "WM_ENDSESSION" : "Unknown"), hwnd, lresult ); + /* If the window was destroyed while the message was in its queue, SendMessageCallback() + calls us with a default 0 result. Ignore it. */ + if (!lresult && !IsWindow( hwnd )) + { + WINE_TRACE( "window was destroyed; ignoring FALSE lresult\n" ); + lresult = TRUE; + } + /* we only care if a WM_QUERYENDSESSION response is FALSE */ cb_data->result = cb_data->result && lresult;

1 0

刘涛 : website: Simplified Chinese translation for 1.6.2 release
by Jeremy Newman 17 Jan '14

17 Jan '14

Module: website Branch: master Commit: d153292842c3264dfb3ab00ab7ca110460dc0c30 URL: http://source.winehq.org/git/website.git/?a=commit;h=d153292842c3264dfb3ab0… Author: 刘涛 <wendaotao(a)163.com> Date: Thu Jan 16 14:38:16 2014 +0800 website: Simplified Chinese translation for 1.6.2 release --- news/zh-cn/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/zh-cn/2014011001.xml b/news/zh-cn/2014011001.xml new file mode 100644 index 0000000..edd1c8e --- /dev/null +++ b/news/zh-cn/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>一月 10, 2014</date> +<title>Wine 1.6.2 发布</title> +<body> + Wine 维护版 1.6.2 现在可以使用了。 + 本次<a href="{$root}/announce/1.6.2">更新</a> : +<ul> + <li>升级 liblcms 到版本 2 来支持色彩管理。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Stefan Dösinger : wined3d: Prevent blits to surfaces that will be converted.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 65bc678fcc9974b79921d6706a44ff10d0aa5f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bc678fcc9974b79921d6706… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:17 2014 +0100 wined3d: Prevent blits to surfaces that will be converted. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ec9f586..015478f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6032,6 +6032,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC DWORD src_ds_flags, dst_ds_flags; RECT src_rect, dst_rect; BOOL scale, convert; + enum wined3d_conversion_type dst_convert_type; + struct wined3d_format dst_conv_fmt; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -6146,7 +6148,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED) + d3dfmt_get_conv(dst_surface, TRUE, TRUE, &dst_conv_fmt, &dst_convert_type); + if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu;

1 0

Stefan Dösinger : d3dx9_36/tests: Use a window with a non-zero size.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: f85f733c7924503f5880e525d4a2698e81726da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85f733c7924503f5880e525d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:18 2014 +0100 d3dx9_36/tests: Use a window with a non-zero size. --- dlls/d3dx9_36/tests/core.c | 3 ++- dlls/d3dx9_36/tests/effect.c | 3 ++- dlls/d3dx9_36/tests/line.c | 3 ++- dlls/d3dx9_36/tests/mesh.c | 20 +++++++++++++------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ dlls/d3dx9_36/tests/surface.c | 3 ++- dlls/d3dx9_36/tests/texture.c | 3 ++- dlls/d3dx9_36/tests/volume.c | 3 ++- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index d2e2d5e..2990893 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1225,7 +1225,8 @@ START_TEST(core) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2306f1e..bc1ddbe 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2691,7 +2691,8 @@ START_TEST(effect) HRESULT hr; ULONG count; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 25d1f32..ae8d07e 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -123,7 +123,8 @@ START_TEST(line) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 47a1b1f..2eb2146 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -121,7 +121,8 @@ static struct test_context *new_test_context(void) D3DPRESENT_PARAMETERS d3dpp = {0}; struct test_context *test_context; - if (!(hwnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); goto error; @@ -1175,7 +1176,8 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl1, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -1381,7 +1383,8 @@ static void D3DXCreateMeshFVFTest(void) hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2449,7 +2452,7 @@ static void D3DXCreateBoxTest(void) return; } - wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP, + wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) @@ -2750,7 +2753,8 @@ static void D3DXCreateSphereTest(void) hr = D3DXCreateSphere(NULL, 0.0f, 0, 1, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2992,7 +2996,8 @@ static void D3DXCreateCylinderTest(void) hr = D3DXCreateCylinder(NULL, 1.0f, 1.0f, 1.0f, 2, 1, &cylinder, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -4282,7 +4287,8 @@ static void D3DXGenerateAdjacencyTest(void) }, }; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4fcf3d3..c0d5f00 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1423,8 +1423,8 @@ static void test_setting_constants(void) HRESULT hr; ULONG refcnt; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6067,8 +6067,8 @@ static void test_registerset(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6371,8 +6371,8 @@ static void test_registerset_defaults(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3af34d4..283fc96 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1281,7 +1281,8 @@ START_TEST(surface) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 18ac720..afc7144 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1786,7 +1786,8 @@ START_TEST(texture) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 8f1dc29..ee83bca 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -267,7 +267,8 @@ START_TEST(volume) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return;

1 0

André Hentschel : oleaut32/tests: Fix a test output.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: dc27a38536e89e851e798282468198bf109c5463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc27a38536e89e851e7982824… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 16 20:49:53 2014 +0100 oleaut32/tests: Fix a test output. --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index bb346f6..8a98782 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1778,8 +1778,8 @@ static void test_SafeArrayCopy(void) /* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || - broken(!sa->fFeatures /* W2k */), - "got 0x%08x\n", hres); + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); ok(sa2->fFeatures == FADF_HAVEVARTYPE ||

1 0

Ken Thomases : winemac: Eliminate unused "hdc" field of OpenGL context structure.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: f4b41eeb17e99d52d7dacca468c915069983c8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b41eeb17e99d52d7dacca46… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:16 2014 -0600 winemac: Eliminate unused "hdc" field of OpenGL context structure. --- dlls/winemac.drv/opengl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ad520fa..48fe4b7 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -56,7 +56,6 @@ static struct gl_info gl_info; struct wgl_context { - HDC hdc; int format; macdrv_opengl_context context; CGLContextObj cglcontext;

1 0

Ken Thomases : winecoreaudio: Remove some no-longer-used code.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: d3488325aec9ca6b2ef0a7212a194711cf4c96f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3488325aec9ca6b2ef0a7212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:25 2014 -0600 winecoreaudio: Remove some no-longer-used code. --- dlls/winecoreaudio.drv/audiounit.c | 95 +----------------------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 6968719..b49d214 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -36,25 +36,8 @@ #include "wine/debug.h" #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for compatibility's sake */ -typedef Component AudioComponent; +/* Define new AudioComponent Manager types for compatibility's sake */ typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} #endif #ifndef HAVE_AUGRAPHADDNODE @@ -72,49 +55,6 @@ static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponen WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); -static const char *streamDescription(const AudioStreamBasicDescription* stream) -{ - return wine_dbg_sprintf("\n mSampleRate : %f\n mFormatID : %s\n mFormatFlags : %lX\n mBytesPerPacket : %lu\n mFramesPerPacket : %lu\n mBytesPerFrame : %lu\n mChannelsPerFrame : %lu\n mBitsPerChannel : %lu\n", - stream->mSampleRate, - wine_dbgstr_fourcc(stream->mFormatID), - stream->mFormatFlags, - stream->mBytesPerPacket, - stream->mFramesPerPacket, - stream->mBytesPerFrame, - stream->mChannelsPerFrame, - stream->mBitsPerChannel); -} - -int AudioUnit_CloseAudioUnit(AudioUnit au) -{ - OSStatus err = AudioComponentInstanceDispose(au); - return (err == noErr); -} - -int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDescription *stream) -{ - OSStatus err = noErr; - - TRACE("input format: %s\n", streamDescription(stream)); - - err = AudioUnitSetProperty(au, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, - 0, stream, sizeof(*stream)); - - if (err != noErr) - { - ERR("AudioUnitSetProperty return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - err = AudioUnitInitialize(au); - if (err != noErr) - { - ERR("AudioUnitInitialize return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - return 1; -} - int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; @@ -150,39 +90,6 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) } -/* FIXME: implement sample rate conversion on input */ -int AudioUnit_GetInputDeviceSampleRate(void) -{ - AudioDeviceID defaultInputDevice; - UInt32 param; - AudioObjectPropertyAddress propertyAddress; - Float64 sampleRate; - OSStatus err; - - param = sizeof(defaultInputDevice); - propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; - propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; - propertyAddress.mElement = kAudioObjectPropertyElementMaster; - err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); - if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) - { - ERR("Couldn't get the default audio input device ID: %08lx\n", err); - return 0; - } - - param = sizeof(sampleRate); - propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate; - propertyAddress.mScope = kAudioDevicePropertyScopeInput; - err = AudioObjectGetPropertyData(defaultInputDevice, &propertyAddress, 0, NULL, &param, &sampleRate); - if (err != noErr) - { - ERR("Couldn't get the device sample rate: %08lx\n", err); - return 0; - } - - return sampleRate; -} - /* * MIDI Synth Unit */

1 0