June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : riched20/tests: Don't use global vars for host/ textservices.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: a50e0d71a49e4af7cc1483e993f1b20a8490d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50e0d71a49e4af7cc1483e99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 22:45:43 2015 +0300 riched20/tests: Don't use global vars for host/textservices. --- dlls/riched20/tests/txtsrv.c | 75 ++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index c154e2d..1a6ca61 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -506,8 +506,6 @@ static ITextHostVtbl itextHostVtbl = { ITextHostImpl_TxGetSelectionBarWidth }; -static ITextServices *txtserv = NULL; -static ITextHostTestImpl *dummyTextHost; static void *wrapperCodeMem = NULL; #include "pshpack1.h" @@ -606,14 +604,15 @@ static void setup_thiscall_wrappers(void) /* Conformance test functions. */ /* Initialize the test texthost structure */ -static BOOL init_texthost(void) +static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) { + ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { - skip("Insufficient memory to create ITextHost interface\n"); + win_skip("Insufficient memory to create ITextHost interface\n"); return FALSE; } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; @@ -622,54 +621,53 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); + result = pCreateTextServices(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { CoTaskMemFree(dummyTextHost); - skip("CreateTextServices failed.\n"); + win_skip("CreateTextServices failed.\n"); return FALSE; } - result = IUnknown_QueryInterface(init, pIID_ITextServices, - (void **)&txtserv); - ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); + result = IUnknown_QueryInterface(init, pIID_ITextServices, (void**)txtserv); + ok((result == S_OK) && (*txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, *txtserv); IUnknown_Release(init); - if (!((result == S_OK) && (txtserv != NULL))) { + if (!((result == S_OK) && (*txtserv != NULL))) { CoTaskMemFree(dummyTextHost); - skip("Could not retrieve ITextServices interface\n"); + win_skip("Could not retrieve ITextServices interface\n"); return FALSE; } + *ret = &dummyTextHost->ITextHost_iface; return TRUE; } -static void free_texthost(void) -{ - ITextServices_Release(txtserv); - CoTaskMemFree(dummyTextHost); -} - static void test_TxGetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxSetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; WCHAR settext[] = {'T','e','s','t',0}; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxSetText(txtserv, settext); @@ -684,10 +682,14 @@ static void test_TxSetText(void) "String returned differs\n"); SysFreeString(rettext); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } -static void test_TxGetNaturalSize(void) { +static void test_TxGetNaturalSize(void) +{ + ITextServices *txtserv; + ITextHost *host; HRESULT result; BOOL ret; @@ -710,7 +712,7 @@ static void test_TxGetNaturalSize(void) { INT charwidth_caps_text[26]; TEXTMETRICA tmInfo_text; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hdcDraw = GetDC(NULL); @@ -759,11 +761,14 @@ static void test_TxGetNaturalSize(void) { cleanup: RestoreDC(hdcDraw,1); ReleaseDC(NULL,hdcDraw); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxDraw(void) { + ITextServices *txtserv; + ITextHost *host; HDC tmphdc = GetDC(NULL); DWORD dwAspect = DVASPECT_CONTENT; HDC hicTargetDev = NULL; /* Means "default" device */ @@ -772,7 +777,8 @@ static void test_TxDraw(void) HRESULT result; RECTL client = {0,0,100,100}; - if (!init_texthost()) + + if (!init_texthost(&txtserv, &host)) return; todo_wine { @@ -782,8 +788,8 @@ static void test_TxDraw(void) ok(result == S_OK, "TxDraw failed (result = %x)\n", result); } - free_texthost(); - + ITextServices_Release(txtserv); + ITextHost_Release(host); } DEFINE_GUID(expected_iid_itextservices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); @@ -872,12 +878,14 @@ static ULONG get_refcount(IUnknown *iface) static void test_QueryInterface(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ULONG refcount; - if(!init_texthost()) + if(!init_texthost(&txtserv, &host)) return; refcount = get_refcount((IUnknown *)txtserv); @@ -927,11 +935,15 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } START_TEST( txtsrv ) { + ITextServices *txtserv; + ITextHost *host; + setup_thiscall_wrappers(); /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -947,9 +959,10 @@ START_TEST( txtsrv ) test_IIDs(); test_COM(); - if (init_texthost()) + if (init_texthost(&txtserv, &host)) { - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); test_TxGetText(); test_TxSetText();

1 0

Nikolay Sivov : urlmon: Remove unreachable code (Coverity).
by Alexandre Julliard June 2, 2015

June 2, 2015

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

Akihiro Sagawa : shell32: Skip buffer allocation when querying drop file numbers.
by Alexandre Julliard June 2, 2015

June 2, 2015

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 June 2, 2015

June 2, 2015

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

Nikolay Sivov : riched20: Avoid extra host calls during CreateTextServices ().
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: b75cd7e2f0f6f40655f690695ab0843fce472e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75cd7e2f0f6f40655f690695… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 10:01:45 2015 +0300 riched20: Avoid extra host calls during CreateTextServices(). --- dlls/riched20/txtsrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9c1061..1bf9cf2 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -399,7 +399,7 @@ static const ITextServicesVtbl textservices_vtbl = HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) { ITextServicesImpl *ITextImpl; - HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); if (pITextHost == NULL) return E_POINTER; @@ -421,8 +421,6 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->editor->rcFormat.right = 0; ITextImpl->editor->rcFormat.bottom = 0; - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; else

1 0

Nikolay Sivov : wined3d: Remove unnecessary test for 0 (Coverity).
by Alexandre Julliard June 2, 2015

June 2, 2015

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

Dmitry Timoshkov : mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/ VT_UINT in IHTMLElementCollection::item.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 242beac6374efb64658376bc56e67b26071f81da URL: http://source.winehq.org/git/wine.git/?a=commit;h=242beac6374efb64658376bc5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 1 21:52:04 2015 +0300 mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/VT_UINT in IHTMLElementCollection::item. --- dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index ca5e1d5..a57f39e 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -419,11 +419,13 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, switch(V_VT(&name)) { case VT_I4: + case VT_INT: if(V_I4(&name) < 0) return E_INVALIDARG; hres = get_item_idx(This, V_I4(&name), pdisp); break; + case VT_UI4: case VT_UINT: hres = get_item_idx(This, V_UINT(&name), pdisp); break; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3e83e64..077f6e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2437,6 +2437,27 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_UI4; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_INT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_UINT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_I4; V_I4(&name) = -1; disp = (void*)0xdeadbeef;

1 0

Damjan Jovanovic : qcap: The VfwCapture filter's GetNumberOfCapabilities() should set the capability count to zero.
by Alexandre Julliard June 2, 2015

June 2, 2015

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

Damjan Jovanovic : qcap: Add initial audio capture filter.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 9c922b6ab5e43e9af7ebac7ba6eae1abfaa763f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c922b6ab5e43e9af7ebac7ba… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:14:43 2015 +0200 qcap: Add initial audio capture filter. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/audiorecord.c | 302 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 2 +- 3 files changed, 304 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c922b6ab5e43e9af7eba…

1 0

Indrek Altpere : mshtml: Add NULL check to avoid crashing due to Gecko bug.
by Alexandre Julliard June 2, 2015

June 2, 2015

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