January 2016 - Wine-commits

Pierre Schweitzer : mpr: Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A().
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 39ec97ea9dcba270bbea31a7eaa7b842bf1beb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ec97ea9dcba270bbea31a7e… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Jan 16 09:51:14 2016 +0100 mpr: Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 941cada..2b53f2a 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1487,11 +1487,12 @@ DWORD WINAPI WNetGetResourceParentW( LPNETRESOURCEW lpNetResource, DWORD WINAPI WNetAddConnectionA( LPCSTR lpRemoteName, LPCSTR lpPassword, LPCSTR lpLocalName ) { - FIXME( "(%s, %p, %s): stub\n", - debugstr_a(lpRemoteName), lpPassword, debugstr_a(lpLocalName) ); + NETRESOURCEA resourcesA; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + memset(&resourcesA, 0, sizeof(resourcesA)); + resourcesA.lpRemoteName = (LPSTR)lpRemoteName; + resourcesA.lpLocalName = (LPSTR)lpLocalName; + return WNetUseConnectionA(NULL, &resourcesA, lpPassword, NULL, 0, NULL, 0, NULL); } /********************************************************************* @@ -1515,11 +1516,8 @@ DWORD WINAPI WNetAddConnection2A( LPNETRESOURCEA lpNetResource, LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08X): stub\n", - lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(NULL, lpNetResource, lpPassword, lpUserID, dwFlags, + NULL, 0, NULL); } /********************************************************************* @@ -1540,11 +1538,8 @@ DWORD WINAPI WNetAddConnection3A( HWND hwndOwner, LPNETRESOURCEA lpNetResource, LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(hwndOwner, lpNetResource, lpPassword, lpUserID, + dwFlags, NULL, 0, NULL); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Add _crt_debugger_hook implementation.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ecfc10bbfb2124e01ea99ac6ccb979071913f716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfc10bbfb2124e01ea99ac6c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 13:53:19 2016 +0100 msvcrt: Add _crt_debugger_hook implementation. Based on a patch by Andrey Zhezherun. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 3 ++- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 3 ++- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 6afa042..65a73ad 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -30,7 +30,7 @@ @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) ucrtbase._crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex @ cdecl _errno() ucrtbase._errno diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d8627d2..39742aa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -745,7 +745,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bf82d30..dd23c75 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1093,8 +1093,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 69cb2c1..461b529 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1084,8 +1084,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1e4554f..425c839 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1038,8 +1038,8 @@ @ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) msvcr120._crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) msvcr120.__crt_debugger_hook @ cdecl _ctime32(ptr) msvcr120._ctime32 @ cdecl _ctime32_s(str long ptr) msvcr120._ctime32_s @ cdecl _ctime64(ptr) msvcr120._ctime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5107038..17af90b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -409,8 +409,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 30bfbcd..fd08455 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -392,7 +392,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 4e9f288..c1510ef 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -498,3 +498,11 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } + +/********************************************************************* + * _crt_debugger_hook (MSVCR80.@) + */ +void CDECL MSVCRT__crt_debugger_hook(int reserved) +{ + WARN("(%x)\n", reserved); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e65a1c0..e59e26f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -242,7 +242,7 @@ @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64

1 0

Akihiro Sagawa : comctl32/tests: Fix a typo.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: d1841f496b423afa0e29cd7da87cfd297e5e8054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1841f496b423afa0e29cd7da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jan 19 23:45:05 2016 +0900 comctl32/tests: Fix a typo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index acfcd20..2afa44d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -198,7 +198,7 @@ static const struct message forward_erasebkgnd_parent_seq[] = { { 0 } }; -static const struct message ownderdata_select_focus_parent_seq[] = { +static const struct message ownerdata_select_focus_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, { WM_NOTIFY, sent|id|optional, 0, 0, LVN_GETDISPINFOA }, /* version 4.7x */ @@ -3146,7 +3146,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata select notification", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3157,7 +3157,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); /* select all, check notifications */

1 0

Piotr Caban : msvcr120: Add _set_FMA3_enable stub.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 68fedc12681ecacc714c01e9a34266ef70e8d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fedc12681ecacc714c01e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 21:08:29 2016 +0100 msvcr120: Add _set_FMA3_enable stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/math.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 361e3d2..69cb2c1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,7 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -@ stub -arch=win64 _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fc88f03..0a3f2da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,6 +73,17 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + #if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /*********************************************************************

1 0

Piotr Caban : msvcr: Sync spec files.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: aae728eae99d706ab7f046bb07dbecf0a3428398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae728eae99d706ab7f046bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 11:45:24 2016 +0100 msvcr: Sync spec files. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 14 +++++++------- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-time-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 12c9ac8..2a2ed6e 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -55,7 +55,7 @@ @ stub _dexp @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) ucrtbase._dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) ucrtbase._dsign @@ -69,7 +69,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) ucrtbase._fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) ucrtbase._fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) ucrtbase._fdsign @@ -93,7 +93,7 @@ @ cdecl _ldclass(double) ucrtbase._ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) ucrtbase._ldpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) ucrtbase._ldsign @@ -117,7 +117,7 @@ @ cdecl -arch=arm,x86_64 _nextafterf(float float) ucrtbase._nextafterf @ cdecl _scalb(double long) ucrtbase._scalb @ cdecl -arch=arm,x86_64 _scalbf(float long) ucrtbase._scalbf -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) ucrtbase._set_FMA3_enable @ cdecl -arch=i386 _set_SSE2_enable(long) ucrtbase._set_SSE2_enable @ cdecl _y0(double) ucrtbase._y0 @ cdecl _y1(double) ucrtbase._y1 @@ -246,9 +246,9 @@ @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf @ cdecl fmaxl(double double) ucrtbase.fmaxl -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) ucrtbase.fmin +@ cdecl fminf(float float) ucrtbase.fminf +@ cdecl fminl(double double) ucrtbase.fminl @ cdecl fmod(double double) ucrtbase.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 568b4ef..d0adc14 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -104,7 +104,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) ucrtbase._mbsdec @ stub _mbsdec_l -@ stub _mbsdup +@ cdecl _mbsdup(str) ucrtbase._mbsdup @ cdecl _mbsicmp(str str) ucrtbase._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) ucrtbase._mbsicoll diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index b619703..80b79cb 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -56,9 +56,9 @@ @ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s @ stub _wcsftime_l @ cdecl _wctime32(ptr) ucrtbase._wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) ucrtbase._wctime32_s @ cdecl _wctime64(ptr) ucrtbase._wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) ucrtbase._wctime64_s @ cdecl _wstrdate(ptr) ucrtbase._wstrdate @ cdecl _wstrdate_s(ptr long) ucrtbase._wstrdate_s @ cdecl _wstrtime(ptr) ucrtbase._wstrtime diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3478342..e65a1c0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -255,7 +255,7 @@ @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) MSVCR120__dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) MSVCR120__dsign @@ -296,7 +296,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) MSVCR120__fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) MSVCR120__fdsign @@ -534,7 +534,7 @@ @ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) MSVCR120__dpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) MSVCR120__dsign @@ -623,7 +623,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l -@ stub _mbsdup +@ stub _mbsdup(str) @ cdecl _mbsicmp(str str) @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) @@ -1876,7 +1876,7 @@ @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s @ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter @ cdecl _seh_filter_exe(long ptr) _XcptFilter -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @@ -2057,9 +2057,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l @ stub _wctype @@ -2310,9 +2310,9 @@ @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) MSVCR120_fmin +@ cdecl fminf(float float) MSVCR120_fminf +@ cdecl fminl(double double) MSVCR120_fmin @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen

1 0

Józef Kucia : wined3d: Handle swizzle type equal to 0 as NOSWIZZLE.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 4235d59d29fa41677079d9012286a7ff18a48705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4235d59d29fa41677079d9012… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:42 2016 +0100 wined3d: Handle swizzle type equal to 0 as NOSWIZZLE. Just to silent unnecessary FIXME messages. 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> --- dlls/wined3d/shader_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 710434b..ae148da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -175,6 +175,7 @@ enum wined3d_sm4_input_primitive_type enum wined3d_sm4_swizzle_type { + WINED3D_SM4_SWIZZLE_NONE = 0x0, WINED3D_SM4_SWIZZLE_VEC4 = 0x1, WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; @@ -725,6 +726,10 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD switch (swizzle_type) { + case WINED3D_SM4_SWIZZLE_NONE: + src_param->swizzle = WINED3DSP_NOSWIZZLE; + break; + case WINED3D_SM4_SWIZZLE_SCALAR: src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; src_param->swizzle = (src_param->swizzle & 0x3) * 0x55;

1 0

Józef Kucia : wined3d: Fix destination swizzle in few SM4 instructions.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 0fb543bb719ce968065eb6c209cf8f82e76ad871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb543bb719ce968065eb6c20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:43 2016 +0100 wined3d: Fix destination swizzle in few SM4 instructions. 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> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index feaa9e3..51d2cce 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4324,7 +4324,7 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4339,7 +4339,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, NULL, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4356,7 +4356,7 @@ static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Allow both SM4 parameter modifiers simultaneously.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 9adf1c21b6dfd0ae6163da1cb62f80e4fb02a806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adf1c21b6dfd0ae6163da1cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:44 2016 +0100 wined3d: Allow both SM4 parameter modifiers simultaneously. It seems that negate and abs are the only source parameter modifiers allowed in SM 4 and 5. 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> --- dlls/wined3d/shader_sm4.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ae148da..f102ed1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -621,9 +621,6 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p { DWORD m = *(*ptr)++; - /* FIXME: This will probably break down at some point. The SM4 - * modifiers look like flags, while wined3d currently has an enum - * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */ switch (m) { case 0x41: @@ -634,6 +631,10 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *modifier = WINED3DSPSM_ABS; break; + case 0xc1: + *modifier = WINED3DSPSM_ABSNEG; + break; + default: FIXME("Skipping modifier 0x%08x.\n", m); *modifier = WINED3DSPSM_NONE;

1 0

Józef Kucia : wined3d: Recognize SM4 oDepth register.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: cf52e6c672f51bad0746b1cbeed778a7562e1cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf52e6c672f51bad0746b1cbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:45 2016 +0100 wined3d: Recognize SM4 oDepth register. 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> --- dlls/wined3d/shader_sm4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f102ed1..6972ea4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -154,6 +154,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_NULL = 0xd, }; @@ -336,7 +337,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ 0, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, };

1 0

Józef Kucia : wined3d: Implement SM4 imad instruction.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: c6223c29600bb60f0bd06c5c91a33ddf057f9288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6223c29600bb60f0bd06c5c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:46 2016 +0100 wined3d: Implement SM4 imad instruction. 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> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51d2cce..07a8fc4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7983,7 +7983,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_ILT */ NULL, - /* WINED3DSIH_IMAD */ NULL, + /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6972ea4..fb104fc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -282,7 +282,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, - {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "II"}, + {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "III"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"},

1 0