February 2016 - Wine-commits

Sebastian Lackner : ntdll/tests: Fix flags passed to VirtualFree in exception tests.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 446067b34df5103fbae12f7d5df8fbe3ef5d30a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446067b34df5103fbae12f7d5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:26:05 2016 +0100 ntdll/tests: Fix flags passed to VirtualFree in exception tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d6a610e..c9e06ea 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2020,5 +2020,5 @@ START_TEST(exception) #endif - VirtualFree(code_mem, 0, MEM_FREE); + VirtualFree(code_mem, 0, MEM_RELEASE); }

1 0

Sebastian Lackner : kernel32/tests: Fix flags passed to VirtualFree in multiple tests.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: f94755f719c6989a132d3da6f759e236ae24c774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94755f719c6989a132d3da6f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:26:25 2016 +0100 kernel32/tests: Fix flags passed to VirtualFree in multiple tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/virtual.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 53dc04b..58ddddf 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3104,7 +3104,7 @@ static void test_read_write(void) "wrong error %u\n", GetLastError() ); ok( bytes == 0, "read %x bytes\n", bytes ); - VirtualFree( mem, 0, MEM_FREE ); + VirtualFree( mem, 0, MEM_RELEASE ); ret = CloseHandle(hFile); ok( ret, "CloseHandle: error %d\n", GetLastError()); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c35f4db..38c0675 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -147,8 +147,8 @@ static void test_VirtualAllocEx(void) b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); - VirtualFree( src, 0, MEM_FREE ); - VirtualFree( dst, 0, MEM_FREE ); + VirtualFree( src, 0, MEM_RELEASE ); + VirtualFree( dst, 0, MEM_RELEASE ); /* * The following tests parallel those in test_VirtualAlloc() @@ -1755,11 +1755,11 @@ static void test_write_watch(void) ok( !ret, "ResetWriteWatch failed %u\n", ret ); } - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_WRITE_WATCH, PAGE_READWRITE ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); base = VirtualAlloc( 0, size, MEM_WRITE_WATCH, PAGE_READWRITE ); ok( !base, "VirtualAlloc succeeded\n" ); @@ -1803,7 +1803,7 @@ static void test_write_watch(void) "wrong count %lu\n", count ); if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); } #ifdef __i386__ @@ -1948,7 +1948,7 @@ static void test_guard_page(void) ok( success, "VirtualUnlock failed %u\n", GetLastError() ); } - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); /* combined guard page / write watch tests */ if (!pGetWriteWatch || !pResetWriteWatch) @@ -2054,7 +2054,7 @@ static void test_guard_page(void) todo_wine ok( results[0] == base || broken(results[0] == (void *)0xdeadbeef) /* Windows 8 */, "wrong result %p\n", results[0] ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); } static DWORD WINAPI stack_commit_func( void *arg ) @@ -2128,8 +2128,8 @@ static void test_stack_commit(void) pNtCurrentTeb()->Tib.StackBase = old_stack_base; pNtCurrentTeb()->Tib.StackLimit = old_stack_limit; - VirtualFree( new_stack, 0, MEM_FREE ); - VirtualFree( call_on_stack, 0, MEM_FREE ); + VirtualFree( new_stack, 0, MEM_RELEASE ); + VirtualFree( call_on_stack, 0, MEM_RELEASE ); } DWORD num_execute_fault_calls; @@ -2564,7 +2564,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) success = UnregisterClassA( cls_name, GetModuleHandleA(0) ); ok( success, "UnregisterClass failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); /* Repeat the tests from above with MEM_WRITE_WATCH protected memory. */ @@ -2753,7 +2753,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) success = UnregisterClassA( cls_name, GetModuleHandleA(0) ); ok( success, "UnregisterClass failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); out: if (restore_flags) @@ -2943,7 +2943,7 @@ static void test_VirtualProtect(void) exec_prot = 1 << (i + 4); } - VirtualFree(base, 0, MEM_FREE); + VirtualFree(base, 0, MEM_RELEASE); } static BOOL is_mem_writable(DWORD prot) @@ -3044,7 +3044,7 @@ static void test_VirtualAlloc_protection(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(ptr == base, "%d: VirtualAlloc failed %d\n", i, GetLastError()); - VirtualFree(base, 0, MEM_FREE); + VirtualFree(base, 0, MEM_RELEASE); } else {

1 0

Francois Gouget : shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 43fe3574f479234f77d25fcb14505233cb66fa33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fe3574f479234f77d25fcb1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 14 00:24:43 2016 +0100 shell32/tests: Fix an ok() call so it shows which DDE test caused the failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 11b7e57..d719c9c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2469,9 +2469,9 @@ static void test_dde(void) } okShell(32 < rc, "failed: rc=%lu err=%u\n", rc, GetLastError()); if (test->ddeexec) - ok(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); + okShell(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); else - ok(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count); + okShell(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count); if (32 < rc) {

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of InterlockedPopEntrySList.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 8ae681101f0adf3cf3f84c5a45540e2f2f5df69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae681101f0adf3cf3f84c5a4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:21:43 2016 +0100 ntoskrnl.exe: Fix calling convention of InterlockedPopEntrySList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7e043be..7938893 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1416,6 +1416,20 @@ LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) /*********************************************************************** + * InterlockedPopEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedPopEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#endif +{ + return InterlockedPopEntrySList( list ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1319ada..f34fd88 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -33,7 +33,7 @@ @ stdcall -norelay InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange @ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd @ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement -@ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList +@ stdcall -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList @ stub IoAssignDriveLetters @ stub IoReadPartitionTable

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of InterlockedPushEntrySList.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: be0e86c526ad623f25ea179057467494431b5356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e86c526ad623f25ea17905… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:22:21 2016 +0100 ntoskrnl.exe: Fix calling convention of InterlockedPushEntrySList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7938893..1fba0af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1430,6 +1430,20 @@ PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) /*********************************************************************** + * InterlockedPushEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedPushEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +#endif +{ + return InterlockedPushEntrySList( list, entry ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f34fd88..6aa7456 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -34,7 +34,7 @@ @ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd @ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement @ stdcall -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList -@ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList +@ stdcall -norelay InterlockedPushEntrySList(ptr ptr) NTOSKRNL_InterlockedPushEntrySList @ stub IoAssignDriveLetters @ stub IoReadPartitionTable @ stub IoSetPartitionInformation

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of ObfReferenceObject.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 2748d4b7719dcf1c32a5aecff51105e236c07a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2748d4b7719dcf1c32a5aecff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:22:52 2016 +0100 ntoskrnl.exe: Fix calling convention of ObfReferenceObject. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1fba0af..1b04060 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1985,13 +1985,6 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes ); } -/*********************************************************************** - * ObfReferenceObject (NTOSKRNL.EXE.@) - */ -VOID WINAPI ObfReferenceObject(PVOID Object) -{ - FIXME("(%p): stub\n", Object); -} /*********************************************************************** * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) @@ -2021,17 +2014,32 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * ObfReferenceObject (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( ObfReferenceObject ) +void WINAPI __regs_ObfReferenceObject( void *obj ) +#else +void WINAPI ObfReferenceObject( void *obj ) +#endif +{ + FIXME( "(%p): stub\n", obj ); +} + + /*********************************************************************** * ObfDereferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ObfDereferenceObject ) -void WINAPI __regs_ObfDereferenceObject( VOID *obj ) +void WINAPI __regs_ObfDereferenceObject( void *obj ) #else -void WINAPI ObfDereferenceObject( VOID *obj ) +void WINAPI ObfDereferenceObject( void *obj ) #endif { - FIXME( "stub: %p\n", obj ); + FIXME( "(%p): stub\n", obj ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6aa7456..1414c53 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -49,7 +49,7 @@ @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -norelay ObfDereferenceObject(ptr) -@ stdcall ObfReferenceObject(ptr) +@ stdcall -norelay ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() ntdll.RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(int64) ntdll.RtlUlonglongByteSwap

1 0

Sebastian Lackner : ntoskrnl.exe: Use debugstr_us() to trace UNICODE_STRING.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e177f869394783743d46cac47d200c659b620990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e177f869394783743d46cac47… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:23:05 2016 +0100 ntoskrnl.exe: Use debugstr_us() to trace UNICODE_STRING. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1b04060..3bee2bf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1258,8 +1258,8 @@ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_o ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) { - FIXME("(%s %p %p %u %p %p %u %d %p) stub\n", debugstr_w(name? name->Buffer : NULL), - drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected); + FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name), + drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected ); return STATUS_NOT_IMPLEMENTED; }

1 0

Nikolay Sivov : dwrite: Implement stub for system IDWriteFontFallback.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: af206b1b2dfde25d1817b01b5d27f38dbcbfd7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af206b1b2dfde25d1817b01b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:06 2016 +0300 dwrite: Implement stub for system IDWriteFontFallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/main.c | 26 ++++++++++++-- dlls/dwrite/tests/layout.c | 36 +++++++++++++------ 4 files changed, 135 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af206b1b2dfde25d1817b…

1 0

Nikolay Sivov : dwrite: Keep factory reference for each layout.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 4d512f9e4e54f36aeaeb87253fa5e4d681d0a4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d512f9e4e54f36aeaeb87253… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:07 2016 +0300 dwrite: Keep factory reference for each layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +++-- dlls/dwrite/layout.c | 19 +++++++++++++------ dlls/dwrite/main.c | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9f0171b..1e4cf59 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -115,8 +115,9 @@ extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; -extern HRESULT create_gdicompat_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT,const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(IDWriteFactory2*,const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_gdicompat_textlayout(IDWriteFactory2*,const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT, + const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteFactory2*,IDWriteTextFormat*,IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory2*,IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1d09460..b60f2ce 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -238,6 +238,8 @@ struct dwrite_textlayout { IDWriteTextAnalysisSource1 IDWriteTextAnalysisSource1_iface; LONG ref; + IDWriteFactory2 *factory; + WCHAR *str; UINT32 len; struct dwrite_textformat_data format; @@ -2548,6 +2550,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { + IDWriteFactory2_Release(This->factory); free_layout_ranges_list(This); free_layout_eruns(This); free_layout_runs(This); @@ -4353,7 +4356,8 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } -static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) +static HRESULT init_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { struct layout_range_header *range, *strike, *underline, *effect, *spacing, *typography; static const DWRITE_TEXT_RANGE r = { 0, ~0u }; @@ -4421,6 +4425,8 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * goto fail; } + layout->factory = factory; + IDWriteFactory2_AddRef(layout->factory); list_add_head(&layout->ranges, &range->entry); list_add_head(&layout->strike_ranges, &strike->entry); list_add_head(&layout->underline_ranges, &underline->entry); @@ -4434,7 +4440,8 @@ fail: return hr; } -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) +HRESULT create_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) { struct dwrite_textlayout *layout; HRESULT hr; @@ -4447,15 +4454,15 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; - hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + hr = init_textlayout(factory, str, len, format, maxwidth, maxheight, layout); if (hr == S_OK) *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; return hr; } -HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, - FLOAT ppdip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, IDWriteTextLayout **ret) +HRESULT create_gdicompat_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, FLOAT ppdip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, IDWriteTextLayout **ret) { struct dwrite_textlayout *layout; HRESULT hr; @@ -4468,7 +4475,7 @@ HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFor layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; - hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + hr = init_textlayout(factory, str, len, format, maxwidth, maxheight, layout); if (hr == S_OK) { layout->measuringmode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5885498..4e30375 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1059,7 +1059,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); - return create_textlayout(string, len, format, max_width, max_height, layout); + return create_textlayout(iface, string, len, format, max_width, max_height, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory2 *iface, WCHAR const* string, @@ -1071,7 +1071,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory TRACE("(%p)->(%s:%u %p %f %f %f %p %d %p)\n", This, debugstr_wn(string, len), len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); - return create_gdicompat_textlayout(string, len, format, layout_width, layout_height, pixels_per_dip, transform, + return create_gdicompat_textlayout(iface, string, len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); }

1 0

Nikolay Sivov : dwrite: Move local stream tracing to a separate channel.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 2c29838b11f3239fc3b0276cb234793b1e246e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c29838b11f3239fc3b0276cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:08 2016 +0300 dwrite: Move local stream tracing to a separate channel. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9bd5404..292866e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -27,6 +27,7 @@ #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +WINE_DECLARE_DEBUG_CHANNEL(dwrite_file); #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') @@ -3793,7 +3794,7 @@ static inline struct dwrite_localfontfilestream *impl_from_IDWriteFontFileStream static HRESULT WINAPI localfontfilestream_QueryInterface(IDWriteFontFileStream *iface, REFIID riid, void **obj) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE_(dwrite_file)("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileStream)) { *obj = iface; @@ -3809,7 +3810,7 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); return ref; } @@ -3825,7 +3826,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); if (!ref) { UnmapViewOfFile(This->file_ptr); @@ -3840,7 +3841,7 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, + TRACE_(dwrite_file)("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; @@ -3857,13 +3858,13 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream static void WINAPI localfontfilestream_ReleaseFileFragment(IDWriteFontFileStream *iface, void *fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, fragment_context); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, fragment_context); } static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, size); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, size); *size = This->size; return S_OK; } @@ -3873,7 +3874,7 @@ static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULARGE_INTEGER li; - TRACE("(%p)->(%p)\n", This, last_writetime); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, last_writetime); li.u.LowPart = This->entry->key->writetime.dwLowDateTime; li.u.HighPart = This->entry->key->writetime.dwHighDateTime;

1 0