wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alistair Leslie-Hughes : kernel32: Add DeleteUmsThreadContext stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

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 : kernel32: Add DeleteUmsCompletionList stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: d4819eea0ed23de8c928cd9cf3654e52cefb5476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4819eea0ed23de8c928cd9c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:57 2018 +0000 kernel32: Add DeleteUmsCompletionList 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 6c4804c..7a2a6ab 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -373,7 +373,7 @@ @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) -# @ stub -arch=x86_64 DeleteUmsCompletionList +@ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) # @ stub -arch=x86_64 DeleteUmsThreadContext @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4075cbf..f5069f4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4252,6 +4252,16 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li return; } +/*********************************************************************** + * DeleteUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index d891b04..69d97c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1911,6 +1911,7 @@ WINBASEAPI void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ 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 DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint)

1 0

Alistair Leslie-Hughes : kernel32: Add CreateUmsThreadContext stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: d3f7b119ffa19719d0288d6ad27cec3baa5eae9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f7b119ffa19719d0288d6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:55 2018 +0000 kernel32: Add CreateUmsThreadContext 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 7f5f439..6c4804c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -341,7 +341,7 @@ @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) -# @ stub -arch=x86_64 CreateUmsThreadContext +@ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) @ stdcall CreateWaitableTimerExA(ptr str long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8596be4..4075cbf 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4235,6 +4235,16 @@ BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) } /*********************************************************************** + * CreateUmsThreadContext (KERNEL32.@) + */ +BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT *ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index f94f4c7..d891b04 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1877,6 +1877,7 @@ WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); +WINBASEAPI BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer)

1 0

Alistair Leslie-Hughes : kernel32: Add CreateUmsCompletionList stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: e7bd802caa87f1e22041c14b0466654a99a128de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bd802caa87f1e22041c14b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:54 2018 +0000 kernel32: Add CreateUmsCompletionList 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 ee11c42..7f5f439 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -340,7 +340,7 @@ @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) -# @ stub -arch=x86_64 CreateUmsCompletionList +@ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) # @ stub -arch=x86_64 CreateUmsThreadContext @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b883087..8596be4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4225,6 +4225,16 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } /*********************************************************************** + * CreateUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index aefedfd..f94f4c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1876,6 +1876,7 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); +WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer)

1 0

Alistair Leslie-Hughes : include: Add UMS typedef's.
by Alexandre Julliard 05 Mar '18

05 Mar '18

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 : include: Add some missing NTSTATUS defines.
by Alexandre Julliard 05 Mar '18

05 Mar '18

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: Treat all directories the same way in configure.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 3aecaf1da776b77c39a385d4a1d062476b178400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aecaf1da776b77c39a385d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 23:02:30 2018 +0100 makefiles: Treat all directories the same way in configure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 116 +-- configure | 2291 ++++++++++++++++++++++++-------------------------- configure.ac | 2186 +++++++++++++++++++++++------------------------ tools/make_makefiles | 62 +- 4 files changed, 2240 insertions(+), 2415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3aecaf1da776b77c39a3…

1 0

Alexandre Julliard : makefiles: Generate dummy dependencies for header files.
by Alexandre Julliard 05 Mar '18

05 Mar '18

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

Alexandre Julliard : makefiles: Generate the tools dependencies from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 431b6459989569a032ee50fe71b101c6aeacce5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=431b6459989569a032ee50fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 22:27:23 2018 +0100 makefiles: Generate the tools dependencies from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 13 +++---------- aclocal.m4 | 9 +-------- configure | 13 ++++--------- configure.ac | 4 +++- tools/makedep.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 791bb84..6b65fdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,7 +74,6 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@srcdir\@,$(srcdir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' @@ -128,18 +127,12 @@ install-manpages:: manpages # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wpp +__tooldeps__: libs/wpp __builddeps__: __tooldeps__ libs/wine include po -.PHONY: depend dummy __tooldeps__ install install-lib install-dev +.PHONY: depend dummy install install-lib install-dev dummy: -loader: libs/port libs/wine tools -server: libs/port libs/wine tools include -fonts: tools/sfnt2fon -include: tools tools/widl -libs/wine tools: libs/port -tools/sfnt2fon tools/wmc tools/wrc: tools -tools/widl tools/wmc tools/wrc: libs/wpp +server: include libs/port libs/wine libs/wpp: include/config.h # Misc rules diff --git a/aclocal.m4 b/aclocal.m4 index 15ad1fe..c0bdd55 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -286,15 +286,8 @@ wine_fn_config_test () wine_fn_config_tool () { ac_dir=$[1] - AS_VAR_IF([enable_tools],[no],[wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return]) - + AS_VAR_IF([enable_tools],[no],[return]) wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () diff --git a/configure b/configure index 3dd1b6b..be00e57 100755 --- a/configure +++ b/configure @@ -7805,16 +7805,9 @@ wine_fn_config_tool () { ac_dir=$1 if test "x$enable_tools" = xno; then : - wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return + return fi - wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () @@ -19348,7 +19341,9 @@ if test "x$enable_tools" != xno then wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext" +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl" else wine_fn_append_rule "\$(MAKEDEP): @echo \"You need to run make in $TOOLSDIR first\" && false" diff --git a/configure.ac b/configure.ac index 5d09075..819a921 100644 --- a/configure.ac +++ b/configure.ac @@ -3954,7 +3954,9 @@ then WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext]) +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl]) else WINE_APPEND_RULE( [\$(MAKEDEP): diff --git a/tools/makedep.c b/tools/makedep.c index 658d47f..57adf0b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3409,6 +3409,7 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray tooldeps_deps = empty_strarray; struct strarray winetest_deps = empty_strarray; struct strarray crosstest_deps = empty_strarray; unsigned int i, j; @@ -3509,6 +3510,30 @@ static void output_subdirs( struct makefile *make ) strarray_add( &builddeps_deps, target ); } } + else + { + if (!strcmp( submake->base_dir, "tools" ) || !strncmp( submake->base_dir, "tools/", 6 )) + { + strarray_add( &tooldeps_deps, submake->base_dir ); + for (j = 0; j < submake->programs.count; j++) + output( "%s/%s%s: %s\n", submake->base_dir, + submake->programs.str[j], tools_ext, submake->base_dir ); + } + if (submake->programs.count || submake->sharedlib) + { + struct strarray libs = get_expanded_make_var_array( submake, "EXTRALIBS" ); + for (j = 0; j < submake->programs.count; j++) + strarray_addall( &libs, get_expanded_file_local_var( submake, + submake->programs.str[j], "LDFLAGS" )); + output( "%s: libs/port", submake->base_dir ); + for (j = 0; j < libs.count; j++) + { + if (!strcmp( libs.str[j], "-lwpp" )) output_filename( "libs/wpp" ); + if (!strcmp( libs.str[j], "-lwine" )) output_filename( "libs/wine" ); + } + output( "\n" ); + } + } if (submake->install_rules[INSTALL_LIB].count) { @@ -3532,6 +3557,13 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + if (tooldeps_deps.count) + { + output( "__tooldeps__:" ); + output_filenames( tooldeps_deps ); + output( "\n" ); + strarray_add( &make->phony_targets, "__tooldeps__" ); + } if (winetest_deps.count) { output( "programs/winetest:" );

1 0

Alexandre Julliard : makefiles: Generate the winetest resource list from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

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

← Newer
1
...
65
66
67
68
69
70
71
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018