January 2014 - Wine-Commits

Alexandre Julliard : gdi32/tests: Run all DIB tests with a hardcoded palette.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: d1463cc44b79df3242c6bff9ee00a280c1eba43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1463cc44b79df3242c6bff9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 17:05:20 2014 +0100 gdi32/tests: Run all DIB tests with a hardcoded palette. --- dlls/gdi32/tests/dib.c | 213 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 172 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1463cc44b79df3242c6b…

1 0

Stefan Dösinger : wined3d: Remove SFLAG_USERPTR.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: db6d3c500ca5d69f49756b69777f09190e6bc498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d3c500ca5d69f49756b697… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:20 2014 +0100 wined3d: Remove SFLAG_USERPTR. --- dlls/wined3d/surface.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 60539c0..f3bb04c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -604,7 +604,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) + if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) + || surface->user_memory) return; wined3d_resource_free_sysmem(&surface->resource); @@ -2715,7 +2716,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, create_dib = TRUE; } - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); + surface->flags &= ~SFLAG_LOCATIONS; surface->resource.allocatedMemory = NULL; wined3d_resource_free_sysmem(&surface->resource); @@ -2741,13 +2742,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; - if (mem) - { - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - } + surface->user_memory = mem; surface->pitch = pitch; - surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; @@ -3220,7 +3216,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; /* Use the DIB section from now on if we are not using a PBO or user memory. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR))) + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM) || surface->user_memory)) { wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8109bc..c10f120 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2294,17 +2294,16 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00000800 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00001000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00002000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00004000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00008000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00008000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00010000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00020000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00040000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00080000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00100000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2317,7 +2316,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ - SFLAG_USERPTR | \ SFLAG_PBO | \ SFLAG_PIN_SYSMEM)

1 0

Stefan Dösinger : wined3d: Mark the system location up to date in the DIB recreation codepath.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 441d8ffeb2dc409462e15f12b1fc8043a27196f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441d8ffeb2dc409462e15f12b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:21 2014 +0100 wined3d: Mark the system location up to date in the DIB recreation codepath. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f3bb04c..a7c9d5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2760,6 +2760,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return hr; } surface->resource.allocatedMemory = surface->dib.bitmap_data; + surface->flags |= SFLAG_INSYSMEM; } else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : wined3d: GL_NV_vertex_program2_option supports relative offsets > 63.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: bffd5362138cd4963005d4fe008c321596a24587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffd5362138cd4963005d4fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:22 2014 +0100 wined3d: GL_NV_vertex_program2_option supports relative offsets > 63. The ARR codepath used if ctx->target_version >= NV2 does not account for the correction offset, but the indirect addressing reads do, which ultimately results in incorrect offsets. Since the limitation goes away as soon as we enable GL_NV_vertex_program_2_option ignoring the offset is the best thing to do. I don't set shader_data->rel_offset to zero in the pre-compilation analysis because enablding NV_vertex_program2 is in theory a decision that is taken later during code generation. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a1bb3e6..ff4345f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1119,7 +1119,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if (!pshader && reg->idx[0].rel_addr) { const struct arb_vshader_private *shader_data = shader->backend_data; - UINT rel_offset = shader_data->rel_offset; + UINT rel_offset = ctx->target_version == ARB ? shader_data->rel_offset : 0; BOOL aL = FALSE; char rel_reg[50]; if (reg_maps->shader_version.major < 2) @@ -1849,7 +1849,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) const struct arb_vshader_private *shader_data = shader->backend_data; src0_param[0] = '\0'; - if (shader_data->rel_offset) + if (shader_data->rel_offset && ctx->target_version == ARB) { const char *offset = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_VS_REL_OFFSET); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param);

1 0

Erich E. Hoover : ddraw/tests: Test DirectDrawEnumerateEx with DDENUM_ATTACHEDSECONDARYDEVICES.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: dc184b526ce1fcfabcf36ac201ad7675fee98eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc184b526ce1fcfabcf36ac20… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 9 08:34:46 2014 -0700 ddraw/tests: Test DirectDrawEnumerateEx with DDENUM_ATTACHEDSECONDARYDEVICES. --- dlls/ddraw/tests/ddrawmodes.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 515f4d1..643fe9b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -209,8 +209,22 @@ static BOOL WINAPI test_context_callbackExA(GUID *lpGUID, char *lpDriverDescript return TRUE; } +static BOOL WINAPI test_count_callbackExA(GUID *lpGUID, char *lpDriverDescription, + char *lpDriverName, void *lpContext, HMONITOR hm) +{ + DWORD *count = (DWORD *)lpContext; + + trace("test_count_callbackExA: %p %s %s %p %p\n", lpGUID, + lpDriverDescription, lpDriverName, lpContext, hm); + + (*count)++; + + return TRUE; +} + static void test_DirectDrawEnumerateExA(void) { + DWORD callbackCount; HRESULT ret; if (!pDirectDrawEnumerateExA) @@ -237,6 +251,21 @@ static void test_DirectDrawEnumerateExA(void) ret = pDirectDrawEnumerateExA(test_context_callbackExA, (void *)0xdeadbeef, 0); ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + /* Test with valid callback parameter and count the number of primary devices */ + callbackCount = 0; + ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, 0); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + ok(callbackCount == 1, "Expected 1 primary device, got %d\n", callbackCount); + + /* Test with valid callback parameter and count the number of secondary devices */ + callbackCount = 0; + ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, + DDENUM_ATTACHEDSECONDARYDEVICES); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + /* Note: this list includes the primary devices as well and some systems (such as the TestBot) + do not include any secondary devices */ + ok(callbackCount >= 1, "Expected at least one device, got %d\n", callbackCount); + /* Test with valid callback parameter, NULL context parameter, and all flags set. */ trace("Calling DirectDrawEnumerateExA with all flags set and NULL context.\n"); ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL,

1 0

Andrey Gusev : xapofx1_1: Add version.rc file.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 8d426f5398254edbdd4aafcd957cf51df361c45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d426f5398254edbdd4aafcd9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 4 21:00:55 2014 +0200 xapofx1_1: Add version.rc file. --- dlls/xapofx1_1/Makefile.in | 2 ++ dlls/xapofx1_1/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index 3a793ac..aff49eb 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -2,3 +2,5 @@ MODULE = xapofx1_1.dll C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/dlls/xapofx1_1/version.rc b/dlls/xapofx1_1/version.rc new file mode 100644 index 0000000..6e8c5f7 --- /dev/null +++ b/dlls/xapofx1_1/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine XAPOFX dll" +#define WINE_FILENAME_STR "xapofx1_1.dll" +#define WINE_FILEVERSION 9,24,1400,0 +#define WINE_FILEVERSION_STR "9.24.1400.0" +#define WINE_PRODUCTVERSION 9,24,1400,0 +#define WINE_PRODUCTVERSION_STR "9.24.1400.0" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : ddraw/tests: Add some color key tests for complex surfaces.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: e00cc024fde84c53a200310ac9d13326e986c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00cc024fde84c53a200310ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 13:49:32 2014 +0100 ddraw/tests: Add some color key tests for complex surfaces. --- dlls/ddraw/tests/ddraw1.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 125 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 547 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00cc024fde84c53a2003…

1 0

Henri Verbeet : ddraw: Don' t propagate color key changes to attached surfaces.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: f7ee96c311dd8127141f268f18f9492b218dd75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ee96c311dd8127141f268f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:01 2014 +0100 ddraw: Don't propagate color key changes to attached surfaces. --- dlls/ddraw/surface.c | 61 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8137157..8ce651c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4494,60 +4494,11 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -/***************************************************************************** - * SetColorKeyEnum - * - * EnumAttachedSurface callback for SetColorKey. Used to set color keys - * recursively in the surface tree - * - *****************************************************************************/ -struct SCKContext -{ - HRESULT ret; - struct wined3d_color_key *color_key; - DWORD Flags; -}; - -static HRESULT WINAPI SetColorKeyEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) -{ - struct ddraw_surface *surface_impl = impl_from_IDirectDrawSurface7(surface); - struct SCKContext *ctx = context; - HRESULT hr; - - hr = wined3d_surface_set_color_key(surface_impl->wined3d_surface, ctx->Flags, ctx->color_key); - if (FAILED(hr)) - { - WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); - ctx->ret = hr; - } - - ddraw_surface7_EnumAttachedSurfaces(surface, context, SetColorKeyEnum); - ddraw_surface7_Release(surface); - - return DDENUMRET_OK; -} - -/***************************************************************************** - * IDirectDrawSurface7::SetColorKey - * - * Sets the color keying options for the surface. Observations showed that - * in case of complex surfaces the color key has to be assigned to all - * sublevels. - * - * Params: - * Flags: DDCKEY_* - * CKey: The new color key - * - * Returns: - * DD_OK on success - * See IWineD3DSurface::SetColorKey for details - * - *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) { struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + HRESULT hr = WINED3D_OK; DDCOLORKEY FixedCKey; - struct SCKContext ctx = { DD_OK, (struct wined3d_color_key *)(CKey ? &FixedCKey : NULL), Flags }; TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); @@ -4612,15 +4563,11 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO } } if (This->wined3d_texture) - ctx.ret = wined3d_texture_set_color_key(This->wined3d_texture, Flags, ctx.color_key); - ddraw_surface7_EnumAttachedSurfaces(iface, &ctx, SetColorKeyEnum); + hr = wined3d_texture_set_color_key(This->wined3d_texture, Flags, + CKey ? (struct wined3d_color_key *)&FixedCKey : NULL); wined3d_mutex_unlock(); - switch(ctx.ret) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return ctx.ret; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key)

1 0

Henri Verbeet : wined3d: Reset the command stream state as well in wined3d_device_reset().
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 4d93adf75e21cd09677e8e21e009d1b57435c452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d93adf75e21cd09677e8e21e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:16:58 2014 +0100 wined3d: Reset the command stream state as well in wined3d_device_reset(). --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3d9a07c..ef10e9d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -48,6 +48,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TRANSFORM, WINED3D_CS_OP_SET_CLIP_PLANE, WINED3D_CS_OP_SET_MATERIAL, + WINED3D_CS_OP_RESET_STATE, }; struct wined3d_cs_present @@ -218,6 +219,11 @@ struct wined3d_cs_set_material const struct wined3d_material *material; }; +struct wined3d_cs_reset_state +{ + enum wined3d_cs_op opcode; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -814,6 +820,28 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma cs->ops->submit(cs); } +static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_adapter *adapter = cs->device->adapter; + HRESULT hr; + + state_cleanup(&cs->state); + memset(&cs->state, 0, sizeof(cs->state)); + if (FAILED(hr = state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) + ERR("Failed to initialize CS state, hr %#x.\n", hr); +} + +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) +{ + struct wined3d_cs_reset_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_RESET_STATE; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -838,6 +866,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, + /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 46fdee2..46492c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4406,6 +4406,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_stateblock_decref(device->recording); device->recording = NULL; } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); if (device->d3d_initialized) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0735116..6d38ec2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2473,6 +2473,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type,

1 0

Bruno Jesus : ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 0d965c14e9932226aa9446c01707790c73284bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d965c14e9932226aa9446c01… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 00:32:12 2014 -0200 ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT. --- dlls/ws2_32/tests/sock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 86a829e..f8dc5a5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7381,7 +7381,8 @@ todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); todo_wine ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ + || broken(error == WSAEFAULT) /* == NT */ || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, "expected 10022, got %d\n", error); @@ -7399,7 +7400,7 @@ todo_wine error = WSAGetLastError(); if(ret && error == ERROR_INVALID_PARAMETER) { - win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + win_skip("the current WSALookupServiceBeginW test is not supported in win <= 2000\n"); return; }

1 0