March 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_cb().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: e527b1035a417c230d3260710fdd73fd967afe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e527b1035a417c230d3260710… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:14 2017 +0100 wined3d: Introduce wined3d_device_get_cs_cb(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c576f02..f7ce15d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2752,6 +2752,19 @@ void CDECL wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_COMPUTE, idx, buffer); } +struct wined3d_buffer * CDECL wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->state.cb[WINED3D_SHADER_TYPE_COMPUTE][idx]; +} + void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1e187f9..b255d77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -53,6 +53,7 @@ @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) +@ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 69241fc..d0ee2e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2165,6 +2165,7 @@ HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *devi struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); +struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetConstantBuffers().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: befff5eefb9240201b3a8a0f7423854969a5ccd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befff5eefb9240201b3a8a0f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:15 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5e5c7a4..43e61c0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2035,8 +2035,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffer %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffer %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_cs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext *iface)

1 0

Nikolay Sivov : gdi32: Cleanup otmfsType bit mask from reserved bits.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 533d800d42a68ee66878266400c4167be6038dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=533d800d42a68ee6687826640… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 13:44:59 2017 +0300 gdi32: Cleanup otmfsType bit mask from reserved bits. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 3 ++- dlls/gdi32/tests/font.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a5147b5..49e8c2f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7914,7 +7914,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmfsSelection |= 1; if (font->fake_bold) font->potm->otmfsSelection |= 1 << 5; - font->potm->otmfsType = pOS2->fsType; + /* Only return valid bits that define embedding and subsetting restrictions */ + font->potm->otmfsType = pOS2->fsType & 0x30e; font->potm->otmsCharSlopeRise = pHori->caret_Slope_Rise; font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; font->potm->otmItalicAngle = 0; /* POST table */ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 834078e..7c80779 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5676,7 +5676,6 @@ static void test_fstype_fixup(void) /* Test font has fsType set to 0x7fff, test that reserved bits are filtered out, valid bits are 1, 2, 3, 8, 9. */ -todo_wine ok((otm->otmfsType & ~0x30e) == 0, "fsType %#x\n", otm->otmfsType); HeapFree(GetProcessHeap(), 0, otm);

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_resource_view().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: e093774c2ab4d0515ff601a64caf501670998f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e093774c2ab4d0515ff601a64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:16 2017 +0100 wined3d: Introduce wined3d_device_get_cs_resource_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7ce15d..ea229f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2773,6 +2773,20 @@ void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_cs_resource_view(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_COMPUTE][idx]; +} + void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, unsigned int idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b255d77..869fa35 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -54,6 +54,7 @@ @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_cb(ptr long) +@ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d0ee2e0..482568f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2166,6 +2166,8 @@ struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct w void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, + unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_compute_shader().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 76a4efe1ed462953b310c10821f7522c982fa281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a4efe1ed462953b310c1082… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:12 2017 +0100 wined3d: Introduce wined3d_device_get_compute_shader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 139b4da..c576f02 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2738,6 +2738,13 @@ void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, stru wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_get_compute_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state.shader[WINED3D_SHADER_TYPE_COMPUTE]; +} + void CDECL wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer) { TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 875e7e3..1e187f9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -51,6 +51,7 @@ @ cdecl wined3d_device_get_base_vertex_index(ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) +@ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 58e3f0d..69241fc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2162,6 +2162,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); +struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device);

1 0

Austin English : ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: f3ccfc092bc91773cf38e9e265eac6385d50cbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ccfc092bc91773cf38e9e26… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 7 16:01:20 2017 +0100 ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 10 ++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index bd6bc35..f441ac5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -4,7 +4,7 @@ @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stub KeAcquireInStackQueuedSpinLock +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06320d0..b3db46c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3188,3 +3188,16 @@ VOID WINAPI KeClearEvent(PRKEVENT event) { FIXME("stub: %p\n", event); } + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) +void WINAPI __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#else +void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#endif +{ + FIXME( "stub: %p %p\n", spinlock, handle ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 62c7fb4..ba18200 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -41,6 +41,7 @@ @ stub IoWritePartitionTable @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4c696f7..61374a7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1210,6 +1210,16 @@ typedef struct _CALLBACK_OBJECT UCHAR reserved[3]; } CALLBACK_OBJECT, *PCALLBACK_OBJECT; +typedef struct _KSPIN_LOCK_QUEUE { + struct _KSPIN_LOCK_QUEUE * volatile Next; + volatile PKSPIN_LOCK Lock; +} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; + +typedef struct _KLOCK_QUEUE_HANDLE { + KSPIN_LOCK_QUEUE LockQueue; + KIRQL OldIrql; +} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; + typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; diff --git a/tools/make_specfiles b/tools/make_specfiles index 1e2400e..404af76 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -338,6 +338,10 @@ my @dll_groups = "bcrypt", "ncrypt", ], + [ + "ntoskrnl.exe", + "hal", + ], ); my $update_flags = 0;

1 0

Nikolay Sivov : gdi32/tests: Test that otmfsType field is cleaned up from reserved bits.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: be287422ce8b8f11c388484527368bbc9a8fbd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be287422ce8b8f11c38848452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 13:44:58 2017 +0300 gdi32/tests: Test that otmfsType field is cleaned up from reserved bits. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_test.sfd | 2 +- dlls/gdi32/tests/wine_test.ttf | Bin 1776 -> 1776 bytes 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 91ea932..834078e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5646,6 +5646,46 @@ todo_wine ReleaseDC(NULL, hdc); } +static void test_fstype_fixup(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_prev; + DWORD ret; + OUTLINETEXTMETRICA *otm; + DWORD otm_size; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); + otm = HeapAlloc(GetProcessHeap(), 0, otm_size); + otm->otmSize = sizeof(*otm); + ret = GetOutlineTextMetricsA(hdc, otm->otmSize, otm); + ok(ret == otm->otmSize, "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + + /* Test font has fsType set to 0x7fff, test that reserved bits are filtered out, + valid bits are 1, 2, 3, 8, 9. */ +todo_wine + ok((otm->otmfsType & ~0x30e) == 0, "fsType %#x\n", otm->otmfsType); + + HeapFree(GetProcessHeap(), 0, otm); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_CreateScalableFontResource(void) { char ttf_name[MAX_PATH]; @@ -5729,6 +5769,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); + test_fstype_fixup(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index c985b43..79a0a4d 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -15,7 +15,7 @@ LayerCount: 2 Layer: 0 1 "Back" 1 Layer: 1 1 "Fore" 0 XUID: [1021 905 592216984 1247726] -FSType: 0 +FSType: 32767 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index 1562a32..d09ae3d 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Henri Verbeet : wined3d: Validate blit parameters in wined3d_texture_blt() .
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 54c3f5c0bc223f3f11703242adb8c84db85aa6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c3f5c0bc223f3f11703242a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:26 2017 +0100 wined3d: Validate blit parameters in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++------------------------- dlls/wined3d/texture.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a2a7d98..7c84ffd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3598,7 +3598,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst unsigned int src_sub_resource_idx = 0; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; - HRESULT hr; static const DWORD simple_blit = WINED3D_BLT_ASYNC | WINED3D_BLT_COLOR_FILL @@ -3632,20 +3631,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); } - if (dst_texture->sub_resources[dst_sub_resource_idx].map_count - || (src_texture && src_texture->sub_resources[src_sub_resource_idx].map_count)) - { - WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); - return WINEDDERR_SURFACEBUSY; - } - - if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_surface->texture_level, &dst_box))) - return hr; - - if (src_texture && FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, - src_surface->texture_level, &src_box))) - return hr; - if (!fx || !(fx->fx)) flags &= ~WINED3D_BLT_FX; @@ -3738,17 +3723,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, color.r))) return WINED3D_OK; } - else + else if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_texture->resource.draw_binding, + src_rect, dst_surface, dst_texture->resource.draw_binding, dst_rect))) { - if (src_ds_flags != dst_ds_flags) - { - WARN("Rejecting depth / stencil blit between incompatible formats.\n"); - return WINED3DERR_INVALIDCALL; - } - - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_texture->resource.draw_binding, - src_rect, dst_surface, dst_texture->resource.draw_binding, dst_rect))) - return WINED3D_OK; + return WINED3D_OK; } } else diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdb728d..4dea254 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2627,7 +2627,11 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { + struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; + struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; struct wined3d_texture_sub_resource *dst_resource, *src_resource = NULL; + unsigned int dst_format_flags, src_format_flags = 0; + HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", @@ -2638,11 +2642,42 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) 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))) + return hr; + if (src_texture) { if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; + + src_format_flags = src_texture->resource.format_flags; + if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, + src_sub_resource_idx % src_texture->level_count, &src_box))) + return hr; + } + + if (dst_texture->sub_resources[dst_sub_resource_idx].map_count + || (src_texture && src_texture->sub_resources[src_sub_resource_idx].map_count)) + { + WARN("Sub-resource is busy, returning WINEDDERR_SURFACEBUSY.\n"); + return WINEDDERR_SURFACEBUSY; + } + + if ((dst_format_flags & WINED3DFMT_FLAG_BLOCKS) && (flags & WINED3D_BLT_COLOR_FILL)) + { + WARN("Color fill not supported on block-based formats.\n"); + return WINED3DERR_INVALIDCALL; + } + + if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + && !(flags & WINED3D_BLT_DEPTH_FILL)) + { + WARN("Rejecting depth/stencil blit between incompatible formats.\n"); + return WINED3DERR_INVALIDCALL; } return wined3d_surface_blt(dst_resource->u.surface, dst_rect,

1 0

Nikolay Sivov : xmllite/reader: Enforce maximum element depth limit.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 71a07330529242c7877d498f95989c0a1fb0a8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a07330529242c7877d498f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:59 2017 +0300 xmllite/reader: Enforce maximum element depth limit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 +++--- dlls/xmllite/tests/reader.c | 206 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 181 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a07330529242c7877d4…

1 0

Nikolay Sivov : xmllite/reader: Return qualified names for attributes.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: ce84b20554705d83edb87f4f8e3fc26337b2d64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce84b20554705d83edb87f4f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:58 2017 +0300 xmllite/reader: Return qualified names for attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 21 +++++++++++++-------- dlls/xmllite/tests/reader.c | 9 +++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7aaaebf..63adc9c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -229,6 +229,7 @@ struct attribute struct list entry; strval prefix; strval localname; + strval qname; strval value; }; @@ -386,7 +387,8 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *qname, + strval *value) { struct attribute *attr; @@ -398,6 +400,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn else memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; + attr->qname = qname ? *qname : *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); reader->attr_count++; @@ -1150,7 +1153,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1226,7 +1229,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1268,7 +1271,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1737,7 +1740,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, NULL, &name, &pub); + hr = reader_add_attr(reader, NULL, &name, NULL, &pub); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1748,7 +1751,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, NULL, &name, &sys); + hr = reader_add_attr(reader, NULL, &name, NULL, &sys); if (FAILED(hr)) return hr; return S_OK; @@ -1762,7 +1765,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, NULL, &name, &sys); + return reader_add_attr(reader, NULL, &name, NULL, &sys); } return S_FALSE; @@ -2160,7 +2163,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &prefix, &local, &value); + return reader_add_attr(reader, &prefix, &local, &qname, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2829,6 +2832,7 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); + reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); return S_OK; @@ -2861,6 +2865,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) This->attr = LIST_ENTRY(next, struct attribute, entry); reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8a736bf..e551a48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1275,9 +1275,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); - +} IStream_Release(stream); IXmlReader_Release(reader); } @@ -1355,9 +1356,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); - +} type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got 0x%8x\n", hr); @@ -1925,12 +1927,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); - } + /* value */ len = 1; str = NULL;

1 0