wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : hidclass.sys: Don't reset the report count when recording a main item.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 4c1ff566dd22a16f30f978754d6f82ce50fb79ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1ff566dd22a16f30f97875… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 16 21:18:05 2020 -0500 hidclass.sys: Don't reset the report count when recording a main item. The report count is global and should be preserved. This fixes the Logitech Extreme 3D Pro controller when used with hidraw. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 876369ad70..56e4da4ad1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -505,7 +505,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_INPUT: case TAG_MAIN_OUTPUT: case TAG_MAIN_FEATURE: - for (j = 0; caps->ReportCount; j++) + for (j = 0; j < caps->ReportCount; j++) { feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); @@ -520,13 +520,13 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->u.NotRange.Usage = usages[j]; feature->caps = *caps; feature->caps.ReportCount = 1; - caps->ReportCount--; feature->collection = collection; if (j+1 >= usages_top) + { + feature->caps.ReportCount += caps->ReportCount - (j + 1); break; + } } - if (caps->ReportCount) - feature->caps.ReportCount += caps->ReportCount; usages_top = 0; new_caps(caps); break;

1 0

Serge Gautherie : advapi32: Fix 3 comments about pdwReserved and dwFlags.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 2df16753f0008099e119f39469badd10e7450bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df16753f0008099e119f394… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 18 16:27:08 2020 +0100 advapi32: Fix 3 comments about pdwReserved and dwFlags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index c4f69886d0..7199795b47 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -612,7 +612,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, * PARAMS * hProv [I] Handle to the CSP whose reference is being incremented. * pdwReserved [IN] Reserved for future use and must be NULL. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE @@ -735,7 +735,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) * hProv [I] Handle of a CSP. * Algid [I] Identifies the hash algorithm to use. * hKey [I] Key for the hash (if required). - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * phHash [O] Address of the future handle to the new hash object. * * RETURNS @@ -970,7 +970,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey) * * PARAMS * hHash [I] Handle to the hash to be copied. - * pdwReserved [I] Reserved for future use and must be zero. + * pdwReserved [I] Reserved for future use and must be NULL. * dwFlags [I] Reserved for future use and must be zero. * phHash [O] Address of the handle to receive the copy. *

1 0

Jacek Caban : ucrtbase/tests: Use ucrtbase functions directly in string.c.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 02cc47c141d00797fa21c83bd7370e7ad0ccfdb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02cc47c141d00797fa21c83b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:41 2020 +0100 ucrtbase/tests: Use ucrtbase functions directly in string.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 168 +++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02cc47c141d00797fa21…

1 0

Jacek Caban : memory.h: Add _memicmp_l declaration.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: e12fa1f341e4063b4f2819821375f3515b51ec0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12fa1f341e4063b4f281982… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:27 2020 +0100 memory.h: Add _memicmp_l declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstring.h | 1 + include/msvcrt/memory.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 8485716e30..10ab894328 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -21,6 +21,7 @@ _ACRTIMP errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); _ACRTIMP void* __cdecl memset(void*,int,size_t); _ACRTIMP void* __cdecl _memccpy(void*,const void*,int,unsigned int); _ACRTIMP int __cdecl _memicmp(const void*,const void*,unsigned int); +_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index 17677f47a8..21198e8f8b 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -24,6 +24,7 @@ errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); void* __cdecl memset(void*,int,size_t); void* __cdecl _memccpy(void*,const void*,int,unsigned int); int __cdecl _memicmp(const void*,const void*,unsigned int); +int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }

1 0

Jacek Caban : string.h: Add __strncnt declaration.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: d0d6e35eadfc23a11c2d644435ebcc0bedde8ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d6e35eadfc23a11c2d6444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:17 2020 +0100 string.h: Add __strncnt declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index f21cc73d9c..2beb429f03 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -19,6 +19,7 @@ extern "C" { #endif +_ACRTIMP size_t __cdecl __strncnt(const char*,size_t); _ACRTIMP int __cdecl _strcmpi(const char*,const char*); _ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t); _ACRTIMP char* __cdecl _strdup(const char*);

1 0

Jacek Caban : ctype.h: Add _to[w]lower_l and _to[w]upper_l declarations.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: e59970a60b0dc4e5510b3385f4685f20c8d2bb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e59970a60b0dc4e5510b3385… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:43:49 2020 +0100 ctype.h: Add _to[w]lower_l and _to[w]upper_l declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 2 ++ include/msvcrt/ctype.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index d090538fae..b9929383d0 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -24,6 +24,8 @@ extern "C" { #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ +wchar_t __cdecl _towlower_l(wchar_t,_locale_t); +wchar_t __cdecl _towupper_l(wchar_t,_locale_t); int __cdecl is_wctype(wint_t,wctype_t); int __cdecl isleadbyte(int); int __cdecl iswalnum(wint_t); diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index 00e77c959b..6b6cf07cd9 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,7 +24,9 @@ int __cdecl __iscsymf(int); int __cdecl __toascii(int); int __cdecl _isctype(int,int); int __cdecl _tolower(int); +int __cdecl _tolower_l(int,_locale_t); int __cdecl _toupper(int); +int __cdecl _toupper_l(int,_locale_t); int __cdecl isalnum(int); int __cdecl isalpha(int); int __cdecl iscntrl(int);

1 0

Gabriel Ivăncescu : jscript: Create separate script dispatches for each named item.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 23bc78c199eb523f45e4542979a2b0f93bf4cb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bc78c199eb523f45e45429… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:50 2020 +0200 jscript: Create separate script dispatches for each named item. 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/jscript/jscript.c | 13 +++++++++---- dlls/jscript/tests/jscript.c | 18 ------------------ 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index f54c34ab5a..31277c6fec 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,10 +110,15 @@ static inline BOOL is_started(script_ctx_t *ctx) HRESULT create_named_item_script_obj(script_ctx_t *ctx, named_item_t *item) { - /* FIXME: Create a separate script dispatch instead of using the global */ - item->script_obj = ctx->global; - IDispatchEx_AddRef(&item->script_obj->IDispatchEx_iface); - return S_OK; + static const builtin_info_t disp_info = { + JSCLASS_GLOBAL, + {NULL, NULL, 0}, + 0, NULL, + NULL, + NULL + }; + + return create_dispex(ctx, &disp_info, NULL, &item->script_obj); } static void release_named_item_script_obj(named_item_t *item) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 284390b860..d79b974e9b 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1203,7 +1203,6 @@ static void test_named_items(void) ok(dispex == dispex2, "get_script_dispatch returned different dispatch objects.\n"); IDispatchEx_Release(dispex2); dispex2 = get_script_dispatch(script, L"codeOnlyItem"); - todo_wine ok(dispex != dispex2, "get_script_dispatch returned same dispatch objects.\n"); SET_EXPECT(OnStateChange_INITIALIZED); @@ -1333,9 +1332,7 @@ static void test_named_items(void) id = 0; hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id); SysFreeString(bstr); } @@ -1345,9 +1342,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); id = 0; hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id); @@ -1381,12 +1376,9 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(GetIDsOfNames); - todo_wine CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); @@ -1496,9 +1488,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine_if(i != 0) ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine_if(i != 0) ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); SysFreeString(bstr); } @@ -1537,9 +1527,7 @@ static void test_named_items(void) bstr = SysAllocString(global_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id); SysFreeString(bstr); } @@ -1549,9 +1537,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine_if(i != 0) ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine_if(i != 0) ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); SysFreeString(bstr); } @@ -1579,10 +1565,8 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine_if(i != 0) ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); @@ -1590,10 +1574,8 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], L"codeOnlyItem", NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine_if(i != 0) ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); }

1 0

Gabriel Ivăncescu : jscript: Lookup and ref the named item's dispatch first, during interpretion.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 0cc48cfd87e698a304e882312b82f106447a390d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc48cfd87e698a304e88231… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:49 2020 +0200 jscript: Lookup and ref the named item's dispatch first, during interpretion. 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/jscript/engine.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 59f37779a1..896ba6067c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -669,6 +669,15 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } } + + if(ctx->call_ctx->bytecode->named_item) { + jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + hres = jsdisp_get_id(script_obj, identifier, 0, &id); + if(SUCCEEDED(hres)) { + exprval_set_disp_ref(ret, to_disp(script_obj), id); + return S_OK; + } + } } hres = jsdisp_get_id(ctx->global, identifier, 0, &id); @@ -1260,13 +1269,17 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return hres; if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + jsdisp_t *script_obj = ctx->global; DISPID id; - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(ctx->call_ctx->bytecode->named_item) + script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + + hres = jsdisp_get_id(script_obj, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) {

1 0

Gabriel Ivăncescu : jscript: Use the proper variable_obj for bytecodes with named items.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: b7ddcbbc18addf504d477cdc505af44259cc1e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ddcbbc18addf504d477cdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:48 2020 +0200 jscript: Use the proper variable_obj for bytecodes with named items. 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/jscript/engine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8914e760ed..59f37779a1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3030,6 +3030,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi }else if(!(flags & (EXEC_GLOBAL | EXEC_EVAL))) { hres = create_dispex(ctx, NULL, NULL, &variable_obj); if(FAILED(hres)) return hres; + }else if(bytecode->named_item) { + variable_obj = jsdisp_addref(bytecode->named_item->script_obj); }else { variable_obj = jsdisp_addref(ctx->global); }

1 0

Matteo Bruni : wined3d: Don't pass the whole context to needs_srgb_write().
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 4ff594e885cd999604d3f6cde67b38b3a83f7baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff594e885cd999604d3f6cd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:25 2020 +0100 wined3d: Don't pass the whole context to needs_srgb_write(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 633d5176ba..1c15c25859 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3414,7 +3414,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { - if (needs_srgb_write(&context_gl->c, state, fb)) + if (needs_srgb_write(context_gl->c.d3d_info, state, fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d645d201..0a0c4c526c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -426,7 +426,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); } - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context->d3d_info, state, fb)) { if (rt_count > 1) WARN("Clearing multiple sRGB render targets without GL_ARB_framebuffer_sRGB " diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3e2a756757..95db994ff3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3904,7 +3904,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb)) { static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fb55bfe0f3..b5d54db5b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4474,7 +4474,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (needs_srgb_write(context, state, state->fb)) + if (needs_srgb_write(context->d3d_info, state, state->fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54866da533..f3ed3b3cec 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6236,7 +6236,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8ee3c6446..db806adf71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5118,10 +5118,10 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context * return FALSE; } -static inline BOOL needs_srgb_write(const struct wined3d_context *context, +static inline BOOL needs_srgb_write(const struct wined3d_d3d_info *d3d_info, const struct wined3d_state *state, const struct wined3d_fb_state *fb) { - return (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + return (!(d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) || state->render_states[WINED3D_RS_SRGBWRITEENABLE]) && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020