March 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : wine.inf: Set Program Files variables separately for all WoW platforms.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: aebc819abff6a01c173aa9d6a736ba0d8ccdb3b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/aebc819abff6a01c173aa9d6a736ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:12:28 2023 +0100 wine.inf: Set Program Files variables separately for all WoW platforms. --- loader/wine.inf.in | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6199c73f300..34b90ef6bbf 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -107,7 +107,7 @@ AddReg=\ ContentIndex,\ ControlClass,\ CurrentVersion,\ - CurrentVersionWow64,\ + CurrentVersionWow64.ntamd64,\ Debugger,\ DirectX,\ Fonts,\ @@ -132,7 +132,7 @@ AddReg=\ ContentIndex,\ ControlClass,\ CurrentVersion,\ - CurrentVersionWow64,\ + CurrentVersionWow64.ntarm64,\ Debugger,\ DirectX,\ Fonts,\ @@ -147,13 +147,13 @@ AddReg=\ VersionInfo,\ LicenseInformation -[Wow64Install] +[Wow64Install.ntx86] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 CopyFiles=NlsFiles AddReg=\ CurrentVersion,\ - CurrentVersionWow64,\ + CurrentVersionWow64.ntx86,\ Debugger,\ DirectX,\ MCI,\ @@ -162,6 +162,20 @@ AddReg=\ VersionInfo,\ LicenseInformation +[Wow64Install.ntarm] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsWin32,FakeDllsWow64 +CopyFiles=NlsFiles +AddReg=\ + CurrentVersion,\ + CurrentVersionWow64.ntarm,\ + Debugger,\ + DirectX,\ + MCI,\ + Misc,\ + Tapi,\ + VersionInfo,\ + LicenseInformation [DefaultInstall.Services] AddService=BITS,0,BITSService @@ -401,9 +415,23 @@ HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" -[CurrentVersionWow64] +[CurrentVersionWow64.ntamd64] +HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" +HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" + +[CurrentVersionWow64.ntarm64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" +HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"C:\Program Files (Arm)" +HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"C:\Program Files (Arm)\Common Files" + +[CurrentVersionWow64.ntx86] +HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16422%" +HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16427%" + +[CurrentVersionWow64.ntarm] +HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"%16422%" +HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"%16427%" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld"

1 0

Alexandre Julliard : wine.inf: Add keys for the platform-specific Wow64 backend.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 7611492ddc5c9707d42e6bfcea81eb0b7120e785 URL: https://gitlab.winehq.org/wine/wine/-/commit/7611492ddc5c9707d42e6bfcea81eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:12:52 2023 +0100 wine.inf: Add keys for the platform-specific Wow64 backend. --- loader/wine.inf.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 34b90ef6bbf..c5850d1e205 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -418,12 +418,15 @@ HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64.ntamd64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" +HKLM,Software\Microsoft\Wow64\x86,,2,"wow64cpu.dll" [CurrentVersionWow64.ntarm64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"C:\Program Files (Arm)" HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"C:\Program Files (Arm)\Common Files" +HKLM,Software\Microsoft\Wow64\arm,,2,"wowarmhw.dll" +HKLM,Software\Microsoft\Wow64\x86,,2,"xtajit.dll" [CurrentVersionWow64.ntx86] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16422%"

1 0

Alexandre Julliard : wow64: Get the backend dll name from the registry.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: b57af3ebca6ee7e8b21b57ee1ef4c3a7143967cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b57af3ebca6ee7e8b21b57ee1ef4c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:13:38 2023 +0100 wow64: Get the backend dll name from the registry. --- dlls/wow64/syscall.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6f4f3a2dc81..dd3937640bc 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -712,16 +712,39 @@ static HMODULE load_64bit_module( const WCHAR *name ) */ static const WCHAR *get_cpu_dll_name(void) { + static ULONG buffer[32]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + const WCHAR *ret; + HANDLE key; + ULONG size; + switch (current_machine) { case IMAGE_FILE_MACHINE_I386: - return (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Wow64\\x86" ); + ret = (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + break; case IMAGE_FILE_MACHINE_ARMNT: - return L"wowarmhw.dll"; + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Wow64\\arm" ); + ret = L"wowarmhw.dll"; + break; default: ERR( "unsupported machine %04x\n", current_machine ); RtlExitUserProcess( 1 ); } + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (NtOpenKey( &key, KEY_READ | KEY_WOW64_64KEY, &attr )) return ret; + RtlInitUnicodeString( &nameW, L"" ); + size = sizeof(buffer) - sizeof(WCHAR); + if (!NtQueryValueKey( key, &nameW, KeyValuePartialInformation, buffer, size, &size ) && info->Type == REG_SZ) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + ret = (WCHAR *)info->Data; + } + NtClose( key ); + return ret; }

1 0

Max Figura : wined3d: Move the WINED3D_RS_FLUSHBATCH stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 9ef49c4b4e02751d63454abc9bfa7814682fd1fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9ef49c4b4e02751d63454abc9bfa78… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 14:13:26 2022 -0600 wined3d: Move the WINED3D_RS_FLUSHBATCH stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 95f34fb25b8..406f6b0b965 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_nop}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6813f500dad..26be2e5d046 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4119,6 +4119,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_ANISOTROPY not implemented yet.\n"); break; + case WINED3D_RS_FLUSHBATCH: + if (state->rs[WINED3D_RS_FLUSHBATCH]) + FIXME("Render state WINED3D_RS_FLUSHBATCH not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 894020f8d52..2175eb388af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c83eb773de9..9b30a867891 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2042,12 +2042,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_flushbatch(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_FLUSHBATCH]) - FIXME("Render state WINED3D_RS_FLUSHBATCH not implemented yet.\n"); -} - static void state_translucentsi(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_TRANSLUCENTSORTINDEPENDENT]) @@ -4693,7 +4687,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_FLUSHBATCH), { STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_flushbatch }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5489,7 +5482,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 30, 33}, { 39, 40}, { 42, 47}, - { 49, 49}, + { 49, 50}, { 52, 59}, { 61, 127}, {149, 150},

1 0

Max Figura : wined3d: Move the WINED3D_RS_TRANSLUCENTSORTINDEPENDENT stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 06bbd2470a07f1456dc91038ba7baedcf63e8e09 URL: https://gitlab.winehq.org/wine/wine/-/commit/06bbd2470a07f1456dc91038ba7bae… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 14:21:21 2022 -0600 wined3d: Move the WINED3D_RS_TRANSLUCENTSORTINDEPENDENT stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 406f6b0b965..3e09191d1e2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26be2e5d046..8de89b01bb4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4124,6 +4124,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_FLUSHBATCH not implemented yet.\n"); break; + case WINED3D_RS_TRANSLUCENTSORTINDEPENDENT: + if (state->rs[WINED3D_RS_TRANSLUCENTSORTINDEPENDENT]) + FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2175eb388af..986032ec6e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9b30a867891..f83af5b8c0e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2042,12 +2042,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_translucentsi(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_TRANSLUCENTSORTINDEPENDENT]) - FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); -} - static void state_extents(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_EXTENTS]) @@ -4687,7 +4681,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5482,8 +5475,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 30, 33}, { 39, 40}, { 42, 47}, - { 49, 50}, - { 52, 59}, + { 49, 59}, { 61, 127}, {149, 150}, {162, 162},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP15 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 549612fd5fe267056401e3d2636d787c94b44aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/549612fd5fe267056401e3d2636d78… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:41:22 2022 -0600 wined3d: Move the WINED3D_RS_WRAP15 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e09191d1e2..870b9a9ac27 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -113,7 +113,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP15), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8de89b01bb4..5f4c8146249 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP15: + { + static unsigned int once; + + if ((state->rs[idx]) && !once++) + FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); + break; + } + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 986032ec6e0..9006194dd12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2826,7 +2826,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP15), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f83af5b8c0e..d086b5f5fff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4696,7 +4696,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP14), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP15), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5484,7 +5483,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {206, 209}, + {205, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP14 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 7997efa35fa886f8a45c4d0378b43f845a96f9ce URL: https://gitlab.winehq.org/wine/wine/-/commit/7997efa35fa886f8a45c4d0378b43f… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:43:54 2022 -0600 wined3d: Move the WINED3D_RS_WRAP14 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 870b9a9ac27..fea8b450500 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -112,7 +112,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f4c8146249..b44732a7044 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP14: case WINED3D_RS_WRAP15: { static unsigned int once; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9006194dd12..c893fb44070 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2825,7 +2825,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d086b5f5fff..0526a29248b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4695,7 +4695,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP11), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP14), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5483,7 +5482,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {205, 209}, + {204, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP13 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: d1b0343d3b6a8bf4fd7e9a0261b9d79852f15e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1b0343d3b6a8bf4fd7e9a0261b9d7… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:56:48 2022 -0600 wined3d: Move the WINED3D_RS_WRAP13 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fea8b450500..a9481f24249 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -111,7 +111,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b44732a7044..98f1e472a51 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP13: case WINED3D_RS_WRAP14: case WINED3D_RS_WRAP15: { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c893fb44070..55f2f70e3fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2824,7 +2824,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0526a29248b..e39fa95d525 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4694,7 +4694,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP10), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP11), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5482,7 +5481,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {204, 209}, + {203, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Florian Will : gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation.
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: 0ebf3222e57d2ac7da790a4ddb572fad5751806a URL: https://gitlab.winehq.org/wine/wine/-/commit/0ebf3222e57d2ac7da790a4ddb572f… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Mar 1 08:47:34 2023 +0100 gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation. --- dlls/gdiplus/tests/font.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ccdb7a2ef96..7fbe619cd93 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -76,6 +76,7 @@ static void test_long_name(void) WCHAR path[MAX_PATH]; GpStatus stat; GpFontCollection *fonts; + HANDLE file; INT num_families; GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; @@ -86,8 +87,19 @@ static void test_long_name(void) create_testfontfile(L"wine_longname.ttf", 1, path); + file = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); + stat = GdipPrivateAddFontFile(fonts, path); - ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + + CloseHandle(file); + + if (stat != Ok) { + /* try again without opened file handle */ + stat = GdipPrivateAddFontFile(fonts, path); + ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + } stat = GdipGetFontCollectionFamilyCount(fonts, &num_families); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed: %d\n", stat);

1 0

Florian Will : gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().
by Alexandre Julliard 02 Mar '23

02 Mar '23

Module: wine Branch: master Commit: b3bf30e7e21f25ca539ade9607cdaaed77067d08 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3bf30e7e21f25ca539ade9607cdaa… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Feb 28 11:56:56 2023 +0100 gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile(). ZusiDisplay sometimes loads the same font file into two different PrivateFontCollections using two threads, so there is a race condition when the file is opened without the FILE_SHARE_READ sharing mode. The second call to GdipPrivateAddFontFile() might fail if the first one hasn't closed the file handle yet. --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 96d3c5630bc..bcf36a60090 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1110,7 +1110,7 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON if (!collection || !name) return InvalidParameter; - file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) return InvalidParameter; if (!GetFileSizeEx(file, &size) || size.u.HighPart) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7fbe619cd93..a2aea904bb1 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -91,7 +91,7 @@ static void test_long_name(void) ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); stat = GdipPrivateAddFontFile(fonts, path); - todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); CloseHandle(file);

1 0