Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/windows.globalization/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 1c41e77d41b..b124f79c644 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -183,7 +183,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_GetMany(IVectorView_HSTRING *ifa
TRACE("iface %p, start_index %#x, items %p, count %p.\n", iface, start_index, items, count);
- memset(items, 0, items_size * sizeof(HSTRING *)); + memset(items, 0, items_size * sizeof(*items));
for (i = start_index; i < impl->count && i < start_index + items_size; ++i) if (FAILED(hr = WindowsDuplicateString(impl->values[i], items + i - start_index)))
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/aclui/aclui_main.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 43171d70410..8fd3db4d58c 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -120,7 +120,10 @@ static void add_user(struct security_page *page, PSID sid) return;
if (!(new_array = realloc(page->users, (page->user_count + 1) * sizeof(*page->users)))) + { + free(name); return; + } page->users = new_array; user = &page->users[page->user_count++];
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/ddraw/tests/ddraw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5536625abdd..a1d4dd942fa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1342,9 +1342,9 @@ static void test_depth_blit(const GUID *device_guid) hr = IDirectDrawSurface_GetSurfaceDesc(ds1, &ddsd_existing); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; if (is_software_device_type(device_guid)) ddsd_new.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; ddsd_new.dwHeight = ddsd_existing.dwHeight; ddsd_new.ddpfPixelFormat = ddsd_existing.ddpfPixelFormat;
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 1 + 2 files changed, 4 insertions(+)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 44a61aba1ef..d25ba2dd06b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4484,7 +4484,10 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat }
if (FAILED(hr)) + { + release_font_data(font_data); break; + } }
IDWriteFontFileStream_Release(stream); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 825e323b468..2a0b69400f4 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1590,6 +1590,7 @@ static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) index++; }
+ heap_free(value); heap_free(name);
*ret = paths;
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com