July 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/trackbar: Update thumb on range change.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: cd55d747429980dea37295d0d6ce68e7b3c01686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55d747429980dea37295d0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 23:39:53 2016 +0300 comctl32/trackbar: Update thumb on range change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 23 +++++++++++++++++++++++ dlls/comctl32/trackbar.c | 16 ++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index adb1b12..918cf1a 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -687,6 +687,7 @@ static void test_position(void) static void test_range(void) { HWND hWndTrackbar; + RECT rect1, rect2; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -752,6 +753,28 @@ static void test_range(void) ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); + /* TBM_SETRANGE updates thumb visual position (rectangle) if needed */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 10)); + ok(r == 0, "got %d\n", r); + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(!EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + + /* change range back, don't force repaint */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 8c99ad0..f79cc67 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1245,21 +1245,21 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) infoPtr->lRangeMin = (SHORT)LOWORD(range); infoPtr->lRangeMax = (SHORT)HIWORD(range); - if (infoPtr->lPos < infoPtr->lRangeMin) { + /* clip position to new min/max limit */ + if (infoPtr->lPos < infoPtr->lRangeMin) infoPtr->lPos = infoPtr->lRangeMin; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } - if (infoPtr->lPos > infoPtr->lRangeMax) { + if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) - TRACKBAR_RecalculateTics (infoPtr); + if (changed) { + if (infoPtr->dwStyle & TBS_AUTOTICKS) + TRACKBAR_RecalculateTics (infoPtr); + infoPtr->flags |= TB_THUMBPOSCHANGED; + } if (redraw) TRACKBAR_InvalidateAll(infoPtr);

1 0

Dmitry Timoshkov : ntdll: Add support for fs segment in ThreadDescriptorTableEntry query.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: d039d188f49d97b92694dbebcbbc72a8b30f29e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d039d188f49d97b92694dbebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 14 00:17:59 2016 +0200 ntdll: Add support for fs segment in ThreadDescriptorTableEntry query. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f6a5fbe..6127c8f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1051,6 +1051,16 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { if (sel == (wine_get_cs() & ~3)) tdi->Entry.HighWord.Bits.Type |= 8; /* code segment */ + else if (sel == (ntdll_get_thread_data()->fs & ~3)) + { + ULONG_PTR fs_base = (ULONG_PTR)NtCurrentTeb(); + tdi->Entry.BaseLow = fs_base & 0xffff; + tdi->Entry.HighWord.Bits.BaseMid = (fs_base >> 16) & 0xff; + tdi->Entry.HighWord.Bits.BaseHi = (fs_base >> 24) & 0xff; + tdi->Entry.LimitLow = 0x0fff; + tdi->Entry.HighWord.Bits.LimitHi = 0; + tdi->Entry.HighWord.Bits.Granularity = 0; + } else status = STATUS_ACCESS_DENIED; } }

1 0

Ken Thomases : kernel32: Overhaul the handling of argv in set_process_name ().
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: a73045d6a018f5b8012ef53f53d3ea7786da8a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73045d6a018f5b8012ef53f5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 11 23:44:20 2016 -0500 kernel32: Overhaul the handling of argv in set_process_name(). This fixes several problems with the code: * The code had been assuming that the argument strings pointed to by the argv array are contiguous iff certain process-name-setting functions are available. This doesn't seem reliable. Instead, test if it's true and shift the strings if so. However, setproctitle() is specifically documented as a preferred alternative to the technique of overwriting the arg strings, so don't shift the strings if that's available. * Use the last path component, recognizing backslash as a path separator, for setprogname() in addition to prctl(). First, setprogname() is documented as searching for the last component itself, but it doesn't understand Windows- style paths, so we need to help it. Second, on some platforms (e.g. macOS), setprogname(), like prctl(), has a fairly small internal length limit (e.g. 32 characters). So, concentrate on the most meaningful part of the path. * Remove argv[0] from argv whether or not there are any process-name-setting functions available. This is necessary for the proper functioning of Wine, so it must be done on all platforms. This part of the logic was lost with commit 5a4576ee0. * Call all available process-name-setting functions instead of treating them as mutually exclusive alternatives. This is also logic that was lost with commit 5a4576ee0. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4771108..5b584ac 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1116,39 +1116,36 @@ static DWORD WINAPI start_process( PEB *peb ) */ static void set_process_name( int argc, char *argv[] ) { + BOOL shift_strings; + char *p, *name; + int i; + #ifdef HAVE_SETPROCTITLE setproctitle("-%s", argv[1]); - /* remove argv[0] */ - memmove( argv, argv + 1, argc * sizeof(argv[0]) ); -#elif defined(HAVE_SETPROGNAME) - int i, offset; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; - - offset = argv[1] - argv[0]; - memmove( argv[1] - offset, argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - - setprogname( argv[0] ); -#elif defined(HAVE_PRCTL) - int i, offset; - char *p, *prctl_name = argv[1]; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + shift_strings = FALSE; +#else + p = argv[0]; -#ifndef PR_SET_NAME -# define PR_SET_NAME 15 + shift_strings = (argc >= 2); + for (i = 1; i < argc; i++) + { + p += strlen(p) + 1; + if (p != argv[i]) + { + shift_strings = FALSE; + break; + } + } #endif - if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; - if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; - - if (prctl( PR_SET_NAME, prctl_name ) != -1) + if (shift_strings) { - offset = argv[1] - argv[0]; - memmove( argv[1] - offset, argv[1], end - argv[1] ); + int offset = argv[1] - argv[0]; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + memmove( argv[0], argv[1], end - argv[1] ); memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; + for (i = 1; i < argc; i++) + argv[i-1] = argv[i] - offset; argv[i-1] = NULL; } else @@ -1156,6 +1153,20 @@ static void set_process_name( int argc, char *argv[] ) /* remove argv[0] */ memmove( argv, argv + 1, argc * sizeof(argv[0]) ); } + + name = argv[0]; + if ((p = strrchr( name, '\\' ))) name = p + 1; + if ((p = strrchr( name, '/' ))) name = p + 1; + +#if defined(HAVE_SETPROGNAME) + setprogname( name ); +#endif + +#ifdef HAVE_PRCTL +#ifndef PR_SET_NAME +# define PR_SET_NAME 15 +#endif + prctl( PR_SET_NAME, name ); #endif /* HAVE_PRCTL */ }

1 0

Nikolay Sivov : comctl32/trackbar: Fix mouse position to thumb position conversion rounding.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 6a237bdb603b36550abb57502d0fa1c27a57d7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a237bdb603b36550abb57502… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 00:37:35 2016 +0300 comctl32/trackbar: Fix mouse position to thumb position conversion rounding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index f79cc67..43131ab 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -34,6 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -203,7 +204,7 @@ TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place) pos = infoPtr->lRangeMin; TRACE("%.2f\n", pos); - return (LONG)(pos + 0.5); + return (LONG)floor(pos + 0.5); }

1 0

Austin English : include: Add more NTE_* definitions.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: d0bc3a25c3168b49c1598a3f9843114559af2bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0bc3a25c3168b49c1598a3f9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 02:05:28 2016 -0500 include: Add more NTE_* definitions. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index ba9e245..9c1b7f1 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2639,6 +2639,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define NTE_TOKEN_KEYSET_STORAGE_FULL _HRESULT_TYPEDEF_(0x80090023) #define NTE_TEMPORARY_PROFILE _HRESULT_TYPEDEF_(0x80090024) #define NTE_FIXEDPARAMETER _HRESULT_TYPEDEF_(0x80090025) +#define NTE_INVALID_HANDLE _HRESULT_TYPEDEF_(0x80090026) +#define NTE_INVALID_PARAMETER _HRESULT_TYPEDEF_(0x80090027) +#define NTE_BUFFER_TOO_SMALL _HRESULT_TYPEDEF_(0x80090028) +#define NTE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80090029) +#define NTE_NO_MORE_ITEMS _HRESULT_TYPEDEF_(0x8009002A) +#define NTE_BUFFERS_OVERLAP _HRESULT_TYPEDEF_(0x8009002B) +#define NTE_DECRYPTION_FAILURE _HRESULT_TYPEDEF_(0x8009002C) +#define NTE_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x8009002D) +#define NTE_UI_REQUIRED _HRESULT_TYPEDEF_(0x8009002E) +#define NTE_HMAC_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8009002F) #define NTE_OP_OK _HRESULT_TYPEDEF_(0) #define SEC_E_INSUFFICIENT_MEMORY _HRESULT_TYPEDEF_(0x80090300)

1 0

Sebastian Lackner : ntdll/tests: Use inline implementation of NtCurrentTeb for exception tests.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 8e8e03de63495586ac2c34d673a6162817aa36f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8e03de63495586ac2c34d67… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 12 00:38:09 2016 +0200 ntdll/tests: Use inline implementation of NtCurrentTeb for 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 | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 64f3dff..a086436 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,7 +38,6 @@ static void *code_mem; -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); @@ -241,16 +240,16 @@ static void run_exception_test(void *handler, const void* context, DWORD oldaccess, oldaccess2; exc_frame.frame.Handler = handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + exc_frame.frame.Prev = NtCurrentTeb()->Tib.ExceptionList; exc_frame.context = context; memcpy(code_mem, code, code_size); if(access) VirtualProtect(code_mem, code_size, access, &oldaccess); - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + NtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; func(); - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; if(access) VirtualProtect(code_mem, code_size, oldaccess, &oldaccess2); @@ -266,7 +265,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); - if (pNtCurrentTeb()->Peb->BeingDebugged) + if (NtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException || broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */ "debugger managed to modify Eax to %x should be %p\n", @@ -363,11 +362,11 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) record.NumberParameters = 0; frame.Handler = rtlraiseexception_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; memcpy(code_mem, call_one_arg_code, sizeof(call_one_arg_code)); - pNtCurrentTeb()->Tib.ExceptionList = &frame; + NtCurrentTeb()->Tib.ExceptionList = &frame; if (have_vectored_api) { vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &rtlraiseexception_vectored_handler); @@ -380,7 +379,7 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) if (have_vectored_api) pRtlRemoveVectoredExceptionHandler(vectored_handler); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; } static void test_rtlraiseexception(void) @@ -448,30 +447,30 @@ static void test_unwind(void) /* add first unwind handler */ frame1->Handler = unwind_handler; - frame1->Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = frame1; + frame1->Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = frame1; /* add second unwind handler */ frame2->Handler = unwind_handler; - frame2->Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = frame2; + frame2->Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = frame2; /* test unwind to current frame */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000); ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); - ok(pNtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, frame2); + ok(NtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", + NtCurrentTeb()->Tib.ExceptionList, frame2); /* unwind to frame1 */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000); ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); - ok(pNtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, frame1); + ok(NtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", + NtCurrentTeb()->Tib.ExceptionList, frame1); /* restore original handler */ - pNtCurrentTeb()->Tib.ExceptionList = frame1->Prev; + NtCurrentTeb()->Tib.ExceptionList = frame1->Prev; } static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, @@ -861,7 +860,7 @@ static void test_debugger(void) if (de.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT) { - if(de.u.CreateProcessInfo.lpBaseOfImage != pNtCurrentTeb()->Peb->ImageBaseAddress) + if(de.u.CreateProcessInfo.lpBaseOfImage != NtCurrentTeb()->Peb->ImageBaseAddress) { skip("child process loaded at different address, terminating it\n"); pNtTerminateProcess(pi.hProcess, 0); @@ -2163,7 +2162,6 @@ START_TEST(exception) return; } - pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); @@ -2185,11 +2183,6 @@ START_TEST(exception) pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); #ifdef __i386__ - if (!pNtCurrentTeb) - { - skip( "NtCurrentTeb not found\n" ); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (pRtlAddVectoredExceptionHandler && pRtlRemoveVectoredExceptionHandler) @@ -2210,7 +2203,7 @@ START_TEST(exception) } /* child must be run under a debugger */ - if (!pNtCurrentTeb()->Peb->BeingDebugged) + if (!NtCurrentTeb()->Peb->BeingDebugged) { ok(FALSE, "child process not being debugged?\n"); return;

1 0

Michael Stefaniuc : avifil32: Avoid using the LPCLASSFACTORY COM iface type.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 5dc2626ba4b22eb6cb48aea129d4851e559529de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc2626ba4b22eb6cb48aea12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:07:53 2016 +0200 avifil32: Avoid using the LPCLASSFACTORY COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/factory.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 8ada02b..30fa604 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -53,8 +53,8 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, - REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI IClassFactory_fnQueryInterface(IClassFactory *iface, REFIID riid, + void **ppobj) { TRACE("(%p,%p,%p)\n", iface, riid, ppobj); @@ -90,9 +90,8 @@ static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface) return ref; } -static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pOuter, - REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI IClassFactory_fnCreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); @@ -122,7 +121,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, return E_NOINTERFACE; } -static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI IClassFactory_fnLockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%p,%d)\n",iface,dolock);

1 0

Sebastian Lackner : kernel32/tests: Use inline implementation of NtCurrentTeb for debugger tests.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 4e0edaac1fa82272821a8d8e9ad96e4601e8e4b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0edaac1fa82272821a8d8e9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 12 00:35:51 2016 +0200 kernel32/tests: Use inline implementation of NtCurrentTeb for debugger tests. Also enable BeingDebugged PEB tests on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 73320c6..82faf3f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -39,7 +39,6 @@ static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); static BOOL (WINAPI *pIsDebuggerPresent)(void); -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; @@ -579,18 +578,15 @@ static void doChild(int argc, char **argv) child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); - if (pNtCurrentTeb) - { - pNtCurrentTeb()->Peb->BeingDebugged = FALSE; + NtCurrentTeb()->Peb->BeingDebugged = FALSE; - ret = pIsDebuggerPresent(); - child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); - ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); - child_ok(debug, "Expected debug != 0, got %#x.\n", debug); + ret = pIsDebuggerPresent(); + child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); + ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(debug, "Expected debug != 0, got %#x.\n", debug); - pNtCurrentTeb()->Peb->BeingDebugged = TRUE; - } + NtCurrentTeb()->Peb->BeingDebugged = TRUE; blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); @@ -815,8 +811,6 @@ START_TEST(debugger) pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); - hdll=GetModuleHandleA("ntdll.dll"); - if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0)

1 0

Nikolay Sivov : xmllite/writer: Close open tag with WriteFullEndElement().
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 8b2b455bd0f475333dc2b4b641aa4b871708bafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2b455bd0f475333dc2b4b64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:30 2016 +0300 xmllite/writer: Close open tag with WriteFullEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 4 ++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 5e6769c..12433fa 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1143,6 +1143,80 @@ todo_wine IStream_Release(stream); } +static void test_WriteFullEndElement(void) +{ + static const WCHAR aW[] = {'a',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* standalone element */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a></a>"); + IStream_Release(stream); + + /* nested elements */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " <a></a>\r\n" + "</a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1160,4 +1234,5 @@ START_TEST(writer) test_WriteRaw(); test_indentation(); test_WriteAttributeString(); + test_WriteFullEndElement(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index be5f0e1..2e630ee 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -947,11 +947,13 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; + writer_close_starttag(This); + writer_dec_indent(This); + /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); - This->starttagopen = FALSE; return S_OK; }

1 0

Nikolay Sivov : xmllite/writer: Fix formatted output with WriteFullEndElement().
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 099eda8eadfb9e7ee55aabb4dc5ef9913a929be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099eda8eadfb9e7ee55aabb4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:32 2016 +0300 xmllite/writer: Fix formatted output with WriteFullEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 699095b..bcc0e85 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -414,7 +414,6 @@ static HRESULT writer_close_starttag(xmlwriter *writer) if (!writer->starttagopen) return S_OK; hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); writer->starttagopen = FALSE; - writer->state = XmlWriterState_Content; return hr; } @@ -958,6 +957,12 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) writer_close_starttag(This); writer_dec_indent(This); + /* don't force full end tag to the next line */ + if (This->state == XmlWriterState_ElemStarted) + This->state = XmlWriterState_Content; + else + write_node_indent(This); + /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len);

1 0