October 2015 - Wine-commits

Alistair Leslie-Hughes : gdiplus: Add GdipCreateEffect stub.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: e5d478c79986d98dbacdb91169c4abc1fca317f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d478c79986d98dbacdb9116… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:07:50 2015 +1100 gdiplus: Add GdipCreateEffect stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9701ee0..edf4e45 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -610,7 +610,7 @@ 610 stdcall GdipFindFirstImageItem(ptr ptr) 611 stub GdipFindNextImageItem 612 stdcall GdipGetImageItemData(ptr ptr) -613 stub GdipCreateEffect +613 stdcall GdipCreateEffect(int128 ptr) 614 stdcall GdipDeleteEffect(ptr) 615 stub GdipGetEffectParameterSize 616 stub GdipGetEffectParameters diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b99b75d..0a8027a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5008,6 +5008,24 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi return retval; } +/***************************************************************************** + * GdipCreateEffect [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) +{ + FIXME("(%s, %p): stub\n", debugstr_guid(&guid), effect); + + if(!effect) + return InvalidParameter; + + *effect = NULL; + + return NotImplemented; +} + +/***************************************************************************** + * GdipDeleteEffect [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) { FIXME("(%p): stub\n", effect);

1 0

Alistair Leslie-Hughes : gdiplus: Add GdipCreateEffect tests.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 71294e2a119c5a5ea4f1cde50583ef353c1ef43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71294e2a119c5a5ea4f1cde50… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:07:51 2015 +1100 gdiplus: Add GdipCreateEffect tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1335d97..51b99a3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4629,6 +4629,47 @@ static void test_supported_encoders(void) GdipDisposeImage((GpImage *)bm); } +static void test_createeffect(void) +{ + static const GUID noneffect = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + GpStatus (WINAPI *pGdipCreateEffect)( const GUID guid, CGpEffect **effect); + GpStatus (WINAPI *pGdipDeleteEffect)( CGpEffect *effect); + GpStatus stat; + CGpEffect *effect; + HMODULE mod = GetModuleHandleA("gdiplus.dll"); + int i; + const GUID effectlist[] = + {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid, + BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid, + TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid}; + + pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); + pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); + if(!pGdipCreateEffect || !pGdipDeleteEffect) + { + /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */ + win_skip("GDIPlus version 1.1 not available\n"); + return; + } + + stat = pGdipCreateEffect(BlurEffectGuid, NULL); + expect(InvalidParameter, stat); + + stat = pGdipCreateEffect(noneffect, &effect); + todo_wine expect(Win32Error, stat); + + for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++) + { + stat = pGdipCreateEffect(effectlist[i], &effect); + todo_wine expect(Ok, stat); + if(stat == Ok) + { + stat = pGdipDeleteEffect(effect); + expect(Ok, stat); + } + } +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4683,6 +4724,7 @@ START_TEST(image) test_remaptable(); test_colorkey(); test_dispose(); + test_createeffect(); GdiplusShutdown(gdiplusToken); }

1 0

Dmitry Timoshkov : advapi32: Add CreatePrivateObjectSecurityWithMultipleInheritance semi-stub.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: d2f0bc2f74b7899aac4308d0a886d0447ab6b32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f0bc2f74b7899aac4308d0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 9 18:21:21 2015 +0800 advapi32: Add CreatePrivateObjectSecurityWithMultipleInheritance semi-stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 8 ++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- include/winbase.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8b1c0d5..ff2b0de 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -121,7 +121,7 @@ # @ stub CreateCodeAuthzLevel @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) # @ stub CreatePrivateObjectSecurityEx -# @ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e8f64d5..00dafe8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5296,6 +5296,14 @@ BOOL WINAPI CreatePrivateObjectSecurity( return TRUE; } +BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance( + PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, PSECURITY_DESCRIPTOR *out, + GUID **types, ULONG count, BOOL is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping) +{ + FIXME(": semi-stub\n"); + return CreatePrivateObjectSecurity(parent, creator, out, is_container, token, mapping); +} + BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor ) { FIXME("%p - stub\n", ObjectDescriptor); diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 130f285..4105e59 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -27,7 +27,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index edae6d1..a44f5b8 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -27,7 +27,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DeleteAce(ptr long) advapi32.DeleteAce diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index e19fe53..02e3b9a 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -31,7 +31,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DeleteAce(ptr long) advapi32.DeleteAce diff --git a/include/winbase.h b/include/winbase.h index b42bc0d..dd320c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1771,6 +1771,7 @@ WINBASEAPI HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,D #define CreateNamedPipe WINELIB_NAME_AW(CreateNamedPipe) WINBASEAPI BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD); WINADVAPI BOOL WINAPI CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOL,HANDLE,PGENERIC_MAPPING); +WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);

1 0

Nikolay Sivov : dwrite: Ignore embedded bitmaps when asked for outline.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 925dc6da8f33ea1e1a092d92f62c127182d98745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925dc6da8f33ea1e1a092d92f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 17:56:02 2015 +0300 dwrite: Ignore embedded bitmaps when asked for outline. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 4eaef02..cfae1af 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -399,7 +399,7 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UIN EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - if (pFT_Load_Glyph(size->face, index, FT_LOAD_DEFAULT) == 0) { + if (pFT_Load_Glyph(size->face, index, FT_LOAD_NO_BITMAP) == 0) { FT_Outline *outline = &size->face->glyph->outline; short count; FT_Matrix m;

1 0

Sebastian Lackner : ntdll: Synchronize Nt and Zw exports.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: ea87d1c317b6c0187006d30002da0be79629afb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea87d1c317b6c0187006d3000… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:39:21 2015 +0200 ntdll: Synchronize Nt and Zw exports. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca3561d..6b3fc65 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -162,9 +162,9 @@ @ stdcall NtDuplicateToken(long long long long long long) # @ stub NtEnumerateBootEntries @ stub NtEnumerateBus -@ stdcall NtEnumerateKey (long long long long long long) +@ stdcall NtEnumerateKey(long long long ptr long ptr) # @ stub NtEnumerateSystemEnvironmentValuesEx -@ stdcall NtEnumerateValueKey (long long long long long long) +@ stdcall NtEnumerateValueKey(long long long ptr long ptr) @ stub NtExtendSection # @ stub NtFilterToken @ stdcall NtFindAtom(ptr long ptr) @@ -273,7 +273,7 @@ @ stdcall NtQuerySystemTime(ptr) @ stdcall NtQueryTimer(ptr long ptr long ptr) @ stdcall NtQueryTimerResolution(long long long) -@ stdcall NtQueryValueKey(long long long long long long) +@ stdcall NtQueryValueKey(long ptr long ptr long ptr) @ stdcall NtQueryVirtualMemory(long ptr long ptr long ptr) @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long) @ stdcall NtQueueApcThread(long ptr long long long) @@ -1010,7 +1010,7 @@ # @ stub ZwAccessCheckByTypeResultListAndAuditAlarmByHandle @ stdcall ZwAddAtom(ptr long ptr) NtAddAtom # @ stub ZwAddBootEntry -@ stdcall ZwAdjustGroupsToken(long long long long long long) NtAdjustGroupsToken +@ stdcall ZwAdjustGroupsToken(long long ptr long ptr ptr) NtAdjustGroupsToken @ stdcall ZwAdjustPrivilegesToken(long long long long long long) NtAdjustPrivilegesToken @ stdcall ZwAlertResumeThread(long ptr) NtAlertResumeThread @ stdcall ZwAlertThread(long) NtAlertThread @@ -1048,7 +1048,7 @@ @ stdcall ZwCreateMutant(ptr long ptr long) NtCreateMutant @ stdcall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall ZwCreatePagingFile(long long long long) NtCreatePagingFile -@ stdcall ZwCreatePort(ptr ptr long long long) NtCreatePort +@ stdcall ZwCreatePort(ptr ptr long long ptr) NtCreatePort @ stub ZwCreateProcess # @ stub ZwCreateProcessEx @ stub ZwCreateProfile @@ -1089,11 +1089,12 @@ @ stdcall ZwFreeVirtualMemory(long ptr ptr long) NtFreeVirtualMemory @ stdcall ZwFsControlFile(long long long long long long long long long long) NtFsControlFile @ stdcall ZwGetContextThread(long ptr) NtGetContextThread +@ stdcall ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent @ stdcall ZwGetTickCount() NtGetTickCount @ stdcall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch -# @ stub ZwImpersonateAnonymousToken +@ stdcall ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort @ stub ZwImpersonateThread @ stub ZwInitializeRegistry @@ -1171,15 +1172,15 @@ @ stdcall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall ZwQueryObject(long long long long long) NtQueryObject @ stub ZwQueryOpenSubKeys -@ stdcall ZwQueryPerformanceCounter (long long) NtQueryPerformanceCounter +@ stdcall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @ stdcall ZwQuerySection (long long long long long) NtQuerySection @ stdcall ZwQuerySecurityObject (long long long long long) NtQuerySecurityObject -@ stdcall ZwQuerySemaphore (long long long long long) NtQuerySemaphore +@ stdcall ZwQuerySemaphore(long long ptr long ptr) NtQuerySemaphore @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject -@ stub ZwQuerySystemEnvironmentValue -# @ stub ZwQuerySystemEnvironmentValueEx +@ stdcall ZwQuerySystemEnvironmentValue(ptr ptr long ptr) NtQuerySystemEnvironmentValue +@ stdcall ZwQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) NtQuerySystemEnvironmentValueEx @ stdcall ZwQuerySystemInformation(long long long long) NtQuerySystemInformation @ stdcall ZwQuerySystemTime(ptr) NtQuerySystemTime @ stdcall ZwQueryTimer(ptr long ptr long ptr) NtQueryTimer @@ -1189,7 +1190,7 @@ @ stdcall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @ stdcall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall ZwRaiseException(ptr ptr long) NtRaiseException -@ stub ZwRaiseHardError +@ stdcall ZwRaiseHardError(long long ptr ptr long long) NtRaiseHardError @ stdcall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter @ stub ZwReadRequestData @@ -1206,7 +1207,7 @@ @ stdcall ZwReplaceKey(ptr long ptr) NtReplaceKey @ stub ZwReplyPort @ stdcall ZwReplyWaitReceivePort(ptr ptr ptr ptr) NtReplyWaitReceivePort -# @ stub ZwReplyWaitReceivePortEx +@ stub ZwReplyWaitReceivePortEx @ stub ZwReplyWaitReplyPort # @ stub ZwRequestDeviceWakeup @ stub ZwRequestPort @@ -1224,7 +1225,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stub ZwSetDebugFilterState @ stub ZwSetDefaultHardErrorPort @ stdcall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlIsCriticalSectionLocked[ ByThread].
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: b028f2c07697f75db7b93f940a320a30176f56d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b028f2c07697f75db7b93f940… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:39:35 2015 +0200 ntdll/tests: Add tests for RtlIsCriticalSectionLocked[ByThread]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index ce23310..4ab3d1e 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -96,6 +96,8 @@ static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULON static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); +static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(RTL_CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(RTL_CRITICAL_SECTION *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -147,6 +149,8 @@ static void InitFunctionPtrs(void) pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); + pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); + pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1956,6 +1960,102 @@ static void test_RtlDecompressBuffer(void) #undef DECOMPRESS_BROKEN_FRAGMENT #undef DECOMPRESS_BROKEN_TRUNCATED +struct critsect_locked_info +{ + CRITICAL_SECTION crit; + HANDLE semaphores[2]; +}; + +static DWORD WINAPI critsect_locked_thread(void *param) +{ + struct critsect_locked_info *info = param; + DWORD ret; + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + ReleaseSemaphore(info->semaphores[0], 1, NULL); + ret = WaitForSingleObject(info->semaphores[1], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + EnterCriticalSection(&info->crit); + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + + ReleaseSemaphore(info->semaphores[0], 1, NULL); + ret = WaitForSingleObject(info->semaphores[1], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + LeaveCriticalSection(&info->crit); + return 0; +} + +static void test_RtlIsCriticalSectionLocked(void) +{ + struct critsect_locked_info info; + HANDLE thread; + BOOL ret; + + if (!pRtlIsCriticalSectionLocked || !pRtlIsCriticalSectionLockedByThread) + { + skip("skipping RtlIsCriticalSectionLocked tests, required functions not available\n"); + return; + } + + InitializeCriticalSection(&info.crit); + info.semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(info.semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + info.semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(info.semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + EnterCriticalSection(&info.crit); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + + thread = CreateThread(NULL, 0, critsect_locked_thread, &info, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + ret = WaitForSingleObject(info.semaphores[0], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + LeaveCriticalSection(&info.crit); + + ReleaseSemaphore(info.semaphores[1], 1, NULL); + ret = WaitForSingleObject(info.semaphores[0], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + ReleaseSemaphore(info.semaphores[1], 1, NULL); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + CloseHandle(thread); + CloseHandle(info.semaphores[0]); + CloseHandle(info.semaphores[1]); + DeleteCriticalSection(&info.crit); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1985,4 +2085,5 @@ START_TEST(rtl) test_RtlCompressBuffer(); test_RtlGetCompressionWorkSpaceSize(); test_RtlDecompressBuffer(); + test_RtlIsCriticalSectionLocked(); }

1 0

Alexandre Julliard : patches: Separate parsing of headers and mail body.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: tools Branch: master Commit: 400ba40298a73d7c4f39f690658bfd9703516a49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=400ba40298a73d7c4f39f690… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 00:03:59 2015 +0900 patches: Separate parsing of headers and mail body. --- patches/update | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/patches/update b/patches/update index aa8d8c9..a11d17e 100755 --- a/patches/update +++ b/patches/update @@ -131,7 +131,11 @@ foreach my $file (readdir DIR) { if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } - elsif (/^Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } + last if (/^$/); + } + while (<PATCH>) + { + if (/^\s*Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } last if (/^---$/); } close PATCH;

1 0

Alexandre Julliard : patches: Send notification emails on patch status change.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: tools Branch: master Commit: 03e4c1bd866a6c61e46679622e611bdd45e534c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=03e4c1bd866a6c61e4667962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 21:35:13 2015 +0900 patches: Send notification emails on patch status change. --- patches/expire | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 188 insertions(+), 1 deletion(-) diff --git a/patches/expire b/patches/expire index a3b99c1..0f26d8a 100755 --- a/patches/expire +++ b/patches/expire @@ -43,6 +43,94 @@ my %status_expiry = "testfail" => 7, ); +my %status_descr = +( + "nil" => "New", + "pending" => "Pending", + "applied" => "Applied", + "committed" => "Committed", + "applyfail" => "Apply failure", + "buildfail" => "Build failure", + "deferred" => "Deferred", + "formatting" => "Formatting", + "other" => "Other project", + "nopatch" => "No patch", + "rejected" => "Rejected", + "split" => "Needs splitting", + "depend" => "Dependency", + "sequence" => "Bad sequence", + "signoff" => "Sign-off", + "superseded" => "Superseded", + "testcase" => "Needs tests", + "testfail" => "Test failure", +); + +my %status_explanation = +( + "pending" => +"This means that the patch is not necessarily wrong, but its +correctness is not obvious. You should either write a test case +demonstrating that it is correct, try to fix the problem in a more +straightforward way, or better explain why you are doing things this +way.", + "committed" => +"This means that your patch has been approved, and committed to the +main git tree. Congratulations!", + "applyfail" => +"This means that git-apply refused to apply the patch. This could be +either because it got mangled in transit, it's not relative to the +latest git, or it conflicts with someone else's patch in the same +area. You need to resend an updated patch.", + "buildfail" => +"This means that the patched code doesn't compile. It could also be +because you forgot to include some changes or new files required for +compilation, or that the patch causes compiler warnings (maintainer +mode implies -Werror). You need to resend a fixed patch.", + "deferred" => +"This means that the patch is deferred because of code freeze for an +upcoming release. You need to either resend after the release, make +the patch less intrusive, or make a convincing argument that it needs +to be included in the release.", + "formatting" => +"This means that there are some formatting issues with your +patch. Either the author's full name, email address, or Signed-off-by +headers are missing, indentation is messed up (usually from editing +with a non-standard tab size), or there are gratuitous formatting +changes to the code. You need to resend a fixed patch.", + "other" => +"This means that the patch belongs to another WineHQ project (website, +appdb, etc.) and will be applied by the respective maintainer.", + "nopatch" => +"This means that no patch was found in your mail.", + "rejected" => +"This means that the patch has been rejected by a reviewer. You should +have received a mail explaining why it was rejected. You need to fix +the issue and resend the patch, or if you are convinced that your +patch is good as is, you should reply to the rejection message with +your counterarguments.", + "split" => +"This means that the patch needs to be split, either because it +contains unrelated changes that should be their own separate patch, or +because it's too large for review. You need to find a way to resend +the changes in smaller chunks.", + "depend" => +"This means that the patch is part of a series in which a previous +patch hasn't been applied. You need to resend when the dependent patch +is fixed.", + "sequence" => +"This means that the patch is part of a series but it's not correctly +numbered. You need to resend the series with correct sequence numbers +to enable the Testbot to figure it out.", + "testcase" => +"This means that you need to write some test cases demonstrating that +the patch is correct.", +# No notifications are sent for the following: +# "nil" +# "signoff" +# "superseded" +# "testfail" +); + sub usage() { print STDERR "Usage: $0 [-n] [-v] [directory]\n"; @@ -53,6 +141,7 @@ my $dir = "."; my $dry_run = 0; my $quiet = 1; my $now = time(); +my $email_from = "Marvin <testbot\(a)winehq.org>"; foreach my $arg (@ARGV) { @@ -100,15 +189,112 @@ sub get_patch_state($) return ($status, $mtime); } +sub get_previous_state($) +{ + my $file = shift; + my $prev_status = "nil"; + + if (open PREVSTATUS, "<$dir/OLD/$file.status") + { + $prev_status = <PREVSTATUS>; + chomp $prev_status; + close PREVSTATUS; + } + return $prev_status; +} + +sub get_notify_headers($$) +{ + my $file = shift; + my $status = shift; + my @headers; + + return () unless open PATCH, "<$dir/$file"; + + push @headers, "From: $email_from"; + + while (<PATCH>) + { + if (/^Subject: (.*)$/) + { + my $subject = $1; + $subject = "Re: " . $subject unless $subject =~ /^[Rr][Ee]: /; + push @headers, "Subject: $subject"; + } + elsif (/^From: (.*)$/) + { + push @headers, "To: $1"; + } + elsif (/^Message-Id: (.*)$/) + { + push @headers, "In-Reply-To: $1"; + push @headers, "References: $1"; + } + last if (/^$/); + } + close PATCH; + + push @headers, "X-Patch-Status: $status_descr{$status}"; + push @headers, "X-Patch-URL: https://source.winehq.org/patches/data/$file"; + push @headers, "Reply-To: wine-devel\(a)winehq.org"; + return @headers; +} + +sub notify_state_change($$$) +{ + my $file = shift; + my $prev_status = shift; + my $status = shift; + + return if $prev_status eq $status; + + printf "file %s status changed %s -> %s\n", $file, $prev_status, $status unless $quiet; + + # if there's no available explanation, don't notify + return unless defined $status_explanation{$status}; + + my @headers = get_notify_headers( $file, $status ); + return unless @headers; + + open PREVSTATUS, ">$dir/OLD/$file.status" or return; + printf PREVSTATUS "%s\n", $status; + close PREVSTATUS; + + open SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq" or return; + print SENDMAIL join("\n", @headers), "\n\n"; + print SENDMAIL <<"EOF"; +Thank you for your contribution to Wine! + +This is an automated notification to let you know that your patch has +been reviewed and its status set to "$status_descr{$status}". + +$status_explanation{$status} +EOF + + if ($status ne "committed") + { + print SENDMAIL <<"EOF"; + +If you do not understand the reason for this status, disagree with our +assessment, or are simply not sure how to proceed next, please ask for +clarification by replying to this email. +EOF + } + close SENDMAIL; +} + # expire current patches opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( "$file" ); + my ($status, $mtime) = get_patch_state( $file ); + my $prev_status = get_previous_state( $file ); my $limit = $status_expiry{$status} || 7; + notify_state_change( $file, $prev_status, $status ); + if (($now - $mtime - 12*60*60) / (24*60*60) > $limit) { if ($status eq "nil" || $status eq "pending") @@ -136,6 +322,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/$file.signoff"; unlink "$dir/$file.testbot"; unlink "$dir/$file.testfail"; + unlink "$dir/OLD/$file.status"; } } }

1 0

Józef Kucia : d3d10core/tests: Use full name of structure field in ok() messages.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 5f2e825b5358faa6b7e5082f9a7c57a09f9cfc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e825b5358faa6b7e5082f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:10 2015 +0200 d3d10core/tests: Use full name of structure field in ok() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1bff1eb..2e0e9e5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1341,7 +1341,7 @@ static void test_create_blend_state(void) ID3D11BlendState_GetDesc(d3d11_blend_state, &d3d11_blend_desc); ok(d3d11_blend_desc.AlphaToCoverageEnable == blend_desc.AlphaToCoverageEnable, - "Got unexpected alpha to coverage %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); + "Got unexpected alpha to coverage enable %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); ok(d3d11_blend_desc.IndependentBlendEnable == FALSE, "Got unexpected independent blend enable %#x.\n", d3d11_blend_desc.IndependentBlendEnable); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) @@ -1404,7 +1404,7 @@ static void test_create_blend_state(void) ID3D11BlendState_GetDesc(d3d11_blend_state, &d3d11_blend_desc); ok(d3d11_blend_desc.AlphaToCoverageEnable == blend_desc.AlphaToCoverageEnable, - "Got unexpected alpha to coverage %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); + "Got unexpected alpha to coverage enable %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); ok(d3d11_blend_desc.IndependentBlendEnable == TRUE, "Got unexpected independent blend enable %#x.\n", d3d11_blend_desc.IndependentBlendEnable); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)

1 0

Józef Kucia : d3d11: Break lines exceeding 120 characters.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 08fa2f0f73c923ecc8f6c4d98bc223ef009188b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08fa2f0f73c923ecc8f6c4d98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:11 2015 +0200 d3d11: Break lines exceeding 120 characters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 20027a7..8a3a2e8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1215,14 +1215,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); /* glEnableIndexedEXT(GL_BLEND, ...) */ FIXME("Per-rendertarget blend not implemented.\n"); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, + desc->RenderTarget[0].BlendEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->RenderTarget[0].SrcBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->RenderTarget[0].DestBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->RenderTarget[0].BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, desc->RenderTarget[0].BlendOpAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, + desc->RenderTarget[0].SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, + desc->RenderTarget[0].DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, + desc->RenderTarget[0].BlendOpAlpha); FIXME("Color mask > 3 not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask);

1 0