February 2014 - Wine-commits

Matteo Bruni : d3dx9: Remove Begin/End stub fixmes.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 244100f01cc180407b691bcb6662ec0deb2fb299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244100f01cc180407b691bcb6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:48 2014 +0100 d3dx9: Remove Begin/End stub fixmes. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 61d6829..a4325af 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3145,7 +3145,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = This->active_technique; - FIXME("iface %p, passes %p, flags %#x partial stub\n", iface, passes, flags); + TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); if (passes && technique) { @@ -3230,7 +3230,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("iface %p partial stub\n", iface); + TRACE("iface %p.\n", iface); if (!This->started) return D3D_OK;

1 0

Matteo Bruni : d3dx9: Don't call CoUninitialize if CoInitializeEx failed.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 8226a187d63e3d355127cf1db830a4281132a598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8226a187d63e3d355127cf1db… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:49 2014 +0100 d3dx9: Don't call CoUninitialize if CoInitializeEx failed. --- dlls/d3dx9_36/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 94301e8..5e87d94 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1025,7 +1025,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, const RECT *pSrcRect, DWORD dwFilter, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { D3DXIMAGE_INFO imginfo; - HRESULT hr; + HRESULT hr, com_init; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder; @@ -1078,7 +1078,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, if (imginfo.ImageFileFormat == D3DXIFF_DIB) convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + com_init = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) goto cleanup_err; @@ -1181,7 +1181,8 @@ cleanup_err: if (factory) IWICImagingFactory_Release(factory); - CoUninitialize(); + if (SUCCEEDED(com_init)) + CoUninitialize(); if (imginfo.ImageFileFormat == D3DXIFF_DIB) HeapFree(GetProcessHeap(), 0, (void*)pSrcData);

1 0

Francois Gouget : d3d9/tests: Fix some test failures on Windows 2000.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: e08c6947c2cd8fe0effc3b341b07c94ba26287d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08c6947c2cd8fe0effc3b341… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:54:22 2014 +0100 d3d9/tests: Fix some test failures on Windows 2000. --- dlls/d3d9/tests/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 07b1c39..3238766 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -206,7 +206,7 @@ static void test_mipmap_levels(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) { skip("failed to create a d3d device\n"); goto cleanup; @@ -254,7 +254,7 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) { skip("failed to create a d3d device\n"); goto cleanup; @@ -318,7 +318,7 @@ static void test_swapchain(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -491,7 +491,7 @@ static void test_refcount(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -812,7 +812,7 @@ static void test_cursor(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -1481,7 +1481,7 @@ static void test_scene(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -1639,7 +1639,7 @@ static void test_limits(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -1712,7 +1712,7 @@ static void test_depthstenciltest(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -2060,7 +2060,7 @@ static void test_null_stream(void) hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!device) { skip("Failed to create a d3d device\n");

1 0

Francois Gouget : oleaut32/tests: Skip the test_stub() tests if we have insufficient privileges.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 2e0d15b00722edd3dad1d627f3a5ab2617bb34cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0d15b00722edd3dad1d627f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:55:23 2014 +0100 oleaut32/tests: Skip the test_stub() tests if we have insufficient privileges. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7adf064..f27a67f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5323,6 +5323,14 @@ static void test_stub(void) ok(hr == S_OK, "got %08x\n", hr); hr = RegisterTypeLib(tl, filenameW, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(tl); + DeleteFileW(filenameW); + CoUninitialize(); + return; + } ok(hr == S_OK, "got %08x\n", hr); ITypeLib_Release(tl);

1 0

Francois Gouget : winmm/tests: Change the current directory to a place that will be writable.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: d155df5c19bc5b4f8254b7d6f7e46e3f38ec472f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d155df5c19bc5b4f8254b7d6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:56:50 2014 +0100 winmm/tests: Change the current directory to a place that will be writable. --- dlls/winmm/tests/mci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6a68b41..c162fce 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1297,8 +1297,14 @@ static void test_AutoOpenWAVE(HWND hwnd) START_TEST(mci) { + char curdir[MAX_PATH], tmpdir[MAX_PATH]; MCIERROR err; HWND hwnd; + + GetCurrentDirectoryA(MAX_PATH, curdir); + GetTempPathA(MAX_PATH, tmpdir); + SetCurrentDirectoryA(tmpdir); + hwnd = CreateWindowExA(0, "static", "winmm test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); test_mciParser(hwnd); @@ -1315,4 +1321,6 @@ START_TEST(mci) ok(!err,"final close all returned %s\n", dbg_mcierr(err)); ok(DeleteFileA("tempfile.wav") || ok_saved, "Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); + + SetCurrentDirectoryA(curdir); }

1 0

Frédéric Delanoy : avifil32: Use BOOL type where appropriate.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: b26c4391509e549a5dc6b80deaee41927aada74a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26c4391509e549a5dc6b80de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 25 00:05:33 2014 +0100 avifil32: Use BOOL type where appropriate. --- dlls/avifil32/wavfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index fd6d9ec..07f9b5e 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -958,7 +958,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, /* do we have anything to write? */ if (buffer != NULL && buffersize > 0) { - This->fDirty = 1; + This->fDirty = TRUE; if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) @@ -1021,7 +1021,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, return AVIERR_UNSUPPORTED; } - This->fDirty = 1; + This->fDirty = TRUE; return AVIERR_OK; } @@ -1225,7 +1225,7 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This) This->lpFormat->nAvgBytesPerSec = This->lpFormat->nBlockAlign * This->lpFormat->nSamplesPerSec; - This->fDirty = 0; + This->fDirty = FALSE; This->sInfo.fccType = streamtypeAUDIO; This->sInfo.fccHandler = 0;

1 0

Frédéric Delanoy : comdlg32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: ce1175149bc92fc8664af507833f1731de0789a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1175149bc92fc8664af5078… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 25 00:05:34 2014 +0100 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index d96d976..e3d9bc7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -325,7 +325,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L { static RECT initrc, rc; static int index, count; - static int gotSWP_bottom, gotShowWindow; + static BOOL gotSWP_bottom, gotShowWindow; HWND parent = GetParent( dlg); int resize; #define MAXNRCTRLS 30 @@ -342,7 +342,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L index = ((OPENFILENAMEA*)lParam)->lCustData; count = 0; - gotSWP_bottom = gotShowWindow = 0; + gotSWP_bottom = gotShowWindow = FALSE; /* test style */ style = GetWindowLongA( parent, GWL_STYLE); if( resize_testcases[index].flags & OFN_ENABLESIZING) @@ -515,16 +515,16 @@ todo_wine { WINDOWPOS *pwp = (WINDOWPOS *)lParam; if( !index && pwp->hwndInsertAfter == HWND_BOTTOM){ - gotSWP_bottom = 1; - ok( gotShowWindow == 0, "The WM_WINDOWPOSCHANGING message came after a WM_SHOWWINDOW message\n"); + gotSWP_bottom = TRUE; + ok(!gotShowWindow, "The WM_WINDOWPOSCHANGING message came after a WM_SHOWWINDOW message\n"); } } break; case WM_SHOWWINDOW: { if( !index){ - gotShowWindow = 1; - ok( gotSWP_bottom == 1, "No WM_WINDOWPOSCHANGING message came before a WM_SHOWWINDOW message\n"); + gotShowWindow = TRUE; + ok(gotSWP_bottom, "No WM_WINDOWPOSCHANGING message came before a WM_SHOWWINDOW message\n"); } } break;

1 0

Dmitry Timoshkov : taskschd/tests: Add more various tests.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 1c778d91bdb07702665f2bae86d7c4a26a150e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c778d91bdb07702665f2bae8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:20 2014 +0900 taskschd/tests: Add more various tests. --- dlls/taskschd/task.c | 2 + dlls/taskschd/tests/scheduler.c | 136 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 133 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8b73bf0..eb42d65 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2173,6 +2173,8 @@ static HRESULT WINAPI TaskDefinition_put_XmlText(ITaskDefinition *iface, BSTR xm TRACE("%p,%s\n", iface, debugstr_w(xml)); + if (!xml) return E_INVALIDARG; + hmem = GlobalAlloc(0, lstrlenW(xml) * sizeof(WCHAR)); if (!hmem) return E_OUTOFMEMORY; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 35e6dc0..8187214 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -81,8 +81,8 @@ static void test_Connect(void) V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); -todo_wine - ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR) || hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH) /* VM */, + "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); SysFreeString(V_BSTR(&v_comp)); vbool = 0xdead; @@ -340,6 +340,10 @@ todo_wine ITaskFolder_Release(subfolder); + hr = ITaskFolder_DeleteFolder(folder, Wine, 0); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); @@ -816,6 +820,15 @@ todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); + ok(hr == S_OK, "put_Enabled error %#x\n", hr); + hr = IRegisteredTask_get_State(task1, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task1, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + IRegisteredTask_Release(task1); hr = ITaskFolder_GetTask(folder, Task2, &task2); @@ -1076,6 +1089,85 @@ todo_wine static void test_TaskDefinition(void) { + static const char xml1[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml2[] = + "<Task>\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml3[] = + "<TASK>\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</TASK>\n"; + static const char xml4[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings/>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml5[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings/>\n" + " <Actions/>\n" + "</Task>\n"; + static const char xml6[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings/>\n" + " <Actions>\n" + "</Task>\n"; + static const char xml7[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings>\n" + " <Enabled>FALSE</Enabled>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_FALSE, @@ -1085,10 +1177,10 @@ static void test_TaskDefinition(void) VARIANT_FALSE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE }; HRESULT hr; - VARIANT v_null; ITaskService *service; ITaskDefinition *taskdef; BSTR xml; + WCHAR xmlW[sizeof(xml1)]; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -1097,8 +1189,6 @@ static void test_TaskDefinition(void) return; } - V_VT(&v_null) = VT_NULL; - hr = ITaskService_NewTask(service, 0, &taskdef); ok(hr == S_OK, "NewTask error %#x\n", hr); @@ -1124,6 +1214,42 @@ static void test_TaskDefinition(void) test_settings_v1(taskdef, &new_settings, &def_settings); */ + hr = ITaskDefinition_put_XmlText(taskdef, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); + ok(hr == S_OK, "put_XmlText error %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); + ok(hr == S_OK, "put_XmlText error %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); + ITaskDefinition_Release(taskdef); ITaskService_Release(service); }

1 0

Dmitry Timoshkov : taskschd: Add a check for the task namespace.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: d2fc6b3145e41d05a81692eb0939bbadf694f5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fc6b3145e41d05a81692eb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:25 2014 +0900 taskschd: Add a check for the task namespace. --- dlls/taskschd/task.c | 7 ++++++- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index eb42d65..1288314 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1990,6 +1990,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef ITaskSettings *taskset; const WCHAR *name; const WCHAR *value; + BOOL xmlns_ok = FALSE; TRACE("\n"); @@ -2028,7 +2029,11 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef else if (!lstrcmpW(name, xmlns)) { if (lstrcmpW(value, task_ns)) + { FIXME("unknown namespace %s\n", debugstr_w(value)); + break; + } + xmlns_ok = TRUE; } else FIXME("unhandled Task attribute %s\n", debugstr_w(name)); @@ -2037,7 +2042,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef } ITaskSettings_Release(taskset); - return S_OK; + return xmlns_ok ? S_OK : SCHED_E_NAMESPACE; } static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8187214..48d16dd 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,7 +1223,6 @@ static void test_TaskDefinition(void) MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0]));

1 0

Dmitry Timoshkov : taskschd: Don' t accept task XML with an invalid boolean value.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 39f0b276c782ea5a23fed6e3ff3b374b8a29f1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f0b276c782ea5a23fed6e3f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:30 2014 +0900 taskschd: Don't accept task XML with an invalid boolean value. --- dlls/taskschd/task.c | 44 +++++++++++++++++++-------------------- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1288314..7dd9f04 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1553,8 +1553,8 @@ static HRESULT read_variantbool_value(IXmlReader *reader, VARIANT_BOOL *vbool) *vbool = VARIANT_FALSE; else { - FIXME("unexpected bool value %s\n", debugstr_w(value)); - return E_FAIL; + WARN("unexpected bool value %s\n", debugstr_w(value)); + return SCHED_E_INVALIDVALUE; } return S_OK; @@ -1826,62 +1826,62 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) else if (!lstrcmpW(name, DisallowStartIfOnBatteries)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_DisallowStartIfOnBatteries(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_DisallowStartIfOnBatteries(taskset, bool_val); } else if (!lstrcmpW(name, AllowStartOnDemand)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_AllowDemandStart(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_AllowDemandStart(taskset, bool_val); } else if (!lstrcmpW(name, StopIfGoingOnBatteries)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); } else if (!lstrcmpW(name, AllowHardTerminate)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_AllowHardTerminate(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_AllowHardTerminate(taskset, bool_val); } else if (!lstrcmpW(name, StartWhenAvailable)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_StartWhenAvailable(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_StartWhenAvailable(taskset, bool_val); } else if (!lstrcmpW(name, RunOnlyIfNetworkAvailable)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); } else if (!lstrcmpW(name, Enabled)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_Enabled(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_Enabled(taskset, bool_val); } else if (!lstrcmpW(name, Hidden)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_Hidden(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_Hidden(taskset, bool_val); } else if (!lstrcmpW(name, RunOnlyIfIdle)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_RunOnlyIfIdle(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_RunOnlyIfIdle(taskset, bool_val); } else if (!lstrcmpW(name, WakeToRun)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_WakeToRun(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_WakeToRun(taskset, bool_val); } else if (!lstrcmpW(name, ExecutionTimeLimit)) { diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 48d16dd..4aad408 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1246,7 +1246,6 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); ITaskDefinition_Release(taskdef);

1 0