September 2020 - Wine-Commits

Hans Leidekker : crypt32: Add support for CRYPT_MACHINE_KEYSET in PFXImportCertStore.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 547508e374b7e347488f8ce7a8fa40b333a79684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547508e374b7e347488f8ce7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 23 12:07:57 2020 +0200 crypt32: Add support for CRYPT_MACHINE_KEYSET in PFXImportCertStore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49857 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 15 +++++++++------ dlls/crypt32/tests/store.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 3f38ae5056..80e6a3d017 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -138,7 +138,7 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) HCRYPTPROV prov = 0; HCRYPTKEY cryptkey; BYTE *buf, *src, *dst; - DWORD size; + DWORD size, acquire_flags; if ((ret = pgnutls_x509_privkey_get_pk_algorithm2( key, &bitlen )) < 0) { @@ -208,17 +208,20 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) else src = d.data; for (i = bitlen / 8 - 1; i >= 0; i--) *dst++ = src[i]; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET )) + acquire_flags = (flags & CRYPT_MACHINE_KEYSET) | CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { if (GetLastError() != NTE_EXISTS) goto done; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, 0 )) + + acquire_flags &= ~CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { WARN( "CryptAcquireContextW failed %08x\n", GetLastError() ); goto done; } } - if (!CryptImportKey( prov, buf, size, 0, flags, &cryptkey )) + if (!CryptImportKey( prov, buf, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08x\n", GetLastError() ); CryptReleaseContext( prov, 0 ); @@ -346,7 +349,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } - if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY)) + if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|CRYPT_MACHINE_KEYSET|PKCS12_NO_PERSIST_KEY)) { FIXME( "flags %08x not supported\n", flags ); return NULL; @@ -373,7 +376,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor goto error; } - if (!(prov = import_key( key, flags & CRYPT_EXPORTABLE ))) goto error; + if (!(prov = import_key( key, flags ))) goto error; if (!(store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, 0, NULL ))) { WARN( "CertOpenStore failed %08x\n", GetLastError() ); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b2d5c7cb7e..46c9102686 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3348,6 +3348,16 @@ static void test_PFXImportCertStore(void) ok(ret, "got %u\n", GetLastError()); CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); + + /* CRYPT_MACHINE_KEYSET */ + store = PFXImportCertStore( &pfx, NULL, CRYPT_MACHINE_KEYSET ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %08x\n", GetLastError() ); + + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); } static void test_CryptQueryObject(void)

1 0

Zebediah Figura : advapi32/tests: Test which tokens DuplicateHandle() validates access against.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 965ebac6c19c72c511d61cc44958a3b944d5ddbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=965ebac6c19c72c511d61cc4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 22 17:31:13 2020 -0500 advapi32/tests: Test which tokens DuplicateHandle() validates access against. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 195 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 825f845190..ae5531db80 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7529,6 +7529,196 @@ static void test_EqualDomainSid(void) FreeSid(domainsid); } +static DWORD WINAPI duplicate_handle_access_thread(void *arg) +{ + HANDLE event = arg, event2; + BOOL ret; + + event2 = OpenEventA(SYNCHRONIZE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + event2 = OpenEventA(EVENT_MODIFY_STATE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + ret = DuplicateHandle(GetCurrentProcess(), event, GetCurrentProcess(), + &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event2); + + return 0; +} + +static void test_duplicate_handle_access(void) +{ + char acl_buffer[200], everyone_sid_buffer[100], local_sid_buffer[100], cmdline[300]; + HANDLE token, restricted, impersonation, all_event, sync_event, event2, thread; + SECURITY_ATTRIBUTES sa = {.nLength = sizeof(sa)}; + SID *everyone_sid = (SID *)everyone_sid_buffer; + SID *local_sid = (SID *)local_sid_buffer; + ACL *acl = (ACL *)acl_buffer; + SID_AND_ATTRIBUTES sid_attr; + SECURITY_DESCRIPTOR sd; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + DWORD size; + BOOL ret; + + /* DuplicateHandle() validates access against the calling thread's token and + * the target process's token. It does *not* validate access against the + * calling process's token, even if the calling thread is not impersonating. + */ + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY | TOKEN_ASSIGN_PRIMARY, &token); + ok(ret, "got error %u\n", GetLastError()); + + size = sizeof(everyone_sid_buffer); + ret = CreateWellKnownSid(WinWorldSid, NULL, everyone_sid, &size); + ok(ret, "got error %u\n", GetLastError()); + size = sizeof(local_sid_buffer); + ret = CreateWellKnownSid(WinLocalSid, NULL, local_sid, &size); + ok(ret, "got error %u\n", GetLastError()); + + InitializeAcl(acl, sizeof(acl_buffer), ACL_REVISION); + ret = AddAccessAllowedAce(acl, ACL_REVISION, SYNCHRONIZE, everyone_sid); + ok(ret, "got error %u\n", GetLastError()); + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + ret = AddAccessAllowedAce(acl, ACL_REVISION, EVENT_MODIFY_STATE, local_sid); + ok(ret, "got error %u\n", GetLastError()); + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + ret = SetSecurityDescriptorDacl(&sd, TRUE, acl, FALSE); + ok(ret, "got error %u\n", GetLastError()); + sa.lpSecurityDescriptor = &sd; + + sid_attr.Sid = local_sid; + sid_attr.Attributes = 0; + ret = CreateRestrictedToken(token, 0, 1, &sid_attr, 0, NULL, 0, NULL, &restricted); + ok(ret, "got error %u\n", GetLastError()); + ret = DuplicateTokenEx(restricted, TOKEN_IMPERSONATE, NULL, + SecurityImpersonation, TokenImpersonation, &impersonation); + ok(ret, "got error %u\n", GetLastError()); + + all_event = CreateEventA(&sa, TRUE, TRUE, "test_dup"); + ok(!!all_event, "got error %u\n", GetLastError()); + sync_event = OpenEventA(SYNCHRONIZE, FALSE, "test_dup"); + ok(!!sync_event, "got error %u\n", GetLastError()); + + event2 = OpenEventA(SYNCHRONIZE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + event2 = OpenEventA(EVENT_MODIFY_STATE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + ret = DuplicateHandle(GetCurrentProcess(), all_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event2); + + ret = DuplicateHandle(GetCurrentProcess(), sync_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event2); + + ret = SetThreadToken(NULL, impersonation); + ok(ret, "got error %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, duplicate_handle_access_thread, sync_event, 0, NULL); + ret = WaitForSingleObject(thread, 1000); + ok(!ret, "wait failed\n"); + + event2 = OpenEventA(SYNCHRONIZE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + SetLastError(0xdeadbeef); + event2 = OpenEventA(EVENT_MODIFY_STATE, FALSE, "test_dup"); + todo_wine ok(!event2, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = DuplicateHandle(GetCurrentProcess(), all_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event2); + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), sync_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = RevertToSelf(); + ok(ret, "got error %u\n", GetLastError()); + + sprintf(cmdline, "%s security duplicate %Iu %u %Iu", myARGV[0], + (ULONG_PTR)sync_event, GetCurrentProcessId(), (ULONG_PTR)impersonation ); + ret = CreateProcessAsUserA(restricted, NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "got error %u\n", GetLastError()); + + ret = DuplicateHandle(GetCurrentProcess(), all_event, pi.hProcess, &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), sync_event, pi.hProcess, &event2, EVENT_MODIFY_STATE, FALSE, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait failed\n"); + + CloseHandle(impersonation); + CloseHandle(restricted); + CloseHandle(token); + CloseHandle(sync_event); + CloseHandle(all_event); +} + +static void test_duplicate_handle_access_child(void) +{ + HANDLE event, event2, process, token; + BOOL ret; + + event = (HANDLE)(ULONG_PTR)_atoi64(myARGV[3]); + process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, atoi(myARGV[4])); + ok(!!process, "failed to open process, error %u\n", GetLastError()); + + event2 = OpenEventA(SYNCHRONIZE, FALSE, "test_dup"); + ok(!!event2, "got error %u\n", GetLastError()); + CloseHandle(event2); + + SetLastError(0xdeadbeef); + event2 = OpenEventA(EVENT_MODIFY_STATE, FALSE, "test_dup"); + todo_wine ok(!event2, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = DuplicateHandle(process, event, process, &event2, EVENT_MODIFY_STATE, FALSE, 0); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(process, event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = DuplicateHandle(process, (HANDLE)(ULONG_PTR)_atoi64(myARGV[5]), + GetCurrentProcess(), &token, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "failed to retrieve token, error %u\n", GetLastError()); + ret = SetThreadToken(NULL, token); + ok(ret, "failed to set thread token, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(process, event, process, &event2, EVENT_MODIFY_STATE, FALSE, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(process, event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = RevertToSelf(); + ok(ret, "failed to revert, error %u\n", GetLastError()); + CloseHandle(token); + CloseHandle(process); +} + START_TEST(security) { init(); @@ -7538,8 +7728,10 @@ START_TEST(security) { if (!strcmp(myARGV[2], "test_token_sd")) test_child_token_sd(); - else + else if (!strcmp(myARGV[2], "test")) test_process_security_child(); + else if (!strcmp(myARGV[2], "duplicate")) + test_duplicate_handle_access_child(); return; } test_kernel_objects_security(); @@ -7585,6 +7777,7 @@ START_TEST(security) test_token_label(); test_GetExplicitEntriesFromAclW(); test_BuildSecurityDescriptorW(); + test_duplicate_handle_access(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Biswapriyo Nath : include/ddraw.h: Add missing UpdateOverlay flags.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 577ee2938f89c23a10e63ea9910f2c9c8fdaf426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577ee2938f89c23a10e63ea9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing UpdateOverlay flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index 528c70aa21..6f7cc0ec27 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -895,6 +895,9 @@ typedef struct _DDPIXELFORMAT { #define DDOVER_BOB 0x00200000 #define DDOVER_OVERRIDEBOBWEAVE 0x00400000 #define DDOVER_INTERLEAVED 0x00800000 +#define DDOVER_BOBHARDWARE 0x01000000 +#define DDOVER_ARGBSCALEFACTORS 0x02000000 +#define DDOVER_DEGRADEARGBSCALING 0x04000000 /* DDPIXELFORMAT.dwFlags */ #define DDPF_ALPHAPIXELS 0x00000001

1 0

Nikolay Sivov : widl: Allow [hidden] attribute on enum members.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 0a49202109e29bd18daaf746cb9493e385511e13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a49202109e29bd18daaf746… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:18 2020 +0300 widl: Allow [hidden] attribute on enum members. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 226 ++++++++++++++++++++++++++++------------------------ 1 file changed, 123 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a49202109e29bd18daa…

1 0

Biswapriyo Nath : include/ddraw.h: Add missing members in DDPIXELFORMAT struct.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 7a4ca1b0b2b5203b7ec9c7b56f9ccf25691ba91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a4ca1b0b2b5203b7ec9c7b5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing members in DDPIXELFORMAT struct. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index cb77df19f0..528c70aa21 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -743,6 +743,7 @@ typedef struct _DDPIXELFORMAT { DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/ DWORD dwLuminanceBitCount; DWORD dwBumpBitCount; + DWORD dwPrivateFormatBitCount; } DUMMYUNIONNAME1; union { DWORD dwRBitMask; /* 10: mask for red bit*/ @@ -750,12 +751,17 @@ typedef struct _DDPIXELFORMAT { DWORD dwStencilBitDepth; DWORD dwLuminanceBitMask; DWORD dwBumpDuBitMask; + DWORD dwOperations; } DUMMYUNIONNAME2; union { DWORD dwGBitMask; /* 14: mask for green bits*/ DWORD dwUBitMask; /* 14: mask for U bits*/ DWORD dwZBitMask; DWORD dwBumpDvBitMask; + struct { + WORD wFlipMSTypes; + WORD wBltMSTypes; + } MultiSampleCaps; } DUMMYUNIONNAME3; union { DWORD dwBBitMask; /* 18: mask for blue bits*/

1 0

Alexandre Julliard : server: Rename make_object_static() to make_object_permanent().
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 25692223f1cf1f451e4283a2d07a89d1dd7cd3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692223f1cf1f451e4283a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 15:26:10 2020 +0200 server: Rename make_object_static() to make_object_permanent(). This makes it clear that it's the same as the OBJ_PERMANENT flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/handle.c | 2 +- server/object.c | 8 ++++---- server/object.h | 2 +- server/registry.c | 4 ++-- server/request.c | 2 +- server/signal.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/atom.c b/server/atom.c index e14650bde2..b61fa27666 100644 --- a/server/atom.c +++ b/server/atom.c @@ -304,7 +304,7 @@ static struct atom_table *get_global_table( struct winstation *winstation, int c else { global_table = table; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); diff --git a/server/handle.c b/server/handle.c index b2c7371e69..90f9ea63d6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -298,7 +298,7 @@ static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int { if (!(global_table = alloc_handle_table( NULL, 0 ))) return 0; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } return handle_local_to_global( alloc_entry( global_table, obj, access )); } diff --git a/server/object.c b/server/object.c index 51a9017e30..27c1aa58ad 100644 --- a/server/object.c +++ b/server/object.c @@ -347,7 +347,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, done: if (attributes & OBJ_PERMANENT) { - make_object_static( new_obj ); + make_object_permanent( new_obj ); grab_object( new_obj ); } return new_obj; @@ -406,8 +406,8 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); } -/* mark an object as being stored statically, i.e. only released at shutdown */ -void make_object_static( struct object *obj ) +/* mark an object as being permanent, i.e. only released at shutdown */ +void make_object_permanent( struct object *obj ) { obj->is_permanent = 1; #ifdef DEBUG_OBJECTS @@ -416,7 +416,7 @@ void make_object_static( struct object *obj ) #endif } -/* mark an object as no longer static */ +/* mark an object as no longer permanent */ void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; diff --git a/server/object.h b/server/object.h index 53e37b61a2..f8a3a971d6 100644 --- a/server/object.h +++ b/server/object.h @@ -145,7 +145,7 @@ extern void *create_named_object( struct object *parent, const struct object_ops extern void *open_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); -extern void make_object_static( struct object *obj ); +extern void make_object_permanent( struct object *obj ); extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); diff --git a/server/registry.c b/server/registry.c index 438ec6c6fc..3b2d59fc72 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1742,7 +1742,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); + make_object_permanent( &key->obj ); return (f != NULL); } @@ -1813,7 +1813,7 @@ void init_registry(void) /* create the root key */ root_key = alloc_key( &root_name, current_time ); assert( root_key ); - make_object_static( &root_key->obj ); + make_object_permanent( &root_key->obj ); /* load system.reg into Registry\Machine */ diff --git a/server/request.c b/server/request.c index 45076d90e2..3ef4a244b8 100644 --- a/server/request.c +++ b/server/request.c @@ -871,7 +871,7 @@ static void acquire_lock(void) !(master_socket->fd = create_anonymous_fd( &master_socket_fd_ops, fd, &master_socket->obj, 0 ))) fatal_error( "out of memory\n" ); set_fd_events( master_socket->fd, POLLIN ); - make_object_static( &master_socket->obj ); + make_object_permanent( &master_socket->obj ); } /* open the master server socket and start waiting for new clients */ diff --git a/server/signal.c b/server/signal.c index 8a9cbdd0ed..7c2bf2cc15 100644 --- a/server/signal.c +++ b/server/signal.c @@ -127,7 +127,7 @@ static struct handler *create_handler( signal_callback callback ) return NULL; } set_fd_events( handler->fd, POLLIN ); - make_object_static( &handler->obj ); + make_object_permanent( &handler->obj ); return handler; }

1 0

Alexandre Julliard : server: Use OBJ_PERMANENT for permanent objects.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 82c84548ebee6f2577f65e0a5df21fef898b6990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c84548ebee6f2577f65e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:42:27 2020 +0200 server: Use OBJ_PERMANENT for permanent objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 137 ++++++++++++++++++++++------------------------------- server/object.c | 14 +++--- server/process.c | 4 +- 3 files changed, 66 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82c84548ebee6f2577f6…

1 0

Alexandre Julliard : server: Pass all creation arguments to the device creation functions.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 5c4d6cf8375b69f15df4e79b23a8c95c634b7421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4d6cf8375b69f15df4e79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:32:47 2020 +0200 server: Pass all creation arguments to the device creation functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 5 +++-- server/device.c | 3 ++- server/directory.c | 10 +++++----- server/file.h | 14 +++++++++----- server/mailslot.c | 5 +++-- server/mapping.c | 4 ++-- server/named_pipe.c | 5 +++-- server/sock.c | 5 +++-- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/server/console.c b/server/console.c index 4ed14a2d3f..b0b6de2eef 100644 --- a/server/console.c +++ b/server/console.c @@ -2540,9 +2540,10 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } -struct object *create_console_device( struct object *root, const struct unicode_str *name ) +struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &console_device_ops, name, 0, NULL ); + return create_named_object( root, &console_device_ops, name, attr, sd ); } /* allocate a console for the renderer */ diff --git a/server/device.c b/server/device.c index 371943acee..652da83e1e 100644 --- a/server/device.c +++ b/server/device.c @@ -720,11 +720,12 @@ static struct device *create_device( struct object *root, const struct unicode_s } struct object *create_unix_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ) { struct device *device; - if ((device = create_named_object( root, &device_ops, name, 0, NULL ))) + if ((device = create_named_object( root, &device_ops, name, attr, sd ))) { device->unix_path = strdup( unix_path ); device->manager = NULL; /* no manager, requests go straight to the Unix device */ diff --git a/server/directory.c b/server/directory.c index ef0a1038a5..cae75d2b69 100644 --- a/server/directory.c +++ b/server/directory.c @@ -423,11 +423,11 @@ void init_directories(void) make_object_static( &dir_objtype->obj ); /* devices */ - named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); - mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); - console_device = create_console_device( &dir_device->obj, &condrv_str ); - socket_device = create_socket_device( &dir_device->obj, &afd_str ); - null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); + named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str, 0, NULL ); + mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str, 0, NULL ); + console_device = create_console_device( &dir_device->obj, &condrv_str, 0, NULL ); + socket_device = create_socket_device( &dir_device->obj, &afd_str, 0, NULL ); + null_device = create_unix_device( &dir_device->obj, &null_str, 0, NULL, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); diff --git a/server/file.h b/server/file.h index 5fb4e5614b..477720f8b1 100644 --- a/server/file.h +++ b/server/file.h @@ -176,12 +176,16 @@ extern struct object *create_user_data_mapping( struct object *root, const struc /* device functions */ -extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, - const char *unix_path ); + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ); /* change notification functions */ diff --git a/server/mailslot.c b/server/mailslot.c index 9c58ed77a5..e0294d946e 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -433,11 +433,12 @@ static void mailslot_device_destroy( struct object *obj ) free( device->mailslots ); } -struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ) +struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct mailslot_device *dev; - if ((dev = create_named_object( root, &mailslot_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &mailslot_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; diff --git a/server/mapping.c b/server/mapping.c index 8955df7ec2..769a986ae2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -964,8 +964,8 @@ struct object *create_user_data_mapping( struct object *root, const struct unico void *ptr; struct mapping *mapping; - if (!(mapping = create_mapping( root, name, OBJ_OPENIF, sizeof(KSHARED_USER_DATA), - SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, NULL ))) return NULL; + if (!(mapping = create_mapping( root, name, attr, sizeof(KSHARED_USER_DATA), + SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); if (ptr != MAP_FAILED) { diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ac35cf118..07a14502b3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -507,11 +507,12 @@ static void named_pipe_device_destroy( struct object *obj ) free( device->pipes ); } -struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ) +struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct named_pipe_device *dev; - if ((dev = create_named_object( root, &named_pipe_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &named_pipe_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->pipes = NULL; diff --git a/server/sock.c b/server/sock.c index c9cf2d56da..3f19c77964 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1247,9 +1247,10 @@ static struct object *socket_device_open_file( struct object *obj, unsigned int return &sock->obj; } -struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &socket_device_ops, name, 0, NULL ); + return create_named_object( root, &socket_device_ops, name, attr, sd ); } /* accept a socket */

1 0

Francois Gouget : msvcirt/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 1a7b256f7c69c50c2a216317e03f9caeb268d0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7b256f7c69c50c2a216317… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:53 2020 +0200 msvcirt/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 88b893d2be..8ee880480a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -8365,7 +8365,7 @@ static void test_fstream(void) /* make sure that OPENMODE_in is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeeded on OPENMODE_out only fstream\n"); /* reopen the file for reading */ call_func1(p_fstream_vbase_dtor, &fs); @@ -8389,7 +8389,7 @@ static void test_fstream(void) /* make sure that OPENMODE_out is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeeded on OPENMODE_in fstream\n"); /* cleanup */ call_func1(p_fstream_vbase_dtor, &fs);

1 0

Michael Stefaniuc : advapi32: Remove superfluous cast to self.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: d6c4efec1ab726b70a660b8a3195eb43003793b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c4efec1ab726b70a660b8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 22 20:52:39 2020 +0200 advapi32: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 846a2b8d45..8a1024ff80 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -179,12 +179,12 @@ EnumServicesStatusW( SC_HANDLE manager, DWORD type, DWORD state, ENUM_SERVICE_ST for (i = 0; i < *ret_count; i++) { lstrcpyW( p, status_ex[i].lpServiceName ); - status[i].lpServiceName = (WCHAR *)p; + status[i].lpServiceName = p; p += lstrlenW( p ) + 1; if (status_ex[i].lpDisplayName) { lstrcpyW( p, status_ex[i].lpDisplayName ); - status[i].lpDisplayName = (WCHAR *)p; + status[i].lpDisplayName = p; p += lstrlenW( p ) + 1; } else status[i].lpDisplayName = NULL;

1 0