wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Gabriel Ivăncescu : msscript.ocx: Implement the ScriptModule enumerator.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: c7aa513a3b08f18687085e26ecd591a2491b13f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7aa513a3b08f18687085e26… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 4 17:28:12 2020 +0300 msscript.ocx: Implement the ScriptModule enumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 163 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 134 +++++++++++++++++++++++++++++- 2 files changed, 294 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7aa513a3b08f1868708…

1 0

Nikolay Sivov : combase: Move CreateErrorInfo() function.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 7f43de677adc41e4ebb1cd73e5c1d55f68a43a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f43de677adc41e4ebb1cd73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:38 2020 +0300 combase: Move CreateErrorInfo() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 + dlls/combase/combase.spec | 2 +- dlls/combase/errorinfo.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/errorinfo.c | 356 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 360 insertions(+), 358 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f43de677adc41e4ebb1…

1 0

Nikolay Sivov : combase: Move HACCEL marshalling functions.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 4ae64d59de4502b538d32186384179089609bcd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae64d59de4502b538d32186… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:37 2020 +0300 combase: Move HACCEL marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 +++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++--- dlls/ole32/usrmarshal.c | 74 ----------------------------------------------- 4 files changed, 9 insertions(+), 78 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3c0955f705..f1aaa44205 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -185,6 +185,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HACCEL_UserFree(ptr ptr) +@ stdcall HACCEL_UserMarshal(ptr ptr ptr) +@ stdcall HACCEL_UserSize(ptr long ptr) +@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) @ stdcall HBITMAP_UserFree(ptr ptr) @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 7c77cc1a80..8bea32cdd5 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ } +IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HBRUSH) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c3ee8f27f2..9a6ec7cb71 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -123,10 +123,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) @ stub GetHookInterface @ stdcall GetRunningObjectTable(long ptr) -@ stdcall HACCEL_UserFree(ptr ptr) -@ stdcall HACCEL_UserMarshal(ptr ptr ptr) -@ stdcall HACCEL_UserSize(ptr long ptr) -@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) +@ stdcall HACCEL_UserFree(ptr ptr) combase.HACCEL_UserFree +@ stdcall HACCEL_UserMarshal(ptr ptr ptr) combase.HACCEL_UserMarshal +@ stdcall HACCEL_UserSize(ptr long ptr) combase.HACCEL_UserSize +@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) combase.HACCEL_UserUnmarshal @ stdcall HBITMAP_UserFree(ptr ptr) combase.HBITMAP_UserFree @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) combase.HBITMAP_UserMarshal @ stdcall HBITMAP_UserSize(ptr long ptr) combase.HBITMAP_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index a5daa94983..c58053489b 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -82,80 +82,6 @@ static const char* debugstr_user_flags(ULONG *pFlags) return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); } -static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) -{ - if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) - { - ERR("can't remote a local handle\n"); - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - return StartingSize; - } - - ALIGN_LENGTH(StartingSize, 3); - return StartingSize + sizeof(RemotableHandle); -} - -static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) -{ - RemotableHandle *remhandle; - if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) - { - ERR("can't remote a local handle\n"); - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - return pBuffer; - } - - ALIGN_POINTER(pBuffer, 3); - remhandle = (RemotableHandle *)pBuffer; - remhandle->fContext = WDT_INPROC_CALL; - remhandle->u.hInproc = (LONG_PTR)*handle; - return pBuffer + sizeof(RemotableHandle); -} - -static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) -{ - RemotableHandle *remhandle; - - ALIGN_POINTER(pBuffer, 3); - remhandle = (RemotableHandle *)pBuffer; - if (remhandle->fContext != WDT_INPROC_CALL) - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; - return pBuffer + sizeof(RemotableHandle); -} - -static void handle_UserFree(ULONG *pFlags, HANDLE *handle) -{ - /* nothing to do */ -} - -#define IMPL_WIREM_HANDLE(type) \ - ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ - { \ - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \ - return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ - } \ - \ - unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ - { \ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ - return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \ - } \ - \ - unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ - { \ - TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \ - return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ - } \ - \ - void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ - { \ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ - handle_UserFree(pFlags, (HANDLE *)handle); \ - } - -IMPL_WIREM_HANDLE(HACCEL) - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] *

1 0

Nikolay Sivov : combase: Move HGLOBAL marshalling functions.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: f6f9dd81a7b600b5a2b85c1a3db897ad23b4ab97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f9dd81a7b600b5a2b85c1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 17:02:36 2020 +0300 combase: Move HGLOBAL marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 219 ---------------------------------------------- 4 files changed, 227 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f9dd81a7b600b5a2b8…

1 0

Louis Lenders : api-ms-win-core-file-ansi-l2-1-0: Add dll.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 470e4828d114420a82e19ed3a7e4d550da8c4706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470e4828d114420a82e19ed3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:02 2020 +0200 api-ms-win-core-file-ansi-l2-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49477 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-file-ansi-l2-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index f7fbde0d65..13c2078221 100755 --- a/configure +++ b/configure @@ -944,6 +944,7 @@ enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_errorhandling_l1_1_3 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 +enable_api_ms_win_core_file_ansi_l2_1_0 enable_api_ms_win_core_file_fromapp_l1_1_0 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 @@ -20319,6 +20320,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-3 enable_api_ms_win_core_errorhandling_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-file-ansi-l2-1-0 enable_api_ms_win_core_file_ansi_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-fromapp-l1-1-0 enable_api_ms_win_core_file_fromapp_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 diff --git a/configure.ac b/configure.ac index 890184151d..d54857181e 100644 --- a/configure.ac +++ b/configure.ac @@ -2862,6 +2862,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-fromapp-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-0) diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in new file mode 100644 index 0000000000..087fadd251 --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec new file mode 100644 index 0000000000..0eb7398aff --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall CopyFileExA(str str ptr ptr ptr long) kernel32.CopyFileExA +@ stdcall ReplaceFileA(str str str long ptr ptr) kernel32.ReplaceFileA diff --git a/tools/make_specfiles b/tools/make_specfiles index a740a60c4c..2af4606984 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -237,6 +237,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2", + "api-ms-win-core-file-ansi-l2-1-0", "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0",

1 0

Louis Lenders : api-ms-win-core-file-fromapp-l1-1-0: Add dll.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 0f040213280a9e20c4c4510e5b906c7a919d6593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f040213280a9e20c4c4510e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:01 2020 +0200 api-ms-win-core-file-fromapp-l1-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49477 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-file-fromapp-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 9b66ddd2b8..f7fbde0d65 100755 --- a/configure +++ b/configure @@ -944,6 +944,7 @@ enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_errorhandling_l1_1_3 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 +enable_api_ms_win_core_file_fromapp_l1_1_0 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l1_2_1 @@ -20318,6 +20319,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-3 enable_api_ms_win_core_errorhandling_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-file-fromapp-l1-1-0 enable_api_ms_win_core_file_fromapp_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 diff --git a/configure.ac b/configure.ac index ab183b9d14..890184151d 100644 --- a/configure.ac +++ b/configure.ac @@ -2862,6 +2862,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-fromapp-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-1) diff --git a/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in b/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in new file mode 100644 index 0000000000..15294e7fad --- /dev/null +++ b/dlls/api-ms-win-core-file-fromapp-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-fromapp-l1-1-0.dll diff --git a/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec b/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec new file mode 100644 index 0000000000..e0f5875885 --- /dev/null +++ b/dlls/api-ms-win-core-file-fromapp-l1-1-0/api-ms-win-core-file-fromapp-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub CopyFileFromAppW +@ stub CreateDirectoryFromAppW +@ stub CreateFile2FromAppW +@ stub CreateFileFromAppW +@ stub DeleteFileFromAppW +@ stub FindFirstFileExFromAppW +@ stub GetFileAttributesExFromAppW +@ stub MoveFileFromAppW +@ stub RemoveDirectoryFromAppW +@ stub ReplaceFileFromAppW +@ stub SetFileAttributesFromAppW diff --git a/tools/make_specfiles b/tools/make_specfiles index d0ac39b4e6..a740a60c4c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -237,6 +237,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2", + "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0",

1 0

Louis Lenders : api-ms-win-core-memory-l1-1-3: Add dll.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: c1202d43a810cf9af03c6f8636cdd5bfe8872290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1202d43a810cf9af03c6f86… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:00 2020 +0200 api-ms-win-core-memory-l1-1-3: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49477 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-3/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-3.spec | 31 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 36 insertions(+) diff --git a/configure b/configure index 244b66545e..9b66ddd2b8 100755 --- a/configure +++ b/configure @@ -985,6 +985,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 +enable_api_ms_win_core_memory_l1_1_3 enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_ansi_l1_1_0 @@ -20358,6 +20359,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-localregistry-l1-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-3 enable_api_ms_win_core_memory_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-ansi-l1-1-0 enable_api_ms_win_core_namedpipe_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 47d0471169..ab183b9d14 100644 --- a/configure.ac +++ b/configure.ac @@ -2903,6 +2903,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-3/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-3/Makefile.in new file mode 100644 index 0000000000..9f5b0aae91 --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-3.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec new file mode 100644 index 0000000000..b0d402b24c --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec @@ -0,0 +1,31 @@ +@ stub CreateFileMappingFromApp +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stub DiscardVirtualMemory +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stub MapViewOfFileFromApp +@ stub OfferVirtualMemory +@ stub OpenFileMappingFromApp +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory +@ stub ReclaimVirtualMemory +@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch +@ stub SetProcessValidCallTargets +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stub UnmapViewOfFileEx +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stub VirtualAllocFromApp +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualLock(ptr long) kernel32.VirtualLock +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stub VirtualProtectFromApp +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx +@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory diff --git a/tools/make_specfiles b/tools/make_specfiles index f60fbbf6d2..d0ac39b4e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -262,6 +262,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2", + "api-ms-win-core-memory-l1-1-3", "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-privateprofile-l1-1-1",

1 0

Derek Lesho : ntoskrnl.exe: Add stubs for Ke(/Test)AlertThread.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: c2a32a3a3c4a75abfede93a66cb1f072cfe0029b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a32a3a3c4a75abfede93a6… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:11 2020 -0500 ntoskrnl.exe: Add stubs for Ke(/Test)AlertThread. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/ntoskrnl.exe/sync.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2376226dc6..4d39f8eea2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -529,6 +529,7 @@ @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ stdcall -arch=!i386 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable +@ stdcall KeAlertThread(ptr long) @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @ stdcall KeBugCheck(long) @@ -647,6 +648,7 @@ @ stdcall KeStackAttachProcess(ptr ptr) @ stub KeSynchronizeExecution @ stub KeTerminateThread +@ stdcall KeTestAlertThread(long) @ extern KeTickCount @ stdcall KeUnstackDetachProcess(ptr) @ stub KeUpdateRunTime diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index c67c4f0157..0ddb1b353c 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -696,6 +696,24 @@ void WINAPI KeInitializeApc(PRKAPC apc, PRKTHREAD thread, KAPC_ENVIRONMENT env, } } +/*********************************************************************** + * KeTestAlertThread (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI KeTestAlertThread(KPROCESSOR_MODE mode) +{ + FIXME("stub! %u\n", mode); + return TRUE; +} + +/*********************************************************************** + * KeAlertThread (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI KeAlertThread(PKTHREAD thread, KPROCESSOR_MODE mode) +{ + FIXME("stub! %p mode %u\n", thread, mode); + return TRUE; +} + static KSPIN_LOCK cancel_lock; /***********************************************************************

1 0

Derek Lesho : ntoskrnl.exe: Implement KeInitializeApc.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 2a578eaeb61047a8e4f4a4ffc47e275de475b6ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a578eaeb61047a8e4f4a4ff… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:10 2020 -0500 ntoskrnl.exe: Implement KeInitializeApc. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 33 +++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 7 +++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 584a8283ea..2376226dc6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -564,7 +564,7 @@ @ stub KeI386ReleaseLid @ stub KeI386SetGdtSelector @ stub KeIcacheFlushCount -@ stub KeInitializeApc +@ stdcall KeInitializeApc(ptr ptr long ptr ptr ptr long ptr) @ stub KeInitializeDeviceQueue @ stdcall KeInitializeDpc(ptr ptr ptr) @ stdcall KeInitializeEvent(ptr long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7f19ce7571..c67c4f0157 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -33,6 +33,7 @@ #include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/server.h" #include "ntoskrnl_private.h" @@ -663,6 +664,38 @@ void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) } #endif +/*********************************************************************** + * KeInitializeApc (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeApc(PRKAPC apc, PRKTHREAD thread, KAPC_ENVIRONMENT env, PKKERNEL_ROUTINE krnl_routine, + PKRUNDOWN_ROUTINE rundown_routine, PKNORMAL_ROUTINE normal_routine, KPROCESSOR_MODE apc_mode, PVOID ctx) +{ + TRACE("apc %p thread %p env %u krnl_routine %p rundown_routine %p normal_routine %p apc_mode %u ctx %p\n", + apc, thread, env, krnl_routine, rundown_routine, normal_routine, apc_mode, ctx); + + if (env != OriginalApcEnvironment) + FIXME("Unhandled APC_ENVIRONMENT\n"); + + apc->Type = 18; + apc->Size = sizeof(*apc); + apc->Thread = thread; + apc->ApcStateIndex = env; + apc->KernelRoutine = krnl_routine; + apc->RundownRoutine = rundown_routine; + apc->NormalRoutine = normal_routine; + apc->Inserted = FALSE; + if (apc->NormalRoutine) + { + apc->ApcMode = apc_mode; + apc->NormalContext = ctx; + } + else + { + apc->ApcMode = KernelMode; + apc->NormalContext = NULL; + } +} + static KSPIN_LOCK cancel_lock; /*********************************************************************** diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 176b432644..9fcb138701 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -464,6 +464,13 @@ typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT; /* Irp definitions */ typedef UCHAR KIRQL, *PKIRQL; typedef CCHAR KPROCESSOR_MODE; +typedef enum _KAPC_ENVIRONMENT +{ + OriginalApcEnvironment, + AttachedApcEnvironment, + CurrentApcEnvironment, + InsertApcEnvironment +} KAPC_ENVIRONMENT, *PKAPC_ENVIRONMENT; typedef VOID (WINAPI *PDRIVER_CANCEL)( IN struct _DEVICE_OBJECT *DeviceObject,

1 0

Derek Lesho : ntoskrnl.exe: Implement KeReadStateEvent.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 72540c93014c0e3b83799e51b351b969d1205953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72540c93014c0e3b83799e51… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:09 2020 -0500 ntoskrnl.exe: Implement KeReadStateEvent. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 22 ++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 030bdbcedf..584a8283ea 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -599,7 +599,7 @@ @ stdcall KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() @ stub KeRaiseUserException -@ stub KeReadStateEvent +@ stdcall KeReadStateEvent(ptr) @ stub KeReadStateMutant @ stub KeReadStateMutex @ stub KeReadStateQueue diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 5e06ab2f2b..7f19ce7571 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -311,6 +311,28 @@ void WINAPI KeClearEvent( PRKEVENT event ) KeResetEvent( event ); } +/*********************************************************************** + * KeReadStateEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReadStateEvent( PRKEVENT event ) +{ + HANDLE handle; + + TRACE("event %p.\n", event); + + if (event->Header.WaitListHead.Blink == INVALID_HANDLE_VALUE) + { + if (!(ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_QUERY_STATE, NULL, KernelMode, &handle ))) + { + EVENT_BASIC_INFORMATION event_info; + if (!(NtQueryEvent( handle, EventBasicInformation, &event_info, sizeof(event_info), NULL))) + event->Header.SignalState = event_info.EventState; + NtClose( handle ); + } + } + return event->Header.SignalState; +} + /*********************************************************************** * KeInitializeSemaphore (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7a325753d4..dfc742eec3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -467,8 +467,14 @@ static void test_sync(void) ret = wait_single(&manual_event, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ret = KeReadStateEvent(&manual_event); + ok(ret == 0, "got %d\n", ret); + KeSetEvent(&manual_event, 0, FALSE); + ret = KeReadStateEvent(&manual_event); + ok(ret == 1, "got %d\n", ret); + ret = wait_single(&manual_event, 0); ok(ret == 0, "got %#x\n", ret); @@ -561,9 +567,14 @@ static void test_sync(void) ret = ObReferenceObjectByHandle(handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, (void **)&event, NULL); ok(!ret, "ObReferenceObjectByHandle failed: %#x\n", ret); + ret = wait_single(event, 0); ok(ret == 0, "got %#x\n", ret); + ret = KeReadStateEvent(event); + ok(ret == 1, "got %d\n", ret); KeResetEvent(event); + ret = KeReadStateEvent(event); + ok(ret == 0, "got %d\n", ret); ret = wait_single(event, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); ret = wait_single_handle(handle, 0); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 59af860708..176b432644 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1759,6 +1759,7 @@ KAFFINITY WINAPI KeQueryActiveProcessors(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReadStateEvent(PRKEVENT); void FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel(KLOCK_QUEUE_HANDLE*); LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
70
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 August 2020