October 2015 - Wine-commits

Austin English : kernel32: Add a stub for GetCurrentProcessorNumberEx.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 132ff59b3ecb80d9e1c18616861ec4cc098bae53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132ff59b3ecb80d9e1c186168… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 11 11:50:53 2015 -0500 kernel32: Add a stub for GetCurrentProcessorNumberEx. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 11 +++++++++++ include/winternl.h | 1 + 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 9fb1941..84f43d8 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -12,7 +12,7 @@ @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber -@ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId @ stub GetCurrentThreadStackLimits diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 830578f..6430c63 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -12,7 +12,7 @@ @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber -@ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId @ stub GetCurrentThreadStackLimits diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bda7c9d..e0cb154 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -632,7 +632,7 @@ @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber -# @ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() # @ stub -arch=x86_64 GetCurrentUmsThread diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7f07b14..40d3df5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -627,6 +627,7 @@ @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() +@ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetElementGenericTable diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d20a098..8eb3e9f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1584,3 +1584,14 @@ BOOL WINAPI RtlSetCurrentTransaction(HANDLE new_transaction) FIXME("(%p) :stub\n", new_transaction); return FALSE; } + +/********************************************************************** + * RtlGetCurrentProcessorNumberEx [NTDLL.@] + */ +void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) +{ + FIXME("(%p) :semi-stub\n", processor); + processor->Group = 0; + processor->Number = NtGetCurrentProcessorNumber(); + processor->Reserved = 0; +} diff --git a/include/winternl.h b/include/winternl.h index e76114e..61b144a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2143,6 +2143,7 @@ NTSYSAPI NTSTATUS WINAPI NtFlushWriteBuffer(VOID); NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); +NTSYSAPI ULONG WINAPI NtGetCurrentProcessorNumber(void); NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); NTSYSAPI ULONG WINAPI NtGetTickCount(VOID); NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*);

1 0

Austin English : fltmgr.sys: Add a stub driver.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: fba70e71d6b798991d07661c284f95608a5e448f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba70e71d6b798991d07661c2… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 11 12:05:07 2015 -0500 fltmgr.sys: Add a stub driver. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/fltmgr.sys/Makefile.in | 5 ++ dlls/fltmgr.sys/fltmgr.sys.spec | 163 ++++++++++++++++++++++++++++++++++++++++ dlls/fltmgr.sys/main.c | 38 ++++++++++ loader/wine.inf.in | 2 + 6 files changed, 211 insertions(+) diff --git a/configure b/configure index 872db31..80cc812 100755 --- a/configure +++ b/configure @@ -1085,6 +1085,7 @@ enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib +enable_fltmgr_sys enable_fntcache enable_fontsub enable_fusion @@ -17490,6 +17491,7 @@ wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib +wine_fn_config_dll fltmgr.sys enable_fltmgr_sys wine_fn_config_dll fntcache enable_fntcache wine_fn_config_dll fontsub enable_fontsub wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index e22b0ef..de8cde5 100644 --- a/configure.ac +++ b/configure.ac @@ -3002,6 +3002,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) +WINE_CONFIG_DLL(fltmgr.sys) WINE_CONFIG_DLL(fntcache) WINE_CONFIG_DLL(fontsub) WINE_CONFIG_DLL(fusion) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in new file mode 100644 index 0000000..3fefde7 --- /dev/null +++ b/dlls/fltmgr.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fltmgr.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec new file mode 100644 index 0000000..5310269 --- /dev/null +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -0,0 +1,163 @@ +@ stub FltAcquirePushLockExclusive +@ stub FltAcquirePushLockShared +@ stub FltAcquireResourceExclusive +@ stub FltAcquireResourceShared +@ stub FltAllocateCallbackData +@ stub FltAllocateContext +@ stub FltAllocateDeferredIoWorkItem +@ stub FltAllocateFileLock +@ stub FltAllocateGenericWorkItem +@ stub FltAllocatePoolAlignedWithTag +@ stub FltAttachVolume +@ stub FltAttachVolumeAtAltitude +@ stub FltBuildDefaultSecurityDescriptor +@ stub FltCancelFileOpen +@ stub FltCancelIo +@ stub FltCbdqDisable +@ stub FltCbdqEnable +@ stub FltCbdqInitialize +@ stub FltCbdqInsertIo +@ stub FltCbdqRemoveIo +@ stub FltCbdqRemoveNextIo +@ stub FltCheckAndGrowNameControl +@ stub FltCheckLockForReadAccess +@ stub FltCheckLockForWriteAccess +@ stub FltCheckOplock +@ stub FltClearCallbackDataDirty +@ stub FltClearCancelCompletion +@ stub FltClose +@ stub FltCloseClientPort +@ stub FltCloseCommunicationPort +@ stub FltCompareInstanceAltitudes +@ stub FltCompletePendedPostOperation +@ stub FltCompletePendedPreOperation +@ stub FltCreateCommunicationPort +@ stub FltCreateFile +@ stub FltCreateFileEx +@ stub FltCreateSystemVolumeInformationFolder +@ stub FltCurrentBatchOplock +@ stub FltDecodeParameters +@ stub FltDeleteContext +@ stub FltDeleteFileContext +@ stub FltDeleteInstanceContext +@ stub FltDeletePushLock +@ stub FltDeleteStreamContext +@ stub FltDeleteStreamHandleContext +@ stub FltDeleteVolumeContext +@ stub FltDetachVolume +@ stub FltDeviceIoControlFile +@ stub FltDoCompletionProcessingWhenSafe +@ stub FltEnumerateFilterInformation +@ stub FltEnumerateFilters +@ stub FltEnumerateInstanceInformationByFilter +@ stub FltEnumerateInstanceInformationByVolume +@ stub FltEnumerateInstances +@ stub FltEnumerateVolumeInformation +@ stub FltEnumerateVolumes +@ stub FltFlushBuffers +@ stub FltFreeCallbackData +@ stub FltFreeDeferredIoWorkItem +@ stub FltFreeFileLock +@ stub FltFreeGenericWorkItem +@ stub FltFreePoolAlignedWithTag +@ stub FltFreeSecurityDescriptor +@ stub FltFsControlFile +@ stub FltGetBottomInstance +@ stub FltGetContexts +@ stub FltGetDestinationFileNameInformation +@ stub FltGetDeviceObject +@ stub FltGetDiskDeviceObject +@ stub FltGetFileContext +@ stub FltGetFileNameInformation +@ stub FltGetFileNameInformationUnsafe +@ stub FltGetFilterFromInstance +@ stub FltGetFilterFromName +@ stub FltGetFilterInformation +@ stub FltGetInstanceContext +@ stub FltGetInstanceInformation +@ stub FltGetIrpName +@ stub FltGetLowerInstance +@ stub FltGetRequestorProcess +@ stub FltGetRequestorProcessId +@ stub FltGetRoutineAddress +@ stub FltGetStreamContext +@ stub FltGetStreamHandleContext +@ stub FltGetSwappedBufferMdlAddress +@ stub FltGetTopInstance +@ stub FltGetTunneledName +@ stub FltGetUpperInstance +@ stub FltGetVolumeContext +@ stub FltGetVolumeFromDeviceObject +@ stub FltGetVolumeFromFileObject +@ stub FltGetVolumeFromInstance +@ stub FltGetVolumeFromName +@ stub FltGetVolumeGuidName +@ stub FltGetVolumeInstanceFromName +@ stub FltGetVolumeName +@ stub FltGetVolumeProperties +@ stub FltInitializeFileLock +@ stub FltInitializeOplock +@ stub FltInitializePushLock +@ stub FltIs32bitProcess +@ stub FltIsCallbackDataDirty +@ stub FltIsDirectory +@ stub FltIsIoCanceled +@ stub FltIsOperationSynchronous +@ stub FltIsVolumeWritable +@ stub FltLoadFilter +@ stub FltLockUserBuffer +@ stub FltNotifyFilterChangeDirectory +@ stub FltObjectDereference +@ stub FltObjectReference +@ stub FltOpenVolume +@ stub FltOplockFsctrl +@ stub FltOplockIsFastIoPossible +@ stub FltParseFileName +@ stub FltParseFileNameInformation +@ stub FltPerformAsynchronousIo +@ stub FltPerformSynchronousIo +@ stub FltProcessFileLock +@ stub FltPurgeFileNameInformationCache +@ stub FltQueryEaFile +@ stub FltQueryInformationFile +@ stub FltQuerySecurityObject +@ stub FltQueryVolumeInformation +@ stub FltQueryVolumeInformationFile +@ stub FltQueueDeferredIoWorkItem +@ stub FltQueueGenericWorkItem +@ stub FltReadFile +@ stub FltReferenceContext +@ stub FltReferenceFileNameInformation +@ stub FltRegisterFilter +@ stub FltReissueSynchronousIo +@ stub FltReleaseContext +@ stub FltReleaseContexts +@ stub FltReleaseFileNameInformation +@ stub FltReleasePushLock +@ stub FltReleaseResource +@ stub FltRequestOperationStatusCallback +@ stub FltRetainSwappedBufferMdlAddress +@ stub FltReuseCallbackData +@ stub FltSendMessage +@ stub FltSetCallbackDataDirty +@ stub FltSetCancelCompletion +@ stub FltSetEaFile +@ stub FltSetFileContext +@ stub FltSetInformationFile +@ stub FltSetInstanceContext +@ stub FltSetSecurityObject +@ stub FltSetStreamContext +@ stub FltSetStreamHandleContext +@ stub FltSetVolumeContext +@ stub FltSetVolumeInformation +@ stub FltStartFiltering +@ stub FltSupportsFileContexts +@ stub FltSupportsStreamContexts +@ stub FltSupportsStreamHandleContexts +@ stub FltTagFile +@ stub FltUninitializeFileLock +@ stub FltUninitializeOplock +@ stub FltUnloadFilter +@ stub FltUnregisterFilter +@ stub FltUntagFile +@ stub FltWriteFile diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c new file mode 100644 index 0000000..7341ef2 --- /dev/null +++ b/dlls/fltmgr.sys/main.c @@ -0,0 +1,38 @@ +/* + * fltmgr.sys + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fltmgr); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f30942a..3e512d6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2499,6 +2499,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- +12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- ; skip .NET fake dlls in Wine Mono package @@ -2537,6 +2538,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +12,,fltmgr.sys 12,,mountmgr.sys 12,,ndis.sys ; skip .NET fake dlls in Wine Mono package

1 0

Dmitry Timoshkov : ntdll: Implement RtlValidRelativeSecurityDescriptor.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: af6610844669df27b10ef2611a1ef712f349ac7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6610844669df27b10ef2611… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 12 11:21:30 2015 +0800 ntdll: Implement RtlValidRelativeSecurityDescriptor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 40d3df5..38422ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -939,7 +939,7 @@ @ stub RtlUsageHeap @ cdecl -i386 -norelay RtlUshortByteSwap() NTDLL_RtlUshortByteSwap @ stdcall RtlValidAcl(ptr) -# @ stub RtlValidRelativeSecurityDescriptor +@ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @ stdcall RtlValidateHeap(long long ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 360a579..125c86e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -558,6 +558,16 @@ NTSTATUS WINAPI RtlValidSecurityDescriptor( } /************************************************************************** + * RtlValidRelativeSecurityDescriptor [NTDLL.@] + */ +BOOLEAN WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR descriptor, + ULONG length, SECURITY_INFORMATION info) +{ + FIXME("%p,%u,%d: semi-stub\n", descriptor, length, info); + return RtlValidSecurityDescriptor(descriptor) == STATUS_SUCCESS; +} + +/************************************************************************** * RtlLengthSecurityDescriptor [NTDLL.@] */ ULONG WINAPI RtlLengthSecurityDescriptor( diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 58ad879..1957a9a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1191,7 +1191,7 @@ @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) ntdll.RtlUpcaseUnicodeToOemN @ stdcall RtlUpperChar(long) ntdll.RtlUpperChar @ stdcall RtlUpperString(ptr ptr) ntdll.RtlUpperString -@ stub RtlValidRelativeSecurityDescriptor +@ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) ntdll.RtlValidRelativeSecurityDescriptor @ stdcall RtlValidSecurityDescriptor(ptr) ntdll.RtlValidSecurityDescriptor @ stdcall RtlValidSid(ptr) ntdll.RtlValidSid @ stdcall RtlVerifyVersionInfo(ptr long int64) ntdll.RtlVerifyVersionInfo diff --git a/include/winternl.h b/include/winternl.h index 61b144a..5420391 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2603,6 +2603,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUpdateTimer(HANDLE, HANDLE, DWORD, DWORD); NTSYSAPI CHAR WINAPI RtlUpperChar(CHAR); NTSYSAPI void WINAPI RtlUpperString(STRING *,const STRING *); NTSYSAPI NTSTATUS WINAPI RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR); +NTSYSAPI BOOLEAN WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR,ULONG,SECURITY_INFORMATION); NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID);

1 0

Jactry Zeng : user32/tests: Add tests for FlashWindow.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: d2d114190ce64fc68322a1bbb6d2124f8de45353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d114190ce64fc68322a1bbb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 7 11:51:10 2015 +0800 user32/tests: Add tests for FlashWindow. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 10aa545..96136c1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -57,6 +57,7 @@ static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); +static BOOL (WINAPI *pFlashWindow)( HWND hwnd, BOOL bInvert ); static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); @@ -7068,6 +7069,33 @@ static void test_rtl_layout(void) DestroyWindow( parent ); } +static void test_FlashWindow(void) +{ + HWND hwnd; + BOOL ret; + if (!pFlashWindow) + { + win_skip( "FlashWindow not supported\n" ); + return; + } + + hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP, + 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( NULL, TRUE ); + todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); + + DestroyWindow( hwnd ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( hwnd, TRUE ); + todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); +} + static void test_FlashWindowEx(void) { HWND hwnd; @@ -8177,6 +8205,7 @@ START_TEST(win) pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); pGetProcessDefaultLayout = (void *)GetProcAddress( user32, "GetProcessDefaultLayout" ); pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); + pFlashWindow = (void *)GetProcAddress( user32, "FlashWindow" ); pFlashWindowEx = (void *)GetProcAddress( user32, "FlashWindowEx" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); @@ -8240,6 +8269,7 @@ START_TEST(win) test_capture_3(hwndMain, hwndMain2); test_capture_4(); test_rtl_layout(); + test_FlashWindow(); test_FlashWindowEx(); test_CreateWindow();

1 0

Jactry Zeng : user32: Implement semi-stub for FlashWindowEx.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: f22760d2102cee7752720d43f72b5e8fad1c0547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22760d2102cee7752720d43f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 7 11:51:30 2015 +0800 user32: Implement semi-stub for FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 19 ++++++++-------- dlls/user32/win.c | 58 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96136c1..34366a7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7085,14 +7085,14 @@ static void test_FlashWindow(void) SetLastError( 0xdeadbeef ); ret = pFlashWindow( NULL, TRUE ); - todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindow returned with %d\n", GetLastError() ); DestroyWindow( hwnd ); SetLastError( 0xdeadbeef ); ret = pFlashWindow( hwnd, TRUE ); - todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindow returned with %d\n", GetLastError() ); } @@ -7119,13 +7119,13 @@ static void test_FlashWindowEx(void) finfo.hwnd = NULL; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "FlashWindowEx returned with %d\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindowEx returned with %d\n", GetLastError()); finfo.hwnd = hwnd; SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7135,13 +7135,13 @@ static void test_FlashWindowEx(void) finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO) + 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO); @@ -7149,7 +7149,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx returned with %d\n", GetLastError()); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); @@ -7165,7 +7165,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7180,7 +7180,6 @@ static void test_FlashWindowEx(void) finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); -todo_wine ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e3650f5..fb320c7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3413,17 +3413,45 @@ BOOL WINAPI AnyPopup(void) */ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) { + FLASHWINFO finfo; + + finfo.cbSize = sizeof(FLASHWINFO); + finfo.dwFlags = bInvert ? FLASHW_ALL : FLASHW_STOP; + finfo.uCount = 1; + finfo.dwTimeout = 0; + finfo.hwnd = hWnd; + return FlashWindowEx( &finfo ); +} + +/******************************************************************* + * FlashWindowEx (USER32.@) + */ +BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) +{ WND *wndPtr; - TRACE("%p\n", hWnd); + TRACE( "%p\n", pfinfo->hwnd ); + + if (!pfinfo) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + + if (!pfinfo->hwnd || pfinfo->cbSize != sizeof(FLASHWINFO) || !IsWindow( pfinfo->hwnd )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + FIXME( "%p - semi-stub\n", pfinfo ); - if (IsIconic( hWnd )) + if (IsIconic( pfinfo->hwnd )) { - RedrawWindow( hWnd, 0, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_FRAME ); + RedrawWindow( pfinfo->hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_FRAME ); - wndPtr = WIN_GetPtr(hWnd); + wndPtr = WIN_GetPtr( pfinfo->hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - if (bInvert && !(wndPtr->flags & WIN_NCACTIVATED)) + if (pfinfo->dwFlags && !(wndPtr->flags & WIN_NCACTIVATED)) { wndPtr->flags |= WIN_NCACTIVATED; } @@ -3437,30 +3465,22 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) else { WPARAM wparam; + HWND hwnd = pfinfo->hwnd; - wndPtr = WIN_GetPtr(hWnd); + wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - hWnd = wndPtr->obj.handle; /* make it a full handle */ + hwnd = wndPtr->obj.handle; /* make it a full handle */ - if (bInvert) wparam = !(wndPtr->flags & WIN_NCACTIVATED); - else wparam = (hWnd == GetForegroundWindow()); + if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED); + else wparam = (hwnd == GetForegroundWindow()); WIN_ReleasePtr( wndPtr ); - SendMessageW( hWnd, WM_NCACTIVATE, wparam, 0 ); + SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); return wparam; } } /******************************************************************* - * FlashWindowEx (USER32.@) - */ -BOOL WINAPI FlashWindowEx( PFLASHWINFO pfwi ) -{ - FIXME("%p\n", pfwi); - return TRUE; -} - -/******************************************************************* * GetWindowContextHelpId (USER32.@) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd )

1 0

Matteo Bruni : d3d9/tests: Test uninitialized texture varyings with transformed vertices.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 171352b90147bfd8b7c1c6c7f3eaff482830f0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171352b90147bfd8b7c1c6c7f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:40 2015 +0200 d3d9/tests: Test uninitialized texture varyings with transformed vertices. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 49f3ad4..a8329e2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7020,6 +7020,20 @@ static void pretransformed_varying_test(void) 0x0000ffff /* end */ }; /* sample: fails */ + static const DWORD texcoord1_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1, v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD texcoord1_alpha_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1, v0 */ + 0x02000001, 0x800f0800, 0x90ff0000, /* mov oC0, v0.w */ + 0x0000ffff /* end */ + }; static const struct { @@ -7027,19 +7041,22 @@ static void pretransformed_varying_test(void) const DWORD *shader_code; DWORD color; BOOL todo; + BOOL broken_warp; } tests[] = { - {"blendweight", blendweight_code, 0x00191919, TRUE }, - {"blendindices", blendindices_code, 0x00333333, TRUE }, - {"normal", normal_code, 0x004c4c4c, TRUE }, - {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, - {"tangent", tangent_code, 0x00999999, TRUE }, - {"binormal", binormal_code, 0x00b2b2b2, TRUE }, - {"color", color_code, 0x00e6e6e6, FALSE}, - {"fog", fog_code, 0x00666666, TRUE }, - {"depth", depth_code, 0x00cccccc, TRUE }, - {"specular", specular_code, 0x004488ff, FALSE}, + {"blendweight", blendweight_code, 0x00191919, TRUE }, + {"blendindices", blendindices_code, 0x00333333, TRUE }, + {"normal", normal_code, 0x004c4c4c, TRUE }, + {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, + {"tangent", tangent_code, 0x00999999, TRUE }, + {"binormal", binormal_code, 0x00b2b2b2, TRUE }, + {"color", color_code, 0x00e6e6e6, FALSE}, + {"fog", fog_code, 0x00666666, TRUE }, + {"depth", depth_code, 0x00cccccc, TRUE }, + {"specular", specular_code, 0x004488ff, FALSE}, + {"texcoord1", texcoord1_code, 0x00000000, FALSE}, + {"texcoord1 alpha", texcoord1_alpha_code, 0x00000000, FALSE, TRUE}, }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -7126,6 +7143,7 @@ static void pretransformed_varying_test(void) 0x224488ff, /* Nothing special */ }, }; + D3DADAPTER_IDENTIFIER9 identifier; IDirect3DVertexDeclaration9 *decl; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -7135,6 +7153,7 @@ static void pretransformed_varying_test(void) DWORD color; HWND window; HRESULT hr; + BOOL warp; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -7155,6 +7174,10 @@ static void pretransformed_varying_test(void) goto done; } + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); @@ -7190,7 +7213,7 @@ static void pretransformed_varying_test(void) "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", tests[i].name, color, tests[i].color); else - ok(color_match(color, tests[i].color, 1), + ok(color_match(color, tests[i].color, 1) || broken(warp && tests[i].broken_warp), "Test %s returned color 0x%08x, expected 0x%08x.\n", tests[i].name, color, tests[i].color);

1 0

Matteo Bruni : d3d9/tests: Add helpers to avoid multiple readbacks of the render target surface.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: b8225d0a6a8aaf9ede81bbbaa747f9f4c9dfcbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8225d0a6a8aaf9ede81bbbaa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:41 2015 +0200 d3d9/tests: Add helpers to avoid multiple readbacks of the render target surface. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 95 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 32 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a8329e2..50149e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -117,59 +117,90 @@ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y return color; } -static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) +struct surface_readback { - DWORD ret; - IDirect3DSurface9 *surf = NULL, *target = NULL; + IDirect3DSurface9 *surface; + D3DLOCKED_RECT locked_rect; +}; + +static void get_rt_readback(IDirect3DSurface9 *surface, struct surface_readback *rb) +{ + IDirect3DDevice9 *device; HRESULT hr; - D3DLOCKED_RECT lockedRect; - RECT rectToLock = {x, y, x+1, y+1}; + memset(rb, 0, sizeof(*rb)); + IDirect3DSurface9_GetDevice(surface, &device); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); - if (FAILED(hr) || !surf) + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + if (FAILED(hr) || !rb->surface) { - trace("Can't create an offscreen plain surface to read the render target data, hr=%08x\n", hr); - return 0xdeadbeef; + trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); + goto error; } - hr = IDirect3DDevice9_GetRenderTarget(device, 0, &target); - if(FAILED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, rb->surface); + if (FAILED(hr)) { - trace("Can't get the render target, hr=%08x\n", hr); - ret = 0xdeadbeed; - goto out; + trace("Can't read the render target data, hr %#x.\n", hr); + goto error; } - hr = IDirect3DDevice9_GetRenderTargetData(device, target, surf); + hr = IDirect3DSurface9_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); if (FAILED(hr)) { - trace("Can't read the render target data, hr=%08x\n", hr); - ret = 0xdeadbeec; - goto out; + trace("Can't lock the offscreen surface, hr %#x.\n", hr); + goto error; } + IDirect3DDevice9_Release(device); + + return; + +error: + if (rb->surface) + IDirect3DSurface9_Release(rb->surface); + rb->surface = NULL; + IDirect3DDevice9_Release(device); +} + +static DWORD get_readback_color(struct surface_readback *rb, unsigned int x, unsigned int y) +{ + return rb->locked_rect.pBits + ? ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x] : 0xdeadbeef; +} + +static void release_surface_readback(struct surface_readback *rb) +{ + HRESULT hr; + + if (!rb->surface) + return; + if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface9_UnlockRect(rb->surface))) + trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + IDirect3DSurface9_Release(rb->surface); +} + +static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) +{ + DWORD ret; + IDirect3DSurface9 *rt; + struct surface_readback rb; + HRESULT hr; - hr = IDirect3DSurface9_LockRect(surf, &lockedRect, &rectToLock, D3DLOCK_READONLY); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); if(FAILED(hr)) { - trace("Can't lock the offscreen surface, hr=%08x\n", hr); - ret = 0xdeadbeeb; - goto out; + trace("Can't get the render target, hr %#x.\n", hr); + return 0xdeadbeed; } + get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't * really important for these tests */ - ret = ((DWORD *) lockedRect.pBits)[0] & 0x00ffffff; - hr = IDirect3DSurface9_UnlockRect(surf); - if(FAILED(hr)) - { - trace("Can't unlock the offscreen surface, hr=%08x\n", hr); - } + ret = get_readback_color(&rb, x, y) & 0x00ffffff; + release_surface_readback(&rb); -out: - if(target) IDirect3DSurface9_Release(target); - if(surf) IDirect3DSurface9_Release(surf); + IDirect3DSurface9_Release(rt); return ret; } @@ -19633,7 +19664,7 @@ static void test_updatetexture(void) color = getPixelColor(device, 320, 240); ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) - || broken(color == 0xdeadbeec), /* WARP device often just breaks down. */ + || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Matteo Bruni : d3d9/tests: Use the new readback helpers in test_pointsize( ).
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 742d4df55bbd9db555a41fdbfe7a71a556856f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742d4df55bbd9db555a41fdbf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:42 2015 +0200 d3d9/tests: Use the new readback helpers in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 50149e0..57d110a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10195,7 +10195,7 @@ static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) return TRUE; } -static void pointsize_test(void) +static void test_pointsize(void) { static const float a = 1.0f, b = 1.0f, c = 1.0f; float ptsize, ptsizemax_orig, ptsizemin_orig; @@ -10718,35 +10718,40 @@ static void pointsize_test(void) } else { + struct surface_readback rb; + + get_rt_readback(backbuffer, &rb); /* On AMD apparently only the first texcoord is modified by the point coordinates * when using SM2/3 pixel shaders. */ - color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x00ffff00, 0) || (allow_broken && broken(color_match(color, 0x00ff0000, 0))), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x00000000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x0000ff00, 0) || (allow_broken && broken(color_match(color, 0x00000000, 0))), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); + + release_surface_readback(&rb); } } IDirect3DDevice9_SetVertexShader(device, NULL); @@ -20008,7 +20013,7 @@ START_TEST(visual) fixed_function_decl_test(); conditional_np2_repeat_test(); fixed_function_bumpmap_test(); - pointsize_test(); + test_pointsize(); tssargtemp_test(); np2_stretch_rect_test(); yuv_color_test();

1 0

Matteo Bruni : maintainers: Update Direct3D-related sections.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 2f375f31630550a32779a0f98ccf88c1c982028a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f375f31630550a32779a0f98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:44 2015 +0200 maintainers: Update Direct3D-related sections. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 20e6e1f..d7e678f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,9 +60,25 @@ M: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> -F: dlls/d3d*/ +F: dlls/d3d10*/ +F: dlls/d3d11/ +F: dlls/d3d8/ +F: dlls/d3d9/ +F: dlls/d3drm/ +F: dlls/ddraw*/ +F: dlls/dxgi/ F: dlls/wined3d/ +Direct3D helper libraries +M: Matteo Bruni <mbruni(a)codeweavers.com> +P: Henri Verbeet <hverbeet(a)codeweavers.com> +P: Stefan Dösinger <stefan(a)codeweavers.com> +P: Józef Kucia <jkucia(a)codeweavers.com> +F: dlls/d3dcompiler*/ +F: dlls/d3dx10*/ +F: dlls/d3dx11*/ +F: dlls/d3dx9*/ + DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/

1 0

Riccardo Bortolato : d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 9c00f968d61f772d6b772f2122dc23ecaaaf2e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c00f968d61f772d6b772f212… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:07 2015 +0200 d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect. Pass wined3d_texture and sub_resource idx to device_parent_surface_created callback. Store wined3d_texture and sub_resource in d3d8_surface. Also updated d3d9, d3d11, ddraw callbacks accordingly. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/surface.c | 11 +++++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- include/wine/wined3d.h | 3 ++- 8 files changed, 29 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c00f968d61f772d6b772…

1 0