February 2023 - Wine-Commits

Max Figura : wined3d: Move the WINED3D_RS_MONOENABLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 0dfc9461052fedc9f287d1777e2cfab913b7e5be URL: https://gitlab.winehq.org/wine/wine/-/commit/0dfc9461052fedc9f287d1777e2cfa… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:15:55 2022 -0600 wined3d: Move the WINED3D_RS_MONOENABLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6cf8f50f2c2..cdf71270d8c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7d312aac65..477a6e9af34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4057,6 +4057,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); break; + case WINED3D_RS_MONOENABLE: + if (state->rs[WINED3D_RS_MONOENABLE]) + FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f8aeef017a..75b2a90d20a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 288cd40f3fc..a570bbb11b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_monoenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_MONOENABLE]) - FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); -} - static void state_rop2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_ROP2]) @@ -4770,7 +4764,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, @@ -5572,6 +5565,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) rs_holes[] = { { 1, 8}, + { 11, 11}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseAsyncContentLoadedEvent stub.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: c928ae56e42e9cccfaeb0228c272a9326c9f1910 URL: https://gitlab.winehq.org/wine/wine/-/commit/c928ae56e42e9cccfaeb0228c272a9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:35:20 2023 -0500 uiautomationcore: Add UiaRaiseAsyncContentLoadedEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 383c0b3d989..e0f9f71ce34 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -327,6 +327,16 @@ HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider return S_OK; } +/*********************************************************************** + * UiaRaiseAsyncContentLoadedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provider, + enum AsyncContentLoadedState async_content_loaded_state, double percent_complete) +{ + FIXME("(%p, %d, %f): stub\n", provider, async_content_loaded_state, percent_complete); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5c577dbfe07..5841523852a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -84,7 +84,7 @@ @ stub UiaPatternRelease #@ stub UiaProviderForNonClient @ stdcall UiaProviderFromIAccessible(ptr long long ptr) -@ stub UiaRaiseAsyncContentLoadedEvent +@ stdcall UiaRaiseAsyncContentLoadedEvent(ptr long double) @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index ef8e760ed4c..91944064ae5 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -476,6 +476,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provider, + enum AsyncContentLoadedState async_content_loaded_state, double percent_complete); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type,

1 0

Max Figura : wined3d: Move the WINED3D_RS_ANTIALIAS stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 8bb11da52861044fe8fc8fdf658ca74ce58ff8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/8bb11da52861044fe8fc8fdf658ca7… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 11:17:01 2022 -0600 wined3d: Move the WINED3D_RS_ANTIALIAS stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 13f4f8c024c..5d21c96c094 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_ANTIALIAS), {STATE_RENDER(WINED3D_RS_ANTIALIAS), state_nop}}, {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 133ddd1f96e..df2ac1c57df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4039,6 +4039,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_render_state(device, idx, state->rs[idx]); break; + case WINED3D_RS_ANTIALIAS: + if (state->rs[WINED3D_RS_ANTIALIAS]) + FIXME("Antialias not supported yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abfd86a6f72..6a15ab937b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_ANTIALIAS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9603a750028..e1d4cf946b0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1999,12 +1999,6 @@ static void state_stippledalpha(struct wined3d_context *context, const struct wi FIXME("Stippled Alpha not supported yet.\n"); } -static void state_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_ANTIALIAS]) - FIXME("Antialias not supported yet.\n"); -} - static void state_sample_mask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -4786,7 +4780,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ANTIALIAS), { STATE_RENDER(WINED3D_RS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, @@ -5593,8 +5586,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 1}, - { 3, 3}, + { 1, 3}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAPV stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 089ef6f38b574676f080fcc10b097007e51bddc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/089ef6f38b574676f080fcc10b0970… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:10:03 2022 -0600 wined3d: Move the WINED3D_RS_WRAPV stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 870fefcd0ec..6cf8f50f2c2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6099e6fffd7..b7d312aac65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4052,6 +4052,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); break; + case WINED3D_RS_WRAPV: + if (state->rs[WINED3D_RS_WRAPV]) + FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c314baa6696..3f8aeef017a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 52b408a4d84..288cd40f3fc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_wrapv(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_WRAPV]) - FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); -} - static void state_monoenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_MONOENABLE]) @@ -4774,7 +4768,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, @@ -5578,8 +5571,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 5}, - { 7, 8}, + { 1, 8}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Max Figura : wined3d: Move the WINED3D_RS_TEXTUREPERSPECTIVE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: c126a7eacd077fc9fa4ab040c51b688a7d7ba9fa URL: https://gitlab.winehq.org/wine/wine/-/commit/c126a7eacd077fc9fa4ab040c51b68… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:01:56 2022 -0600 wined3d: Move the WINED3D_RS_TEXTUREPERSPECTIVE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 3 +++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5d21c96c094..57f7996bbf9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df2ac1c57df..d8ad324471b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4044,6 +4044,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Antialias not supported yet.\n"); break; + case WINED3D_RS_TEXTUREPERSPECTIVE: + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a15ab937b8..e571a11b917 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1d4cf946b0..46880235f64 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4780,7 +4780,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, @@ -5586,7 +5585,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 3}, + { 1, 4}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAPU stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: ef4a893e2e1f6c70da831482c386999db77b5590 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef4a893e2e1f6c70da831482c38699… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:06:38 2022 -0600 wined3d: Move the WINED3D_RS_WRAPU stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 57f7996bbf9..870fefcd0ec 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8ad324471b..6099e6fffd7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4047,6 +4047,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_TEXTUREPERSPECTIVE: break; + case WINED3D_RS_WRAPU: + if (state->rs[WINED3D_RS_WRAPU]) + FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e571a11b917..c314baa6696 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 46880235f64..52b408a4d84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_wrapu(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_WRAPU]) - FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); -} - static void state_wrapv(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_WRAPV]) @@ -4780,7 +4774,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, @@ -5585,7 +5578,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 4}, + { 1, 5}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Paul Gofman : imm32: Disable cross thread access for ImmSetCompositionString().
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 9bcc90fb4bc81da21fc70e27e538c4349c7da388 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bcc90fb4bc81da21fc70e27e538c4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 3 20:15:48 2023 -0600 imm32: Disable cross thread access for ImmSetCompositionString(). --- dlls/imm32/imm.c | 6 ++++++ dlls/imm32/tests/imm32.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index fa2e0705db1..17061ae0034 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2377,6 +2377,9 @@ BOOL WINAPI ImmSetCompositionStringA( if (!data) return FALSE; + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + if (!(dwIndex == SCS_SETSTR || dwIndex == SCS_CHANGEATTR || dwIndex == SCS_CHANGECLAUSE || @@ -2432,6 +2435,9 @@ BOOL WINAPI ImmSetCompositionStringW( if (!data) return FALSE; + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + if (!(dwIndex == SCS_SETSTR || dwIndex == SCS_CHANGEATTR || dwIndex == SCS_CHANGECLAUSE || diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 75b5cde6c7b..496dc284fbc 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -984,6 +984,14 @@ static void test_ImmThreads(void) rc = ImmSetCompositionFontA(threadinfo.u_himc, &lf); ok(rc == 0, "ImmSetCompositionFont should fail\n"); + /* CompositionString */ + rc = ImmSetCompositionStringA(himc, SCS_SETSTR, "a", 2, NULL, 0); + ok(rc, "failed.\n"); + rc = ImmSetCompositionStringA(otherHimc, SCS_SETSTR, "a", 2, NULL, 0); + ok(!rc, "should fail.\n"); + rc = ImmSetCompositionStringA(threadinfo.u_himc, SCS_SETSTR, "a", 2, NULL, 0); + ok(!rc, "should fail.\n"); + /* CompositionWindow */ rc = ImmSetCompositionWindow(himc, &cf); ok(rc != 0, "ImmSetCompositionWindow failed\n");

1 0

Zebediah Figura : wined3d: Destroy objects belonging to wined3d_device_gl.completed_fence_id.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 97b836a938928ce714fd7cf430a97d5fbefd7df0 URL: https://gitlab.winehq.org/wine/wine/-/commit/97b836a938928ce714fd7cf430a97d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 16:59:14 2023 -0600 wined3d: Destroy objects belonging to wined3d_device_gl.completed_fence_id. Not just those belonging to earlier completed fences. completed_fence_id names the most recent fence to be completed. In essence, this fixes an off-by-one error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53217 --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0217e12d903..5574997bf05 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2726,7 +2726,7 @@ static void wined3d_context_gl_destroy_allocator_block(struct wined3d_context_gl struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); struct wined3d_retired_block_gl *r; - if (device_gl->completed_fence_id > fence_id) + if (device_gl->completed_fence_id >= fence_id) { wined3d_device_gl_free_memory(device_gl, block); TRACE("Freed block %p.\n", block);

1 0

Zebediah Figura : wined3d: Introduce wined3d_texture_get_swapchain().
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 302996efaebe7e1b03675bf208f0e274980b5b51 URL: https://gitlab.winehq.org/wine/wine/-/commit/302996efaebe7e1b03675bf208f0e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 19:36:09 2023 -0600 wined3d: Introduce wined3d_texture_get_swapchain(). --- dlls/wined3d/texture.c | 5 +++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8d416494eb8..33b938ad460 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4313,6 +4313,11 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINED3D_OK; } +struct wined3d_swapchain * CDECL wined3d_texture_get_swapchain(struct wined3d_texture *texture) +{ + return texture->swapchain; +} + void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 827ac295ddc..b22adf07c9c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -301,6 +301,7 @@ @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) +@ cdecl wined3d_texture_get_swapchain(ptr) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_release_dc(ptr long ptr) @ cdecl wined3d_texture_set_color_key(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f4ec2470bba..5d8a1156b21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2857,6 +2857,7 @@ struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_te HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx); +struct wined3d_swapchain * __cdecl wined3d_texture_get_swapchain(struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture,

1 0

Zebediah Figura : d3d11: Expand tests for IDXGIResource.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 80bb094e4a272a996fa63edb85cce2e11e4e2e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/80bb094e4a272a996fa63edb85cce2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 20:33:08 2023 -0600 d3d11: Expand tests for IDXGIResource. --- dlls/d3d11/tests/d3d11.c | 146 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 26 deletions(-)

1 0