wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Tim Clem : winebus.sys: Do not attempt to open keyboard and mouse HID devices on macOS.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 3985b7c599cd0036eb4e2aef14e1cf7cbb7ffdb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3985b7c599cd0036eb4e2aef14e1cf… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Feb 6 09:40:07 2024 -0800 winebus.sys: Do not attempt to open keyboard and mouse HID devices on macOS. Doing so triggers a permissions prompt for input monitoring. Patch originally by Rémi Bernon. --- dlls/winebus.sys/bus_iohid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 7c8c3cc3529..fdcd820e99e 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -276,6 +276,16 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * }; struct iohid_device *impl; CFStringRef str; + UINT usage_page, usage; + + usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); + usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); + + if (usage_page == HID_USAGE_PAGE_GENERIC && (usage == HID_USAGE_GENERIC_MOUSE || usage == HID_USAGE_GENERIC_KEYBOARD)) + { + TRACE("Ignoring mouse / keyboard device\n"); + return; + } desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey)));

1 0

Paul Gofman : explorer: Don't pop start menu on "undo minimize all windows" systray command.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 5da459f1f2471365bc98078be1a3a1f84ef1a3dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5da459f1f2471365bc98078be1a3a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 10:04:09 2024 -0600 explorer: Don't pop start menu on "undo minimize all windows" systray command. --- dlls/user32/tests/win.c | 5 +++++ programs/explorer/systray.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 26b1f0098dd..1b03e64181a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -13034,6 +13034,7 @@ static void test_WM_NCCALCSIZE(void) } #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 static void test_shell_tray(void) { @@ -13056,6 +13057,10 @@ static void test_shell_tray(void) flush_events( TRUE ); todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" ); + SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL_UNDO, 0xdeadbeef ); + flush_events( TRUE ); + ok( !IsIconic( hwnd ), "window is minimized.\n" ); + DestroyWindow(hwnd); } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 99a5a99490d..43187db30b5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 struct notify_data /* platform-independent format for NOTIFYICONDATA */ { @@ -1064,7 +1065,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP case WM_COMMAND: if (HIWORD(wparam) == BN_CLICKED) { - if (LOWORD(wparam) == TRAY_MINIMIZE_ALL) + if (LOWORD(wparam) == TRAY_MINIMIZE_ALL || LOWORD(wparam) == TRAY_MINIMIZE_ALL_UNDO) { FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) ); break;

1 0

Paul Gofman : explorer: Don't pop start menu on "minimize all windows" systray command.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: d66fe6206d950eeeabfcf408ae4d199a558150f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d66fe6206d950eeeabfcf408ae4d19… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 8 21:05:35 2024 -0600 explorer: Don't pop start menu on "minimize all windows" systray command. --- dlls/user32/tests/win.c | 29 ++++++++++++++++++++++++++++- programs/explorer/systray.c | 12 +++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8dad718e357..26b1f0098dd 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1796,7 +1796,7 @@ static void test_shell_window(void) WaitForSingleObject(hthread, INFINITE); - DeleteObject(hthread); + CloseHandle(hthread); CloseDesktop(hdesk); } @@ -13033,6 +13033,32 @@ static void test_WM_NCCALCSIZE(void) DestroyWindow(hwnd); } +#define TRAY_MINIMIZE_ALL 419 + +static void test_shell_tray(void) +{ + HWND hwnd, traywnd; + + if (!(traywnd = FindWindowA( "Shell_TrayWnd", NULL ))) + { + skip( "Shell_TrayWnd not found, skipping tests.\n" ); + return; + } + + hwnd = CreateWindowW( L"static", L"parent", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL ); + ok( !!hwnd, "failed, error %lu.\n", GetLastError() ); + flush_events( TRUE ); + + ok( !IsIconic( hwnd ), "window is minimized.\n" ); + + SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL, 0xdeadbeef ); + flush_events( TRUE ); + todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" ); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -13229,4 +13255,5 @@ START_TEST(win) test_topmost(); test_shell_window(); + test_shell_tray(); } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3b4e5bdc8ac..99a5a99490d 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); +#define TRAY_MINIMIZE_ALL 419 + struct notify_data /* platform-independent format for NOTIFYICONDATA */ { LONG hWnd; @@ -1060,7 +1062,15 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP break; case WM_COMMAND: - if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam ); + if (HIWORD(wparam) == BN_CLICKED) + { + if (LOWORD(wparam) == TRAY_MINIMIZE_ALL) + { + FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) ); + break; + } + click_taskbar_button( (HWND)lparam ); + } break; case WM_CONTEXTMENU:

1 0

Louis Lenders : wbemprox: Add property 'ClassGuid' to Win32_PnPEntity.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 988253a69bd0a48d027ba4e65ee735d9936d9144 URL: https://gitlab.winehq.org/wine/wine/-/commit/988253a69bd0a48d027ba4e65ee735… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Feb 6 09:05:13 2024 +0100 wbemprox: Add property 'ClassGuid' to Win32_PnPEntity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56291 --- dlls/wbemprox/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 38e6893792b..11bb2623f0d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -301,6 +301,7 @@ static const struct column col_physicalmemory[] = static const struct column col_pnpentity[] = { { L"Caption", CIM_STRING }, + { L"ClassGuid", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, @@ -755,6 +756,7 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *caption; + const WCHAR *class_guid; const WCHAR *device_id; const WCHAR *manufacturer; const WCHAR *name; @@ -3176,11 +3178,13 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * idx = 0; while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) { - WCHAR device_id[MAX_PATH]; + WCHAR device_id[MAX_PATH], guid[GUID_SIZE]; if (SetupDiGetDeviceInstanceIdW( device_info_set, &devinfo, device_id, ARRAY_SIZE(device_id), NULL )) { + StringFromGUID2( &devinfo.ClassGuid, guid, ARRAY_SIZE(guid) ); rec->caption = L"Wine PnP Device"; + rec->class_guid = wcsdup( wcslwr(guid) ); rec->device_id = wcsdup( device_id ); rec->manufacturer = L"The Wine Project"; rec->name = L"Wine PnP Device";

1 0

Zebediah Figura : wined3d/arb: Compare the fragment pipe ops in shader_arb_select() instead of using an extra field.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: de5a07b20bd00c66528570400416e9eadac0cf9c URL: https://gitlab.winehq.org/wine/wine/-/commit/de5a07b20bd00c66528570400416e9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 11:20:25 2023 -0600 wined3d/arb: Compare the fragment pipe ops in shader_arb_select() instead of using an extra field. Matches what's done in the GLSL shader backend. --- dlls/wined3d/arb_program_shader.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c89c2e848a6..eecbe1c22b1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -271,7 +271,6 @@ struct shader_arb_priv { const struct arb_ps_compiled_shader *compiled_fprog; const struct arb_vs_compiled_shader *compiled_vprog; - BOOL use_arbfp_fixed_func; struct wine_rb_tree fragment_shaders; BOOL last_ps_const_clamped; BOOL last_vs_color_unclamp; @@ -4677,7 +4676,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } else { - if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && !priv->use_arbfp_fixed_func) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && context->device->adapter->fragment_pipe != &arbfp_fragment_pipeline) { /* Disable only if we're not using arbfp fixed function fragment * processing. If this is used, keep GL_FRAGMENT_PROGRAM_ARB @@ -5759,15 +5758,13 @@ static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend /* Share private data between the shader backend and the pipeline * replacement, if both are the arb implementation. This is needed to - * figure out whether ARBfp should be disabled if no pixel shader is bound - * or not. */ + * invalidate some data when switching between FFP and fragment shaders. */ if (shader_backend == &arb_program_shader_backend) priv = shader_priv; else if (!(priv = heap_alloc_zero(sizeof(*priv)))) return NULL; wine_rb_init(&priv->fragment_shaders, wined3d_ffp_frag_program_key_compare); - priv->use_arbfp_fixed_func = TRUE; return priv; } @@ -5792,7 +5789,6 @@ static void arbfp_free(struct wined3d_device *device, struct wined3d_context *co struct shader_arb_priv *priv = device->fragment_priv; wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, context_gl); - priv->use_arbfp_fixed_func = FALSE; if (device->shader_backend != &arb_program_shader_backend) heap_free(device->fragment_priv);

1 0

Zebediah Figura : wined3d/arb: Always disable the fragment pipeline in shader_arb_select().
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 37d909e0076fef93dec10ea7b7c3e06a4cef7c97 URL: https://gitlab.winehq.org/wine/wine/-/commit/37d909e0076fef93dec10ea7b7c3e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 11:16:14 2023 -0600 wined3d/arb: Always disable the fragment pipeline in shader_arb_select(). The original intent here seems to have been to avoid disabling GL_FRAGMENT_PROGRAM_ARB only to reënable it again. There is not actually any harm in this, however. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ee693924a24..c89c2e848a6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4639,10 +4639,10 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId);"); - if (!priv->use_arbfp_fixed_func) - priv->fragment_pipe->fp_enable(context, FALSE); + priv->fragment_pipe->fp_enable(context, FALSE); - /* Enable OpenGL fragment programs. */ + /* Enable OpenGL fragment programs. Note that we may have already + * disabled them when disabling the fragment pipeline. */ gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");

1 0

Zebediah Figura : wined3d/glsl: Pass through the specular varying when SPECULARENABLE is FALSE.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 4ed7bb35ed8516203d530dea18fbd75158fd49b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ed7bb35ed8516203d530dea18fbd7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 17:23:29 2023 -0500 wined3d/glsl: Pass through the specular varying when SPECULARENABLE is FALSE. --- dlls/d3d8/tests/visual.c | 4 ++-- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++------------------ dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c605b53606c..b40743f0cbb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12342,7 +12342,7 @@ static void test_specular_shaders(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == S_OK, "Got hr %#lx.\n", hr); - check_rt_color_todo(context.backbuffer, 0x00007f00); + check_rt_color(context.backbuffer, 0x00007f00); hr = IDirect3DDevice8_BeginScene(device); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -12352,7 +12352,7 @@ static void test_specular_shaders(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == S_OK, "Got hr %#lx.\n", hr); - check_rt_color_todo(context.backbuffer, 0x00007f00); + check_rt_color(context.backbuffer, 0x00007f00); /* Vertex shader and pixel shader. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9fae11aec30..bc4053e21de 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1359,17 +1359,8 @@ static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (state->render_states[WINED3D_RS_SPECULARENABLE]) - { - GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, &state->material.specular.r)); - GL_EXTCALL(glUniform1f(prog->vs.material_shininess_location, state->material.power)); - } - else - { - static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; - - GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, black)); - } + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, &state->material.specular.r)); + GL_EXTCALL(glUniform1f(prog->vs.material_shininess_location, state->material.power)); GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); GL_EXTCALL(glUniform4fv(prog->vs.material_emissive_location, 1, &state->material.emissive.r)); @@ -8881,9 +8872,10 @@ static void shader_glsl_ffp_vertex_lighting_footer(struct wined3d_string_buffer shader_addline(buffer, "t = dot(normal, ffp_normalize(dir - ffp_normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, ffp_normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (dot(dir, normal) > 0.0 && t > 0.0%s) specular +=" - " pow(t, ffp_material.shininess) * ffp_light[%u].specular * att;\n", - legacy_lighting ? " && ffp_material.shininess > 0.0" : "", idx); + if (settings->specular_enable) + shader_addline(buffer, "if (dot(dir, normal) > 0.0 && t > 0.0%s) specular +=" + " pow(t, ffp_material.shininess) * ffp_light[%u].specular * att;\n", + legacy_lighting ? " && ffp_material.shininess > 0.0" : "", idx); } static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer, @@ -8901,10 +8893,12 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "vec3 ambient = ffp_light_ambient;\n"); shader_addline(buffer, "vec3 diffuse = vec3(0.0);\n"); - shader_addline(buffer, "vec4 specular = vec4(0.0);\n"); shader_addline(buffer, "vec3 dir, dst;\n"); shader_addline(buffer, "float att, t;\n"); + if (settings->specular_enable) + shader_addline(buffer, "vec4 specular = vec4(0.0);\n"); + ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); @@ -9006,7 +9000,10 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "ffp_varying_diffuse.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n", ambient, diffuse, emissive); shader_addline(buffer, "ffp_varying_diffuse.w = %s.w;\n", diffuse); - shader_addline(buffer, "ffp_varying_specular = %s * specular;\n", specular); + if (settings->specular_enable) + shader_addline(buffer, "ffp_varying_specular = %s * specular;\n", specular); + else + shader_addline(buffer, "ffp_varying_specular = ffp_attrib_specular;\n"); } /* Context activation is done by the caller. */ @@ -11917,8 +11914,7 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = {STATE_SHADER(WINED3D_SHADER_TYPE_HULL), {STATE_SHADER(WINED3D_SHADER_TYPE_HULL), glsl_vertex_pipe_hs }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), {STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), glsl_vertex_pipe_geometry_shader}, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_vertex_pipe_pixel_shader}, WINED3D_GL_EXT_NONE }, - {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), glsl_vertex_pipe_material}, WINED3D_GL_EXT_NONE }, + {STATE_MATERIAL, {STATE_MATERIAL, glsl_vertex_pipe_material}, WINED3D_GL_EXT_NONE }, /* Clip planes */ {STATE_CLIPPLANE(0), {STATE_CLIPPLANE(0), glsl_vertex_pipe_clip_plane}, WINED3D_GLSL_130 }, {STATE_CLIPPLANE(0), {STATE_CLIPPLANE(0), clipplane }, WINED3D_GL_EXT_NONE }, @@ -11996,6 +11992,7 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_AMBIENTMATERIALSOURCE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_EMISSIVEMATERIALSOURCE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_VERTEXBLEND), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 464317f0043..6b9617d990b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6749,6 +6749,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; + settings->specular_enable = !!state->render_states[WINED3D_RS_SPECULARENABLE]; settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 549a2aa7a7a..474a31a9206 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2761,7 +2761,8 @@ struct wined3d_ffp_vs_settings DWORD texcoords : 8; /* WINED3D_MAX_FFP_TEXTURES */ DWORD ortho_fog : 1; DWORD flatshading : 1; - DWORD padding : 18; + DWORD specular_enable : 1; + DWORD padding : 17; DWORD swizzle_map; /* MAX_ATTRIBS, 32 */

1 0

Zebediah Figura : wined3d/glsl: Always set WINED3D_SHADER_CONST_FFP_LIGHTS in FFP constant update masks.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: b5a252bcec42cb9168f7e1c85a432fa6d158299f URL: https://gitlab.winehq.org/wine/wine/-/commit/b5a252bcec42cb9168f7e1c85a432f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 17:12:43 2023 -0500 wined3d/glsl: Always set WINED3D_SHADER_CONST_FFP_LIGHTS in FFP constant update masks. It is possible (if somewhat artificial) to use lighting without using ambient lighting. In this case ffp_light_ambient may not be an active uniform. We could be more sophisticated here, and add lighting to the mask if we use any lighting uniform, but this is simpler and probably good enough. --- dlls/d3d8/tests/visual.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f6217e5f400..c605b53606c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12325,13 +12325,13 @@ static void test_specular_shaders(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); get_surface_readback(context.backbuffer, &rb); color = get_readback_color(&rb, 160, 120); - todo_wine ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); + ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); color = get_readback_color(&rb, 480, 120); - todo_wine ok(color_match(color, 0x001900, 1), "Got color %08x.\n", color); + ok(color_match(color, 0x001900, 1), "Got color %08x.\n", color); color = get_readback_color(&rb, 160, 360); - todo_wine ok(color_match(color, 0x009900, 1), "Got color %08x.\n", color); + ok(color_match(color, 0x009900, 1), "Got color %08x.\n", color); color = get_readback_color(&rb, 480, 360); - todo_wine ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); + ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); release_surface_readback(&rb); hr = IDirect3DDevice8_BeginScene(device); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4141a39b00f..9fae11aec30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10595,7 +10595,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, else { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW - | WINED3D_SHADER_CONST_FFP_PROJ; + | WINED3D_SHADER_CONST_FFP_PROJ | WINED3D_SHADER_CONST_FFP_LIGHTS; for (i = 1; i < MAX_VERTEX_BLENDS; ++i) { @@ -10619,8 +10619,6 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, || entry->vs.material_emissive_location != -1 || entry->vs.material_shininess_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; - if (entry->vs.light_ambient_location != -1) - entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_LIGHTS; } if (entry->vs.clip_planes_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_CLIP_PLANES;

1 0

Zebediah Figura : d3d8/tests: Add more tests for SPECULARENABLE.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 4171fdf4d7e71e94c6d17694d43c5657ff248b0f URL: https://gitlab.winehq.org/wine/wine/-/commit/4171fdf4d7e71e94c6d17694d43c56… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 17:04:43 2023 -0500 d3d8/tests: Add more tests for SPECULARENABLE. Show that it affects both the vertex and fragment FFP pipelines. --- dlls/d3d8/tests/visual.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 88bbaebb033..f6217e5f400 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12188,6 +12188,200 @@ static void test_mipmap_upload(void) release_test_context(&context); } +static void test_specular_shaders(void) +{ + struct d3d8_test_context context; + struct surface_readback rb; + IDirect3DDevice8 *device; + unsigned int color; + DWORD vs, ps; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + vs_1_1 + mov oPos, v0 + mov oD0, v5 + mov oD1, v6 +#endif + 0xfffe0101, + 0x00000001, 0xc00f0000, 0x90e40000, + 0x00000001, 0xd00f0000, 0x90e40005, + 0x00000001, 0xd00f0001, 0x90e40006, + 0x0000ffff + }; + + static const DWORD ps_code[] = + { +#if 0 + ps_1_1 + mov r0, v1 +#endif + 0xffff0101, + 0x00000001, 0x800f0000, 0x90e40001, + 0x0000ffff + }; + + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_FLOAT3), + D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), + D3DVSD_REG(D3DVSDE_SPECULAR, D3DVSDT_D3DCOLOR), + D3DVSD_END() + }; + + static const struct + { + struct vec3 position; + struct vec3 normal; + unsigned int diffuse; + unsigned int specular; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, 0x0000003f, 0x00007f00}, + {{-1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, 0x0000003f, 0x00007f00}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, 0x0000003f, 0x00007f00}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, 0x0000003f, 0x00007f00}, + }; + + static const D3DMATERIAL8 material = + { + .Specular = {0.7f, 0.0f, 0.7f, 1.0f}, + .Power = 2.0f, + }; + + static const D3DLIGHT8 light = + { + .Type = D3DLIGHT_DIRECTIONAL, + .Diffuse = {0.0f, 0.1f, 0.1f, 0.0f}, + .Specular = {0.8f, 0.8f, 0.8f, 0.0f}, + .Direction = {0.0f, 0.0f, -1.0f}, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + /* Vertex shader only. */ + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_code, &vs, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color(context.backbuffer, 0x00007f3f); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color(context.backbuffer, 0x0000003f); + + hr = IDirect3DDevice8_CreatePixelShader(device, ps_code, &ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Pixel shader only. */ + + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_SetMaterial(device, &material); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetLight(device, 0, &light); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + get_surface_readback(context.backbuffer, &rb); + color = get_readback_color(&rb, 160, 120); + todo_wine ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); + color = get_readback_color(&rb, 480, 120); + todo_wine ok(color_match(color, 0x001900, 1), "Got color %08x.\n", color); + color = get_readback_color(&rb, 160, 360); + todo_wine ok(color_match(color, 0x009900, 1), "Got color %08x.\n", color); + color = get_readback_color(&rb, 480, 360); + todo_wine ok(color_match(color, 0x003300, 1), "Got color %08x.\n", color); + release_surface_readback(&rb); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color_todo(context.backbuffer, 0x00007f00); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color_todo(context.backbuffer, 0x00007f00); + + /* Vertex shader and pixel shader. */ + + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color(context.backbuffer, 0x00007f00); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_rt_color(context.backbuffer, 0x00007f00); + + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -12271,4 +12465,5 @@ START_TEST(visual) test_filling_convention(); test_managed_reset(); test_mipmap_upload(); + test_specular_shaders(); }

1 0

Rémi Bernon : mf/tests: Add some tests with video processor aperture handling.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 604bc7ccf93bd19247742c2116425109b4a36c5e URL: https://gitlab.winehq.org/wine/wine/-/commit/604bc7ccf93bd19247742c21164251… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 23:33:13 2024 +0100 mf/tests: Add some tests with video processor aperture handling. --- dlls/mf/tests/transform.c | 55 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 977e819cdf8..468239b0fd4 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -692,19 +692,21 @@ static void check_mft_set_input_type_required_(int line, IMFTransform *transform ok_(__FILE__, line)(!ref, "Release returned %lu\n", ref); } -static void check_mft_set_input_type(IMFTransform *transform, const struct attribute_desc *attributes) +#define check_mft_set_input_type(a, b) check_mft_set_input_type_(__LINE__, a, b, FALSE) +static void check_mft_set_input_type_(int line, IMFTransform *transform, const struct attribute_desc *attributes, BOOL todo) { IMFMediaType *media_type; HRESULT hr; hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr); init_media_type(media_type, attributes, -1); hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "SetInputType returned %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine_if(todo) + ok_(__FILE__, line)(hr == S_OK, "SetInputType returned %#lx.\n", hr); IMFMediaType_Release(media_type); } @@ -7349,6 +7351,28 @@ static void test_video_processor(void) ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), {0}, }; + const struct attribute_desc nv12_no_aperture[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_FRAME_SIZE, 82, 84), + {0}, + }; + const struct attribute_desc nv12_with_aperture[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + {0}, + }; + const struct attribute_desc rgb32_no_aperture[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), + ATTR_RATIO(MF_MT_FRAME_SIZE, 82, 84), + {0}, + }; const MFT_OUTPUT_STREAM_INFO initial_output_info = {0}; const MFT_INPUT_STREAM_INFO initial_input_info = {0}; MFT_OUTPUT_STREAM_INFO output_info = {0}; @@ -7910,6 +7934,29 @@ static void test_video_processor(void) ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %ld\n", ret); + + /* check that it is possible to change input media type frame size using geometric aperture */ + + hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, + &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "got hr %#lx\n", hr); + + check_mft_set_input_type(transform, nv12_no_aperture); + check_mft_get_input_current_type(transform, nv12_no_aperture); + + check_mft_set_output_type(transform, rgb32_no_aperture, S_OK); + check_mft_get_output_current_type(transform, rgb32_no_aperture); + + check_mft_set_input_type_(__LINE__, transform, nv12_with_aperture, TRUE); + check_mft_get_input_current_type_(__LINE__, transform, nv12_with_aperture, TRUE, FALSE); + + /* output type is the same as before */ + check_mft_get_output_current_type(transform, rgb32_no_aperture); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %ld\n", ret); + + failed: winetest_pop_context(); CoUninitialize();

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
72
Older →

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 February 2024