October 2017 - Wine-commits

Jacek Caban : ntdll: Always use server ioctl for FSCTL_PIPE_PEEK.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 1e87417e7f4bd2d995e67113b5562c67329b5656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e87417e7f4bd2d995e67113b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:36 2017 +0200 ntdll: Always use server ioctl for FSCTL_PIPE_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 63 ------------------------------------------------- dlls/ntdll/tests/file.c | 8 +++++++ 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 217b678..35fd2c1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1699,69 +1699,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); return status; - case FSCTL_PIPE_PEEK: - { - FILE_PIPE_PEEK_BUFFER *buffer = out_buffer; - int avail = 0, fd, needs_close; - - if (out_size < FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data )) - { - status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - if ((status = server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) - { - if (status == STATUS_BAD_DEVICE_TYPE) - return server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - break; - } - -#ifdef FIONREAD - if (ioctl( fd, FIONREAD, &avail ) != 0) - { - TRACE("FIONREAD failed reason: %s\n",strerror(errno)); - if (needs_close) close( fd ); - status = FILE_GetNtStatus(); - break; - } -#endif - if (!avail) /* check for closed pipe */ - { - struct pollfd pollfd; - int ret; - - pollfd.fd = fd; - pollfd.events = POLLIN; - pollfd.revents = 0; - ret = poll( &pollfd, 1, 0 ); - if (ret == -1 || (ret == 1 && (pollfd.revents & (POLLHUP|POLLERR)))) - { - if (needs_close) close( fd ); - status = STATUS_PIPE_BROKEN; - break; - } - } - buffer->NamedPipeState = 0; /* FIXME */ - buffer->ReadDataAvailable = avail; - buffer->NumberOfMessages = 0; /* FIXME */ - buffer->MessageLength = 0; /* FIXME */ - io->Information = FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); - status = STATUS_SUCCESS; - if (avail) - { - ULONG data_size = out_size - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); - if (data_size) - { - int res = recv( fd, buffer->Data, data_size, MSG_PEEK ); - if (res >= 0) io->Information += res; - } - } - if (needs_close) close( fd ); - } - break; - case FSCTL_PIPE_DISCONNECT: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ff27d98..f88d16b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4179,6 +4179,7 @@ static void test_read_write(void) static void test_ioctl(void) { HANDLE event = CreateEventA(NULL, TRUE, FALSE, NULL); + FILE_PIPE_PEEK_BUFFER peek_buf; IO_STATUS_BLOCK iosb; HANDLE file; NTSTATUS status; @@ -4195,6 +4196,13 @@ static void test_ioctl(void) status = pNtFsControlFile(file, (HANDLE)0xdeadbeef, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0); ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, + &peek_buf, sizeof(peek_buf)); + todo_wine + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status); + ok(iosb.Status == 0x55555555, "iosb.Status = %x\n", iosb.Status); + CloseHandle(event); CloseHandle(file); }

1 0

Jacek Caban : kernel32/tests: Get rid of no longer needed hacks.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: b9248446ffe3da1720e9b88565e5a04c3c090e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9248446ffe3da1720e9b8856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:56 2017 +0200 kernel32/tests: Get rid of no longer needed hacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 87e64ef..13afa10 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -356,9 +356,7 @@ static void test_CreateNamedPipe(int pipemode) ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ - if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek3 got %d bytes left\n", left); } else @@ -395,9 +393,7 @@ static void test_CreateNamedPipe(int pipemode) ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ - if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek4 got %d bytes left\n", left); } else

1 0

Hans Leidekker : secur32/tests: Don't free static buffers (Valgrind).
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 132d111815f88b73db3beee954c335e5afb9e5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132d111815f88b73db3beee95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 5 15:02:15 2017 +0200 secur32/tests: Don't free static buffers (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 254b668..355af5a 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1181,10 +1181,6 @@ end: pDeleteSecurityContext(&client.ctxt); pFreeCredentialsHandle(&client.cred); - HeapFree(GetProcessHeap(), 0, fake_data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, fake_data[1].pvBuffer); - HeapFree(GetProcessHeap(), 0, data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); }

1 0

Vincent Povirk : mscoree: Mono renamed mono_trace_set_assembly.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: bce8330f99003ec076881f0f415960e93117c896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce8330f99003ec076881f0f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 5 11:49:34 2017 -0500 mscoree: Mono renamed mono_trace_set_assembly. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 10 ++++++++-- dlls/mscoree/mscoree_private.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index eed96da..64f345d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1457,7 +1457,7 @@ __int32 WINAPI _CorExeMain(void) if (assembly) { - mono_trace_set_assembly(assembly); + mono_callspec_set_assembly(assembly); exit_code = mono_jit_exec(domain, assembly, argc, argv); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index bf70baa..0f88b0f 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -87,6 +87,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); +void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); @@ -122,7 +123,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -224,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_trace_set_assembly); #undef LOAD_MONO_FUNCTION @@ -235,6 +234,7 @@ static HRESULT load_mono(LPCWSTR mono_path) } \ } while (0); + LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); @@ -245,6 +245,12 @@ static HRESULT load_mono(LPCWSTR mono_path) #undef LOAD_OPT_MONO_FUNCTION + if (mono_callspec_set_assembly == NULL) + { + mono_callspec_set_assembly = (void*)GetProcAddress(mono_handle, "mono_trace_set_assembly"); + if (!mono_callspec_set_assembly) goto fail; + } + if (mono_profiler_create != NULL) { /* Profiler API v2 */ diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9df41d2..3f2aa70 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -142,6 +142,7 @@ extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; +extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; @@ -165,7 +166,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Add mbsnlen_l implementation.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: f097c2be1167ead5bd6e317fe56497b207719b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f097c2be1167ead5bd6e317fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 19:39:25 2017 +0200 msvcrt: Add mbsnlen_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 6 +-- dlls/msvcr100/msvcr100.spec | 6 +-- dlls/msvcr110/msvcr110.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr80/msvcr80.spec | 6 +-- dlls/msvcr90/msvcr90.spec | 6 +-- dlls/msvcrt/mbcs.c | 61 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 6 +-- dlls/ucrtbase/ucrtbase.spec | 6 +-- 9 files changed, 72 insertions(+), 37 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index d0adc14..9db4f53 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -112,7 +112,7 @@ @ cdecl _mbsinc(str) ucrtbase._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) ucrtbase._mbslen -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) ucrtbase._mbslen_l @ cdecl _mbslwr(str) ucrtbase._mbslwr @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) ucrtbase._mbslwr_s @@ -161,8 +161,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) ucrtbase._mbsninc @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) ucrtbase._mbsnlen +@ cdecl _mbsnlen_l(str long ptr) ucrtbase._mbsnlen_l @ cdecl _mbsnset(ptr long long) ucrtbase._mbsnset @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 340a41a..5c8158a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1118,7 +1118,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1167,8 +1167,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cc90e0c..2a7b777 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1475,7 +1475,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1524,8 +1524,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fabe0f8..725ecb2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1485,7 +1485,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1534,8 +1534,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d0e9be0..d8290dd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -790,7 +790,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -839,8 +839,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c3a6d2e..bfaf6f6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -768,7 +768,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -817,8 +817,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 63be805..12a7f5d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -569,23 +569,58 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) } /********************************************************************* - * _mbslen(MSVCRT.@) + * _mbsnlen_l(MSVCRT.@) */ -MSVCRT_size_t CDECL _mbslen(const unsigned char* str) +MSVCRT_size_t CDECL _mbsnlen_l(const unsigned char *str, + MSVCRT_size_t maxsize, MSVCRT__locale_t locale) { - MSVCRT_size_t len = 0; - while(*str) - { - if (_ismbblead(*str)) + MSVCRT_pthreadmbcinfo mbcinfo; + MSVCRT_size_t i = 0, len = 0; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT_strnlen((const char*)str, maxsize); + + while(i<maxsize && str[i]) { - str++; - if (!*str) /* count only full chars */ - break; + if (_ismbblead_l(str[i], locale)) + { + i++; + if (!str[i]) /* count only full chars */ + break; + } + i++; + len++; } - str++; - len++; - } - return len; + return i < maxsize ? len : maxsize; +} + +/********************************************************************* + * _mbslen(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbslen(const unsigned char* str) +{ + return _mbsnlen_l(str, -1, NULL); +} + +/********************************************************************* + * _mbslen_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbslen_l(const unsigned char* str, MSVCRT__locale_t locale) +{ + return _mbsnlen_l(str, -1, locale); +} + +/********************************************************************* + * _mbsnlen(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbsnlen(const unsigned char* str, MSVCRT_size_t maxsize) +{ + return _mbsnlen_l(str, maxsize, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e72fd7d..3c73ae2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -737,7 +737,7 @@ @ cdecl _mbsinc(str) # stub _mbsinc_l(str ptr) @ cdecl _mbslen(str) -# stub _mbslen_l(str ptr) +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) # stub _mbslwr_l(str ptr) @ cdecl _mbslwr_s(str long) @@ -786,8 +786,8 @@ # stub _mbsnicoll_l(str str long ptr) @ cdecl _mbsninc(str long) # stub _mbsninc_l(str long ptr) -# stub _mbsnlen(str long) -# stub _mbsnlen_l(str long ptr) +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) # stub _mbsnset_l(ptr long long ptr) # stub _mbsnset_s(ptr long long long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 26b773c..6fc805d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -631,7 +631,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -680,8 +680,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s

1 0

Piotr Caban : msvcrt/tests: Add _mbsnlen tests.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: f38c958ed430388950d1360bec3392ea2f1fc2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38c958ed430388950d1360be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 19:39:29 2017 +0200 msvcrt/tests: Add _mbsnlen tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1681001..221ee3c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -96,6 +96,7 @@ static double (__cdecl *p__atof_l)(const char*,_locale_t); static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); +static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -316,6 +317,20 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + if(!p__mbsnlen) { + win_skip("_mbsnlen tests\n"); + }else { + expect_eq(p__mbsnlen(mbstring, 8), 8, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 9), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 10), 4, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 0), 0, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 1), 1, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 2), 0, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 7), 7, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 8), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 9), 4, int, "%d"); + } + /* mbrlen */ if(!setlocale(LC_ALL, ".936") || !p_mbrlen) { win_skip("mbrlen tests\n"); @@ -3270,6 +3285,7 @@ START_TEST(string) p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); + p__mbsnlen = (void*)GetProcAddress(hMsvcrt, "_mbsnlen"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Alistair Leslie-Hughes : include: Add appmodel.h.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 85b3df00abc8f6d534ece0d072f187fa49e4c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b3df00abc8f6d534ece0d07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:41 2017 +0000 include: Add appmodel.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/appmodel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2e17067..025fe77 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -225,6 +225,7 @@ HEADER_SRCS = \ amaudio.h \ appcompatapi.h \ appmgmt.h \ + appmodel.h \ atlbase.h \ atlcom.h \ atlwin.h \ diff --git a/include/appmodel.h b/include/appmodel.h new file mode 100644 index 0000000..bc61a89 --- /dev/null +++ b/include/appmodel.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _APPMODEL_H_ +#define _APPMODEL_H_ + +#if defined(__cplusplus) +extern "C" { +#endif + +typedef enum AppPolicyProcessTerminationMethod +{ + AppPolicyProcessTerminationMethod_ExitProcess = 0, + AppPolicyProcessTerminationMethod_TerminateProcess = 1, +} AppPolicyProcessTerminationMethod; + +typedef enum AppPolicyThreadInitializationType +{ + AppPolicyThreadInitializationType_None = 0, + AppPolicyThreadInitializationType_InitializeWinRT = 1, +} AppPolicyThreadInitializationType; + +LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); +LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); + +#if defined(__cplusplus) +} +#endif + +#endif /* _APPMODEL_H_ */

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetProcessTerminationMethod stub.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: ed4c5c7864ea4087f86e4cde8f2fe5385020abb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4c5c7864ea4087f86e4cde8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:42 2017 +0000 kernelbase: Add AppPolicyGetProcessTerminationMethod stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index ce38d95..8ae7f0b 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -2,7 +2,7 @@ @ stub AppPolicyGetCreateFileAccess @ stub AppPolicyGetLifecycleManagement @ stub AppPolicyGetMediaFoundationCodecLoading -@ stub AppPolicyGetProcessTerminationMethod +@ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stub AppPolicyGetShowDeveloperDiagnostic @ stub AppPolicyGetThreadInitializationType @ stub AppPolicyGetWindowingModel diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f508c25..e228497 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -44,7 +44,7 @@ # @ stub AppPolicyGetCreateFileAccess # @ stub AppPolicyGetLifecycleManagement # @ stub AppPolicyGetMediaFoundationCodecLoading -# @ stub AppPolicyGetProcessTerminationMethod +@ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) # @ stub AppPolicyGetShowDeveloperDiagnostic # @ stub AppPolicyGetThreadInitializationType # @ stub AppPolicyGetWindowingModel diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 30cba3f..c55c2a7 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -16,11 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windows.h" +#include "appmodel.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(kernelbase); /*********************************************************************** + * AppPolicyGetProcessTerminationMethod (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyProcessTerminationMethod_ExitProcess; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetThreadInitializationType stub.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 825d5c86415d9e76c92a9d533c00790efe847ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825d5c86415d9e76c92a9d533… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:44 2017 +0000 kernelbase: Add AppPolicyGetThreadInitializationType stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index 8ae7f0b..f98ec0e 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -4,7 +4,7 @@ @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stub AppPolicyGetShowDeveloperDiagnostic -@ stub AppPolicyGetThreadInitializationType +@ stdcall AppPolicyGetThreadInitializationType(ptr ptr) kernelbase.AppPolicyGetThreadInitializationType @ stub AppPolicyGetWindowingModel @ stub GetApplicationUserModelIdFromToken @ stub GetPackageFamilyNameFromToken diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e228497..85b2323 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -46,7 +46,7 @@ # @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) # @ stub AppPolicyGetShowDeveloperDiagnostic -# @ stub AppPolicyGetThreadInitializationType +@ stdcall AppPolicyGetThreadInitializationType(ptr ptr) # @ stub AppPolicyGetWindowingModel # @ stub AppXFreeMemory # @ stub AppXGetApplicationData diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index c55c2a7..ff1b2f6 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -37,6 +37,19 @@ LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessT } /*********************************************************************** + * AppPolicyGetThreadInitializationType (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyThreadInitializationType_None; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Andrey Gusev : winhttp: Remove redundant comparison.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 8fc6b58df4b3b399780bfd10103276f49a813560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc6b58df4b3b399780bfd101… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 5 11:00:46 2017 +0300 winhttp: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 5ec4f0b..b4b2530 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -152,7 +152,7 @@ static cookie_t *parse_cookie( const WCHAR *string ) if (*p++ == '=') { - while (*p && *p == ' ') p++; + while (*p == ' ') p++; len = strlenW( p ); while (len && p[len - 1] == ' ') len--;

1 0