August 2021 - Wine-commits - list.winehq.org

Alex Henrie : rasapi32: Add RasSetCredentialsA/W stubs.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 84d85a3d72a12f9f845fa28544999788741cdb06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d85a3d72a12f9f845fa285… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 3 23:40:55 2021 -0600 rasapi32: Add RasSetCredentialsA/W stubs. Based on a patch by Oleg Dubinskiy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49726 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 12 ++++++++++++ dlls/rasapi32/rasapi32.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133..f70f73caa2c 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -496,6 +496,18 @@ DWORD WINAPI RasRenameEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszOldEntry, LPCWST return 0; } +DWORD WINAPI RasSetCredentialsA(const char *phonebook, const char *entry, RASCREDENTIALSA *credentials, BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), credentials, clear); + return ERROR_UNKNOWN; +} + +DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASCREDENTIALSW *credentials, BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), credentials, clear); + return ERROR_UNKNOWN; +} + DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 90ebcbce072..783da6be102 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -126,8 +126,8 @@ @ stdcall RasSetAutodialEnableW(long long) @ stdcall RasSetAutodialParamA(long ptr long) @ stdcall RasSetAutodialParamW(long ptr long) -@ stub RasSetCredentialsA -@ stub RasSetCredentialsW +@ stdcall RasSetCredentialsA(str str ptr long) +@ stdcall RasSetCredentialsW(wstr wstr ptr long) @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) # @ stub RasSetEapUserDataA

1 0

Biswapriyo Nath : include: Add some type aliases in dsound.h.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 811e4129c1a05c9df84e01ba251f6b5b515f38a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=811e4129c1a05c9df84e01ba… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 4 14:19:17 2021 +0530 include: Add some type aliases in dsound.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index bfb52a297a5..f2a0a85c70b 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -81,12 +81,17 @@ typedef struct IDirectSoundBuffer8 *LPDIRECTSOUNDBUFFER8,**LPLPDIRECTSOUNDBUFFER DEFINE_GUID(IID_IDirectSoundNotify, 0xB0210783,0x89cd,0x11d0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16); typedef struct IDirectSoundNotify *LPDIRECTSOUNDNOTIFY,**LPLPDIRECTSOUNDNOTIFY; #define IID_IDirectSoundNotify8 IID_IDirectSoundNotify +typedef struct IDirectSoundNotify IDirectSoundNotify8,*LPDIRECTSOUNDNOTIFY8; DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60); typedef struct IDirectSound3DListener *LPDIRECTSOUND3DLISTENER,**LPLPDIRECTSOUND3DLISTENER; +#define IID_IDirectSound3DListener8 IID_IDirectSound3DListener +typedef struct IDirectSound3DListener IDirectSound3DListener8,*LPDIRECTSOUND3DLISTENER8; DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60); typedef struct IDirectSound3DBuffer *LPDIRECTSOUND3DBUFFER,**LPLPDIRECTSOUND3DBUFFER; +#define IID_IDirectSound3DBuffer8 IID_IDirectSound3DBuffer +typedef struct IDirectSound3DBuffer IDirectSound3DBuffer8,*LPDIRECTSOUND3DBUFFER8; DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16); typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE,**LPLPDIRECTSOUNDCAPTURE; @@ -102,6 +107,7 @@ typedef struct IDirectSoundCaptureBuffer8 *LPDIRECTSOUNDCAPTUREBUFFER8,**LPLPDIR DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xEDCB4C7A,0xDAAB,0x4216,0xA4,0x2E,0x6C,0x50,0x59,0x6D,0xDC,0x1D); typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX,**LPLPDIRECTSOUNDFULLDUPLEX; #define IID_IDirectSoundFullDuplex8 IID_IDirectSoundFullDuplex +typedef struct IDirectSoundFullDuplex IDirectSoundFullDuplex8,*LPDIRECTSOUNDFULLDUPLEX8; DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4); typedef struct IDirectSoundFXI3DL2Reverb *LPDIRECTSOUNDFXI3DL2REVERB;

1 0

Rémi Bernon : maintainers: Add a WIDL section.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 145d6722fc3c034d09d91c94034cc95e242e12c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=145d6722fc3c034d09d91c94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 4 10:39:15 2021 +0200 maintainers: Add a WIDL section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c36a70958ed..ad121ab117d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -244,7 +244,6 @@ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 -F: tools/widl TWAIN P: Esme Povirk <vincent(a)codeweavers.com> @@ -274,6 +273,11 @@ F: dlls/ieframe/ F: dlls/mshtml/ F: dlls/shdocvw/ +WIDL +P: Huw Davies <huw(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> +F: tools/widl + Windows Imaging Component M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/

1 0

Rémi Bernon : maintainers: Add myself to some sections.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 7458219e17a472cd34567ea958ede23b0a190200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7458219e17a472cd34567ea9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 4 10:39:16 2021 +0200 maintainers: Add myself to some sections. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index ad121ab117d..18478a8871f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -89,6 +89,7 @@ F: dlls/d3dxof/ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/dinput/ DirectMusic @@ -139,6 +140,7 @@ F: dlls/gphoto2.ds/ HID support M: Aric Stewart <aric(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ @@ -148,6 +150,12 @@ M: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/httpapi/ F: dlls/http.sys/ +Input events +P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/user32/input.c +F: dlls/user32/rawinput.c +F: server/queue.c + Input methods M: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ @@ -275,6 +283,7 @@ F: dlls/shdocvw/ WIDL P: Huw Davies <huw(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl @@ -300,6 +309,10 @@ F: dlls/mfreadwrite/ F: dlls/mfuuid/ F: dlls/rtworkq/ +Wine debugger (GDB backend) +P: Rémi Bernon <rbernon(a)codeweavers.com> +F: programs/winedbg/gdbproxy.c + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> @@ -323,6 +336,7 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing

1 0

Alexandre Julliard : ntdll: Move the loading of the global options to the Unix side.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 0bce76d83077960763f6e71a0ecf9757ce08325c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bce76d83077960763f6e71a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 11:45:51 2021 +0200 ntdll: Move the loading of the global options to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 18 ++++++-- dlls/ntdll/heap.c | 4 +- dlls/ntdll/loader.c | 22 ---------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/env.c | 100 +++++++++++++++++++++++++++++++++++++----- 5 files changed, 105 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bce76d83077960763f6…

1 0

Alexandre Julliard : ntdll: Store the 32-bit PEB in the process initial 32-bit context.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 44de9743bfeb088b0aa038da82ba118ce4ab30a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44de9743bfeb088b0aa038da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:42:44 2021 +0200 ntdll: Store the 32-bit PEB in the process initial 32-bit context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2769ebf24d6..bfc5b34a464 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2929,7 +2929,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B { wow_context->ContextFlags = CONTEXT_I386_ALL; wow_context->Eax = (ULONG_PTR)entry; - wow_context->Ebx = (ULONG_PTR)arg; + wow_context->Ebx = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; wow_context->SegCs = cs32_sel;

1 0

Alexandre Julliard : ntdll: Use the 32-bit __wine_ctrl_routine() in Wow64 processes.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 3dd6cafe3d03404eb61eb1585e36a1de6e4259a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd6cafe3d03404eb61eb158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:48:15 2021 +0200 ntdll: Use the 32-bit __wine_ctrl_routine() in Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2f79bc2c44..f1dbe9f345e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -869,6 +869,8 @@ static void load_ntdll_wow64_functions( HMODULE module ) GET_FUNC( RtlpQueryProcessDebugInformationRemote ); #undef GET_FUNC + p__wine_ctrl_routine = (void *)find_named_export( module, exports, "__wine_ctrl_routine" ); + /* also set the 32-bit LdrSystemDllInitBlock */ memcpy( (void *)(ULONG_PTR)pLdrSystemDllInitBlock->pLdrSystemDllInitBlock, pLdrSystemDllInitBlock, sizeof(*pLdrSystemDllInitBlock) );

1 0

Alexandre Julliard : wow64cpu: Implement 32<->64 bit code switching.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f60fd0e9ae35503f1a334607c2b8294595058e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f60fd0e9ae35503f1a334607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:06:02 2021 +0200 wow64cpu: Implement 32<->64 bit code switching. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64cpu/Makefile.in | 5 ++ dlls/wow64cpu/cpu.c | 139 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64cpu/wow64cpu.spec | 18 +++--- 3 files changed, 153 insertions(+), 9 deletions(-) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in index 261363fa72a..d574b68aee5 100644 --- a/dlls/wow64cpu/Makefile.in +++ b/dlls/wow64cpu/Makefile.in @@ -1 +1,6 @@ MODULE = wow64cpu.dll +IMPORTS = wow64 ntdll winecrt0 + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f100000 + +C_SRCS = cpu.c diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c new file mode 100644 index 00000000000..df292221117 --- /dev/null +++ b/dlls/wow64cpu/cpu.c @@ -0,0 +1,139 @@ +/* + * WoW64 CPU support + * + * Copyright 2021 Alexandre Julliard + * + * 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 "winnt.h" +#include "winternl.h" +#include "wine/asm.h" +#include "wine/exception.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wow); + +#include "pshpack1.h" +struct thunk_32to64 +{ + BYTE ljmp; /* ljmp %cs:1f */ + DWORD addr; + WORD cs; +}; +#include "poppack.h" + +static BYTE DECLSPEC_ALIGN(4096) code_buffer[0x1000]; + + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} + + +/********************************************************************** + * syscall_32to64 + * + * Execute a 64-bit syscall from 32-bit code, then return to 32-bit. + */ +extern void WINAPI syscall_32to64(void) DECLSPEC_HIDDEN; +__ASM_GLOBAL_FUNC( syscall_32to64, + /* cf. BTCpuSimulate prolog */ + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "xchgq %r14,%rsp\n\t" + "movl %edi,0x9c(%r13)\n\t" /* context->Edi */ + "movl %esi,0xa0(%r13)\n\t" /* context->Esi */ + "movl %ebx,0xa4(%r13)\n\t" /* context->Ebx */ + "movl %ebp,0xb4(%r13)\n\t" /* context->Ebp */ + "movl (%r14),%edx\n\t" + "movl %edx,0xb8(%r13)\n\t" /* context->Eip */ + "pushfq\n\t" + "popq %rdx\n\t" + "movl %edx,0xc0(%r13)\n\t" /* context->EFlags */ + "leaq 4(%r14),%rdx\n\t" + "movl %edx,0xc4(%r13)\n\t" /* context->Esp */ + "movq %rax,%rcx\n\t" /* syscall number */ + "leaq 8(%r14),%rdx\n\t" /* parameters */ + "call " __ASM_NAME("Wow64SystemServiceEx") "\n\t" + + "syscall_32to64_return:\n\t" + "movl 0x9c(%r13),%edi\n\t" /* context->Edi */ + "movl 0xa0(%r13),%esi\n\t" /* context->Esi */ + "movl 0xa4(%r13),%ebx\n\t" /* context->Ebx */ + "movl 0xb4(%r13),%ebp\n\t" /* context->Ebp */ + "movl 0xb8(%r13),%edx\n\t" /* context->Eip */ + "movl %edx,(%rsp)\n\t" + "movl 0xbc(%r13),%edx\n\t" /* context->SegCs */ + "movl %edx,4(%rsp)\n\t" + "movl 0xc4(%r13),%r14d\n\t" /* context->Esp */ + "xchgq %r14,%rsp\n\t" + "ljmp *(%r14)" ) + + +/********************************************************************** + * BTCpuSimulate (wow64cpu.@) + */ +__ASM_STDCALL_FUNC( BTCpuSimulate, 0, + "subq $0x28,%rsp\n" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %gs:0x30,%r12\n\t" + "movq 0x1488(%r12),%rcx\n\t" /* NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED] */ + "leaq 4(%rcx),%r13\n" /* cpu->Context */ + "jmp syscall_32to64_return\n" ) + + +/********************************************************************** + * BTCpuProcessInit (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuProcessInit(void) +{ + struct thunk_32to64 *thunk = (struct thunk_32to64 *)code_buffer; + SIZE_T size = sizeof(*thunk); + ULONG old_prot; + CONTEXT context; + + if ((ULONG_PTR)syscall_32to64 >> 32) + { + ERR( "wow64cpu loaded above 4G, disabling\n" ); + return STATUS_INVALID_ADDRESS; + } + + RtlCaptureContext( &context ); + thunk->ljmp = 0xea; + thunk->addr = PtrToUlong( syscall_32to64 ); + thunk->cs = context.SegCs; + NtProtectVirtualMemory( GetCurrentProcess(), (void **)&thunk, &size, PAGE_EXECUTE_READ, &old_prot ); + return STATUS_SUCCESS; +} + + +/********************************************************************** + * BTCpuGetBopCode (wow64cpu.@) + */ +void * WINAPI BTCpuGetBopCode(void) +{ + return code_buffer; +} diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index 768b6627a1d..ba0abb7a8ed 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -1,9 +1,9 @@ -@ stub BTCpuGetBopCode -@ stub BTCpuGetContext -@ stub BTCpuProcessInit -@ stub BTCpuResetToConsistentState -@ stub BTCpuSetContext -@ stub BTCpuSimulate -@ stub BTCpuTurboThunkControl -@ stub TurboDispatchJumpAddressEnd -@ stub TurboDispatchJumpAddressStart +@ stdcall BTCpuGetBopCode() +#@ stub BTCpuGetContext +@ stdcall BTCpuProcessInit() +#@ stub BTCpuResetToConsistentState +#@ stub BTCpuSetContext +@ stdcall BTCpuSimulate() +#@ stub BTCpuTurboThunkControl +#@ stub TurboDispatchJumpAddressEnd +#@ stub TurboDispatchJumpAddressStart

1 0

Conor McCarthy : vkd3d-shader: Implement DNE instruction.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: fabadf584f08605396260e016bba711861639ff2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fabadf584f08605396260e0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 4 12:56:10 2021 +1000 vkd3d-shader: Implement DNE instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 4 ++-- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f557f83..dd18b6f 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -314,6 +314,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DLT = 0xc5, + VKD3D_SM5_OP_DNE = 0xc6, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, @@ -1258,6 +1259,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, + {VKD3D_SM5_OP_DNE, VKD3DSIH_DNE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb9e2bf..3a1f196 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7363,6 +7363,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co case VKD3DSIH_INE: op = SpvOpINotEqual; break; case VKD3DSIH_DLT: case VKD3DSIH_LT: op = SpvOpFOrdLessThan; break; + case VKD3DSIH_DNE: case VKD3DSIH_NE: op = SpvOpFUnordNotEqual; break; case VKD3DSIH_UGE: op = SpvOpUGreaterThanEqual; break; case VKD3DSIH_ULT: op = SpvOpULessThan; break; @@ -9575,6 +9576,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DEQ: case VKD3DSIH_DGE: case VKD3DSIH_DLT: + case VKD3DSIH_DNE: case VKD3DSIH_EQ: case VKD3DSIH_GE: case VKD3DSIH_IEQ: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b35748b..d9306d6 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", /* VKD3DSIH_DMOV */ "dmov", + /* VKD3DSIH_DNE */ "dne", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", /* VKD3DSIH_DP3 */ "dp3", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2ce70db..76704d5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -198,6 +198,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DIV, VKD3DSIH_DLT, VKD3DSIH_DMOV, + VKD3DSIH_DNE, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, VKD3DSIH_DP3, diff --git a/tests/d3d12.c b/tests/d3d12.c index 1324fe1..b2a338d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9942,8 +9942,8 @@ static void test_shader_instructions(void) {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true}, {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true}, {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, - {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, - {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, + {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true}, + {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true}, {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true}, {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true}, {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true},

1 0

Zebediah Figura : build: Add hlsl.h and preproc.h to libvkd3d_shader_la_SOURCES.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: 587e85af5b292019fa9c5b8ae30a2f47072dc228 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=587e85af5b292019fa9c5b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 22:52:12 2021 -0500 build: Add hlsl.h and preproc.h to libvkd3d_shader_la_SOURCES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 5b3c4ff..8dd803d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,7 +170,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/hlsl.c \ + libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/preproc.h \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \

1 0