- Wine-Commits - list.winehq.org

Max Figura : wined3d: Move the WINED3D_RS_TRANSLUCENTSORTINDEPENDENT stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 2, 2023

March 2, 2023

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

Alexandre Julliard : wine.inf: Set Program Files variables separately for all WoW platforms.
by Alexandre Julliard March 2, 2023

March 2, 2023

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: Remove redundant platform-specific sections.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 863858da2aa42edfa3b4e639905fcad7056eaeb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/863858da2aa42edfa3b4e639905fca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:11:32 2023 +0100 wine.inf: Remove redundant platform-specific sections. --- loader/wine.inf.in | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1f5138051c9..6199c73f300 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -119,7 +119,7 @@ AddReg=\ SessionMgr,\ Tapi,\ ThemeManager,\ - VersionInfo.ntamd64,\ + VersionInfo,\ LicenseInformation [DefaultInstall.ntarm64] @@ -144,7 +144,7 @@ AddReg=\ SessionMgr,\ Tapi,\ ThemeManager,\ - VersionInfo.ntamd64,\ + VersionInfo,\ LicenseInformation [Wow64Install] @@ -159,11 +159,9 @@ AddReg=\ MCI,\ Misc,\ Tapi,\ - VersionInfo.ntamd64,\ + VersionInfo,\ LicenseInformation -[Wow64Install.ntarm64] -WineFakeDlls=FakeDllsWin32 [DefaultInstall.Services] AddService=BITS,0,BITSService @@ -2488,25 +2486,6 @@ HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" -[VersionInfo.ntamd64] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3" -HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10 -HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0 -HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362" -HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free" -HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro" -HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0 -HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" - [Wow64] ; Wow6432Node symlinks HKLM,Software\Classes\Wow6432Node\AppId,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\AppId"

1 0

Francois Gouget : shlwapi/tests: Make sure to test the formatting of troublesome dates.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 90dfa808bfddb8a7fd6ec19a2ce13953ea4a2aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/90dfa808bfddb8a7fd6ec19a2ce139… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 2 16:03:28 2023 +0100 shlwapi/tests: Make sure to test the formatting of troublesome dates. Test the current date to ensure broad coverage, and specifically test a February date because, in the French locale, it shows that SHFormatDateTimeA() uses the CP_ACP code page, not the locale's default one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54149 --- dlls/shlwapi/tests/ordinal.c | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index e2a6ee52a7d..7cb997c304c 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1666,16 +1666,14 @@ static void test_SHSetWindowBits(void) UnregisterClassA("Shlwapi test class", GetModuleHandleA(NULL)); } -static void test_SHFormatDateTimeA(void) +static void test_SHFormatDateTimeA(const SYSTEMTIME *st) { FILETIME UNALIGNED filetime; CHAR buff[100], buff2[100], buff3[100]; - SYSTEMTIME st; DWORD flags; INT ret; - GetLocalTime(&st); - SystemTimeToFileTime(&st, &filetime); + SystemTimeToFileTime(st, &filetime); /* SHFormatDateTime expects input as utc */ LocalFileTimeToFileTime(&filetime, &filetime); @@ -1731,14 +1729,14 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1746,21 +1744,21 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1768,7 +1766,7 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1776,12 +1774,12 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); buff[lstrlenA(buff2)] = '\0'; ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", @@ -1790,12 +1788,12 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); buff[lstrlenA(buff2)] = '\0'; ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", @@ -1804,10 +1802,10 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); strcat(buff2, " "); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1815,10 +1813,10 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); strcat(buff2, " "); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -3109,6 +3107,8 @@ static void test_DllGetVersion(void) START_TEST(ordinal) { + SYSTEMTIME st; + static const SYSTEMTIME february = {2023, 2, 2, 14, 12, 0, 0, 0}; char **argv; int argc; @@ -3136,7 +3136,15 @@ START_TEST(ordinal) test_IConnectionPoint(); test_SHPropertyBag_ReadLONG(); test_SHSetWindowBits(); - test_SHFormatDateTimeA(); + + GetLocalTime(&st); + test_SHFormatDateTimeA(&st); + /* Test how the locale and code page interact for date formatting by + * repeating the tests with a February date which in French contains an + * e-acute that can only be represented in some code pages. + */ + test_SHFormatDateTimeA(&february); + test_SHFormatDateTimeW(); test_SHGetObjectCompatFlags(); test_IUnknown_QueryServiceExec();

1 0

Florian Will : gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation.
by Alexandre Julliard March 2, 2023

March 2, 2023

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

Francois Gouget : shlwapi/tests: Fix the date formatting tests when the locale does not match the code page.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: a662f00e6bdaec3c403be6997fd48fefbd7774ad URL: https://gitlab.winehq.org/wine/wine/-/commit/a662f00e6bdaec3c403be6997fd48f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 2 16:00:46 2023 +0100 shlwapi/tests: Fix the date formatting tests when the locale does not match the code page. In particular, February dates contain an e-acute in French, the representation of which depends on the code page being used, which in SHFormatDateTimeA() is CP_ACP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54149 --- dlls/shlwapi/tests/ordinal.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 603a2ac2a76..e2a6ee52a7d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1731,14 +1731,14 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1746,21 +1746,21 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &st, NULL, buff2, sizeof(buff2)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1768,7 +1768,7 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1776,12 +1776,12 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); buff[lstrlenA(buff2)] = '\0'; ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", @@ -1790,12 +1790,12 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); buff[lstrlenA(buff2)] = '\0'; ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", @@ -1804,10 +1804,10 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); strcat(buff2, " "); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); @@ -1815,10 +1815,10 @@ static void test_SHFormatDateTimeA(void) flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2)); + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE | LOCALE_USE_CP_ACP, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); strcat(buff2, " "); - ret = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &st, NULL, buff3, sizeof(buff3)); + ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff);

1 0

Florian Will : gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().
by Alexandre Julliard March 2, 2023

March 2, 2023

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

Illia Polishchuk : d3d9: Always draw only a single instance for non-indexed draws.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: af65f0c9a09c040a615e4eaa4c290240c0a12847 URL: https://gitlab.winehq.org/wine/wine/-/commit/af65f0c9a09c040a615e4eaa4c2902… Author: Illia Polishchuk <illia.a.polishchuk(a)globallogic.com> Date: Tue Feb 28 22:58:35 2023 +0200 d3d9: Always draw only a single instance for non-indexed draws. Windows d3d9 always draws only a single instance for non-indexed draws. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54570 --- dlls/d3d9/device.c | 16 ++++++++++++---- dlls/d3d9/tests/visual.c | 9 +++------ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_gl.c | 6 ------ dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eddb2a0ebdd..bb3e0b8e6d4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3052,7 +3052,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); - wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 1); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3092,7 +3095,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); - wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, + device->stateblock_state->streams[0].frequency); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3144,7 +3148,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 1); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); @@ -3211,7 +3218,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_context_draw_indexed(device->immediate_context, - vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); + vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, + device->stateblock_state->streams[0].frequency); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cdc9ed11a00..2c83965f0cb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13101,14 +13101,11 @@ static void stream_test(void) color = getPixelColor(device, 200, 340); ok(color == act.color1, "has color 0x%08x, expected 0x%08x (case %i)\n", color, act.color1, i); color = getPixelColor(device, 400, 340); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 400, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 200, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d97640b297b..95f34fb25b8 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1808,8 +1808,6 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, else { instance_count = parameters->u.direct.instance_count; - if (context_vk->c.instance_count) - instance_count = context_vk->c.instance_count; if (!instance_count) instance_count = 1; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5574997bf05..27969f0b5c9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5321,8 +5321,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s else { unsigned int instance_count = parameters->u.direct.instance_count; - if (context->instance_count) - instance_count = context->instance_count; if (context->use_immediate_mode_draw || emulation) draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, @@ -5466,7 +5464,6 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5680,7 +5677,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c unsigned int i; /* Default to no instancing. */ - context->instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; if (stream_info->use_map & ~wined3d_mask_from_size(gl_info->limits.vertex_attribs)) @@ -5726,8 +5722,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c stream = &state->streams[element->stream_idx]; stream->buffer->bo_user.valid = true; - if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 459ac7a19c8..c0a190cbc5c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2307,7 +2307,6 @@ struct wined3d_context DWORD numbered_array_mask; enum fogsource fog_source; - UINT instance_count; void *shader_backend_data; void *fragment_pipe_data;

1 0

Illia Polishchuk : d3d9/tests: Add test for non-indexed instancing drawing.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 6df6c7fe0cf026ddd3b8c9a7246906d3c0c438c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6df6c7fe0cf026ddd3b8c9a7246906… Author: Illia Polishchuk <illia.a.polishchuk(a)globallogic.com> Date: Tue Feb 28 23:10:24 2023 +0200 d3d9/tests: Add test for non-indexed instancing drawing. Windows d3d9 always draws only a single instance for non-indexed draws. --- dlls/d3d9/tests/visual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 230f7deabb2..cdc9ed11a00 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13090,6 +13090,36 @@ static void stream_test(void) hr = IDirect3DDevice9_SetStreamSource(device, act.strInstance, vb3, 0, sizeof(instancepos[0])); ok(SUCCEEDED(hr), "Failed to set stream source, hr %#lx.\n", hr); + /* Non-indexed draw test. Only a single instance should be drawn. */ + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 1); + ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); + + /* Check that only single triangle instance has beed drawn with non-indexed draw. */ + color = getPixelColor(device, 200, 340); + ok(color == act.color1, "has color 0x%08x, expected 0x%08x (case %i)\n", color, act.color1, i); + color = getPixelColor(device, 400, 340); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + color = getPixelColor(device, 400, 180); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + color = getPixelColor(device, 200, 180); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr); + + /* Indexed draw test. */ hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device);

1 0

Henry Goffin : win32u: Invalidate all cached keys after input.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 0e85ac17a4f1312018959d03bee7efab7f1145f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e85ac17a4f1312018959d03bee7ef… Author: Henry Goffin <hgoffin(a)amazon.com> Date: Tue Feb 28 12:40:23 2023 -0800 win32u: Invalidate all cached keys after input. This patch addresses an issue in Second Life and potentially other multi-threaded applications which process WM_KEYDOWN in one thread and then verify that the key is "still down" with GetAsyncKeyState from another thread. Wine uses a per-thread key cache, resulting in inconsistent views of key status. Caches are now invalidated when an input event is injected by the driver or via SendInput. --- dlls/win32u/message.c | 18 ++++++++---------- include/wine/server_protocol.h | 3 +-- server/protocol.def | 1 - server/queue.c | 2 -- server/trace.c | 1 - 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index de1ca8cefbc..5ca568d7302 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2585,13 +2585,11 @@ LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, */ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) { - struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; int prev_x, prev_y, new_x, new_y; - INT counter = global_key_state_counter; USAGE hid_usage_page, hid_usage; NTSTATUS ret; - BOOL wait; + BOOL wait, affects_key_state = FALSE; info.type = MSG_HARDWARE; info.dest_tid = 0; @@ -2629,6 +2627,10 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.mouse.flags = input->mi.dwFlags; req->input.mouse.time = input->mi.time; req->input.mouse.info = input->mi.dwExtraInfo; + affects_key_state = !!(input->mi.dwFlags & (MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP | + MOUSEEVENTF_RIGHTDOWN | MOUSEEVENTF_RIGHTUP | + MOUSEEVENTF_MIDDLEDOWN | MOUSEEVENTF_MIDDLEUP | + MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)); break; case INPUT_KEYBOARD: req->input.kbd.vkey = input->ki.wVk; @@ -2636,6 +2638,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.kbd.flags = input->ki.dwFlags; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; + affects_key_state = TRUE; break; case INPUT_HARDWARE: req->input.hw.msg = input->hi.uMsg; @@ -2664,8 +2667,6 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r } break; } - if (key_state_info) wine_server_set_reply( req, key_state_info->state, - sizeof(key_state_info->state) ); ret = wine_server_call( req ); wait = reply->wait; prev_x = reply->prev_x; @@ -2677,11 +2678,8 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r if (!ret) { - if (key_state_info) - { - key_state_info->time = NtGetTickCount(); - key_state_info->counter = counter; - } + if (affects_key_state) + InterlockedIncrement( &global_key_state_counter ); /* force refreshing the key state cache */ if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) user_driver->pSetCursorPos( new_x, new_y ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c5e0182f42a..ffef499df20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2768,7 +2768,6 @@ struct send_hardware_message_reply int prev_y; int new_x; int new_y; - /* VARARG(keystate,bytes); */ char __pad_28[4]; }; #define SEND_HWMSG_INJECTED 0x01 @@ -6356,7 +6355,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 760 +#define SERVER_PROTOCOL_VERSION 761 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 69888fa643e..57957efdae3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2078,7 +2078,6 @@ enum message_type int prev_y; int new_x; /* new cursor position */ int new_y; - VARARG(keystate,bytes); /* global state array for all the keys */ @END #define SEND_HWMSG_INJECTED 0x01 diff --git a/server/queue.c b/server/queue.c index 07a31b47370..7320dddc6b7 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2551,7 +2551,6 @@ DECL_HANDLER(send_hardware_message) struct desktop *desktop; unsigned int origin = (req->flags & SEND_HWMSG_INJECTED ? IMO_INJECTED : IMO_HARDWARE); struct msg_queue *sender = get_current_queue(); - data_size_t size = min( 256, get_reply_max_size() ); if (!(desktop = get_thread_desktop( current, 0 ))) return; @@ -2587,7 +2586,6 @@ DECL_HANDLER(send_hardware_message) reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; - set_reply_data( desktop->keystate, size ); release_object( desktop ); } diff --git a/server/trace.c b/server/trace.c index b63bc386ee8..91bc3ae7af9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2662,7 +2662,6 @@ static void dump_send_hardware_message_reply( const struct send_hardware_message fprintf( stderr, ", prev_y=%d", req->prev_y ); fprintf( stderr, ", new_x=%d", req->new_x ); fprintf( stderr, ", new_y=%d", req->new_y ); - dump_varargs_bytes( ", keystate=", cur_size ); } static void dump_get_message_request( const struct get_message_request *req )

1 0