February 2018 - Wine-commits

Nikolay Sivov : wincodecs/tests: Add a test for GetDecoderInfo() returned instance.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 44f787ed9265d9c1f86eb750a81a1e47243ac427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f787ed9265d9c1f86eb750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 09:38:44 2018 +0300 wincodecs/tests: Add a test for GetDecoderInfo() returned instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 5d0dc44..4a9c9c6 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -109,8 +109,8 @@ static void test_decoder_info(void) 1 }, }; + IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; - IWICBitmapDecoderInfo *decoder_info; HRESULT hr; ULONG len; WCHAR value[256]; @@ -122,9 +122,34 @@ static void test_decoder_info(void) for (i = 0; i < sizeof(decoder_info_tests)/sizeof(decoder_info_tests[0]); i++) { struct decoder_info_test *test = &decoder_info_tests[i]; + IWICBitmapDecoder *decoder, *decoder2; WCHAR extensionsW[64]; WCHAR mimetypeW[64]; + hr = CoCreateInstance(test->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); + ok(SUCCEEDED(hr), "Failed to create decoder, hr %#x.\n", hr); + + decoder_info = NULL; + hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info); + ok(hr == S_OK || broken(IsEqualCLSID(&CLSID_WICBmpDecoder, test->clsid) && FAILED(hr)) /* Fails on Windows */, + "%u: failed to get decoder info, hr %#x.\n", i, hr); + + if (hr == S_OK) + { + decoder_info2 = NULL; + hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info2); + ok(hr == S_OK, "Failed to get decoder info, hr %#x.\n", hr); + todo_wine + ok(decoder_info == decoder_info2, "Unexpected decoder info instance.\n"); + + hr = IWICBitmapDecoderInfo_QueryInterface(decoder_info, &IID_IWICBitmapDecoder, (void **)&decoder2); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IWICBitmapDecoderInfo_Release(decoder_info); + IWICBitmapDecoderInfo_Release(decoder_info2); + } + IWICBitmapDecoder_Release(decoder); + MultiByteToWideChar(CP_ACP, 0, test->mimetype, -1, mimetypeW, sizeof(mimetypeW)/sizeof(mimetypeW[0])); MultiByteToWideChar(CP_ACP, 0, test->extensions, -1, extensionsW, sizeof(extensionsW)/sizeof(extensionsW[0]));

1 0

Louis Lenders : kernel32: Add message resource for TRUST_E_NOSIGNATURE.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 1ae2036f24b92464610589ece5ed070625e8d276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae2036f24b92464610589ec… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Feb 26 00:34:25 2018 +0000 kernel32: Add message resource for TRUST_E_NOSIGNATURE. Based on a patch by Austin English. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 + dlls/kernel32/winerror.mc | 9 + po/ar.po | 1486 ++++++++++++++++++------------------- po/bg.po | 1484 ++++++++++++++++++------------------- po/ca.po | 1486 ++++++++++++++++++------------------- po/cs.po | 1484 ++++++++++++++++++------------------- po/da.po | 1486 ++++++++++++++++++------------------- po/de.po | 1486 ++++++++++++++++++------------------- po/el.po | 1484 ++++++++++++++++++------------------- po/en.po | 1484 ++++++++++++++++++------------------- po/en_US.po | 1484 ++++++++++++++++++------------------- po/eo.po | 1484 ++++++++++++++++++------------------- po/es.po | 1486 ++++++++++++++++++------------------- po/fa.po | 1484 ++++++++++++++++++------------------- po/fi.po | 1486 ++++++++++++++++++------------------- po/fr.po | 1486 ++++++++++++++++++------------------- po/he.po | 1484 ++++++++++++++++++------------------- po/hi.po | 1484 ++++++++++++++++++------------------- po/hr.po | 1486 ++++++++++++++++++------------------- po/hu.po | 1486 ++++++++++++++++++------------------- po/it.po | 1486 ++++++++++++++++++------------------- po/ja.po | 1486 ++++++++++++++++++------------------- po/ko.po | 1486 ++++++++++++++++++------------------- po/lt.po | 1486 ++++++++++++++++++------------------- po/ml.po | 1484 ++++++++++++++++++------------------- po/nb_NO.po | 1486 ++++++++++++++++++------------------- po/nl.po | 1486 ++++++++++++++++++------------------- po/or.po | 1484 ++++++++++++++++++------------------- po/pa.po | 1484 ++++++++++++++++++------------------- po/pl.po | 1486 ++++++++++++++++++------------------- po/pt_BR.po | 1486 ++++++++++++++++++------------------- po/pt_PT.po | 1486 ++++++++++++++++++------------------- po/rm.po | 1484 ++++++++++++++++++------------------- po/ro.po | 1486 ++++++++++++++++++------------------- po/ru.po | 1486 ++++++++++++++++++------------------- po/sk.po | 1484 ++++++++++++++++++------------------- po/sl.po | 1486 ++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 1484 ++++++++++++++++++------------------- po/sr_RS(a)latin.po | 1484 ++++++++++++++++++------------------- po/sv.po | 1486 ++++++++++++++++++------------------- po/te.po | 1484 ++++++++++++++++++------------------- po/th.po | 1484 ++++++++++++++++++------------------- po/tr.po | 1486 ++++++++++++++++++------------------- po/uk.po | 1488 +++++++++++++++++++------------------- po/wa.po | 1484 ++++++++++++++++++------------------- po/wine.pot | 1484 ++++++++++++++++++------------------- po/zh_CN.po | 1486 ++++++++++++++++++------------------- po/zh_TW.po | 1486 ++++++++++++++++++------------------- 48 files changed, 34289 insertions(+), 34042 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ae2036f24b924646105…

1 0

Michael Müller : w2_32: Ignore setting several port assignment related socket options.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 6fa715c2709c5418a21bd50d9f3a6fed229b032f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa715c2709c5418a21bd50d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 26 03:06:36 2018 +0000 w2_32: Ignore setting several port assignment related socket options. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 16 ++++++++++++++++ include/winsock.h | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e39901d..d983633 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5886,6 +5886,22 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; #endif + case WS_SO_RANDOMIZE_PORT: + FIXME("Ignoring WS_SO_RANDOMIZE_PORT\n"); + return 0; + + case WS_SO_PORT_SCALABILITY: + FIXME("Ignoring WS_SO_PORT_SCALABILITY\n"); + return 0; + + case WS_SO_REUSE_UNICASTPORT: + FIXME("Ignoring WS_SO_REUSE_UNICASTPORT\n"); + return 0; + + case WS_SO_REUSE_MULTICASTPORT: + FIXME("Ignoring WS_SO_REUSE_MULTICASTPORT\n"); + return 0; + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/include/winsock.h b/include/winsock.h index 8bb067f..891fa9d 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -672,6 +672,10 @@ typedef struct WS(WSAData) #define SO_TYPE 0x1008 #define SO_BSP_STATE 0x1009 +#define SO_RANDOMIZE_PORT 0x3005 +#define SO_PORT_SCALABILITY 0x3006 +#define SO_REUSE_UNICASTPORT 0x3007 +#define SO_REUSE_MULTICASTPORT 0x3008 #define IOCPARM_MASK 0x7f #define IOC_VOID 0x20000000 @@ -707,6 +711,11 @@ typedef struct WS(WSAData) #define WS_SO_TYPE 0x1008 #define WS_SO_BSP_STATE 0x1009 +#define WS_SO_RANDOMIZE_PORT 0x3005 +#define WS_SO_PORT_SCALABILITY 0x3006 +#define WS_SO_REUSE_UNICASTPORT 0x3007 +#define WS_SO_REUSE_MULTICASTPORT 0x3008 + #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000 #define WS_IOC_OUT 0x40000000

1 0

Henri Verbeet : wined3d: Pass a wined3d_rendertarget_info structure to context_find_fbo_entry().
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: b574fab087ed2903093b9c8263cb9c116e8f1fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b574fab087ed2903093b9c82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:48 2018 +0330 wined3d: Pass a wined3d_rendertarget_info structure to context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 122 ++++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b574fab087ed2903093b…

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set().
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: c86467bdadb4abb94ffa3527c4f0eff2a1c664c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86467bdadb4abb94ffa3527… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:49 2018 +0330 wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 36e69a9..9823de2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7567,9 +7567,9 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons /* Context activation is done by the caller. */ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context, - const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) + const struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_color_key *color_key) { - const struct wined3d_texture *texture = surface->container; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; struct wine_rb_entry *entry; @@ -7577,10 +7577,12 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine struct arbfp_blit_desc *desc; struct wined3d_color float_color_key[2]; struct wined3d_vec4 size; + unsigned int level; GLuint shader; - size.x = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - size.y = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + level = sub_resource_idx % texture->level_count; + size.x = wined3d_texture_get_level_pow2_width(texture, level); + size.y = wined3d_texture_get_level_pow2_height(texture, level); size.z = 1.0f; size.w = 1.0f; @@ -7875,7 +7877,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl color_key = &alpha_test_key; } - arbfp_blit_set(arbfp_blitter, context, src_surface, color_key); + arbfp_blit_set(arbfp_blitter, context, src_texture, src_sub_resource_idx, color_key); /* Draw a textured quad */ draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter);

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in arbfp_blitter_blit().
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: a9678a1a8c0a160b0e1378ef0581f1cdff322cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9678a1a8c0a160b0e1378ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:50 2018 +0330 wined3d: Explicitly calculate the sub-resource level in arbfp_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9823de2..f86c167 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7825,6 +7825,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl == WINED3D_LOCATION_DRAWABLE && !wined3d_resource_is_offscreen(&src_texture->resource)) { + unsigned int src_level = src_sub_resource_idx % src_texture->level_count; + /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can * flip in the blitter, we don't actually need that flip anyway. So we @@ -7833,8 +7835,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl surface_load_fb_texture(src_surface, FALSE, context); s = *src_rect; - s.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.top; - s.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.bottom; + s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; + s.bottom = wined3d_texture_get_level_height(src_texture, src_level) - s.bottom; src_rect = &s; } else

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in is_full_clear().
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 6e1606253264cdb7205e0ee6fb03212fe75ee14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e1606253264cdb7205e0ee6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:51 2018 +0330 wined3d: Explicitly calculate the sub-resource level in is_full_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e275e1..18b39b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -200,10 +200,14 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) +static BOOL is_full_clear(const struct wined3d_texture *texture, unsigned int sub_resource_idx, + const RECT *draw_rect, const RECT *clear_rect) { - unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); - unsigned int width = wined3d_texture_get_level_width(target->container, target->texture_level); + unsigned int width, height, level; + + level = sub_resource_idx % texture->level_count; + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); /* partial draw rect */ if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) @@ -262,7 +266,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rt, rtv->sub_resource_idx, + draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); @@ -289,7 +294,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) - && !is_full_clear(depth_stencil, draw_rect, rect_count ? clear_rect : NULL)) + && !is_full_clear(ds, dsv->sub_resource_idx, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); else wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location);

1 0

Nikolay Sivov : avifil32: Remove some redundant statements.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 7675ce7550f20a5f6b2150b0c20211e2092be528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7675ce7550f20a5f6b2150b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:33:25 2018 +0300 avifil32: Remove some redundant statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/tmpfile.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 2e0fa2f..a4df628 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -282,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c8580a8..be4a2a9 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -134,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ee7e772..6d199c7 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -94,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref;

1 0

Nikolay Sivov : explorerframe: Use global memory allocation helpers.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 9e8f152dc9adf6bacd961c507da908c1aa184105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8f152dc9adf6bacd961c50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:34:08 2018 +0300 explorerframe: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 15d2f26..37e1a55 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorerframe_main.h" @@ -861,9 +862,8 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); EFRAME_UnlockModule(); - return 0; } return ref; @@ -1001,7 +1001,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = HeapAlloc(GetProcessHeap(), 0, sizeof(nstc_root)); + new_root = heap_alloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - HeapFree(GetProcessHeap(), 0, new_root); + heap_free(new_root); return E_FAIL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - HeapFree(GetProcessHeap(), 0, root); + heap_free(root); return S_OK; } else @@ -1135,7 +1135,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); + array = heap_alloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1149,7 +1149,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return hr; } @@ -1610,7 +1610,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + nstc = heap_alloc_zero(sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : explorerframe/tests: Use global memory allocation helpers.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 4f35819843da7ce3f8a36faa2c44f5af25018768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f35819843da7ce3f8a36faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:34:09 2018 +0300 explorerframe/tests: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/msg.h | 12 +++++------- dlls/explorerframe/tests/nstc.c | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index f5e20f7..857278e 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,6 +20,7 @@ #include <assert.h> #include <windows.h> +#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -66,16 +67,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - msg_seq->sequence, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -92,7 +90,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, msg_seq->sequence); + heap_free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -112,5 +110,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct msg_sequence)); + seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 1d1673c..44bdf31 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -363,7 +363,8 @@ static const INameSpaceTreeControlEventsVtbl vt_NSTCEvents = { static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(INameSpaceTreeControlEventsImpl)); + + This = heap_alloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2377,8 +2378,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - HeapFree(GetProcessHeap(), 0, pnstceimpl); - HeapFree(GetProcessHeap(), 0, pnstceimpl2); + heap_free(pnstceimpl); + heap_free(pnstceimpl2); } IShellItem_Release(psi);

1 0