June 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Allow the dispatcher functions to return to the caller.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: e8753b4bc2a7a248667de54cd18808352db4f543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8753b4bc2a7a248667de54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:56:23 2021 +0200 ntdll: Allow the dispatcher functions to return to the caller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 +++++----- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cec2ef250a3..19e9d603d52 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -354,10 +354,10 @@ static int wait_select_reply( void *cookie ) /*********************************************************************** * invoke_user_apc */ -static void invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTATUS status ) +static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTATUS status ) { - call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2], - wine_server_get_ptr( apc->func ), pKiUserApcDispatcher, status ); + return call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2], + wine_server_get_ptr( apc->func ), pKiUserApcDispatcher, status ); } @@ -675,7 +675,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f } ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); - if (ret == STATUS_USER_APC) invoke_user_apc( NULL, &apc, ret ); + if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret ); /* A test on Windows 2000 shows that Windows always yields during a wait, but a wait that is hit by an event gets a priority @@ -696,7 +696,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) if (alertable) { status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); - if (status == STATUS_USER_APC) invoke_user_apc( context, &apc, status ); + if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status ); } status = NtSetContextThread( GetCurrentThread(), context ); if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 54b748e99cb..d460be909a4 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1163,7 +1163,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return NtContinue( context, FALSE ); - if (first_chance) call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); + if (first_chance) return call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); if (rec->ExceptionFlags & EH_STACK_INVALID) ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 5ebbc6d702b..e2a6ea1591f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -284,13 +284,13 @@ extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO extern void dbg_init(void) DECLSPEC_HIDDEN; -extern void WINAPI DECLSPEC_NORETURN call_user_apc_dispatcher( CONTEXT *context_ptr, ULONG_PTR arg1, - ULONG_PTR arg2, ULONG_PTR arg3, - PNTAPCFUNC func, - void (WINAPI *dispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC), - NTSTATUS status ) DECLSPEC_HIDDEN; -extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI call_user_apc_dispatcher( CONTEXT *context_ptr, ULONG_PTR arg1, + ULONG_PTR arg2, ULONG_PTR arg3, + PNTAPCFUNC func, + void (WINAPI *dispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC), + NTSTATUS status ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; extern void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) DECLSPEC_HIDDEN; #define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */

1 0

Zhiyi Zhang : winver: Enable visual styles.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: fb84605470848103b4a7895bf4c981101a41d4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb84605470848103b4a7895b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:41 2021 +0800 winver: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/Makefile.in | 2 +- programs/winver/version.rc | 5 +++++ programs/winver/winver.c | 3 +++ programs/winver/winver.manifest | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 0caef713865..8f74ab774df 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,5 +1,5 @@ MODULE = winver.exe -IMPORTS = shell32 +IMPORTS = shell32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/winver/version.rc b/programs/winver/version.rc index ae042fb82a0..c079dde644a 100644 --- a/programs/winver/version.rc +++ b/programs/winver/version.rc @@ -15,6 +15,8 @@ * 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 <windef.h> +#include <winuser.h> #define WINE_FILEDESCRIPTION_STR "Windows Version" #define WINE_FILENAME_STR "winver.exe" @@ -25,3 +27,6 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.0" #include "wine/wine_common_ver.rc" + +/* @makedep: winver.manifest */ +1 RT_MANIFEST winver.manifest diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 019eb5248b2..ee3120443eb 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -19,6 +19,7 @@ */ #include "windows.h" +#include "commctrl.h" #include "shellapi.h" int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) @@ -26,6 +27,8 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) char name[128] = "Wine "; const char * (CDECL *wine_get_version)(void); + InitCommonControls(); + wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" ); if (wine_get_version) strcat( name, wine_get_version() ); return !ShellAboutA( NULL, name, NULL, 0 ); diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest new file mode 100644 index 00000000000..519bd175c19 --- /dev/null +++ b/programs/winver/winver.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winver" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly>

1 0

Zhiyi Zhang : winevdm: Enable visual styles.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: f304b2ae23bb537029fe51983f060f680de66a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f304b2ae23bb537029fe5198… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:33 2021 +0800 winevdm: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/Makefile.in | 4 +++- programs/winevdm/winevdm.c | 3 +++ programs/winevdm/winevdm.manifest | 16 ++++++++++++++++ programs/winevdm/winevdm.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index 0ea89f4b0de..c841f3c4d46 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,6 +1,8 @@ MODULE = winevdm.exe APPMODE = -mwindows -IMPORTS = user32 kernel +IMPORTS = user32 kernel comctl32 C_SRCS = \ winevdm.c + +RC_SRCS = winevdm.rc diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 0a43e579793..1ab91f41d66 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -30,6 +30,7 @@ #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" +#include "commctrl.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -504,6 +505,8 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; + InitCommonControls(); + if (!argv[1]) usage(); if (!strcmp( argv[1], "--app-name" )) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest new file mode 100644 index 00000000000..9634ec55524 --- /dev/null +++ b/programs/winevdm/winevdm.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winevdm" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winevdm/winevdm.rc b/programs/winevdm/winevdm.rc new file mode 100644 index 00000000000..5ccf9e47151 --- /dev/null +++ b/programs/winevdm/winevdm.rc @@ -0,0 +1,25 @@ +/* + * Winevdm resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * 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 <windef.h> +#include <winuser.h> + +/* @makedep: winevdm.manifest */ +1 RT_MANIFEST winevdm.manifest

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on x86-64.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 25b093f3845a0ae1b2e2fe1c0701e98064f8e8d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b093f3845a0ae1b2e2fe1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:57:26 2021 +0200 ntdll: Switch to the kernel stack for syscalls on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 266 +++++++++++++--------------------------- tools/winebuild/import.c | 169 +++++++++++-------------- 2 files changed, 161 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25b093f3845a0ae1b2e2…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on i386.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 308a5e7c4d01525184b057058949c68c0ee77dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=308a5e7c4d01525184b05705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:57:20 2021 +0200 ntdll: Switch to the kernel stack for syscalls on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 250 ++++++++++++++++++++---------------------- tools/winebuild/import.c | 192 ++++++++++++-------------------- 2 files changed, 186 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308a5e7c4d01525184b0…

1 0

Alexandre Julliard : ntdll: Simplify the platform-specific dispatcher interface.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: fa5759b9efad3b00e8ce349889e411792748f87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5759b9efad3b00e8ce3498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 12:40:08 2021 +0200 ntdll: Simplify the platform-specific dispatcher interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 9 +++------ dlls/ntdll/unix/signal_arm.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 28 +++++++++++++--------------- dlls/ntdll/unix/signal_i386.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/signal_x86_64.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 14 +++++--------- 7 files changed, 64 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa5759b9efad3b00e8ce…

1 0

Zhiyi Zhang : winefile: Enable visual styles.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 7abfec447397f6e85058294e1bc0a5d5453cecf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7abfec447397f6e85058294e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:18 2021 +0800 winefile: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.manifest | 16 ++++++++++++++++ programs/winefile/winefile.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winefile/winefile.manifest b/programs/winefile/winefile.manifest new file mode 100644 index 00000000000..4ebd48c8933 --- /dev/null +++ b/programs/winefile/winefile.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winefile" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 4420019ec56..8d0f9940787 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -195,6 +195,9 @@ IDA_WINEFILE ACCELERATORS LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: winefile.manifest */ +1 RT_MANIFEST winefile.manifest + /* @makedep: winefile.ico */ IDI_WINEFILE ICON winefile.ico

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on ARM.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 7954b86f6b417e7dfb2d8eab7d9c85c06ef123b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7954b86f6b417e7dfb2d8eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 11:24:28 2021 +0200 ntdll: Switch to the kernel stack for syscalls on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 271 ++++++++++++++++++++++++++----------------- tools/winebuild/import.c | 52 ++++++--- 2 files changed, 200 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7954b86f6b417e7dfb2d…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on ARM64.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 08c4419a49655801cba2b71ea327534ff7fd4278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c4419a49655801cba2b71e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 11:17:36 2021 +0200 ntdll: Switch to the kernel stack for syscalls on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 273 ++++++++++++++++++++++++----------------- tools/winebuild/import.c | 155 +++++++++++++++-------- 2 files changed, 267 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08c4419a49655801cba2…

1 0

Zhiyi Zhang : winemine: Enable visual styles.
by Alexandre Julliard June 11, 2021

June 11, 2021

Module: wine Branch: master Commit: 6c6cfb913b30905352612c9c19e1ac12d4d87f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6cfb913b30905352612c9c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:26 2021 +0800 winemine: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/Makefile.in | 2 +- programs/winemine/main.c | 3 +++ programs/winemine/winemine.manifest | 16 ++++++++++++++++ programs/winemine/winemine.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 8f5aebd9645..5ae0eaf2c62 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -1,5 +1,5 @@ MODULE = winemine.exe -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 comctl32 DELAYIMPORTS = shell32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 37ce1927047..cd0763042d3 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -23,6 +23,7 @@ #include <string.h> #include <time.h> #include <windows.h> +#include <commctrl.h> #include <stdlib.h> #include <shellapi.h> #include "main.h" @@ -1012,6 +1013,8 @@ int WINAPI wWinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int c HACCEL haccel; WCHAR appname[20]; + InitCommonControls(); + LoadStringW( hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); wc.cbSize = sizeof(wc); diff --git a/programs/winemine/winemine.manifest b/programs/winemine/winemine.manifest new file mode 100644 index 00000000000..8850b090e37 --- /dev/null +++ b/programs/winemine/winemine.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winemine" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winemine/winemine.rc b/programs/winemine/winemine.rc index 5bbd68247b8..1e1bdeae5bc 100644 --- a/programs/winemine/winemine.rc +++ b/programs/winemine/winemine.rc @@ -105,6 +105,9 @@ IDA_WINEMINE ACCELERATORS LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL +/* @makedep: winemine.manifest */ +1 RT_MANIFEST winemine.manifest + /* @makedep: winemine.ico */ IDI_WINEMINE ICON winemine.ico

1 0