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

James Hawkins : msi: If the filename is empty or NULL, remove the directory .
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 7b858882ac13ba9b86f98b56e3c916f10ea022fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b858882ac13ba9b86f98b56e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:14:59 2008 -0500 msi: If the filename is empty or NULL, remove the directory. --- dlls/msi/files.c | 20 +++++++++++++++----- dlls/msi/tests/install.c | 25 ++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3c8ac60..c829ce9 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -491,7 +491,8 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) if (!dir) return ERROR_OUTOFMEMORY; - size = lstrlenW(filename) + lstrlenW(dir) + 2; + size = (filename != NULL) ? lstrlenW(filename) : 0; + size += lstrlenW(dir) + 2; path = msi_alloc(size * sizeof(WCHAR)); if (!path) { @@ -500,11 +501,20 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) } lstrcpyW(path, dir); - lstrcatW(path, filename); + PathAddBackslashW(path); - TRACE("Deleting misc file: %s\n", debugstr_w(path)); - if (!DeleteFileW(path)) - TRACE("DeleteFileW failed: %d\n", GetLastError()); + if (filename) + { + lstrcatW(path, filename); + + TRACE("Deleting misc file: %s\n", debugstr_w(path)); + DeleteFileW(path); + } + else + { + TRACE("Removing misc directory: %s\n", debugstr_w(path)); + RemoveDirectoryW(path); + } done: msi_free(path); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 04a9675..b326758 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -551,7 +551,8 @@ static const CHAR rem_remove_files_dat[] = "FileKey\tComponent_\tFileName\tDirPr "attoparsec\tlithium\tattoparsec\tMSITESTDIR\t2\n" "storeys\thydrogen\tstoreys\tMSITESTDIR\t3\n" "block\thelium\tblock\tMSITESTDIR\t3\n" - "siriometer\tlithium\tsiriometer\tMSITESTDIR\t3\n"; + "siriometer\tlithium\tsiriometer\tMSITESTDIR\t3\n" + "nanoacre\thydrogen\t\tCABOUTDIR\t3\n"; static const CHAR mov_move_file_dat[] = "FileKey\tComponent_\tSourceName\tDestName\tSourceFolder\tDestFolder\tOptions\n" "s72\ts72\tS255\tS255\tS72\ts72\ti2\n" @@ -4228,7 +4229,6 @@ static void test_removefiles(void) create_file("msitest\\hydrogen", 500); create_file("msitest\\helium", 500); create_file("msitest\\lithium", 500); - create_file("msitest\\beryllium", 500); create_database(msifile, rem_tables, sizeof(rem_tables) / sizeof(msi_table)); @@ -4283,6 +4283,8 @@ static void test_removefiles(void) create_pf("msitest\\storeys", TRUE); create_pf("msitest\\block", TRUE); create_pf("msitest\\siriometer", TRUE); + create_pf("msitest\\cabout", FALSE); + create_pf("msitest\\cabout\\blocker", TRUE); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -4298,6 +4300,7 @@ static void test_removefiles(void) ok(!pf_exists("msitest\\storeys"), "File not deleted\n"); ok(!pf_exists("msitest\\block"), "File not deleted\n"); ok(!pf_exists("msitest\\siriometer"), "File not deleted\n"); + ok(pf_exists("msitest\\cabout"), "Directory removed\n"); ok(pf_exists("msitest"), "File not installed\n"); create_pf("msitest\\furlong", TRUE); @@ -4324,7 +4327,23 @@ static void test_removefiles(void) ok(!delete_pf("msitest\\storeys", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\block", TRUE), "File not deleted\n"); ok(delete_pf("msitest\\siriometer", TRUE), "File deleted\n"); - ok(delete_pf("msitest", FALSE), "File deleted\n"); + ok(pf_exists("msitest\\cabout"), "Directory deleted\n"); + ok(pf_exists("msitest"), "Directory deleted\n"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\hydrogen", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File installed\n"); + ok(delete_pf("msitest\\lithium", TRUE), "File not installed\n"); + ok(pf_exists("msitest\\cabout"), "Directory deleted\n"); + ok(pf_exists("msitest"), "Directory deleted\n"); + + delete_pf("msitest\\cabout\\blocker", TRUE); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory not deleted\n"); + ok(delete_pf("msitest", FALSE), "Directory deleted\n"); DeleteFile(msifile); DeleteFile("msitest\\hydrogen");

1 0

Hongbo Ni : notepad: Update simplified Chinese resource.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 872077674921c3e813b6be6760ec06b036606b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872077674921c3e813b6be676… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Thu Aug 21 16:20:36 2008 +1000 notepad: Update simplified Chinese resource. --- programs/notepad/Zh.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 46cee03..57dea33 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -44,7 +44,7 @@ POPUP " MENUITEM "��ڡ�ʱ�䣨&T��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "�Զ��У�&W��", CMD_WRAP - MENUITEM "&Font...", CMD_FONT /* FIXME */ + MENUITEM "��壨&F��...", CMD_FONT /* FIXME */ } POPUP "��&S��" { MENUITEM "��&S��...", CMD_SEARCH @@ -55,7 +55,7 @@ POPUP " MENUITEM "��&S��...", CMD_HELP_SEARCH MENUITEM "��ʹ�ð��&H��", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "��ڼ��±��&A��", CMD_HELP_ABOUT_NOTEPAD } } @@ -84,13 +84,13 @@ EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_ DEFPUSHBUTTON "ȷ��", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "ȡ��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "��&��", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "��&H��", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "Page &p" +STRING_PAGESETUP_FOOTERVALUE, "&p ҳ" STRING_NOTEPAD, "��±�" STRING_ERROR, "��"

1 0

Gerald Pfeifer : winhttp: #include <netinet/in.h> for sockaddr_in.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 4169fad358d17b07e14707c4d5949de4d804ab8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4169fad358d17b07e14707c4d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 20:34:43 2008 +0200 winhttp: #include <netinet/in.h> for sockaddr_in. --- dlls/winhttp/winhttp_private.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 549d9cd..b971e66 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -26,6 +26,9 @@ #include "wine/list.h" #include "wine/unicode.h" +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif #ifdef HAVE_NETDB_H # include <netdb.h> #endif

1 0

James Hawkins : msi: Handle processing a component that is installed to source.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 96dd6ce167ecc44c8e8cd8682d9ee04d97ba93dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=96dd6ce167ecc44c8e8cd8682… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:14:26 2008 -0500 msi: Handle processing a component that is installed to source. --- dlls/msi/action.c | 55 ++++++++++++++++++++++--------- dlls/msi/tests/install.c | 82 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 117 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96dd6ce167ecc44c8e8cd…

1 0

Roy Shea : mstask/tests: Conformance test for (Set|Get)Trigger.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: c5536ef1ae494e2283e977ba702f863923900f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5536ef1ae494e2283e977ba7… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 18:29:03 2008 -0700 mstask/tests: Conformance test for (Set|Get)Trigger. --- dlls/mstask/tests/Makefile.in | 3 +- dlls/mstask/tests/task_trigger.c | 365 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 367 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5536ef1ae494e2283e97…

1 0

Dmitry Timoshkov : gdi32: Avoid loading a bitmap if a glyph transformation is being requested.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: f322f70a691320bc5500edcae256d09d90988502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f322f70a691320bc5500edcae… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 21 15:01:05 2008 +0900 gdi32: Avoid loading a bitmap if a glyph transformation is being requested. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bb3c7d3..d569735 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4356,17 +4356,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - if(font->orientation || (format != GGO_METRICS && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP) || lpmat) - load_flags |= FT_LOAD_NO_BITMAP; - - err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); - - if(err) { - WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); - LeaveCriticalSection( &freetype_cs ); - return GDI_ERROR; - } - /* Scaling factor */ if (font->aveWidth) { @@ -4380,13 +4369,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, else widthRatio = font->scale_y; - left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - - adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6; - lsb = left >> 6; - bbx = (right - left) >> 6; - /* Scaling transform */ if (widthRatio != 1.0 || font->scale_y != 1.0) { @@ -4454,6 +4436,24 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, needsTransform = TRUE; } + if (needsTransform || (format != GGO_METRICS && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP)) + load_flags |= FT_LOAD_NO_BITMAP; + + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + + if(err) { + WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); + LeaveCriticalSection( &freetype_cs ); + return GDI_ERROR; + } + + left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; + + adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6; + lsb = left >> 6; + bbx = (right - left) >> 6; + if(!needsTransform) { top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY -

1 0

Dmitry Timoshkov : gdi32: Replace DC transform by font scaling for bitmap fonts.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 21cdaeea4bfa05859bb89dd27e3477e0cb07bb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21cdaeea4bfa05859bb89dd27… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 21 15:02:15 2008 +0900 gdi32: Replace DC transform by font scaling for bitmap fonts. --- dlls/gdi32/freetype.c | 6 ++++++ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d569735..8bd75cb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3555,6 +3555,12 @@ found: /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; + /* FIXME: rotation of bitmap fonts is ignored */ + height = abs(GDI_ROUND( (double)height * ret->font_desc.matrix.eM22 )); + if (ret->aveWidth) + ret->aveWidth = (double)ret->aveWidth * ret->font_desc.matrix.eM11; + ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; + if (height != 0) height = diff; height += face->size.height; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7065cd5..7d2c036 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -30,7 +30,7 @@ #include "wine/test.h" -#define near_match(a, b) (abs((a) - (b)) <= 4) +#define near_match(a, b) (abs((a) - (b)) <= 6) #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height);

1 0

Roy Shea : mstask: TaskTrigger stub with AddRef, QueryInterface, and Release.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 9c131bb05691cf4fbbe76c4657099b13670478e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c131bb05691cf4fbbe76c465… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 18:28:30 2008 -0700 mstask: TaskTrigger stub with AddRef, QueryInterface, and Release. --- dlls/mstask/Makefile.in | 5 +- dlls/mstask/mstask_private.h | 7 +++ dlls/mstask/task_trigger.c | 122 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 6c1f824..9fb78ee 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -6,10 +6,11 @@ MODULE = mstask.dll IMPORTS = uuid kernel32 C_SRCS = \ - task.c \ factory.c \ mstask_main.c \ - task_scheduler.c + task.c \ + task_scheduler.c \ + task_trigger.c RC_SRCS = rsrc.rc diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index a532bdd..e5de0dc 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -40,6 +40,13 @@ extern ClassFactoryImpl MSTASK_ClassFactory; typedef struct { + const ITaskTriggerVtbl *lpVtbl; + LONG ref; +} TaskTriggerImpl; +extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); + +typedef struct +{ const ITaskSchedulerVtbl *lpVtbl; LONG ref; } TaskSchedulerImpl; diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c new file mode 100644 index 0000000..25ea3ec --- /dev/null +++ b/dlls/mstask/task_trigger.c @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mstask_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); + +static HRESULT WINAPI MSTASK_ITaskTrigger_QueryInterface( + ITaskTrigger* iface, + REFIID riid, + void **ppvObject) +{ + TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + + TRACE("IID: %s\n", debugstr_guid(riid)); + if (ppvObject == NULL) + return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ITaskTrigger)) + { + *ppvObject = &This->lpVtbl; + ITaskTrigger_AddRef(iface); + return S_OK; + } + + WARN("Unknown interface: %s\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MSTASK_ITaskTrigger_AddRef( + ITaskTrigger* iface) +{ + TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + ULONG ref; + TRACE("\n"); + ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG WINAPI MSTASK_ITaskTrigger_Release( + ITaskTrigger* iface) +{ + TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + ULONG ref; + TRACE("\n"); + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + InterlockedDecrement(&dll_ref); + } + return ref; +} + +static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( + ITaskTrigger* iface, + const PTASK_TRIGGER pTrigger) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( + ITaskTrigger* iface, + PTASK_TRIGGER pTrigger) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskTrigger_GetTriggerString( + ITaskTrigger* iface, + LPWSTR *ppwszTrigger) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static const ITaskTriggerVtbl MSTASK_ITaskTriggerVtbl = +{ + MSTASK_ITaskTrigger_QueryInterface, + MSTASK_ITaskTrigger_AddRef, + MSTASK_ITaskTrigger_Release, + MSTASK_ITaskTrigger_SetTrigger, + MSTASK_ITaskTrigger_GetTrigger, + MSTASK_ITaskTrigger_GetTriggerString +}; + +HRESULT TaskTriggerConstructor(LPVOID *ppObj) +{ + TaskTriggerImpl *This; + TRACE("(%p)\n", ppObj); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &MSTASK_ITaskTriggerVtbl; + This->ref = 1; + + *ppObj = &This->lpVtbl; + InterlockedIncrement(&dll_ref); + return S_OK; +}

1 0

Roy Shea : mstask/tests: Basic conformance test for (Set|Get) AccountInformation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: e8d22f02df9882e673e3cd72f1ef4218a6fb22ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d22f02df9882e673e3cd72f… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 17:46:43 2008 -0700 mstask/tests: Basic conformance test for (Set|Get)AccountInformation. --- dlls/mstask/tests/task.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index b1f194c..7e9e831 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -427,6 +427,77 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) return; } +static void test_SetAccountInformation_GetAccountInformation(void) +{ + BOOL setup; + HRESULT hres; + LPWSTR account_name; + const WCHAR dummy_account_name[] = {'N', 'o', 'S', 'u', 'c', 'h', + 'A', 'c', 'c', 'o', 'u', 'n', 't', 0}; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + /* Get account information before it is set */ + 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) || + 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, + "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); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(account_name, dummy_account_name), + "Got %s, expected %s\n", dbgstr_w(account_name), + dbgstr_w(dummy_account_name)); + CoTaskMemFree(account_name); + } + + /* 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, + "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); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(account_name, dummy_account_name), + "Got %s, expected %s\n", dbgstr_w(account_name), + dbgstr_w(dummy_account_name)); + 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); + hres = ITask_GetAccountInformation(test_task, &account_name); + todo_wine ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(account_name, empty), + "Got %s, expected empty string\n", dbgstr_w(account_name)); + CoTaskMemFree(account_name); + } + + cleanup_task(); + return; +} + START_TEST(task) { CoInitialize(NULL); @@ -435,5 +506,6 @@ START_TEST(task) test_SetParameters_GetParameters(); test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); + test_SetAccountInformation_GetAccountInformation(); CoUninitialize(); }

1 0

Roy Shea : mstask/tests: Conformance test for (Set|Get)MaxRunTime.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 714c6d3a66f0f31829ef95e84800d2d275a6e5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714c6d3a66f0f31829ef95e84… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 17:46:05 2008 -0700 mstask/tests: Conformance test for (Set|Get)MaxRunTime. --- dlls/mstask/tests/task.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 749eb55..b1f194c 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -370,6 +370,63 @@ static void test_SetComment_GetComment(void) return; } +static void test_SetMaxRunTime_GetMaxRunTime(void) +{ + BOOL setup; + HRESULT hres; + DWORD max_run_time; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + /* Default time is 3 days: + * 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); + + /* 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); + 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); + + /* 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); + 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); + + /* 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); + 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); + + /* 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); + 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); + + cleanup_task(); + return; +} + START_TEST(task) { CoInitialize(NULL); @@ -377,5 +434,6 @@ START_TEST(task) test_CreateTrigger(); test_SetParameters_GetParameters(); test_SetComment_GetComment(); + test_SetMaxRunTime_GetMaxRunTime(); CoUninitialize(); }

1 0