August 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : regedit: Convert AddEntryToTree to unicode.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 74cae34da8cac146fafc1e477f6edc3be26ec9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cae34da8cac146fafc1e477… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 22 00:12:09 2008 +0200 regedit: Convert AddEntryToTree to unicode. --- programs/regedit/treeview.c | 67 +++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 61c13ad..dcfb7fa 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -232,26 +232,30 @@ BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) } /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ -static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) +static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HKEY hKey, DWORD dwChildren) { TVINSERTSTRUCT tvins; + CHAR* labelA = GetMultiByteString(label); + HTREEITEM ret; if (hKey) { - if (RegQueryInfoKey(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { dwChildren = 0; } } tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = label; - tvins.u.item.cchTextMax = lstrlen(label); + tvins.u.item.pszText = labelA; + tvins.u.item.cchTextMax = lstrlen(labelA); tvins.u.item.iImage = Image_Closed; tvins.u.item.iSelectedImage = Image_Open; tvins.u.item.cChildren = dwChildren; tvins.u.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; - return TreeView_InsertItem(hwndTV, &tvins); + ret = TreeView_InsertItem(hwndTV, &tvins); + HeapFree(GetProcessHeap(), 0, labelA); + return ret; } static BOOL match_string(LPCTSTR sstring1, LPCTSTR sstring2, int mode) @@ -388,20 +392,20 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) { HKEY hRoot, hKey, hSubKey; HTREEITEM childItem; - LPTSTR KeyPath; + LPWSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; - LPSTR Name; + LPWSTR Name; TVITEM tvItem; hRoot = NULL; - KeyPath = GetItemPath(hwndTV, hItem, &hRoot); + KeyPath = GetItemPathW(hwndTV, hItem, &hRoot); if (!KeyPath || !hRoot) return FALSE; if (*KeyPath) { - if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - WINE_TRACE("RegOpenKeyEx failed, \"%s\" was probably removed.\n", KeyPath); + if (RegOpenKeyExW(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { + WINE_TRACE("RegOpenKeyEx failed, %s was probably removed.\n", wine_dbgstr_w(KeyPath)); return FALSE; } } else { @@ -409,7 +413,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } HeapFree(GetProcessHeap(), 0, KeyPath); - if (RegQueryInfoKey(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { return FALSE; } @@ -428,7 +432,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } dwMaxSubKeyLen++; /* account for the \0 terminator */ - if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { return FALSE; } tvItem.cchTextMax = dwMaxSubKeyLen; @@ -440,38 +444,43 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; BOOL found; + CHAR* NameA; found = FALSE; - if (RegEnumKeyEx(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { + if (RegEnumKeyExW(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { continue; } /* Find the number of children of the node. */ dwSubCount = 0; - if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { + if (RegOpenKeyExW(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { dwSubCount = 0; } RegCloseKey(hSubKey); } + NameA = GetMultiByteString(Name); + /* Check if the node is already in there. */ for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; childItem = TreeView_GetNextSibling(hwndTV, childItem)) { tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; if (!TreeView_GetItem(hwndTV, &tvItem)) { + HeapFree(GetProcessHeap(), 0, NameA); return FALSE; } - if (!stricmp(tvItem.pszText, Name)) { + if (!stricmp(tvItem.pszText, NameA)) { found = TRUE; + HeapFree(GetProcessHeap(), 0, NameA); break; } } if (found == FALSE) { - WINE_TRACE("New subkey %s\n", Name); + WINE_TRACE("New subkey %s\n", NameA); AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } @@ -527,9 +536,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return FALSE; if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE)) { - char* nameA = GetMultiByteString(name); - hNewItem = AddEntryToTree(hwndTV, hItem, nameA, 0, 0); - HeapFree(GetProcessHeap(), 0, nameA); + hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE; item.hItem = hItem; @@ -568,7 +575,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) { TVINSERTSTRUCT tvins; HTREEITEM hRoot; - static TCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, + static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}, @@ -646,8 +653,8 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) { DWORD dwCount, dwIndex, dwMaxSubKeyLen; HKEY hRoot, hNewKey, hKey; - LPTSTR keyPath; - LPTSTR Name; + LPWSTR keyPath; + LPWSTR Name; LONG errCode; HCURSOR hcursorOld; @@ -658,32 +665,32 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) } expanding = TRUE; hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); - SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, FALSE, 0); - keyPath = GetItemPath(hwndTV, hItem, &hRoot); + keyPath = GetItemPathW(hwndTV, hItem, &hRoot); if (!keyPath) goto done; if (*keyPath) { - errCode = RegOpenKeyEx(hRoot, keyPath, 0, KEY_READ, &hNewKey); + errCode = RegOpenKeyExW(hRoot, keyPath, 0, KEY_READ, &hNewKey); if (errCode != ERROR_SUCCESS) goto done; } else { hNewKey = hRoot; } - errCode = RegQueryInfoKey(hNewKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0); + errCode = RegQueryInfoKeyW(hNewKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0); if (errCode != ERROR_SUCCESS) goto done; dwMaxSubKeyLen++; /* account for the \0 terminator */ - Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)); + Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)); if (!Name) goto done; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; - errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); + errCode = RegEnumKeyExW(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); if (errCode != ERROR_SUCCESS) continue; - errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); + errCode = RegOpenKeyExW(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); if (errCode == ERROR_SUCCESS) { - errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); + errCode = RegQueryInfoKeyW(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); RegCloseKey(hKey); } if (errCode != ERROR_SUCCESS) dwSubCount = 0;

1 0

Alexander Nicolaysen Sørnes : dpnet: Add stubbed DirectPlay8Peer interface.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: bae5e6e1e5ddde12e59a5663bc43e57f69cb1af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae5e6e1e5ddde12e59a5663b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 20 15:18:57 2008 +0200 dpnet: Add stubbed DirectPlay8Peer interface. --- dlls/dpnet/dpnet_private.h | 11 ++ dlls/dpnet/peer.c | 328 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 337 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bae5e6e1e5ddde12e59a5…

1 0

Paul Vriens : advapi32/tests: Add helper function to get function pointers.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 6381303c019c9d9b9a7119a1db8fb7dae68c867c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6381303c019c9d9b9a7119a1d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 20 20:13:59 2008 +0200 advapi32/tests: Add helper function to get function pointers. --- dlls/advapi32/tests/service.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 829cfe7..306f000 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -33,6 +33,19 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ +static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); +static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); + +static void init_function_pointers(void) +{ + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + + pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); + pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); + pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); +} + static void test_open_scm(void) { SC_HANDLE scm_handle; @@ -958,13 +971,7 @@ static void test_queryconfig2(void) static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR description [] = "Description"; - HMODULE dllhandle = GetModuleHandleA("advapi32.dll"); - BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID) - = (void*)GetProcAddress(dllhandle, "ChangeServiceConfig2A"); - BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) - = (void*)GetProcAddress(dllhandle, "QueryServiceConfig2A"); - BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) - = (void*)GetProcAddress(dllhandle, "QueryServiceConfig2W"); + if(!pQueryServiceConfig2A) { skip("function QueryServiceConfig2A not present\n"); @@ -1250,6 +1257,8 @@ START_TEST(service) } CloseServiceHandle(scm_handle); + init_function_pointers(); + /* First some parameter checking */ test_open_scm(); test_open_svc();

1 0

Paul Vriens : advapi32/tests: Add tests for QueryServiceStatus.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 9d906d0df89f33a5dd80ff18382449dca75600bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d906d0df89f33a5dd80ff183… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 20 20:27:34 2008 +0200 advapi32/tests: Add tests for QueryServiceStatus. --- dlls/advapi32/tests/service.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 306f000..746530a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -797,6 +797,64 @@ static void test_get_servicekeyname(void) CloseServiceHandle(scm_handle); } +static void test_query_svc(void) +{ + SC_HANDLE scm_handle, svc_handle; + BOOL ret; + SERVICE_STATUS status; + + /* All NULL or wrong */ + SetLastError(0xdeadbeef); + ret = QueryServiceStatus(NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + + /* Check if 'Spooler' exists. + * Open with not enough rights to query the status. + */ + svc_handle = OpenServiceA(scm_handle, spooler, STANDARD_RIGHTS_READ); + if (!svc_handle) + { + skip("Spooler service doesn't exist\n"); + CloseServiceHandle(scm_handle); + return; + } + + SetLastError(0xdeadbeef); + ret = QueryServiceStatus(svc_handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_ADDRESS || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Unexpected last error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QueryServiceStatus(svc_handle, &status); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* Open the service with just enough rights. + * (Verified with 'SERVICE_ALL_ACCESS &~ SERVICE_QUERY_STATUS') + */ + CloseServiceHandle(svc_handle); + svc_handle = OpenServiceA(scm_handle, spooler, SERVICE_QUERY_STATUS); + + SetLastError(0xdeadbeef); + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == 0xdeadbeef /* NT4, XP and Vista */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Unexpected last error %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + static void test_close(void) { SC_HANDLE handle; @@ -1265,6 +1323,7 @@ START_TEST(service) test_create_delete_svc(); test_get_displayname(); test_get_servicekeyname(); + test_query_svc(); test_close(); /* Test the creation, querying and deletion of a service */ test_sequence();

1 0

Roy Shea : mstask: Implemented partial stub for (Set|Get)AccountInformation .
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: f208025228852d2286ffcd8de7ba880216413d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f208025228852d2286ffcd8de… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 13:07:00 2008 -0700 mstask: Implemented partial stub for (Set|Get)AccountInformation. --- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/mstask/tests/task.c | 28 +++++++++++++++------------- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 998bb71..71a675e 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -62,6 +62,7 @@ typedef struct LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; + LPWSTR accountName; } TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 707b943..2c70ef5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -29,6 +29,7 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This->taskName); @@ -355,17 +356,46 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( LPCWSTR pwszAccountName, LPCWSTR pwszPassword) { - FIXME("(%p, %s, %s): stub\n", iface, debugstr_w(pwszAccountName), + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + LPWSTR tmp_account_name; + + TRACE("(%p, %s, %s): partial stub\n", iface, debugstr_w(pwszAccountName), debugstr_w(pwszPassword)); - return E_NOTIMPL; + + if (pwszPassword) + FIXME("Partial stub ignores passwords\n"); + + n = (lstrlenW(pwszAccountName) + 1); + tmp_account_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + if (!tmp_account_name) + return E_OUTOFMEMORY; + lstrcpyW(tmp_account_name, pwszAccountName); + HeapFree(GetProcessHeap(), 0, This->accountName); + This->accountName = tmp_account_name; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( ITask* iface, LPWSTR *ppwszAccountName) { - FIXME("(%p, %p): stub\n", iface, ppwszAccountName); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %p): partial stub\n", iface, ppwszAccountName); + + /* This implements the WinXP behavior when accountName has not yet + * set. Win2K behaves differently, returning SCHED_E_CANNOT_OPEN_TASK */ + if (!This->accountName) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + n = (lstrlenW(This->accountName) + 1); + *ppwszAccountName = CoTaskMemAlloc(n * sizeof(WCHAR)); + if (!*ppwszAccountName) + return E_OUTOFMEMORY; + lstrcpyW(*ppwszAccountName, This->accountName); + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetApplicationName( @@ -728,6 +758,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; + This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 8dfa675..9e4dfe2 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -434,6 +434,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) LPWSTR account_name; const WCHAR dummy_account_name[] = {'N', 'o', 'S', 'u', 'c', 'h', 'A', 'c', 'c', 'o', 'u', 'n', 't', 0}; + const WCHAR dummy_account_name_b[] = {'N', 'o', 'S', 'u', 'c', 'h', + 'A', 'c', 'c', 'o', 'u', 'n', 't', 'B', 0}; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -447,20 +449,20 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_GetAccountInformation(test_task, &account_name); /* WinXP returns HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND): 0x80070002 but * Win2K returns SCHED_E_CANNOT_OPEN_TASK: 0x8004130d */ - todo_wine ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, "Unset account name generated: 0x%08x\n", hres); /* Attempt to set to a dummy account without a password */ /* This test passes on WinXP but fails on Win2K */ hres = ITask_SetAccountInformation(test_task, dummy_account_name, NULL); - todo_wine ok(hres == S_OK, + ok(hres == S_OK, "Failed setting dummy account with no password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - todo_wine ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(account_name, dummy_account_name), + ok(!lstrcmpW(account_name, dummy_account_name), "Got %s, expected %s\n", dbgstr_w(account_name), dbgstr_w(dummy_account_name)); CoTaskMemFree(account_name); @@ -468,28 +470,28 @@ static void test_SetAccountInformation_GetAccountInformation(void) /* Attempt to set to a dummy account with a (invalid) password */ /* This test passes on WinXP but fails on Win2K */ - hres = ITask_SetAccountInformation(test_task, dummy_account_name, - dummy_account_name); - todo_wine ok(hres == S_OK, + hres = ITask_SetAccountInformation(test_task, dummy_account_name_b, + dummy_account_name_b); + ok(hres == S_OK, "Failed setting dummy account with password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - todo_wine ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(account_name, dummy_account_name), + ok(!lstrcmpW(account_name, dummy_account_name_b), "Got %s, expected %s\n", dbgstr_w(account_name), - dbgstr_w(dummy_account_name)); + dbgstr_w(dummy_account_name_b)); CoTaskMemFree(account_name); } /* Attempt to set to the local system account */ hres = ITask_SetAccountInformation(test_task, empty, NULL); - todo_wine ok(hres == S_OK, "Failed setting system account: %08x\n", hres); + ok(hres == S_OK, "Failed setting system account: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - todo_wine ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(account_name, empty), + ok(!lstrcmpW(account_name, empty), "Got %s, expected empty string\n", dbgstr_w(account_name)); CoTaskMemFree(account_name); }

1 0

Roy Shea : mstask: Implemented (Set|Get)MaxRunTime.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: a597d9eaed00489ba44cfb0ab339e7b60bd230ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a597d9eaed00489ba44cfb0ab… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 13:06:19 2008 -0700 mstask: Implemented (Set|Get)MaxRunTime. --- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task.c | 19 +++++++++++++++---- dlls/mstask/tests/task.c | 28 ++++++++++++++-------------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 05e7b0c..998bb71 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -61,6 +61,7 @@ typedef struct LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; + DWORD maxRunTime; } TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 149869a..707b943 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -540,16 +540,24 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( ITask* iface, DWORD dwMaxRunTime) { - FIXME("(%p, %d): stub\n", iface, dwMaxRunTime); - return E_NOTIMPL; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %d)\n", iface, dwMaxRunTime); + + This->maxRunTime = dwMaxRunTime; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetMaxRunTime( ITask* iface, DWORD *pdwMaxRunTime) { - FIXME("(%p, %p): stub\n", iface, pdwMaxRunTime); - return E_NOTIMPL; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %p)\n", iface, pdwMaxRunTime); + + *pdwMaxRunTime = This->maxRunTime; + return S_OK; } static HRESULT WINAPI MSTASK_IPersistFile_QueryInterface( @@ -721,6 +729,9 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) This->parameters = NULL; This->comment = NULL; + /* Default time is 3 days = 259200000 ms */ + This->maxRunTime = 259200000; + *ppObj = &This->lpVtbl; InterlockedIncrement(&dll_ref); return S_OK; diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 349b110..8dfa675 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -388,40 +388,40 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ max_run_time = 0; hres = ITask_GetMaxRunTime(test_task, &max_run_time); - todo_wine ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - todo_wine ok(max_run_time == 259200000, "Expected 259200000: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); + ok(max_run_time == 259200000, "Expected 259200000: %d\n", max_run_time); /* Basic set test */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1234); - todo_wine ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - todo_wine ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - todo_wine ok(max_run_time == 1234, "Expected 1234: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); + ok(max_run_time == 1234, "Expected 1234: %d\n", max_run_time); /* Verify that time can be set to zero */ max_run_time = 1; hres = ITask_SetMaxRunTime(test_task, 0); - todo_wine ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - todo_wine ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - todo_wine ok(max_run_time == 0, "Expected 0: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); + ok(max_run_time == 0, "Expected 0: %d\n", max_run_time); /* Check resolution by setting time to one */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1); - todo_wine ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - todo_wine ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - todo_wine ok(max_run_time == 1, "Expected 1: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); + ok(max_run_time == 1, "Expected 1: %d\n", max_run_time); /* Verify that time can be set to INFINITE */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, INFINITE); - todo_wine ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - todo_wine ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - todo_wine ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); + ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); cleanup_task(); return;

1 0

Roy Shea : mstask: Implement (Set|Get)Parameters.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 2f95e5123be7b967d261a75a69ca27f7cfe03970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f95e5123be7b967d261a75a6… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 13:05:07 2008 -0700 mstask: Implement (Set|Get)Parameters. --- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task.c | 45 ++++++++++++++++++++++++++++++++++++++--- dlls/mstask/tests/task.c | 22 ++++++++++---------- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index b0892fe..8920707 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -59,6 +59,7 @@ typedef struct LONG ref; LPWSTR taskName; LPWSTR applicationName; + LPWSTR parameters; } TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5cef29f..235c5fc 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -29,6 +29,7 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This->taskName); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); @@ -403,16 +404,51 @@ static HRESULT WINAPI MSTASK_ITask_SetParameters( ITask* iface, LPCWSTR pwszParameters) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszParameters)); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + LPWSTR tmp_parameters; + + TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); + + /* Empty parameter list */ + if (pwszParameters[0] == 0) + { + HeapFree(GetProcessHeap(), 0, This->parameters); + This->parameters = NULL; + return S_OK; + } + + /* Set to pwszParameters */ + n = (lstrlenW(pwszParameters) + 1); + tmp_parameters = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + if (!tmp_parameters) + return E_OUTOFMEMORY; + lstrcpyW(tmp_parameters, pwszParameters); + HeapFree(GetProcessHeap(), 0, This->parameters); + This->parameters = tmp_parameters; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetParameters( ITask* iface, LPWSTR *ppwszParameters) { - FIXME("(%p, %p): stub\n", iface, ppwszParameters); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %p)\n", iface, ppwszParameters); + + n = This->parameters ? lstrlenW(This->parameters) + 1 : 1; + *ppwszParameters = CoTaskMemAlloc(n * sizeof(WCHAR)); + if (!*ppwszParameters) + return E_OUTOFMEMORY; + + if (!This->parameters) + *ppwszParameters[0] = 0; + else + lstrcpyW(*ppwszParameters, This->parameters); + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( @@ -645,6 +681,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) } lstrcpyW(This->taskName, pwszTaskName); This->applicationName = NULL; + This->parameters = NULL; *ppObj = &This->lpVtbl; InterlockedIncrement(&dll_ref); diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index ff35f52..7d1b44d 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -249,49 +249,49 @@ static void test_SetParameters_GetParameters(void) /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, &parameters); - todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(parameters, empty), + ok(!lstrcmpW(parameters, empty), "Got %s, expected empty string\n", dbgstr_w(parameters)); CoTaskMemFree(parameters); } /* Set parameters to a simple string */ hres = ITask_SetParameters(test_task, parameters_a); - todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08x\n", dbgstr_w(parameters_a), hres); hres = ITask_GetParameters(test_task, &parameters); - todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(parameters, parameters_a), "Got %s, expected %s\n", + ok(!lstrcmpW(parameters, parameters_a), "Got %s, expected %s\n", dbgstr_w(parameters), dbgstr_w(parameters_a)); CoTaskMemFree(parameters); } /* Update parameters to a different simple string */ hres = ITask_SetParameters(test_task, parameters_b); - todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08x\n", dbgstr_w(parameters_b), hres); hres = ITask_GetParameters(test_task, &parameters); - todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(parameters, parameters_b), "Got %s, expected %s\n", + ok(!lstrcmpW(parameters, parameters_b), "Got %s, expected %s\n", dbgstr_w(parameters), dbgstr_w(parameters_b)); CoTaskMemFree(parameters); } /* Clear parameters */ hres = ITask_SetParameters(test_task, empty); - todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08x\n", dbgstr_w(empty), hres); hres = ITask_GetParameters(test_task, &parameters); - todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(parameters, empty), + ok(!lstrcmpW(parameters, empty), "Got %s, expected empty string\n", dbgstr_w(parameters)); CoTaskMemFree(parameters); }

1 0

Roy Shea : mstask: Implemented (Set|Get)Comment.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 37708b1e5c9923817384f5d51b9bd5e887d956a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37708b1e5c9923817384f5d51… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 13:05:43 2008 -0700 mstask: Implemented (Set|Get)Comment. --- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task.c | 46 ++++++++++++++++++++++++++++++++++++++--- dlls/mstask/tests/task.c | 22 ++++++++++---------- 3 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 8920707..05e7b0c 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -60,6 +60,7 @@ typedef struct LPWSTR taskName; LPWSTR applicationName; LPWSTR parameters; + LPWSTR comment; } TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 235c5fc..149869a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -29,6 +29,7 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This->taskName); HeapFree(GetProcessHeap(), 0, This); @@ -219,16 +220,52 @@ static HRESULT WINAPI MSTASK_ITask_SetComment( ITask* iface, LPCWSTR pwszComment) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszComment)); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + LPWSTR tmp_comment; + + TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); + + /* Empty comment */ + if (pwszComment[0] == 0) + { + HeapFree(GetProcessHeap(), 0, This->comment); + This->comment = NULL; + return S_OK; + } + + /* Set to pwszComment */ + n = (lstrlenW(pwszComment) + 1); + tmp_comment = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + if (!tmp_comment) + return E_OUTOFMEMORY; + lstrcpyW(tmp_comment, pwszComment); + HeapFree(GetProcessHeap(), 0, This->comment); + This->comment = tmp_comment; + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetComment( ITask* iface, LPWSTR *ppwszComment) { - FIXME("(%p, %p): stub\n", iface, ppwszComment); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %p)\n", iface, ppwszComment); + + n = This->comment ? lstrlenW(This->comment) + 1 : 1; + *ppwszComment = CoTaskMemAlloc(n * sizeof(WCHAR)); + if (!*ppwszComment) + return E_OUTOFMEMORY; + + if (!This->comment) + *ppwszComment[0] = 0; + else + lstrcpyW(*ppwszComment, This->comment); + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetCreator( @@ -682,6 +719,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) lstrcpyW(This->taskName, pwszTaskName); This->applicationName = NULL; This->parameters = NULL; + This->comment = NULL; *ppObj = &This->lpVtbl; InterlockedIncrement(&dll_ref); diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 7d1b44d..349b110 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -319,49 +319,49 @@ static void test_SetComment_GetComment(void) /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); - todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(comment, empty), + ok(!lstrcmpW(comment, empty), "Got %s, expected empty string\n", dbgstr_w(comment)); CoTaskMemFree(comment); } /* Set comment to a simple string */ hres = ITask_SetComment(test_task, comment_a); - todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08x\n", dbgstr_w(comment_a), hres); hres = ITask_GetComment(test_task, &comment); - todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(comment, comment_a), "Got %s, expected %s\n", + ok(!lstrcmpW(comment, comment_a), "Got %s, expected %s\n", dbgstr_w(comment), dbgstr_w(comment_a)); CoTaskMemFree(comment); } /* Update comment to a different simple string */ hres = ITask_SetComment(test_task, comment_b); - todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08x\n", dbgstr_w(comment_b), hres); hres = ITask_GetComment(test_task, &comment); - todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(comment, comment_b), "Got %s, expected %s\n", + ok(!lstrcmpW(comment, comment_b), "Got %s, expected %s\n", dbgstr_w(comment), dbgstr_w(comment_b)); CoTaskMemFree(comment); } /* Clear comment */ hres = ITask_SetComment(test_task, empty); - todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08x\n", dbgstr_w(empty), hres); hres = ITask_GetComment(test_task, &comment); - todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(comment, empty), + ok(!lstrcmpW(comment, empty), "Got %s, expected empty string\n", dbgstr_w(comment)); CoTaskMemFree(comment); }

1 0

Roy Shea : mstask: Task PersistFile AddRef, QueryInterface, and Release.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: aec0eb87de7d71ab4d3160f3b2b0fb1250937243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec0eb87de7d71ab4d3160f3b… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 08:54:01 2008 -0700 mstask: Task PersistFile AddRef, QueryInterface, and Release. --- dlls/mstask/task.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index f1f5426..5cef29f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -21,6 +21,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) +{ + return (TaskImpl*) ((char*)(iface) - FIELD_OFFSET(TaskImpl, persistVtbl)); +} + static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); @@ -47,6 +52,12 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( ITask_AddRef(iface); return S_OK; } + else if (IsEqualGUID(riid, &IID_IPersistFile)) + { + *ppvObject = &This->persistVtbl; + ITask_AddRef(iface); + return S_OK; + } WARN("Unknown interface: %s\n", debugstr_guid(riid)); *ppvObject = NULL; @@ -473,22 +484,31 @@ static HRESULT WINAPI MSTASK_IPersistFile_QueryInterface( REFIID riid, void **ppvObject) { - FIXME("(%p, %s, %p): stub\n", iface, debugstr_guid(riid), ppvObject); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppvObject); + return ITask_QueryInterface((ITask *) This, riid, ppvObject); } static ULONG WINAPI MSTASK_IPersistFile_AddRef( IPersistFile* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + ULONG ref; + TRACE("\n"); + ref = InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI MSTASK_IPersistFile_Release( IPersistFile* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + ULONG ref; + TRACE("\n"); + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + TaskDestructor(This); + return ref; } static HRESULT WINAPI MSTASK_IPersistFile_GetClassID(

1 0

Piotr Caban : msxml3: Code clean up.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 12f7e0aa3981827849fdbf09d53e8445d5903d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f7e0aa3981827849fdbf09d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Aug 21 23:36:40 2008 +0200 msxml3: Code clean up. --- dlls/msxml3/queryresult.c | 90 ++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 1b2070e..6f8f3c4 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -50,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpath.h> -static const struct IXMLDOMNodeListVtbl queryresult_vtbl; - typedef struct _queryresult { const struct IXMLDOMNodeListVtbl *lpVtbl; @@ -66,50 +64,6 @@ static inline queryresult *impl_from_IXMLDOMNodeList( IXMLDOMNodeList *iface ) return (queryresult *)((char*)iface - FIELD_OFFSET(queryresult, lpVtbl)); } -HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **out) -{ - queryresult *This = CoTaskMemAlloc(sizeof(queryresult)); - xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); - xmlChar *str = xmlChar_from_wchar(szQuery); - HRESULT hr; - - - TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out); - - *out = NULL; - if (This == NULL || ctxt == NULL || str == NULL) - { - hr = E_OUTOFMEMORY; - goto cleanup; - } - - This->lpVtbl = &queryresult_vtbl; - This->ref = 1; - This->resultPos = 0; - This->node = node; - xmldoc_add_ref(This->node->doc); - - ctxt->node = node; - This->result = xmlXPathEval(str, ctxt); - if (!This->result || This->result->type != XPATH_NODESET) - { - hr = E_FAIL; - goto cleanup; - } - - *out = (IXMLDOMNodeList *)This; - hr = S_OK; - TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); - -cleanup: - if (This != NULL && FAILED(hr)) - IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); - if (ctxt != NULL) - xmlXPathFreeContext(ctxt); - HeapFree(GetProcessHeap(), 0, str); - return hr; -} - static HRESULT WINAPI queryresult_QueryInterface( IXMLDOMNodeList *iface, @@ -343,4 +297,48 @@ static const struct IXMLDOMNodeListVtbl queryresult_vtbl = queryresult__newEnum, }; +HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **out) +{ + queryresult *This = CoTaskMemAlloc(sizeof(queryresult)); + xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); + xmlChar *str = xmlChar_from_wchar(szQuery); + HRESULT hr; + + + TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out); + + *out = NULL; + if (This == NULL || ctxt == NULL || str == NULL) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + This->lpVtbl = &queryresult_vtbl; + This->ref = 1; + This->resultPos = 0; + This->node = node; + xmldoc_add_ref(This->node->doc); + + ctxt->node = node; + This->result = xmlXPathEval(str, ctxt); + if (!This->result || This->result->type != XPATH_NODESET) + { + hr = E_FAIL; + goto cleanup; + } + + *out = (IXMLDOMNodeList *)This; + hr = S_OK; + TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); + +cleanup: + if (This != NULL && FAILED(hr)) + IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); + if (ctxt != NULL) + xmlXPathFreeContext(ctxt); + HeapFree(GetProcessHeap(), 0, str); + return hr; +} + #endif

1 0