wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Louis Lenders : ntdll: Add stub for RtlAddAuditAccessObjectAce and forward to AddAuditAccessObjectAce in advapi32.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: d37b3f59e9e1df6523ac77bf628b7220b97713ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b3f59e9e1df6523ac77bf6… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 25 09:10:32 2016 +0100 ntdll: Add stub for RtlAddAuditAccessObjectAce and forward to AddAuditAccessObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 18 ++++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 21 ++++++++++++++++++++- include/winternl.h | 1 + 8 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 08f799d..1058935 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -23,7 +23,7 @@ @ stdcall AddAce(ptr long long ptr long) @ stdcall AddAuditAccessAce(ptr long long ptr long long) @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) -# @ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub AddConditionalAce @ stdcall AddMandatoryAce(ptr long long long ptr) # @ stub AddUsersToEncryptedFileEx diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 08f88c0..5746218 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2672,6 +2672,24 @@ BOOL WINAPI AddAuditAccessAceEx( } /****************************************************************************** + * AddAuditAccessObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAuditAccessObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + return set_ntstatus( RtlAddAuditAccessObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid, bAuditSuccess, bAuditFailure) ); +} + +/****************************************************************************** * LookupAccountNameA [ADVAPI32.@] */ BOOL WINAPI diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index e1b4663..e5280b5 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index a44f5b8..d1fdff4 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 02e3b9a..01c7c01 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stub AddResourceAttributeAce @ stub AddScopedPolicyIDAce diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ccd79f..9b64023 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -417,7 +417,7 @@ @ stub RtlAddAttributeActionToRXact @ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) -# @ stub RtlAddAuditAccessObjectAce +@ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 125c86e..34de33b 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1325,7 +1325,26 @@ NTSTATUS WINAPI RtlAddAuditAccessAce( { return RtlAddAuditAccessAceEx(pAcl, dwAceRevision, 0, dwAccessMask, pSid, bAuditSuccess, bAuditFailure); } - + +/****************************************************************************** + * RtlAddAuditAccessObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAuditAccessObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + FIXME("%p %x %x %x %p %p %p %d %d - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid, bAuditSuccess, bAuditFailure); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 9b40fd4..a861aa7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2357,6 +2357,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); +NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Thomas Faber : ole32: Do not open registry keys with no access rights.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: b743127c3ca7278553db834c9e48579a0e03769f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b743127c3ca7278553db834c9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 27 12:26:16 2015 +0100 ole32: Do not open registry keys with no access rights. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/comcat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 46a722e..eb5a927 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -245,7 +245,7 @@ static HRESULT COMCAT_IsClassOfCategories( if (res != ERROR_SUCCESS) return S_FALSE; for (string = impl_strings; *string; string += CHARS_IN_GUID) { HKEY catkey; - res = open_classes_key(subkey, string, 0, &catkey); + res = open_classes_key(subkey, string, READ_CONTROL, &catkey); if (res != ERROR_SUCCESS) { RegCloseKey(subkey); return S_FALSE;

1 0

Thomas Faber : msi: Do not open registry keys with no access rights.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 57fa1bee65e14d0d4527edef01b2ce644720de51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fa1bee65e14d0d4527edef0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 27 12:25:27 2015 +0100 msi: Do not open registry keys with no access rights. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8c1bff3..370007c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3003,7 +3003,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE, access ); + hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey );

1 0

Hugh McMaster : reg: Fail if the data for REG_MULTI_SZ begins with a separator.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: a573f237d0749440aa38c7ff0b8e69c58ee41028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a573f237d0749440aa38c7ff0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 29 15:54:22 2016 +1100 reg: Fail if the data for REG_MULTI_SZ begins with a separator. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bb1764e..bad9274 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -300,7 +300,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r else buffer[destindex] = data[i]; - if (destindex && !buffer[destindex - 1] && !buffer[destindex]) + if (destindex && !buffer[destindex - 1] && (!buffer[destindex] || destindex == 1)) { HeapFree(GetProcessHeap(), 0, buffer); output_message(STRING_INVALID_STRING); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b5ae277..d03fb2c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -357,7 +357,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -371,7 +371,7 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Hugh McMaster : reg: Fail if the data for REG_MULTI_SZ contains two adjacent separators.
by Alexandre Julliard 01 Mar '16

01 Mar '16

1 0

Thomas Faber : ntdll/tests: Test NtOpenKey with zero access.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 5441f8352c329866f95b087c17cf7e39c75d3a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5441f8352c329866f95b087c1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Feb 29 17:09:48 2016 +0100 ntdll/tests: Test NtOpenKey with zero access. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d00a496..3738301 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -362,6 +362,13 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + /* Zero accessmask */ + attr.Length = sizeof(attr); + status = pNtOpenKey(&key, 0, &attr); +todo_wine + ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); + if (status == STATUS_SUCCESS) NtClose(key); + /* Calling without parent key requres full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0);

1 0

Alexandre Julliard : makedep: Make the filename hashing more efficient.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: bf6db74f85d4a6bbf2ef3f2ce90162382c4fc71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6db74f85d4a6bbf2ef3f2ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 17:20:33 2016 +0900 makedep: Make the filename hashing more efficient. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index adb8a40..298ec04 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -109,7 +109,7 @@ static const struct { FLAG_IDL_HEADER, ".h" } }; -#define HASH_SIZE 137 +#define HASH_SIZE 997 static struct list files[HASH_SIZE]; @@ -728,8 +728,9 @@ static char *get_line( FILE *file ) */ static unsigned int hash_filename( const char *name ) { - unsigned int ret = 0; - while (*name) ret = (ret << 7) + (ret << 3) + *name++; + /* FNV-1 hash */ + unsigned int ret = 2166136261; + while (*name) ret = (ret * 16777619) ^ *name++; return ret % HASH_SIZE; } @@ -742,7 +743,6 @@ static struct file *add_file( const char *name ) struct file *file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup( name ); - list_add_tail( &files[hash_filename( name )], &file->entry ); return file; } @@ -1198,6 +1198,7 @@ static struct file *load_file( const char *name ) if (!(f = fopen( name, "r" ))) return NULL; file = add_file( name ); + list_add_tail( &files[hash], &file->entry ); input_file_name = file->name; input_line = 0;

1 0

Alexandre Julliard : configure: Support setting the corresponding enable variable directly from the WINE_NOTICE_WITH macros.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 850df9d5a5bedbcd50f7dbbcb2c36fdec6b65a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850df9d5a5bedbcd50f7dbbcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:48:04 2016 +0900 configure: Support setting the corresponding enable variable directly from the WINE_NOTICE_WITH macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 14 ++++++++----- configure | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------------ configure.ac | 40 +++++++++++++++++------------------- 3 files changed, 82 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=850df9d5a5bedbcd50f7d…

1 0

Alexandre Julliard : makefiles: Generate the LINGUAS file.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: f7a239a504dcd877264796b133d62c0444c3da86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a239a504dcd877264796b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:30:24 2016 +0900 makefiles: Generate the LINGUAS file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 1 - po/LINGUAS | 45 --------------------------------------------- tools/make_makefiles | 13 +------------ tools/makedep.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 61 deletions(-) diff --git a/configure b/configure index 2f40d7e..31573d0 100755 --- a/configure +++ b/configure @@ -17246,8 +17246,6 @@ test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.tt fi ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls -ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" -test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine if test "x$enable_win64" != xno; then @@ -18970,7 +18968,6 @@ do "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "fonts/wingding.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/wingding.ttf:fonts/wingding.ttf" ;; "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; - "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;; diff --git a/configure.ac b/configure.ac index 54b16f6..82a8d0f 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,7 +2611,6 @@ test -n "$CROSSTARGET" || WINE_APPEND_RULE( 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(po,po,[LINGUAS]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 091a734..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,45 +0,0 @@ -ar -bg -ca -cs -da -de -el -en -en_US -eo -es -fa -fi -fr -he -hi -hr -hu -it -ja -ko -lt -ml -nb_NO -nl -or -pa -pl -pt_BR -pt_PT -rm -ro -ru -sk -sl -sr_RS@cyrillic -sr_RS@latin -sv -te -th -tr -uk -wa -zh_CN -zh_TW diff --git a/tools/make_makefiles b/tools/make_makefiles index 98f65d3..a5e8a05 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -55,7 +55,7 @@ my %ignored_source_files = ( "tools/makedep.c" => 1, ); -my (@linguas, @makefiles, %makefiles); +my (@makefiles, %makefiles); sub dirname($) { @@ -532,20 +532,10 @@ sub update_makefiles(@) } -################################################################ -# update the LINGUAS file - -sub update_linguas(@) -{ - replace_in_file( "po/LINGUAS", undef, undef, join("\n", sort @_), "\n" ); -} - - my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -d $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; -@linguas = map { (my $ret = $_) =~ s/^po\/(.*)\.po/$1/; $ret; } grep /^po\/.*\.po$/, @all_files; @makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort @makefiles) @@ -555,5 +545,4 @@ foreach my $file (sort @makefiles) } assign_sources_to_makefiles( @all_files ); -update_linguas( @linguas ); update_makefiles( @makefiles ); diff --git a/tools/makedep.c b/tools/makedep.c index 687bf3f..adb8a40 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2251,6 +2251,10 @@ static void output_po_files( const struct makefile *make ) output( ": %s/wine.pot\n", po_dir ); output( "\tmsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", po_dir ); + output( "po:" ); + for (i = 0; i < linguas.count; i++) + output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); + output( "\n" ); } output( "%s/wine.pot:", po_dir ); output_filenames( pot_files ); @@ -3212,6 +3216,27 @@ static void rename_temp_file_if_changed( const char *dest ) /******************************************************************* + * output_linguas + */ +static void output_linguas( const struct makefile *make ) +{ + const char *dest = base_dir_path( make, "LINGUAS" ); + struct incl_file *source; + + output_file = create_temp_file( dest ); + + output( "# Automatically generated by make depend; DO NOT EDIT!!\n" ); + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) + if (strendswith( source->name, ".po" )) + output( "%s\n", replace_extension( source->name, ".po", "" )); + + if (fclose( output_file )) fatal_perror( "write" ); + output_file = NULL; + rename_temp_file_if_changed( dest ); +} + + +/******************************************************************* * output_testlist */ static void output_testlist( const struct makefile *make ) @@ -3333,6 +3358,11 @@ static void output_dependencies( const struct makefile *make ) output_testlist( make ); strarray_add( &ignore_files, "testlist.c" ); } + if (make->base_dir && !strcmp( make->base_dir, "po" )) + { + output_linguas( make ); + strarray_add( &ignore_files, "LINGUAS" ); + } strarray_addall( &ignore_files, targets ); if (!make->src_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files );

1 0

Alexandre Julliard : makefiles: Add a makefile for the po directory.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 0bb029f92912d3a69967316cccb084e05f3eb9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb029f92912d3a69967316cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:21:01 2016 +0900 makefiles: Add a makefile for the po directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 +-- configure | 55 +++------------------------------------------------- configure.ac | 52 ++----------------------------------------------- po/Makefile.in | 46 +++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 10 +++++++--- tools/makedep.c | 23 +++++++++++----------- 6 files changed, 71 insertions(+), 118 deletions(-) diff --git a/Makefile.in b/Makefile.in index b9b58cd..5b658a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,7 +70,6 @@ CONVERT = @CONVERT@ ICOTOOL = @ICOTOOL@ MSGFMT = @MSGFMT@ CROSSTARGET = @CROSSTARGET@ -LINGUAS = @LINGUAS@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) @@ -139,7 +138,7 @@ install-manpages:: manpages # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wpp -__builddeps__: __tooldeps__ libs/wine include +__builddeps__: __tooldeps__ libs/wine include po .PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__ dummy: diff --git a/configure b/configure index 7bf9178..2f40d7e 100755 --- a/configure +++ b/configure @@ -625,7 +625,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS WINELOADER_INSTALL -LINGUAS ALL_VARS_RULES LDAP_LIBS RT_LIBS @@ -1439,6 +1438,7 @@ enable_libs_port enable_libs_wine enable_libs_wpp enable_loader +enable_po enable_arp enable_aspnet_regiis enable_attrib @@ -6116,6 +6116,7 @@ if test "$MSGFMT" = false; then : This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi +test "$MSGFMT" = false && enable_po=${enable_po:-no} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386_set_ldt in -li386" >&5 @@ -18070,6 +18071,7 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,implib,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader clean,install-lib +wine_fn_config_makefile po enable_po clean wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib clean,install @@ -18174,55 +18176,6 @@ wine_fn_config_tool tools/winemaker clean,install-dev wine_fn_config_tool tools/wmc clean,install-dev wine_fn_config_tool tools/wrc clean,install-dev -LINGUAS="\ -ar \ -bg \ -ca \ -cs \ -da \ -de \ -el \ -en \ -en_US \ -eo \ -es \ -fa \ -fi \ -fr \ -he \ -hi \ -hr \ -hu \ -it \ -ja \ -ko \ -lt \ -ml \ -nb_NO \ -nl \ -or \ -pa \ -pl \ -pt_BR \ -pt_PT \ -rm \ -ro \ -ru \ -sk \ -sl \ -sr_RS@cyrillic \ -sr_RS@latin \ -sv \ -te \ -th \ -tr \ -uk \ -wa \ -zh_CN \ -zh_TW" - - - wine_fn_append_file CONFIGURE_TARGETS "TAGS" wine_fn_append_file CONFIGURE_TARGETS "tags" @@ -18257,8 +18210,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -test "$MSGFMT" != false || LINGUAS= - if test "x$enable_tools" != xno then wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status diff --git a/configure.ac b/configure.ac index 19abd08..54b16f6 100644 --- a/configure.ac +++ b/configure.ac @@ -362,6 +362,7 @@ EOF fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], [gettext tools not found (or too old), translations won't be built.]) +test "$MSGFMT" = false && enable_po=${enable_po:-no} dnl **** Check for some libraries **** @@ -3430,6 +3431,7 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,implib,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib]) +WINE_CONFIG_MAKEFILE([po],,[clean]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[clean,install]) @@ -3533,54 +3535,6 @@ WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev]) WINE_CONFIG_TOOL(tools/winemaker,[clean,install-dev]) WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev]) WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev]) - -AC_SUBST([LINGUAS],["\ -ar \ -bg \ -ca \ -cs \ -da \ -de \ -el \ -en \ -en_US \ -eo \ -es \ -fa \ -fi \ -fr \ -he \ -hi \ -hr \ -hu \ -it \ -ja \ -ko \ -lt \ -ml \ -nb_NO \ -nl \ -or \ -pa \ -pl \ -pt_BR \ -pt_PT \ -rm \ -ro \ -ru \ -sk \ -sl \ -sr_RS@cyrillic \ -sr_RS@latin \ -sv \ -te \ -th \ -tr \ -uk \ -wa \ -zh_CN \ -zh_TW"]) - dnl End of auto-generated output commands dnl Main ignore file @@ -3629,8 +3583,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -test "$MSGFMT" != false || LINGUAS= - if test "x$enable_tools" != xno then WINE_APPEND_RULE( diff --git a/po/Makefile.in b/po/Makefile.in new file mode 100644 index 0000000..430a9a8 --- /dev/null +++ b/po/Makefile.in @@ -0,0 +1,46 @@ +PO_SRCS = \ + ar.po \ + bg.po \ + ca.po \ + cs.po \ + da.po \ + de.po \ + el.po \ + en.po \ + en_US.po \ + eo.po \ + es.po \ + fa.po \ + fi.po \ + fr.po \ + he.po \ + hi.po \ + hr.po \ + hu.po \ + it.po \ + ja.po \ + ko.po \ + lt.po \ + ml.po \ + nb_NO.po \ + nl.po \ + or.po \ + pa.po \ + pl.po \ + pt_BR.po \ + pt_PT.po \ + rm.po \ + ro.po \ + ru.po \ + sk.po \ + sl.po \ + sr_RS(a)cyrillic.po \ + sr_RS(a)latin.po \ + sv.po \ + te.po \ + th.po \ + tr.po \ + uk.po \ + wa.po \ + zh_CN.po \ + zh_TW.po diff --git a/tools/make_makefiles b/tools/make_makefiles index ce38c53..98f65d3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -211,7 +211,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PO_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -388,6 +388,11 @@ sub assign_sources_to_makefiles(@) push @{${$make}{"=MC_SRCS"}}, $name; ${${$make}{"=flags"}}{"clean"} = 1; } + elsif ($name =~ /\.po$/) + { + push @{${$make}{"=PO_SRCS"}}, $name; + ${${$make}{"=flags"}}{"clean"} = 1; + } elsif ($name =~ /\.idl$/) { die "no makedep flags specified in $file" unless %flags || $dir eq "include"; @@ -502,8 +507,6 @@ sub update_makefiles(@) } } - push @lines, "\nAC_SUBST([LINGUAS],[\"\\\n", join( " \\\n", sort @linguas ), "\"])\n\n"; - # update the source variables in all the makefiles foreach my $file (sort @_) @@ -519,6 +522,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IDL_SRCS" ); replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); + replace_makefile_variable( $file, "PO_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); } diff --git a/tools/makedep.c b/tools/makedep.c index 12f5395..687bf3f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1811,6 +1811,11 @@ static void add_generated_sources( struct makefile *make ) if (!make->staticimplib && make->importlib && *dll_ext) make->staticimplib = strmake( "lib%s.def.a", make->importlib ); } + if (strendswith( source->name, ".po" )) + { + if (!make->disabled) + strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); + } } if (make->testdll) { @@ -2536,6 +2541,12 @@ static struct strarray output_sources( const struct makefile *make ) top_dir_path( make, "tools/buildimage" ), source->filename ); } } + else if (!strcmp( ext, "po" )) /* po file */ + { + output( "%s.mo: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t%s -o $@ %s\n", msgfmt, source->filename ); + strarray_add( &all_targets, strmake( "%s.mo", obj )); + } else if (!strcmp( ext, "res" )) { strarray_add( &res_files, source->name ); @@ -3080,16 +3091,6 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); strarray_add( &phony_targets, "distclean" ); - if (msgfmt && strcmp( msgfmt, "false" )) - { - strarray_addall( &build_deps, mo_files ); - for (i = 0; i < linguas.count; i++) - { - output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); - output( " %s/%s.po\n", src_dir_path( make, "po" ), linguas.str[i] ); - output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); - } - } if (build_deps.count) { output( "__builddeps__:" ); @@ -3360,6 +3361,7 @@ static void load_sources( struct makefile *make ) "SVG_SRCS", "FONT_SRCS", "IN_SRCS", + "PO_SRCS", "MANPAGES", NULL }; @@ -3537,7 +3539,6 @@ int main( int argc, char *argv[] ) top_makefile = parse_makefile( NULL ); - linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" ); target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); msvcrt_flags = get_expanded_make_var_array( top_makefile, "MSVCRTFLAGS" ); dll_flags = get_expanded_make_var_array( top_makefile, "DLLFLAGS" );

1 0

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 2016