wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Andrew Eikum : xaudio2: Register legacy AudioVolumeMeter CLSIDs.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: c8f2d095b224e865a7d84839d26302b4f5a45cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f2d095b224e865a7d84839d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 13:01:30 2015 -0500 xaudio2: Register legacy AudioVolumeMeter CLSIDs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_1/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_2/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_3/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_4/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_5/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_6/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_7/xaudio_dll.c | 8 +++++++- include/xaudio2fx.idl | 42 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl index 7f2f93b..80fe781 100644 --- a/dlls/xaudio2_1/xaudio_classes.idl +++ b/dlls/xaudio2_1/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio21 { interface IXAudio22; } uuid(f4769300-b949-4df9-b333-00d33932e9a6) ] coclass AudioReverb21 { interface IXAPO; } + +[ + helpstring("XAudio2.1 AudioVolumeMeter Class"), + threading(both), + uuid(c1e3f122-a2ea-442c-854f-20d98f8357a1) +] +coclass AudioVolumeMeter21 { interface IXAPO; } diff --git a/dlls/xaudio2_2/xaudio_classes.idl b/dlls/xaudio2_2/xaudio_classes.idl index 42ae148..1d49ffb 100644 --- a/dlls/xaudio2_2/xaudio_classes.idl +++ b/dlls/xaudio2_2/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio22 { interface IXAudio22; } uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51) ] coclass AudioReverb22 { interface IXAPO; } + +[ + helpstring("XAudio2.2 AudioVolumeMeter Class"), + threading(both), + uuid(f5ca7b34-8055-42c0-b836-216129eb7e30) +] +coclass AudioVolumeMeter22 { interface IXAPO; } diff --git a/dlls/xaudio2_3/xaudio_classes.idl b/dlls/xaudio2_3/xaudio_classes.idl index 7c1fabc..ebd8548 100644 --- a/dlls/xaudio2_3/xaudio_classes.idl +++ b/dlls/xaudio2_3/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio23 { interface IXAudio27; } uuid(9cab402c-1d37-44b4-886d-fa4f36170a4c) ] coclass AudioReverb23 { interface IXAPO; } + +[ + helpstring("XAudio2.3 AudioVolumeMeter Class"), + threading(both), + uuid(e180344b-ac83-4483-959e-18a5c56a5e19) +] +coclass AudioVolumeMeter23 { interface IXAPO; } diff --git a/dlls/xaudio2_4/xaudio_classes.idl b/dlls/xaudio2_4/xaudio_classes.idl index 6723bce..3486de3 100644 --- a/dlls/xaudio2_4/xaudio_classes.idl +++ b/dlls/xaudio2_4/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio24 { interface IXAudio27; } uuid(8bb7778b-645b-4475-9a73-1de3170bd3af) ] coclass AudioReverb24 { interface IXAPO; } + +[ + helpstring("XAudio2.4 AudioVolumeMeter Class"), + threading(both), + uuid(c7338b95-52b8-4542-aa79-42eb016c8c1c) +] +coclass AudioVolumeMeter24 { interface IXAPO; } diff --git a/dlls/xaudio2_5/xaudio_classes.idl b/dlls/xaudio2_5/xaudio_classes.idl index 13fceab..f3c0b0a 100644 --- a/dlls/xaudio2_5/xaudio_classes.idl +++ b/dlls/xaudio2_5/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio25 { interface IXAudio27; } uuid(d06df0d0-8518-441e-822f-5451d5c595b8) ] coclass AudioReverb25 { interface IXAPO; } + +[ + helpstring("XAudio2.5 AudioVolumeMeter Class"), + threading(both), + uuid(2139e6da-c341-4774-9ac3-b4e026347f64) +] +coclass AudioVolumeMeter25 { interface IXAPO; } diff --git a/dlls/xaudio2_6/xaudio_classes.idl b/dlls/xaudio2_6/xaudio_classes.idl index addbca0..1b76a6a 100644 --- a/dlls/xaudio2_6/xaudio_classes.idl +++ b/dlls/xaudio2_6/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio26 { interface IXAudio27; } uuid(cecec95a-d894-491a-bee3-5e106fb59f2d) ] coclass AudioReverb26 { interface IXAPO; } + +[ + helpstring("XAudio2.6 AudioVolumeMeter Class"), + threading(both), + uuid(e48c5a3f-93ef-43bb-a092-2c7ceb946f27) +] +coclass AudioVolumeMeter26 { interface IXAPO; } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a0e2c60..868cca3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2479,7 +2479,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xaudio2_factory(26); }else if(IsEqualGUID(rclsid, &CLSID_XAudio2)){ factory = make_xaudio2_factory(27); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { + }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26)){ factory = &vumeter_cf; }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb) || IsEqualGUID(rclsid, &CLSID_AudioReverb21) || diff --git a/include/xaudio2fx.idl b/include/xaudio2fx.idl index 3014eb1..c152b98 100644 --- a/include/xaudio2fx.idl +++ b/include/xaudio2fx.idl @@ -26,6 +26,48 @@ coclass AudioVolumeMeter { } [ + uuid(c1e3f122-a2ea-442c-854f-20d98f8357a1) +] +coclass AudioVolumeMeter21 { + interface IUnknown; +} + +[ + uuid(f5ca7b34-8055-42c0-b836-216129eb7e30) +] +coclass AudioVolumeMeter22 { + interface IUnknown; +} + +[ + uuid(e180344b-ac83-4483-959e-18a5c56a5e19) +] +coclass AudioVolumeMeter23 { + interface IUnknown; +} + +[ + uuid(c7338b95-52b8-4542-aa79-42eb016c8c1c) +] +coclass AudioVolumeMeter24 { + interface IUnknown; +} + +[ + uuid(2139e6da-c341-4774-9ac3-b4e026347f64) +] +coclass AudioVolumeMeter25 { + interface IUnknown; +} + +[ + uuid(e48c5a3f-93ef-43bb-a092-2c7ceb946f27) +] +coclass AudioVolumeMeter26 { + interface IUnknown; +} + +[ uuid(6a93130e-1d53-41d1-a9cf-e758800bb179) ] coclass AudioReverb {

1 0

Andrew Eikum : xaudio2: Register legacy AudioReverb CLSIDs.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: e9459b047a2948011986c74b27a3e1f509e8a4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9459b047a2948011986c74b2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 13:01:28 2015 -0500 xaudio2: Register legacy AudioReverb CLSIDs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_1/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_2/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_3/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_4/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_5/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_6/xaudio_classes.idl | 7 +++++++ dlls/xaudio2_7/xaudio_dll.c | 8 +++++++- include/xaudio2fx.idl | 42 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl index de85c0b..7f2f93b 100644 --- a/dlls/xaudio2_1/xaudio_classes.idl +++ b/dlls/xaudio2_1/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(e21a7345-eb21-468e-be50-804db97cf708) ] coclass XAudio21 { interface IXAudio22; } + +[ + helpstring("XAudio2.1 AudioReverb Class"), + threading(both), + uuid(f4769300-b949-4df9-b333-00d33932e9a6) +] +coclass AudioReverb21 { interface IXAPO; } diff --git a/dlls/xaudio2_2/xaudio_classes.idl b/dlls/xaudio2_2/xaudio_classes.idl index 6ff0a00..42ae148 100644 --- a/dlls/xaudio2_2/xaudio_classes.idl +++ b/dlls/xaudio2_2/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(b802058a-464a-42db-bc10-b650d6f2586a) ] coclass XAudio22 { interface IXAudio22; } + +[ + helpstring("XAudio2.2 AudioReverb Class"), + threading(both), + uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51) +] +coclass AudioReverb22 { interface IXAPO; } diff --git a/dlls/xaudio2_3/xaudio_classes.idl b/dlls/xaudio2_3/xaudio_classes.idl index c95fac0..7c1fabc 100644 --- a/dlls/xaudio2_3/xaudio_classes.idl +++ b/dlls/xaudio2_3/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(4c5e637a-16c7-4de3-9c46-5ed22181962d) ] coclass XAudio23 { interface IXAudio27; } + +[ + helpstring("XAudio2.3 AudioReverb Class"), + threading(both), + uuid(9cab402c-1d37-44b4-886d-fa4f36170a4c) +] +coclass AudioReverb23 { interface IXAPO; } diff --git a/dlls/xaudio2_4/xaudio_classes.idl b/dlls/xaudio2_4/xaudio_classes.idl index 26af295..6723bce 100644 --- a/dlls/xaudio2_4/xaudio_classes.idl +++ b/dlls/xaudio2_4/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(03219e78-5bc3-44d1-b92e-f63d89cc6526) ] coclass XAudio24 { interface IXAudio27; } + +[ + helpstring("XAudio2.4 AudioReverb Class"), + threading(both), + uuid(8bb7778b-645b-4475-9a73-1de3170bd3af) +] +coclass AudioReverb24 { interface IXAPO; } diff --git a/dlls/xaudio2_5/xaudio_classes.idl b/dlls/xaudio2_5/xaudio_classes.idl index 78d7c1e..13fceab 100644 --- a/dlls/xaudio2_5/xaudio_classes.idl +++ b/dlls/xaudio2_5/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(4c9b6dde-6809-46e6-a278-9b6a97588670) ] coclass XAudio25 { interface IXAudio27; } + +[ + helpstring("XAudio2.5 AudioReverb Class"), + threading(both), + uuid(d06df0d0-8518-441e-822f-5451d5c595b8) +] +coclass AudioReverb25 { interface IXAPO; } diff --git a/dlls/xaudio2_6/xaudio_classes.idl b/dlls/xaudio2_6/xaudio_classes.idl index e54eed7..addbca0 100644 --- a/dlls/xaudio2_6/xaudio_classes.idl +++ b/dlls/xaudio2_6/xaudio_classes.idl @@ -26,3 +26,10 @@ uuid(3eda9b49-2085-498b-9bb2-39a6778493de) ] coclass XAudio26 { interface IXAudio27; } + +[ + helpstring("XAudio2.6 AudioReverb Class"), + threading(both), + uuid(cecec95a-d894-491a-bee3-5e106fb59f2d) +] +coclass AudioReverb26 { interface IXAPO; } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 68fe955..a0e2c60 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2481,7 +2481,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xaudio2_factory(27); }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { factory = &vumeter_cf; - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb)) { + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb) || + IsEqualGUID(rclsid, &CLSID_AudioReverb21) || + IsEqualGUID(rclsid, &CLSID_AudioReverb22) || + IsEqualGUID(rclsid, &CLSID_AudioReverb23) || + IsEqualGUID(rclsid, &CLSID_AudioReverb24) || + IsEqualGUID(rclsid, &CLSID_AudioReverb25) || + IsEqualGUID(rclsid, &CLSID_AudioReverb26)){ factory = &reverb_cf; } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/include/xaudio2fx.idl b/include/xaudio2fx.idl index a83b2f6..3014eb1 100644 --- a/include/xaudio2fx.idl +++ b/include/xaudio2fx.idl @@ -31,3 +31,45 @@ coclass AudioVolumeMeter { coclass AudioReverb { interface IUnknown; } + +[ + uuid(f4769300-b949-4df9-b333-00d33932e9a6) +] +coclass AudioReverb21 { + interface IUnknown; +} + +[ + uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51) +] +coclass AudioReverb22 { + interface IUnknown; +} + +[ + uuid(9cab402c-1d37-44b4-886d-fa4f36170a4c) +] +coclass AudioReverb23 { + interface IUnknown; +} + +[ + uuid(8bb7778b-645b-4475-9a73-1de3170bd3af) +] +coclass AudioReverb24 { + interface IUnknown; +} + +[ + uuid(d06df0d0-8518-441e-822f-5451d5c595b8) +] +coclass AudioReverb25 { + interface IUnknown; +} + +[ + uuid(cecec95a-d894-491a-bee3-5e106fb59f2d) +] +coclass AudioReverb26 { + interface IUnknown; +}

1 0

Andrew Eikum : x3daudio: Forward older DLLs to x3daudio1_7.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: b2b5a085b5e288bbbb673c57eb6e6a04156735ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b5a085b5e288bbbb673c57e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 13:01:24 2015 -0500 x3daudio: Forward older DLLs to x3daudio1_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 4 +++- configure.ac | 3 ++- dlls/x3daudio1_0/Makefile.in | 4 ++++ dlls/x3daudio1_0/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_0/x3daudio1_0.spec | 2 ++ dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- dlls/x3daudio1_2/x3daudio1_2.spec | 4 ++-- dlls/x3daudio1_3/x3daudio1_3.spec | 4 ++-- dlls/x3daudio1_4/x3daudio1_4.spec | 4 ++-- dlls/x3daudio1_5/x3daudio1_5.spec | 4 ++-- dlls/x3daudio1_6/Makefile.in | 1 + dlls/x3daudio1_6/main.c | 9 +++++++++ dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- dlls/x3daudio1_7/Makefile.in | 1 + 14 files changed, 70 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 6fdf7a6..33f0343 100755 --- a/configure +++ b/configure @@ -1364,6 +1364,7 @@ enable_wsock32 enable_wtsapi32 enable_wuapi enable_wuaueng +enable_x3daudio1_0 enable_x3daudio1_1 enable_x3daudio1_2 enable_x3daudio1_3 @@ -17935,13 +17936,14 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll x3daudio1_0 enable_x3daudio1_0 wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 wine_fn_config_dll x3daudio1_2 enable_x3daudio1_2 wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3 wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 -wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 implib wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_2 enable_xapofx1_2 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index 7e6e855..74ab202 100644 --- a/configure.ac +++ b/configure.ac @@ -3450,13 +3450,14 @@ WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(x3daudio1_0) WINE_CONFIG_DLL(x3daudio1_1) WINE_CONFIG_DLL(x3daudio1_2) WINE_CONFIG_DLL(x3daudio1_3) WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) -WINE_CONFIG_DLL(x3daudio1_7) +WINE_CONFIG_DLL(x3daudio1_7,,[implib]) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_2) WINE_CONFIG_DLL(xapofx1_3) diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in new file mode 100644 index 0000000..16d2868 --- /dev/null +++ b/dlls/x3daudio1_0/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_0.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_0/main.c b/dlls/x3daudio1_0/main.c new file mode 100644 index 0000000..52a5e3d --- /dev/null +++ b/dlls/x3daudio1_0/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_0/x3daudio1_0.spec b/dlls/x3daudio1_0/x3daudio1_0.spec new file mode 100644 index 0000000..6351da4 --- /dev/null +++ b/dlls/x3daudio1_0/x3daudio1_0.spec @@ -0,0 +1,2 @@ +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_1/x3daudio1_1.spec +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_2/x3daudio1_2.spec +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_3/x3daudio1_3.spec b/dlls/x3daudio1_3/x3daudio1_3.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_3/x3daudio1_3.spec +++ b/dlls/x3daudio1_3/x3daudio1_3.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_4/x3daudio1_4.spec b/dlls/x3daudio1_4/x3daudio1_4.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_4/x3daudio1_4.spec +++ b/dlls/x3daudio1_4/x3daudio1_4.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_5/x3daudio1_5.spec b/dlls/x3daudio1_5/x3daudio1_5.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_5/x3daudio1_5.spec +++ b/dlls/x3daudio1_5/x3daudio1_5.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index ad59b8f..fa9046e 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,4 +1,5 @@ MODULE = x3daudio1_6.dll +IMPORTS = x3daudio1_7 C_SRCS = \ main.c diff --git a/dlls/x3daudio1_6/main.c b/dlls/x3daudio1_6/main.c index ea6732f..ab06cd6 100644 --- a/dlls/x3daudio1_6/main.c +++ b/dlls/x3daudio1_6/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "x3daudio.h" + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -38,3 +40,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +void CDECL X3DA16_X3DAudioInitialize(UINT32 chanmask, float speedofsound, + X3DAUDIO_HANDLE handle) +{ + /* forward to 1.7 */ + X3DAudioInitialize(chanmask, speedofsound, handle); +} diff --git a/dlls/x3daudio1_6/x3daudio1_6.spec b/dlls/x3daudio1_6/x3daudio1_6.spec index 9a51f1b..6103b1b 100644 --- a/dlls/x3daudio1_6/x3daudio1_6.spec +++ b/dlls/x3daudio1_6/x3daudio1_6.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_7.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) X3DA16_X3DAudioInitialize diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 7487ca8..f3110e4 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,4 +1,5 @@ MODULE = x3daudio1_7.dll +IMPORTLIB = x3daudio1_7 C_SRCS = \ main.c

1 0

Henri Verbeet : d2d1: Implement d2d_cdt_incircle() in a more robust way.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 7e6b52e88b5f35caf678f87d45fc0972844400c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6b52e88b5f35caf678f87d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:23 2015 +0200 d2d1: Implement d2d_cdt_incircle() in a more robust way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/geometry.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 327 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e6b52e88b5f35caf678f…

1 0

Henri Verbeet : d2d1: Implement d2d_point_ccw() in a more robust way.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: e8b4d8e0d0edec7f6d160126fdb95a3992193cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b4d8e0d0edec7f6d160126f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:22 2015 +0200 d2d1: Implement d2d_point_ccw() in a more robust way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure | 28 ++++++ configure.ac | 1 + dlls/d2d1/Makefile.in | 1 + dlls/d2d1/geometry.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 278 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8b4d8e0d0edec7f6d160…

1 0

Henri Verbeet : d2d1: Properly handle the candidate being the last vertex before the base edge origin in d2d_cdt_fixup ().
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: f35bfff4fcdfdba34ff7cda0544a15ba7f889c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35bfff4fcdfdba34ff7cda05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:21 2015 +0200 d2d1: Properly handle the candidate being the last vertex before the base edge origin in d2d_cdt_fixup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/geometry.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a705723..7400f81 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -712,7 +712,12 @@ static BOOL d2d_cdt_fixup(struct d2d_cdt *cdt, const struct d2d_cdt_edge_ref *ba if (count > 1) { - if (!d2d_cdt_connect(cdt, &new_base, &candidate, base_edge)) + d2d_cdt_edge_next_left(cdt, &next, &candidate); + if (d2d_cdt_edge_destination(cdt, &next) == d2d_cdt_edge_origin(cdt, base_edge)) + d2d_cdt_edge_next_left(cdt, &next, base_edge); + else + next = *base_edge; + if (!d2d_cdt_connect(cdt, &new_base, &candidate, &next)) return FALSE; if (!d2d_cdt_fixup(cdt, &new_base)) return FALSE;

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: stdiofile.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: c5480a881039927a2571e9db578413d339fc23bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5480a881039927a2571e9db5… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 2 15:03:24 2015 +0200 msvcirt: Implement stdiobuf::stdiofile. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 602ab77..1d915fa 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1589,8 +1589,8 @@ int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size) DEFINE_THISCALL_WRAPPER(stdiobuf_stdiofile, 4) FILE* __thiscall stdiobuf_stdiofile(stdiobuf *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->file; } /* ?sync@stdiobuf@@UAEHXZ */

1 0

Iván Matellanes : msvcirt: Implement stdiobuf::sync.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: c16e4f5cc52f5b9a6f8e99b9d76fd565bd2a9d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16e4f5cc52f5b9a6f8e99b9d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 2 15:03:23 2015 +0200 msvcirt: Implement stdiobuf::sync. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 27 +++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 2b54f5b..602ab77 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1598,8 +1598,31 @@ FILE* __thiscall stdiobuf_stdiofile(stdiobuf *this) DEFINE_THISCALL_WRAPPER(stdiobuf_sync, 4) int __thiscall stdiobuf_sync(stdiobuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + if (this->base.unbuffered) + return 0; + /* flush the put area */ + if (call_streambuf_overflow(&this->base, EOF) == EOF) + return EOF; + /* flush the get area */ + if (this->base.gptr < this->base.egptr) { + char *ptr; + int fd, mode, offset = this->base.egptr - this->base.gptr; + if ((fd = fileno(this->file)) < 0) + return EOF; + mode = _setmode(fd, _O_TEXT); + _setmode(fd, mode); + if (mode & _O_TEXT) { + /* in text mode, '\n' in the buffer means '\r\n' in the file */ + for (ptr = this->base.gptr; ptr < this->base.egptr; ptr++) + if (*ptr == '\n') + offset++; + } + if (fseek(this->file, -offset, SEEK_CUR)) + return EOF; + this->base.gptr = this->base.egptr; + } + return 0; } /* ?underflow@stdiobuf@@UAEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 1f85186..8bc45c1 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); /* ios */ @@ -373,6 +374,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); + SET(p_stdiobuf_sync, "?sync@stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); @@ -456,6 +458,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); + SET(p_stdiobuf_sync, "?sync@stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); @@ -1960,6 +1963,59 @@ static void test_stdiobuf(void) ret = (int) call_func1(p_stdiobuf_underflow, &stb2); ok(ret == EOF, "expected EOF got %d\n", ret); + /* sync */ + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.gptr = stb1.base.eback; + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb1.base.pbase == stb1.base.base + 256, "wrong put base, expected %p got %p\n", stb1.base.base + 256, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base + 256, "wrong put pointer, expected %p got %p\n", stb1.base.base + 256, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 512, "wrong put end, expected %p got %p\n", stb1.base.base + 512, stb1.base.epptr); + stb1.base.gptr = stb1.base.egptr; + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.eback = stb1.base.gptr = stb1.base.egptr = NULL; + stb1.base.pptr = stb1.base.epptr; + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr); + stb1.base.pptr = stb1.base.pbase; + ret = (int) call_func1(p_stdiobuf_sync, &stb1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr); + stb1.base.unbuffered = 1; + stb2.base.unbuffered = 0; + stb2.base.egptr = stb2.base.ebuf; + ret = (int) call_func1(p_stdiobuf_sync, &stb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb2.base.pbase == stb2.base.base + 32, "wrong put base, expected %p got %p\n", stb2.base.base + 32, stb2.base.pbase); + ok(stb2.base.pptr == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pptr); + ok(stb2.base.epptr == stb2.base.base + 64, "wrong put end, expected %p got %p\n", stb2.base.base + 64, stb2.base.epptr); + stb2.base.egptr = stb2.base.pbase; + stb2.base.gptr = stb2.base.egptr - 25; + ret = (int) call_func1(p_stdiobuf_sync, &stb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func3(p_streambuf_xsputn, &stb2.base, "Never gonna make you cry", 24); + ok(ret == 24, "expected 24 got %d\n", ret); + ret = (int) call_func1(p_stdiobuf_sync, &stb2); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(ftell(stb2.file) == 23, "ftell failed\n"); + ok(fseek(stb2.file, 3, SEEK_SET) == 0, "fseek failed\n"); + stb2.base.gptr = stb2.base.egptr - 3; + strcpy(stb2.base.gptr, "a\nc"); + ret = (int) call_func1(p_stdiobuf_sync, &stb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb2.base.gptr == stb2.base.egptr - 3, "wrong get pointer, expected %p got %p\n", stb2.base.egptr - 3, stb2.base.gptr); + *(stb2.base.gptr+1) = 'b'; + ret = (int) call_func1(p_stdiobuf_sync, &stb2); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr); + stb2.base.unbuffered = 1; + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: underflow.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 775461912819a69578ac31c7950eff718a64cd31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775461912819a69578ac31c79… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 2 15:03:22 2015 +0200 msvcirt: Implement stdiobuf::underflow. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 25 +++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 81519d0..2b54f5b 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1607,8 +1607,29 @@ int __thiscall stdiobuf_sync(stdiobuf *this) DEFINE_THISCALL_WRAPPER(stdiobuf_underflow, 4) int __thiscall stdiobuf_underflow(stdiobuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + if (!this->file) + return EOF; + if (this->base.unbuffered) + return fgetc(this->file); + if (streambuf_allocate(&this->base) == EOF) + return EOF; + + if (!this->base.egptr) { + /* set the get area to the first half of the buffer */ + char *middle = this->base.base + (this->base.ebuf - this->base.base) / 2; + streambuf_setg(&this->base, this->base.base, middle, middle); + } + if (this->base.gptr >= this->base.egptr) { + /* read characters from the file */ + int buffer_size = this->base.egptr - this->base.eback, read_bytes; + if (!this->base.eback || + (read_bytes = fread(this->base.eback, sizeof(char), buffer_size, this->file)) <= 0) + return EOF; + memmove(this->base.egptr - read_bytes, this->base.eback, read_bytes); + this->base.gptr = this->base.egptr - read_bytes; + } + return *this->base.gptr++; } /* ??0ios@@IAE@ABV0@@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 53af65c..1f85186 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -372,6 +373,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); + SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -454,6 +456,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); + SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1913,6 +1916,50 @@ static void test_stdiobuf(void) stb2.base.epptr = buffer + 64; stb2.base.unbuffered = 1; + /* underflow */ + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == 'N', "expected 'N' got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(stb1.base.eback == stb1.base.base, "wrong get base, expected %p got %p\n", stb1.base.base, stb1.base.eback); + ok(stb1.base.gptr == stb1.base.egptr - 47, "wrong get pointer, expected %p got %p\n", stb1.base.egptr - 47, stb1.base.gptr); + ok(stb1.base.egptr == stb1.base.base + 256, "wrong get end, expected %p got %p\n", stb1.base.base + 256, stb1.base.egptr); + ok(*stb1.base.gptr == 'v', "expected 'v' got '%c'\n", *stb1.base.gptr); + stb1.base.pbase = stb1.base.pptr = stb1.base.epptr = NULL; + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == 'v', "expected 'v' got %d\n", ret); + ok(stb1.base.gptr == stb1.base.egptr - 46, "wrong get pointer, expected %p got %p\n", stb1.base.egptr - 46, stb1.base.gptr); + stb1.base.gptr = stb1.base.egptr; + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb1.base.unbuffered = 1; + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + rewind(stb2.file); + ret = (int) call_func1(p_stdiobuf_underflow, &stb2); + ok(ret == 'a', "expected 'a' got %d\n", ret); + stb2.base.unbuffered = 0; + stb2.base.eback = stb2.base.gptr = buffer + 16; + stb2.base.egptr = buffer + 32; + strcpy(buffer + 16, "and desert you"); + ret = (int) call_func1(p_stdiobuf_underflow, &stb2); + ok(ret == 'a', "expected 'a' got %d\n", ret); + ok(stb2.base.gptr == buffer + 17, "wrong get pointer, expected %p got %p\n", buffer + 17, stb2.base.gptr); + stb2.base.eback = buffer; + stb2.base.gptr = stb2.base.egptr; + stb2.base.pbase = stb2.base.pptr = stb2.base.epptr = NULL; + ret = (int) call_func1(p_stdiobuf_underflow, &stb2); + ok(ret == 'N', "expected 'N' got %d\n", ret); + ok(stb2.base.gptr == stb2.base.egptr - 22, "wrong get pointer, expected %p got %p\n", stb2.base.egptr - 22, stb2.base.gptr); + ok(ftell(stb2.file) == 24, "ftell failed\n"); + stb2.base.gptr = stb2.base.egptr; + ret = (int) call_func1(p_stdiobuf_underflow, &stb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb2.base.unbuffered = 1; + ret = (int) call_func1(p_stdiobuf_underflow, &stb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: overflow.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 608aa13672d585e2cc2f64d73483bcd75f2ee471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608aa13672d585e2cc2f64d73… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 2 15:03:21 2015 +0200 msvcirt: Implement stdiobuf::overflow. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 25 +++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3b1c03d..81519d0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1532,8 +1532,29 @@ stdiobuf* __thiscall stdiobuf_scalar_dtor(stdiobuf *this, unsigned int flags) DEFINE_THISCALL_WRAPPER(stdiobuf_overflow, 8) int __thiscall stdiobuf_overflow(stdiobuf *this, int c) { - FIXME("(%p %d) stub\n", this, c); - return EOF; + TRACE("(%p %d)\n", this, c); + if (this->base.unbuffered) + return (c == EOF) ? 1 : fputc(c, this->file); + if (streambuf_allocate(&this->base) == EOF) + return EOF; + + if (!this->base.epptr) { + /* set the put area to the second half of the buffer */ + streambuf_setp(&this->base, + this->base.base + (this->base.ebuf - this->base.base) / 2, this->base.ebuf); + } else if (this->base.pptr > this->base.pbase) { + /* flush the put area */ + int count = this->base.pptr - this->base.pbase; + if (fwrite(this->base.pbase, sizeof(char), count, this->file) != count) + return EOF; + this->base.pptr = this->base.pbase; + } + if (c != EOF) { + if (this->base.pbase >= this->base.epptr) + return fputc(c, this->file); + *this->base.pptr++ = c; + } + return 1; } /* ?pbackfail@stdiobuf@@UAEHH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 5158b82..53af65c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -209,6 +209,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); /* stdiobuf */ static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); +static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -370,6 +371,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); + SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -451,6 +453,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); + SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1828,6 +1831,8 @@ static void test_stdiobuf(void) FILE *file1, *file2; const char filename1[] = "stdiobuf_test1"; const char filename2[] = "stdiobuf_test2"; + int ret; + char buffer[64]; memset(&stb1, 0xab, sizeof(stdiobuf)); memset(&stb2, 0xab, sizeof(stdiobuf)); @@ -1855,6 +1860,59 @@ static void test_stdiobuf(void) ok(stb2.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb2.base.unbuffered); ok(stb2.file == file2, "wrong file pointer, expected %p got %p\n", file2, stb2.file); + /* overflow */ + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, EOF); + ok(ret == 1, "expected 1 got %d\n", ret); + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, 'a'); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, 'a'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", stb1.base.allocated); + ok(stb1.base.ebuf == stb1.base.base + 512, "expected %p got %p\n", stb1.base.base + 512, stb1.base.ebuf); + ok(stb1.base.pbase == stb1.base.base + 256, "wrong put base, expected %p got %p\n", stb1.base.base + 256, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.pbase + 1, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 1, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.ebuf, "wrong put end, expected %p got %p\n", stb1.base.ebuf, stb1.base.epptr); + ok(*(stb1.base.pptr-1) == 'a', "expected 'a', got '%c'\n", *(stb1.base.pptr-1)); + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, EOF); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase + 1, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 1, stb1.base.pptr); + stb1.base.pptr = stb1.base.pbase; + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, EOF); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase, "wrong put pointer, expected %p got %p\n", stb1.base.pbase, stb1.base.pptr); + ret = (int) call_func2(p_stdiobuf_overflow, &stb1, 'b'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase + 1, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 1, stb1.base.pptr); + ok(*(stb1.base.pptr-1) == 'b', "expected 'b', got '%c'\n", *(stb1.base.pptr-1)); + stb1.base.unbuffered = 1; + ret = (int) call_func2(p_stdiobuf_overflow, &stb2, EOF); + ok(ret == 1, "expected 1 got %d\n", ret); + ret = (int) call_func2(p_stdiobuf_overflow, &stb2, 'a'); + ok(ret == 'a', "expected 'a' got %d\n", ret); + stb2.base.unbuffered = 0; + stb2.base.base = buffer; + stb2.base.pbase = stb2.base.pptr = buffer + 32; + stb2.base.ebuf = stb2.base.epptr = buffer + 64; + ret = (int) call_func3(p_streambuf_xsputn, &stb2.base, "Never gonna run around", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + ret = (int) call_func2(p_stdiobuf_overflow, &stb2, 'c'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase + 1, "wrong put pointer, expected %p got %p\n", stb2.base.pbase + 1, stb2.base.pptr); + ok(*(stb2.base.pptr-1) == 'c', "expected 'c', got '%c'\n", *(stb2.base.pptr-1)); + stb2.base.pbase = stb2.base.pptr + 3; + ret = (int) call_func2(p_stdiobuf_overflow, &stb2, 'd'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase - 2, "wrong put pointer, expected %p got %p\n", stb2.base.pbase - 2, stb2.base.pptr); + ok(*(stb2.base.pptr-1) == 'd', "expected 'd', got '%c'\n", *(stb2.base.pptr-1)); + stb2.base.pbase = stb2.base.pptr = buffer + 32; + stb2.base.epptr = buffer + 30; + ret = (int) call_func2(p_stdiobuf_overflow, &stb2, 'd'); + ok(ret == 'd', "expected 'd' got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.epptr = buffer + 64; + stb2.base.unbuffered = 1; + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
75
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 October 2015