March 2020 - Wine-commits - list.winehq.org

Vijay Kiran Kamuju : include: Add missing DPACCOUNTDESC to dplay.h.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 226c3196e48c6c0ba6dbc34b7bfb9e161da6ee93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=226c3196e48c6c0ba6dbc34b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 12:57:57 2020 +0100 include: Add missing DPACCOUNTDESC to dplay.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dplay.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/dplay.h b/include/dplay.h index 2294ba851f..70431db7f3 100644 --- a/include/dplay.h +++ b/include/dplay.h @@ -332,6 +332,19 @@ typedef struct tagDPSECURITYDESC typedef const DPSECURITYDESC *LPCDPSECURITYDESC; +typedef struct +{ + DWORD dwSize; + DWORD dwFlags; + union + { + LPWSTR lpszAccountID; + LPSTR lpszAccountIDA; + } DUMMYUNIONNAME; +} DPACCOUNTDESC, *LPDPACCOUNTDESC; + +typedef const DPACCOUNTDESC *LPCDPACCOUNTDESC; + typedef struct tagDPCREDENTIALS { DWORD dwSize; /* Size of structure */

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoOpenDeviceRegistryKey().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: bd00dedecd83935c45d32657dd8c60a44cd1c817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd00dedecd83935c45d32657… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 10:09:03 2020 -0500 ntoskrnl.exe: Implement IoOpenDeviceRegistryKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 29 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6b5b127a62..40341d8f0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -423,7 +423,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d53..75310f7b35 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -844,6 +844,35 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla return status; } +/*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCESS_MASK access, HANDLE *key ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + + if ((status = get_device_instance_id( device, device_instance_id ))) + { + ERR("Failed to get device instance ID, error %#x.\n", status); + return status; + } + + set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL ); + + SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ); + + *key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, type, access ); + SetupDiDestroyDeviceInfoList( set ); + if (*key == INVALID_HANDLE_VALUE) + return GetLastError(); + return STATUS_SUCCESS; +} + /*********************************************************************** * PoSetPowerState (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53ea9e17cf..b4325cec6c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1607,6 +1607,7 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL);

1 0

Nikolay Sivov : mf: Remove FIXME for zero buffer size, it's used as is.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 9e33f3f312a477df1fd9460e4977f3c7ad941b45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e33f3f312a477df1fd9460e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 16 12:19:21 2020 +0300 mf: Remove FIXME for zero buffer size, it's used as is. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e98be7c95f..07cfc4ee8c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2257,9 +2257,6 @@ static HRESULT transform_node_get_sample(struct topo_node *node, DWORD output, I { IMFMediaBuffer *buffer = NULL; - if (!stream_info.cbSize) - FIXME("Unhandled buffer size %u.\n", stream_info.cbSize); - hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer); if (SUCCEEDED(hr)) hr = MFCreateSample(&buffers[output].pSample);

1 0

Gabriel Ivăncescu : quartz: Clear the WS_CHILD style instead of unparenting the window.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 5c8903a0a9fcef947d958c93a7fa05f9faa3bcb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8903a0a9fcef947d958c93… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 16 18:54:51 2020 +0200 quartz: Clear the WS_CHILD style instead of unparenting the window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48732 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 4 ++++ dlls/quartz/window.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 01152c214a..f8b80dd23b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4380,11 +4380,15 @@ static void test_window_threading(void) else skip("Could not find renderer window.\n"); + SetActiveWindow(parent); expect_parent_message = FALSE; ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); expect_parent_message = TRUE; + hwnd = GetActiveWindow(); + ok(hwnd == parent, "Parent window lost focus, active window %p.\n", hwnd); + hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 0b0df136f2..4656bad8d6 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -136,14 +136,14 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { - BaseControlWindow *window = impl_from_BaseWindow(This); - if (!This->hWnd) return S_OK; - /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent - * the window first. */ - IVideoWindow_put_Owner(&window->IVideoWindow_iface, 0); + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so clear + * the child style first. Just like Windows, we don't actually unparent + * the window, to prevent extra focus events from being generated since + * it would become top-level for a brief period before being destroyed. */ + SetWindowLongW(This->hWnd, GWL_STYLE, GetWindowLongW(This->hWnd, GWL_STYLE) & ~WS_CHILD); SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL;

1 0

Matteo Bruni : wined3d: Get rid of the vertex sampler offset.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 038b561b104b96558f9ac8a106febaad262f7aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=038b561b104b96558f9ac8a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 16 21:23:33 2020 +0330 wined3d: Get rid of the vertex sampler offset. Do the offsetting in d3d9 instead. Notice that this also fixes vertex sampler handling in wined3d_stateblock_apply(), since it was using the adjusted "stage" to index the sampler_states[] array. (Coverity) 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/d3d9/device.c | 23 +++++++++++++---------- dlls/wined3d/device.c | 18 +++--------------- dlls/wined3d/stateblock.c | 14 +------------- include/wine/wined3d.h | 5 +---- 4 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4887dff45..85798db444 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2514,8 +2514,8 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st if (!texture) return D3DERR_INVALIDCALL; - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + if (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + stage -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; if (stage >= ARRAY_SIZE(state->textures)) { @@ -2550,20 +2550,20 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); + if (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + stage -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; + wined3d_mutex_lock(); wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); if (!device->recording) { - unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) - ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; - - if (i < D3D9_MAX_TEXTURE_UNITS) + if (stage < D3D9_MAX_TEXTURE_UNITS) { if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) - device->auto_mipmaps |= 1u << i; + device->auto_mipmaps |= 1u << stage; else - device->auto_mipmaps &= ~(1u << i); + device->auto_mipmaps &= ~(1u << stage); } } wined3d_mutex_unlock(); @@ -2656,8 +2656,8 @@ static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, TRACE("iface %p, sampler_idx %u, state %#x, value %p.\n", iface, sampler_idx, state, value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + if (sampler_idx >= D3DVERTEXTEXTURESAMPLER0 && sampler_idx <= D3DVERTEXTEXTURESAMPLER3) + sampler_idx -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; if (sampler_idx >= ARRAY_SIZE(device_state->sampler_states)) { @@ -2681,6 +2681,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev TRACE("iface %p, sampler %u, state %#x, value %#x.\n", iface, sampler, state, value); + if (sampler >= D3DVERTEXTEXTURESAMPLER0 && sampler <= D3DVERTEXTEXTURESAMPLER3) + sampler -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; + wined3d_mutex_lock(); wined3d_stateblock_set_sampler_state(device->update_state, sampler, state, value); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3d2d5124b..42d645d201 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1758,9 +1758,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", device, sampler_idx, debug_d3dsamplerstate(state), value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (value == device->state.sampler_states[sampler_idx][state]) { TRACE("Application is setting the old value over, nothing to do.\n"); @@ -3452,9 +3449,6 @@ static void wined3d_device_set_texture(struct wined3d_device *device, TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - /* Windows accepts overflowing this array... we do not. */ if (stage >= ARRAY_SIZE(device->state.textures)) { @@ -3492,7 +3486,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, BOOL set_blend_state = FALSE, set_rasterizer_state = FALSE; unsigned int i, j, start, idx; struct wined3d_range range; - DWORD map, stage; + uint32_t map; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3732,14 +3726,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { - stage = i; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; map = changed->samplerState[i]; while (map) { j = wined3d_bit_scan(&map); - wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + wined3d_device_set_sampler_state(device, i, j, state->sampler_states[i][j]); } } @@ -3788,10 +3779,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, while (map) { i = wined3d_bit_scan(&map); - stage = i; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - wined3d_device_set_texture(device, stage, state->textures[i]); + wined3d_device_set_texture(device, i, state->textures[i]); } map = changed->clipplane; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 248f413f62..db0019adbf 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1075,7 +1075,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, DWORD stage = stateblock->contained_sampler_states[i].stage; DWORD sampler_state = stateblock->contained_sampler_states[i].state; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; wined3d_stateblock_set_sampler_state(device_state, stage, sampler_state, state->sampler_states[stage][sampler_state]); } @@ -1127,13 +1126,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, map = stateblock->changed.textures; for (i = 0; map; map >>= 1, ++i) { - DWORD stage = i; - - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (map & 1) - wined3d_stateblock_set_texture(device_state, stage, state->textures[i]); + wined3d_stateblock_set_texture(device_state, i, state->textures[i]); } map = stateblock->changed.clipplane; @@ -1353,9 +1347,6 @@ void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *state TRACE("stateblock %p, sampler_idx %u, state %s, value %#x.\n", stateblock, sampler_idx, debug_d3dsamplerstate(state), value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (sampler_idx >= ARRAY_SIZE(stateblock->stateblock_state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); @@ -1394,9 +1385,6 @@ void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, { TRACE("stateblock %p, stage %u, texture %p.\n", stateblock, stage, texture); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (stage >= ARRAY_SIZE(stateblock->stateblock_state.textures)) { WARN("Ignoring invalid stage %u.\n", stage); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cfb13529b3..d192266583 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1035,10 +1035,7 @@ enum wined3d_shader_type /* VTF defines */ #define WINED3DDMAPSAMPLER 0x100 -#define WINED3DVERTEXTEXTURESAMPLER0 (WINED3DDMAPSAMPLER + 1) -#define WINED3DVERTEXTEXTURESAMPLER1 (WINED3DDMAPSAMPLER + 2) -#define WINED3DVERTEXTEXTURESAMPLER2 (WINED3DDMAPSAMPLER + 3) -#define WINED3DVERTEXTEXTURESAMPLER3 (WINED3DDMAPSAMPLER + 4) +#define WINED3D_VERTEX_SAMPLER_OFFSET WINED3D_MAX_FRAGMENT_SAMPLERS #define WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 #define WINED3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080

1 0

Paul Gofman : d3d9/tests: Add tests for allowed StrecthRect() filters.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: ab0d8e68948a94d30920ecb144a11795bca99a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0d8e68948a94d30920ecb1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 16 21:23:34 2020 +0330 d3d9/tests: Add tests for allowed StrecthRect() filters. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 493 +++++++++++++++++++++-------------------------- 1 file changed, 222 insertions(+), 271 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab0d8e68948a94d30920…

1 0

Paul Gofman : wined3d: Validate the filter in wined3d_texture_blt().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: e9961039ec46ec64198489338ecdf01a4b1c765c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9961039ec46ec6419848933… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 16 21:23:35 2020 +0330 wined3d: Validate the filter in wined3d_texture_blt(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 26 +++++++++++++------------- dlls/wined3d/surface.c | 18 ++++-------------- dlls/wined3d/texture.c | 4 ++++ 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a798d975f9..9ceb758c60 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3917,24 +3917,24 @@ static void stretchrect_test(void) {BACKBUFFER, &src_rect, TEX_RT_DST_640_480, &dst_rect_flipy, D3DTEXF_NONE}, /* Test filter. */ {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_PYRAMIDALQUAD, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_GAUSSIANQUAD, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_CONVOLUTIONMONO, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, 0xbadf, FALSE, TRUE}, + {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_PYRAMIDALQUAD}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_GAUSSIANQUAD}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_CONVOLUTIONMONO}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, 0xbadf}, {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {RT_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {RT_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_NONE, TRUE}, - {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_ANISOTROPIC}, }; window = create_window(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3745d8dde7..e965203950 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -165,20 +165,10 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co && (abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left)); - switch (filter) - { - case WINED3D_TEXF_LINEAR: - gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; - break; - - default: - FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); - /* fall through */ - case WINED3D_TEXF_NONE: - case WINED3D_TEXF_POINT: - gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; - break; - } + if (filter == WINED3D_TEXF_LINEAR) + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; + else + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b663a44fbb..85f09ee348 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3569,6 +3569,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; + if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT + && filter != WINED3D_TEXF_LINEAR) + return WINED3DERR_INVALIDCALL; + dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box)))

1 0

Jacek Caban : dbghelp: Use generic image_find_section in elf_check_alternate.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: a3e1c7fa02351b032de60fc2a685f14e9f7308fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e1c7fa02351b032de60fc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:05:11 2020 +0100 dbghelp: Use generic image_find_section in elf_check_alternate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 648169b980..1013b70749 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1139,7 +1139,7 @@ static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module struct image_section_map buildid_sect, debuglink_sect; /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (elf_find_section(fmap, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + if (image_find_section(fmap, ".note.gnu.build-id", &buildid_sect)) { const uint32_t* note; @@ -1156,7 +1156,7 @@ static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module image_unmap_section(&buildid_sect); } /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (!ret && elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + if (!ret && image_find_section(fmap, ".gnu_debuglink", &debuglink_sect)) { const char* dbg_link;

1 0

Jacek Caban : dbghelp: Move alternate file map pointer to generic image_file_map.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 02dfd959ca6f2295ca279ab65f6b6429cd53673c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02dfd959ca6f2295ca279ab6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:05:23 2020 +0100 dbghelp: Move alternate file map pointer to generic image_file_map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 61 +++++++++++++++++++++++++++++--------------- dlls/dbghelp/image_private.h | 27 +++++++++++++++----- dlls/dbghelp/macho_module.c | 1 + dlls/dbghelp/pe_module.c | 1 + 4 files changed, 63 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02dfd959ca6f2295ca27…

1 0

Jacek Caban : dbghelp: Use vtbl to handle different image_file_map types.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 95a5f8296188d7dd8ffb86afd4f0c3280e2f5656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a5f8296188d7dd8ffb86af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:05:39 2020 +0100 dbghelp: Use vtbl to handle different image_file_map types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 44 +++++++++--------------- dlls/dbghelp/image_private.h | 79 ++++++++------------------------------------ dlls/dbghelp/macho_module.c | 41 +++++++++-------------- dlls/dbghelp/pe_module.c | 24 ++++++++++---- 4 files changed, 62 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95a5f8296188d7dd8ffb…

1 0