February 2020 - Wine-Commits

Sven Baars : wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind).
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 4128e457a97d02c4b49c4414829afdbc6d1cb869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4128e457a97d02c4b49c4414… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Feb 2 14:45:51 2020 +0100 wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..634a0be36a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4848,7 +4848,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx->free = ctx != &c ? ctx : NULL; wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); - if (!ctx->free) + if (ctx == &c) device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Zebediah Figura : wined3d: Fix the spelling of a comment.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 5ec0b75993071197a325b8bc5ac5e94e558c64c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec0b75993071197a325b8bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 31 10:16:46 2020 -0600 wined3d: Fix the spelling of a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ccdb506e4..ebf2e3afdf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1031,7 +1031,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit DWORD location; /* If we would need to copy from a renderbuffer or drawable, we'd probably - * be better of using the FBO blitter directly, since we'd need to use it + * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_texture->resource.format->id == dst_texture->resource.format->id

1 0

Zebediah Figura : ddraw: Apply the device state before executing a draw call.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 92dd6dd150089e0674dfb080fa22dc31eebb2a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92dd6dd150089e0674dfb080… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:26:05 2020 -0600 ddraw: Apply the device state before executing a draw call. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++++++++++-- dlls/ddraw/executebuffer.c | 4 ++++ dlls/ddraw/surface.c | 2 ++ dlls/ddraw/vertexbuffer.c | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 725a935022..6cd8948f56 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3520,6 +3520,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, size = vertex_count * stride; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3713,6 +3714,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -4057,6 +4059,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, dst_size); if (FAILED(hr)) goto done; @@ -4173,6 +4176,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); if (FAILED(hr)) goto done; @@ -4330,6 +4334,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) @@ -4452,6 +4457,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); @@ -5251,6 +5257,7 @@ static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_c TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -5313,7 +5320,7 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, (color & 0xff) / 255.0f, ((color >> 24) & 0xff) / 255.0f, }; - struct d3d_device *This = impl_from_IDirect3DDevice7(iface); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", @@ -5326,7 +5333,8 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, } wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9f0fdb85e5..0d1726ed7f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -74,6 +74,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DOP_POINT: { const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST, 0); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); @@ -106,6 +107,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d primitive_size = 3; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + index_count = count * primitive_size; if (buffer->index_size < index_count) { @@ -300,6 +303,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d { case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fda42f2982..03546e17f1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1472,6 +1472,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, &colour, 0.0f, 0); @@ -1487,6 +1488,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, NULL, colour.r, 0); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9df386d1a0..1e3d25f6cb 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -277,6 +277,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to

1 0

Jacek Caban : quartz: Fix hex digit checks in process_pattern_string.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: bf95bccfafd7ea8faf5acf414a4806cbd001358f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf95bccfafd7ea8faf5acf41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:29 2020 +0100 quartz: Fix hex digit checks in process_pattern_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 4855f9834c..11cc438be2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -87,37 +87,19 @@ static inline AsyncReader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) static const IFileSourceFilterVtbl FileSource_Vtbl; static const IAsyncReaderVtbl FileAsyncReader_Vtbl; -static unsigned char byte_from_hex_char(WCHAR wHex) +static int byte_from_hex_char(WCHAR c) { - switch (towlower(wHex)) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - return (wHex - '0') & 0xf; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - return (wHex - 'a' + 10) & 0xf; - default: - return 0; - } + if ('0' <= c && c <= '9') return c - '0'; + if ('a' <= c && c <= 'f') return c - 'a' + 10; + if ('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; } static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) { ULONG size, offset, i, ret_size; BYTE *mask, *expect, *actual; + int d; BOOL ret = TRUE; /* format: "offset, size, mask, value" */ @@ -140,15 +122,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) return FALSE; } pattern++; - while (!iswxdigit(*pattern) && (*pattern != ',')) + while (byte_from_hex_char(*pattern) == -1 && (*pattern != ',')) pattern++; - for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) + for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++) { if (i % 2) - mask[i / 2] |= byte_from_hex_char(*pattern); + mask[i / 2] |= d; else - mask[i / 2] = byte_from_hex_char(*pattern) << 4; + mask[i / 2] = d << 4; } if (!(pattern = wcschr(pattern, ','))) @@ -158,15 +140,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) return FALSE; } pattern++; - while (!iswxdigit(*pattern) && (*pattern != ',')) + while (byte_from_hex_char(*pattern) == -1 && (*pattern != ',')) pattern++; - for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) + for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++) { if (i % 2) - expect[i / 2] |= byte_from_hex_char(*pattern); + expect[i / 2] |= d; else - expect[i / 2] = byte_from_hex_char(*pattern) << 4; + expect[i / 2] = d << 4; } actual = heap_alloc(size);

1 0

Alexandre Julliard : winegcc: Make the WINEBUILD variable take precedence over the bin directory.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: d96a0acf296d45538cb8c95e965e06f173039fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96a0acf296d45538cb8c95e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 21:12:25 2020 +0100 winegcc: Make the WINEBUILD variable take precedence over the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c6bd444fa3..bee81edcc3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -865,10 +865,12 @@ static strarray *get_winebuild_args(struct options *opts) binary = opts->winebuild; else if (opts->wine_objdir) binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT ); + else if (winebuild) + binary = find_binary( opts->prefix, winebuild ); else if (bindir) binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else - binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" ); + binary = find_binary( opts->prefix, "winebuild" ); strarray_add( spec_args, binary ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" );

1 0

Alexandre Julliard : wmc: Always output resource strings in Unicode format.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: f504135e387b8fdbe955f4bbf6e4b542aab1ce1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f504135e387b8fdbe955f4bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 18:08:52 2020 +0100 wmc: Always output resource strings in Unicode format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 18 ----- tools/wmc/lang.h | 1 - tools/wmc/mcy.y | 2 +- tools/wmc/wmc.c | 9 +-- tools/wmc/wmc.h | 1 - tools/wmc/wmc.man.in | 6 +- tools/wmc/write.c | 190 +++++++++++++++++---------------------------------- 7 files changed, 66 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f504135e387b8fdbe955…

1 0

Stefan Dösinger : ddraw/test: Completely disable the refcount stealing GetClipper call.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 30cbc4a829db372d9ec690ab3c62bc8402680562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30cbc4a829db372d9ec690ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 3 13:33:22 2020 +0100 ddraw/test: Completely disable the refcount stealing GetClipper call. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 5 +++-- dlls/ddraw/tests/ddraw2.c | 5 +++-- dlls/ddraw/tests/ddraw4.c | 5 +++-- dlls/ddraw/tests/ddraw7.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 45a24e3ffb..61f0adcd7e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12938,12 +12938,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3fccd02f1e..6e35bfd534 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13767,12 +13767,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d97834e542..b53c0c2160 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16413,12 +16413,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bbc61087ca..51223e62ac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16340,12 +16340,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetRenderState().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: aae7a4671d441b25cdca83b5e62780798704670b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae7a4671d441b25cdca83b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:26:06 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6cd8948f56..3a35eaeb5e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2501,14 +2501,6 @@ static HRESULT WINAPI d3d_device2_GetRenderState(IDirect3DDevice2 *iface, return IDirect3DDevice3_GetRenderState(&device->IDirect3DDevice3_iface, state, value); } -static void d3d_device_set_render_state(struct d3d_device *device, - enum wined3d_render_state state, DWORD value) -{ - wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); -} - static void d3d_device_set_sampler_state(struct d3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { @@ -2649,7 +2641,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - d3d_device_set_render_state(device, WINED3D_RS_DEPTHBIAS, value); + wined3d_stateblock_set_render_state(device->update_state, WINED3D_RS_DEPTHBIAS, value); break; default: @@ -2661,7 +2653,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - d3d_device_set_render_state(device, state, value); + wined3d_stateblock_set_render_state(device->update_state, state, value); break; } wined3d_mutex_unlock();

1 0

Jacek Caban : crypt32: Allow only ASCII digits in CRYPT_AsnEncodeNumericString.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 275f6ca3df976628152a637f8b9d32e3908dedc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=275f6ca3df976628152a637f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:20 2020 +0100 crypt32: Allow only ASCII digits in CRYPT_AsnEncodeNumericString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 45eeea8e9d..91735eb53d 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2060,7 +2060,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, ptr += lenBytes; for (i = 0; ret && i < encodedLen; i++) { - if (isdigitW(str[i])) + if ('0' <= str[i] && str[i] <= '9') *ptr++ = (BYTE)str[i]; else {

1 0

Alexandre Julliard : wmc: Add trailing newlines to error messages.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: ccfabb323be58de25c0ff40f59f8666b2cd42e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccfabb323be58de25c0ff40f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 15:29:33 2020 +0100 wmc: Add trailing newlines to error messages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcy.y | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index f1d34584a6..1869fa9853 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -48,14 +48,14 @@ #include "wmc.h" #include "lang.h" -static const char err_syntax[] = "Syntax error"; -static const char err_number[] = "Number expected"; -static const char err_ident[] = "Identifier expected"; -static const char err_assign[] = "'=' expected"; -static const char err_popen[] = "'(' expected"; -static const char err_pclose[] = "')' expected"; -static const char err_colon[] = "':' expected"; -static const char err_msg[] = "Message expected"; +static const char err_syntax[] = "Syntax error\n"; +static const char err_number[] = "Number expected\n"; +static const char err_ident[] = "Identifier expected\n"; +static const char err_assign[] = "'=' expected\n"; +static const char err_popen[] = "'(' expected\n"; +static const char err_pclose[] = "')' expected\n"; +static const char err_colon[] = "':' expected\n"; +static const char err_msg[] = "Message expected\n"; /* Scanner switches */ int want_nl = 0; /* Request next newlinw */

1 0