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

Louis Lenders : ntdll: Add stub for RtlAddAuditAccessObjectAce and forward to AddAuditAccessObjectAce in advapi32.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 9b31c7361a201364c61a1ec30d878f8280e8ef85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b31c7361a201364c61a1ec30… 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> (cherry picked from commit d37b3f59e9e1df6523ac77bf628b7220b97713ee) Signed-off-by: Michael Stefaniuc <mstefani(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 0343e13..ddde272 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 4105e59..bd6b1f9 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 04e9548..631c568 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 42ecb5b..d5c8259 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2348,6 +2348,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

Seong-ho Cho : configure: Add AC_HEADER_MAJOR to find where major() is defined.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: d133be20b15f0656430e48ff681fd6bab786528c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d133be20b15f0656430e48ff6… Author: Seong-ho Cho <darkcircle.0426(a)gmail.com> Date: Mon Apr 18 04:25:38 2016 +0900 configure: Add AC_HEADER_MAJOR to find where major() is defined. Signed-off-by: Seong-ho Cho <darkcircle.0426(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca8a08606d3f0900b3f4aa8f2e6547882a22dba8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + dlls/ntdll/cdrom.c | 5 +++++ dlls/ntdll/directory.c | 5 +++++ dlls/ntdll/file.c | 5 +++++ include/config.h.in | 8 ++++++++ server/fd.c | 5 +++++ 7 files changed, 79 insertions(+) diff --git a/configure b/configure index b33909a..73befb6 100755 --- a/configure +++ b/configure @@ -6798,6 +6798,56 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 +$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } +if ${ac_cv_header_sys_types_h_makedev+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> +int +main () +{ +return makedev(0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_header_sys_types_h_makedev=yes +else + ac_cv_header_sys_types_h_makedev=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 +$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } + +if test $ac_cv_header_sys_types_h_makedev = no; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + +$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +fi + + + + if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : + +$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + +fi + + + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index aabaecd..a75ff16 100644 --- a/configure.ac +++ b/configure.ac @@ -510,6 +510,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) +AC_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4407277..33a489c 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -38,6 +38,11 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #include <sys/types.h> #ifdef HAVE_SYS_IOCTL_H diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8a972c8..0902759 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -47,6 +47,11 @@ #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_SYS_VNODE_H /* Work around a conflict with Solaris' system list defined in sys/list.h. */ #define list SYSLIST diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e03d860..668ebbf 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -57,6 +57,11 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_UTIME_H # include <utime.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 61817f4..90717c8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1311,6 +1311,14 @@ /* Define to 1 if you have the `__res_get_state' function. */ #undef HAVE___RES_GET_STATE +/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. + */ +#undef MAJOR_IN_MKDEV + +/* Define to 1 if `major', `minor', and `makedev' are declared in + <sysmacros.h>. */ +#undef MAJOR_IN_SYSMACROS + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/server/fd.c b/server/fd.c index e3fe292..0a3a6e5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -83,6 +83,11 @@ #endif #include <sys/stat.h> #include <sys/time.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif #include <sys/types.h> #include <unistd.h> #ifdef HAVE_SYS_SYSCALL_H

1 0

Sebastian Lackner : server: Do not hold reference on parent process.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: adbba72246fb7be7ae5c46b200fd7473b6764fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbba72246fb7be7ae5c46b20… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:07 2016 +0200 server: Do not hold reference on parent process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bae3dcc2957683a4e2ca04a75ef10f91688300e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- server/console.c | 3 +-- server/process.c | 7 +++---- server/process.h | 2 +- server/snapshot.c | 2 +- server/thread.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a9084f8..0c4bded 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1159,7 +1159,7 @@ static void test_Toolhelp(void) Sleep(100); } /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ - todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + ok(i < 20 || broken(i == 20), "process object not released\n"); snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); diff --git a/server/console.c b/server/console.c index a57b2fe..3d0e0e0 100644 --- a/server/console.c +++ b/server/console.c @@ -1425,13 +1425,12 @@ DECL_HANDLER(alloc_console) case 0: /* renderer is current, console to be attached to parent process */ renderer = current; - if (!(process = current->process->parent)) + if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } - grab_object( process ); attach = 1; break; case 0xffffffff: diff --git a/server/process.c b/server/process.c index e00b429..1fdaaca 100644 --- a/server/process.c +++ b/server/process.c @@ -502,7 +502,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit close( fd ); goto error; } - process->parent = NULL; + process->parent_id = 0; process->debugger = NULL; process->handles = NULL; process->msg_fd = NULL; @@ -554,7 +554,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit else { struct process *parent = parent_thread->process; - process->parent = (struct process *)grab_object( parent ); + process->parent_id = parent->id; process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt @@ -621,7 +621,6 @@ static void process_destroy( struct object *obj ) release_object( process->job ); } if (process->console) release_object( process->console ); - if (process->parent) release_object( process->parent ); if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); @@ -1350,7 +1349,7 @@ DECL_HANDLER(get_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); - reply->ppid = process->parent ? get_process_id( process->parent ) : 0; + reply->ppid = process->parent_id; reply->exit_code = process->exit_code; reply->priority = process->priority; reply->affinity = process->affinity; diff --git a/server/process.h b/server/process.h index fa7f60d..34b6ea6 100644 --- a/server/process.h +++ b/server/process.h @@ -56,7 +56,7 @@ struct process { struct object obj; /* object header */ struct list entry; /* entry in system-wide process list */ - struct process *parent; /* parent process */ + process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ struct handle_table *handles; /* handle entries */ diff --git a/server/snapshot.c b/server/snapshot.c index dd00bd1..bec281d 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -113,7 +113,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process ptr = &snapshot->processes[snapshot->process_pos++]; reply->count = ptr->count; reply->pid = get_process_id( ptr->process ); - reply->ppid = ptr->process->parent ? get_process_id( ptr->process->parent ) : 0; + reply->ppid = ptr->process->parent_id; reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; diff --git a/server/thread.c b/server/thread.c index bad2231..176cf44 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1300,7 +1300,7 @@ DECL_HANDLER(init_thread) process->peb = req->entry; process->cpu = req->cpu; reply->info_size = init_process( current ); - if (!process->parent) + if (!process->parent_id) process->affinity = current->affinity = get_thread_affinity( current ); else set_thread_affinity( current, current->affinity );

1 0

Sebastian Lackner : kernel32/tests: Add test for process object destruction.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 28cb112bfb136210d7bdc7acb75494548f2f7f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cb112bfb136210d7bdc7acb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 13:06:37 2015 +0100 kernel32/tests: Add test for process object destruction. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0b6bf86f74438c574f7165ab220060681bb66cd) Conflicts: dlls/kernel32/tests/process.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/process.c | 159 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a28fa99..1277af6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -33,11 +33,14 @@ #include "wincon.h" #include "winnls.h" #include "winternl.h" +#include "tlhelp32.h" #include "wine/test.h" /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +/* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) #define expect_eq_d(expected, actual) \ do { \ @@ -79,6 +82,11 @@ static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); +static BOOL (WINAPI *pProcess32First)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); +static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); /* ############################### */ @@ -238,6 +246,11 @@ static BOOL init(void) pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); + pCreateToolhelp32Snapshot = (void *)GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); + pProcess32First = (void *)GetProcAddress(hkernel32, "Process32First"); + pProcess32Next = (void *)GetProcAddress(hkernel32, "Process32Next"); + pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); + pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); return TRUE; @@ -290,6 +303,8 @@ static void doChild(const char* file, const char* option) char bufA[MAX_PATH]; WCHAR bufW[MAX_PATH]; HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + HANDLE snapshot; + PROCESSENTRY32 pe; BOOL ret; if (hFile == INVALID_HANDLE_VALUE) return; @@ -344,6 +359,26 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "CommandLineA=%s\n", encodeA(GetCommandLineA())); childPrintf(hFile, "CommandLineW=%s\n\n", encodeW(GetCommandLineW())); + /* output toolhelp information */ + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ProcessID != GetCurrentProcessId()) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ProcessID == GetCurrentProcessId(), "failed to find current process in snapshot\n"); + childPrintf(hFile, + "[Toolhelp]\ncntUsage=%u\nth32DefaultHeapID=%lu\n" + "th32ModuleID=%u\ncntThreads=%u\nth32ParentProcessID=%u\n" + "pcPriClassBase=%u\ndwFlags=%u\nszExeFile=%s\n\n", + pe.cntUsage, pe.th32DefaultHeapID, pe.th32ModuleID, + pe.cntThreads, pe.th32ParentProcessID, pe.pcPriClassBase, + pe.dwFlags, encodeA(pe.szExeFile)); + /* output of environment (Ansi) */ ptrA_save = ptrA = GetEnvironmentStringsA(); if (ptrA) @@ -1068,6 +1103,112 @@ static void test_Directory(void) ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n"); } +static void test_Toolhelp(void) +{ + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + HANDLE process, thread, snapshot; + PROCESSENTRY32 pe; + THREADENTRY32 te; + DWORD ret; + int i; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c nested \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + CloseHandle(process); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + for (i = 0; i < 20; i++) + { + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process || GetLastError() == ERROR_INVALID_PARAMETER, "OpenProcess failed %u\n", GetLastError()); + if (!process) break; + CloseHandle(process); + Sleep(100); + } + /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ + todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ParentProcessID != info.dwProcessId) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&te, 0, sizeof(te)); + te.dwSize = sizeof(te); + if (pThread32First(snapshot, &te)) + { + while (te.th32OwnerProcessID != pe.th32ProcessID) + if (!pThread32Next(snapshot, &te)) break; + } + CloseHandle(snapshot); + ok(te.th32OwnerProcessID == pe.th32ProcessID, "failed to find suspended thread\n"); + + thread = OpenThread(THREAD_ALL_ACCESS_NT4, FALSE, te.th32ThreadID); + ok(thread != NULL, "OpenThread failed %u\n", GetLastError()); + ret = ResumeThread(thread); + ok(ret == 1, "expected 1, got %u\n", ret); + CloseHandle(thread); + + ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(process); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); +} + static BOOL is_str_env_drive_dir(const char* str) { return str[0] == '=' && str[1] >= 'A' && str[1] <= 'Z' && str[2] == ':' && @@ -3026,6 +3167,23 @@ START_TEST(process) Sleep(100); return; } + else if (!strcmp(myARGV[2], "nested") && myARGC >= 4) + { + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, myARGV[3]); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -3036,6 +3194,7 @@ START_TEST(process) test_Startup(); test_CommandLine(); test_Directory(); + test_Toolhelp(); test_Environment(); test_SuspendFlag(); test_DebuggingFlag();

1 0

Andrey Gusev : kernel32/nls: Update currency name and fix a typo.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 1232320baa8e3fc852170487d76fd1414309dcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1232320baa8e3fc852170487d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 27 19:39:15 2016 +0300 kernel32/nls: Update currency name and fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a20354ca56484d78884f33e531032329a1fe364) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/ukr.nls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index f61e07b..fa50528 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "неділя" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Ukraine" - LOCALE_SENGCURRNAME "Ukrainian Grivna" + LOCALE_SENGCURRNAME "Ukrainian Hryvnia" LOCALE_SENGLANGUAGE "Ukrainian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "UAH" @@ -127,8 +127,8 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SNATIVECTRYNAME "Україна" LOCALE_SNATIVECURRNAME "гривня" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "україньска (Україна)" - LOCALE_SNATIVELANGNAME "україньска" + LOCALE_SNATIVEDISPLAYNAME "українська (Україна)" + LOCALE_SNATIVELANGNAME "українська" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "UKR " LOCALE_SPOSITIVESIGN ""

1 0

Nikolay Sivov : kernel32/nls: Convert most of the locale data files to UTF-8.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 19244e6fc352d197d2b5c471d68cf23bdf5eeb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19244e6fc352d197d2b5c471d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 18:33:03 2016 +0300 kernel32/nls: Convert most of the locale data files to UTF-8. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d488f6b8561d01f80362ae4cd29f893b70ecd5eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/afk.nls | 4 +- dlls/kernel32/nls/ara.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/are.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arg.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arh.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ari.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arj.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ark.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arl.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arm.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aro.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arq.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ars.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/art.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aru.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ary.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aze.nls | 74 +++++++++++++------------- dlls/kernel32/nls/azl.nls | 22 ++++---- dlls/kernel32/nls/bel.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/bgr.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/brf.nls | 10 ++-- dlls/kernel32/nls/cat.nls | 14 ++--- dlls/kernel32/nls/chs.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/cht.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/cor.nls | 8 +-- dlls/kernel32/nls/csy.nls | 80 ++++++++++++++-------------- dlls/kernel32/nls/cym.nls | 6 +-- dlls/kernel32/nls/dan.nls | 12 ++--- dlls/kernel32/nls/dea.nls | 20 +++---- dlls/kernel32/nls/dec.nls | 8 +-- dlls/kernel32/nls/del.nls | 10 ++-- dlls/kernel32/nls/des.nls | 8 +-- dlls/kernel32/nls/deu.nls | 12 ++--- dlls/kernel32/nls/ell.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ena.nls | 4 +- dlls/kernel32/nls/enb.nls | 4 +- dlls/kernel32/nls/enc.nls | 4 +- dlls/kernel32/nls/eng.nls | 6 +-- dlls/kernel32/nls/eni.nls | 6 +-- dlls/kernel32/nls/enj.nls | 4 +- dlls/kernel32/nls/enl.nls | 4 +- dlls/kernel32/nls/enp.nls | 4 +- dlls/kernel32/nls/ens.nls | 4 +- dlls/kernel32/nls/ent.nls | 6 +-- dlls/kernel32/nls/enu.nls | 4 +- dlls/kernel32/nls/enw.nls | 4 +- dlls/kernel32/nls/enz.nls | 4 +- dlls/kernel32/nls/esa.nls | 18 +++---- dlls/kernel32/nls/esb.nls | 16 +++--- dlls/kernel32/nls/esc.nls | 18 +++---- dlls/kernel32/nls/esd.nls | 18 +++---- dlls/kernel32/nls/ese.nls | 16 +++--- dlls/kernel32/nls/esf.nls | 16 +++--- dlls/kernel32/nls/esg.nls | 16 +++--- dlls/kernel32/nls/esh.nls | 14 ++--- dlls/kernel32/nls/esi.nls | 16 +++--- dlls/kernel32/nls/esl.nls | 16 +++--- dlls/kernel32/nls/esm.nls | 20 +++---- dlls/kernel32/nls/esn.nls | 20 +++---- dlls/kernel32/nls/eso.nls | 16 +++--- dlls/kernel32/nls/esp.nls | 18 +++---- dlls/kernel32/nls/esr.nls | 18 +++---- dlls/kernel32/nls/ess.nls | 16 +++--- dlls/kernel32/nls/esu.nls | 16 +++--- dlls/kernel32/nls/esv.nls | 20 +++---- dlls/kernel32/nls/esy.nls | 16 +++--- dlls/kernel32/nls/esz.nls | 18 +++---- dlls/kernel32/nls/eti.nls | 24 ++++----- dlls/kernel32/nls/euq.nls | 6 +-- dlls/kernel32/nls/far.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/fin.nls | 18 +++---- dlls/kernel32/nls/fos.nls | 26 +++++----- dlls/kernel32/nls/fra.nls | 40 +++++++------- dlls/kernel32/nls/frb.nls | 36 ++++++------- dlls/kernel32/nls/frc.nls | 38 +++++++------- dlls/kernel32/nls/frl.nls | 40 +++++++------- dlls/kernel32/nls/frm.nls | 42 +++++++-------- dlls/kernel32/nls/frs.nls | 34 ++++++------ dlls/kernel32/nls/gae.nls | 78 ++++++++++++++-------------- dlls/kernel32/nls/gdh.nls | 40 +++++++------- dlls/kernel32/nls/gdv.nls | 6 +-- dlls/kernel32/nls/glc.nls | 20 +++---- dlls/kernel32/nls/heb.nls | 124 +++++++++++++++++++++---------------------- dlls/kernel32/nls/hrv.nls | 16 +++--- dlls/kernel32/nls/hun.nls | 46 ++++++++-------- dlls/kernel32/nls/ind.nls | 4 +- dlls/kernel32/nls/isl.nls | 56 ++++++++++---------- dlls/kernel32/nls/ita.nls | 14 ++--- dlls/kernel32/nls/its.nls | 14 ++--- dlls/kernel32/nls/ivl.nls | 2 +- dlls/kernel32/nls/jpn.nls | 72 ++++++++++++------------- dlls/kernel32/nls/kkz.nls | 58 ++++++++++----------- dlls/kernel32/nls/kor.nls | 70 ++++++++++++------------- dlls/kernel32/nls/kyr.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/lvi.nls | 30 +++++------ dlls/kernel32/nls/mki.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/mon.nls | 60 ++++++++++----------- dlls/kernel32/nls/msb.nls | 4 +- dlls/kernel32/nls/msl.nls | 4 +- dlls/kernel32/nls/nlb.nls | 8 +-- dlls/kernel32/nls/nld.nls | 6 +-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/non.nls | 12 ++--- dlls/kernel32/nls/nor.nls | 26 +++++----- dlls/kernel32/nls/plk.nls | 46 ++++++++-------- dlls/kernel32/nls/ptb.nls | 30 +++++------ dlls/kernel32/nls/ptg.nls | 32 ++++++------ dlls/kernel32/nls/rmc.nls | 2 +- dlls/kernel32/nls/rus.nls | 2 +- dlls/kernel32/nls/sky.nls | 66 +++++++++++------------ dlls/kernel32/nls/slv.nls | 8 +-- dlls/kernel32/nls/sqi.nls | 26 +++++----- dlls/kernel32/nls/srb.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/srl.nls | 8 +-- dlls/kernel32/nls/sve.nls | 18 +++---- dlls/kernel32/nls/svf.nls | 22 ++++---- dlls/kernel32/nls/swk.nls | 4 +- dlls/kernel32/nls/trk.nls | 38 +++++++------- dlls/kernel32/nls/ttt.nls | 72 ++++++++++++------------- dlls/kernel32/nls/ukr.nls | 130 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/urd.nls | 84 +++++++++++++++--------------- dlls/kernel32/nls/uzb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/uzl.nls | 8 +-- dlls/kernel32/nls/wal.nls | 28 +++++----- dlls/kernel32/nls/zhh.nls | 10 ++-- dlls/kernel32/nls/zhi.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/zhm.nls | 80 ++++++++++++++-------------- 128 files changed, 2506 insertions(+), 2506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19244e6fc352d197d2b5c…

1 0

Austin English : crypt32: Add CryptMsgVerifyCountersignatureEncoded stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: fe6cee574753d80d4c25ffa576684f2e0791b94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6cee574753d80d4c25ffa57… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 16:19:18 2016 -0500 crypt32: Add CryptMsgVerifyCountersignatureEncoded stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9fd90749c2c635573c234aba7b92064f7bc5ffc0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index e639d7c..0d2a477 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -160,7 +160,7 @@ @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) -@ stub CryptMsgVerifyCountersignatureEncoded +@ stdcall CryptMsgVerifyCountersignatureEncoded(ptr long ptr long ptr long ptr) @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectMemory(ptr long long) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 13f5934..80b2de7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3737,6 +3737,17 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, return ret; } +BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwEncodingType, BYTE *pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + CERT_INFO *pciCountersigner) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv, + dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature, + cbSignerInfoCountersignature, pciCountersigner); + return FALSE; +} + BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,

1 0

Nikolay Sivov : kernel32/nls: Added SSHORTESTDAYNAME* entries.
by Alexandre Julliard June 16, 2016

June 16, 2016

1 0

Michael Müller : kernel32: Implement GetFinalPathNameByHandle.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: cd5bd6c9eb74e98416de4ae4395dc302f40e79da URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5bd6c9eb74e98416de4ae43… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 10:28:52 2016 -0500 kernel32: Implement GetFinalPathNameByHandle. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6e12aba9c7f0fef8d2b1b7202ad778c399e6e862) Conflicts: dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec dlls/kernelbase/kernelbase.spec Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-file-l1-1-0.spec | 4 +- .../api-ms-win-core-file-l1-2-0.spec | 4 +- dlls/kernel32/file.c | 211 +++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/file.c | 40 ++++ 5 files changed, 257 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd5bd6c9eb74e98416de4…

1 0

Nikolay Sivov : dwrite: Always initialize context and font table pointers.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: b5ca1aaa4fd61d614cd4ccb2df96347d52b10101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ca1aaa4fd61d614cd4ccb2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 08:40:07 2016 +0300 dwrite: Always initialize context and font table pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7cac7bb99f962e268796fe5f7566d0eaffd09bb6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +++ dlls/dwrite/tests/font.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 98e7ab0..4799088 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -809,6 +809,9 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ if (found) *found = FALSE; if (table_size) *table_size = 0; + *table_data = NULL; + *table_context = NULL; + if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; void * ttc_context; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 681f010..e15f168 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2725,6 +2725,15 @@ static void test_TryGetFontTable(void) IDWriteFontFace_ReleaseFontTable(fontface, context2); IDWriteFontFace_ReleaseFontTable(fontface, context); + /* table does not exist */ + exists = TRUE; + context = (void*)0xdeadbeef; + table = (void*)0xdeadbeef; + hr = IDWriteFontFace_TryGetFontTable(fontface, 0xabababab, &table, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == FALSE, "got %d\n", exists); + ok(context == NULL && table == NULL, "got context %p, table pointer %p\n", context, table); + IDWriteFontFace_Release(fontface); IDWriteFontFile_Release(file); IDWriteFactory_Release(factory);

1 0