April 2020 - Wine-Commits - list.winehq.org

Andrew Eikum : winmm/tests: Test mmioOpen with long file name.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ca092dcf819174699f9bb1af45a285dff2f6ac81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca092dcf819174699f9bb1af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 13:24:04 2020 -0500 winmm/tests: Test mmioOpen with long file name. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mmio.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c319c5..e3984fbaf3 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -471,6 +471,58 @@ static void test_mmioOpen(char *fname) mmioClose(hmmio, 0); } +static void test_mmioOpen_create(void) +{ + HMMIO hmmio; + HANDLE handle; + WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; + /* According to docs, filename must be no more than 128 bytes, but it will + * actually allow longer than that. */ + WCHAR filename[] = L"very_long_filename_" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + SetCurrentDirectoryW(temp_dir); + + DeleteFileW(filename); + + /* open with MMIO_DENYNONE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* MMIO_DENYNONE lets us open it here, too */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + /* open with MMIO_EXCLUSIVE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* should fail due to MMIO_EXCLUSIVE */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); + if(handle != INVALID_HANDLE_VALUE) + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + SetCurrentDirectoryW(cwd); +} + static void test_mmioSetBuffer(char *fname) { char buf[256]; @@ -1016,6 +1068,7 @@ START_TEST(mmio) test_mmioDescend(fname); test_mmioOpen(NULL); test_mmioOpen(fname); + test_mmioOpen_create(); test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc();

1 0

Jacek Caban : include: Avoid _onexit_t redefinition.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: d45e36f5f8253a3e122f874ceb707387f1ef5b33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e36f5f8253a3e122f874c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 20:26:49 2020 +0200 include: Avoid _onexit_t redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48888 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 3 +++ include/msvcrt/stdlib.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index 064f6fca27..58450b94ca 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -32,7 +32,10 @@ typedef struct _onexit_table_t { _PVFV *_end; } _onexit_table_t; +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif struct _exception; typedef int (__cdecl *_UserMathErrorFunctionPointer)(struct _exception *); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f73f2ae384..2ce4789350 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -136,7 +136,10 @@ errno_t __cdecl _get_errno(int*); errno_t __cdecl _set_doserrno(int); errno_t __cdecl _set_errno(int); +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif int __cdecl _atodbl(_CRT_DOUBLE*,char*);

1 0

Jactry Zeng : qasf: Implement WM ASF reader stub.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: b15298c2daf2ebd6bd46a759db6b7d6a5597b463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15298c2daf2ebd6bd46a759… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 6 11:54:05 2020 -0500 qasf: Implement WM ASF reader stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 1 + dlls/qasf/asfreader.c | 67 ++++++++++++++++ dlls/qasf/qasf_classes.idl | 7 ++ dlls/qasf/qasf_main.c | 3 + dlls/qasf/qasf_private.h | 1 + dlls/qasf/tests/Makefile.in | 1 + dlls/qasf/tests/asfreader.c | 192 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 272 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15298c2daf2ebd6bd46…

1 0

Jacek Caban : dbghelp: Always build all loader backends.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 131fb79535c74e8011ac82c279f6f4a9d971e1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=131fb79535c74e8011ac82c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 19:42:26 2020 +0200 dbghelp: Always build all loader backends. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 28 ---------------------------- dlls/dbghelp/macho_module.c | 14 -------------- 2 files changed, 42 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 96c7484cef..72e9d2124a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -19,13 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#if defined(__svr4__) || defined(__sun) -#define __ELF__ 1 -#endif - #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -37,8 +30,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#ifdef __ELF__ - #define ELF_INFO_DEBUG_HEADER 0x0001 #define ELF_INFO_MODULE 0x0002 #define ELF_INFO_NAME 0x0004 @@ -1778,22 +1769,3 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) pcs->loader = &elf_loader_ops; return TRUE; } - -#else /* !__ELF__ */ - -BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) -{ - return FALSE; -} - -BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) -{ - return FALSE; -} - -int elf_is_in_thunk_area(ULONG_PTR addr, - const struct elf_thunk_area* thunks) -{ - return -1; -} -#endif /* __ELF__ */ diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 3ef65af7c9..4baf444f9e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <assert.h> #include <stdarg.h> @@ -42,8 +39,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#ifdef HAVE_MACH_O_LOADER_H - struct dyld_image_info32 { UINT32 imageLoadAddress; /* const struct mach_header* */ @@ -1933,12 +1928,3 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) TRACE("Found macho debug header %#lx\n", pcs->dbg_hdr_addr); return TRUE; } - -#else /* HAVE_MACH_O_LOADER_H */ - -BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) -{ - return FALSE; -} - -#endif /* HAVE_MACH_O_LOADER_H */

1 0

Chip Davis : d3d11: Introduce a function to convert a wined3d feature level to a D3D feature level.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ad61b1a62035bd74a46534262bb2868cf3d38d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad61b1a62035bd74a4653426… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:58 2020 -0500 d3d11: Introduce a function to convert a wined3d feature level to a D3D feature level. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index bc411b0b9f..6f8257078d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6078,6 +6078,11 @@ static inline struct d3d_device *device_from_wined3d_device_parent(struct wined3 return CONTAINING_RECORD(device_parent, struct d3d_device, device_parent); } +static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) +{ + return (D3D_FEATURE_LEVEL)level; +} + static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, struct wined3d_device *wined3d_device) { @@ -6088,7 +6093,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; - device->feature_level = wined3d_device_get_feature_level(wined3d_device); + device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device)); set_default_depth_stencil_state(wined3d_device); }

1 0

Chip Davis : d3d10core/tests: Use compare_uint() in a few more places.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 4b19ef0b74747814cec30bd4d6d6bfedda746a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b19ef0b74747814cec30bd4… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 10:58:45 2020 -0500 d3d10core/tests: Use compare_uint() in a few more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 8332257d37..97a00a0715 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -814,7 +814,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u8(rb, x, y); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -846,7 +846,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u16(rb, x, y); - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -878,7 +878,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback for (x = rect->left; x < rect->right; ++x) { value = get_readback_u32(rb, x, y) >> shift; - if (abs((int)value - (int)expected_value) > max_diff) + if (!compare_uint(value, expected_value, max_diff)) goto done; } } @@ -15855,7 +15855,7 @@ static void test_depth_bias(void) u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - all_match = abs(u32_value - expected_value) <= 3; + all_match = compare_uint(u32_value, expected_value, 3); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, @@ -15864,7 +15864,7 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - all_match = abs(*u16 - expected_value) <= 1; + all_match = compare_uint(*u16, expected_value, 1); ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f);

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 fill modes to wined3d.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: a6529ff876043d03bdee124c7b3dad195a2c82c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6529ff876043d03bdee124c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:04 2020 -0500 d3d11: Introduce a function to convert D3D11 fill modes to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index eb3080d55c..b4bcf63094 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1071,6 +1071,11 @@ static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = d3d_rasterizer_state_wined3d_object_destroyed, }; +static enum wined3d_fill_mode wined3d_fill_mode_from_d3d11(D3D11_FILL_MODE mode) +{ + return (enum wined3d_fill_mode)mode; +} + static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -1090,7 +1095,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return E_FAIL; } - wined3d_desc.fill_mode = desc->FillMode; + wined3d_desc.fill_mode = wined3d_fill_mode_from_d3d11(desc->FillMode); wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_bias = desc->DepthBias;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend ops to wined3d.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 07832261b5001cc7e581cfc17f65eb0c63f6e2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07832261b5001cc7e581cfc1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:03 2020 -0500 d3d11: Introduce a function to convert D3D11 blend ops to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index da2768880f..eb3080d55c 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -308,6 +308,11 @@ static enum wined3d_blend wined3d_blend_from_d3d11(D3D11_BLEND factor) return (enum wined3d_blend)factor; } +static enum wined3d_blend_op wined3d_blend_op_from_d3d11(D3D11_BLEND_OP op) +{ + return (enum wined3d_blend_op)op; +} + HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, struct d3d_blend_state **state) { @@ -392,10 +397,10 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; wined3d_desc.rt[i].src = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlend); wined3d_desc.rt[i].dst = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlend); - wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; + wined3d_desc.rt[i].op = wined3d_blend_op_from_d3d11(desc->RenderTarget[i].BlendOp); wined3d_desc.rt[i].src_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlendAlpha); wined3d_desc.rt[i].dst_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlendAlpha); - wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; + wined3d_desc.rt[i].op_alpha = wined3d_blend_op_from_d3d11(desc->RenderTarget[i].BlendOpAlpha); wined3d_desc.rt[i].writemask = desc->RenderTarget[i].RenderTargetWriteMask; }

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend factors to wined3d.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: b5d178c0289119cd36778656c58232cc867f8608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d178c0289119cd36778656… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:02 2020 -0500 d3d11: Introduce a function to convert D3D11 blend factors to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d48d62e0a8..da2768880f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -303,6 +303,11 @@ static const struct wined3d_parent_ops d3d_blend_state_wined3d_parent_ops = d3d_blend_state_wined3d_object_destroyed, }; +static enum wined3d_blend wined3d_blend_from_d3d11(D3D11_BLEND factor) +{ + return (enum wined3d_blend)factor; +} + HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, struct d3d_blend_state **state) { @@ -385,11 +390,11 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; - wined3d_desc.rt[i].src = desc->RenderTarget[i].SrcBlend; - wined3d_desc.rt[i].dst = desc->RenderTarget[i].DestBlend; + wined3d_desc.rt[i].src = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlend); + wined3d_desc.rt[i].dst = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlend); wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; - wined3d_desc.rt[i].src_alpha = desc->RenderTarget[i].SrcBlendAlpha; - wined3d_desc.rt[i].dst_alpha = desc->RenderTarget[i].DestBlendAlpha; + wined3d_desc.rt[i].src_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlendAlpha); + wined3d_desc.rt[i].dst_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlendAlpha); wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; wined3d_desc.rt[i].writemask = desc->RenderTarget[i].RenderTargetWriteMask; }

1 0

Dmitry Timoshkov : adsldp: Always fully initialize returned column values.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 0d15fb330d891a0f03470e14e40abaae48e33bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d15fb330d891a0f03470e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:44 2020 +0800 adsldp: Always fully initialize returned column values. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index a4467c0abe..2b5f621fba 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1393,13 +1393,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1421,13 +1418,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1459,13 +1453,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1488,13 +1479,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_values_len(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_free_len(values); @@ -1533,6 +1521,8 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + memset(col, 0, sizeof(*col)); + if (!wcsicmp(name, L"ADsPath")) { WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry);

1 0