July 2021 - Wine-Commits - list.winehq.org

Paul Gofman : mshtml: Add console object stub implementation.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: fd892ff10f87c3ab6c7c8af23c8a9e2c940496d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd892ff10f87c3ab6c7c8af2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:22 2021 +0300 mshtml: Add console object stub implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 19 +++ dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/mshtml_private_iface.idl | 46 +++++++ dlls/mshtml/omnavigator.c | 258 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 64 +++++++++ 6 files changed, 393 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd892ff10f87c3ab6c7c…

1 0

Paul Gofman : mshtml_private.tlb: Add private typelib.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 73f7873d96e2468f3fe8781e93c3c88700cbd2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f7873d96e2468f3fe8781e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:20 2021 +0300 mshtml_private.tlb: Add private typelib. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/mshtml.rc | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mshtml_private_iface.idl | 28 ++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 469667081e3..ce7ddb40bde 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -71,4 +71,5 @@ RC_SRCS = mshtml.rc IDL_SRCS = \ mshtml_classes.idl \ + mshtml_private_iface.idl \ nsiface.idl diff --git a/dlls/mshtml/mshtml.rc b/dlls/mshtml/mshtml.rc index 22926e1643e..156e1ad734d 100644 --- a/dlls/mshtml/mshtml.rc +++ b/dlls/mshtml/mshtml.rc @@ -74,3 +74,6 @@ REGINST REGINST mshtml.inf /* @makedep: blank.htm */ blank.htm HTML "blank.htm" + +/* @makedep: mshtml_private_iface.tlb */ +1 TYPELIB mshtml_private_iface.tlb diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e3486aa3314..6228cf1298d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include "mshtml_private_iface.h" + #include <assert.h> #define NS_ERROR_GENERATE_FAILURE(module,code) \ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl new file mode 100644 index 00000000000..5a01c6c1b27 --- /dev/null +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#pragma makedep typelib + +[ + version(1.0), + hidden, + uuid(90de541e-380b-4530-94a9-97367fe49d8d) +] +library MSHTML_private +{ +} /* library MSHTML_private */

1 0

Alexandre Julliard : ntdll: Avoid calling NtOpenFile() from the Unix side.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 76f949577aac88bbde4e9e7b904587f5bc8c808d URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f949577aac88bbde4e9e7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:23 2021 +0200 ntdll: Avoid calling NtOpenFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++---- dlls/ntdll/unix/process.c | 15 ++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 077c0058c83..b405624d7fb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -162,7 +162,6 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) 's','o','r','t','i','n','g','\\',0}; NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; - IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; UNICODE_STRING valueW; WCHAR buffer[ARRAY_SIZE(sortdirW) + 16]; @@ -179,10 +178,12 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - if (status == STATUS_NO_SUCH_FILE) - /* try to open file in system dir */ - status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + free( path ); + if (status != STATUS_NO_SUCH_FILE) return status; + if ((status = nt_to_unix_file_name( &attr, &path, FILE_OPEN ))) return status; + status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, + FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); free( path ); return status; } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 90bf01d76fd..b85132af131 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -353,21 +353,26 @@ static WCHAR *get_nt_pathname( const UNICODE_STRING *str ) */ static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) { - UNICODE_STRING nt_name; + UNICODE_STRING nt_name, redir; OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; int fd = -1; + char *unix_name; if (!(nt_name.Buffer = get_nt_pathname( &params->CurrentDirectory.DosPath ))) return -1; nt_name.Length = wcslen( nt_name.Buffer ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - status = NtOpenFile( &handle, FILE_TRAVERSE | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + get_redirect( &attr, &redir ); + status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN ); free( nt_name.Buffer ); + free( redir.Buffer ); + if (status) return -1; + status = open_unix_file( &handle, unix_name, FILE_TRAVERSE | SYNCHRONIZE, &attr, 0, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + free( unix_name ); if (status) return -1; wine_server_handle_to_fd( handle, FILE_TRAVERSE, &fd, NULL ); NtClose( handle );

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_atomic().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: bc70306dd244008e7bb6f90152f953d8ffd9f966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc70306dd244008e7bb6f901… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:52 2021 +0200 wined3d: Use wined3d_mask_from_size() in shader_glsl_atomic(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b62f3f79e2e..eb805f43a9f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5354,7 +5354,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) } resource = "image"; data_type = reg_maps->uav_resource_info[resource_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); stride = reg_maps->uav_resource_info[resource_idx].stride; }

1 0

Huw Davies : iphlpapi: Use ConvertGuidToStringA() where possible.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: ab237f0a9001ee8ffa650bdc86c11c2ce3e7a7cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab237f0a9001ee8ffa650bdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 09:00:02 2021 +0100 iphlpapi: Use ConvertGuidToStringA() where possible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 079acbf2a9e..5621a4485c4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -747,10 +747,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) /* on Win98 this is left empty, but whatever */ ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); + ConvertGuidToStringA( &guid, ptr->AdapterName, ARRAY_SIZE(ptr->AdapterName) ); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], @@ -1057,10 +1054,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ConvertInterfaceIndexToLuid(index, &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - sprintf(ptr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); + ConvertGuidToStringA( &guid, ptr, CHARS_IN_GUID ); aa->AdapterName = ptr; ptr += CHARS_IN_GUID;

1 0

Zebediah Figura : wined3d: Fix some memory leaks when destroying deferred contexts.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 82be8b676c8e588551c5b04a7f1996ee98655c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82be8b676c8e588551c5b04a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:07 2021 -0500 wined3d: Fix some memory leaks when destroying deferred contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3062becb153..3593e5bfb48 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3674,13 +3674,18 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte for (i = 0; i < deferred->resource_count; ++i) wined3d_resource_decref(deferred->resources[i]); + heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) { wined3d_resource_decref(deferred->uploads[i].resource); heap_free(deferred->uploads[i].sysmem); } - heap_free(deferred->resources); + heap_free(deferred->uploads); + + for (i = 0; i < deferred->command_list_count; ++i) + wined3d_command_list_decref(deferred->command_lists[i]); + heap_free(deferred->command_lists); wined3d_state_destroy(deferred->c.state); heap_free(deferred->data);

1 0

Alexandre Julliard : ntdll: Avoid calling NtReadFile() from the Unix side.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 3f9d49809d4560c6739597d85d72316e207a0d10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9d49809d4560c6739597d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:53 2021 +0200 ntdll: Avoid calling NtReadFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b85132af131..77fb81fe404 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -144,7 +144,7 @@ static char **build_argv( const UNICODE_STRING *cmdline, int reserved ) /*********************************************************************** * get_so_file_info */ -static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) +static BOOL get_so_file_info( int fd, pe_image_info_t *info ) { union { @@ -185,12 +185,9 @@ static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) IMAGE_DOS_HEADER mz; } header; - IO_STATUS_BLOCK io; - LARGE_INTEGER offset; + off_t pos; - offset.QuadPart = 0; - if (NtReadFile( handle, 0, NULL, NULL, &io, &header, sizeof(header), &offset, 0 )) return FALSE; - if (io.Information != sizeof(header)) return FALSE; + if (pread( fd, &header, sizeof(header), 0 ) != sizeof(header)) return FALSE; if (!memcmp( header.elf.magic, "\177ELF", 4 )) { @@ -213,20 +210,19 @@ static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) if (header.elf.type != 3 /* ET_DYN */) return FALSE; if (header.elf.class == 2 /* ELFCLASS64 */) { - offset.QuadPart = header.elf64.phoff; + pos = header.elf64.phoff; phnum = header.elf64.phnum; } else { - offset.QuadPart = header.elf.phoff; + pos = header.elf.phoff; phnum = header.elf.phnum; } while (phnum--) { - if (NtReadFile( handle, 0, NULL, NULL, &io, &type, sizeof(type), &offset, 0 )) return FALSE; - if (io.Information < sizeof(type)) return FALSE; + if (pread( fd, &type, sizeof(type), pos ) != sizeof(type)) return FALSE; if (type == 3 /* PT_INTERP */) return FALSE; - offset.QuadPart += (header.elf.class == 2) ? 56 : 32; + pos += (header.elf.class == 2) ? 56 : 32; } return TRUE; } @@ -290,7 +286,13 @@ static NTSTATUS get_pe_file_info( OBJECT_ATTRIBUTES *attr, HANDLE *handle, pe_im } else if (status == STATUS_INVALID_IMAGE_NOT_MZ) { - if (get_so_file_info( *handle, info )) return STATUS_SUCCESS; + int unix_fd, needs_close; + + if (!server_get_unix_fd( *handle, FILE_READ_DATA, &unix_fd, &needs_close, NULL, NULL )) + { + if (get_so_file_info( unix_fd, info )) status = STATUS_SUCCESS; + if (needs_close) close( unix_fd ); + } } return status; }

1 0

Alexandre Julliard : ntdll: Avoid calling NtCreateFile() from the Unix side.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 07f8b0c84ad499065ee30a6ac67e6a2d5fcb3e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f8b0c84ad499065ee30a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:41 2021 +0200 ntdll: Avoid calling NtCreateFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 18 +++++++++++++----- dlls/ntdll/unix/registry.c | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a655aa94715..977b0dfbd51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3919,12 +3919,20 @@ NTSTATUS WINAPI NtDeleteFile( OBJECT_ATTRIBUTES *attr ) { HANDLE handle; NTSTATUS status; - IO_STATUS_BLOCK io; + char *unix_name; + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES new_attr = *attr; - status = NtCreateFile( &handle, GENERIC_READ | GENERIC_WRITE | DELETE, attr, &io, NULL, 0, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, - FILE_DELETE_ON_CLOSE, NULL, 0 ); - if (status == STATUS_SUCCESS) NtClose( handle ); + get_redirect( &new_attr, &nt_name ); + if (!(status = nt_to_unix_file_name( &new_attr, &unix_name, FILE_OPEN ))) + { + if (!(status = open_unix_file( &handle, unix_name, GENERIC_READ | GENERIC_WRITE | DELETE, &new_attr, + 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, + FILE_DELETE_ON_CLOSE, NULL, 0 ))) + NtClose( handle ); + free( unix_name ); + } + free( nt_name.Buffer ); return status; } diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 9a572d7f44e..915b99d2c7f 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -661,14 +661,23 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil { NTSTATUS ret; HANDLE key; - IO_STATUS_BLOCK io; data_size_t len; struct object_attributes *objattr; + char *unix_name; + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES new_attr = *file; TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile( &key, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, - FILE_OPEN, 0, NULL, 0); + get_redirect( &new_attr, &nt_name ); + if (!(ret = nt_to_unix_file_name( &new_attr, &unix_name, FILE_OPEN ))) + { + ret = open_unix_file( &key, unix_name, GENERIC_READ | SYNCHRONIZE, + &new_attr, 0, 0, FILE_OPEN, 0, NULL, 0 ); + free( unix_name ); + } + free( nt_name.Buffer ); + if (ret) return ret; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;

1 0

Huw Davies : iphlpapi: Implement ConvertStringToGuidW().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 2e7353dce987a57b19aee021cf494434b6c76e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7353dce987a57b19aee021… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 09:00:01 2021 +0100 iphlpapi: Implement ConvertStringToGuidW(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 8 ++++++++ dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 480b26c9315..6c51548b6e3 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -32,7 +32,7 @@ #@ stub ConvertRemoteInterfaceLuidToGuid #@ stub ConvertRemoteInterfaceLuidToIndex #@ stub ConvertStringToGuidA -#@ stub ConvertStringToGuidW +@ stdcall ConvertStringToGuidW( ptr ptr ) #@ stub ConvertStringToInterfacePhysicalAddress #@ stub CPNatfwtCreateProviderInstance #@ stub CPNatfwtDeregisterProviderInstance diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ffd0028ff42..079acbf2a9e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -97,6 +97,14 @@ DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) return ERROR_SUCCESS; } +DWORD WINAPI ConvertStringToGuidW( const WCHAR *str, GUID *guid ) +{ + UNICODE_STRING ustr; + + RtlInitUnicodeString( &ustr, str ); + return RtlNtStatusToDosError( RtlGUIDFromString( &ustr, guid ) ); +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index daf3fec0a98..39aa7123668 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -69,6 +69,7 @@ static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD ); DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD ); +DWORD WINAPI ConvertStringToGuidW( const WCHAR *, GUID * ); static void loadIPHlpApi(void) { @@ -2339,7 +2340,7 @@ static void test_ConvertGuidToString( void ) DWORD err; char bufA[39]; WCHAR bufW[39]; - GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }; + GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }, guid2; err = ConvertGuidToStringA( &guid, bufA, 38 ); ok( err, "got %d\n", err ); @@ -2352,6 +2353,13 @@ static void test_ConvertGuidToString( void ) err = ConvertGuidToStringW( &guid, bufW, 39 ); ok( !err, "got %d\n", err ); ok( !wcscmp( bufW, L"{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", debugstr_w( bufW ) ); + + err = ConvertStringToGuidW( bufW, &guid2 ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &guid, &guid2 ), "guid mismatch\n" ); + + err = ConvertStringToGuidW( L"foo", &guid2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %d\n", err ); } START_TEST(iphlpapi)

1 0

Alexandre Julliard : ntdll: Add a helper function to open a file object.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: f690266c1186593d1b17d84b89799e779e7483bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f690266c1186593d1b17d84b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:10 2021 +0200 ntdll: Add a helper function to open a file object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 643daa5ab3f..a655aa94715 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1844,6 +1844,27 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * } +static NTSTATUS server_open_file_object( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + ULONG sharing, ULONG options ) +{ + NTSTATUS status; + + SERVER_START_REQ( open_file_object ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + req->sharing = sharing; + req->options = options; + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + status = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return status; +} + + /* retrieve device/inode number for all the drives */ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) { @@ -1970,8 +1991,8 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni init_unicode_string( &string, MOUNTMGR_DEVICE_NAME ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); - status = NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); + status = server_open_file_object( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); if (status) return status; status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, @@ -3747,18 +3768,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { - SERVER_START_REQ( open_file_object ) - { - req->access = access; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); - req->sharing = sharing; - req->options = options; - wine_server_add_data( req, new_attr.ObjectName->Buffer, new_attr.ObjectName->Length ); - io->u.Status = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; + io->u.Status = server_open_file_object( handle, access, &new_attr, sharing, options ); if (io->u.Status == STATUS_SUCCESS) io->Information = FILE_OPENED; free( nt_name.Buffer ); return io->u.Status;

1 0