March 2018 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : kernel32: Add ExecuteUmsThread stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 1e451445700f593f94635da23d9c0018fe80ff51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e451445700f593f94635da2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:02 2018 +0000 kernel32: Add ExecuteUmsThread stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 09af923..b2b2422 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -437,7 +437,7 @@ @ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) -# @ stub -arch=x86_64 ExecuteUmsThread +@ stdcall -arch=x86_64 ExecuteUmsThread(ptr) @ stdcall ExitProcess(long) @ stdcall ExitThread(long) @ stub ExitVDM diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b6a8a49..9fed99a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4292,6 +4292,16 @@ BOOL WINAPI EnterUmsSchedulingMode(UMS_SCHEDULER_STARTUP_INFO *info) return FALSE; } +/*********************************************************************** + * ExecuteUmsThread (KERNEL32.@) + */ +BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 3cf28af..8bd65c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1957,6 +1957,7 @@ WINADVAPI BOOL WINAPI EqualPrefixSid(PSID,PSID); WINBASEAPI DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI ExitProcess(DWORD); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI ExitThread(DWORD); +WINBASEAPI BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT); WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD); WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsW(LPCWSTR,LPWSTR,DWORD); #define ExpandEnvironmentStrings WINELIB_NAME_AW(ExpandEnvironmentStrings)

1 0

Alistair Leslie-Hughes : kernel32: Add GetNextUmsListItem stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: ead8dd6f55a7efd2fe67cefc4fc869490c7d539e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead8dd6f55a7efd2fe67cefc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:04 2018 +0000 kernel32: Add GetNextUmsListItem stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3a295fb..31b305a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -735,7 +735,7 @@ # @ stub GetNamedPipeServerProcessId # @ stub GetNamedPipeServerSessionId @ stdcall GetNativeSystemInfo(ptr) -# @ stub -arch=x86_64 GetNextUmsListItem +@ stdcall -arch=x86_64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand @ stub GetNlsSectionName # @ stub GetNLSVersion diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ac37fd0..8dd1967 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4312,6 +4312,16 @@ PUMS_CONTEXT WINAPI GetCurrentUmsThread(void) return FALSE; } +/*********************************************************************** + * GetNextUmsListItem (KERNEL32.@) + */ +PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return NULL; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 4753015..225f7ad 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2147,6 +2147,7 @@ WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); +WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD);

1 0

Alistair Leslie-Hughes : kernel32: Add GetUmsCompletionListEvent stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: e7ff7b5adad3b9913a7043112c6b53655c327cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ff7b5adad3b9913a704311… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:05 2018 +0000 kernel32: Add GetUmsCompletionListEvent stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31b305a..23bd0b4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -866,7 +866,7 @@ @ stdcall GetTimeZoneInformationForYear(long ptr ptr) @ stdcall GetThreadUILanguage() # @ stub GetUILanguageInfo -# @ stub -arch=x86_64 GetUmsCompletionListEvent +@ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8dd1967..1730083 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4322,6 +4322,16 @@ PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT ctx) return NULL; } +/*********************************************************************** + * GetUmsCompletionListEvent (KERNEL32.@) + */ +BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) +{ + FIXME( "%p,%p: stub\n", list, event ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 225f7ad..a752d69 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2248,6 +2248,7 @@ WINBASEAPI BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); WINBASEAPI BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); WINADVAPI BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD,LPDWORD); +WINBASEAPI BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST, PHANDLE); WINADVAPI BOOL WINAPI GetUserNameA(LPSTR,LPDWORD); WINADVAPI BOOL WINAPI GetUserNameW(LPWSTR,LPDWORD); #define GetUserName WINELIB_NAME_AW(GetUserName)

1 0

Alistair Leslie-Hughes : kernel32: Add DeleteUmsThreadContext stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: bb4872bab056f0ad596ecfdb43ee5a5f391d12e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4872bab056f0ad596ecfdb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:58 2018 +0000 kernel32: Add DeleteUmsThreadContext stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7a2a6ab..c780e3a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -374,7 +374,7 @@ @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) @ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) -# @ stub -arch=x86_64 DeleteUmsThreadContext +@ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) # @ stub -arch=x86_64 DequeueUmsCompletionListItems diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f5069f4..dffc60d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4262,6 +4262,16 @@ BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST list) return FALSE; } +/*********************************************************************** + * DeleteUmsThreadContext (KERNEL32.@) + */ +BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 69d97c9..f39d659 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1912,6 +1912,7 @@ WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST); +WINBASEAPI BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint)

1 0

Alistair Leslie-Hughes : include: Add some missing NTSTATUS defines.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: bd57abf403d85c338051d1c22951fa94d01fed52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd57abf403d85c338051d1c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 00:34:31 2018 +0000 include: Add some missing NTSTATUS defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 86dad85..735b6c2 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -990,6 +990,10 @@ #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) +#define STATUS_INVALID_SIGNATURE ((NTSTATUS) 0xC000A000) +#define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS) 0xC000A001) +#define STATUS_AUTH_TAG_MISMATCH ((NTSTATUS) 0xC000A002) + #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001) #define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS) 0xC0020002) #define RPC_NT_INVALID_BINDING ((NTSTATUS) 0xC0020003)

1 0

Alexandre Julliard : makefiles: Generate the crosstest disabled rule from makedep.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 2fa7ae05f2378567f650e185079b657b89334858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa7ae05f2378567f650e185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 15:33:02 2018 +0100 makefiles: Generate the crosstest disabled rule from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 4 ---- tools/makedep.c | 14 +++++++------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c9150d3..cba521b 100755 --- a/configure +++ b/configure @@ -18198,9 +18198,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)" -test -n "$CROSSTARGET" || wine_fn_append_rule "crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" - if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" diff --git a/configure.ac b/configure.ac index 2e99320..5d09075 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,10 +2797,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -test -n "$CROSSTARGET" || WINE_APPEND_RULE( -[crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false]) - WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) diff --git a/tools/makedep.c b/tools/makedep.c index 457dcd0..7e14ed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3547,13 +3547,13 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); } - if (crosstest_deps.count) - { - output( "crosstest:" ); - output_filenames( crosstest_deps ); - output( "\n" ); - strarray_add( &make->phony_targets, "crosstest" ); - } + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); + if (!crosstest_deps.count) + output( "\t(a)echo \"crosstest is not supported (mingw not installed?)\" && false\n" ); + strarray_add( &make->phony_targets, "crosstest" ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n");

1 0

Alexandre Julliard : makefiles: Generate the winetest resource list from makedep.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: acc6306bcfd17ea472ccb162b9aeb0ab208dfdfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc6306bcfd17ea472ccb162… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 15:36:10 2018 +0100 makefiles: Generate the winetest resource list from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - aclocal.m4 | 13 +- configure | 417 +++++++++++++++++++++--------------------- programs/winetest/Makefile.in | 2 +- tools/makedep.c | 14 ++ 5 files changed, 223 insertions(+), 224 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acc6306bcfd17ea472cc…

1 0

Alexandre Julliard : makefiles: Generate dummy dependencies for header files.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 51b57133c79ddc8787df37ebea22550cb42f6625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b57133c79ddc8787df37eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 5 00:20:57 2018 +0100 makefiles: Generate dummy dependencies for header files. This allows building when a header file is removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 57adf0b..c9ab24d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -200,6 +200,7 @@ struct makefile struct strarray implib_objs; struct strarray all_targets; struct strarray phony_targets; + struct strarray dependencies; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -426,6 +427,17 @@ static void strarray_add_uniq( struct strarray *array, const char *str ) /******************************************************************* + * strarray_addall_uniq + */ +static void strarray_addall_uniq( struct strarray *array, struct strarray added ) +{ + unsigned int i; + + for (i = 0; i < added.count; i++) strarray_add_uniq( array, added.str[i] ); +} + + +/******************************************************************* * strarray_get_value * * Find a value in a name/value pair string array. @@ -3643,7 +3655,7 @@ static void output_sources( struct makefile *make ) if (!strcmp( ext, output_source_funcs[j].ext )) break; output_source_funcs[j].fn( make, source, obj ); - free( obj ); + strarray_addall_uniq( &make->dependencies, source->dependencies ); } /* special case for winetest: add resource files from other test dirs */ @@ -3705,9 +3717,14 @@ static void output_sources( struct makefile *make ) output_uninstall_rules( make ); } + if (make->dependencies.count) + { + output_filenames( make->dependencies ); + output( ":\n" ); + } + strarray_addall( &make->clean_files, make->object_files ); - for (i = 0; i < make->crossobj_files.count; i++) - strarray_add_uniq( &make->clean_files, make->crossobj_files.str[i] ); + strarray_addall_uniq( &make->clean_files, make->crossobj_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, get_expanded_make_var_array( make, "EXTRA_TARGETS" ));

1 0

Alistair Leslie-Hughes : include: Add UMS typedef's.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: d3ea561f550bba5ce4eab0e4d9a94f1f663aa12d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ea561f550bba5ce4eab0e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:53 2018 +0000 include: Add UMS typedef's. Based on a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 14 ++++++++++++++ include/winnt.h | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 9c7908a..aefedfd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1694,6 +1694,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef void *PUMS_CONTEXT; +typedef void *PUMS_COMPLETION_LIST; +typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT; +typedef struct _UMS_SCHEDULER_STARTUP_INFO +{ + ULONG UmsVersion; + PUMS_COMPLETION_LIST CompletionList; + PUMS_SCHEDULER_ENTRY_POINT SchedulerProc; + PVOID SchedulerParam; +} UMS_SCHEDULER_STARTUP_INFO, *PUMS_SCHEDULER_STARTUP_INFO; + +typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; +typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 56b533c..e602c1f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6123,6 +6123,27 @@ typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); +typedef enum _RTL_UMS_THREAD_INFO_CLASS +{ + UmsThreadInvalidInfoClass, + UmsThreadUserContext, + UmsThreadPriority, + UmsThreadAffinity, + UmsThreadTeb, + UmsThreadIsSuspended, + UmsThreadIsTerminated, + UmsThreadMaxInfoClass +} RTL_UMS_THREAD_INFO_CLASS, *PRTL_UMS_THREAD_INFO_CLASS; + +typedef enum _RTL_UMS_SCHEDULER_REASON +{ + UmsSchedulerStartup, + UmsSchedulerThreadBlocked, + UmsSchedulerThreadYield, +} RTL_UMS_SCHEDULER_REASON, *PRTL_UMS_SCHEDULER_REASON; + +typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); + #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : kernel32: Add GetCurrentUmsThread stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: c9cb63bed6db956bf8be2a2c13ee21e355b8a26e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9cb63bed6db956bf8be2a2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:03 2018 +0000 kernel32: Add GetCurrentUmsThread stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b2b2422..3a295fb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -637,7 +637,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() -# @ stub -arch=x86_64 GetCurrentUmsThread +@ stdcall -arch=x86_64 GetCurrentUmsThread() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9fed99a..ac37fd0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4302,6 +4302,16 @@ BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT ctx) return FALSE; } +/*********************************************************************** + * GetCurrentUmsThread (KERNEL32.@) + */ +PUMS_CONTEXT WINAPI GetCurrentUmsThread(void) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 8bd65c7..4753015 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2073,6 +2073,7 @@ WINBASEAPI DWORD WINAPI GetCurrentProcessorNumber(void); WINBASEAPI VOID WINAPI GetCurrentProcessorNumberEx(PPROCESSOR_NUMBER); WINBASEAPI HANDLE WINAPI GetCurrentThread(void); #define GetCurrentTime() GetTickCount() +WINBASEAPI PUMS_CONTEXT WINAPI GetCurrentUmsThread(void); WINBASEAPI BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,LPDWORD); WINBASEAPI BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,LPDWORD); #define GetDefaultCommConfig WINELIB_NAME_AW(GetDefaultCommConfig)

1 0