June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : advapi32: Move MD5 implementation to ntdll.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: d5249c0f6d4df715a4f273536264b61914015511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5249c0f6d4df715a4f27353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 14:51:40 2019 +0200 advapi32: Move MD5 implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 6 +- dlls/advapi32/crypt_md5.c | 279 -------------------------------------------- dlls/ntdll/crypt.c | 241 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 3 + 5 files changed, 247 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5249c0f6d4df715a4f2…

1 0

Jacek Caban : ntoskrnl.exe: Implement ExInitializePagedLookasideList.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: fac633495db6bba2301578ea401e6b695986d4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac633495db6bba2301578ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 24 16:25:13 2019 +0200 ntoskrnl.exe: Implement ExInitializePagedLookasideList. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++++++------------------ dlls/ntoskrnl.exe/tests/driver.c | 24 +++++++++++++++++ include/ddk/wdm.h | 11 +++++++- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 99b8599..be8a10a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2060,6 +2060,28 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( GetProcessHeap(), 0, ptr ); } +static void initialize_lookaside_list( GENERAL_LOOKASIDE *lookaside, PALLOCATE_FUNCTION allocate, PFREE_FUNCTION free, + ULONG type, SIZE_T size, ULONG tag ) +{ + + RtlInitializeSListHead( &lookaside->u.ListHead ); + lookaside->Depth = 4; + lookaside->MaximumDepth = 256; + lookaside->TotalAllocates = 0; + lookaside->u2.AllocateMisses = 0; + lookaside->TotalFrees = 0; + lookaside->u3.FreeMisses = 0; + lookaside->Type = type; + lookaside->Tag = tag; + lookaside->Size = size; + lookaside->u4.Allocate = allocate ? allocate : ExAllocatePoolWithTag; + lookaside->u5.Free = free ? free : ExFreePool; + lookaside->LastTotalAllocates = 0; + lookaside->u6.LastAllocateMisses = 0; + + /* FIXME: insert in global list of lookadside lists */ +} + /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ @@ -2072,37 +2094,22 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST lookaside, USHORT depth) { TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); - - RtlInitializeSListHead( &lookaside->L.u.ListHead ); - lookaside->L.Depth = 4; - lookaside->L.MaximumDepth = 256; - lookaside->L.TotalAllocates = 0; - lookaside->L.u2.AllocateMisses = 0; - lookaside->L.TotalFrees = 0; - lookaside->L.u3.FreeMisses = 0; - lookaside->L.Type = NonPagedPool | flags; - lookaside->L.Tag = tag; - lookaside->L.Size = size; - lookaside->L.u4.Allocate = allocate ? allocate : ExAllocatePoolWithTag; - lookaside->L.u5.Free = free ? free : ExFreePool; - lookaside->L.LastTotalAllocates = 0; - lookaside->L.u6.LastAllocateMisses = 0; - - /* FIXME: insert in global list of lookadside lists */ + initialize_lookaside_list( &lookaside->L, allocate, free, NonPagedPool | flags, size, tag ); } /*********************************************************************** * ExInitializePagedLookasideList (NTOSKRNL.EXE.@) */ -void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST Lookaside, - PALLOCATE_FUNCTION Allocate, - PFREE_FUNCTION Free, - ULONG Flags, - SIZE_T Size, - ULONG Tag, - USHORT Depth) +void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST lookaside, + PALLOCATE_FUNCTION allocate, + PFREE_FUNCTION free, + ULONG flags, + SIZE_T size, + ULONG tag, + USHORT depth) { - FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); + TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); + initialize_lookaside_list( &lookaside->L, allocate, free, PagedPool | flags, size, tag ); } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 48bee1d..41b1420 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -950,6 +950,7 @@ static void test_stack_callout(void) static void test_lookaside_list(void) { NPAGED_LOOKASIDE_LIST list; + PAGED_LOOKASIDE_LIST paged_list; ULONG tag = 0x454e4957; /* WINE */ ExInitializeNPagedLookasideList(&list, NULL, NULL, POOL_NX_ALLOCATION, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 0); @@ -974,6 +975,29 @@ static void test_lookaside_list(void) ok(list.L.MaximumDepth == 256, "Expected 256 got %u\n", list.L.MaximumDepth); ok(list.L.Type == NonPagedPool, "Expected NonPagedPool got %u\n", list.L.Type); ExDeleteNPagedLookasideList(&list); + + ExInitializePagedLookasideList(&paged_list, NULL, NULL, POOL_NX_ALLOCATION, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 0); + ok(paged_list.L.Depth == 4, "Expected 4 got %u\n", paged_list.L.Depth); + ok(paged_list.L.MaximumDepth == 256, "Expected 256 got %u\n", paged_list.L.MaximumDepth); + ok(paged_list.L.TotalAllocates == 0, "Expected 0 got %u\n", paged_list.L.TotalAllocates); + ok(paged_list.L.AllocateMisses == 0, "Expected 0 got %u\n", paged_list.L.AllocateMisses); + ok(paged_list.L.TotalFrees == 0, "Expected 0 got %u\n", paged_list.L.TotalFrees); + ok(paged_list.L.FreeMisses == 0, "Expected 0 got %u\n", paged_list.L.FreeMisses); + ok(paged_list.L.Type == (PagedPool|POOL_NX_ALLOCATION), + "Expected PagedPool|POOL_NX_ALLOCATION got %u\n", paged_list.L.Type); + ok(paged_list.L.Tag == tag, "Expected %x got %x\n", tag, paged_list.L.Tag); + ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, + "Expected %u got %u\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, paged_list.L.Size); + ok(paged_list.L.LastTotalAllocates == 0,"Expected 0 got %u\n", paged_list.L.LastTotalAllocates); + ok(paged_list.L.LastAllocateMisses == 0,"Expected 0 got %u\n", paged_list.L.LastAllocateMisses); + ExDeletePagedLookasideList(&paged_list); + + paged_list.L.Depth = 0; + ExInitializePagedLookasideList(&paged_list, NULL, NULL, 0, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 20); + ok(paged_list.L.Depth == 4, "Expected 4 got %u\n", paged_list.L.Depth); + ok(paged_list.L.MaximumDepth == 256, "Expected 256 got %u\n", paged_list.L.MaximumDepth); + ok(paged_list.L.Type == PagedPool, "Expected PagedPool got %u\n", paged_list.L.Type); + ExDeletePagedLookasideList(&paged_list); } static void test_version(void) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 64afea5..f79b36a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -211,7 +211,6 @@ typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _IO_WORKITEM *PIO_WORKITEM; -typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; typedef struct _ZONE_HEADER *PZONE_HEADER; @@ -1364,6 +1363,14 @@ typedef struct LOOKASIDE_ALIGN _NPAGED_LOOKASIDE_LIST #endif } NPAGED_LOOKASIDE_LIST, *PNPAGED_LOOKASIDE_LIST; +typedef struct LOOKASIDE_ALIGN _PAGED_LOOKASIDE_LIST +{ + GENERAL_LOOKASIDE L; +#if defined(__i386__) + FAST_MUTEX Lock__ObsoleteButDoNotDelete; +#endif +} PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST; + typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; @@ -1538,12 +1545,14 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); +void WINAPI ExDeletePagedLookasideList(PPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);

1 0

Alexandre Julliard : advapi32: Move SHA1 implementation to ntdll.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 45e0f91de1c2521f0f1b3669bce95f6de2df8b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e0f91de1c2521f0f1b3669… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 14:40:45 2019 +0200 advapi32: Move SHA1 implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 6 +++--- dlls/ntdll/Makefile.in | 1 + dlls/{advapi32/crypt_sha.c => ntdll/crypt.c} | 23 ++++++++++------------- dlls/ntdll/ntdll.spec | 3 +++ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 224286f..a55a317 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ crypt_lmhash.c \ crypt_md4.c \ crypt_md5.c \ - crypt_sha.c \ eventlog.c \ lsa.c \ perf.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1c92f62..c8d8d85 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -1,7 +1,7 @@ # 1000 stub ADVAPI32_1000 -@ stdcall A_SHAFinal(ptr ptr) -@ stdcall A_SHAInit(ptr) -@ stdcall A_SHAUpdate(ptr ptr long) +@ stdcall A_SHAFinal(ptr ptr) ntdll.A_SHAFinal +@ stdcall A_SHAInit(ptr) ntdll.A_SHAInit +@ stdcall A_SHAUpdate(ptr ptr long) ntdll.A_SHAUpdate @ stdcall AbortSystemShutdownA(ptr) @ stdcall AbortSystemShutdownW(ptr) @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index ed4bb94..1ad674e 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ atom.c \ cdrom.c \ critsection.c \ + crypt.c \ debugbuffer.c \ debugtools.c \ directory.c \ diff --git a/dlls/advapi32/crypt_sha.c b/dlls/ntdll/crypt.c similarity index 95% rename from dlls/advapi32/crypt_sha.c rename to dlls/ntdll/crypt.c index ffd59a7..2a1db55 100644 --- a/dlls/advapi32/crypt_sha.c +++ b/dlls/ntdll/crypt.c @@ -1,6 +1,5 @@ /* * Copyright 2004 Filip Navara - * Based on public domain SHA code by Steve Reid <steve(a)edmweb.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +19,10 @@ #include <stdarg.h> #include "windef.h" -/* SHA Context Structure Declaration */ +/* SHA1 algorithm + * + * Based on public domain SHA code by Steve Reid <steve(a)edmweb.com> + */ typedef struct { ULONG Unknown[6]; @@ -29,8 +31,6 @@ typedef struct { UCHAR Buffer[64]; } SHA_CTX, *PSHA_CTX; -/* SHA1 Helper Macros */ - #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) /* FIXME: This definition of DWORD2BE is little endian specific! */ #define DWORD2BE(x) (((x) >> 24) & 0xff) | (((x) >> 8) & 0xff00) | (((x) << 8) & 0xff0000) | (((x) << 24) & 0xff000000); @@ -98,7 +98,7 @@ static void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) /****************************************************************************** - * A_SHAInit [ADVAPI32.@] + * A_SHAInit (ntdll.@) * * Initialize a SHA context structure. * @@ -108,8 +108,7 @@ static void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) * RETURNS * Nothing */ -VOID WINAPI -A_SHAInit(PSHA_CTX Context) +void WINAPI A_SHAInit(PSHA_CTX Context) { /* SHA1 initialization constants */ Context->State[0] = 0x67452301; @@ -122,7 +121,7 @@ A_SHAInit(PSHA_CTX Context) } /****************************************************************************** - * A_SHAUpdate [ADVAPI32.@] + * A_SHAUpdate (ntdll.@) * * Update a SHA context with a hashed data from supplied buffer. * @@ -134,8 +133,7 @@ A_SHAInit(PSHA_CTX Context) * RETURNS * Nothing */ -VOID WINAPI -A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) +void WINAPI A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) { ULONG BufferContentSize; @@ -166,7 +164,7 @@ A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) } /****************************************************************************** - * A_SHAFinal [ADVAPI32.@] + * A_SHAFinal (ntdll.@) * * Finalize SHA context and return the resulting hash. * @@ -177,8 +175,7 @@ A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) * RETURNS * Nothing */ -VOID WINAPI -A_SHAFinal(PSHA_CTX Context, PULONG Result) +void WINAPI A_SHAFinal(PSHA_CTX Context, PULONG Result) { INT Pad, Index; UCHAR Buffer[72]; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5d3b0ca..a650646 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,9 @@ #if you change a Nt.. function DON'T FORGET to change the #Zw one too. +@ stdcall A_SHAFinal(ptr ptr) +@ stdcall A_SHAInit(ptr) +@ stdcall A_SHAUpdate(ptr ptr long) @ stdcall ApiSetQueryApiSetPresence(ptr ptr) @ stub CsrAllocateCaptureBuffer @ stub CsrAllocateCapturePointer

1 0

Zhiyi Zhang : user32: Avoid a possible race.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 87897429367ee4bb0f452a9d5b79b5f1b99409d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87897429367ee4bb0f452a9d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 24 15:16:29 2019 +0800 user32: Avoid a possible race. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3e457f0..4d644b9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -701,6 +701,21 @@ void release_display_dc( HDC hdc ) LeaveCriticalSection( &display_dc_section ); } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutexW ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -3871,6 +3886,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i WCHAR bufferW[1024]; LONG adapter_index; WCHAR *next_charW; + HANDLE mutex; DWORD size; DWORD type; HKEY hkey; @@ -3878,13 +3894,15 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + mutex = get_display_device_init_mutex(); + /* Find adapter */ if (!device) { sprintfW( key_nameW, VIDEO_VALUE_FMT, index ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceKey */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) @@ -3900,13 +3918,13 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(info->DeviceString); if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, info->DeviceString, &size )) - return FALSE; + goto done; /* StateFlags */ size = sizeof(info->StateFlags); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, &info->StateFlags, &size )) - return FALSE; + goto done; /* DeviceID */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) @@ -3918,7 +3936,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(bufferW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, bufferW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, @@ -3933,14 +3951,14 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i { /* Check adapter name */ if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) - return FALSE; + goto done; adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceName */ sprintfW( info->DeviceName, MONITOR_FMT, adapter_index, index ); @@ -3952,7 +3970,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(instanceW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_MONITOR, NULL ); if (!SetupDiOpenDeviceInfoW( set, instanceW, NULL, 0, &device_data )) @@ -4016,6 +4034,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i ret = TRUE; done: + release_display_device_init_mutex( mutex ); SetupDiDestroyDeviceInfoList( set ); if (ret) return ret;

1 0

Józef Kucia : dxgi: Forbid creating D3D12 swapchains on desktop window.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: dd202c11755e688d84d16913410059ff986e687c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd202c11755e688d84d16913… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 24 11:26:31 2019 +0200 dxgi: Forbid creating D3D12 swapchains on desktop window. 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/d3d12/tests/d3d12.c | 4 ++-- dlls/dxgi/swapchain.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index d23aba9..54eec6b 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1404,12 +1404,12 @@ static void test_desktop_window(void) swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; swapchain_desc.Flags = 0; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); swapchain_desc.Width = rect.right; swapchain_desc.Height = rect.bottom; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); IDXGIFactory4_Release(factory); destroy_test_context(&context); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9c..1bc59f4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2683,6 +2683,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkResult vr; HRESULT hr; + if (window == GetDesktopWindow()) + { + WARN("D3D12 swapchain cannot be created on desktop window.\n"); + return E_ACCESSDENIED; + } + swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1;

1 0

Alexandre Julliard : advapi32: Move more event log stubs to ntdll.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: f535bcb2e66153301f1927a9a323c1e989c49cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f535bcb2e66153301f1927a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 12:19:20 2019 +0200 advapi32: Move more event log stubs to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 18 ++++---- dlls/advapi32/eventlog.c | 94 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 32 +++++++------- dlls/ntdll/misc.c | 91 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 9 ++++ tools/make_specfiles | 1 - 6 files changed, 125 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f535bcb2e66153301f19…

1 0

Zhiyi Zhang : user32: Move EnumDisplayDevicesA/W to sysparams.c.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: db839e0f1ae770a75f8014d6f49955aa7bac498e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db839e0f1ae770a75f8014d6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 24 15:16:03 2019 +0800 user32: Move EnumDisplayDevicesA/W to sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 313 ------------------------------------------------ dlls/user32/sysparams.c | 298 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db839e0f1ae770a75f80…

1 0

Józef Kucia : d3d12/tests: Add test for creating swapchain on desktop window.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 29bc8075ccd81358492c402d36d62a6b1c8044ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=29bc8075ccd81358492c402d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 24 11:26:30 2019 +0200 d3d12/tests: Add test for creating swapchain on desktop window. 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/d3d12/tests/d3d12.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index ae750af..d23aba9 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -308,6 +308,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line, struct test_context_desc { + BOOL no_render_target; BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; @@ -436,6 +437,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); } + if (desc && desc->no_render_target) + return TRUE; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; @@ -1011,6 +1015,7 @@ static void test_swapchain_draw(void) {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1088,6 +1093,7 @@ static void test_swapchain_refcount(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1165,6 +1171,7 @@ static void test_swapchain_size_mismatch(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1287,6 +1294,7 @@ static void test_swapchain_backbuffer_index(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1357,6 +1365,56 @@ static void test_swapchain_backbuffer_index(void) destroy_test_context(&context); } +static void test_desktop_window(void) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain1 *swapchain; + IDXGIFactory4 *factory; + IUnknown *queue; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = TRUE; + if (!init_test_context(&context, NULL)) + return; + queue = (IUnknown *)context.queue; + + window = GetDesktopWindow(); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + swapchain_desc.Width = rect.right; + swapchain_desc.Height = rect.bottom; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1391,4 +1449,5 @@ START_TEST(d3d12) test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); + test_desktop_window(); }

1 0

Jeff Smith : d3drm: CreateViewport checks for non-NULL viewport pointer first.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 5ebd6117b2fa478252d9aab0e16f434afdacce66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebd6117b2fa478252d9aab0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Jun 21 12:23:49 2019 -0500 d3drm: CreateViewport checks for non-NULL viewport pointer first. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ef5830..0b3af02 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -568,10 +568,12 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1090,10 +1092,12 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1761,10 +1765,12 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6fe7dfa..a7cd594 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1863,42 +1863,72 @@ static void test_Viewport(void) ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); /* Test all failures together */ + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);

1 0

Paul Gofman : ddraw: Factor out fixup_texture_alpha_op() function.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 3b29fc0a87bbd33628ccbe8fe958eb64fab6a3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b29fc0a87bbd33628ccbe8f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jun 22 19:56:25 2019 +0300 ddraw: Factor out fixup_texture_alpha_op() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 78 +++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 48 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdf4de8..284daa3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2662,6 +2662,33 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i return hr; } +static void fixup_texture_alpha_op(struct d3d_device *device) +{ + /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. + See d3d_device3_SetRenderState() for details. */ + struct wined3d_texture *tex; + BOOL tex_alpha = FALSE; + DDPIXELFORMAT ddfmt; + + if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) + return; + + if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + { + struct wined3d_resource_desc desc; + + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; + } + + /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ + wined3d_device_set_texture_stage_state(device->wined3d_device, + 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); +} + static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -2732,32 +2759,14 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } device->legacyTextureBlending = TRUE; + device->texture_map_blend = value; switch (value) { case D3DTBLEND_MODULATE: { - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; + fixup_texture_alpha_op(device); - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); wined3d_device_set_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); wined3d_device_set_texture_stage_state(device->wined3d_device, @@ -2827,7 +2836,6 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, default: FIXME("Unhandled texture environment %#x.\n", value); } - device->texture_map_blend = value; hr = D3D_OK; break; } @@ -4830,33 +4838,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); - if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE) - { - /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. - See d3d_device3_SetRenderState() for details. */ - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - } + fixup_texture_alpha_op(device); wined3d_mutex_unlock();

1 0