January 2022 - Wine-devel - list.winehq.org

[PATCH v8 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang 20 Jan '22

20 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v3 -> v4: - iatgas.h - LLVM(Clang), ARM, ARM64 support - Use __ASM_NAME macro - Don't fail test on MSVC - Don't end asm macros with "\n\t" v4 -> v5: - iatgas.h - mark idata sections as RO - loader.c - test for forward export itself v5 -> v6: - loader.c - Fix compilation warning in format string v6 -> v7: - forward4.c - fix building without MinGW v7 -> v8: - forward[1-3].c - Call DisableThreadLibraryCalls in DllMain - forward4.c: removed - iatgas.h: removed - sforward.c: new file - loader.c - test static forwarded import using shlwapi -> userenv forward dlls/kernel32/tests/Makefile.in | 14 ++- dlls/kernel32/tests/forward1.c | 19 ++++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 9 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 9 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/loader.c | 177 ++++++++++++++++++++++++++++++ dlls/kernel32/tests/sforward.c | 16 +++ dlls/kernel32/tests/sforward.spec | 1 + 10 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/sforward.c create mode 100644 dlls/kernel32/tests/sforward.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..1f8dd3b86a0 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernel32.dll -IMPORTS = user32 advapi32 + +# shlwapi is for testing export forwarding (to userenv) +IMPORTS = user32 advapi32 shlwapi SOURCES = \ actctx.c \ @@ -37,4 +39,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + sforward.c \ + sforward.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..6419d95eaea --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,19 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..1efd5a7fa5d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1642,6 +1642,180 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH], sforward_path[MAX_PATH]; + HMODULE userenv, shlwapi, sforward; + FARPROC test_func_stub; + + if (GetModuleHandleA( "userenv.dll" )) + { + skip("cannot test since userenv.dll is already loaded\n"); + return; + } + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( sforward_path, MAX_PATH, "%s\\sforward.dll", dir_path ); + extract_resource( "sforward.dll", "TESTDLL", sforward_path ); + + userenv = LoadLibraryA( "userenv.dll" ); + ok( !!userenv, "couldn't find userenv.dll: %u\n", GetLastError() ); + shlwapi = LoadLibraryA( "shlwapi.dll" ); + ok( !!shlwapi, "couldn't find shlwapi.dll: %u\n", GetLastError() ); + sforward = LoadLibraryA( sforward_path ); + ok( !!sforward, "couldn't find %s: %u\n", sforward_path, GetLastError() ); + + test_func_stub = GetProcAddress( sforward, "test_func_stub" ); + ok( !!test_func_stub, "sforward!test_func_stub not found\n" ); + + FreeLibrary( userenv ); + FreeLibrary( shlwapi ); + + todo_wine + ok( !!GetModuleHandleA( "userenv.dll" ), "userenv.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "shlwapi.dll" ), "shlwapi.dll unexpectedly unloaded\n" ); + + FreeLibrary( sforward ); + + ok( !GetModuleHandleA( "userenv.dll" ), "userenv.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "shlwapi.dll" ), "shlwapi.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "sforward.dll" ), "sforward.dll unexpectedly kept open\n" ); + + DeleteFileA( sforward_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3, oproc1, oproc2, oproc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + oproc1 = GetProcAddress(forward1, (LPSTR)2); + ok( !!oproc1, "cannot resolve forward1!#2 (forward_test_func2)\n"); + oproc2 = GetProcAddress(forward2, (LPSTR)2); + ok( !!oproc2, "cannot resolve forward2!#2 (forward_test_func2)\n"); + oproc3 = GetProcAddress(forward3, (LPSTR)2); + ok( !!oproc3, "cannot resolve forward3!#2 (forward_test_func2)\n"); + ok( oproc1 == oproc3, "forward1!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + ok( oproc2 == oproc3, "forward2!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4119,9 +4293,12 @@ START_TEST(loader) return; } + test_static_forwarded_import_refs(); /* Must be first; other tests may load userenv.dll */ test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); diff --git a/dlls/kernel32/tests/sforward.c b/dlls/kernel32/tests/sforward.c new file mode 100644 index 00000000000..17f79fb5a74 --- /dev/null +++ b/dlls/kernel32/tests/sforward.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +DECLSPEC_IMPORT BOOL WINAPI SHExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); + +void test_func_stub(void) +{ + SHExpandEnvironmentStringsForUserW(NULL, NULL, NULL, 0); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/sforward.spec b/dlls/kernel32/tests/sforward.spec new file mode 100644 index 00000000000..cb6d4add796 --- /dev/null +++ b/dlls/kernel32/tests/sforward.spec @@ -0,0 +1 @@ +@ cdecl test_func_stub() -- 2.31.1

3 7

[PATCH 4/4] dmusic: Remove SynthPortImpl from the method and vtbl names
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 163 +++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index c51b33ce9c3..a17e399ee17 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -149,8 +149,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown return S_OK; } -/* SynthPortImpl IDirectMusicPort IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_QueryInterface(IDirectMusicPort *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -175,7 +174,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI return S_OK; } -static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface) +static ULONG WINAPI synth_port_AddRef(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -187,7 +186,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT ifac return ref; } -static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT iface) +static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -214,8 +213,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa return ref; } -/* SynthPortImpl IDirectMusicPort interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) +static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); HRESULT hr; @@ -242,7 +240,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPOR return hr; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(LPDIRECTMUSICPORT iface, HANDLE event) +static HRESULT WINAPI synth_port_SetReadNotificationHandle(IDirectMusicPort *iface, HANDLE event) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -251,7 +249,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(L return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) +static HRESULT WINAPI synth_port_Read(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -260,7 +258,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) +static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDirectMusicInstrument *instrument, + IDirectMusicDownloadedInstrument **downloaded_instrument, DMUS_NOTERANGE *note_ranges, DWORD num_note_ranges) { struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicInstrumentImpl *instrument_object; @@ -346,7 +345,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT return E_FAIL; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument) +static HRESULT WINAPI synth_port_UnloadInstrument(IDirectMusicPort *iface, + IDirectMusicDownloadedInstrument *downloaded_instrument) { struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); @@ -366,7 +366,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMU return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUSICPORT iface, IReferenceClock** clock) +static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IReferenceClock **clock) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -378,7 +378,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS stats) +static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_SYNTHSTATS *stats) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -387,7 +387,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT iface) +static HRESULT WINAPI synth_port_Compact(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -396,7 +396,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT i return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS port_caps) +static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *port_caps) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -407,8 +407,9 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT i return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUSICPORT iface, DWORD io_control_code, LPVOID in_buffer, DWORD in_buffer_size, - LPVOID out_buffer, DWORD out_buffer_size, LPDWORD bytes_returned, LPOVERLAPPED overlapped) +static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD io_control_code, + void *in_buffer, DWORD in_buffer_size, void *out_buffer, DWORD out_buffer_size, + DWORD *bytes_returned, OVERLAPPED *overlapped) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -417,7 +418,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIRECTMUSICPORT iface, DWORD channel_groups) +static HRESULT WINAPI synth_port_SetNumChannelGroups(IDirectMusicPort *iface, DWORD channel_groups) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -428,7 +429,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIREC return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIRECTMUSICPORT iface, LPDWORD channel_groups) +static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DWORD *channel_groups) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -439,7 +440,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIREC return S_OK; } -static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active) +static HRESULT WINAPI synth_port_Activate(IDirectMusicPort *iface, BOOL active) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -468,7 +469,8 @@ static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, DWORD priority) +static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, + DWORD channel, DWORD priority) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -483,7 +485,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECT return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, LPDWORD priority) +static HRESULT WINAPI synth_port_GetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, + DWORD channel, DWORD *priority) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -494,7 +497,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECT return S_OK; } -static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, +static HRESULT WINAPI synth_port_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, IDirectSoundBuffer *dsbuffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -525,7 +528,8 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) +static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *pWaveFormatEx, + DWORD *pdwWaveFormatExSize, DWORD *pdwBufferSize) { struct synth_port *This = synth_from_IDirectMusicPort(iface); WAVEFORMATEX format; @@ -570,33 +574,32 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT return S_OK; } -static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { +static const IDirectMusicPortVtbl synth_port_vtbl = { /**** IDirectMusicPort IUnknown part methods ***/ - SynthPortImpl_IDirectMusicPort_QueryInterface, - SynthPortImpl_IDirectMusicPort_AddRef, - SynthPortImpl_IDirectMusicPort_Release, + synth_port_QueryInterface, + synth_port_AddRef, + synth_port_Release, /**** IDirectMusicPort methods ***/ - SynthPortImpl_IDirectMusicPort_PlayBuffer, - SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle, - SynthPortImpl_IDirectMusicPort_Read, - SynthPortImpl_IDirectMusicPort_DownloadInstrument, - SynthPortImpl_IDirectMusicPort_UnloadInstrument, - SynthPortImpl_IDirectMusicPort_GetLatencyClock, - SynthPortImpl_IDirectMusicPort_GetRunningStats, - SynthPortImpl_IDirectMusicPort_Compact, - SynthPortImpl_IDirectMusicPort_GetCaps, - SynthPortImpl_IDirectMusicPort_DeviceIoControl, - SynthPortImpl_IDirectMusicPort_SetNumChannelGroups, - SynthPortImpl_IDirectMusicPort_GetNumChannelGroups, - synth_dmport_Activate, - SynthPortImpl_IDirectMusicPort_SetChannelPriority, - SynthPortImpl_IDirectMusicPort_GetChannelPriority, - synth_dmport_SetDirectSound, - SynthPortImpl_IDirectMusicPort_GetFormat + synth_port_PlayBuffer, + synth_port_SetReadNotificationHandle, + synth_port_Read, + synth_port_DownloadInstrument, + synth_port_UnloadInstrument, + synth_port_GetLatencyClock, + synth_port_GetRunningStats, + synth_port_Compact, + synth_port_GetCaps, + synth_port_DeviceIoControl, + synth_port_SetNumChannelGroups, + synth_port_GetNumChannelGroups, + synth_port_Activate, + synth_port_SetChannelPriority, + synth_port_GetChannelPriority, + synth_port_SetDirectSound, + synth_port_GetFormat }; -/* SynthPortImpl IDirectMusicPortDownload IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_download_QueryInterface(IDirectMusicPortDownload *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -605,7 +608,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDI return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface) +static ULONG WINAPI synth_port_download_AddRef(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -614,7 +617,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSIC return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSICPORTDOWNLOAD iface) +static ULONG WINAPI synth_port_download_Release(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -623,8 +626,8 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSIC return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } -/* SynthPortImpl IDirectMusicPortDownload Interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD DLId, IDirectMusicDownload** IDMDownload) +static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *iface, DWORD DLId, + IDirectMusicDownload **IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -636,7 +639,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTM return DMUSIC_CreateDirectMusicDownloadImpl(&IID_IDirectMusicDownload, (LPVOID*)IDMDownload, NULL); } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD size, IDirectMusicDownload** IDMDownload) +static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownload *iface, DWORD size, + IDirectMusicDownload **IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -645,7 +649,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDI return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* start_DLId, DWORD count) +static HRESULT WINAPI synth_port_download_GetDLId(IDirectMusicPortDownload *iface, DWORD *start_DLId, DWORD count) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -654,7 +658,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* append) +static HRESULT WINAPI synth_port_download_GetAppend(IDirectMusicPortDownload *iface, DWORD *append) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -663,7 +667,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECT return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) +static HRESULT WINAPI synth_port_download_Download(IDirectMusicPortDownload *iface, IDirectMusicDownload *IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -672,7 +676,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMU return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) +static HRESULT WINAPI synth_port_download_Unload(IDirectMusicPortDownload *iface, IDirectMusicDownload *IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -681,22 +685,21 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSI return S_OK; } -static const IDirectMusicPortDownloadVtbl SynthPortImpl_DirectMusicPortDownload_Vtbl = { +static const IDirectMusicPortDownloadVtbl synth_port_download_vtbl = { /*** IDirectMusicPortDownload IUnknown part methods ***/ - SynthPortImpl_IDirectMusicPortDownload_QueryInterface, - SynthPortImpl_IDirectMusicPortDownload_AddRef, - SynthPortImpl_IDirectMusicPortDownload_Release, + synth_port_download_QueryInterface, + synth_port_download_AddRef, + synth_port_download_Release, /*** IDirectMusicPortDownload methods ***/ - SynthPortImpl_IDirectMusicPortDownload_GetBuffer, - SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer, - SynthPortImpl_IDirectMusicPortDownload_GetDLId, - SynthPortImpl_IDirectMusicPortDownload_GetAppend, - SynthPortImpl_IDirectMusicPortDownload_Download, - SynthPortImpl_IDirectMusicPortDownload_Unload + synth_port_download_GetBuffer, + synth_port_download_AllocateBuffer, + synth_port_download_GetDLId, + synth_port_download_GetAppend, + synth_port_download_Download, + synth_port_download_Unload }; -/* SynthPortImpl IDirectMusicThru IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_thru_QueryInterface(IDirectMusicThru *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -705,7 +708,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSI return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU iface) +static ULONG WINAPI synth_port_thru_AddRef(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -714,7 +717,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU ifac return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU iface) +static ULONG WINAPI synth_port_thru_Release(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -723,9 +726,9 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU ifa return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } -/* SynthPortImpl IDirectMusicThru Interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTHRU iface, DWORD source_channel_group, DWORD source_channel, DWORD destination_channel_group, - DWORD destination_channel, LPDIRECTMUSICPORT destination_port) +static HRESULT WINAPI synth_port_thru_ThruChannel(IDirectMusicThru *iface, DWORD source_channel_group, + DWORD source_channel, DWORD destination_channel_group, DWORD destination_channel, + IDirectMusicPort *destination_port) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -734,13 +737,13 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTH return S_OK; } -static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { +static const IDirectMusicThruVtbl synth_port_thru_vtbl = { /*** IDirectMusicThru IUnknown part methods */ - SynthPortImpl_IDirectMusicThru_QueryInterface, - SynthPortImpl_IDirectMusicThru_AddRef, - SynthPortImpl_IDirectMusicThru_Release, + synth_port_thru_QueryInterface, + synth_port_thru_AddRef, + synth_port_thru_Release, /*** IDirectMusicThru methods ***/ - SynthPortImpl_IDirectMusicThru_ThruChannel + synth_port_thru_ThruChannel }; static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid, @@ -827,9 +830,9 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (!obj) return E_OUTOFMEMORY; - obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; - obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; - obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->IDirectMusicPort_iface.lpVtbl = &synth_port_vtbl; + obj->IDirectMusicPortDownload_iface.lpVtbl = &synth_port_download_vtbl; + obj->IDirectMusicThru_iface.lpVtbl = &synth_port_thru_vtbl; obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; obj->ref = 1; obj->parent = parent; -- 2.31.1

1 0

[PATCH 2/4] dmsynth: Pass the master clock on to the sink
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 7 +++++-- dlls/dmusic/port.c | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3d3af80d005..51b33e8df8d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -305,9 +305,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(IDirectMusicSynth8 * { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); - return S_OK; + if (!This->sink) + return DMUS_E_NOSYNTHSINK; + + return IDirectMusicSynthSink_SetMasterClock(This->sink, clock); } static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 *iface, diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 165bd520191..88c7c60a50d 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -856,9 +856,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (SUCCEEDED(hr)) hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); - if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); - if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH 1/4] dmusic: Call SetSynkSink() first to initialize the Synth
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7bd2afdb9a3..165bd520191 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -851,13 +851,13 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH vkd3d v2 2/8] tests: Test struct initializers.
by Francisco Casas 20 Jan '22

20 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 77 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index 3545d74b..051053cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..ab9ac0f3 --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,77 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + double2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + double2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

2 1

[PATCH] widl: Allow optional interface parameter on the [activatable] attribute.
by Bernhard Kölbl 20 Jan '22

20 Jan '22

As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- tools/widl/parser.y | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..04365d62280 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,16 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +/* The interface part of the activatable attribute is only checked +for the type, but won't be further used by the following nonterminal. */ +activatable_attr: + contract_req { $$ = $1; } + | decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = $3; } + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

1 0

[PATCH 5/5] wined3d: Properly compare integers in wined3d_so_desc_compare().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93c738ad955..71b5aaa5742 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5733,11 +5733,11 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * unsigned int i; int ret; - if ((ret = (k->element_count - desc->element_count))) + if ((ret = wined3d_uint32_compare(k->element_count, desc->element_count))) return ret; - if ((ret = (k->buffer_stride_count - desc->buffer_stride_count))) + if ((ret = wined3d_uint32_compare(k->buffer_stride_count, desc->buffer_stride_count))) return ret; - if ((ret = (k->rasterizer_stream_idx - desc->rasterizer_stream_idx))) + if ((ret = wined3d_uint32_compare(k->rasterizer_stream_idx, desc->rasterizer_stream_idx))) return ret; for (i = 0; i < k->element_count; ++i) @@ -5745,25 +5745,25 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * const struct wined3d_stream_output_element *b = &desc->elements[i]; const struct wined3d_stream_output_element *a = &k->elements[i]; - if ((ret = (a->stream_idx - b->stream_idx))) + if ((ret = wined3d_uint32_compare(a->stream_idx, b->stream_idx))) return ret; if ((ret = (!a->semantic_name - !b->semantic_name))) return ret; if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; - if ((ret = (a->semantic_idx - b->semantic_idx))) + if ((ret = wined3d_uint32_compare(a->semantic_idx, b->semantic_idx))) return ret; - if ((ret = (a->component_idx - b->component_idx))) + if ((ret = wined3d_uint32_compare(a->component_idx, b->component_idx))) return ret; - if ((ret = (a->component_count - b->component_count))) + if ((ret = wined3d_uint32_compare(a->component_count, b->component_count))) return ret; - if ((ret = (a->output_slot - b->output_slot))) + if ((ret = wined3d_uint32_compare(a->output_slot, b->output_slot))) return ret; } for (i = 0; i < k->buffer_stride_count; ++i) { - if ((ret = (k->buffer_strides[i] - desc->buffer_strides[i]))) + if ((ret = wined3d_uint32_compare(k->buffer_strides[i], desc->buffer_strides[i]))) return ret; } -- 2.30.2

1 0

[PATCH 4/5] wined3d: Properly compare integers in wined3d_pipeline_layout_vk_compare().
by Henri Verbeet 20 Jan '22

20 Jan '22

As pointed out by Giovanni, modular subtraction doesn't produce a total order; in particular, it's not transitive. For the values likely to be encountered by wined3d_pipeline_layout_vk_compare(), this is perhaps unlikely to be an issue in practice. However, that's not necessarily the case for e.g. handles or masks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 5 +++-- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fd6d810f0e2..cf6247387ca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1797,9 +1797,10 @@ static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine const struct wined3d_pipeline_layout_key_vk *a = key; const struct wined3d_pipeline_layout_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, const struct wined3d_pipeline_layout_vk, entry)->key; + int ret; - if (a->binding_count != b->binding_count) - return a->binding_count - b->binding_count; + if ((ret = wined3d_uint32_compare(a->binding_count, b->binding_count))) + return ret; return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fa51a844ac..c9d83b3fbc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -447,6 +447,11 @@ static inline unsigned int wined3d_popcount(unsigned int x) #endif } +static inline int wined3d_uint32_compare(uint32_t x, uint32_t y) +{ + return (x > y) - (x < y); +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -- 2.30.2

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_fs_settings().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4724393905b..69c73487240 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6549,7 +6549,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st } else { - settings->texcoords_initialized = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords_initialized = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); } settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] -- 2.30.2

1 0

[PATCH 2/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_vs_settings().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e375f43a48..4724393905b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6734,7 +6734,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); if (d3d_info->emulated_flatshading) settings->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; @@ -6783,7 +6783,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { -- 2.30.2

1 0