May 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : cryptdlg: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 3817304343f00cfeaf159dfb6a44d463b9f38f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3817304343f00cfeaf159dfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:53:11 2019 +0200 cryptdlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdlg/Makefile.in | 2 + dlls/cryptdlg/main.c | 185 +++++++++++++++++++++++----------------------- 2 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3817304343f00cfeaf15…

1 0

Alexandre Julliard : credui: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: bf1bebc3a8c9088cdb149a42a3cf1ea0e47e5467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1bebc3a8c9088cdb149a42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:50:22 2019 +0200 credui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/Makefile.in | 2 ++ dlls/credui/credui_main.c | 67 +++++++++++++++++++++++------------------------ 2 files changed, 35 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1bebc3a8c9088cdb14…

1 0

Alexandre Julliard : compobj: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 6a5d0230ceec454a4d6abe3162fff4947d6dd821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5d0230ceec454a4d6abe31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:49:11 2019 +0200 compobj: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/Makefile.in | 2 +- dlls/compobj.dll16/compobj.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in index 5b11e84..4f29a65 100644 --- a/dlls/compobj.dll16/Makefile.in +++ b/dlls/compobj.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = compobj.dll16 IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll C_SRCS = compobj.c diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 4eddace..ffbd87a 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -22,7 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdlib.h> #include <stdarg.h> @@ -40,7 +39,6 @@ #include "winreg.h" #include "wownt32.h" #include "wtypes.h" -#include "wine/unicode.h" #include "wine/winbase16.h" #include "wine/debug.h"

1 0

Alexandre Julliard : commdlg: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 6655e6520d307fa9f2ea19bf21f3b37e478cf863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6655e6520d307fa9f2ea19bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:49:02 2019 +0200 commdlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in index 6973114..b1609dd 100644 --- a/dlls/commdlg.dll16/Makefile.in +++ b/dlls/commdlg.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = commdlg.dll16 IMPORTS = comdlg32 user32 gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,comdlg32.dll C_SRCS = \ colordlg.c \

1 0

Alexandre Julliard : comdlg32: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 2cfe9075844ce26a1f9ad6bf063a34f8ba884ba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cfe9075844ce26a1f9ad6bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:48:52 2019 +0200 comdlg32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/Makefile.in | 2 ++ dlls/comdlg32/filedlg.c | 42 +++++++++++++++++++----------------------- dlls/comdlg32/filedlg31.c | 35 +++++++++++++++++------------------ dlls/comdlg32/fontdlg.c | 5 ++--- dlls/comdlg32/printdlg.c | 23 +++++++++++------------ 5 files changed, 51 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cfe9075844ce26a1f9a…

1 0

Zebediah Figura : quartz/waveparser: Use BaseFilterImpl_Release().
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: e707bb49fbbb00df0b063892e104f9a1cd17f8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e707bb49fbbb00df0b063892… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:17 2019 -0500 quartz/waveparser: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 13 ------------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 9 ++++++++- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 433502c..095ec5e 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This) CoTaskMemFree(This); } -ULONG WINAPI Parser_Release(IBaseFilter * iface) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - Parser_Destroy(This); - - return refCount; -} - /** IPersist methods **/ HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index d221eec..4d51e3a 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -63,7 +63,6 @@ extern void Parser_Destroy(ParserImpl *This); extern HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); extern ULONG WINAPI Parser_AddRef(IBaseFilter * iface); -extern ULONG WINAPI Parser_Release(IBaseFilter * iface); extern HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid); extern HRESULT WINAPI Parser_Stop(IBaseFilter * iface); extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6240b78..1b18f69 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -398,7 +398,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = { Parser_QueryInterface, Parser_AddRef, - Parser_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -413,9 +413,16 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_QueryVendorInfo }; +static void wave_parser_destroy(BaseFilter *iface) +{ + WAVEParserImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable wave_parser_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = wave_parser_destroy, }; HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Zebediah Figura : quartz/mpegsplit: Use BaseFilterImpl_Release().
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 23daccb0dac9e7fdd9ba02bfd7376492e1ea0b3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23daccb0dac9e7fdd9ba02bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:16 2019 -0500 quartz/mpegsplit: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 24e61fe..b64385b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -795,7 +795,7 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = { MPEGSplitter_QueryInterface, Parser_AddRef, - Parser_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -868,9 +868,16 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = AMStreamSelect_Enable }; +static void mpeg_splitter_destroy(BaseFilter *iface) +{ + MPEGSplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable mpeg_splitter_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = mpeg_splitter_destroy, }; HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Alexandre Julliard : cryptnet: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 7ca2c13ea9f62c050ed20540b9aaadb37592cfd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca2c13ea9f62c050ed20540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:53:47 2019 +0200 cryptnet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 ++ dlls/cryptnet/cryptnet_main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index e6849e5..8482882 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -3,5 +3,7 @@ IMPORTLIB = cryptnet IMPORTS = crypt32 DELAYIMPORTS = wininet +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cryptnet_main.c diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 9d05a91..2e0ab21 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS

1 0

Alexandre Julliard : comsvcs: Build with msvcrt.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 73cc4a444e660a9cfb280a8e96110704d05f177d URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cc4a444e660a9cfb280a8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:49:31 2019 +0200 comsvcs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 ++ dlls/comsvcs/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index b01c4f2..44c08ff 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -2,6 +2,8 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index af9487b..736608e 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : include/msvcrt: Define more math functions.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 54bd7e655a4c21d769f6f57402ea38b6b8c8ac3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bd7e655a4c21d769f6f574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 09:57:08 2019 +0200 include/msvcrt: Define more math functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 82 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c539ebe..b82961e 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -70,6 +70,9 @@ double __cdecl ldexp(double, int); double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); +double __cdecl fmin(double, double); +double __cdecl fmax(double, double); +double __cdecl erf(double); double __cdecl _hypot(double, double); double __cdecl _j0(double); @@ -98,7 +101,16 @@ long __cdecl lrintf(float); long __cdecl lround(double); long __cdecl lroundf(float); -#if defined(__x86_64__) || defined(__arm__) +double __cdecl _copysign (double, double); +double __cdecl _chgsign (double); +double __cdecl _scalb(double, __msvcrt_long); +double __cdecl _logb(double); +double __cdecl _nextafter(double, double); +int __cdecl _finite(double); +int __cdecl _isnan(double); +int __cdecl _fpclass(double); + +#ifndef __i386__ float __cdecl sinf(float); float __cdecl cosf(float); @@ -121,41 +133,57 @@ float __cdecl sqrtf(float); float __cdecl ceilf(float); float __cdecl floorf(float); float __cdecl fabsf(float); -float __cdecl ldexpf(float, int); float __cdecl frexpf(float, int*); float __cdecl modff(float, float*); float __cdecl fmodf(float, float); +float __cdecl _copysignf(float, float); +float __cdecl _chgsignf(float); +float __cdecl _logbf(float); +int __cdecl _finitef(float); +int __cdecl _isnanf(float); +int __cdecl _fpclassf(float); + #else -#define sinf(x) ((float)sin((double)(x))) -#define cosf(x) ((float)cos((double)(x))) -#define tanf(x) ((float)tan((double)(x))) -#define sinhf(x) ((float)sinh((double)(x))) -#define coshf(x) ((float)cosh((double)(x))) -#define tanhf(x) ((float)tanh((double)(x))) -#define asinf(x) ((float)asin((double)(x))) -#define acosf(x) ((float)acos((double)(x))) -#define atanf(x) ((float)atan((double)(x))) -#define atan2f(x,y) ((float)atan2((double)(x), (double)(y))) -#define asinhf(x) ((float)asinh((double)(x))) -#define acoshf(x) ((float)acosh((double)(x))) -#define atanhf(x) ((float)atanh((double)(x))) -#define expf(x) ((float)exp((double)(x))) -#define logf(x) ((float)log((double)(x))) -#define log10f(x) ((float)log10((double)(x))) -#define powf(x,y) ((float)pow((double)(x), (double)(y))) -#define sqrtf(x) ((float)sqrt((double)(x))) -#define ceilf(x) ((float)ceil((double)(x))) -#define floorf(x) ((float)floor((double)(x))) -#define fabsf(x) ((float)fabs((double)(x))) -#define frexpf(x) ((float)frexp((double)(x))) -#define modff(x,y) ((float)modf((double)(x), (double*)(y))) -#define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) +static inline float sinf(float x) { return sin(x); } +static inline float cosf(float x) { return cos(x); } +static inline float tanf(float x) { return tan(x); } +static inline float sinhf(float x) { return sinh(x); } +static inline float coshf(float x) { return cosh(x); } +static inline float tanhf(float x) { return tanh(x); } +static inline float asinf(float x) { return asin(x); } +static inline float acosf(float x) { return acos(x); } +static inline float atanf(float x) { return atan(x); } +static inline float atan2f(float x, float y) { return atan2(x, y); } +static inline float asinhf(float x) { return asinh(x); } +static inline float acoshf(float x) { return acosh(x); } +static inline float atanhf(float x) { return atanh(x); } +static inline float expf(float x) { return exp(x); } +static inline float logf(float x) { return log(x); } +static inline float log10f(float x) { return log10(x); } +static inline float powf(float x, float y) { return pow(x, y); } +static inline float sqrtf(float x) { return sqrt(x); } +static inline float ceilf(float x) { return ceil(x); } +static inline float floorf(float x) { return floor(x); } +static inline float fabsf(float x) { return fabs(x); } +static inline float frexpf(float x, int *y) { return frexp(x, y); } +static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } +static inline float fmodf(float x, float y) { return fmod(x, y); } + +static inline float _copysignf(float x, float y) { return _copysign(x, y); } +static inline float _chgsignf(float x) { return _chgsign(x); } +static inline float _logbf(float x) { return _logb(x); } +static inline int _finitef(float x) { return _finite(x); } +static inline int _isnanf(float x) { return _isnan(x); } +static inline int _fpclassf(float x) { return _fpclass(x); } #endif -#define ldexpf(x,y) ((float)ldexp((double)(x),(y))) +static inline float ldexpf(float x, int y) { return ldexp(x, y); } + +#define copysign(x,y) _copysign(x,y) +#define copysignf(x,y) _copysignf(x,y) double __cdecl nearbyint(double); float __cdecl nearbyintf(float);

1 0