April 2024 - Wine-commits - list.winehq.org

Matteo Bruni : d3d9: Don't do instanced draws in DrawPrimitive() and DrawPrimitiveUP().
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 03321ea66a6d47b44dff9e8f302ae1e5a918531e URL: https://gitlab.winehq.org/wine/wine/-/commit/03321ea66a6d47b44dff9e8f302ae1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 13 21:14:52 2023 +0200 d3d9: Don't do instanced draws in DrawPrimitive() and DrawPrimitiveUP(). On Windows this behavior is hardware dependent. Setting instance_count to 0 makes all our d3d versions consistent in this regard and avoids triggering the FIXME() in wined3d:draw_primitive_immediate_mode(). --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1267dc8fca1..31dffbf4b60 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3176,7 +3176,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, wined3d_primitive_type_from_d3d(primitive_type), 0); /* Instancing is ignored for non-indexed draws. */ - wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 1); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3274,7 +3274,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_device_apply_stateblock(device->wined3d_device, device->state); /* Instancing is ignored for non-indexed draws. */ - wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 1); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device);

1 0

Matteo Bruni : wined3d: Don't skip FFP projection transform update.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 5f0d6afcd7b27b6af381d8c99ab9cb692933d09c URL: https://gitlab.winehq.org/wine/wine/-/commit/5f0d6afcd7b27b6af381d8c99ab9cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 13 21:31:37 2023 +0200 wined3d: Don't skip FFP projection transform update. In the same vein as e106bbdd39a5f27bce028ed992033eb0a5635f60. --- dlls/wined3d/ffp_gl.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index 8a87248de4f..e4c44f77609 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -3528,6 +3528,8 @@ static void transform_projection(struct wined3d_context *context, const struct w const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; struct wined3d_matrix projection; + TRACE("context %p, state %p, state_id %lu.\n", context, state, state_id); + gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); @@ -3558,6 +3560,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine BOOL wasrhw = context->last_was_rhw; unsigned int i; + TRACE("context %p, state %p, state_id %lu.\n", context, state, state_id); + transformed = context->stream_info.position_transformed; if (transformed != context->last_was_rhw && !useVertexShaderFunction) updateFog = TRUE; @@ -3574,25 +3578,12 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine * make sure they're properly set. */ if (!useVertexShaderFunction) { - /* TODO: Move this mainly to the viewport state and only apply when - * the vp has changed or transformed / untransformed was switched. */ if (wasrhw != context->last_was_rhw - && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)) && !isStateDirty(context, STATE_VIEWPORT)) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - /* World matrix needs reapplication here only if we're switching between rhw and non-rhw - * mode. - * - * If a vertex shader is used, the world matrix changed and then vertex shader unbound - * this check will fail and the matrix not applied again. This is OK because a simple - * world matrix change reapplies the matrix - These checks here are only to satisfy the - * needs of the vertex declaration. - * - * World and view matrix go into the same gl matrix, so only apply them when neither is - * dirty - */ - if (transformed != wasrhw && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))) - && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) + /* World matrix needs reapplication here only if we're switching + * between rhw and non-rhw mode. */ + if (transformed != wasrhw) transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_COLORVERTEX))) context_apply_state(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); @@ -3830,8 +3821,9 @@ static void viewport_miscpart_cc(struct wined3d_context *context, static void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) - transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + TRACE("context %p, state %p, state_id %lu.\n", context, state, state_id); + + transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) && state->render_states[WINED3D_RS_POINTSCALEENABLE]) state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE));

1 0

Matteo Bruni : wined3d: Don't override texture parameters for COND_NP2 on multisample textures.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 07228191d0550e9d18a2148c2bc5363a58f352d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/07228191d0550e9d18a2148c2bc536… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 14 23:10:09 2023 +0200 wined3d: Don't override texture parameters for COND_NP2 on multisample textures. Those parameters are not supported on multisample textures in the first place (basically, GL mandates ARB_sampler_objects for those). The combination COND_NP2 + ARB_texture_multisample is not expected to happen without wined3d configuration overrides. --- dlls/wined3d/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a531998ddd2..2fc6d5c06df 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1377,7 +1377,8 @@ GLuint wined3d_texture_gl_prepare_gl_texture(struct wined3d_texture_gl *texture_ gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2 && target != GL_TEXTURE_2D_MULTISAMPLE + && target != GL_TEXTURE_2D_MULTISAMPLE_ARRAY) { /* Conditional non power of two textures use a different clamping * default. If we're using the GL_WINE_normalized_texrect partial

1 0

Matteo Bruni : d3d9/tests: Skip test_sample_attached_rendertarget() without pixel shaders support.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: a518e5c98a713b3e291ea53f626fc19083e99354 URL: https://gitlab.winehq.org/wine/wine/-/commit/a518e5c98a713b3e291ea53f626fc1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 15 00:46:04 2023 +0200 d3d9/tests: Skip test_sample_attached_rendertarget() without pixel shaders support. --- dlls/d3d9/tests/visual.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20df3d29b1b..0d64081f7e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26877,6 +26877,7 @@ static void test_sample_attached_rendertarget(void) unsigned int color, i; IDirect3D9 *d3d; ULONG refcount; + D3DCAPS9 caps; BOOL is_warp; HWND window; HRESULT hr; @@ -26926,6 +26927,17 @@ static void test_sample_attached_rendertarget(void) return; } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No shader model 2 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_EVENT, NULL); if (hr == D3DERR_NOTAVAILABLE) {

1 0

Matteo Bruni : wined3d: Conditionally support WINED3D_FRAGMENT_CAP_SRGB_WRITE on the ffp fragment pipe.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: b5488e59e51ada82f2d85afc1b5f987c6bd8cd12 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5488e59e51ada82f2d85afc1b5f98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 15 02:22:40 2023 +0200 wined3d: Conditionally support WINED3D_FRAGMENT_CAP_SRGB_WRITE on the ffp fragment pipe. --- dlls/wined3d/ffp_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index e4c44f77609..8af67fc12df 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4819,6 +4819,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = { STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_srgbwrite }, ARB_FRAMEBUFFER_SRGB }, { STATE_RENDER(WINED3D_RS_SHADEMODE), { STATE_RENDER(WINED3D_RS_SHADEMODE), state_shademode }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, WINED3D_GL_EXT_NONE }, @@ -4897,6 +4898,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct | WINED3DTEXOPCAPS_SELECTARG1 | WINED3DTEXOPCAPS_SELECTARG2 | WINED3DTEXOPCAPS_DISABLE; + caps->srgb_write = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; if (gl_info->supported[ARB_TEXTURE_ENV_COMBINE] || gl_info->supported[EXT_TEXTURE_ENV_COMBINE]

1 0

Matteo Bruni : wined3d: Conditionally allow sRGB writes with the 'none' shader backend.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: b4692e945ee5dbc542b06d97937113308960615a URL: https://gitlab.winehq.org/wine/wine/-/commit/b4692e945ee5dbc542b06d97937113… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 15 02:26:57 2023 +0200 wined3d: Conditionally allow sRGB writes with the 'none' shader backend. --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index badd25ddebb..dcbc177d29e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3193,7 +3193,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - srgb_write = fragment_caps.srgb_write && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); + srgb_write = fragment_caps.srgb_write + && (!shader_caps.ps_version || (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)); for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) {

1 0

Piotr Caban : winhttp: Fix parameters validation in WinHttpGetProxyForUrl.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: ec65fd0ba19f2ec8e6b6ff3ea057aba947ca2e20 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec65fd0ba19f2ec8e6b6ff3ea057ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 25 19:47:19 2024 +0200 winhttp: Fix parameters validation in WinHttpGetProxyForUrl. --- dlls/winhttp/session.c | 23 +++++++++++------------ dlls/winhttp/tests/winhttp.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f6b4423600e..7860bf757f4 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2105,10 +2105,9 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTOPROXY_OPTIONS *options, WINHTTP_PROXY_INFO *info ) { - WCHAR *detected_pac_url = NULL; - const WCHAR *pac_url; + WCHAR *pac_url; struct session *session; - char *script; + char *script = NULL; DWORD size; BOOL ret = FALSE; @@ -2128,29 +2127,29 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO if (!url || !options || !info || !(options->dwFlags & (WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL)) || ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && !options->dwAutoDetectFlags) || - ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && - (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL)) || (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL && !options->lpszAutoConfigUrl)) { release_object( &session->hdr ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT && - !WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &detected_pac_url )) - goto done; + WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &pac_url )) + { + script = download_script( pac_url, &size ); + GlobalFree( pac_url ); + } - if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; - else pac_url = detected_pac_url; + if (!script && options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) + script = download_script( options->lpszAutoConfigUrl, &size ); - if ((script = download_script( pac_url, &size ))) + if (script) { ret = run_script( script, size, url, info, options->dwFlags ); free( script ); } -done: - GlobalFree( detected_pac_url ); release_object( &session->hdr ); if (ret) SetLastError( ERROR_SUCCESS ); return ret; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5810a516c68..1fb9dad115f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5415,6 +5415,21 @@ static void test_WinHttpGetProxyForUrl(int port) GlobalFree( info.lpszProxyBypass ); } + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; + options.lpszAutoConfigUrl = L"http://wpad/wpad.dat"; + + SetLastError(0xdeadbeef); + memset( &info, 0, sizeof(info) ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); + error = GetLastError(); + ok( error != ERROR_INVALID_PARAMETER, "got ERROR_INVALID_PARAMETER\n" ); + if (ret) + { + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); + } + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A;

1 0

Alexandre Julliard : taskschd: Use fully interpreted IDL stubs.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 24b48e1ea0fa0974faf33af7185301879b5591d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/24b48e1ea0fa0974faf33af7185301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:19:09 2024 +0200 taskschd: Use fully interpreted IDL stubs. --- dlls/taskschd/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index fcc39fd6f04..1910b0699df 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -2,6 +2,7 @@ MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 EXTRADLLFLAGS = -Wb,--prefer-native +EXTRAIDLFLAGS = -Oicf SOURCES = \ folder.c \

1 0

Alexandre Julliard : ntoskrnl.exe: Use fully interpreted IDL stubs.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: a87d52e22cf6600dfc3901cbc967c36fcf016e3e URL: https://gitlab.winehq.org/wine/wine/-/commit/a87d52e22cf6600dfc3901cbc967c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:19:52 2024 +0200 ntoskrnl.exe: Use fully interpreted IDL stubs. --- dlls/ntoskrnl.exe/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index a04a75e7f52..ebeb3ad3406 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt DELAYIMPORTS = rpcrt4 setupapi +EXTRAIDLFLAGS = -Oicf + SOURCES = \ instr.c \ ntoskrnl.c \

1 0

Alexandre Julliard : plugplay: Use fully interpreted IDL stubs.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: e26ed6bc9976ebd9ed50959c25272ae31feab790 URL: https://gitlab.winehq.org/wine/wine/-/commit/e26ed6bc9976ebd9ed50959c25272a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:20:05 2024 +0200 plugplay: Use fully interpreted IDL stubs. --- programs/plugplay/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index ce595a6d759..e39c39bf1aa 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -2,6 +2,7 @@ MODULE = plugplay.exe IMPORTS = advapi32 rpcrt4 user32 EXTRADLLFLAGS = -mconsole -municode +EXTRAIDLFLAGS = -Oicf SOURCES = \ main.c \

1 0