April 2018 - Wine-Devel - list.winehq.org

[PATCH 3/7] wsdapi: Build and write Types list for Hello message.
by Owen Rudge April 19, 2018

April 19, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)

1 0

[PATCH] shell32: handle writing an iconresource entry in SHGetSetFolderCustomSettings
by Louis Lenders April 19, 2018

April 19, 2018

This fixes bug https://bugs.winehq.org/show_bug.cgi?id=44959 I also tried to write a test, that test passes on the 32-bit testbots, but somehow the last test fails on 64-bit testbots and i don`t know why. Test is at https://testbot.winehq.org/GetFile.pl?JobKey=37794&StepKey=1 Also win2003 testbot gives strange errors in a test above this one that i don`t get. See for example https://testbot.winehq.org/JobDetails.pl?Key=37794. So this goes without submitted test for now Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/shlfolder.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 9143f1e..0348418 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -607,12 +607,37 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci /*********************************************************************** * SHGetSetFolderCustomSettings * - * Only Unicode above Server 2003 + * Only in XP (up to SP2) and Server 2003, writes/reads from a desktop.ini */ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { + static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0}; + static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH]= {0}; + HRESULT hr; + + hr = E_FAIL; + + if (flag & FCS_FORCEWRITE) + { + if (fcs->dwMask & FCSM_ICONFILE) + { + lstrcpyW(bufferW, path); + PathAddBackslashW(bufferW); + lstrcatW(bufferW, desktop_iniW); + + if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW)) + { + TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW)); + hr = S_OK; + } + else + ERR("Failed to write (to) Desktop.ini file\n"); + } + } + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); - return E_NOTIMPL; + return hr; } /*********************************************************************** -- 2.7.4

1 0

[PATCH vkd3d] build: Set libtool version numbers for shared libraries.
by Józef Kucia April 19, 2018

April 19, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Generates the following sonames: libvkd3d.so.1 and libvkd3d-utils.so.1 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index aa2e2f65917d..f1f80c32881d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,18 +94,20 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h +libvkd3d_la_LDFLAGS = -version-info 1:0:0 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT -libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map endif libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h +libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT -libvkd3d_utils_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif EXTRA_DIST = LICENSE -- 2.16.1

2 1

[PATCH] d3d9/tests: Add a basic test for default value and limits of max frame latency parameter.
by Nikolay Sivov April 19, 2018

April 19, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 77e09c3cee..7c36e6ee64 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4043,6 +4043,55 @@ static void test_device_caps(void) DestroyWindow(window); } +static void test_frame_latency(void) +{ + IDirect3DDevice9Ex *device; + ULONG refcount; + UINT latency; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 1, "Unexpected max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4093,4 +4142,5 @@ START_TEST(d3d9ex) test_backbuffer_resize(); test_format_unknown(); test_device_caps(); + test_frame_latency(); } -- 2.17.0

2 1

[PATCH 1/2] wined3d: Add support for setting multiple scissor rectangles.
by Nikolay Sivov April 19, 2018

April 19, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/wined3d/cs.c | 36 +++++++++++++++++++------------ dlls/wined3d/device.c | 38 +++++++++++++++++++++++---------- dlls/wined3d/state.c | 39 +++++++++++++++++++++++++--------- dlls/wined3d/stateblock.c | 16 +++++++++----- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.h | 3 ++- 9 files changed, 98 insertions(+), 47 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7377952036..a8251aad27 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -998,7 +998,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } @@ -4192,7 +4192,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0a77b3e316..b73d974860 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2564,7 +2564,7 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rect); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 221e51eb94..6273ec04a1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,7 +34,7 @@ enum wined3d_cs_op WINED3D_CS_OP_FLUSH, WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORTS, - WINED3D_CS_OP_SET_SCISSOR_RECT, + WINED3D_CS_OP_SET_SCISSOR_RECTS, WINED3D_CS_OP_SET_RENDERTARGET_VIEW, WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW, WINED3D_CS_OP_SET_VERTEX_DECLARATION, @@ -145,10 +145,11 @@ struct wined3d_cs_set_viewports struct wined3d_viewport viewports[1]; }; -struct wined3d_cs_set_scissor_rect +struct wined3d_cs_set_scissor_rects { enum wined3d_cs_op opcode; - RECT rect; + unsigned int rect_count; + RECT rects[1]; }; struct wined3d_cs_set_rendertarget_view @@ -545,7 +546,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); op->color = *color; op->depth = depth; op->stencil = stencil; @@ -989,21 +990,28 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_scissor_rect *op = data; + const struct wined3d_cs_set_scissor_rects *op = data; - cs->state.scissor_rect = op->rect; - device_invalidate_state(cs->device, STATE_SCISSORRECT); + if (op->rect_count) + memcpy(cs->state.scissor_rects, op->rects, op->rect_count * sizeof(*op->rects)); + else + SetRectEmpty(cs->state.scissor_rects); + cs->state.scissor_rect_count = op->rect_count; + device_invalidate_state(cs->device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) { - struct wined3d_cs_set_scissor_rect *op; + struct wined3d_cs_set_scissor_rects *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = *rect; + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; + if (rect_count) + memcpy(op->rects, rects, rect_count * sizeof(*rects)); + op->rect_count = rect_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2411,7 +2419,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_FLUSH */ wined3d_cs_exec_flush, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORTS */ wined3d_cs_exec_set_viewports, - /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, + /* WINED3D_CS_OP_SET_SCISSOR_RECTS */ wined3d_cs_exec_set_scissor_rects, /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, /* WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW */ wined3d_cs_exec_set_depth_stencil_view, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8d4f4cde0e..e2852570d9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2123,19 +2123,33 @@ DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device return device->state.sampler_states[sampler_idx][state]; } -void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) +void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, + const RECT *rects) { - TRACE("device %p, rect %s.\n", device, wine_dbgstr_rect(rect)); + unsigned int i; + + TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } if (device->recording) device->recording->changed.scissorRect = TRUE; - if (EqualRect(&device->update_state->scissor_rect, rect)) + if (device->update_state->scissor_rect_count == rect_count + && !memcmp(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects))) { - TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); return; } - CopyRect(&device->update_state->scissor_rect, rect); + + if (rect_count) + memcpy(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(device->update_state->scissor_rects, 0, sizeof(device->update_state->scissor_rects)); + device->update_state->scissor_rect_count = rect_count; if (device->recording) { @@ -2143,14 +2157,14 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - wined3d_cs_emit_set_scissor_rect(device->cs, rect); + wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); - *rect = device->state.scissor_rect; + *rect = device->state.scissor_rects[0]; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); } @@ -4476,8 +4490,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } prev = device->fb.render_targets[view_idx]; @@ -4986,8 +5001,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } if (device->d3d_initialized) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5bcd244d93..6e4c2452c9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4770,25 +4770,44 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s static void scissorrect(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - const RECT *r = &state->scissor_rect; + unsigned int height = 0; + const RECT *r; /* Warning: glScissor uses window coordinates, not viewport coordinates, * so our viewport correction does not apply. Warning2: Even in windowed * mode the coords are relative to the window, not the screen. */ - TRACE("Setting new scissor rect to %s.\n", wine_dbgstr_rect(r)); - if (context->render_offscreen) - { - gl_info->gl_ops.gl.p_glScissor(r->left, r->top, r->right - r->left, r->bottom - r->top); - } - else + if (!context->render_offscreen) { const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - UINT height; - UINT width; + unsigned int width; wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); - gl_info->gl_ops.gl.p_glScissor(r->left, height - r->bottom, r->right - r->left, r->bottom - r->top); + } + + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + { + unsigned int i; + + for (i = 0; i < state->scissor_rect_count; ++i) + { + r = &state->scissor_rects[i]; + GL_EXTCALL(glScissorIndexed(i, r->left, height ? height - r->top : r->top, + r->right - r->left, r->bottom - r->top)); + } + + if (state->viewport_count > state->scissor_rect_count) + { + static const GLint reset[4 * WINED3D_MAX_VIEWPORTS]; + unsigned int reset_count = state->viewport_count - state->scissor_rect_count; + GL_EXTCALL(glScissorArrayv(state->scissor_rect_count, reset_count, reset)); + } + } + else + { + r = &state->scissor_rects[0]; + gl_info->gl_ops.gl.p_glScissor(r->left, height ? height - r->top : r->top, + r->right - r->left, r->bottom - r->top); } checkGLcall("glScissor"); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4ad0331f94..a70fed0806 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -825,12 +825,17 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); } - if (stateblock->changed.scissorRect && memcmp(&src_state->scissor_rect, - &stateblock->state.scissor_rect, sizeof(stateblock->state.scissor_rect))) + if (stateblock->changed.scissorRect + && (src_state->scissor_rect_count != stateblock->state.scissor_rect_count + || memcmp(src_state->scissor_rects, stateblock->state.scissor_rects, + src_state->scissor_rect_count * sizeof(*stateblock->state.scissor_rects)))) { - TRACE("Updating scissor rect.\n"); + TRACE("Updating scissor rects.\n"); - stateblock->state.scissor_rect = src_state->scissor_rect; + if ((stateblock->state.scissor_rect_count = src_state->scissor_rect_count)) + memcpy(stateblock->state.scissor_rects, src_state->scissor_rects, sizeof(src_state->scissor_rects)); + else + SetRectEmpty(stateblock->state.scissor_rects); } map = stateblock->changed.streamSource; @@ -1065,7 +1070,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); if (stateblock->changed.scissorRect) - wined3d_device_set_scissor_rect(device, &stateblock->state.scissor_rect); + wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, + stateblock->state.scissor_rects); map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b59178296..21b2414bbe 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -176,7 +176,7 @@ @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_sampler_state(ptr long long long) -@ cdecl wined3d_device_set_scissor_rect(ptr ptr) +@ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e6a87fe2f..dcdfcbe413 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2856,7 +2856,8 @@ struct wined3d_state struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; unsigned int viewport_count; - RECT scissor_rect; + RECT scissor_rects[WINED3D_MAX_VIEWPORTS]; + unsigned int scissor_rect_count; /* Light hashmap. Collisions are handled using linked lists. */ #define LIGHTMAP_SIZE 43 @@ -3592,7 +3593,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ccda987405..6223706f57 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2426,7 +2426,8 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport); void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); -void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); +void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, + unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); -- 2.17.0

2 2

[PATCH 3/3] reg/tests: Add tests for values with embedded null characters
by Hugh McMaster April 19, 2018

April 19, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 88 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b64defb48d..5004414450 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2355,6 +2355,23 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); + /* Test with embedded null characters */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine69a\"=\"\\0\n" + "\"Wine69b\"=\"\\0\\0\n" + "\"Wine69c\"=\"Value1\\0\n" + "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine69e\"=\"Value3\\0Value4\n" + "\"Wine69f\"=\"\\0Value4\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine69a"); + verify_reg_nonexist(hkey, "Wine69b"); + verify_reg_nonexist(hkey, "Wine69c"); + verify_reg_nonexist(hkey, "Wine69d"); + verify_reg_nonexist(hkey, "Wine69e"); + verify_reg_nonexist(hkey, "Wine69f"); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3863,6 +3880,23 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); + /* Test with embedded null characters */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine69a\"=\"\\0\n" + "\"Wine69b\"=\"\\0\\0\n" + "\"Wine69c\"=\"Value1\\0\n" + "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine69e\"=\"Value3\\0Value4\n" + "\"Wine69f\"=\"\\0Value4\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine69a"); + verify_reg_nonexist(hkey, "Wine69b"); + verify_reg_nonexist(hkey, "Wine69c"); + verify_reg_nonexist(hkey, "Wine69d"); + verify_reg_nonexist(hkey, "Wine69e"); + verify_reg_nonexist(hkey, "Wine69f"); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -4328,9 +4362,9 @@ error: static void test_export(void) { LONG err; - DWORD r, dword; + DWORD r, dword, type, size; HKEY hkey, subkey; - BYTE hex[4]; + BYTE hex[4], buffer[8]; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -4406,6 +4440,18 @@ static void test_export(void) "\"Wine3b\"=hex:12,34,56,78\r\n" "\"Wine3c\"=dword:10203040\r\n\r\n"; + const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine4a\"=dword:00000005\r\n" + "\"Wine4b\"=\"\"\r\n" + "\"Wine4c\"=\"Value\"\r\n" + "\"Wine4d\"=\"\"\r\n" + "\"Wine4e\"=dword:00000100\r\n" + "\"Wine4f\"=\"\"\r\n" + "\"Wine4g\"=\"Value2\"\r\n" + "\"Wine4h\"=\"abc\"\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4598,6 +4644,44 @@ static void test_export(void) ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with embedded null characters */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine4a\"=dword:00000005\n" + "\"Wine4b\"=hex(1):00,00,00,00,00,00,00,00\n" + "\"Wine4c\"=\"Value\"\n" + "\"Wine4d\"=hex(1):00,00,61,00,62,00,63,00\n" + "\"Wine4e\"=dword:00000100\n" + "\"Wine4f\"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine4g\"=\"Value2\"\n" + "\"Wine4h\"=hex(1):61,00,62,00,63,00,00,00, \\\n" + " 64,00,65,00,66,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + dword = 0x5; + verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); + verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); + /* Wine4d */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine4d", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_SZ, "got wrong type %u, expected %u\n", type, REG_SZ); + todo_wine ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); + ok(memcmp(buffer, "\0abc", size) == 0, "got wrong data\n"); + dword = 0x100; + verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0); + verify_reg(hkey, "Wine4g", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(reg) -- 2.17.0

1 0

[PATCH 2/3] regedit/tests: Add tests for values with embedded null characters
by Hugh McMaster April 19, 2018

April 19, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/tests/regedit.c | 74 ++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3bab7e1220..41712a13f1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1638,6 +1638,22 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine32a"); verify_reg_nonexist(hkey, "Wine32b"); + /* Test with embedded null characters */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=\"\\0\n" + "\"Wine33b\"=\"\\0\\0\n" + "\"Wine33c\"=\"Value1\\0\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine33e\"=\"Value3\\0Value4\n" + "\"Wine33f\"=\"\\0Value4\n\n"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -2134,6 +2150,22 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine32a"); verify_reg_nonexist(hkey, "Wine32b"); + /* Test with embedded null characters */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=\"\\0\n" + "\"Wine33b\"=\"\\0\\0\n" + "\"Wine33c\"=\"Value1\\0\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine33e\"=\"Value3\\0Value4\n" + "\"Wine33f\"=\"\\0Value4\n\n"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3483,6 +3515,18 @@ static void test_export(void) "\"Wine3b\"=hex:12,34,56,78\r\n" "\"Wine3c\"=dword:10203040\r\n\r\n"; + const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine4a\"=dword:00000005\r\n" + "\"Wine4b\"=\"\"\r\n" + "\"Wine4c\"=\"Value\"\r\n" + "\"Wine4d\"=\"\"\r\n" + "\"Wine4e\"=dword:00000100\r\n" + "\"Wine4f\"=\"\"\r\n" + "\"Wine4g\"=\"Value2\"\r\n" + "\"Wine4h\"=\"abc\"\r\n\r\n"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3600,6 +3644,7 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); + /* Test registry export with embedded null characters */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" @@ -3617,6 +3662,35 @@ static void test_export(void) ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine4a\"=dword:00000005\n" + "\"Wine4b\"=hex(1):00,00,00,00,00,00,00,00\n" + "\"Wine4c\"=\"Value\"\n" + "\"Wine4d\"=hex(1):00,00,61,00,62,00,63,00\n" + "\"Wine4e\"=dword:00000100\n" + "\"Wine4f\"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine4g\"=\"Value2\"\n" + "\"Wine4h\"=hex(1):61,00,62,00,63,00,00,00, \\\n" + " 64,00,65,00,66,00,00,00\n\n"); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + dword = 0x5; + verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); + verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, TODO_REG_SIZE); + dword = 0x100; + verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0); + verify_reg(hkey, "Wine4g", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); + RegCloseKey(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit) -- 2.17.0

1 0

[PATCH 1/3] regedit: Use the correct window class name
by Hugh McMaster April 19, 2018

April 19, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 460a951ff4..19d720d4d2 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -62,7 +62,7 @@ const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C', #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; -const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; +const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0}; const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -- 2.17.0

1 0

[PATCH 5/5] wined3d: Allow context_draw_shaded_quad() to function without immediate mode draws.
by Henri Verbeet April 19, 2018

April 19, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/glsl_shader.c | 3 --- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ba625319c0..d5378e203e0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1447,6 +1447,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) } } + if (context->blit_vbo) + GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo)); + checkGLcall("context cleanup"); } @@ -5564,15 +5567,41 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te quad[3].texcoord = info.texcoords[3]; /* Draw a quad. */ - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - - for (i = 0; i < ARRAY_SIZE(quad); ++i) + if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); - GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + if (!context->blit_vbo) + GL_EXTCALL(glGenBuffers(1, &context->blit_vbo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo)); + + context_unload_vertex_data(context); + context_unload_numbered_arrays(context); + + GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); + GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL)); + GL_EXTCALL(glVertexAttribPointer(1, 3, GL_FLOAT, FALSE, sizeof(*quad), + (void *)FIELD_OFFSET(struct blit_vertex, texcoord))); + + GL_EXTCALL(glEnableVertexAttribArray(0)); + GL_EXTCALL(glEnableVertexAttribArray(1)); + + gl_info->gl_ops.gl.p_glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, 0)); + GL_EXTCALL(glDisableVertexAttribArray(1)); + GL_EXTCALL(glDisableVertexAttribArray(0)); } + else + { + gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glEnd(); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); + GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + } + + gl_info->gl_ops.gl.p_glEnd(); + } checkGLcall("draw"); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 799b2ff1caf..dfd8e61f902 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12628,9 +12628,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) return; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return; - if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d53941318cc..8cdc3ef6f93 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1983,6 +1983,8 @@ struct wined3d_context struct wined3d_fence *buffer_fences[MAX_ATTRIBS]; unsigned int buffer_fence_count; + GLuint blit_vbo; + DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS]; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Simplify context_update_stream_sources().
by Henri Verbeet April 19, 2018

April 19, 2018

Note that this slightly changes behaviour, in that no loads or unloads happen anymore when "use_immediate_mode_draw" is set. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d2bcedc9218..9ba625319c0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5479,32 +5479,22 @@ static void context_load_numbered_arrays(struct wined3d_context *context, void context_update_stream_sources(struct wined3d_context *context, const struct wined3d_state *state) { - BOOL load_numbered = context->d3d_info->ffp_generic_attributes - || (use_vs(state) && !context->use_immediate_mode_draw); - BOOL load_named = !context->d3d_info->ffp_generic_attributes - && !use_vs(state) && !context->use_immediate_mode_draw; - if (context->numbered_array_mask && !load_numbered) - { - context_unload_numbered_arrays(context); - context->numbered_array_mask = 0; - } - else - { - context_unload_vertex_data(context); - } + if (context->use_immediate_mode_draw) + return; - if (load_numbered) + context_unload_vertex_data(context); + if (context->d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); context_load_numbered_arrays(context, &context->stream_info, state); + return; } - else if (load_named) - { - TRACE("Loading vertex data.\n"); - context_load_vertex_data(context, &context->stream_info, state); - context->namedArraysLoaded = TRUE; - } + + TRACE("Loading named arrays.\n"); + context_unload_numbered_arrays(context); + context_load_vertex_data(context, &context->stream_info, state); + context->namedArraysLoaded = TRUE; } static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, -- 2.11.0

1 0