April 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Use a separate device for offscreen_test().
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 80c3e07c968fbdfe7e76ffe1d69f5aa7a8afe5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3e07c968fbdfe7e76ffe1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 9 08:54:46 2014 +0200 d3d9/tests: Use a separate device for offscreen_test(). --- dlls/d3d9/tests/visual.c | 90 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 62feac0..3d4cda7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1653,46 +1653,60 @@ static void test_cube_wrap(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surface); } -static void offscreen_test(IDirect3DDevice9 *device) +static void offscreen_test(void) { + IDirect3DSurface9 *backbuffer, *offscreen; + IDirect3DTexture9 *offscreenTexture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - IDirect3DTexture9 *offscreenTexture = NULL; - IDirect3DSurface9 *backbuffer = NULL, *offscreen = NULL; - DWORD color; - static const float quad[][5] = { + static const float quad[][5] = + { {-0.5f, -0.5f, 0.1f, 0.0f, 0.0f}, {-0.5f, 0.5f, 0.1f, 0.0f, 1.0f}, { 0.5f, -0.5f, 0.1f, 1.0f, 0.0f}, { 0.5f, 0.5f, 0.1f, 1.0f, 1.0f}, }; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %08x\n", hr); - if(!offscreenTexture) { - trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n"); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL); + if (!offscreenTexture) + { + trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5.\n"); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %08x\n", hr); - if(!offscreenTexture) { - skip("Cannot create an offscreen render target\n"); - goto out; + if (!offscreenTexture) + { + skip("Cannot create an offscreen render target.\n"); + IDirect3DDevice9_Release(device); + goto done; } } hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); - if(!backbuffer) { - goto out; - } hr = IDirect3DTexture9_GetSurfaceLevel(offscreenTexture, 0, &offscreen); ok(hr == D3D_OK, "Can't get offscreen surface, hr = %08x\n", hr); - if(!offscreen) { - goto out; - } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "SetFVF failed, hr = %08x\n", hr); @@ -1739,34 +1753,19 @@ static void offscreen_test(IDirect3DDevice9 *device) /* Part of the originally cleared back buffer */ color = getPixelColor(device, 10, 10); ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); - if(0) { - /* Lower left corner of the screen, where back buffer offscreen rendering draws the offscreen texture. - * It should be red, but the offscreen texture may leave some junk there. Not tested yet. Depending on - * the offscreen rendering mode this test would succeed or fail - */ - color = getPixelColor(device, 10, 470); - ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); - } + color = getPixelColor(device, 10, 470); + ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); -out: - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture returned %#x.\n", hr); - - /* restore things */ - if (backbuffer) - { - hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget returned %#x.\n", hr); - IDirect3DSurface9_Release(backbuffer); - } - if(offscreenTexture) { - IDirect3DTexture9_Release(offscreenTexture); - } - if(offscreen) { - IDirect3DSurface9_Release(offscreen); - } + IDirect3DSurface9_Release(backbuffer); + IDirect3DTexture9_Release(offscreenTexture); + IDirect3DSurface9_Release(offscreen); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* This test tests fog in combination with shaders. @@ -16670,11 +16669,10 @@ START_TEST(visual) skip("No mipmap support\n"); } - offscreen_test(device_ptr); - cleanup_device(device_ptr); device_ptr = NULL; + offscreen_test(); ds_size_test(); alpha_test(); shademode_test();

1 0

Alexandre Julliard : makedep: Add a structure to store individual makefile parameters.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 228684d34f5814470c6af357320652b80a8bd42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=228684d34f5814470c6af3573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 10:12:44 2014 +0200 makedep: Add a structure to store individual makefile parameters. --- tools/makedep.c | 187 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=228684d34f5814470c6af…

1 0

Alexandre Julliard : makedep: Compute source paths instead of loading them from the makefile.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 8fdacd15d2766bb7133bb54fc4f8ed4b4803dc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdacd15d2766bb7133bb54fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 12:32:54 2014 +0200 makedep: Compute source paths instead of loading them from the makefile. --- tools/makedep.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a893d54..8eb1ca3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -519,9 +519,9 @@ static char *get_relative_path( const char *from, const char *dest ) */ static char *concat_paths( const char *base, const char *path ) { - if (!base) return xstrdup( path[0] ? path : "." ); + if (!base) return xstrdup( path && path[0] ? path : "." ); + if (!path || !path[0]) return xstrdup( base ); if (path[0] == '/') return xstrdup( path ); - if (!path[0]) return xstrdup( base ); return strmake( "%s/%s", base, path ); } @@ -1537,8 +1537,8 @@ static struct strarray output_sources( struct strarray *testlist_files ) strarray_add( &includes, "-I." ); if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make->parent_dir ))); - if (make->top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", make->top_obj_dir )); - if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s/include", make->top_src_dir )); + if (make->top_obj_dir) strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( "include" ))); + if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( "include" ))); if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( "include/msvcrt" ))); strarray_addall( &includes, make->include_args ); @@ -2341,26 +2341,25 @@ static void update_makefile( const char *path ) struct strarray value; struct incl_file *file; + make->top_obj_dir = get_relative_path( path, "" ); make->base_dir = path; if (!strcmp( make->base_dir, "." )) make->base_dir = NULL; + output_file_name = base_dir_path( makefile_name ); parse_makefile( output_file_name, Separator, &make->vars ); - make->src_dir = get_expanded_make_variable( "srcdir" ); - make->top_src_dir = get_expanded_make_variable( "top_srcdir" ); - make->top_obj_dir = get_expanded_make_variable( "top_builddir" ); - make->parent_dir = get_expanded_make_variable( "PARENTSRC" ); - - /* ignore redundant source paths */ - if (make->src_dir && !strcmp( make->src_dir, "." )) - make->src_dir = NULL; - if (make->top_src_dir && make->top_obj_dir && !strcmp( make->top_src_dir, make->top_obj_dir )) - make->top_src_dir = NULL; - if (make->top_obj_dir && !strcmp( make->top_obj_dir, "." )) - make->top_obj_dir = NULL; + if (root_src_dir) + { + make->top_src_dir = concat_paths( make->top_obj_dir, root_src_dir ); + make->src_dir = concat_paths( make->top_src_dir, make->base_dir ); + } + strarray_set_value( &make->vars, "top_builddir", top_obj_dir_path( "" )); + strarray_set_value( &make->vars, "top_srcdir", top_dir_path( "" )); + strarray_set_value( &make->vars, "srcdir", src_dir_path( "" )); - make->appmode = get_expanded_make_var_array( "APPMODE" ); - make->imports = get_expanded_make_var_array( "IMPORTS" ); + make->parent_dir = get_expanded_make_variable( "PARENTSRC" ); + make->appmode = get_expanded_make_var_array( "APPMODE" ); + make->imports = get_expanded_make_var_array( "IMPORTS" ); make->use_msvcrt = 0; for (i = 0; i < make->appmode.count && !make->use_msvcrt; i++) @@ -2531,6 +2530,7 @@ int main( int argc, char *argv[] ) rsvg = get_expanded_make_variable( "RSVG" ); icotool = get_expanded_make_variable( "ICOTOOL" ); + if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL; if (!tools_ext) tools_ext = ""; if (!dll_prefix) dll_prefix = "";

1 0

Alexandre Julliard : makedep: Store more variables in the makefile structure.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 081df721d03a090f223fe9596d0acb1519b3e5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=081df721d03a090f223fe9596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 12:35:24 2014 +0200 makedep: Store more variables in the makefile structure. --- tools/makedep.c | 114 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=081df721d03a090f223fe…

1 0

Piotr Caban : server: Don' t debug children when DEBUG_PROCESS and DEBUG_ONLY_THIS_PROCESS flags are passed to CreateProcess.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 4fca1693018de3c77d8fea0c10753f40c7a3cd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fca1693018de3c77d8fea0c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 9 10:15:41 2014 +0200 server: Don't debug children when DEBUG_PROCESS and DEBUG_ONLY_THIS_PROCESS flags are passed to CreateProcess. --- dlls/kernel32/tests/debugger.c | 1 + server/process.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 41e4f1a..011ed5f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -846,6 +846,7 @@ START_TEST(debugger) test_debug_loop(myARGC, myARGV); test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE); test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE); + test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE); test_debug_children(myARGV[0], 0, FALSE); } } diff --git a/server/process.c b/server/process.c index ceaef64..7b9a3b2 100644 --- a/server/process.c +++ b/server/process.c @@ -955,7 +955,8 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->debug_children = !!(req->create_flags & DEBUG_PROCESS); + process->debug_children = (req->create_flags & DEBUG_PROCESS) + && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */

1 0

Dmitry Timoshkov : schedsvc: Return correct error code when a being loaded xml doesn't exist.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 96452fc81008fac90f59779641a8c874157eabb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96452fc81008fac90f5977964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:42 2014 +0900 schedsvc: Return correct error code when a being loaded xml doesn't exist. --- dlls/schedsvc/schedsvc.c | 8 +++++++- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index aa99b03..a0daab2 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -245,10 +245,16 @@ static int detect_encoding(const void *buffer, DWORD size) static HRESULT read_xml(const WCHAR *name, WCHAR **xml) { HANDLE hfile; - DWORD size; + DWORD size, attrs; char *src; int cp; + attrs = GetFileAttributesW(name); + if (attrs == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + if (attrs & FILE_ATTRIBUTE_DIRECTORY) + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + hfile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5e5d303..3f8ba3e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -760,7 +760,6 @@ static void test_GetTask(void) ok(hr == S_OK, "CreateFolder error %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine, &task1); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0]));

1 0

Dmitry Timoshkov : schedsvc: Add some tests for SchRpcGetTaskInfo.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 9b9b07e4cdbf61daf1fb6fdc4695d5df5e1bf1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9b07e4cdbf61daf1fb6fdc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:49 2014 +0900 schedsvc: Add some tests for SchRpcGetTaskInfo. --- dlls/schedsvc/tests/rpcapi.c | 50 ++++++++++++++++++++++++++++++++++++++++-- include/wine/schrpc.idl | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 2ef50c9..480aa83 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -93,7 +93,7 @@ START_TEST(rpcapi) }; WCHAR xmlW[sizeof(xml1)], *xml; HRESULT hr; - DWORD version, start_index, count, i, enumed; + DWORD version, start_index, count, i, enumed, enabled, state; WCHAR *path; TASK_XML_ERROR_INFO *info; TASK_NAMES names; @@ -407,7 +407,7 @@ START_TEST(rpcapi) ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), - "expected Task3, got %s\n", wine_dbgstr_w(names[0])); + "expected Task1, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -473,6 +473,52 @@ START_TEST(rpcapi) MIDL_user_free(names[0]); MIDL_user_free(names); + if (0) /* crashes under win7 */ + { + hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, NULL, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, &enabled, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, NULL, &state); + } + + hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 0, "expected 0, got %u\n", enabled); + ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); +} + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 0, "expected 0, got %u\n", enabled); + ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); +} + + hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 1, "expected 1, got %u\n", enabled); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); +} + hr = SchRpcDelete(Wine_Task1+1, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = SchRpcDelete(Wine_Task2+1, 0); diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 55acb38..4af709d 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -19,6 +19,7 @@ */ cpp_quote("#define SCHEDSVC_TRANSPORT {'n','c','a','l','r','p','c',0}") +cpp_quote("#define SCH_FLAG_STATE 0x10000000") import "oaidl.idl"; import "ocidl.idl";

1 0

Dmitry Timoshkov : schedsvc: Add SchRpcGetTaskInfo stub implementation.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 67100eb29c1e11bf3cdc20856bb8d2c55e384670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67100eb29c1e11bf3cdc20856… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:53 2014 +0900 schedsvc: Add SchRpcGetTaskInfo stub implementation. --- dlls/schedsvc/schedsvc.c | 16 +++++++++++++++- dlls/schedsvc/tests/rpcapi.c | 15 ++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a0daab2..eb84998 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -664,8 +664,22 @@ HRESULT __cdecl SchRpcGetLastRunInfo(const WCHAR *path, SYSTEMTIME *last_runtime HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled, DWORD *task_state) { + WCHAR *full_name, *xml; + HRESULT hr; + FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); - return E_NOTIMPL; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = read_xml(full_name, &xml); + heap_free(full_name); + if (hr != S_OK) return hr; + heap_free(xml); + + *enabled = 0; + *task_state = (flags & SCH_FLAG_STATE) ? TASK_STATE_DISABLED : TASK_STATE_UNKNOWN; + return S_OK; } HRESULT __cdecl SchRpcGetNumberOfMissedRuns(const WCHAR *path, DWORD *runs) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 480aa83..02f6882 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -482,28 +482,19 @@ START_TEST(rpcapi) } hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); -} enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); -} hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); todo_wine @@ -511,13 +502,11 @@ todo_wine enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ +todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); -} hr = SchRpcDelete(Wine_Task1+1, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Dmitry Timoshkov : taskschd: Forward IRegisteredTask:: get_State to SchRpcGetTaskInfo.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 7f3c32b626f9bfcdc299a7d8c494f24ee99e8dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c32b626f9bfcdc299a7d8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:58 2014 +0900 taskschd: Forward IRegisteredTask::get_State to SchRpcGetTaskInfo. --- dlls/taskschd/regtask.c | 8 ++++++-- dlls/taskschd/tests/scheduler.c | 13 +++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 2953c6e..038315f 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -152,8 +152,12 @@ static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *state) { - FIXME("%p,%p: stub\n", iface, state); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + DWORD enabled; + + TRACE("%p,%p\n", iface, state); + + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3f8ba3e..7498b70 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -815,9 +815,7 @@ todo_wine ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -844,9 +842,8 @@ if (hr == S_OK) ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); todo_wine @@ -875,9 +872,7 @@ todo_wine ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -889,9 +884,8 @@ if (hr == S_OK) todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -913,9 +907,8 @@ if (hr == S_OK) ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); todo_wine

1 0

Dmitry Timoshkov : taskschd: Forward IRegisteredTask:: get_Enabled to SchRpcGetTaskInfo.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: a3cd93ca9602406b4891136101167c5444101391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3cd93ca9602406b489113610… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:51:03 2014 +0900 taskschd: Forward IRegisteredTask::get_Enabled to SchRpcGetTaskInfo. --- dlls/taskschd/regtask.c | 14 +++++++++++--- dlls/taskschd/tests/scheduler.c | 13 +++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 038315f..e224b3e 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -160,10 +160,18 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } -static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *enabled) +static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *v_enabled) { - FIXME("%p,%p: stub\n", iface, enabled); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + DWORD enabled, state; + HRESULT hr; + + TRACE("%p,%p\n", iface, v_enabled); + + hr = SchRpcGetTaskInfo(regtask->path, 0, &enabled, &state); + if (hr == S_OK) + *v_enabled = enabled ? VARIANT_TRUE : VARIANT_FALSE; + return hr; } static HRESULT WINAPI regtask_put_Enabled(IRegisteredTask *iface, VARIANT_BOOL enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 7498b70..e54e6ee 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -818,9 +818,7 @@ todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); -todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); -if (hr == S_OK) ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -846,9 +844,8 @@ if (hr == S_OK) todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); -todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); @@ -875,9 +872,7 @@ todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); -todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); -if (hr == S_OK) ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); @@ -888,9 +883,8 @@ todo_wine todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); -todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -911,9 +905,8 @@ if (hr == S_OK) todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); -todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2);

1 0