December 2016 - Wine-commits

Piotr Caban : ucrtbase: Add __intrinsic_setjmp implementation.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 138fec0b534b39fa8e4983573be99605a34e0ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138fec0b534b39fa8e4983573… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 15:31:01 2016 -0600 ucrtbase: Add __intrinsic_setjmp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8683fc8c42095f23e26a76b978e1180b60e1048) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b77b73e..e71bd78 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aa4e7e0..8571295 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -93,7 +93,7 @@ @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index feb94ac..6c147ce 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -32,7 +32,7 @@ @ stub __TypeMatch @ stub __current_exception @ stub __current_exception_context -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure

1 0

Andrew Eikum : mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 6fbcd1db4a9e1d787bc1a978ad870d5af14f9f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbcd1db4a9e1d787bc1a978a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:22 2016 -0600 mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89de040e4f2567df48af1cfcad33c34e2a54d9cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- dlls/mmdevapi/devenum.c | 5 +++-- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 24 ++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 7dddbdf..a49d2e9 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -233,10 +233,15 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); + if (!mindb || !maxdb || !inc) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) @@ -273,17 +278,17 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + *ppv = &This->IAudioEndpointVolumeEx_iface; return S_OK; } diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1d838e3..f21019c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -596,8 +596,9 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2b40a05..b85c757 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -74,6 +74,6 @@ typedef struct MMDevice { } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 12e2156..4f8c848 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" +#include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 298c886..1476adc 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -39,6 +39,7 @@ #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -2242,6 +2243,28 @@ static void test_marshal(void) } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2306,7 @@ START_TEST(render) test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

Bruno Jesus : msvfw32/tests: Add tests for ICInfo().
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 065f67360e592ab005e04e09ec0083e73eca15a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065f67360e592ab005e04e09e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:53 2016 -0200 msvfw32/tests: Add tests for ICInfo(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90e4ad3b144b44805e21b8549129c29e75b797e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 125cac5..507d003 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -285,9 +285,47 @@ static void test_ICSeqCompress(void) ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } +todo_wine + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); + test_ICInfo(); }

1 0

Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: a4e39fcbf253a36b546219fc8fe2a8731364c14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e39fcbf253a36b546219fc8… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 22 03:52:55 2016 -0200 msvfw32: Use case insensitive compare in ICInfo for fourcc codes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02fa1d4cc2f99909d62565e1760bc0158e36d700) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 5 ++--- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4f1a2bf..6650b8f 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); - /* exact match of fccHandler or nth driver found */ - if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) - return FALSE; + if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) + return FALSE; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..0b0c9dc 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -306,14 +306,12 @@ static void test_ICInfo(void) if (fcc[0] & 0x20) { fcc[0] &= ~0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); } else { fcc[0] |= 0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); }

1 0

Piotr Caban : msvcrt: Add _fpieee_flt stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 63d80c3108322bb8795c5f5189c78d119e1bf490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d80c3108322bb8795c5f518… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:55 2016 +0200 msvcrt: Add _fpieee_flt stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc0e3d0a9c3ffa085d1cbcc53940d1876005af1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except_arm.c | 10 +++ dlls/msvcrt/except_i386.c | 11 +++ dlls/msvcrt/except_x86_64.c | 11 +++ dlls/msvcrt/msvcrt.h | 90 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 19 files changed, 137 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d80c3108322bb8795c5…

1 0

Piotr Caban : msvcrt: Support fdiv m64fp in i386 _fpieee_flt.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 4690483f6bb74a98cb2d5909a29da462ace7abbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4690483f6bb74a98cb2d5909a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:58:00 2016 +0200 msvcrt: Support fdiv m64fp in i386 _fpieee_flt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6ffb1d2cf4b86290e61e1c44c8e3c9179c4172d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/except_i386.c | 70 +++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 2103c1a..79d5a76 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1137,8 +1137,74 @@ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep, int (__cdecl *handler)(_FPIEEE_RECORD*)) { - FIXME("(%x %p %p) opcode: %x\n", exception_code, ep, handler, - *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + FLOATING_SAVE_AREA *ctx = &ep->ContextRecord->FloatSave; + _FPIEEE_RECORD rec; + int ret; + + TRACE("(%x %p %p)\n", exception_code, ep, handler); + + switch(exception_code) { + case STATUS_FLOAT_DIVIDE_BY_ZERO: + case STATUS_FLOAT_INEXACT_RESULT: + case STATUS_FLOAT_INVALID_OPERATION: + case STATUS_FLOAT_OVERFLOW: + case STATUS_FLOAT_UNDERFLOW: + break; + default: + return EXCEPTION_CONTINUE_SEARCH; + } + + memset(&rec, 0, sizeof(rec)); + rec.RoundingMode = ctx->ControlWord >> 10; + switch((ctx->ControlWord >> 8) & 0x3) { + case 0: rec.Precision = 2; break; + case 1: rec.Precision = 3; break; + case 2: rec.Precision = 1; break; + case 3: rec.Precision = 0; break; + } + rec.Status.InvalidOperation = ctx->StatusWord & 0x1; + rec.Status.ZeroDivide = ((ctx->StatusWord & 0x4) != 0); + rec.Status.Overflow = ((ctx->StatusWord & 0x8) != 0); + rec.Status.Underflow = ((ctx->StatusWord & 0x10) != 0); + rec.Status.Inexact = ((ctx->StatusWord & 0x20) != 0); + rec.Enable.InvalidOperation = ((ctx->ControlWord & 0x1) == 0); + rec.Enable.ZeroDivide = ((ctx->ControlWord & 0x4) == 0); + rec.Enable.Overflow = ((ctx->ControlWord & 0x8) == 0); + rec.Enable.Underflow = ((ctx->ControlWord & 0x10) == 0); + rec.Enable.Inexact = ((ctx->ControlWord & 0x20) == 0); + rec.Cause.InvalidOperation = rec.Enable.InvalidOperation & rec.Status.InvalidOperation; + rec.Cause.ZeroDivide = rec.Enable.ZeroDivide & rec.Status.ZeroDivide; + rec.Cause.Overflow = rec.Enable.Overflow & rec.Status.Overflow; + rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; + rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; + + TRACE("opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + + if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ + if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { + rec.Operand1.OperandValid = 1; + rec.Result.OperandValid = 0; + } else { + rec.Operand1.OperandValid = 0; + rec.Result.OperandValid = 1; + } + rec.Operand2.OperandValid = 1; + rec.Operation = _FpCodeDivide; + rec.Operand1.Format = _FpFormatFp80; + memcpy(&rec.Operand1.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + rec.Operand2.Format = _FpFormatFp64; + rec.Operand2.Value.Fp64Value = *(double*)ctx->DataOffset; + rec.Result.Format = _FpFormatFp80; + memcpy(&rec.Result.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + + ret = handler(&rec); + + if(ret == EXCEPTION_CONTINUE_EXECUTION) + memcpy(ctx->RegisterArea, &rec.Result.Value.Fp80Value, sizeof(rec.Operand1.Value.Fp80Value)); + return ret; + } + + FIXME("unsupported opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3ddd835..8dc2929 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1148,6 +1148,113 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_MASK (0x0007) typedef enum { + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, +} _FP_OPERATION_CODE; + +typedef enum { _FpFormatFp32, _FpFormatFp64, _FpFormatFp80,

1 0

Carlos Rafael Ramirez : cmd: When 'if' condition is not met, ignore the next commands in the list.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 488f314e918f5f44ee6a9f03bd39e69de5ba0b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488f314e918f5f44ee6a9f03b… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Mon Oct 31 18:57:33 2016 -0500 cmd: When 'if' condition is not met, ignore the next commands in the list. Signed-off-by: Carlos Rafael Ramirez <crramirez(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55be713d76bef86ba7577c810a9dbdfb071fc179) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 3 +++ programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++++++ 3 files changed, 27 insertions(+) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a444330..cfa1642 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1574,6 +1574,9 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + } else if (!processThese) { + if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + WINE_TRACE("Ignore the next command as well (next = %p)\n", *cmdList); } else { WINE_TRACE("Found end of this IF statement (next = %p)\n", *cmdList); break; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cf2559a..975a84b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -836,6 +836,17 @@ if 1 GEQ "10" (echo 1 GEQ "10") else echo foo if "1" GEQ "10" (echo 1 GEQ "10") else echo foo if '1' GEQ "10" (echo '1' GEQ "10") else echo foo if "10" GEQ "10" (echo "10" GEQ "10") +echo --- unconditional ampersand after if one line +if "0"=="0" echo 1 & echo 2 & echo 3 else echo 4 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 +echo --- +echo x & if "0"=="1" (echo 1 & echo 2 & echo 3) +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 else echo 4 +echo --- goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7543b53..d70aad3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -645,6 +645,19 @@ foo foo '1' GEQ "10" "10" GEQ "10" +--- unconditional ampersand after if one line +1(a)space@ +2(a)space@ +3 else echo 4 +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- ------------ Testing for ------------ --- plain FOR A

1 0

Józef Kucia : wined3d: Improve advertized driver version for Windows 10.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: a7d16673478f6fa385f4cb689140e5807643975d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d16673478f6fa385f4cb689… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:25 2016 +0100 wined3d: Improve advertized driver version for Windows 10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4315caeff699325cd681b9beb7d22908b098411b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 364082d..e02adb3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1145,7 +1145,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1521,6 +1521,11 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } break; + case 10: + driver_os_version = 10; + driver_model = DRIVER_MODEL_NT6X; + break; + default: FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0

Grazvydas Ignotas : wined3d: Add Polaris GPUs and their driver.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: e1b2c40be623a931154af5d65da05049e1b61db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b2c40be623a931154af5d65… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Mon Nov 14 00:10:00 2016 +0200 wined3d: Add Polaris GPUs and their driver. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c63e3261f37e8116e59c70b9bed20aa90c39e8a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e02adb3..e090694 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -45,6 +45,7 @@ enum wined3d_display_driver DRIVER_AMD_R100, DRIVER_AMD_R300, DRIVER_AMD_R600, + DRIVER_AMD_RX, DRIVER_INTEL_GMA800, DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, @@ -1146,6 +1147,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 17, 10, 1474}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1350,7 +1352,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, @@ -2071,6 +2075,9 @@ cards_intel[] = * These are returned but not handled: RC410, RV380. */ cards_amd_mesa[] = { + /* Polaris 10/11 */ + {"POLARIS10", CARD_AMD_RADEON_RX_480}, + {"POLARIS11", CARD_AMD_RADEON_RX_460}, /* Sea Islands */ {"HAWAII", CARD_AMD_RADEON_R9 }, {"KAVERI", CARD_AMD_RADEON_R7 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e83cc6..4725726 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1536,6 +1536,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_RX_460 = 0x67ef, + CARD_AMD_RADEON_RX_480 = 0x67df, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Piotr Caban : msvcr110: Add Concurrency::details:: _Condition_variable class stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: f60df433588f2315dfdf1375940f56ce825405d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60df433588f2315dfdf13759… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:06 2016 -0600 msvcr110: Add Concurrency::details::_Condition_variable class stub. Based on patch by Yifu Wang. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84bed7664c381637697f30f32f5b34787d9450da) Conflicts: dlls/concrt140/concrt140.spec Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 36 +++++++++++------------ dlls/msvcr120/msvcr120.spec | 36 +++++++++++------------ dlls/msvcr120_app/msvcr120_app.spec | 36 +++++++++++------------ dlls/msvcrt/lock.c | 58 +++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f60df433588f2315dfdf1…

1 0