wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : urlmon: Remove unreachable code (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 6e94edd36fcb8d21d0d8e841485570b6d12b749f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e94edd36fcb8d21d0d8e8414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 03:17:19 2015 +0300 urlmon: Remove unreachable code (Coverity). --- dlls/urlmon/mimefilter.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index cee1a19..ee95755 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -697,8 +697,5 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, if(pwzMimeProposed || pBuffer) return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, pwzUrl, ppwzMimeOut); - if(pwzUrl) - return find_mime_from_url(pwzUrl, ppwzMimeOut); - - return E_FAIL; + return find_mime_from_url(pwzUrl, ppwzMimeOut); }

1 0

Nikolay Sivov : wined3d: Remove unnecessary test for 0 (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 5daf08f2cb3b020d43059c084b929e6f8046c349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf08f2cb3b020d43059c084… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 02:46:37 2015 +0300 wined3d: Remove unnecessary test for 0 (Coverity). --- dlls/wined3d/shader.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 279ec42..9bc3bac 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1569,26 +1569,23 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, shader_dump_register(&param->reg, shader_version); - if (src_modifier) - { - switch (src_modifier) - { - case WINED3DSPSM_NONE: break; - case WINED3DSPSM_NEG: break; - case WINED3DSPSM_NOT: break; - case WINED3DSPSM_BIAS: TRACE("_bias"); break; - case WINED3DSPSM_BIASNEG: TRACE("_bias"); break; - case WINED3DSPSM_SIGN: TRACE("_bx2"); break; - case WINED3DSPSM_SIGNNEG: TRACE("_bx2"); break; - case WINED3DSPSM_COMP: break; - case WINED3DSPSM_X2: TRACE("_x2"); break; - case WINED3DSPSM_X2NEG: TRACE("_x2"); break; - case WINED3DSPSM_DZ: TRACE("_dz"); break; - case WINED3DSPSM_DW: TRACE("_dw"); break; - case WINED3DSPSM_ABSNEG: TRACE(")"); break; - case WINED3DSPSM_ABS: TRACE(")"); break; - default: TRACE("_unknown_modifier(%#x)", src_modifier); - } + switch (src_modifier) + { + case WINED3DSPSM_NONE: break; + case WINED3DSPSM_NEG: break; + case WINED3DSPSM_NOT: break; + case WINED3DSPSM_BIAS: TRACE("_bias"); break; + case WINED3DSPSM_BIASNEG: TRACE("_bias"); break; + case WINED3DSPSM_SIGN: TRACE("_bx2"); break; + case WINED3DSPSM_SIGNNEG: TRACE("_bx2"); break; + case WINED3DSPSM_COMP: break; + case WINED3DSPSM_X2: TRACE("_x2"); break; + case WINED3DSPSM_X2NEG: TRACE("_x2"); break; + case WINED3DSPSM_DZ: TRACE("_dz"); break; + case WINED3DSPSM_DW: TRACE("_dw"); break; + case WINED3DSPSM_ABSNEG: TRACE(")"); break; + case WINED3DSPSM_ABS: TRACE(")"); break; + default: TRACE("_unknown_modifier(%#x)", src_modifier); } if (swizzle != WINED3DSP_NOSWIZZLE)

1 0

Nikolay Sivov : dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 9351596538d012c6ed11c59576246f524f90aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351596538d012c6ed11c5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 15:11:56 2015 +0300 dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity). --- dlls/dwrite/layout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index cb191b0..365f0b2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2016,8 +2016,11 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout2 *iface TRACE("(%p)->(%u %p %p)\n", This, position, object, r); + if (position >= This->len) + return S_OK; + range = get_layout_range_by_pos(This, position); - *object = range ? range->object : NULL; + *object = range->object; if (*object) IDWriteInlineObject_AddRef(*object);

1 0

Akihiro Sagawa : mciqtz32: Watch the player thread while waiting a player task.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 998af35a3e587c8ce4a5f3fb130f9d942df72bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=998af35a3e587c8ce4a5f3fb1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:09 2015 +0900 mciqtz32: Watch the player thread while waiting a player task. --- dlls/mciqtz32/mciqtz.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 413c2f6..d018a54 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -75,6 +75,8 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, { WINE_MCIQTZ *wma; LRESULT res; + HANDLE handles[2]; + DWORD ret; TRACE("(%08lX, %08x, %08x, %08lx)\n", dwDevID, wMsg, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(dwDevID); @@ -86,7 +88,11 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, wma->task.flags = dwFlags; wma->task.parms = lpParms; SetEvent(wma->task.notify); - if (WaitForSingleObject(wma->task.done, INFINITE) == WAIT_OBJECT_0) + handles[0] = wma->task.done; + handles[1] = wma->task.thread; + ret = WaitForMultipleObjects(sizeof(handles)/sizeof(handles[0]), handles, + FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) res = wma->task.res; else res = MCIERR_INTERNAL;

1 0

Akihiro Sagawa : shell32: Skip buffer allocation when querying drop file numbers.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: d2e9856a567bd1b83644993bf3b75c0a64cb2916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e9856a567bd1b83644993bf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:08 2015 +0900 shell32: Skip buffer allocation when querying drop file numbers. --- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/tests/shellole.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 74c5965..637a101 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -578,7 +578,7 @@ UINT WINAPI DragQueryFileA( if(lpDropFileStruct->fWide) { LPWSTR lpszFileW = NULL; - if(lpszFile) { + if(lpszFile && lFile != 0xFFFFFFFF) { lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; @@ -633,7 +633,7 @@ UINT WINAPI DragQueryFileW( if(lpDropFileStruct->fWide == FALSE) { LPSTR lpszFileA = NULL; - if(lpszwFile) { + if(lpszwFile && lFile != 0xFFFFFFFF) { lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); if(lpszFileA == NULL) { goto end; diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 308134a..71ba477 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -760,7 +760,7 @@ static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA num = DragQueryFileA(hDrop, 0xffffffff, NULL, 0); ok(num == 1, "expected 1, got %u\n", num); num = DragQueryFileA(hDrop, 0xffffffff, (char*)0xdeadbeef, 0xffffffff); - todo_wine ok(num == 1, "expected 1, got %u\n", num); + ok(num == 1, "expected 1, got %u\n", num); num = DragQueryFileA(hDrop, 0, filename, sizeof(filename)); ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename);

1 0

Akihiro Sagawa : shell32/tests: Add tests for DragQueryFile.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 37d7d6f81c45f14e56b5a4ae81fcd3cf5c4ab1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7d6f81c45f14e56b5a4ae8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:06 2015 +0900 shell32/tests: Add tests for DragQueryFile. --- dlls/shell32/tests/shellole.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 3f0b490..308134a 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "shlobj.h" +#include "shellapi.h" #include "initguid.h" DEFINE_GUID(FMTID_Test,0x12345678,0x1234,0x1234,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12); @@ -742,10 +743,126 @@ static void test_SHCreateQueryCancelAutoPlayMoniker(void) IMoniker_Release(mon); } +#define DROPTEST_FILENAME "c:\\wintest.bin" +struct DragParam { + HWND hwnd; + HANDLE ready; +}; + +static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) { + case WM_DROPFILES: + { + HDROP hDrop = (HDROP)wparam; + char filename[MAX_PATH] = "dummy"; + UINT num; + num = DragQueryFileA(hDrop, 0xffffffff, NULL, 0); + ok(num == 1, "expected 1, got %u\n", num); + num = DragQueryFileA(hDrop, 0xffffffff, (char*)0xdeadbeef, 0xffffffff); + todo_wine ok(num == 1, "expected 1, got %u\n", num); + num = DragQueryFileA(hDrop, 0, filename, sizeof(filename)); + ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); + ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename); + DragFinish(hDrop); + return 0; + } + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD WINAPI drop_window_therad(void *arg) +{ + struct DragParam *param = arg; + WNDCLASSA cls; + WINDOWINFO info; + BOOL r; + MSG msg; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = drop_window_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "drop test"; + RegisterClassA(&cls); + + param->hwnd = CreateWindowA("drop test", NULL, 0, 0, 0, 0, 0, + NULL, 0, NULL, 0); + ok(param->hwnd != NULL, "CreateWindow failed: %d\n", GetLastError()); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + r = GetWindowInfo(param->hwnd, &info); + ok(r, "got %d\n", r); + ok(!(info.dwExStyle & WS_EX_ACCEPTFILES), "got %08x\n", info.dwExStyle); + + DragAcceptFiles(param->hwnd, TRUE); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + r = GetWindowInfo(param->hwnd, &info); + ok(r, "got %d\n", r); + ok((info.dwExStyle & WS_EX_ACCEPTFILES), "got %08x\n", info.dwExStyle); + + SetEvent(param->ready); + + while ((r = GetMessageA(&msg, NULL, 0, 0)) != 0) { + if (r == (BOOL)-1) { + ok(0, "unexpected return value, got %d\n", r); + break; + } + DispatchMessageA(&msg); + } + + DestroyWindow(param->hwnd); + UnregisterClassA("drop test", GetModuleHandleA(NULL)); + return 0; +} + +static void test_DragQueryFile(void) +{ + struct DragParam param; + HANDLE hThread; + DWORD rc; + HGLOBAL hDrop; + DROPFILES *pDrop; + int ret; + BOOL r; + + param.ready = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(param.ready != NULL, "can't create event\n"); + hThread = CreateThread(NULL, 0, drop_window_therad, &param, 0, NULL); + + rc = WaitForSingleObject(param.ready, 5000); + ok(rc == WAIT_OBJECT_0, "got %u\n", rc); + + hDrop = GlobalAlloc(GHND, sizeof(DROPFILES) + (strlen(DROPTEST_FILENAME) + 2) * sizeof(WCHAR)); + pDrop = GlobalLock(hDrop); + pDrop->pFiles = sizeof(DROPFILES); + ret = MultiByteToWideChar(CP_ACP, 0, DROPTEST_FILENAME, -1, + (LPWSTR)(pDrop + 1), strlen(DROPTEST_FILENAME) + 1); + ok(ret > 0, "got %d\n", ret); + pDrop->fWide = TRUE; + GlobalUnlock(hDrop); + + r = PostMessageA(param.hwnd, WM_DROPFILES, (WPARAM)hDrop, 0); + ok(r, "got %d\n", r); + + r = PostMessageA(param.hwnd, WM_QUIT, 0, 0); + ok(r, "got %d\n", r); + + rc = WaitForSingleObject(hThread, 5000); + ok(rc == WAIT_OBJECT_0, "got %d\n", rc); + + CloseHandle(param.ready); + CloseHandle(hThread); +} +#undef DROPTEST_FILENAME + START_TEST(shellole) { init(); test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); + test_DragQueryFile(); }

1 0

Akihiro Sagawa : shell32/tests: Make tests run on win2k again.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 4c31892ea50eede74b91078e67af3f2119f8b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c31892ea50eede74b91078e6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:04 2015 +0900 shell32/tests: Make tests run on win2k again. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b457bb..822acf6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -75,6 +75,7 @@ static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static HRESULT (WINAPI *pSHCreateShellFolderView)(const SFV_CREATE *pcsfv, IShellView **ppsv); static HRESULT (WINAPI *pSHCreateShellFolderViewEx)(LPCSFV psvcbi, IShellView **ppv); +static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static WCHAR *make_wstr(const char *str) { @@ -140,6 +141,7 @@ static void init_function_pointers(void) MAKEFUNC_ORD(ILFindLastID, 16); MAKEFUNC_ORD(ILIsEqual, 21); MAKEFUNC_ORD(ILCombine, 25); + MAKEFUNC_ORD(SHILCreateFromPath, 28); MAKEFUNC_ORD(ILFree, 155); MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); #undef MAKEFUNC_ORD @@ -4974,9 +4976,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE;

1 0

Indrek Altpere : mshtml: Add NULL check to get_frame_by_name.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 2676488fcd95c70ff18404660877f63ac6838789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2676488fcd95c70ff18404660… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Fri May 29 16:51:50 2015 +0300 mshtml: Add NULL check to get_frame_by_name. --- dlls/mshtml/htmlwindow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 618648e..c53ea16 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -406,6 +406,11 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H nsIDOMWindow_Release(nswindow); + if(!window_iter) { + WARN("nsIDOMWindow without HTMLOuterWindow: %p\n", nswindow); + continue; + } + hres = IHTMLElement_get_id(&window_iter->frame_element->element.IHTMLElement_iface, &id); if(FAILED(hres)) { FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres);

1 0

Indrek Altpere : mshtml: Add NULL check to avoid crashing due to Gecko bug.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 55c03ad4d219ae8ba78ec30e6ff1ad82070bd2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c03ad4d219ae8ba78ec30e6… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Mon Jun 1 14:11:21 2015 +0300 mshtml: Add NULL check to avoid crashing due to Gecko bug. --- dlls/mshtml/htmlcurstyle.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 5f6cb35..f0b0d98 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1343,6 +1343,11 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) return E_FAIL; } + if(!nsstyle) { + ERR("GetComputedStyle returned NULL nsstyle\n"); + return E_FAIL; + } + ret = heap_alloc_zero(sizeof(HTMLCurrentStyle)); if(!ret) { nsIDOMCSSStyleDeclaration_Release(nsstyle);

1 0

Damjan Jovanovic : qcap: The VfwCapture filter's GetNumberOfCapabilities() should set the capability count to zero.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: bd5e184bfbc228a486ad74d2490e8afef6f2a5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5e184bfbc228a486ad74d24… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:15:20 2015 +0200 qcap: The VfwCapture filter's GetNumberOfCapabilities() should set the capability count to zero. --- dlls/qcap/vfwcapture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 5d128f2..efae931 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -374,6 +374,7 @@ AMStreamConfig_GetNumberOfCapabilities( IAMStreamConfig *iface, int *piCount, int *piSize ) { FIXME("%p: %p %p - stub, intentional\n", iface, piCount, piSize); + *piCount = 0; return E_NOTIMPL; /* Not implemented for this interface */ }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015