December 2016 - Wine-Commits

Alexandre Julliard : msvcirt/tests: Silence a compiler warning.
by Alexandre Julliard Dec. 22, 2016

Dec. 22, 2016

Module: wine Branch: master Commit: c28816cc378a580258bfb35a8fc8a32d1b40afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28816cc378a580258bfb35a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 15:07:05 2016 +0100 msvcirt/tests: Silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2234abf..63582e8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2122,14 +2122,14 @@ static void test_strstreambuf(void) ok(ssb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb1.base.allocated); ok(ssb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb1.base.unbuffered); ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); - ok(ssb1.base.ebuf == buffer + 0x7fffffff || ssb1.base.ebuf == (char*)-1, + ok(ssb1.base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.ebuf == (char*)-1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.ebuf); ok(ssb1.base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, ssb1.base.eback); ok(ssb1.base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, ssb1.base.gptr); ok(ssb1.base.egptr == buffer + 20, "wrong get end, expected %p got %p\n", buffer + 20, ssb1.base.egptr); ok(ssb1.base.pbase == buffer + 20, "wrong put base, expected %p got %p\n", buffer + 20, ssb1.base.pbase); ok(ssb1.base.pptr == buffer + 20, "wrong put pointer, expected %p got %p\n", buffer + 20, ssb1.base.pptr); - ok(ssb1.base.epptr == buffer + 0x7fffffff || ssb1.base.epptr == (char*)-1, + ok(ssb1.base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.epptr == (char*)-1, "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); @@ -4208,14 +4208,14 @@ static void test_ostrstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer + 4, "wrong put pointer, expected %p got %p\n", buffer + 4, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_ostrstream_dtor, &os1.base_ios); @@ -6858,14 +6858,14 @@ static void test_strstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer, "wrong put pointer, expected %p got %p\n", buffer, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_strstream_vbase_dtor, &ios1);

1 0

Nikolay Sivov : shell32: Fix potential destination buffer overrun.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: f7cc41d7ae11e22163bd8b205bb30c43e2b6f7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cc41d7ae11e22163bd8b205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:56 2016 +0300 shell32: Fix potential destination buffer overrun. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 1674ad2..9307b08 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -323,7 +323,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN if (SUCCEEDED(hr)) { - hr = IShellLinkW_GetIconLocation(psl, szIconFile, MAX_PATH, piIndex); + hr = IShellLinkW_GetIconLocation(psl, szIconFile, cchMax, piIndex); if (SUCCEEDED(hr) && *szIconFile) found = TRUE;

1 0

Nikolay Sivov : shell32: Don't trace output string buffer contents.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: 490ffe7f4081f7bac874997ba432835eea6e1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490ffe7f4081f7bac874997ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:55 2016 +0300 shell32: Don't trace output string buffer contents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index cf26caf..1674ad2 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + TRACE("(%p) (flags=%u, %p, %u, %p, %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); if (pwFlags)

1 0

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: c03ea1971b3a16291615cac25e169aeb78290c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ea1971b3a16291615cac25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

1 0

Alexandre Julliard : msvcrt: Disable relay for the __libm_sse2 functions.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: cf51752d5f13ad24d9a4abea29d5aecba803adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf51752d5f13ad24d9a4abea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 17:11:09 2016 +0100 msvcrt: Disable relay for the __libm_sse2 functions. The relay code can use the SSE registers too. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 64 +++++++++++----------- dlls/msvcr100/msvcr100.spec | 42 +++++++------- dlls/msvcr110/msvcr110.spec | 64 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 64 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 64 +++++++++++----------- dlls/msvcr80/msvcr80.spec | 42 +++++++------- dlls/msvcr90/msvcr90.spec | 42 +++++++------- dlls/msvcrt/msvcrt.spec | 42 +++++++------- dlls/ucrtbase/ucrtbase.spec | 64 +++++++++++----------- 9 files changed, 244 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf51752d5f13ad24d9a4a…

1 0

Alexandre Julliard : winex11: Also ignore BadWindow errors caused by XSendEvent.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: adc349c38edd82902571fb7100014241205b3731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc349c38edd82902571fb710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:08:28 2016 +0100 winex11: Also ignore BadWindow errors caused by XSendEvent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1c4ecfd..2127df4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -196,8 +196,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && - (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + if ((event->request_code == X_SetInputFocus || + event->request_code == X_ChangeWindowAttributes || + event->request_code == X_SendEvent) && + (event->error_code == BadMatch || + event->error_code == BadWindow)) return TRUE; /* the clipboard display interacts with external windows, ignore all errors */ if (display == clipboard_display) return TRUE;

1 0

Hans Leidekker : setupapi/tests: Skip InstallHinfSection tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 53b7a36319895f929e3dcdc0433cc2e55020dd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b7a36319895f929e3dcdc04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:08:35 2016 +0100 setupapi/tests: Skip InstallHinfSection tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 5015e31..558453c 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -455,6 +455,14 @@ static void test_profile_items(void) goto cleanup; } + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + if (!CreateDirectoryA(path, NULL) && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + return; + } + RemoveDirectoryA(path); + create_inf_file(inffile, inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path);

1 0

Nikolay Sivov : dwrite: Fully initialize shared factory vtable.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 6d0fa4cebce4b5711fdd291c7ef54f27e14abe6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0fa4cebce4b5711fdd291c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 02:09:27 2016 +0300 dwrite: Fully initialize shared factory vtable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9d5b1be..50a4c1c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1536,7 +1536,10 @@ static const struct IDWriteFactory4Vtbl shareddwritefactoryvtbl = { dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, dwritefactory3_GetSystemFontCollection, - dwritefactory3_GetFontDownloadQueue + dwritefactory3_GetFontDownloadQueue, + dwritefactory4_TranslateColorGlyphRun, + dwritefactory4_ComputeGlyphOrigins_, + dwritefactory4_ComputeGlyphOrigins }; static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type)

1 0

Zebediah Figura : advapi32: Add tests for StartTrace().
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 1bcd38f788bb5165cc65a830ea912ff4eda50b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcd38f788bb5165cc65a830e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 18 15:25:59 2016 -0600 advapi32: Add tests for StartTrace(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 92 ++++++++++++++++++++++++++++++++++++++++++ include/evntrace.h | 1 + 2 files changed, 93 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 7daaeaf..d86a924 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -20,12 +20,15 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winnt.h" #include "winreg.h" #include "sddl.h" +#include "wmistr.h" +#include "evntrace.h" #include "wine/test.h" @@ -1143,6 +1146,92 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_start_trace(void) +{ + const char sessionname[] = "wine"; + const char filepath[] = "wine.etl"; + const char filepath2[] = "eniw.etl"; + EVENT_TRACE_PROPERTIES *properties; + TRACEHANDLE handle; + LONG buffersize; + LONG ret; + + buffersize = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname) + sizeof(filepath); + properties = (EVENT_TRACE_PROPERTIES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + properties->Wnode.BufferSize = buffersize; + properties->Wnode.Flags = WNODE_FLAG_TRACED_GUID; + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + strcpy((char *)properties + properties->LogFileNameOffset, filepath); + + properties->Wnode.BufferSize = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH || + ret == ERROR_INVALID_PARAMETER, /* XP and 2k3 */ + "Expected ERROR_BAD_LENGTH, got %d\n", ret); + properties->Wnode.BufferSize = buffersize; + + ret = StartTraceA(&handle, "this name is too long", properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH, "Expected ERROR_BAD_LENGTH, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, NULL); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = StartTraceA(NULL, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + properties->LogFileNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + properties->LoggerNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + + properties->LogFileMode = EVENT_TRACE_FILE_MODE_SEQUENTIAL | EVENT_TRACE_FILE_MODE_CIRCULAR; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + /* XP creates a file we can't delete, so change the filepath to something else */ + strcpy((char *)properties + properties->LogFileNameOffset, filepath2); + + properties->Wnode.Guid = SystemTraceControlGuid; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->Wnode.Guid = (GUID){0}; + + properties->LogFileNameOffset = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_PATHNAME, "Expected ERROR_BAD_PATHNAME, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + ret = StartTraceA(&handle, sessionname, properties); + ok(ret == ERROR_SUCCESS, "Expected success, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_ALREADY_EXISTS || + ret == ERROR_SHARING_VIOLATION, /* 2k3 */ + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + + /* clean up */ + ControlTraceA(handle, sessionname, properties, EVENT_TRACE_CONTROL_STOP); + HeapFree(GetProcessHeap(), 0, properties); + DeleteFileA(filepath); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -1172,4 +1261,7 @@ START_TEST(eventlog) test_autocreation(); cleanup_eventlog(); } + + /* Trace tests */ + test_start_trace(); } diff --git a/include/evntrace.h b/include/evntrace.h index bb1ce03..5722b28 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -236,6 +236,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG MaximumFileSize; ULONG LogFileMode; ULONG FlushTimer; + ULONG EnableFlags; LONG AgeLimit; ULONG NumberOfBuffers; ULONG FreeBuffers;

1 0

Marcus Meissner : xmllite: Hr was uninitialized in error path (Coverity).
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: f900879d9e86d9f0991be3357e1a3a455b39cc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900879d9e86d9f0991be3357… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 17 12:37:10 2016 +0100 xmllite: Hr was uninitialized in error path (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0fedd91..460eeab 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -547,8 +547,10 @@ static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *lo } element = reader_alloc_zero(reader, sizeof(*element)); - if (!element) + if (!element) { + hr = E_OUTOFMEMORY; goto failed; + } if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK ||

1 0