March 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll: RtlFindActivationContextSectionString should accept a NULL pointer as data.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: ab91c011121b76bcc46fc7e3b3addefd1b3acca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab91c011121b76bcc46fc7e3b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 16 03:38:58 2015 +0100 ntdll: RtlFindActivationContextSectionString should accept a NULL pointer as data. --- dlls/kernel32/actctx.c | 8 ++++- dlls/kernel32/tests/actctx.c | 10 ++++-- dlls/ntdll/actctx.c | 81 ++++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index bcf95ec..2eb1c2a 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -227,7 +227,7 @@ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, TRACE("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), ulId, debugstr_a(lpSearchStr), pInfo); - if (!lpSearchStr) + if (!lpSearchStr || !pInfo) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -255,6 +255,12 @@ BOOL WINAPI FindActCtxSectionStringW(DWORD dwFlags, const GUID* lpExtGuid, UNICODE_STRING us; NTSTATUS status; + if (!pInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + RtlInitUnicodeString(&us, lpSearchStr); if ((status = RtlFindActivationContextSectionString(dwFlags, lpExtGuid, ulId, &us, pInfo))) { diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 887c6b0..7512aed 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2148,9 +2148,13 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + if (todo) + todo_wine + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + else + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); pRtlFreeUnicodeString(&string_to_findW); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 6ea7b54..4552e40 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3133,19 +3133,22 @@ static NTSTATUS find_dll_redirection(ACTIVATION_CONTEXT* actctx, const UNICODE_S index = find_string_index(actctx->dllredirect_section, name); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - dll = get_dllredirect_data(actctx, index); + if (data) + { + dll = get_dllredirect_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = dll; - data->ulLength = dll->size; - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->dllredirect_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->dllredirect_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = dll; + data->ulLength = dll->size; + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->dllredirect_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->dllredirect_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -3342,20 +3345,23 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI if (!index) return STATUS_SXS_KEY_NOT_FOUND; - class = get_wndclass_data(actctx, index); + if (data) + { + class = get_wndclass_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = class; - /* full length includes string length with nulls */ - data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->wndclass_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->wndclass_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = class; + /* full length includes string length with nulls */ + data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->wndclass_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->wndclass_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4397,19 +4403,22 @@ static NTSTATUS find_progid_redirection(ACTIVATION_CONTEXT* actctx, const UNICOD index = find_string_index(actctx->progid_section, name); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - progid = get_progid_data(actctx, index); + if (data) + { + progid = get_progid_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = progid; - data->ulLength = progid->size; - data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; - data->ulSectionGlobalDataLength = actctx->progid_section->global_len; - data->lpSectionBase = actctx->progid_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->progid_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = progid; + data->ulLength = progid->size; + data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; + data->ulSectionGlobalDataLength = actctx->progid_section->global_len; + data->lpSectionBase = actctx->progid_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->progid_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4441,7 +4450,7 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind, if (status != STATUS_SUCCESS) return status; - if (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + if (data && (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX)) { actctx_addref(actctx); data->hActCtx = actctx; @@ -5008,7 +5017,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID * FIXME("unknown flags %08x\n", flags); return STATUS_INVALID_PARAMETER; } - if (!data || data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || + if ((data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)) || !section_name || !section_name->Buffer) { WARN("invalid parameter\n");

1 0

Stefan Dösinger : ddraw: Add DDBLT_COLORFILL validation.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 6cb795b4b6879a9a023229fe07d8301447c515cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb795b4b6879a9a023229fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:52 2015 +0100 ddraw: Add DDBLT_COLORFILL validation. --- dlls/ddraw/surface.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cbf11da..8b25cb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1537,6 +1537,28 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR wined3d_mutex_lock(); + if (Flags & DDBLT_COLORFILL) + { + if (src_surface) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + if (!DDBltFx) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + } + if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT))) { WARN("DDBLT_KEYDEST blit without color key in surface, returning DDERR_INVALIDPARAMS\n");

1 0

Stefan Dösinger : ddraw/tests: Add a DDBLT_COLORFILL test.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 1d8e92c170652f449243e10c20b21f532a94e71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8e92c170652f449243e10c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:53 2015 +0100 ddraw/tests: Add a DDBLT_COLORFILL test. --- dlls/ddraw/tests/ddraw7.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d8e92c170652f449243e…

1 0

Stefan Dösinger : ddraw: Add DDBLT_DEPTHFILL validation.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: a84980168ce948069565a65cf5d98b778c471fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84980168ce948069565a65cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:54 2015 +0100 ddraw: Add DDBLT_DEPTHFILL validation. --- dlls/ddraw/surface.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b25cb9..034e3aa 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1537,26 +1537,36 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR wined3d_mutex_lock(); - if (Flags & DDBLT_COLORFILL) + if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) { if (src_surface) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); + WARN("Depth or colorfill is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } if (!DDBltFx) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); + WARN("Depth or colorfill used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } - if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + + if ((Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) == (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) + Flags &= ~DDBLT_DEPTHFILL; + + if ((dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_COLORFILL)) { wined3d_mutex_unlock(); WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } + if (!(dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_DEPTHFILL)) + { + wined3d_mutex_unlock(); + WARN("DDBLT_DEPTHFILL used on a color buffer, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } } if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT)))

1 0

Stefan Dösinger : ddraw/tests: Add tests for DDBLT_DEPTHFILL.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: e0edd55a2e45129c0f775f5aba230e00a819917e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0edd55a2e45129c0f775f5ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:55 2015 +0100 ddraw/tests: Add tests for DDBLT_DEPTHFILL. --- dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 98 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0edd55a2e45129c0f775…

1 0

Stefan Dösinger : ddraw: Add validation and tests for DDBLT_ROP.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 948202c47f1f11d558611620e3f7775331eb43a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948202c47f1f11d558611620e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 23:06:57 2015 +0100 ddraw: Add validation and tests for DDBLT_ROP. --- dlls/ddraw/surface.c | 16 ++++++++ dlls/ddraw/tests/ddraw7.c | 98 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=948202c47f1f11d558611…

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for querying between IDirect3DRM interfaces.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: cb1e856612381ed86d819ac91cd3001d1697b85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1e856612381ed86d819ac91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 15 17:51:51 2015 +0530 d3drm/tests: Add tests for querying between IDirect3DRM interfaces. --- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 7035bc6..dc6e8d1 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid ddraw user32 +IMPORTS = dxguid ddraw user32 uuid C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ee01b91..f9925ae 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,6 +1,7 @@ /* * Copyright 2010, 2012 Christian Costa * Copyright 2012 André Hentschel + * Copyright 2011-2014 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1726,6 +1727,83 @@ static void test_frame_mesh_materials(void) IDirect3DRM_Release(d3drm); } +struct qi_test +{ + REFIID iid; + REFIID refcount_iid; + HRESULT hr; + BOOL refcount_todo; +}; + +static void test_qi(const char *test_name, IUnknown *base_iface, + REFIID refcount_iid, const struct qi_test *tests, UINT entry_count) +{ + ULONG refcount, expected_refcount; + IUnknown *iface1, *iface2; + HRESULT hr; + UINT i, j; + + for (i = 0; i < entry_count; ++i) + { + hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1); + ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i); + if (SUCCEEDED(hr)) + { + for (j = 0; j < entry_count; ++j) + { + hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2); + ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j); + if (SUCCEEDED(hr)) + { + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface2); + if (tests[i].refcount_todo || tests[j].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + } + } + + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[i].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface1); + if (tests[i].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + } + } +} + +static void test_d3drm_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, + { &IID_IUnknown, &IID_IDirect3DRM, S_OK, FALSE }, + }; + HRESULT hr; + IDirect3DRM *d3drm; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); + + IDirect3DRM_Release(d3drm); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) @@ -1744,6 +1822,7 @@ START_TEST(d3drm) test_frame_transform(); test_d3drm_load(); test_frame_mesh_materials(); + test_d3drm_qi(); FreeLibrary(d3drm_handle); }

1 0

Francois Gouget : winemenubuilder: Avoid a couple of forward declarations.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: d4b9ac46a0a474d6f2cd3514db7ef07e7a3e6178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b9ac46a0a474d6f2cd3514d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:39 2015 +0100 winemenubuilder: Avoid a couple of forward declarations. --- programs/winemenubuilder/winemenubuilder.c | 46 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d902e93..2bdbdbf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -195,8 +195,6 @@ static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ static unsigned short crc16(const char* string) @@ -1004,6 +1002,28 @@ end: return hr; } +static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) +{ + HRESULT hr; + WCHAR *value = NULL; + DWORD size = 0; + hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); + if (SUCCEEDED(hr)) + { + value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (value) + { + hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, value); + value = NULL; + } + } + } + return value; +} + static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) { static const WCHAR openW[] = {'o','p','e','n',0}; @@ -1939,28 +1959,6 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) -{ - HRESULT hr; - WCHAR *value = NULL; - DWORD size = 0; - hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); - if (SUCCEEDED(hr)) - { - value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (value) - { - hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, value); - value = NULL; - } - } - } - return value; -} - static char *slashes_to_minuses(const char *string) { int i;

1 0

Francois Gouget : winemenubuilder: Handle icons disguised as executables and better validate icon streams.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 520dcb4c23d7aad280ddaee8254cd847c5baf038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520dcb4c23d7aad280ddaee82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:43 2015 +0100 winemenubuilder: Handle icons disguised as executables and better validate icon streams. For some applications the shortcut's icon points to a .exe file which in fact contains a .ico file. This means open_icon() cannot rely on the file extension. Also reject icon streams that don't actually contain a valid icon and use the next source as a fallback. --- programs/winemenubuilder/winemenubuilder.c | 84 ++++++++++++++++++------------ 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2bdbdbf..4a5639b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); (csidl)==CSIDL_COMMON_DESKTOPDIRECTORY) #define in_startmenu(csidl) ((csidl)==CSIDL_STARTMENU || \ (csidl)==CSIDL_COMMON_STARTMENU) - + /* link file formats */ #include "pshpack1.h" @@ -964,20 +964,32 @@ end: return hr; } -static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPCWSTR szFileName) +static HRESULT validate_ico(IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) +{ + HRESULT hr; + + hr = read_ico_direntries(*ppStream, ppIconDirEntries, numEntries); + if (SUCCEEDED(hr)) + { + if (*numEntries) + return hr; + HeapFree(GetProcessHeap(), 0, *ppIconDirEntries); + *ppIconDirEntries = NULL; + } + IStream_Release(*ppStream); + *ppStream = NULL; + return E_FAIL; +} + +static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, const char *icon_name, LPCWSTR szFileName) { - ICONDIRENTRY *pIconDirEntry = NULL; - int numEntries; int nMax = 0, nMaxBits = 0; int nIndex = 0; int i; LARGE_INTEGER position; HRESULT hr; - hr = read_ico_direntries(iconStream, &pIconDirEntry, &numEntries); - if (FAILED(hr)) - goto end; - for (i = 0; i < numEntries; i++) { WINE_TRACE("[%d]: %d x %d @ %d\n", i, pIconDirEntry[i].bWidth, pIconDirEntry[i].bHeight, pIconDirEntry[i].wBitCount); @@ -1069,7 +1081,7 @@ static HRESULT open_default_icon(IStream **ppStream) return open_module_icon(user32W, -(INT_PTR)IDI_WINLOGO, ppStream); } -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream) +static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) { HRESULT hr; @@ -1084,16 +1096,25 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt } else { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + /* This might be a raw .ico file */ + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); } } + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + if (FAILED(hr)) + { hr = open_file_type_icon(filename, ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } if (FAILED(hr) && !bWait) + { hr = open_default_icon(ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } return hr; } @@ -1147,11 +1168,10 @@ static inline int size_to_slot(int size) #define CLASSIC_SLOT 3 -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; struct { int index; int maxBits; @@ -1164,9 +1184,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico LARGE_INTEGER zero; HRESULT hr; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; for (i = 0; i < ICNS_SLOTS; i++) { best[i].index = -1; @@ -1254,7 +1271,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, icnsPath); return hr; } @@ -1279,20 +1295,15 @@ static void refresh_icon_cache(const char *iconsDir) } } -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; int i; char *iconsDir = NULL; HRESULT hr = S_OK; LARGE_INTEGER zero; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; - if (destFilename) *nativeIdentifier = heap_printf("%s", destFilename); else @@ -1372,7 +1383,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico refresh_icon_cache(iconsDir); end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, iconsDir); return hr; } @@ -1382,24 +1392,27 @@ end: static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, BOOL bWait) { IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; char *nativeIdentifier = NULL; WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_a(destFilename)); - hr = open_icon(icoPathW, index, bWait, &stream); + hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); if (FAILED(hr)) { WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); goto end; } - hr = platform_write_icon(stream, index, icoPathW, destFilename, &nativeIdentifier); + hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) WINE_WARN("writing icon failed, error 0x%08X\n", hr); end: if (stream) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, nativeIdentifier); @@ -3472,6 +3485,8 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) WCHAR szIconPath[MAX_PATH]; int iconId; IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; utf8lnkPath = wchars_to_utf8_chars(lnkPath); @@ -3533,15 +3548,15 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) if (szIconPath[0]) { - hr = open_icon(szIconPath, iconId, FALSE, &stream); + hr = open_icon(szIconPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } else { - hr = open_icon(szPath, iconId, FALSE, &stream); + hr = open_icon(szPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } end: @@ -3554,6 +3569,7 @@ end: IPersistFile_Release(persistFile); if (stream != NULL) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); } static WCHAR *next_token( LPWSTR *p )

1 0

Francois Gouget : ws2_32: Add more WSA_FLAG_XXX values.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 7bf46e46c518642d5219d9eabbb6b43ca21a4695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf46e46c518642d5219d9eab… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 17:45:36 2015 +0100 ws2_32: Add more WSA_FLAG_XXX values. --- include/winsock2.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index 04f3aea..fa3d26b 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -184,11 +184,14 @@ extern "C" { #endif /* USE_WS_PREFIX */ /* Constants for WSAIoctl() */ -#define WSA_FLAG_OVERLAPPED 0x01 -#define WSA_FLAG_MULTIPOINT_C_ROOT 0x02 -#define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 -#define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 -#define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 +#define WSA_FLAG_OVERLAPPED 0x0001 +#define WSA_FLAG_MULTIPOINT_C_ROOT 0x0002 +#define WSA_FLAG_MULTIPOINT_C_LEAF 0x0004 +#define WSA_FLAG_MULTIPOINT_D_ROOT 0x0008 +#define WSA_FLAG_MULTIPOINT_D_LEAF 0x0010 +#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x0040 +#define WSA_FLAG_NO_HANDLE_INHERIT 0x0080 +#define WSA_FLAG_REGISTERED_IO 0x0100 /* Constants for WSAJoinLeaf() */ #define JL_SENDER_ONLY 0x01

1 0