wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Nikolay Sivov : dwrite: Use OpenType 1.8 'head' table structure.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 08a729fc152762cdbb22fa07ddf3e219ff84e63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a729fc152762cdbb22fa07d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:54:13 2017 +0300 dwrite: Use OpenType 1.8 'head' table structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 ++- dlls/dwrite/tests/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c829813..f4ed51f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -113,7 +113,8 @@ enum OPENTYPE_CMAP_TABLE_FORMAT #include "pshpack2.h" typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; ULONG revision; ULONG checksumadj; ULONG magic; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba9866a..9382569 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -113,7 +113,8 @@ static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o',' #include "pshpack2.h" typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; ULONG revision; ULONG checksumadj; ULONG magic;

1 0

Nikolay Sivov : wshom: Added IProvideClassInfo support for implemented interfaces.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 722c28cb5de076a4894a0a23500b160531a8b744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722c28cb5de076a4894a0a235… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:50:36 2017 +0300 wshom: Added IProvideClassInfo support for implemented interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 93 +++++++++++++++++++++++++++++------------- dlls/wshom.ocx/tests/wshom.c | 31 +++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 8 ++++ dlls/wshom.ocx/wshom.idl | 8 ++++ dlls/wshom.ocx/wshom_main.c | 72 ++++++++++++++++++++++++++++++-- dlls/wshom.ocx/wshom_private.h | 9 ++++ 6 files changed, 189 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=722c28cb5de076a4894a0…

1 0

Henri Verbeet : ddraw: Kill stray tabs.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 31fcbb6bf2fc65ec5e6b1ac735c6a043b85b5a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fcbb6bf2fc65ec5e6b1ac73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:28 2017 +0100 ddraw: Kill stray tabs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 75 ++++++++++++++++++++++------------------------ dlls/ddraw/main.c | 6 ---- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 09226cd..98e9404 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -75,12 +75,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, for (;;) { D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; - BYTE size; - WORD count; - - count = current->wCount; - size = current->bSize; - instr += sizeof(D3DINSTRUCTION); + BYTE size; + WORD count; + + count = current->wCount; + size = current->bSize; + instr += sizeof(*current); primitive_size = 0; switch (current->bOpcode) @@ -203,10 +203,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; } - case D3DOP_MATRIXLOAD: - WARN("MATRIXLOAD-s (%d)\n", count); - instr += count * size; - break; + case D3DOP_MATRIXLOAD: + WARN("MATRIXLOAD-s (%u)\n", count); + instr += count * size; + break; case D3DOP_MATRIXMULTIPLY: TRACE("MATRIXMULTIPLY (%d)\n", count); @@ -351,19 +351,15 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - case D3DOP_TEXTURELOAD: { - WARN("TEXTURELOAD-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_TEXTURELOAD: + WARN("TEXTURELOAD-s (%u)\n", count); + instr += count * size; + break; - case D3DOP_EXIT: { - TRACE("EXIT (%d)\n", count); - /* We did this instruction */ - instr += size; - /* Exit this loop */ - goto end_of_buffer; - } break; + case D3DOP_EXIT: + TRACE("EXIT (%u)\n", count); + instr += size; + goto end_of_buffer; case D3DOP_BRANCHFORWARD: TRACE("BRANCHFORWARD (%d)\n", count); @@ -380,26 +376,28 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr = (char*)current + ci->dwOffset; break; } - } - } else { - if (ci->bNegate) { + } + } + else + { + if (ci->bNegate) + { TRACE(" Branch to %d\n", ci->dwOffset); if (ci->dwOffset) { instr = (char*)current + ci->dwOffset; break; } - } - } + } + } - instr += size; + instr += size; } break; - case D3DOP_SPAN: { - WARN("SPAN-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_SPAN: + WARN("SPAN-s (%u)\n", count); + instr += count * size; + break; case D3DOP_SETSTATUS: TRACE("SETSTATUS (%d)\n", count); @@ -410,12 +408,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - default: - ERR("Unhandled OpCode %d !!!\n",current->bOpcode); - /* Try to save ... */ - instr += count * size; - break; - } + default: + ERR("Unhandled OpCode %#x.\n",current->bOpcode); + instr += count * size; + break; + } } end_of_buffer: diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index bb9e37f..4c94dd1 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -748,17 +748,11 @@ HRESULT WINAPI DllCanUnloadNow(void) } -/*********************************************************************** - * DllRegisterServer (DDRAW.@) - */ HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); } -/*********************************************************************** - * DllUnregisterServer (DDRAW.@) - */ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance );

1 0

Henri Verbeet : wined3d: Get rid of surface_load_ds_location().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 1bd56b6ca5638cdf026938eb89fac0ccfd24874b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd56b6ca5638cdf026938eb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:27 2017 +0100 wined3d: Get rid of surface_load_ds_location(). This should be unused now that "AlwaysOffscreen" is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 186 ------------------------------------- dlls/wined3d/glsl_shader.c | 179 ------------------------------------ dlls/wined3d/shader.c | 5 - dlls/wined3d/surface.c | 188 -------------------------------------- dlls/wined3d/wined3d_private.h | 3 - 5 files changed, 561 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bd56b6ca5638cdf02693…

1 0

Henri Verbeet : wined3d: Get rid of the "AlwaysOffscreen" setting.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: ff85cd5f4af3408e35bbfd51446c4ea516856e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff85cd5f4af3408e35bbfd514… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:26 2017 +0100 wined3d: Get rid of the "AlwaysOffscreen" setting. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 ++--- dlls/wined3d/swapchain.c | 21 --------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_main.c | 7 ------- dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6112b40..b4e40fd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1752,7 +1752,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (color_format->id == WINED3DFMT_P8_UINT) color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); - /* When "always_offscreen" is enabled, we only use the drawable for + /* When using FBOs for off-screen rendering, we only use the drawable for * presentation blits, and don't do any rendering to it. That means we * don't need depth or stencil buffers, and can mostly ignore the render * target format. This wouldn't necessarily be quite correct for 10bpc @@ -1760,8 +1760,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, * Using the same format regardless of the color/depth/stencil targets * makes it much less likely that different wined3d instances will set * conflicting pixel formats. */ - if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER - && wined3d_settings.always_offscreen) + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) { color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN, WINED3DUSAGE_DEPTHSTENCIL); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 06215fc..e52ab41 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -749,8 +749,6 @@ static const struct wined3d_swapchain_ops swapchain_gdi_ops = static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) { - RECT client_rect; - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -761,25 +759,6 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) return; } - GetClientRect(swapchain->win_handle, &client_rect); - - TRACE("Backbuffer %ux%u, window %ux%u.\n", - swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height, - client_rect.right, client_rect.bottom); - TRACE("Multisample type %#x, quality %#x.\n", - swapchain->desc.multisample_type, - swapchain->desc.multisample_quality); - - if (!wined3d_settings.always_offscreen && !swapchain->desc.multisample_type - && swapchain->desc.backbuffer_width == client_rect.right - && swapchain->desc.backbuffer_height == client_rect.bottom) - { - TRACE("Backbuffer dimensions match window dimensions, rendering onscreen.\n"); - swapchain->render_to_fbo = FALSE; - return; - } - TRACE("Rendering to FBO.\n"); swapchain->render_to_fbo = TRUE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da003e1..b4267ed 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1366,7 +1366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (!texture->swapchain && wined3d_settings.always_offscreen) + if (!texture->swapchain && wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) ERR("Texture %p does not have a drawable.\n", texture); return TRUE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index eb566bc..442a970 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,7 +82,6 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ - TRUE, /* Don't try to render onscreen by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ @@ -304,12 +303,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; } - if (!get_config_key(hkey, appkey, "AlwaysOffscreen", buffer, size) - && !strcmp(buffer,"disabled")) - { - TRACE("Not always rendering backbuffers offscreen.\n"); - wined3d_settings.always_offscreen = FALSE; - } if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 271c605..71c9523 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -298,7 +298,6 @@ struct wined3d_settings int allow_multisampling; unsigned int sample_count; BOOL strict_draw_ordering; - BOOL always_offscreen; BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_hs;

1 0

Henri Verbeet : wined3d: Use the depth/ stencil view to acquire a context for depth-only draws.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: c93f2e3f8544d4c4fcfe24bb894bdf7661ba4fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93f2e3f8544d4c4fcfe24bb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:25 2017 +0100 wined3d: Use the depth/stencil view to acquire a context for depth-only draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ebccb1d..9be696b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -414,8 +414,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; + struct wined3d_rendertarget_view *dsv, *rtv; struct wined3d_stream_info si_emulated; - struct wined3d_rendertarget_view *dsv; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; unsigned int i, idx_size = 0; @@ -425,7 +425,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!index_count) return; - context = context_acquire(device, wined3d_rendertarget_view_get_surface(fb->render_targets[0])); + if (!(rtv = fb->render_targets[0])) + rtv = fb->depth_stencil; + context = context_acquire(device, wined3d_rendertarget_view_get_surface(rtv)); if (!context->valid) { context_release(context); @@ -436,10 +438,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; struct wined3d_texture *rt; - if (!rtv || rtv->format->id == WINED3DFMT_NULL) + if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; rt = wined3d_texture_from_resource(rtv->resource);

1 0

Henri Verbeet : wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 87c6ac4258bb7b741d4a5eff950807ca1a3e0d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c6ac4258bb7b741d4a5eff9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:24 2017 +0100 wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill(). shader_glsl_add_src_param() already adds floatBitsToUint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8d208e..40bbfdc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5450,7 +5450,7 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(floatBitsToUint(%s))) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); } else {

1 0

Huw Davies : schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: bdec0b20317b413514663c041ceac7f206ea4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec0b20317b413514663c041… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 23 11:01:46 2017 +0000 schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 7aeea17..044118e 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -148,7 +148,9 @@ START_TEST(rpcapi) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = SchRpcDelete(Wine, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + broken(hr == S_OK), /* Early versions of Win 10 */ + "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = SchRpcDelete(empty, 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr);

1 0

Zebediah Figura : ws2_32/tests: Fix memcmp size in test_TransmitFile().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: b655102ca38dd8120d5437d6aeae9289eb37cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b655102ca38dd8120d5437d6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 22 15:25:04 2017 -0600 ws2_32/tests: Fix memcmp size in test_TransmitFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5856718..7208088 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8296,17 +8296,17 @@ static void test_TransmitFile(void) /* Test TransmitFile with only buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); bret = pTransmitFile(client, NULL, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); iret = recv(dest, buf, sizeof(buf), 0); - ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, + ok(iret == sizeof(header_msg)+sizeof(footer_msg), "Returned an unexpected buffer from TransmitFile: %d\n", iret ); - ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); - ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, + ok(memcmp(&buf[sizeof(header_msg)], &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with only file data */ @@ -8316,18 +8316,18 @@ static void test_TransmitFile(void) /* Test TransmitFile with both file and buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test overlapped TransmitFile */ @@ -8381,9 +8381,9 @@ static void test_TransmitFile(void) goto cleanup; } buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 0; bret = pTransmitFile(client, file, 0, 0, &ov, &buffers, 0); @@ -8396,12 +8396,12 @@ static void test_TransmitFile(void) ok(total_sent == (file_size + buffers.HeadLength + buffers.TailLength), "Overlapped TransmitFile sent an unexpected number of bytes (%d != %d).\n", total_sent, file_size + buffers.HeadLength + buffers.TailLength); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with a UDP datagram socket */

1 0

Jacek Caban : mshtml: Initialize nsAString in IHTMLDocument3::get_dir.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 4823119a79152f7cf3808b9744e2143776970edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4823119a79152f7cf3808b974… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 13:26:25 2017 +0100 mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 47e087d..cf9344f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2207,6 +2207,7 @@ static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) return E_UNEXPECTED; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017