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

Sebastian Lackner : server: Get rid of RIP_EVENT union elements.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 9696ea506309b4ee4b72c456085a785b5d59c2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9696ea506309b4ee4b72c4560… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:02:31 2014 +0200 server: Get rid of RIP_EVENT union elements. --- include/wine/server_protocol.h | 8 +------- server/debugger.c | 2 +- server/protocol.def | 6 ------ server/trace.c | 4 ---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a5ecb20..57ab839 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -112,12 +112,6 @@ typedef union int __pad; mod_handle_t base; } unload_dll; - struct - { - int code; - int error; - int type; - } rip_info; } debug_event_t; @@ -5840,6 +5834,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 455 +#define SERVER_PROTOCOL_VERSION 456 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 3ccec29..374f2ad 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -211,7 +211,7 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); -#define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ +#define NB_DEBUG_EVENTS UNLOAD_DLL_DEBUG_EVENT static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = { diff --git a/server/protocol.def b/server/protocol.def index 61b9ed5..a8c1fb9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -128,12 +128,6 @@ typedef union int __pad; mod_handle_t base; /* base address of the dll */ } unload_dll; - struct - { - int code; /* RIP_EVENT */ - int error; /* ??? */ - int type; /* ??? */ - } rip_info; } debug_event_t; /* supported CPU types */ diff --git a/server/trace.c b/server/trace.c index 0887daf..4834354 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,10 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; - case RIP_EVENT: - fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, - event.rip_info.error, event.rip_info.type ); - break; case 0: /* zero is the code returned on timeouts */ fprintf( stderr, "%s{}", prefix ); break;

1 0

Sebastian Lackner : ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 9d82ee5cac7c5c260e757f8ac1cda6afcdb4ab04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d82ee5cac7c5c260e757f8ac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:04:20 2014 +0200 ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events. --- dlls/ntdll/tests/exception.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5fc21de..2074f0a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -968,6 +968,26 @@ static void test_debugger(void) if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (de.dwDebugEventCode == RIP_EVENT) + { + int stage; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 5 || stage == 6) + { + ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n", + de.u.RipInfo.dwError, 0x11223344); + ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n", + de.u.RipInfo.dwType, 0x55667788); + } + else + ok(FALSE, "unexpected stage %x\n", stage); + + if (stage == 6) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1719,6 +1739,55 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD ripevent_exceptions; + +static LONG CALLBACK ripevent_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, DBG_RIPEXCEPTION); + ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[0], 0x11223344); + ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[1], 0x55667788); + + ripevent_exceptions++; + return (rec->ExceptionCode == DBG_RIPEXCEPTION) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_ripevent(DWORD numexc) +{ + EXCEPTION_RECORD record; + PVOID vectored_handler; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &ripevent_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + record.ExceptionCode = DBG_RIPEXCEPTION; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 2; + record.ExceptionInformation[0] = 0x11223344; + record.ExceptionInformation[1] = 0x55667788; + + ripevent_exceptions = 0; + pRtlRaiseException(&record); + ok(ripevent_exceptions == numexc, "RtlRaiseException generated %d exceptions, expected %d\n", + ripevent_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1792,6 +1861,10 @@ START_TEST(exception) test_outputdebugstring(0, FALSE); test_stage = 4; test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ + test_stage = 5; + test_ripevent(0); + test_stage = 6; + test_ripevent(1); } else skip( "RtlRaiseException not found\n" ); @@ -1804,6 +1877,7 @@ START_TEST(exception) test_exceptions(); test_rtlraiseexception(); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1821,6 +1895,7 @@ START_TEST(exception) "RtlLookupFunctionEntry" ); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Francois Gouget : mshtml: Remove nsAString_SetData() because it is unused.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: e0537210571a71838971d4c46f567f1b06add7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0537210571a71838971d4c46… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 20 18:23:47 2014 +0200 mshtml: Remove nsAString_SetData() because it is unused. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8be7141..8db2ba8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -827,7 +827,6 @@ void nsACString_Finish(nsACString*) DECLSPEC_HIDDEN; BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; -void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 18de331..fd87d37 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -836,11 +836,6 @@ void nsAString_InitDepend(nsAString *str, const PRUnichar *data) NS_StringContainerInit2(str, data, PR_UINT32_MAX, NS_STRING_CONTAINER_INIT_DEPEND); } -void nsAString_SetData(nsAString *str, const PRUnichar *data) -{ - NS_StringSetData(str, data, PR_UINT32_MAX); -} - UINT32 nsAString_GetData(const nsAString *str, const PRUnichar **data) { return NS_StringGetData(str, data, NULL);

1 0

Alexandre Julliard : usp10: Update the character data tables to Unicode 7.0.0.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 96ff3daaa31bd7b62cab307c703b0aad431a942f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ff3daaa31bd7b62cab307c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 16:05:13 2014 +0200 usp10: Update the character data tables to Unicode 7.0.0. --- dlls/usp10/indicsyllable.c | 184 ++++++++++++++----------- dlls/usp10/linebreak.c | 334 ++++++++++++++++++++++++--------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shape.c | 3 +- dlls/usp10/shaping.c | 80 ++++++----- tools/make_unicode | 16 ++- 6 files changed, 339 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96ff3daaa31bd7b62cab3…

1 0

Alexandre Julliard : libwine: Update the codepage tables to Unicode 7.0.0.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 500bbb3e9aafd4591cecc0d03163fd3bc967f340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500bbb3e9aafd4591cecc0d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 16:05:36 2014 +0200 libwine: Update the codepage tables to Unicode 7.0.0. --- dlls/kernel32/tests/locale.c | 2 + libs/wine/c_10003.c | 69 ++++++++++++++-------- libs/wine/c_10007.c | 100 +++++++++++++++++++++----------- libs/wine/c_10008.c | 73 ++++++++++++++--------- libs/wine/c_10017.c | 100 +++++++++++++++++++++----------- libs/wine/c_20866.c | 100 +++++++++++++++++++++----------- libs/wine/c_20932.c | 71 +++++++++++++++-------- libs/wine/c_21866.c | 100 +++++++++++++++++++++----------- libs/wine/c_28595.c | 100 +++++++++++++++++++++----------- libs/wine/c_855.c | 100 +++++++++++++++++++++----------- libs/wine/c_866.c | 100 +++++++++++++++++++++----------- libs/wine/c_878.c | 100 +++++++++++++++++++++----------- libs/wine/casemap.c | 64 ++++++++++++--------- libs/wine/wctype.c | 134 +++++++++++++++++++++---------------------- loader/l_intl.nls | Bin 6086 -> 6118 bytes 15 files changed, 765 insertions(+), 448 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500bbb3e9aafd4591cecc…

1 0

Nikolay Sivov : scrrun: Implement GetDriveName().
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: d2d62cf578a62754265fac76b332a31c482c3ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d62cf578a62754265fac76b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 21 20:30:11 2014 +0400 scrrun: Implement GetDriveName(). --- dlls/scrrun/filesystem.c | 15 ++++++++++---- dlls/scrrun/tests/filesystem.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 54deb97..c85fe63 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2937,12 +2937,19 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, return S_OK; } -static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, - BSTR *pbstrResult) +static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + TRACE("(%p)->(%s %p)\n", iface, debugstr_w(path), drive); - return E_NOTIMPL; + if (!drive) + return E_POINTER; + + *drive = NULL; + + if (path && strlenW(path) > 1 && path[1] == ':') + *drive = SysAllocStringLen(path, 2); + + return S_OK; } static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c06b43d..c9b41c0 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1745,6 +1745,51 @@ todo_wine SysFreeString(nameW); } +struct getdrivename_test { + const WCHAR path[10]; + const WCHAR drive[5]; +}; + +static const struct getdrivename_test getdrivenametestdata[] = { + { {'C',':','\\','1','.','t','s','t',0}, {'C',':',0} }, + { {'O',':','\\','1','.','t','s','t',0}, {'O',':',0} }, + { {'O',':',0}, {'O',':',0} }, + { {'o',':',0}, {'o',':',0} }, + { {'O','O',':',0} }, + { {':',0} }, + { {'O',0} }, + { { 0 } } +}; + +static void test_GetDriveName(void) +{ + const struct getdrivename_test *ptr = getdrivenametestdata; + HRESULT hr; + BSTR name; + + hr = IFileSystem3_GetDriveName(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, NULL, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name == NULL, "got %p\n", name); + + while (*ptr->path) { + BSTR path = SysAllocString(ptr->path); + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, path, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (name) + ok(!lstrcmpW(ptr->drive, name), "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + else + ok(!*ptr->drive, "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + SysFreeString(path); + SysFreeString(name); + ptr++; + } +} + START_TEST(filesystem) { HRESULT hr; @@ -1777,6 +1822,7 @@ START_TEST(filesystem) test_WriteLine(); test_ReadAll(); test_Read(); + test_GetDriveName(); IFileSystem3_Release(fs3);

1 0

André Hentschel : Add WWN 371
by Jeremy Newman 22 Jun '14

22 Jun '14

Module: website Branch: master Commit: def3736c5f344830bd6226f9b17cfd40e783c194 URL: http://source.winehq.org/git/website.git/?a=commit;h=def3736c5f344830bd6226… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 21 14:15:38 2014 +0200 Add WWN 371 --- news/de/2014062001.xml | 10 + news/en/2014062001.xml | 10 + wwn/en/wn20140620_371.xml | 1047 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1067 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=def3736c5f344830bd…

1 0

Sebastian Lackner : ntdll/tests: Add more tests for debug string events.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 99ac786c6989a7962eed4c15e7ef8673f6988ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ac786c6989a7962eed4c15e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 21:19:38 2014 +0200 ntdll/tests: Add more tests for debug string events. This patch adds additional tests, to check how debuggers handle OUTPUT_DEBUG_STRING_EVENT events. --- dlls/ntdll/tests/exception.c | 44 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 623a25e..5fc21de 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -943,6 +943,31 @@ static void test_debugger(void) ok(!status, "NtSetContextThread failed with 0x%x\n", status); } } + else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) + { + int stage; + char buffer[64]; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + ok(!de.u.DebugString.fUnicode, "unepxected unicode debug string event\n"); + ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", + de.u.DebugString.nDebugStringLength); + + memset(buffer, 0, sizeof(buffer)); + status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer, + de.u.DebugString.nDebugStringLength, &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 3 || stage == 4) + ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer); + else /* ignore unrelated debug strings like 'SHIMVIEW: ShimInfo(Complete)' */ + ok(strstr(buffer, "SHIMVIEW") != NULL, "unexpected stage %x, got debug string event '%s'\n", stage, buffer); + + if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1668,7 +1693,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce return EXCEPTION_CONTINUE_SEARCH; } -static void test_outputdebugstring(void) +static void test_outputdebugstring(DWORD numexc, BOOL todo) { PVOID vectored_handler; @@ -1683,8 +1708,13 @@ static void test_outputdebugstring(void) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - ok(outputdebugstring_exceptions == 1, "OutputDebugStringA generated %d exceptions, expected one\n", - outputdebugstring_exceptions); + if (todo) + todo_wine + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); + else + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -1758,6 +1788,10 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; + test_outputdebugstring(0, FALSE); + test_stage = 4; + test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ } else skip( "RtlRaiseException not found\n" ); @@ -1769,7 +1803,7 @@ START_TEST(exception) test_unwind(); test_exceptions(); test_rtlraiseexception(); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1786,7 +1820,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Francois Gouget : packager/tests: Make the IStorage methods static.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 889cce442ed24ed8eadd09af46464b31ba57f715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889cce442ed24ed8eadd09af4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 20 18:23:50 2014 +0200 packager/tests: Make the IStorage methods static. --- dlls/packager/tests/oleobj.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index f81dc22..1f81cb5 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -177,7 +177,7 @@ static IStream ole10native_stream = { &ole10native_stream_vtbl }; -HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, +static HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, void **ppvObject) { ok(0, "queryinterface: %s\n", wine_dbgstr_guid(riid)); @@ -207,7 +207,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; @@ -220,14 +220,14 @@ HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, return S_OK; } -HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage **ppstg) { ok(0, "createstorage\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg) { @@ -235,73 +235,73 @@ HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, +static HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, const IID *rgiidExclude, SNB snbExclude, IStorage *pstgDest) { ok(0, "copyto\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgDest, LPCOLESTR pwcsNewName, DWORD grfFlags) { ok(0, "moveelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) +static HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) { ok(0, "commit\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Revert(IStorage* This) +static HRESULT WINAPI stg_Revert(IStorage* This) { ok(0, "revert\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, +static HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, void *reserved2, DWORD reserved3, IEnumSTATSTG **ppenum) { ok(0, "enumelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) +static HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) { ok(0, "destroyelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, +static HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, LPCOLESTR pwcsNewName) { ok(0, "renamelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, const FILETIME *pctime, const FILETIME *patime, const FILETIME *pmtime) { ok(0, "setelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) +static HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) { ok(0, "setclass\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, +static HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, DWORD grfMask) { ok(0, "setstate\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) +static HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) { memset(pstatstg, 0, sizeof(*pstatstg)); pstatstg->clsid = CLSID_Package;

1 0

Vincent Povirk : Revert "windowscodecs: Fix leak in test_QueryCapability." .
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 13a8d80f3044854fc406e7e463fe0f204f92e0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a8d80f3044854fc406e7e46… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 19 14:43:46 2014 -0500 Revert "windowscodecs: Fix leak in test_QueryCapability.". --- dlls/windowscodecs/tests/tiffformat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index cee8882..cc1951e 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -242,8 +242,6 @@ todo_wine hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); - IWICBitmapDecoder_Release(decoder); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0