December 2018 - Wine-commits

Paul Gofman : d3d8: Fix crash in d3d8_vertexbuffer_Release().
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: 90bd6dc3eedda2c65308258ca49056d006fae222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bd6dc3eedda2c65308258c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:24 2018 +0300 d3d8: Fix crash in d3d8_vertexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 58aaff2..887ecf4 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -74,12 +74,13 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Paul Gofman : d3d8: Fix crash in d3d8_indexbuffer_Release().
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: f6896e062d30d6d5d6d94a34e3a622c83aa9d3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6896e062d30d6d5d6d94a34… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:25 2018 +0300 d3d8: Fix crash in d3d8_indexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 887ecf4..3b98000 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -395,12 +395,13 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Zebediah Figura : dinput: Move the version resource to a separate file.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: a8ce68333cc905c3f1c93eef6f4a2e24dd59c101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ce68333cc905c3f1c93eef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:11 2018 -0600 dinput: Move the version resource to a separate file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 4 +++- dlls/dinput/dinput.rc | 9 --------- dlls/dinput/version.rc | 26 ++++++++++++++++++++++++++ po/ar.po | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/ca.po | 22 +++++++++++----------- po/cs.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/en.po | 22 +++++++++++----------- po/en_US.po | 22 +++++++++++----------- po/eo.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/fa.po | 22 +++++++++++----------- po/fi.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 22 +++++++++++----------- po/hr.po | 22 +++++++++++----------- po/hu.po | 22 +++++++++++----------- po/it.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/lt.po | 22 +++++++++++----------- po/ml.po | 22 +++++++++++----------- po/nb_NO.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/or.po | 22 +++++++++++----------- po/pa.po | 22 +++++++++++----------- po/pl.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/pt_PT.po | 22 +++++++++++----------- po/rm.po | 22 +++++++++++----------- po/ro.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/sk.po | 22 +++++++++++----------- po/sl.po | 22 +++++++++++----------- po/sr_RS(a)cyrillic.po | 22 +++++++++++----------- po/sr_RS(a)latin.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- po/te.po | 22 +++++++++++----------- po/th.po | 22 +++++++++++----------- po/tr.po | 22 +++++++++++----------- po/uk.po | 22 +++++++++++----------- po/wa.po | 22 +++++++++++----------- po/wine.pot | 22 +++++++++++----------- po/zh_CN.po | 22 +++++++++++----------- po/zh_TW.po | 22 +++++++++++----------- 49 files changed, 535 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ce68333cc905c3f1c9…

1 0

Zebediah Figura : dinput8: Include common resources from dinput.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: feb23d367f7b3d457053b8f48237e6abe9ef9231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb23d367f7b3d457053b8f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:12 2018 -0600 dinput8: Include common resources from dinput. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 6b62969..53cd0c3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -20,4 +20,5 @@ C_SRCS = \ IDL_SRCS = dinput8.idl -RC_SRCS = version.rc +RC_SRCS = \ + version.rc

1 0

Zebediah Figura : dinput: Use the global module instance handle to load resources.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: d507549038f7e0555e077ab9374eb16b8f7b06db URL: https://source.winehq.org/git/wine.git/?a=commit;h=d507549038f7e0555e077ab9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:13 2018 -0600 dinput: Use the global module instance handle to load resources. This fixes a regression introduced by 56345c8757887431ada9f2347b43fc372d72872a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46323 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 8 ++++---- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index bb36db0..885f1f4 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -86,7 +86,6 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev */ static void init_listview_columns(HWND dialog) { - HINSTANCE hinstance = (HINSTANCE) GetWindowLongPtrW(dialog, GWLP_HINSTANCE); LVCOLUMNW listColumn; RECT viewRect; int width; @@ -95,7 +94,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); width = (viewRect.right - viewRect.left)/2; - LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); + LoadStringW(DINPUT_instance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -103,7 +102,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); + LoadStringW(DINPUT_instance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); listColumn.cx = width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -453,7 +452,8 @@ HRESULT _configure_devices(IDirectInput8W *iface, InitCommonControls(); - DialogBoxParamW(GetModuleHandleA("dinput.dll"), (LPCWSTR) MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM) &data); + DialogBoxParamW(DINPUT_instance, (const WCHAR *)MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), + lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM)&data); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6ed764e..7074704 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -93,7 +93,7 @@ static const struct dinput_device *dinput_devices[] = &joystick_osx_device }; -static HINSTANCE DINPUT_instance = NULL; +HINSTANCE DINPUT_instance; static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 6c93e16..abdfbeb 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -27,6 +27,8 @@ #include "dinputd.h" #include "wine/list.h" +extern HINSTANCE DINPUT_instance; + /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; struct IDirectInputImpl

1 0

Serge Gautherie : d3dcompiler: Fix dxbc_init() function prototype.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: ffe9346120ca74f193d8a31d0b6a48eb55604d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe9346120ca74f193d8a31d… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Dec 19 23:06:46 2018 +0100 d3dcompiler: Fix dxbc_init() function prototype. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1eea0d2..68ff962 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1214,7 +1214,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) DECLSPEC_HIDDEN; void dxbc_destroy(struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) DECLSPEC_HIDDEN; -HRESULT dxbc_init(struct dxbc *dxbc, DWORD count) DECLSPEC_HIDDEN; +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b872e34..95a1dbd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; } -HRESULT dxbc_init(struct dxbc *dxbc, UINT size) +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) { TRACE("dxbc %p, size %u.\n", dxbc, size);

1 0

Zhiyi Zhang : vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: ee61493d9c3b253a9aebd5bae33ef8f32c7e77fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee61493d9c3b253a9aebd5ba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 19 23:15:12 2018 +0100 vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 4143af7..9a93e2a 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -158,6 +158,69 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void test_enumerate_physical_device2(void) +{ + static const char *procs[] = {"vkGetPhysicalDeviceProperties2", "vkGetPhysicalDeviceProperties2KHR"}; + static const char *extensions[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}; + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance; + unsigned int i, j; + const LUID *luid; + uint32_t count; + VkResult vr; + + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + return; + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < ARRAY_SIZE(procs); ++i) + { + pfn_vkGetPhysicalDeviceProperties2 + = (PFN_vkGetPhysicalDeviceProperties2)vkGetInstanceProcAddr(vk_instance, procs[i]); + if (!pfn_vkGetPhysicalDeviceProperties2) + { + skip("%s is not available.\n", procs[i]); + continue; + } + + for (j = 0; j < count; ++j) + { + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + memset(&id, 0, sizeof(id)); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); + luid = (const LUID *)id.deviceLUID; + trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", + properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), + wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + } + } + + heap_free(vk_physical_devices); + vkDestroyInstance(vk_instance, NULL); +} + static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) { VkPhysicalDeviceProperties device_properties; @@ -359,6 +422,7 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + test_enumerate_physical_device2(); for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool);

1 0

Daniel Lehman : gdi32: Fix memory leak (Valgrind).
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: 3b8fde3f0840af271cd0c1db4501e4e8261c05a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8fde3f0840af271cd0c1db… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Dec 19 21:35:05 2018 -0800 gdi32: Fix memory leak (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 0acb23f..a84be82 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1035,6 +1035,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } + free_dib_info( &src_dib ); if (tmp_rgn) DeleteObject( tmp_rgn ); return ret;

1 0

Huw Davies : gdi32: Try to update the default families with fonts that exist.
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: f59755755e90220ccb27db56e169401f509bb227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59755755e90220ccb27db56… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 10:32:14 2018 +0000 gdi32: Try to update the default families with fonts that exist. Based on a patch by Akihiro Sagawa. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46285 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46244 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ebecf79..9f6bdfe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -482,10 +482,6 @@ static inline struct freetype_physdev *get_freetype_dev( PHYSDEV dev ) static const struct gdi_dc_funcs freetype_funcs; -static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; -static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -557,6 +553,10 @@ static const WCHAR *default_sans_list[] = NULL }; +static const WCHAR *default_serif = times_new_roman; +static const WCHAR *default_fixed = courier_new; +static const WCHAR *default_sans = arial; + typedef struct { WCHAR *name; INT charset; @@ -4341,22 +4341,24 @@ static BOOL move_to_front(const WCHAR *name) return FALSE; } -static BOOL set_default(const WCHAR **name_list) +static const WCHAR *set_default(const WCHAR **name_list) { - while (*name_list) + const WCHAR **entry = name_list; + + while (*entry) { - if (move_to_front(*name_list)) return TRUE; - name_list++; + if (move_to_front(*entry)) return *entry; + entry++; } - return FALSE; + return *name_list; } static void reorder_font_list(void) { - set_default( default_serif_list ); - set_default( default_fixed_list ); - set_default( default_sans_list ); + default_serif = set_default( default_serif_list ); + default_fixed = set_default( default_fixed_list ); + default_sans = set_default( default_sans_list ); } /************************************************************* @@ -5649,13 +5651,13 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if((lf.lfPitchAndFamily & FIXED_PITCH) || (lf.lfPitchAndFamily & 0xF0) == FF_MODERN) - strcpyW(lf.lfFaceName, defFixed); + strcpyW(lf.lfFaceName, default_fixed); else if((lf.lfPitchAndFamily & 0xF0) == FF_ROMAN) - strcpyW(lf.lfFaceName, defSerif); + strcpyW(lf.lfFaceName, default_serif); else if((lf.lfPitchAndFamily & 0xF0) == FF_SWISS) - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); else - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { if(!strncmpiW(family->FamilyName, lf.lfFaceName, LF_FACESIZE - 1)) { font_link = find_font_link(family->FamilyName);

1 0

Nikolay Sivov : urlmon/tests: Fix some leaks (Valgrind).
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: f19fdad2ba18c6e2c2c30c10b1bfb61442377a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f19fdad2ba18c6e2c2c30c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:09 2018 +0300 urlmon/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3c5e27c..b62f247 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -8366,6 +8366,7 @@ static void test_IUri_GetPropertyLength(void) { /* Value may be unicode encoded */ expectedValueW = a2w(prop.value); expectedLen = lstrlenW(expectedValueW); + heap_free(expectedValueW); /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; @@ -11538,6 +11539,7 @@ static void test_IPersistStream(void) ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + IUri_Release(uri); hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); hr = IUri_GetRawUri(uri, &raw_uri);

1 0