wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Eric Pouech : dbghelp,winedump: Added support for symbol 0x113a.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: ee4aaf7fcd941aa157d81c95e3c4b0c86d8c9fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4aaf7fcd941aa157d81c95e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:30:48 2008 +0200 dbghelp,winedump: Added support for symbol 0x113a. --- dlls/dbghelp/msc.c | 2 ++ include/wine/mscvpdb.h | 9 +++++++++ tools/winedump/msc.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ff322b7..6ae4fdf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1725,7 +1725,9 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root TRACE("S-Align V1\n"); break; + /* the symbols we can safely ignore for now */ case 0x112c: + case S_SECUCOOKIE_V3: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 8cfd501..602453e 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1522,6 +1522,14 @@ union codeview_symbol unsigned int offset; unsigned short segment; } ssearch_v1; + + struct + { + short int len; + short int id; + unsigned int offset; + unsigned int unknown; + } security_cookie_v3; }; #define S_COMPILAND_V1 0x0001 @@ -1597,6 +1605,7 @@ union codeview_symbol #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ #define S_PUB_FUNC2_V3 0x1127 +#define S_SECUCOOKIE_V3 0x113A /* ======================================== * * Line number information diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 60814c9..44f907e 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1033,6 +1033,11 @@ int codeview_dump_symbols(const void* root, unsigned long size) nest_block++; break; + case S_SECUCOOKIE_V3: + printf("\tSecurity Cookie V3 @%d unk:%x\n", + sym->security_cookie_v3.offset, sym->security_cookie_v3.unknown); + break; + case S_END_V1: if (nest_block) {

1 0

Eric Pouech : dbghelp: Added stub for SymSetScopeFromAddr.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 7abf97ca47c19a00f1a500e938f1864f2327857f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abf97ca47c19a00f1a500e93… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:30:42 2008 +0200 dbghelp: Added stub for SymSetScopeFromAddr. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 210c74d..d7c7faa 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -157,7 +157,7 @@ @ stub SymSetHomeDirectoryW @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) -@ stub SymSetScopeFromAddr +@ stdcall SymSetScopeFromAddr(ptr double) @ stub SymSetScopeFromIndex @ stdcall SymSetSearchPath(long str) @ stdcall SymSetSearchPathW(long wstr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ca6ec61..6ca6d85 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1750,3 +1750,15 @@ BOOL WINAPI SymAddSymbolW(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR name, return FALSE; } +/****************************************************************** + * SymSetScopeFromAddr (DBGHELP.@) + */ +BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) +{ + struct process* pcs; + + FIXME("(%p %s): stub\n", hProcess, wine_dbgstr_longlong(addr)); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + return TRUE; +}

1 0

Eric Pouech : dbghelp: Added the latest stubs.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 871dbfa88b554edeec0a89859187a79abb70107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=871dbfa88b554edeec0a89859… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:30:35 2008 +0200 dbghelp: Added the latest stubs. --- dlls/dbghelp/dbghelp.spec | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 360c6d4..210c74d 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -4,6 +4,8 @@ @ stdcall EnumDirTreeW(long wstr wstr ptr ptr ptr) @ stdcall EnumerateLoadedModules(long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) +@ stub EnumerateLoadedModulesEx +@ stub EnumerateLoadedModulesExW @ stdcall EnumerateLoadedModulesW64(long ptr ptr) @ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) @@ -30,19 +32,30 @@ @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) +@ stub SymAddSourceStream +@ stub SymAddSourceStreamA +@ stub SymAddSourceStreamW @ stdcall SymAddSymbol(ptr double str double long long) @ stdcall SymAddSymbolW(ptr double wstr double long long) @ stdcall SymCleanup(long) +@ stub SymDeleteSymbol +@ stub SymDeleteSymbolW @ stdcall SymEnumLines(ptr double str str ptr ptr) @ stub SymEnumLinesW +@ stub SymEnumProcesses +@ stub SymEnumSourceFileTokens @ stdcall SymEnumSourceFiles(ptr double str ptr ptr) @ stub SymEnumSourceFilesW +@ stub SymEnumSourceLines +@ stub SymEnumSourceLinesW @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) -@ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) @ stub SymEnumSymbolsForAddr @ stub SymEnumSymbolsForAddrW +@ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) @ stdcall SymEnumTypes(ptr double ptr ptr) +@ stub SymEnumTypesByName +@ stub SymEnumTypesByNameW @ stdcall SymEnumTypesW(ptr double ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) @@ -53,6 +66,8 @@ @ stub SymEnumerateSymbolsW64 @ stub SymFindDebugInfoFile @ stub SymFindDebugInfoFileW +@ stub SymFindExecutableImage +@ stub SymFindExecutableImageW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr double ptr ptr) @@ -73,6 +88,7 @@ @ stdcall SymGetLineFromAddrW64(long double ptr ptr) @ stub SymGetLineFromName @ stub SymGetLineFromName64 +@ stub SymGetLineFromNameW64 @ stdcall SymGetLineNext(long ptr) @ stdcall SymGetLineNext64(long ptr) @ stub SymGetLineNextW64 @@ -91,6 +107,7 @@ @ stub SymGetScopeW @ stdcall SymGetSearchPath(long ptr long) @ stdcall SymGetSearchPathW(long ptr long) +@ stub SymGetSourceFile @ stub SymGetSourceFileFromToken @ stub SymGetSourceFileFromTokenW @ stdcall SymGetSourceFileToken(ptr double str ptr ptr) @@ -140,9 +157,10 @@ @ stub SymSetHomeDirectoryW @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) +@ stub SymSetScopeFromAddr +@ stub SymSetScopeFromIndex @ stdcall SymSetSearchPath(long str) @ stdcall SymSetSearchPathW(long wstr) -@ stub SymSetSymWithAddr64 @ stub SymSrvDeltaName @ stub SymSrvDeltaNameW @ stub SymSrvGetFileIndexInfo @@ -160,6 +178,7 @@ @ stub SymSrvStoreSupplement @ stub SymSrvStoreSupplementW # @ stub SymSetSymWithAddr64 no longer present ?? +@ stub SymSetSymWithAddr64 @ stdcall SymUnDName(ptr str long) @ stub SymUnDName64 @ stdcall SymUnloadModule(long long)

1 0

Eric Pouech : dbghelp: Added stubs for add symbol functions.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 49a44342fa1774e35044f7b9e3ea43f2f82ca8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a44342fa1774e35044f7b9e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:30:29 2008 +0200 dbghelp: Added stubs for add symbol functions. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index b95a9e7..360c6d4 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -30,8 +30,8 @@ @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) -@ stub SymAddSymbol -@ stub SymAddSymbolW +@ stdcall SymAddSymbol(ptr double str double long long) +@ stdcall SymAddSymbolW(ptr double wstr double long long) @ stdcall SymCleanup(long) @ stdcall SymEnumLines(ptr double str str ptr ptr) @ stub SymEnumLinesW diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 682f37a..ca6ec61 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1716,3 +1716,37 @@ BOOL WINAPI SymSearchW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index, return ret; } + +/****************************************************************** + * SymAddSymbol (DBGHELP.@) + * + */ +BOOL WINAPI SymAddSymbol(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR name, + DWORD64 addr, DWORD size, DWORD flags) +{ + WCHAR nameW[MAX_SYM_NAME]; + + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + return SymAddSymbolW(hProcess, BaseOfDll, nameW, addr, size, flags); +} + +/****************************************************************** + * SymAddSymbolW (DBGHELP.@) + * + */ +BOOL WINAPI SymAddSymbolW(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR name, + DWORD64 addr, DWORD size, DWORD flags) +{ + struct module_pair pair; + + TRACE("(%p %s %s %u)\n", hProcess, wine_dbgstr_w(name), wine_dbgstr_longlong(addr), size); + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} +

1 0

Dimitrie O. Paun : user32: Fix a noisy FIXME.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: e209932069263afa79d30addb86b61bca7204f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e209932069263afa79d30addb… Author: Dimitrie O. Paun <dimi(a)lattica.com> Date: Sun Sep 28 14:47:07 2008 -0400 user32: Fix a noisy FIXME. --- dlls/user32/resource.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index cbdb4ea..ffcc35a 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -444,7 +444,13 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT */ DWORD WINAPI GetGuiResources( HANDLE hProcess, DWORD uiFlags ) { - FIXME("(%p,%x): stub\n",hProcess,uiFlags); + static BOOL warn = TRUE; + + if (warn) { + FIXME("(%p,%x): stub\n",hProcess,uiFlags); + warn = FALSE; + } + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; }

1 0

Jacek Caban : mshtml.idl: Added DispHTMLTableRow declaration.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 8b3c63dce6ee072122fefd6e65a3cc201aa64c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3c63dce6ee072122fefd6e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 29 19:43:46 2008 +0200 mshtml.idl: Added DispHTMLTableRow declaration. --- include/mshtmdid.h | 7 + include/mshtml.idl | 903 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 910 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b3c63dce6ee072122fef…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLTable declaration.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: e7fb15065fc9b6b3438660304c9a657f74ae8bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fb15065fc9b6b3438660304… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 29 19:43:43 2008 +0200 mshtml.idl: Added DispHTMLTable declaration. --- include/mshtmdid.h | 9 + include/mshtml.idl | 1010 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1019 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7fb15065fc9b6b343866…

1 0

Jacek Caban : mshtml.idl: Added IHTMLTableRow declaration.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: d893690e3b45868eb89575f39a2a612e126f3592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d893690e3b45868eb89575f39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 29 19:43:30 2008 +0200 mshtml.idl: Added IHTMLTableRow declaration. --- include/mshtmdid.h | 13 ++++++++++ include/mshtml.idl | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a830cf8..542c709 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2245,6 +2245,19 @@ #define DISPID_IHTMLTABLESECTION_INSERTROW DISPID_TABLESECTION+1 #define DISPID_IHTMLTABLESECTION_DELETEROW DISPID_TABLESECTION+2 +/* IHTMLTableRow */ +#define DISPID_IHTMLTABLEROW_ALIGN STDPROPID_XOBJ_BLOCKALIGN +#define DISPID_IHTMLTABLEROW_VALIGN DISPID_A_TABLEVALIGN +#define DISPID_IHTMLTABLEROW_BGCOLOR DISPID_BACKCOLOR +#define DISPID_IHTMLTABLEROW_BORDERCOLOR DISPID_A_TABLEBORDERCOLOR +#define DISPID_IHTMLTABLEROW_BORDERCOLORLIGHT DISPID_A_TABLEBORDERCOLORLIGHT +#define DISPID_IHTMLTABLEROW_BORDERCOLORDARK DISPID_A_TABLEBORDERCOLORDARK +#define DISPID_IHTMLTABLEROW_ROWINDEX DISPID_TABLEROW +#define DISPID_IHTMLTABLEROW_SECTIONROWINDEX DISPID_TABLEROW+1 +#define DISPID_IHTMLTABLEROW_CELLS DISPID_TABLEROW+2 +#define DISPID_IHTMLTABLEROW_INSERTCELL DISPID_TABLEROW+3 +#define DISPID_IHTMLTABLEROW_DELETECELL DISPID_TABLEROW+4 + /* IHTMLScriptElement */ #define DISPID_IHTMLSCRIPTELEMENT_SRC DISPID_SCRIPT+1 #define DISPID_IHTMLSCRIPTELEMENT_HTMLFOR DISPID_SCRIPT+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index 653ebf4..2103584 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16085,6 +16085,71 @@ interface IHTMLTableSection : IDispatch } /***************************************************************************** + * IHTMLTableRow interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f23c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLTableRow : IDispatch +{ + [propput, id(DISPID_IHTMLTABLEROW_ALIGN)] + HRESULT align([in] BSTR v); + + [propget, id(DISPID_IHTMLTABLEROW_ALIGN)] + HRESULT align([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLTABLEROW_VALIGN)] + HRESULT vAlign([in] BSTR v); + + [propget, id(DISPID_IHTMLTABLEROW_VALIGN)] + HRESULT vAlign([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLTABLEROW_BGCOLOR)] + HRESULT bgColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLEROW_BGCOLOR)] + HRESULT bgColor([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLEROW_BORDERCOLOR)] + HRESULT borderColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLEROW_BORDERCOLOR)] + HRESULT borderColor([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLEROW_BORDERCOLORLIGHT)] + HRESULT borderColorLight([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLEROW_BORDERCOLORLIGHT)] + HRESULT borderColorLight([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLEROW_BORDERCOLORDARK)] + HRESULT borderColorDark([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLEROW_BORDERCOLORDARK)] + HRESULT borderColorDark([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLTABLEROW_ROWINDEX)] + HRESULT rowIndex([out, retval] long *p); + + [propget, id(DISPID_IHTMLTABLEROW_SECTIONROWINDEX)] + HRESULT sectionRowIndex([out, retval] long *p); + + [propget, id(DISPID_IHTMLTABLEROW_CELLS)] + HRESULT cells([out, retval] IHTMLElementCollection **p); + + [id(DISPID_IHTMLTABLEROW_INSERTCELL)] + HRESULT insertCell( + [in, defaultvalue(-1)] long index, + [out, retval] IDispatch **row); + + [id(DISPID_IHTMLTABLEROW_DELETECELL)] + HRESULT deleteCell([in, defaultvalue(-1)] long index); +} + +/***************************************************************************** * IHTMLScriptElement interface */ [

1 0

Marcus Meissner : msi: Fix potential uninitialized use of substg.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 628b8e7630dbca0eca3ef24d3a733aaf025cd639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628b8e7630dbca0eca3ef24d3… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 28 22:27:29 2008 +0200 msi: Fix potential uninitialized use of substg. --- dlls/msi/storages.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 7b20dd9..4fb3ba0 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -184,7 +184,7 @@ done: static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; - IStorage *stg, *substg; + IStorage *stg, *substg = NULL; IStream *stm; LPWSTR name = NULL; HRESULT hr; @@ -236,7 +236,7 @@ static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, done: msi_free(name); - IStorage_Release(substg); + if (substg) IStorage_Release(substg); IStorage_Release(stg); IStream_Release(stm);

1 0

Reece Dunn : kernel32: Be more verbose when reporting the sync test failures.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 4193d78029873c8b336fc8ec4bc1f36a294222da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4193d78029873c8b336fc8ec4… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Sep 28 20:09:21 2008 +0100 kernel32: Be more verbose when reporting the sync test failures. --- dlls/kernel32/tests/sync.c | 54 +++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40ee4bb..dbf7929 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -658,8 +658,10 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); /* Test synchronous deletion of the queue and running timers. */ q = pCreateTimerQueue(); @@ -771,32 +773,42 @@ static void test_timer_queue(void) even if the timer is finished. */ SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t1, NULL); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t2, NULL); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t3, et1); - ok(ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == 0xdeadbeef, "DeleteTimerQueueTimer\n"); + ok(ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, + "DeleteTimerQueueTimer, GetLastError: expected 0xdeadbeef, got %d\n", + GetLastError()); ok(WaitForSingleObject(et1, 250) == WAIT_OBJECT_0, "Timer destruction event not triggered\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t4, et2); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(WaitForSingleObject(et2, 1000) == WAIT_OBJECT_0, "Timer destruction event not triggered\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, e); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(WaitForSingleObject(e, 250) == WAIT_OBJECT_0, "Queue destruction event not triggered\n"); CloseHandle(e); @@ -871,8 +883,10 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(d1.num_calls == 1, "DeleteTimerQueueTimer\n"); /* Test functions on the default timer queue. */ @@ -922,13 +936,17 @@ static void test_timer_queue(void) /* Try to delete the default queue? In any case: not allowed. */ SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(NULL, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "DeleteTimerQueueEx, GetLastError: expected ERROR_INVALID_HANDLE, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); } START_TEST(sync)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2008