wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

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

08 Mar '23

Module: wine Branch: master Commit: 3809a31258b9c06696f308d67a33818500143440 URL: https://gitlab.winehq.org/wine/wine/-/commit/3809a31258b9c06696f308d67a3381… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:31:17 2022 -0600 wined3d: Move the WINED3D_RS_WRAP5 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 a0ef4213b11..4c5604fc54e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -103,7 +103,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP5), {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 065367c605c..be10d1f0b32 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_WRAP5: case WINED3D_RS_WRAP6: case WINED3D_RS_WRAP7: case WINED3D_RS_WRAP8: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8a38eb13d9..cf03c1f8f77 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2816,7 +2816,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP5), {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 ded450992f6..f4d767825db 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4686,7 +4686,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP3), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP4), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP5), { 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 }, @@ -5467,7 +5466,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {134, 135}, + {133, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

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

08 Mar '23

Module: wine Branch: master Commit: cbbf1f054c9e6ecd56dce57563527118281264a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbbf1f054c9e6ecd56dce575635271… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:29:11 2022 -0600 wined3d: Move the WINED3D_RS_WRAP6 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 a8aae40b7f2..a0ef4213b11 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -104,7 +104,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP6), {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 27f9c1d14e6..065367c605c 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_WRAP6: case WINED3D_RS_WRAP7: case WINED3D_RS_WRAP8: case WINED3D_RS_WRAP9: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 337753e7e70..f8a38eb13d9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2817,7 +2817,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP6), {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 7dfdcb7c456..ded450992f6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4687,7 +4687,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP3), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP4), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP5), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP6), { 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 }, @@ -5468,7 +5467,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {135, 135}, + {134, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

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

08 Mar '23

Module: wine Branch: master Commit: 9933832a13b9eeb26fccb8a0001bd71d8d2d7c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/9933832a13b9eeb26fccb8a0001bd7… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:26:46 2022 -0600 wined3d: Move the WINED3D_RS_WRAP7 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 | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index caddae5c918..a8aae40b7f2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -105,7 +105,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP7), {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 a1e0d880004..27f9c1d14e6 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_WRAP7: case WINED3D_RS_WRAP8: case WINED3D_RS_WRAP9: case WINED3D_RS_WRAP10: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8f9316d914..337753e7e70 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2818,7 +2818,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP7), {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 c0606ae30e8..7dfdcb7c456 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4688,7 +4688,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP4), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP5), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP6), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP7), { 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 }, @@ -5469,6 +5468,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, + {135, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

Mohamad Al-Jaf : pdh/tests: Add PdhVbGetDoubleCounterValue() tests.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 2af11b6ee7736c3b26223b62233886e6a2616682 URL: https://gitlab.winehq.org/wine/wine/-/commit/2af11b6ee7736c3b26223b62233886… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Mar 5 17:35:21 2023 -0500 pdh/tests: Add PdhVbGetDoubleCounterValue() tests. --- dlls/pdh/tests/pdh.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 195fd89eba5..e5d6fa8205e 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -34,6 +34,7 @@ static PDH_STATUS (WINAPI *pPdhAddEnglishCounterW)(PDH_HQUERY, LPCWSTR, DWORD_ static PDH_STATUS (WINAPI *pPdhCollectQueryDataWithTime)(PDH_HQUERY, LONGLONG *); static PDH_STATUS (WINAPI *pPdhValidatePathExA)(PDH_HLOG, LPCSTR); static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR); +static double (WINAPI *pPdhVbGetDoubleCounterValue)(PDH_HCOUNTER, PDH_STATUS *); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); @@ -69,6 +70,7 @@ static void init_function_ptrs( void ) GETFUNCPTR( PdhCollectQueryDataWithTime ) GETFUNCPTR( PdhValidatePathExA ) GETFUNCPTR( PdhValidatePathExW ) + GETFUNCPTR( PdhVbGetDoubleCounterValue ) } static const WCHAR processor_time[] = L"% Processor Time"; @@ -424,6 +426,46 @@ static void test_PdhGetRawCounterValue( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08lx\n", ret); } +static void test_PdhVbGetDoubleCounterValue(void) +{ + PDH_FMT_COUNTERVALUE value; + PDH_HCOUNTER counter; + PDH_STATUS status; + PDH_HQUERY query; + double ret; + + status = PdhOpenQueryA( NULL, 0, &query ); + ok(status == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08lx\n", status); + + status = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(status == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08lx\n", status); + + status = PdhCollectQueryData(query); + ok(status == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08lx\n", status); + + status = PdhGetFormattedCounterValue( counter, PDH_FMT_DOUBLE, NULL, &value ); + ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08lx\n", status); + + ret = pPdhVbGetDoubleCounterValue( NULL, NULL ); + ok(ret == 0.0, "Unexpected value %f\n", ret); + + status = PDH_FUNCTION_NOT_FOUND; + ret = pPdhVbGetDoubleCounterValue( NULL, &status ); + ok(status == PDH_INVALID_HANDLE, "PdhVbGetDoubleCounterValue failed 0x%08lx\n", status); + ok(ret == 0.0, "Unexpected value %f\n", ret); + + ret = pPdhVbGetDoubleCounterValue( counter, NULL ); + ok(ret == value.doubleValue, "Unexpected value %f\n", ret); + + status = PDH_FUNCTION_NOT_FOUND; + ret = pPdhVbGetDoubleCounterValue( counter, &status ); + ok(status == ERROR_SUCCESS, "PdhVbGetDoubleCounterValue failed 0x%08lx\n", status); + ok(ret == value.doubleValue, "Unexpected value %f\n", ret); + + status = PdhCloseQuery(query); + ok(status == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08lx\n", status); +} + static void test_PdhSetCounterScaleFactor( void ) { PDH_STATUS ret; @@ -998,6 +1040,8 @@ START_TEST(pdh) test_PdhSetCounterScaleFactor(); test_PdhGetCounterTimeBase(); + test_PdhVbGetDoubleCounterValue(); + test_PdhGetCounterInfoA(); test_PdhGetCounterInfoW();

1 0

Mohamad Al-Jaf : pdh: Implement PdhVbGetDoubleCounterValue().
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: e1c59cc5621a8d3420fc30314fd8daa5c6e55a26 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1c59cc5621a8d3420fc30314fd8da… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 1 20:49:41 2022 -0500 pdh: Implement PdhVbGetDoubleCounterValue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54618 --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 5f61a8a42ca..711c970029b 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -145,7 +145,7 @@ @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList -@ stub PdhVbGetDoubleCounterValue +@ stdcall PdhVbGetDoubleCounterValue(ptr ptr) @ stub PdhVbGetLogFileSize @ stub PdhVbGetOneCounterPath @ stub PdhVbIsGoodStatus diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7eae7872b48..121b7e712ce 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1062,6 +1062,23 @@ PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER * return PDH_NOT_IMPLEMENTED; } +/*********************************************************************** + * PdhVbGetDoubleCounterValue (PDH.@) + */ +double WINAPI PdhVbGetDoubleCounterValue( PDH_HCOUNTER handle, PDH_STATUS *counter_status ) +{ + PDH_FMT_COUNTERVALUE value; + PDH_STATUS status; + + TRACE( "%p %p\n", handle, counter_status ); + + memset( &value, 0, sizeof(value) ); + status = PdhGetFormattedCounterValue( handle, PDH_FMT_DOUBLE, NULL, &value ); + + if (counter_status) *counter_status = status; + return value.u.doubleValue; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */

1 0

Brendan Shanks : kernelbase: Implement DiscardVirtualMemory().
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: d7d94ed0df6931907d1c89d7d7551dd40f5214c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7d94ed0df6931907d1c89d7d7551d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 3 10:49:18 2023 -0800 kernelbase: Implement DiscardVirtualMemory(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 13 +++++++++++++ include/memoryapi.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47ff251067a..8da6321e8d0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -371,6 +371,7 @@ @ stdcall -import DeleteProcThreadAttributeList(ptr) # @ stub DisableThreadProfiling @ stdcall DisassociateCurrentThreadFromCallback(ptr) NTDLL.TpDisassociateCallback +@ stdcall DiscardVirtualMemory(ptr long) kernelbase.DiscardVirtualMemory @ stdcall DeleteTimerQueue(long) @ stdcall -import DeleteTimerQueueEx(long long) @ stdcall -import DeleteTimerQueueTimer(long long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e3a0ad257f2..af3af8ecabe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -269,7 +269,7 @@ @ stdcall DisablePredefinedHandleTableInternal(long) @ stdcall DisableThreadLibraryCalls(long) @ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback -# @ stub DiscardVirtualMemory +@ stdcall DiscardVirtualMemory(ptr long) @ stdcall DisconnectNamedPipe(long) @ stdcall DnsHostnameToComputerNameExW(wstr ptr ptr) # @ stub DsBindWithSpnExW diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4bcd4a639f6..a3ba79f3405 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -52,6 +52,19 @@ BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void ***********************************************************************/ +/*********************************************************************** + * DiscardVirtualMemory (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH DiscardVirtualMemory( void *addr, SIZE_T size ) +{ + NTSTATUS status; + LPVOID ret = addr; + + status = NtAllocateVirtualMemory( GetCurrentProcess(), &ret, 0, &size, MEM_RESET, PAGE_NOACCESS ); + return RtlNtStatusToDosError( status ); +} + + /*********************************************************************** * FlushViewOfFile (kernelbase.@) */ diff --git a/include/memoryapi.h b/include/memoryapi.h index 8743e67927c..6728b832fa7 100644 --- a/include/memoryapi.h +++ b/include/memoryapi.h @@ -41,5 +41,6 @@ typedef struct WIN32_MEMORY_REGION_INFORMATION SIZE_T CommitSize; } WIN32_MEMORY_REGION_INFORMATION; +DWORD WINAPI DiscardVirtualMemory(void *addr, SIZE_T size); BOOL WINAPI QueryVirtualMemoryInformation(HANDLE process,const void *addr, WIN32_MEMORY_INFORMATION_CLASS info_class, void *info, SIZE_T size, SIZE_T *ret_size);

1 0

Martin Storsjö : ntdll: Handle aarch64 pointer authentication in unwind info.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 7f7f06fe615fbd662d469cd1c16fd933692e05de URL: https://gitlab.winehq.org/wine/wine/-/commit/7f7f06fe615fbd662d469cd1c16fd9… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Mar 3 11:45:34 2023 +0200 ntdll: Handle aarch64 pointer authentication in unwind info. These were docmented in [1] (with the user-facing name of the opcode adjusted later in [2]). Since MSVC 2022, the precompiled runtimes (both runtimes such as vcruntime140*.dll and the statically linked code from e.g. libcmt.lib) are built with pointer authentication enabled. To correctly handle unwinding through such functions, even on HW that don't support the pointer authentication mechanism itself, wine needs to at least be aware of it (for handling the cases with packed unwind info with CR==2 simiarly to CR==3). This patch has been tested on Linux on HW supporting pointer authentication too, with binaries built with MSVC. [1] https://github.com/MicrosoftDocs/cpp-docs/commit/f510c83085d9764b3c7b522219… [2] https://github.com/MicrosoftDocs/cpp-docs/commit/cac237d3f370a06b71f6c314a6… --- dlls/ntdll/signal_arm64.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2eed51b101e..90be8fc2232 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -690,6 +690,20 @@ static void restore_fpregs( int reg, int count, int pos, CONTEXT *context, } +static void do_pac_auth( CONTEXT *context ) +{ + register DWORD64 x17 __asm__( "x17" ) = context->u.s.Lr; + register DWORD64 x16 __asm__( "x16" ) = context->Sp; + + /* This is the autib1716 instruction. The hint instruction is used here + * as gcc does not assemble autib1716 for pre armv8.3a targets. For + * pre-armv8.3a targets, this is just treated as a hint instruction, which + * is ignored. */ + __asm__( "hint 0xe" : "+r"(x17) : "r"(x16) ); + + context->u.s.Lr = x17; +} + /*********************************************************************** * process_unwind_codes */ @@ -773,6 +787,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, { memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); } + else if (*ptr == 0xfc) /* pac_sign_lr */ + { + do_pac_auth( context ); + } else { WARN( "unsupported code %02x\n", *ptr ); @@ -820,6 +838,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION len = (int_size + 8) / 16 + (fp_size + 8) / 16; switch (func->u.s.CR) { + case 2: + len++; /* pacibsp */ + /* fall through */ case 3: len++; /* mov x29,sp */ len++; /* stp x29,lr,[sp,0] */ @@ -845,7 +866,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (!skip) { - if (func->u.s.CR == 3) + if (func->u.s.CR == 3 || func->u.s.CR == 2) { DWORD64 *fp = (DWORD64 *) context->u.s.Fp; /* u.X[29] */ context->Sp = context->u.s.Fp; @@ -864,6 +885,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION switch (func->u.s.CR) { case 3: + case 2: /* mov x29,sp */ if (pos++ >= skip) context->Sp = context->u.s.Fp; if (local_size <= 512) @@ -932,6 +954,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION restore_regs( 19, 2, -saved_regs, context, ptrs ); } } + if (func->u.s.CR == 2) do_pac_auth( context ); return NULL; }

1 0

Alexandre Julliard : ntdll: Don't touch the top of the 32-bit thread stack.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 26163c10bb3e1053d4f1b3d78c2d2d65d96c43d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/26163c10bb3e1053d4f1b3d78c2d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 17:48:23 2023 +0100 ntdll: Don't touch the top of the 32-bit thread stack. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 07ffb269d19..2152b5e1a77 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -97,7 +97,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "pushq %rdi\n\t" "movq %rsp,%rdi\n\t" "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ - "subl $0x10,%esp\n\t" + "subl $0x20,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ "movl %ecx,(%rsp)\n\t" /* entry_number */ "movl %edx,4(%rsp)\n\t" /* base */

1 0

Alexandre Julliard : ntdll: Pass the WoW context to the server on ARM64.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: cc0ca49a464d77cc731b97a650e0f696c04478f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc0ca49a464d77cc731b97a650e0f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 12:27:58 2023 +0100 ntdll: Pass the WoW context to the server on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 11 ++++++++++- dlls/ntdll/unix/thread.c | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3855afc34f4..186054af546 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -590,7 +590,7 @@ void *get_native_context( CONTEXT *context ) */ void *get_wow_context( CONTEXT *context ) { - return NULL; + return get_cpu_area( main_image_info.Machine ); } @@ -878,6 +878,15 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) memcpy( &context->FloatSave, &wow_frame->FloatSave, sizeof(context->FloatSave) ); context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; } + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) + { + context->Dr0 = wow_frame->Dr0; + context->Dr1 = wow_frame->Dr1; + context->Dr2 = wow_frame->Dr2; + context->Dr3 = wow_frame->Dr3; + context->Dr6 = wow_frame->Dr6; + context->Dr7 = wow_frame->Dr7; + } /* FIXME: CONTEXT_I386_XSTATE */ break; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 79943ebabc2..3228180e20f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -214,8 +214,15 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin */ static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_machine ) { - if (native_machine == wow_machine) return 0; - return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; + switch (MAKELONG( native_machine, wow_machine )) + { + case MAKELONG( IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386 ): + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_ARMNT ): + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT; + default: + return 0; + } } @@ -595,6 +602,10 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void return STATUS_SUCCESS; } + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_I386 ): + case MAKELONG( IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARM64 ): + return STATUS_SUCCESS; + default: return STATUS_INVALID_PARAMETER; } @@ -974,7 +985,6 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma ARM64_NT_CONTEXT *to = dst; to_flags = to->ContextFlags & ~CONTEXT_ARM64; - to->ContextFlags = CONTEXT_ARM64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_ARM64_CONTROL)) { to->ContextFlags |= CONTEXT_ARM64_CONTROL; @@ -1011,6 +1021,10 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma return STATUS_SUCCESS; } + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_I386 ): + case MAKELONG( IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARM64 ): + return STATUS_SUCCESS; + default: return STATUS_INVALID_PARAMETER; }

1 0

Alexandre Julliard : server: Determine the native thread context flags on the client side.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: fa47ea740020dd5bffa94b3cd835559393b2f752 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa47ea740020dd5bffa94b3cd83555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 12:24:49 2023 +0100 server: Determine the native thread context flags on the client side. --- dlls/ntdll/unix/thread.c | 15 +++++++++++++++ include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 2 ++ server/request.h | 6 ++++-- server/thread.c | 8 +++----- server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d56962e1721..79943ebabc2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -207,6 +207,18 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin } +/*********************************************************************** + * get_native_context_flags + * + * Get flags for registers that are set from the native context in WoW mode. + */ +static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_machine ) +{ + if (native_machine == wow_machine) return 0; + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; +} + + /*********************************************************************** * context_to_server * @@ -1691,6 +1703,7 @@ NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USH SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); + req->native_flags = server_contexts[0].flags & get_native_context_flags( native_machine, machine ); wine_server_add_data( req, server_contexts, count * sizeof(server_contexts[0]) ); ret = wine_server_call( req ); *self = reply->self; @@ -1717,6 +1730,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->handle = wine_server_obj_handle( handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); *self = reply->self; @@ -1734,6 +1748,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->context = wine_server_obj_handle( context_handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); count = wine_server_reply_size( reply ) / sizeof(server_contexts[0]); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ffef499df20..f61918271ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2531,8 +2531,9 @@ struct get_thread_context_request obj_handle_t handle; obj_handle_t context; unsigned int flags; + unsigned int native_flags; unsigned short machine; - char __pad_26[6]; + char __pad_30[2]; }; struct get_thread_context_reply { @@ -2548,7 +2549,9 @@ struct set_thread_context_request { struct request_header __header; obj_handle_t handle; + unsigned int native_flags; /* VARARG(contexts,contexts); */ + char __pad_20[4]; }; struct set_thread_context_reply { @@ -6355,7 +6358,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 761 +#define SERVER_PROTOCOL_VERSION 762 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 57957efdae3..c857f72ce68 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1931,6 +1931,7 @@ struct process_info obj_handle_t handle; /* thread handle */ obj_handle_t context; /* context handle */ unsigned int flags; /* context flags */ + unsigned int native_flags; /* flags for native context if WoW present */ unsigned short machine; /* context architecture */ @REPLY int self; /* was it a handle to the current thread? */ @@ -1942,6 +1943,7 @@ struct process_info /* Set the current context of a thread */ @REQ(set_thread_context) obj_handle_t handle; /* thread handle */ + unsigned int native_flags; /* flags for native context if WoW present */ VARARG(contexts,contexts); /* thread context(s) */ @REPLY int self; /* was it a handle to the current thread? */ diff --git a/server/request.h b/server/request.h index 10b877b1deb..b8d4f6a6d5e 100644 --- a/server/request.h +++ b/server/request.h @@ -1278,13 +1278,15 @@ C_ASSERT( sizeof(struct get_timer_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, context) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, flags) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, native_flags) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 28 ); C_ASSERT( sizeof(struct get_thread_context_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, self) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, handle) == 12 ); -C_ASSERT( sizeof(struct set_thread_context_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, native_flags) == 16 ); +C_ASSERT( sizeof(struct set_thread_context_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_reply, self) == 8 ); C_ASSERT( sizeof(struct set_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_selector_entry_request, handle) == 12 ); diff --git a/server/thread.c b/server/thread.c index 5f8493dd309..c9adccfef66 100644 --- a/server/thread.c +++ b/server/thread.c @@ -127,8 +127,6 @@ struct context /* flags for registers that always need to be set from the server side */ static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; -/* flags for registers that are set from the native context even in WoW mode */ -static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry ); @@ -1866,8 +1864,8 @@ DECL_HANDLER(get_thread_context) if (req->machine == thread_context->regs[CTX_WOW].machine) { - native_flags = req->flags & always_native_flags; - wow_flags = req->flags & ~always_native_flags; + native_flags = req->native_flags; + wow_flags = req->flags & ~native_flags; } if ((context = set_reply_data_size( (!!native_flags + !!wow_flags) * sizeof(context_t) ))) { @@ -1922,7 +1920,7 @@ DECL_HANDLER(set_thread_context) unsigned int ctx = CTX_NATIVE; const context_t *context = &contexts[CTX_NATIVE]; unsigned int flags = system_flags & context->flags; - unsigned int native_flags = always_native_flags & context->flags; + unsigned int native_flags = context->flags & req->native_flags; if (thread != current) stop_thread( thread ); else if (flags) set_thread_context( thread, context, flags ); diff --git a/server/trace.c b/server/trace.c index 91bc3ae7af9..fb006f605b5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2509,6 +2509,7 @@ static void dump_get_thread_context_request( const struct get_thread_context_req fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", context=%04x", req->context ); fprintf( stderr, ", flags=%08x", req->flags ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); fprintf( stderr, ", machine=%04x", req->machine ); } @@ -2522,6 +2523,7 @@ static void dump_get_thread_context_reply( const struct get_thread_context_reply static void dump_set_thread_context_request( const struct set_thread_context_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); dump_varargs_contexts( ", contexts=", cur_size ); }

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023