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

Piotr Caban : wineps: Fix return value in path drawing routines.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: ee972bf06132811217ff084332d06f689a063ad3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee972bf06132811217ff084332d06f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 10:45:22 2023 +0200 wineps: Fix return value in path drawing routines. --- dlls/wineps.drv/graphics.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index fc7dcb9fec8..469a1587464 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -490,7 +490,6 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) { POINT *points; BYTE *types; - BOOL ret = FALSE; int i, size = GetPath( dev->hdc, NULL, NULL, 0 ); if (size == -1) return FALSE; @@ -536,7 +535,7 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) done: HeapFree( GetProcessHeap(), 0, points ); HeapFree( GetProcessHeap(), 0, types ); - return ret; + return TRUE; } /***********************************************************************

1 0

Piotr Caban : wineps: Continue printing if path drawing function returns error.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 9b98c90e6e573d41e770948db57fe4944f37212e URL: https://gitlab.winehq.org/wine/wine/-/commit/9b98c90e6e573d41e770948db57fe4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 10:46:47 2023 +0200 wineps: Continue printing if path drawing function returns error. --- dlls/wineps.drv/printproc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index af76b76a2ba..69ee1041b69 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2605,11 +2605,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLPATH: - return PSDRV_FillPath(&data->pdev->dev); + PSDRV_FillPath(&data->pdev->dev); + return 1; case EMR_STROKEANDFILLPATH: - return PSDRV_StrokeAndFillPath(&data->pdev->dev); + PSDRV_StrokeAndFillPath(&data->pdev->dev); + return 1; case EMR_STROKEPATH: - return PSDRV_StrokePath(&data->pdev->dev); + PSDRV_StrokePath(&data->pdev->dev); + return 1; case EMR_ABORTPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Reset memory DC state on every page.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 537c9655e0fc3c5a12ff3475da6e0368b5d52893 URL: https://gitlab.winehq.org/wine/wine/-/commit/537c9655e0fc3c5a12ff3475da6e03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 11:03:25 2023 +0200 wineps: Reset memory DC state on every page. --- dlls/wineps.drv/printproc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 69ee1041b69..914fc23f69e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -3003,6 +3003,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, static BOOL print_metafile(struct pp_data *data, HANDLE hdata) { + XFORM xform = { .eM11 = 1, .eM22 = 1 }; record_hdr header; HENHMETAFILE hmf; BYTE *buf; @@ -3038,6 +3039,20 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) if (!hmf) return FALSE; + AbortPath(data->pdev->dev.hdc); + SetBkColor(data->pdev->dev.hdc, RGB(255, 255, 255)); + SetBkMode(data->pdev->dev.hdc, OPAQUE); + SetMapMode(data->pdev->dev.hdc, MM_TEXT); + SetPolyFillMode(data->pdev->dev.hdc, ALTERNATE); + SetROP2(data->pdev->dev.hdc, R2_COPYPEN); + SetStretchBltMode(data->pdev->dev.hdc, BLACKONWHITE); + SetTextAlign(data->pdev->dev.hdc, TA_LEFT | TA_TOP); + SetTextColor(data->pdev->dev.hdc, 0); + SetTextJustification(data->pdev->dev.hdc, 0, 0); + SetWorldTransform(data->pdev->dev.hdc, &xform); + PSDRV_SetTextColor(&data->pdev->dev, 0); + PSDRV_SetBkColor(&data->pdev->dev, RGB(255, 255, 255)); + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, (void *)data, NULL); DeleteEnhMetaFile(hmf); free(data->patterns); @@ -3133,9 +3148,6 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) data->pdev->dev.next = &data->font_dev; data->font_dev.funcs = &font_funcs; data->font_dev.hdc = hdc; - - PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); - PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); return (HANDLE)data; }

1 0

Mohamad Al-Jaf : include: Add appnotify.h file.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 4ce24eb9be5c7f2896a91d1d554b20f2b8266d3f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ce24eb9be5c7f2896a91d1d554b20… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 14:03:09 2023 -0400 include: Add appnotify.h file. --- include/Makefile.in | 1 + include/appnotify.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7a6e5d62763..c957fed884c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -19,6 +19,7 @@ SOURCES = \ appcompatapi.h \ appmgmt.h \ appmodel.h \ + appnotify.h \ asferr.h \ asptlb.idl \ asyncinfo.idl \ diff --git a/include/appnotify.h b/include/appnotify.h new file mode 100644 index 00000000000..882b0342afb --- /dev/null +++ b/include/appnotify.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINE_APISET_PSMAPPNOTIFY_H_ +#define _WINE_APISET_PSMAPPNOTIFY_H_ + +#include <windows.h> + +#ifdef _CONTRACT_GEN +#define PSM_APP_API_HOST +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(PSM_APP_API_HOST) +#define APICONTRACT +#else +#define APICONTRACT DECLSPEC_IMPORT +#endif + +typedef void (__cdecl *PAPPSTATE_CHANGE_ROUTINE)(BOOLEAN quiesced, void *context); + +typedef struct _APPSTATE_REGISTRATION *PAPPSTATE_REGISTRATION; + +APICONTRACT ULONG NTAPI RegisterAppStateChangeNotification(PAPPSTATE_CHANGE_ROUTINE,void *,PAPPSTATE_REGISTRATION *); +APICONTRACT void NTAPI UnregisterAppStateChangeNotification(PAPPSTATE_REGISTRATION); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINE_APISET_PSMAPPNOTIFY_H_ */

1 0

Mohamad Al-Jaf : twinapi.appcore: Add stub DLL.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 4d61854dc142494f2b3d60e4548226fb22841ab8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d61854dc142494f2b3d60e4548226… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 14:08:30 2023 -0400 twinapi.appcore: Add stub DLL. --- configure | 2 + configure.ac | 1 + dlls/twinapi.appcore/Makefile.in | 1 + dlls/twinapi.appcore/twinapi.appcore.spec | 127 ++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+) diff --git a/configure b/configure index 86d4e00fa0f..d9853deb0c7 100755 --- a/configure +++ b/configure @@ -1411,6 +1411,7 @@ enable_tdi_sys enable_threadpoolwinrt enable_traffic enable_twain_32 +enable_twinapi_appcore enable_tzres enable_ucrtbase enable_uianimation @@ -21801,6 +21802,7 @@ wine_fn_config_makefile dlls/traffic enable_traffic wine_fn_config_makefile dlls/twain.dll16 enable_win16 wine_fn_config_makefile dlls/twain_32 enable_twain_32 wine_fn_config_makefile dlls/twain_32/tests enable_tests +wine_fn_config_makefile dlls/twinapi.appcore enable_twinapi_appcore wine_fn_config_makefile dlls/typelib.dll16 enable_win16 wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase diff --git a/configure.ac b/configure.ac index 4bb1efb3b7b..e96131953c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3040,6 +3040,7 @@ WINE_CONFIG_MAKEFILE(dlls/traffic) WINE_CONFIG_MAKEFILE(dlls/twain.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/twain_32) WINE_CONFIG_MAKEFILE(dlls/twain_32/tests) +WINE_CONFIG_MAKEFILE(dlls/twinapi.appcore) WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) diff --git a/dlls/twinapi.appcore/Makefile.in b/dlls/twinapi.appcore/Makefile.in new file mode 100644 index 00000000000..b6e31708d9d --- /dev/null +++ b/dlls/twinapi.appcore/Makefile.in @@ -0,0 +1 @@ +MODULE = twinapi.appcore.dll diff --git a/dlls/twinapi.appcore/twinapi.appcore.spec b/dlls/twinapi.appcore/twinapi.appcore.spec new file mode 100644 index 00000000000..cda1c38103f --- /dev/null +++ b/dlls/twinapi.appcore/twinapi.appcore.spec @@ -0,0 +1,127 @@ +@ stub ValidateSystemShutdown +@ stub BiActivateWorkItemForUser +@ stub BiChangeApplicationStateForPackageName +@ stub BiChangeApplicationStateForPackageNameForUser +@ stub BiChangeApplicationStateForPsmKey +@ stub BiChangeApplicationStateForPsmKeyForUser +@ stub BiChangeSessionState +@ stub BiChangeUserState +@ stub BiEnumerateWorkItemsForPackageNameAndUser +@ stub BiGetActiveBackgroundTasksEvent +@ stub BiGetActiveBackgroundTasksEventForUser +@ stub BiGetCancellationTimeoutInMs +@ stub BiIsApplicationTerminateSensitive +@ stub BiIsApplicationTerminateSensitiveForUser +@ stub BiNotifyNewSession +@ stub BiNotifyNewSessionComplete +@ stub BiNotifyNewUser +@ stub BiPlmFreeMemory +@ stub BiPtActivateDeferredWorkItem +@ stub BiPtActivateInBackground +@ stub BiPtActivateInBackgroundEx +@ stub BiPtActivateWorkItem +@ stub BiPtAssociateActivationProxy +@ stub BiPtAssociateApplicationEntryPoint +@ stub BiPtAssociateApplicationExtensionClass +@ stub BiPtCancelWorkItem +@ stub BiPtCancelWorkItemEx +@ stub BiPtCreateEvent +@ stub BiPtCreateEventForApp +@ stub BiPtCreateEventForPackageName +@ stub BiPtDeleteEvent +@ stub BiPtDisableWorkItem +@ stub BiPtDisassociateWorkItem +@ stub BiPtDisassociateWorkItemEx +@ stub BiPtEnableWorkItem +@ stub BiPtEnumerateBrokeredEvents +@ stub BiPtEnumerateBrokeredEventsEx +@ stub BiPtEnumerateWorkItemsForPackageName +@ stub BiPtEnumerateWorkItemsForPackageNameEx +@ stub BiPtFreeMemory +@ stub BiPtGetStatusStateNameFromBrokerEventId +@ stub BiPtQueryBrokerEventId +@ stub BiPtQueryBrokeredEvent +@ stub BiPtQuerySystemStateBroadcastChannels +@ stub BiPtQueryWorkItem +@ stub BiPtQueryWorkItemEx +@ stub BiPtQueryWorkItemStatusStateName +@ stub BiPtSignalEvent +@ stub BiPtSignalEventEx +@ stub BiPtSignalMultipleEvents +@ stub BiPtSignalTriggerEvent +@ stub BiPtSignalTriggerEventEx +@ stub BiQueryWorkItemForUser +@ stub BiResetActiveSessionForPackage +@ stub BiResetActiveUserForPackage +@ stub BiSetActiveSessionForPackage +@ stub BiSetActiveUserForPackage +@ stub BiTerminateApplicationHost +@ stub BiTerminateApplicationHost2 +@ stub BiTerminateApplicationHostForUser +@ stub BiUpdateBackgroundAccessApplicationsForUser +@ stub BiUpdateLockScreenApplications +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub PsmApplyTaskCompletion +@ stub PsmBlockAppStateChangeCompletion +@ stub PsmDisconnect +@ stub PsmGetSessionInfo +@ stub PsmInitializeExtension +@ stub PsmIsProcessInApplication +@ stub PsmIsProcessInApplication2 +@ stub PsmQueryApplicationInformation +@ stub PsmQueryApplicationInformation2 +@ stub PsmQueryApplicationInterferenceCount +@ stub PsmQueryApplicationInterferenceCount2 +@ stub PsmQueryApplicationList +@ stub PsmQueryApplicationList2 +@ stub PsmQueryApplicationProperties +@ stub PsmQueryApplicationProperties2 +@ stub PsmQueryApplicationProperties3 +@ stub PsmQueryApplicationPropertiesByUser +@ stub PsmQueryApplicationResourceUsage +@ stub PsmQueryApplicationResourceUsage2 +@ stub PsmQueryApplicationResourceUsageForTimer +@ stub PsmQueryCurrentAppState +@ stub PsmQueryMaxMemoryUsage +@ stub PsmQueryMaxMemoryUsage2 +@ stub PsmQueryMemoryUsage +@ stub PsmQueryMemoryUsage2 +@ stub PsmQueryMemoryUsageByUser +@ stub PsmQueryProcessList +@ stub PsmQueryProcessList2 +@ stub PsmQuerySharedCommitByUser +@ stub PsmQueryTaskCompletionInformation +@ stub PsmQueryTaskCompletionInformation2 +@ stub PsmRegisterAppPriorityNotification +@ stub PsmRegisterAppStateChangeNotification +@ stub PsmRegisterApplicationNotification +@ stub PsmRegisterApplicationNotification2 +@ stub PsmRegisterDynamicProcess +@ stub PsmRegisterKeyNotification +@ stub PsmRegisterManagerType +@ stub PsmResetMaxMemoryUsage +@ stub PsmResetMaxMemoryUsage2 +@ stub PsmResetMaxMemoryUsageByUser +@ stub PsmSetApplicationPriority +@ stub PsmSetApplicationPriority2 +@ stub PsmSetApplicationProperties +@ stub PsmSetApplicationProperties2 +@ stub PsmSetApplicationProperties3 +@ stub PsmSetApplicationPropertiesByUser +@ stub PsmSetApplicationState +@ stub PsmSetApplicationState2 +@ stub PsmShutdownApplication +@ stub PsmTimerCleanup +@ stub PsmTimerElapsedResourceTimeGet +@ stub PsmTimerInitialize +@ stub PsmTimerRemainingResourceTimeGet +@ stub PsmTimerStart +@ stub PsmUnblockAppStateChangeCompletion +@ stub PsmUnregisterAppStateChangeNotification +@ stub PsmWaitForAppResume +@ stub RegisterAppConstrainedChangeNotification +@ stub RegisterAppStateChangeNotification +@ stub UnregisterAppConstrainedChangeNotification +@ stub UnregisterAppStateChangeNotification

1 0

Mohamad Al-Jaf : twinapi.appcore: Add RegisterAppStateChangeNotification stub.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 5ff1242c9469e3bd39929c7ade7469df82e7e53a URL: https://gitlab.winehq.org/wine/wine/-/commit/5ff1242c9469e3bd39929c7ade7469… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 20:25:00 2023 -0400 twinapi.appcore: Add RegisterAppStateChangeNotification stub. Needed for Minecraft Legends. --- dlls/twinapi.appcore/Makefile.in | 4 ++++ dlls/twinapi.appcore/main.c | 31 +++++++++++++++++++++++++++++++ dlls/twinapi.appcore/twinapi.appcore.spec | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/twinapi.appcore/Makefile.in b/dlls/twinapi.appcore/Makefile.in index b6e31708d9d..a0095988f7f 100644 --- a/dlls/twinapi.appcore/Makefile.in +++ b/dlls/twinapi.appcore/Makefile.in @@ -1 +1,5 @@ +EXTRADEFS = -D_CONTRACT_GEN MODULE = twinapi.appcore.dll + +C_SRCS = \ + main.c diff --git a/dlls/twinapi.appcore/main.c b/dlls/twinapi.appcore/main.c new file mode 100644 index 00000000000..dcaee58c5ef --- /dev/null +++ b/dlls/twinapi.appcore/main.c @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "appnotify.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twinapi); + +/*********************************************************************** + * RegisterAppStateChangeNotification (twinapi.appcore.@) + */ +ULONG WINAPI RegisterAppStateChangeNotification( PAPPSTATE_CHANGE_ROUTINE routine, void *context, PAPPSTATE_REGISTRATION *reg ) +{ + FIXME( "routine %p, context %p, reg %p - stub.\n", routine, context, reg ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/twinapi.appcore/twinapi.appcore.spec b/dlls/twinapi.appcore/twinapi.appcore.spec index cda1c38103f..9052c4e7cf5 100644 --- a/dlls/twinapi.appcore/twinapi.appcore.spec +++ b/dlls/twinapi.appcore/twinapi.appcore.spec @@ -122,6 +122,6 @@ @ stub PsmUnregisterAppStateChangeNotification @ stub PsmWaitForAppResume @ stub RegisterAppConstrainedChangeNotification -@ stub RegisterAppStateChangeNotification +@ stdcall RegisterAppStateChangeNotification(ptr ptr ptr) @ stub UnregisterAppConstrainedChangeNotification @ stub UnregisterAppStateChangeNotification

1 0

Mohamad Al-Jaf : twinapi.appcore: Add UnregisterAppStateChangeNotification stub.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 1a4be359489c75ef3077121a4852ce308e084a06 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a4be359489c75ef3077121a4852ce… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 20:27:10 2023 -0400 twinapi.appcore: Add UnregisterAppStateChangeNotification stub. --- dlls/twinapi.appcore/main.c | 8 ++++++++ dlls/twinapi.appcore/twinapi.appcore.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/twinapi.appcore/main.c b/dlls/twinapi.appcore/main.c index dcaee58c5ef..99e413f8946 100644 --- a/dlls/twinapi.appcore/main.c +++ b/dlls/twinapi.appcore/main.c @@ -29,3 +29,11 @@ ULONG WINAPI RegisterAppStateChangeNotification( PAPPSTATE_CHANGE_ROUTINE routin FIXME( "routine %p, context %p, reg %p - stub.\n", routine, context, reg ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * UnregisterAppStateChangeNotification (twinapi.appcore.@) + */ +void WINAPI UnregisterAppStateChangeNotification( PAPPSTATE_REGISTRATION reg ) +{ + FIXME( "reg %p - stub.\n", reg ); +} diff --git a/dlls/twinapi.appcore/twinapi.appcore.spec b/dlls/twinapi.appcore/twinapi.appcore.spec index 9052c4e7cf5..0b2d8d2055e 100644 --- a/dlls/twinapi.appcore/twinapi.appcore.spec +++ b/dlls/twinapi.appcore/twinapi.appcore.spec @@ -124,4 +124,4 @@ @ stub RegisterAppConstrainedChangeNotification @ stdcall RegisterAppStateChangeNotification(ptr ptr ptr) @ stub UnregisterAppConstrainedChangeNotification -@ stub UnregisterAppStateChangeNotification +@ stdcall UnregisterAppStateChangeNotification(ptr)

1 0

Mohamad Al-Jaf : apisetschema: Add api-ms-win-core-psm-appnotify-l1-1-0.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 041a7990a356d22bfb1186b4184f67c04b477df1 URL: https://gitlab.winehq.org/wine/wine/-/commit/041a7990a356d22bfb1186b4184f67… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 14:16:51 2023 -0400 apisetschema: Add api-ms-win-core-psm-appnotify-l1-1-0. Needed for Minecraft Legends. --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index 981b80c6976..122cd1209ba 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -99,6 +99,7 @@ apiset api-ms-win-core-psapi-ansi-l1-1-0 = kernelbase.dll apiset api-ms-win-core-psapi-l1-1-0 = kernelbase.dll apiset api-ms-win-core-psapi-obsolete-l1-1-0 = kernelbase.dll apiset api-ms-win-core-psapiansi-l1-1-0 = kernelbase.dll +apiset api-ms-win-core-psm-appnotify-l1-1-0 = twinapi.appcore.dll apiset api-ms-win-core-psm-key-l1-1-1 = kernelbase.dll apiset api-ms-win-core-quirks-l1-1-0 = kernelbase.dll apiset api-ms-win-core-realtime-l1-1-0 = kernelbase.dll

1 0

Alexandre Julliard : ntdll: Use a separate memory allocation for the kernel stack.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 871f333d55c2c472014a861bfdd256c1f497dd40 URL: https://gitlab.winehq.org/wine/wine/-/commit/871f333d55c2c472014a861bfdd256… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 25 15:52:26 2023 +0200 ntdll: Use a separate memory allocation for the kernel stack. --- dlls/ntdll/unix/thread.c | 35 ++++++++++++++++------------------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 38 +++++++++++--------------------------- 3 files changed, 28 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 9b0b5f7ce22..2686a8365cf 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1181,37 +1181,36 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, INITIAL_TEB stack; NTSTATUS status; + /* kernel stack */ + if ((status = virtual_alloc_thread_stack( &stack, 0, kernel_stack_size, kernel_stack_size, FALSE ))) + return status; + thread_data->kernel_stack = stack.DeallocationStack; + if (wow_teb) { WOW64_CPURESERVED *cpu; SIZE_T cpusize = sizeof(WOW64_CPURESERVED) + ((get_machine_context_size( main_image_info.Machine ) + 7) & ~7) + sizeof(ULONG64); + /* 64-bit stack */ + if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, TRUE ))) return status; + cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); + cpu->Machine = main_image_info.Machine; + #ifdef _WIN64 + teb->Tib.StackBase = teb->TlsSlots[WOW64_TLS_CPURESERVED] = cpu; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + /* 32-bit stack */ if ((status = virtual_alloc_thread_stack( &stack, zero_bits ? zero_bits : 0x7fffffff, - reserve_size, commit_size, 0 ))) + reserve_size, commit_size, TRUE ))) return status; wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); wow_teb->DeallocationStack = PtrToUlong( stack.DeallocationStack ); - - /* 64-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, kernel_stack_size ))) - return status; - cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); - cpu->Machine = main_image_info.Machine; - teb->Tib.StackBase = teb->TlsSlots[WOW64_TLS_CPURESERVED] = cpu; - teb->Tib.StackLimit = stack.StackLimit; - teb->DeallocationStack = stack.DeallocationStack; - thread_data->kernel_stack = stack.StackBase; return STATUS_SUCCESS; #else - /* 64-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, 0 ))) return status; - - cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); - cpu->Machine = main_image_info.Machine; wow_teb->Tib.StackBase = wow_teb->TlsSlots[WOW64_TLS_CPURESERVED] = PtrToUlong( cpu ); wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); wow_teb->DeallocationStack = PtrToUlong( stack.DeallocationStack ); @@ -1219,13 +1218,11 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, } /* native stack */ - if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, - commit_size, kernel_stack_size ))) + if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, TRUE ))) return status; teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; - thread_data->kernel_stack = stack.StackBase; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b803b1cef46..e72b435c65a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -233,7 +233,7 @@ extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, - SIZE_T commit_size, SIZE_T extra_size ) DECLSPEC_HIDDEN; + SIZE_T commit_size, BOOL guard_page ) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0faf3e343e3..7769d2c31f5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -726,8 +726,7 @@ static void free_ranges_insert_view( struct file_view *view ) assert( range != free_ranges_end ); assert( range->end > view_base || next != free_ranges_end ); - /* this happens because virtual_alloc_thread_stack shrinks a view, then creates another one on top, - * or because AT_ROUND_TO_PAGE was used with NtMapViewOfSection to force 4kB aligned mapping. */ + /* this happens because AT_ROUND_TO_PAGE was used with NtMapViewOfSection to force 4kB aligned mapping. */ if ((range->end > view_base && range->base >= view_end) || (range->end == view_base && next->base >= view_end)) { @@ -3106,7 +3105,7 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) * virtual_alloc_thread_stack */ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, - SIZE_T commit_size, SIZE_T extra_size ) + SIZE_T commit_size, BOOL guard_page ) { struct file_view *view; NTSTATUS status; @@ -3122,9 +3121,8 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - if ((status = map_view( &view, NULL, size + extra_size, FALSE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, get_zero_bits_mask( zero_bits ), 0 )) - != STATUS_SUCCESS) + if ((status = map_view( &view, NULL, size, FALSE, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, + get_zero_bits_mask( zero_bits ), 0 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -3132,35 +3130,21 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI #endif /* setup no access guard page */ - set_page_vprot( view->base, page_size, VPROT_COMMITTED ); - set_page_vprot( (char *)view->base + page_size, page_size, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); - mprotect_range( view->base, 2 * page_size, 0, 0 ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); - - if (extra_size) + if (guard_page) { - struct file_view *extra_view; - - /* shrink the first view and create a second one for the extra size */ - /* this allows the app to free the stack without freeing the thread start portion */ - view->size -= extra_size; - status = create_view( &extra_view, (char *)view->base + view->size, extra_size, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); - if (status != STATUS_SUCCESS) - { - view->size += extra_size; - delete_view( view ); - goto done; - } + set_page_vprot( view->base, page_size, VPROT_COMMITTED ); + set_page_vprot( (char *)view->base + page_size, page_size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); + mprotect_range( view->base, 2 * page_size , 0, 0 ); } + VIRTUAL_DEBUG_DUMP_VIEW( view ); /* note: limit is lower than base since the stack grows down */ stack->OldStackBase = 0; stack->OldStackLimit = 0; stack->DeallocationStack = view->base; stack->StackBase = (char *)view->base + view->size; - stack->StackLimit = (char *)view->base + 2 * page_size; + stack->StackLimit = (char *)view->base + (guard_page ? 2 * page_size : 0); done: server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status;

1 0

Stefan Dösinger : d3d9/tests: Radeon GPUs don't draw from sysmem textures.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: e5f149a81a8fc07219160d95fae8a46406dcbb89 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5f149a81a8fc07219160d95fae8a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 7 12:52:17 2022 +0300 d3d9/tests: Radeon GPUs don't draw from sysmem textures. --- dlls/d3d9/tests/visual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2c83965f0cb..f82bb1e921c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19782,7 +19782,9 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Failed to set texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + /* Radeon GPUs read zero from sysmem textures. */ + ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); /* Tests with managed textures. */ fill_surface(surface_managed0, 0x00ff0000, 0);

1 0