January 2010 - Wine-commits

Paul Vriens : xmllite/tests: Remove some tests that make Vista SP0 crash.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 307b9fb68750951c42da2425e9b5d75e0d406724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307b9fb68750951c42da2425e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 22 10:03:28 2010 +0100 xmllite/tests: Remove some tests that make Vista SP0 crash. --- dlls/xmllite/tests/reader.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 27dae53..cb55181 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -176,7 +176,6 @@ static void test_reader_create(void) { HRESULT hr; IXmlReader *reader; - IMalloc *imalloc; IUnknown *input; /* crashes native */ @@ -189,12 +188,6 @@ static void test_reader_create(void) hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = CoGetMalloc(1, &imalloc); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - - hr = IMalloc_DidAlloc(imalloc, reader); - ok(hr != 1, "Expected 0 or -1, got %08x\n", hr); - /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Paul Vriens : rpcrt4/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: da91da4652229175867cac20a6cb839ab2ddc6f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da91da4652229175867cac20a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 22 11:22:37 2010 +0100 rpcrt4/tests: Fix some memory leaks (Valgrind). --- dlls/rpcrt4/tests/rpc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 0f742b2..3acb46e 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -654,9 +654,13 @@ static void test_RpcStringBindingParseA(void) ok(status == RPC_S_INVALID_STRING_BINDING, "RpcStringBindingParseA should have returned RPC_S_INVALID_STRING_BINDING instead of %d\n", status); todo_wine ok(uuid == NULL, "uuid was %p instead of NULL\n", uuid); + if (uuid) + RpcStringFreeA(&uuid); ok(protseq == NULL, "protseq was %p instead of NULL\n", protseq); todo_wine ok(network_addr == NULL, "network_addr was %p instead of NULL\n", network_addr); + if (network_addr) + RpcStringFreeA(&network_addr); ok(endpoint == NULL, "endpoint was %p instead of NULL\n", endpoint); ok(options == NULL, "options was %p instead of NULL\n", options); }

1 0

Jacek Caban : jscript: Skip tests on too old jscript.dll.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 2a81ef06f89894531197103be44ac5e646b2848f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a81ef06f89894531197103be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 01:25:30 2010 +0100 jscript: Skip tests on too old jscript.dll. --- dlls/jscript/tests/activex.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 4826910..ba3f8bd 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -720,6 +720,8 @@ static IActiveScriptParse *create_script(void) hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&script); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return NULL; set_safety_options((IUnknown*)script); @@ -1058,13 +1060,37 @@ static BOOL register_activex(void) return TRUE; } +static BOOL check_jscript(void) +{ + IActiveScriptParse *parser; + BSTR str; + HRESULT hres; + + parser = create_script(); + if(!parser) + return FALSE; + + str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); + hres = IActiveScriptParse64_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + SysFreeString(str); + IUnknown_Release(parser); + + return hres == S_OK; +} + START_TEST(activex) { CoInitialize(NULL); - register_activex(); - test_ActiveXObject(); + if(check_jscript()) { + register_activex(); + + test_ActiveXObject(); + + init_registry(FALSE); + }else { + win_skip("Broken engine, probably too old\n"); + } - init_registry(FALSE); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Make it possible to use RtlGetNtGlobalFlags before the TEB is initialized.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: e7810c8bc6ba41851e38e69baf133226188faa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7810c8bc6ba41851e38e69ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 12:32:40 2010 +0100 ntdll: Make it possible to use RtlGetNtGlobalFlags before the TEB is initialized. --- dlls/ntdll/process.c | 9 --------- dlls/ntdll/thread.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index aaf8315..ba51df5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -73,15 +73,6 @@ PEB * WINAPI RtlGetCurrentPeb(void) return NtCurrentTeb()->Peb; } -/****************************************************************************** - * RtlGetNtGlobalFlags [NTDLL.@] - * - */ -ULONG WINAPI RtlGetNtGlobalFlags(void) -{ - return NtCurrentTeb()->Peb->NtGlobalFlag; -} - /*********************************************************************** * __wine_make_process_system (NTDLL.@) * diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ef9183a..65fc737 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -57,6 +57,7 @@ struct startup_info void *entry_arg; }; +static PEB *peb; static PEB_LDR_DATA ldr; static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; @@ -191,7 +192,6 @@ done: */ HANDLE thread_init(void) { - PEB *peb; TEB *teb; void *addr; SIZE_T size, info_size; @@ -522,6 +522,16 @@ error: } +/****************************************************************************** + * RtlGetNtGlobalFlags (NTDLL.@) + */ +ULONG WINAPI RtlGetNtGlobalFlags(void) +{ + if (!peb) return 0; /* init not done yet */ + return peb->NtGlobalFlag; +} + + /*********************************************************************** * NtOpenThread (NTDLL.@) * ZwOpenThread (NTDLL.@)

1 0

Alexandre Julliard : ntdll: Set the heap debug flags based on the GlobalFlag value.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 9055e9e3dd41504431af5e6fcb6be49ef1a7cbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9055e9e3dd41504431af5e6fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 12:33:03 2010 +0100 ntdll: Set the heap debug flags based on the GlobalFlag value. --- dlls/ntdll/heap.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index adaf693..a1fc764 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -155,6 +155,12 @@ typedef struct tagHEAP #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ #define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ +/* some undocumented flags (names are made up) */ +#define HEAP_PAGE_ALLOCS 0x01000000 +#define HEAP_VALIDATE 0x10000000 +#define HEAP_VALIDATE_ALL 0x20000000 +#define HEAP_VALIDATE_PARAMS 0x40000000 + static HEAP *processHeap; /* main process heap */ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL quiet ); @@ -1233,6 +1239,32 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ /*********************************************************************** + * heap_set_debug_flags + */ +void heap_set_debug_flags( HANDLE handle ) +{ + HEAP *heap = HEAP_GetPtr( handle ); + ULONG global_flags = RtlGetNtGlobalFlags(); + ULONG flags = 0; + + if (global_flags & FLG_HEAP_ENABLE_TAIL_CHECK) flags |= HEAP_TAIL_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_ENABLE_FREE_CHECK) flags |= HEAP_FREE_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_DISABLE_COALESCING) flags |= HEAP_DISABLE_COALESCE_ON_FREE; + if (global_flags & FLG_HEAP_PAGE_ALLOCS) flags |= HEAP_PAGE_ALLOCS | HEAP_GROWABLE; + + if (global_flags & FLG_HEAP_VALIDATE_PARAMETERS) + flags |= HEAP_VALIDATE | HEAP_VALIDATE_PARAMS | + HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_VALIDATE_ALL) + flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | + HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + + heap->flags |= flags; + heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE); +} + + +/*********************************************************************** * RtlCreateHeap (NTDLL.@) * * Create a new Heap. @@ -1278,6 +1310,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c list_init( &processHeap->entry ); } + heap_set_debug_flags( subheap->heap ); return subheap->heap; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1172a86..7bbcf95 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2656,6 +2656,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; + heap_set_debug_flags( GetProcessHeap() ); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 586250d..c7b721a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -70,6 +70,7 @@ extern void actctx_init(void); extern void virtual_init(void); extern void virtual_init_threading(void); extern void fill_cpu_info(void); +extern void heap_set_debug_flags( HANDLE handle ); /* server support */ extern timeout_t server_start_time;

1 0

Alexandre Julliard : kernel32/tests: Add tests for the global flag and its influence on the heap flags.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: dabda7e3ee6e7710ddb7dca1db94ce7d5fd3fcf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabda7e3ee6e7710ddb7dca1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 12:33:24 2010 +0100 kernel32/tests: Add tests for the global flag and its influence on the heap flags. --- dlls/kernel32/tests/heap.c | 151 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 56f9744..b213339 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -21,14 +21,25 @@ #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winreg.h" +#include "winternl.h" #include "wine/test.h" #define MAGIC_DEAD 0xdeadbeef static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); +static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); + +struct heap_layout +{ + DWORD unknown[3]; + DWORD flags; + DWORD force_flags; +}; static SIZE_T resize_9x(SIZE_T size) { @@ -467,8 +478,132 @@ static void test_HeapQueryInformation(void) ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); } +static void test_debug_heap( const char *argv0, DWORD flags ) +{ + char keyname[MAX_PATH]; + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + BOOL ret; + DWORD err; + HKEY hkey; + const char *basename; + + if ((basename = strrchr( argv0, '\\' ))) basename++; + else basename = argv0; + + sprintf( keyname, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options\\%s", + basename ); + if (!strcmp( keyname + strlen(keyname) - 3, ".so" )) keyname[strlen(keyname) - 3] = 0; + + err = RegCreateKeyA( HKEY_LOCAL_MACHINE, keyname, &hkey ); + ok( !err, "failed to create '%s' error %u\n", keyname, err ); + if (err) return; + + if (flags == 0xdeadbeef) /* magic value for unsetting it */ + RegDeleteValueA( hkey, "GlobalFlag" ); + else + RegSetValueExA( hkey, "GlobalFlag", 0, REG_DWORD, (BYTE *)&flags, sizeof(flags) ); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + + sprintf( buffer, "%s heap.c 0x%x", argv0, flags ); + ret = CreateProcessA( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok( ret, "failed to create child process error %u\n", GetLastError() ); + if (ret) + { + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); + } + RegDeleteValueA( hkey, "GlobalFlag" ); + RegCloseKey( hkey ); + RegDeleteKeyA( HKEY_LOCAL_MACHINE, keyname ); +} + +static DWORD heap_flags_from_global_flag( DWORD flag ) +{ + DWORD ret = 0; + + if (flag & FLG_HEAP_ENABLE_TAIL_CHECK) + ret |= HEAP_TAIL_CHECKING_ENABLED; + if (flag & FLG_HEAP_ENABLE_FREE_CHECK) + ret |= HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_PARAMETERS) + ret |= 0x50000000 | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_ALL) + ret |= 0x30000000 | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_DISABLE_COALESCING) + ret |= HEAP_DISABLE_COALESCE_ON_FREE; + if (flag & FLG_HEAP_PAGE_ALLOCS) + ret |= 0x01000000 | HEAP_GROWABLE; + return ret; +} + +static void test_child_heap( const char *arg ) +{ + struct heap_layout *heap = GetProcessHeap(); + DWORD expected = strtoul( arg, 0, 16 ); + + if (expected == 0xdeadbeef) /* expected value comes from Session Manager global flags */ + { + HKEY hkey; + expected = 0; + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Session Manager", &hkey )) + { + char buffer[32]; + DWORD type, size = sizeof(buffer); + + if (!RegQueryValueExA( hkey, "GlobalFlag", 0, &type, (BYTE *)buffer, &size )) + { + if (type == REG_DWORD) expected = *(DWORD *)buffer; + else if (type == REG_SZ) expected = strtoul( buffer, 0, 16 ); + } + RegCloseKey( hkey ); + } + } + if (expected && !pRtlGetNtGlobalFlags()) /* not working on NT4 */ + { + win_skip( "global flags not set\n" ); + return; + } + + ok( pRtlGetNtGlobalFlags() == expected, + "%s: got global flags %08x expected %08x\n", arg, pRtlGetNtGlobalFlags(), expected ); + + if (!(heap->flags & HEAP_GROWABLE) || heap->flags == 0xeeeeeeee) /* vista layout */ + { + if (expected & FLG_HEAP_PAGE_ALLOCS) + ok( heap->flags == 0xeeeeeeee, "%s: got heap flags %08x expected 0xeeeeeeee\n", + arg, heap->flags ); + else + ok( heap->flags == 0, "%s: got heap flags %08x expected 0\n", arg, heap->flags ); + } + else + { + expected = heap_flags_from_global_flag( expected ); + ok( heap->flags == (expected | HEAP_GROWABLE), + "%s: got heap flags %08x expected %08x\n", arg, heap->flags, expected ); + ok( heap->force_flags == (expected & ~0x18000080), + "%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expected ); + } +} + START_TEST(heap) { + int argc; + char **argv; + + pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); + + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + test_child_heap( argv[2] ); + return; + } + test_heap(); test_obsolete_flags(); @@ -480,4 +615,20 @@ START_TEST(heap) test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); test_HeapQueryInformation(); + + if (pRtlGetNtGlobalFlags) + { + test_debug_heap( argv[0], 0 ); + test_debug_heap( argv[0], FLG_HEAP_ENABLE_TAIL_CHECK ); + test_debug_heap( argv[0], FLG_HEAP_ENABLE_FREE_CHECK ); + test_debug_heap( argv[0], FLG_HEAP_VALIDATE_PARAMETERS ); + test_debug_heap( argv[0], FLG_HEAP_VALIDATE_ALL ); + test_debug_heap( argv[0], FLG_POOL_ENABLE_TAGGING ); + test_debug_heap( argv[0], FLG_HEAP_ENABLE_TAGGING ); + test_debug_heap( argv[0], FLG_HEAP_ENABLE_TAG_BY_DLL ); + test_debug_heap( argv[0], FLG_HEAP_DISABLE_COALESCING ); + test_debug_heap( argv[0], FLG_HEAP_PAGE_ALLOCS ); + test_debug_heap( argv[0], 0xdeadbeef ); + } + else win_skip( "RtlGetNtGlobalFlags not found, skipping heap debug tests\n" ); }

1 0

Alexandre Julliard : winex11: Use the thread connection to clear the systray icon window.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: baa7eed11c4f67b2daef61979c35232b09cdb471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa7eed11c4f67b2daef61979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 12:44:59 2010 +0100 winex11: Use the thread connection to clear the systray icon window. --- dlls/winex11.drv/systray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index bbe6b67..8ed1550 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -344,7 +344,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (icon->window) { struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); - if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + if (data) XClearArea( thread_display(), data->client_window, 0, 0, 0, 0, True ); } }

1 0

Nikolay Sivov : xmllite/tests: Test query for supported interface sequence while creating IXmlReaderInput instance .
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 5c1f0dbae088589a791a35df3ccffd7d8ed2fdad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1f0dbae088589a791a35df3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 21 17:47:03 2010 +0300 xmllite/tests: Test query for supported interface sequence while creating IXmlReaderInput instance. --- dlls/xmllite/reader.c | 12 +++ dlls/xmllite/tests/reader.c | 189 +++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/xmllite.spec | 2 +- include/xmllite.idl | 2 + 4 files changed, 199 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cd30f48..5877474 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -297,3 +297,15 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) return S_OK; } + +HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, + IMalloc *pMalloc, + LPCWSTR encoding, + BOOL hint, + LPCWSTR base_uri, + IXmlReaderInput **ppInput) +{ + FIXME("%p %p %s %d %s %p\n", stream, pMalloc, wine_dbgstr_w(encoding), + hint, wine_dbgstr_w(base_uri), ppInput); + return E_NOTIMPL; +} diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 18eed5c..8faf469 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -21,18 +21,137 @@ #define COBJMACROS #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "ole2.h" #include "xmllite.h" -#include "initguid.h" #include "wine/test.h" -DEFINE_GUID(IID_IXmlReader, 0x7279fc81, 0x709d, 0x4095, 0xb6, 0x3d, 0x69, - 0xfe, 0x4b, 0x0d, 0x90, 0x30); +DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, + IMalloc *pMalloc, + LPCWSTR encoding, + BOOL hint, + LPCWSTR base_uri, + IXmlReaderInput **ppInput); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + +typedef struct input_iids_t { + IID iids[10]; + int count; +} input_iids_t; + +static const IID *setinput_full[] = { + &IID_IXmlReaderInput, + &IID_ISequentialStream, + &IID_IStream +}; + +static input_iids_t input_iids; + +static void ok_iids_(const input_iids_t *iids, const IID **expected, int size, int todo, int line) +{ + int i; + + if (todo) { + todo_wine + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + } + else + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + + if (iids->count != size) return; + + for (i = 0; i < size; i++) { + ok_(__FILE__, line)(IsEqualGUID(&iids->iids[i], expected[i]), + "Wrong IID(%d), got (%s)\n", i, debugstr_guid(&iids->iids[i])); + } +} +#define ok_iids(got, exp, size, todo) ok_iids_(got, exp, size, todo, __LINE__) + +typedef struct _testinput +{ + const IUnknownVtbl *lpVtbl; + LONG ref; +} testinput; + +static inline testinput *impl_from_IUnknown(IUnknown *iface) +{ + return (testinput *)((char*)iface - FIELD_OFFSET(testinput, lpVtbl)); +} + +static HRESULT WINAPI testinput_QueryInterface(IUnknown *iface, REFIID riid, void** ppvObj) +{ + if (IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + input_iids.iids[input_iids.count++] = *riid; + + *ppvObj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI testinput_AddRef(IUnknown *iface) +{ + testinput *This = impl_from_IUnknown(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI testinput_Release(IUnknown *iface) +{ + testinput *This = impl_from_IUnknown(iface); + LONG ref; + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static const struct IUnknownVtbl testinput_vtbl = +{ + testinput_QueryInterface, + testinput_AddRef, + testinput_Release +}; + +static HRESULT testinput_createinstance(void **ppObj) +{ + testinput *input; + + input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + if(!input) return E_OUTOFMEMORY; + + input->lpVtbl = &testinput_vtbl; + input->ref = 1; + + *ppObj = &input->lpVtbl; + + return S_OK; +} static BOOL init_pointers(void) { @@ -45,8 +164,10 @@ static BOOL init_pointers(void) return FALSE; } - pCreateXmlReader = (void*)GetProcAddress(mod, "CreateXmlReader"); - if (!pCreateXmlReader) return FALSE; +#define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; + MAKEFUNC(CreateXmlReader); + MAKEFUNC(CreateXmlReaderInputWithEncodingName); +#undef MAKEFUNC return TRUE; } @@ -56,6 +177,7 @@ static void test_reader_create(void) HRESULT hr; IXmlReader *reader; IMalloc *imalloc; + IUnknown *input; /* crashes native */ if (0) @@ -73,9 +195,65 @@ static void test_reader_create(void) hr = IMalloc_DidAlloc(imalloc, reader); ok(hr != 1, "Expected 0 or -1, got %08x\n", hr); + /* test input interface selection sequence */ + hr = testinput_createinstance((void**)&input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + input_iids.count = 0; + hr = IXmlReader_SetInput(reader, input); + todo_wine ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_full, sizeof(setinput_full)/sizeof(REFIID), TRUE); + + IUnknown_Release(input); + IXmlReader_Release(reader); } +static void test_readerinput(void) +{ + IXmlReaderInput *reader_input; + IUnknown *obj; + IStream *stream; + HRESULT hr; + LONG ref; + + hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input); + todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ref = IStream_AddRef(stream); + ok(ref == 2, "Expected 2, got %d\n", ref); + IStream_Release(stream); + hr = pCreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + if(hr != S_OK) + { + skip("CreateXmlReaderInputWithEncodingName not implemented\n"); + IStream_Release(stream); + return; + } + + /* IXmlReader grabs a stream reference */ + ref = IStream_AddRef(stream); + ok(ref == 3, "Expected 3, got %d\n", ref); + IStream_Release(stream); + + /* IID_IXmlReaderInput */ + /* it returns a kind of private undocumented vtable incompatible with IUnknown, + so it's not a COM interface actually. + Such query will be used only to check if input is really IXmlReaderInput */ + obj = (IUnknown*)0xdeadbeef; + hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + IUnknown_Release(reader_input); + IStream_Release(stream); +} + START_TEST(reader) { HRESULT r; @@ -90,6 +268,7 @@ START_TEST(reader) } test_reader_create(); + test_readerinput(); CoUninitialize(); } diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index 9b5a84a..d2d0ff7 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,6 +1,6 @@ @ stdcall CreateXmlReader(ptr ptr ptr) @ stub CreateXmlReaderInputWithEncodingCodePage -@ stub CreateXmlReaderInputWithEncodingName +@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) @ stub CreateXmlWriter @ stub CreateXmlWriterOutputWithEncodingCodePage @ stub CreateXmlWriterOutputWithEncodingName diff --git a/include/xmllite.idl b/include/xmllite.idl index 9ba429f..e00d8c8 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -80,3 +80,5 @@ interface IXmlReader : IUnknown /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") + +typedef IUnknown IXmlReaderInput;

1 0

Nikolay Sivov : xmllite: Add IXmlReaderInput stub implementation.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 4e3283fdd25d019e78da89590ad19854bdf43d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3283fdd25d019e78da89590… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 21 18:19:20 2010 +0300 xmllite: Add IXmlReaderInput stub implementation. --- dlls/xmllite/reader.c | 88 +++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/tests/reader.c | 17 +++----- 2 files changed, 92 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5877474..2c7d3f1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -31,17 +31,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); +/* not defined in public headers */ +DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); + typedef struct _xmlreader { const IXmlReaderVtbl *lpVtbl; LONG ref; } xmlreader; +typedef struct _xmlreaderinput +{ + const IUnknownVtbl *lpVtbl; + LONG ref; +} xmlreaderinput; + static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl)); } +static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) +{ + return (xmlreaderinput *)((char*)iface - FIELD_OFFSET(xmlreaderinput, lpVtbl)); +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -271,6 +285,59 @@ static const struct IXmlReaderVtbl xmlreader_vtbl = xmlreader_IsEOF }; +/* IXmlReaderInput */ +static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFIID riid, void** ppvObject) +{ + xmlreaderinput *This = impl_from_IXmlReaderInput(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IXmlReaderInput) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) +{ + xmlreaderinput *This = impl_from_IXmlReaderInput(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) +{ + xmlreaderinput *This = impl_from_IXmlReaderInput(iface); + LONG ref; + + TRACE("%p\n", This); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static const struct IUnknownVtbl xmlreaderinput_vtbl = +{ + xmlreaderinput_QueryInterface, + xmlreaderinput_AddRef, + xmlreaderinput_Release +}; + HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) { xmlreader *reader; @@ -305,7 +372,22 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, LPCWSTR base_uri, IXmlReaderInput **ppInput) { - FIXME("%p %p %s %d %s %p\n", stream, pMalloc, wine_dbgstr_w(encoding), - hint, wine_dbgstr_w(base_uri), ppInput); - return E_NOTIMPL; + xmlreaderinput *readerinput; + + FIXME("%p %p %s %d %s %p: stub\n", stream, pMalloc, wine_dbgstr_w(encoding), + hint, wine_dbgstr_w(base_uri), ppInput); + + if (!stream || !ppInput) return E_INVALIDARG; + + readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); + if(!readerinput) return E_OUTOFMEMORY; + + readerinput->lpVtbl = &xmlreaderinput_vtbl; + readerinput->ref = 1; + + *ppInput = (IXmlReaderInput*)&readerinput->lpVtbl; + + TRACE("returning iface %p\n", *ppInput); + + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8faf469..5585853 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -218,9 +218,9 @@ static void test_readerinput(void) LONG ref; hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input); - todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -229,17 +229,11 @@ static void test_readerinput(void) ok(ref == 2, "Expected 2, got %d\n", ref); IStream_Release(stream); hr = pCreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - if(hr != S_OK) - { - skip("CreateXmlReaderInputWithEncodingName not implemented\n"); - IStream_Release(stream); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* IXmlReader grabs a stream reference */ ref = IStream_AddRef(stream); - ok(ref == 3, "Expected 3, got %d\n", ref); + todo_wine ok(ref == 3, "Expected 3, got %d\n", ref); IStream_Release(stream); /* IID_IXmlReaderInput */ @@ -249,6 +243,9 @@ static void test_readerinput(void) obj = (IUnknown*)0xdeadbeef; hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ref = IUnknown_AddRef(reader_input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(reader_input); IUnknown_Release(reader_input); IStream_Release(stream);

1 0

Jacek Caban : mshtml.idl: Added DispHTMLFrameElement dispinterface declaration.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: af926beaaf1af4984ba15ee77d29a2601370f1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af926beaaf1af4984ba15ee77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 21 14:46:28 2010 +0100 mshtml.idl: Added DispHTMLFrameElement dispinterface declaration. --- include/mshtmdid.h | 18 +++++ include/mshtml.idl | 217 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 158 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af926beaaf1af4984ba15…

1 0