February 2020 - Wine-commits

Daniel Lehman : wintrust: Set last error in WinVerifyTrust.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 95a80d3585f7bc843edc902d2e9172ad5772af26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a80d3585f7bc843edc902d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 24 22:22:01 2020 -0800 wintrust: Set last error in WinVerifyTrust. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 10 ++++++++++ dlls/wintrust/wintrust_main.c | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5a150e684d..25d458faad 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -845,7 +845,9 @@ static void test_wintrust(void) file.pcwszFilePath = pathW; /* Test with an empty file */ file.hFile = create_temp_file(pathW); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); CloseHandle(file.hFile); @@ -853,18 +855,26 @@ static void test_wintrust(void) file.hFile = NULL; /* Test with a known file path, which we expect not have a signature */ getNotepadPath(pathW, MAX_PATH); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_VERIFY; + SetLastError(0xdeadbeef); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(hr == GetLastError(), "expected %08x, got %08x\n", GetLastError(), hr); ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index a0b8a137ed..768522ea4a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -732,6 +732,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) } } + if (err) SetLastError(err); TRACE("returning %08x\n", err); return err; }

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt swscanf and swscanf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 77be811dee24300021af89d43c0dea131923fd9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=77be811dee24300021af89d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:27:58 2020 +0100 corecrt_wstdio.h: Add ucrt swscanf and swscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 5b751b47f9..0a574ad8e0 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -78,8 +78,6 @@ wchar_t* __cdecl getws(wchar_t*); wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); -int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); -int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); @@ -98,6 +96,7 @@ _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t _ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswscanf(unsigned __int64,const wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { @@ -248,6 +247,28 @@ static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV swscanf_s(const wchar_t *buffer, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...) { int ret; @@ -282,8 +303,10 @@ _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va _ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...); @@ -304,8 +327,8 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); -_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); -_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); +_ACRTIMP int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); #endif /* _UCRT */

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wprintf and vwprintf declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 364baf5deb7a0559a5d56bd0af1582eb33b57780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364baf5deb7a0559a5d56bd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:08 2020 +0100 corecrt_wstdio.h: Add ucrt wprintf and vwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 0a574ad8e0..2dac0f9fa3 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,9 +79,7 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); -int WINAPIV wprintf(const wchar_t*,...); int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); int WINAPIV wscanf_s(const wchar_t*,...); @@ -247,6 +245,22 @@ static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int __cdecl vwprintf(const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV wprintf(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) { int ret; @@ -307,6 +321,8 @@ _ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int WINAPIV wprintf(const wchar_t*,...); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wprintf_s and vwprintf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 2a74488f4741c6cd007fca87039ba20b87b2a5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a74488f4741c6cd007fca87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:18 2020 +0100 corecrt_wstdio.h: Add ucrt wprintf_s and vwprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 2dac0f9fa3..91b65b9397 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,8 +79,6 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); -int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); int WINAPIV wscanf_s(const wchar_t*,...); @@ -261,6 +259,22 @@ static inline int WINAPIV wprintf(const wchar_t *format, ...) return ret; } +static inline int vwprintf_s(const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV wprintf_s(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = vfwprintf_s(stdout, format, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) { int ret; @@ -322,7 +336,9 @@ _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); _ACRTIMP int WINAPIV wprintf(const wchar_t*,...); +_ACRTIMP int WINAPIV wprintf_s(const wchar_t*,...); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wscanf and wscanf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 6b6c3ec7289bc8e631e4917bd6705c115e15acaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6c3ec7289bc8e631e4917b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:31 2020 +0100 corecrt_wstdio.h: Add ucrt wscanf and wscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 91b65b9397..3951a1c829 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,8 +79,6 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int WINAPIV wscanf(const wchar_t*,...); -int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT @@ -319,6 +317,28 @@ static inline int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int WINAPIV wscanf(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV wscanf_s(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -361,6 +381,8 @@ _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); _ACRTIMP int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); +_ACRTIMP int WINAPIV wscanf(const wchar_t*,...); +_ACRTIMP int WINAPIV wscanf_s(const wchar_t*,...); #endif /* _UCRT */

1 0

Jacek Caban : include: Add corecrt_wstring.h header.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: e52ca3d68b53ad03ac472d62c2970efe40142f2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e52ca3d68b53ad03ac472d62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 16:51:37 2020 +0100 include: Add corecrt_wstring.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wstring.h | 88 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 74 +-------------------------------- include/msvcrt/wchar.h | 59 +-------------------------- 4 files changed, 91 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e52ca3d68b53ad03ac47…

1 0

Gabriel Ivăncescu : vbscript: Return the item's disp when it does not have the SCRIPTITEM_CODEONLY flag, rather than the script dispatch.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 02022849663b093bde596984842b422b266180d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02022849663b093bde596984… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 24 15:44:35 2020 +0200 vbscript: Return the item's disp when it does not have the SCRIPTITEM_CODEONLY flag, rather than the script dispatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 4 +++- dlls/vbscript/tests/vbscript.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b0046cb3ae..27a4aee9bd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1527,7 +1527,9 @@ static HRESULT interp_me(exec_ctx_t *ctx) if(ctx->vbthis) disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; else if(ctx->code->named_item) - disp = (IDispatch*)&ctx->code->named_item->script_obj->IDispatchEx_iface; + disp = (ctx->code->named_item->flags & SCRIPTITEM_CODEONLY) + ? (IDispatch*)&ctx->code->named_item->script_obj->IDispatchEx_iface + : ctx->code->named_item->disp; else if(ctx->script->host_global) disp = ctx->script->host_global; else diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 19689b5f6d..8536ee1776 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1858,6 +1858,15 @@ static void test_named_items(void) hres = IActiveScript_GetScriptDispatch(script, L"visibleCodeItem", &disp); ok(hres == S_OK, "GetScriptDispatch returned: %08x\n", hres); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"visibleCodeItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == disp, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); IDispatch_Release(disp); SET_EXPECT(GetItemInfo_visible_code); @@ -1993,6 +2002,15 @@ static void test_named_items(void) CHECK_CALLED(OnLeaveScript); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"globalItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"codeOnlyItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == (IDispatch*)script_disp2,

1 0

Zebediah Figura : d3d8: Retrieve transform states from the primary stateblock.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: cc7d556212cc63032cfe82668892d26e9114c837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7d556212cc63032cfe8266… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:35 2020 -0600 d3d8: Retrieve transform states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5e18f64550..8ce38e2d9e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1636,7 +1636,7 @@ static HRESULT WINAPI d3d8_device_GetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix); + memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetTransform() and d3d8_device_MultiplyTransform().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: bc414af57ec69e7921061e28382aeec6f343c007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc414af57ec69e7921061e28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:36 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetTransform() and d3d8_device_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8ce38e2d9e..725286cd16 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1620,8 +1620,6 @@ static HRESULT WINAPI d3d8_device_SetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); - if (!device->recording) - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -1652,7 +1650,6 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); - wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Retrieve clip planes from the primary stateblock.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 7b20951ed41a657e6b0617d03169f8420cb6a7f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b20951ed41a657e6b0617d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:37 2020 -0600 d3d8: Retrieve clip planes from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0fcc8bd7a0..9bf92af7c9 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -131,7 +131,7 @@ struct d3d8_device DWORD in_destruction : 1; DWORD padding : 14; - unsigned int vs_uniform_count; + unsigned int max_user_clip_planes, vs_uniform_count; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 725286cd16..17ce954a7d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1829,15 +1829,20 @@ static HRESULT WINAPI d3d8_device_SetClipPlane(IDirect3DDevice8 *iface, DWORD in static HRESULT WINAPI d3d8_device_GetClipPlane(IDirect3DDevice8 *iface, DWORD index, float *plane) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); + if (index >= device->max_user_clip_planes) + { + TRACE("Plane %u requested, but only %u planes are supported.\n", index, device->max_user_clip_planes); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - hr = wined3d_device_get_clip_plane(device->wined3d_device, index, (struct wined3d_vec4 *)plane); + memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[index], sizeof(struct wined3d_vec4)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static void resolve_depth_buffer(struct d3d8_device *device) @@ -3710,6 +3715,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine } wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &device->state)))

1 0