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

Alistair Leslie-Hughes : msi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 51049c95a242f1553562a442142e813e37cee233 URL: https://gitlab.winehq.org/wine/wine/-/commit/51049c95a242f1553562a442142e81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 msi: Remove DECLSPEC_HIDDEN usage. --- dlls/msi/msipriv.h | 552 ++++++++++++++++++++++++++--------------------------- 1 file changed, 276 insertions(+), 276 deletions(-)

1 0

Alistair Leslie-Hughes : xaudio2_7: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: db6b62dfa99688302aed35920bcb701af8e9d183 URL: https://gitlab.winehq.org/wine/wine/-/commit/db6b62dfa99688302aed35920bcb70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 xaudio2_7: Remove DECLSPEC_HIDDEN usage. --- dlls/xaudio2_7/xaudio_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 8c07d4e9555..fc907edf9c1 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -104,15 +104,15 @@ typedef struct _IXAudio2Impl { } IXAudio2Impl; /* xaudio_dll.c */ -extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; -extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) DECLSPEC_HIDDEN; -extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) DECLSPEC_HIDDEN; -extern DWORD WINAPI engine_thread(void *user) DECLSPEC_HIDDEN; +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc); +extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain); +extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user); +extern DWORD WINAPI engine_thread(void *user); /* xapo.c */ -extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv); /* xaudio_allocator.c */ -extern void* XAudio_Internal_Malloc(size_t size) DECLSPEC_HIDDEN; -extern void XAudio_Internal_Free(void* ptr) DECLSPEC_HIDDEN; -extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN; +extern void* XAudio_Internal_Malloc(size_t size); +extern void XAudio_Internal_Free(void* ptr); +extern void* XAudio_Internal_Realloc(void* ptr, size_t size);

1 0

Alistair Leslie-Hughes : winmm: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: c55eaef445a3f6d34adfd1ec65d0541e90710670 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55eaef445a3f6d34adfd1ec65d054… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 winmm: Remove DECLSPEC_HIDDEN usage. --- dlls/winmm/winemm.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 52cab64b1c5..0bae816c793 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -127,39 +127,39 @@ typedef struct tagWINE_MMIO { /* function prototypes */ -LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) DECLSPEC_HIDDEN; -BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) DECLSPEC_HIDDEN; -LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) DECLSPEC_HIDDEN; -void DRIVER_UnloadAll(void) DECLSPEC_HIDDEN; +LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr); +BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz); +LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2); +void DRIVER_UnloadAll(void); -void MMDRV_Exit(void) DECLSPEC_HIDDEN; -UINT MMDRV_GetNum(UINT) DECLSPEC_HIDDEN; +void MMDRV_Exit(void); +UINT MMDRV_GetNum(UINT); LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, - DWORD_PTR* dwCallback, DWORD_PTR* dwInstance) DECLSPEC_HIDDEN; -void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; -DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; -DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; -LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; -DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; + DWORD_PTR* dwCallback, DWORD_PTR* dwInstance); +void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld); +DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2); +DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); +LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); +DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; +DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; +const char* WINMM_ErrorToString(MMRESULT error); -void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; +void TIME_MMTimeStop(void); -MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer); -void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; +void WINMM_DeleteWaveform(void); -void joystick_unload( void ) DECLSPEC_HIDDEN; +void joystick_unload( void ); /* Global variables */ -extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN; -extern HINSTANCE hWinMM32Instance DECLSPEC_HIDDEN; -extern HANDLE psLastEvent DECLSPEC_HIDDEN; -extern HANDLE psStopEvent DECLSPEC_HIDDEN; +extern CRITICAL_SECTION WINMM_cs; +extern HINSTANCE hWinMM32Instance; +extern HANDLE psLastEvent; +extern HANDLE psStopEvent; /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits

1 0

Alistair Leslie-Hughes : dsound: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 0599292ce7acb6c7f437700319f1d88d0970d7b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0599292ce7acb6c7f437700319f1d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 dsound: Remove DECLSPEC_HIDDEN usage. --- dlls/dsound/dsound_private.h | 120 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-)

1 0

Eric Pouech : winedbg: Detect debuggee termination before first exception.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: fdd1c1c7765a2d863975fb1ed9e310f453934ec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd1c1c7765a2d863975fb1ed9e310… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Detect debuggee termination before first exception. When a crash in a program happens, and the debugger in launched in --auto mode, in some cases the program terminates before the debugger has gotten proper context on debuggee. (Could be a watchdog in programs checking if it's debugged and terminating itself if so). Detect debuggee termination and still provide some information on debuggee (threads, modules, system info). The backtrace will not be available as no exception is gotten from debuggee. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55187 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/tgt_active.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a339a586eca..5ac9a4d1229 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -597,6 +597,26 @@ void dbg_active_wait_for_first_exception(void) wait_exception(); } +static BOOL dbg_active_wait_for_startup(DEBUG_EVENT* de) +{ + dbg_interactiveP = FALSE; + while (dbg_num_processes() && WaitForDebugEvent(de, INFINITE)) + { + switch (de->dwDebugEventCode) + { + case CREATE_PROCESS_DEBUG_EVENT: + case CREATE_THREAD_DEBUG_EVENT: + case LOAD_DLL_DEBUG_EVENT: + case EXCEPTION_DEBUG_EVENT: + if (dbg_handle_debug_event(de)) return TRUE; + break; + default: + return FALSE; + } + } + return FALSE; +} + static BOOL dbg_start_debuggee(LPSTR cmdLine) { PROCESS_INFORMATION info; @@ -862,6 +882,8 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) { HANDLE thread = 0, event = 0, input, output = INVALID_HANDLE_VALUE; enum dbg_start ds = start_error_parse; + BOOL first_exception = TRUE; + DEBUG_EVENT de; DBG_IVAR(BreakOnDllLoad) = 0; @@ -894,12 +916,25 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) NULL); if (input == INVALID_HANDLE_VALUE) return start_error_parse; - if (dbg_curr_process->active_debuggee) - dbg_active_wait_for_first_exception(); + /* debuggee can terminate before we get the first exception. + * so detect end of attach load sequence, and then print information. + */ + if (dbg_curr_process->active_debuggee && !(first_exception = dbg_active_wait_for_startup(&de))) + { + dbg_printf("Couldn't get first exception for process %04lx %ls%s.\n" + "No backtrace available\n", + dbg_curr_pid, dbg_curr_process->imageName, dbg_curr_process->is_wow64 ? " (WOW64)" : ""); + } dbg_interactiveP = TRUE; parser_handle(NULL, input); + if (!first_exception) + { + /* continue managing debug events, in case the exception event comes after current debug event */ + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + dbg_active_wait_for_first_exception(); + } if (output != INVALID_HANDLE_VALUE) { SetEvent( event );

1 0

Eric Pouech : winedbg: Cache wow64 status inside struct process.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: bde065746e51e4cfdcf0cbf8583a933abbb2daea URL: https://gitlab.winehq.org/wine/wine/-/commit/bde065746e51e4cfdcf0cbf8583a93… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Cache wow64 status inside struct process. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/debugger.h | 1 + programs/winedbg/gdbproxy.c | 10 +++------- programs/winedbg/tgt_active.c | 4 +--- programs/winedbg/winedbg.c | 5 +++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 59c923c38ad..28fb788b3c7 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -280,6 +280,7 @@ struct dbg_process struct backend_cpu* be_cpu; HANDLE event_on_first_exception; BOOL active_debuggee; + BOOL is_wow64; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; unsigned next_bp; struct dbg_delayed_bp* delayed_bp; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 18e18289bee..238eecb1538 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1685,7 +1685,6 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO IMAGE_NT_HEADERS *nth = NULL; IMAGEHLP_MODULE64 mod; SIZE_T size, i; - BOOL is_wow64; char buffer[0x400]; mod.SizeOfStruct = sizeof(mod); @@ -1709,8 +1708,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO if ((unix_path = wine_get_unix_file_name(nt_name.Buffer))) { - if (IsWow64Process(gdbctx->process->handle, &is_wow64) && - is_wow64 && (tmp = strstr(unix_path, "system32"))) + if (gdbctx->process->is_wow64 && (tmp = strstr(unix_path, "system32"))) memcpy(tmp, "syswow64", 8); reply_buffer_append_xmlstr(reply, unix_path); } @@ -1743,7 +1741,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO * the following computation valid in all cases. */ dos = (IMAGE_DOS_HEADER *)buffer; nth = (IMAGE_NT_HEADERS *)(buffer + dos->e_lfanew); - if (IsWow64Process(gdbctx->process->handle, &is_wow64) && is_wow64) + if (gdbctx->process->is_wow64) sec = IMAGE_FIRST_SECTION((IMAGE_NT_HEADERS32 *)nth); else sec = IMAGE_FIRST_SECTION((IMAGE_NT_HEADERS64 *)nth); @@ -1967,7 +1965,6 @@ static enum packet_return packet_query_exec_file(struct gdb_context* gdbctx) struct reply_buffer* reply = &gdbctx->qxfer_buffer; struct dbg_process* process = gdbctx->process; char *unix_path; - BOOL is_wow64; char *tmp; if (!process) return packet_error; @@ -1978,8 +1975,7 @@ static enum packet_return packet_query_exec_file(struct gdb_context* gdbctx) if (!(unix_path = wine_get_unix_file_name(process->imageName))) return packet_reply_error(gdbctx, GetLastError() == ERROR_NOT_ENOUGH_MEMORY ? HOST_ENOMEM : HOST_ENOENT); - if (IsWow64Process(process->handle, &is_wow64) && - is_wow64 && (tmp = strstr(unix_path, "system32"))) + if (process->is_wow64 && (tmp = strstr(unix_path, "system32"))) memcpy(tmp, "syswow64", 8); reply_buffer_append_str(reply, unix_path); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0d5ae754af5..7a5d71d8909 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -869,15 +869,13 @@ static void output_system_info(void) const char *(CDECL *wine_get_build_id)(void); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); - BOOL is_wow64; wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); - if (!IsWow64Process( dbg_curr_process->handle, &is_wow64 )) is_wow64 = FALSE; dbg_printf( "System information:\n" ); if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); - dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + dbg_printf( " Platform: %s%s\n", platform, dbg_curr_process->is_wow64 ? " (WOW64)" : "" ); dbg_printf( " Version: Windows %s\n", get_windows_version() ); if (wine_get_host_version) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e7ba6afa2e4..438d4a3d94b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -266,6 +266,8 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, if (!h) h = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); + if (!IsWow64Process(h, &wow64)) wow64 = FALSE; + if (!(p = malloc(sizeof(struct dbg_process)))) return NULL; p->handle = h; p->pid = pid; @@ -276,6 +278,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, list_init(&p->modules); p->event_on_first_exception = NULL; p->active_debuggee = FALSE; + p->is_wow64 = wow64; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ memset(p->bp, 0, sizeof(p->bp)); p->delayed_bp = NULL; @@ -291,8 +294,6 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, list_add_head(&dbg_process_list, &p->entry); - IsWow64Process(h, &wow64); - #ifdef __i386__ p->be_cpu = &be_i386; #elif defined(__x86_64__)

1 0

Eric Pouech : winedbg: Add 'info system' command.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 7ada0e223904c563d79af97922dc8301ecf030f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ada0e223904c563d79af97922dc83… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Add 'info system' command. Letting the information displayed in '--auto' mode be available as a command. Simplify a bit the --auto mode handling. Note: - the WOW64 status of the debuggee used to be printed in system information, which is a bit ackward as system info shouldn't be tied to a given process. - replaced it with supported guest machines (for the record, a 64-bit only setup incorrectly returns i386 as supported guest; I guess we shouldn't care). - now printing the wow64 status of a process when displaying an exception information instead. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/dbg.y | 3 +- programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 108 +++++++++++++++++++++++++++++++++++++++++- programs/winedbg/tgt_active.c | 97 ++----------------------------------- 5 files changed, 115 insertions(+), 95 deletions(-)

1 0

Mohamad Al-Jaf : windows.networking.hostname: Implement IHostName::get_RawName().
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 79161ea00a699bbf940720fdf1196fa5ea497722 URL: https://gitlab.winehq.org/wine/wine/-/commit/79161ea00a699bbf940720fdf1196f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 03:07:20 2023 -0400 windows.networking.hostname: Implement IHostName::get_RawName(). --- dlls/windows.networking.hostname/hostname.c | 8 ++++++-- dlls/windows.networking.hostname/tests/hostname.c | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/windows.networking.hostname/hostname.c b/dlls/windows.networking.hostname/hostname.c index f3ba7b5b20c..c941e7ada89 100644 --- a/dlls/windows.networking.hostname/hostname.c +++ b/dlls/windows.networking.hostname/hostname.c @@ -191,8 +191,12 @@ static HRESULT WINAPI hostname_get_IPInformation( IHostName *iface, IIPInformati static HRESULT WINAPI hostname_get_RawName( IHostName *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct hostname *impl = impl_from_IHostName( iface ); + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (!value) return E_INVALIDARG; + return WindowsDuplicateString( impl->rawname, value ); } static HRESULT WINAPI hostname_get_DisplayName( IHostName *iface, HSTRING *value ) diff --git a/dlls/windows.networking.hostname/tests/hostname.c b/dlls/windows.networking.hostname/tests/hostname.c index 18cdec840ef..7c6cfd559ea 100644 --- a/dlls/windows.networking.hostname/tests/hostname.c +++ b/dlls/windows.networking.hostname/tests/hostname.c @@ -94,12 +94,12 @@ static void test_HostnameStatics(void) check_interface( hostname, &IID_IHostName ); hr = IHostName_get_RawName( hostname, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); hr = IHostName_get_RawName( hostname, &rawname ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = WindowsCompareStringOrdinal( str, rawname, &res ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( !res, "got unexpected string %s.\n", debugstr_hstring(rawname) ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !res, "got unexpected string %s.\n", debugstr_hstring(rawname) ); WindowsDeleteString( str ); WindowsDeleteString( rawname );

1 0

Mohamad Al-Jaf : windows.networking.hostname/tests: Add IHostNameFactory::CreateHostName() tests.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 790109da8a570dcf05951d65b373a3da3191bced URL: https://gitlab.winehq.org/wine/wine/-/commit/790109da8a570dcf05951d65b373a3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 02:07:49 2023 -0400 windows.networking.hostname/tests: Add IHostNameFactory::CreateHostName() tests. --- dlls/windows.networking.hostname/tests/hostname.c | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/windows.networking.hostname/tests/hostname.c b/dlls/windows.networking.hostname/tests/hostname.c index edb20f1fa44..0d9ea85bdef 100644 --- a/dlls/windows.networking.hostname/tests/hostname.c +++ b/dlls/windows.networking.hostname/tests/hostname.c @@ -48,10 +48,13 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_HostnameStatics(void) { static const WCHAR *hostname_statics_name = L"Windows.Networking.HostName"; + static const WCHAR *ip = L"192.168.0.0"; IHostNameFactory *hostnamefactory; IActivationFactory *factory; - HSTRING str; + HSTRING str, rawname; + IHostName *hostname; HRESULT hr; + INT32 res; LONG ref; hr = WindowsCreateString( hostname_statics_name, wcslen( hostname_statics_name ), &str ); @@ -72,7 +75,29 @@ static void test_HostnameStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IHostNameFactory, (void **)&hostnamefactory ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCreateString( ip, wcslen( ip ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = IHostNameFactory_CreateHostName( hostnamefactory, NULL, &hostname ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = IHostNameFactory_CreateHostName( hostnamefactory, str, NULL ); + todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IHostNameFactory_CreateHostName( hostnamefactory, NULL, NULL ); + todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IHostNameFactory_CreateHostName( hostnamefactory, str, &hostname ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( hostname != NULL, "got NULL hostname %p.\n", hostname ); + + hr = IHostName_get_RawName( hostname, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = IHostName_get_RawName( hostname, &rawname ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, rawname, &res ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( !res, "got unexpected string %s.\n", debugstr_hstring(rawname) ); + WindowsDeleteString( str ); + WindowsDeleteString( rawname ); ref = IHostNameFactory_Release( hostnamefactory ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : windows.networking.hostname: Implement IHostNameFactory::CreateHostName().
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 3fe0cfef9c087b86d80ed2d95c4c4466f6203508 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fe0cfef9c087b86d80ed2d95c4c44… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 02:43:04 2023 -0400 windows.networking.hostname: Implement IHostNameFactory::CreateHostName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54699 --- dlls/windows.networking.hostname/hostname.c | 139 +++++++++++++++++++++- dlls/windows.networking.hostname/private.h | 2 +- dlls/windows.networking.hostname/tests/hostname.c | 17 ++- 3 files changed, 150 insertions(+), 8 deletions(-) diff --git a/dlls/windows.networking.hostname/hostname.c b/dlls/windows.networking.hostname/hostname.c index 538e897963f..f3ba7b5b20c 100644 --- a/dlls/windows.networking.hostname/hostname.c +++ b/dlls/windows.networking.hostname/hostname.c @@ -115,12 +115,147 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct hostname +{ + IHostName IHostName_iface; + LONG ref; + + HSTRING rawname; +}; + +static inline struct hostname *impl_from_IHostName( IHostName *iface ) +{ + return CONTAINING_RECORD( iface, struct hostname, IHostName_iface ); +} + +static HRESULT WINAPI hostname_QueryInterface( IHostName *iface, REFIID iid, void **out ) +{ + struct hostname *impl = impl_from_IHostName( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IHostName )) + { + *out = &impl->IHostName_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hostname_AddRef( IHostName *iface ) +{ + struct hostname *impl = impl_from_IHostName( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI hostname_Release( IHostName *iface ) +{ + struct hostname *impl = impl_from_IHostName( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI hostname_GetIids( IHostName *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_GetRuntimeClassName( IHostName *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_GetTrustLevel( IHostName *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_get_IPInformation( IHostName *iface, IIPInformation **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_get_RawName( IHostName *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_get_DisplayName( IHostName *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_get_CanonicalName( IHostName *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_get_Type( IHostName *iface, HostNameType *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hostname_IsEqual( IHostName *iface, IHostName *name, boolean *equal ) +{ + FIXME( "iface %p, name %p, equal %p stub!\n", iface, name, equal ); + return E_NOTIMPL; +} + +static const struct IHostNameVtbl hostname_vtbl = +{ + hostname_QueryInterface, + hostname_AddRef, + hostname_Release, + /* IInspectable methods */ + hostname_GetIids, + hostname_GetRuntimeClassName, + hostname_GetTrustLevel, + /* IHostName methods */ + hostname_get_IPInformation, + hostname_get_RawName, + hostname_get_DisplayName, + hostname_get_CanonicalName, + hostname_get_Type, + hostname_IsEqual, +}; + DEFINE_IINSPECTABLE( hostname_factory, IHostNameFactory, struct hostname_statics, IActivationFactory_iface ) static HRESULT WINAPI hostname_factory_CreateHostName( IHostNameFactory *iface, HSTRING name, IHostName **value ) { - FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring(name), value ); - return E_NOTIMPL; + struct hostname *impl; + + TRACE( "iface %p, name %s, value %p\n", iface, debugstr_hstring(name), value ); + + if (!value) return E_POINTER; + if (!name) return E_INVALIDARG; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IHostName_iface.lpVtbl = &hostname_vtbl; + impl->ref = 1; + impl->rawname = name; + + *value = &impl->IHostName_iface; + TRACE( "created IHostName %p.\n", *value ); + return S_OK; } static const struct IHostNameFactoryVtbl hostname_factory_vtbl = diff --git a/dlls/windows.networking.hostname/private.h b/dlls/windows.networking.hostname/private.h index 55faba8cc96..a07690911c5 100644 --- a/dlls/windows.networking.hostname/private.h +++ b/dlls/windows.networking.hostname/private.h @@ -33,6 +33,7 @@ #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" #define WIDL_using_Windows_Networking +#define WIDL_using_Windows_Networking_Connectivity #include "windows.networking.h" extern IActivationFactory *hostname_factory; @@ -75,5 +76,4 @@ extern IActivationFactory *hostname_factory; #define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) - #endif diff --git a/dlls/windows.networking.hostname/tests/hostname.c b/dlls/windows.networking.hostname/tests/hostname.c index 0d9ea85bdef..18cdec840ef 100644 --- a/dlls/windows.networking.hostname/tests/hostname.c +++ b/dlls/windows.networking.hostname/tests/hostname.c @@ -79,14 +79,19 @@ static void test_HostnameStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IHostNameFactory_CreateHostName( hostnamefactory, NULL, &hostname ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); hr = IHostNameFactory_CreateHostName( hostnamefactory, str, NULL ); - todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); hr = IHostNameFactory_CreateHostName( hostnamefactory, NULL, NULL ); - todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); hr = IHostNameFactory_CreateHostName( hostnamefactory, str, &hostname ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( hostname != NULL, "got NULL hostname %p.\n", hostname ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hostname != NULL, "got NULL hostname %p.\n", hostname ); + + check_interface( hostname, &IID_IUnknown ); + check_interface( hostname, &IID_IInspectable ); + check_interface( hostname, &IID_IAgileObject ); + check_interface( hostname, &IID_IHostName ); hr = IHostName_get_RawName( hostname, NULL ); todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); @@ -98,6 +103,8 @@ static void test_HostnameStatics(void) WindowsDeleteString( str ); WindowsDeleteString( rawname ); + ref = IHostName_Release( hostname ); + ok( !ref, "got ref %ld.\n", ref ); ref = IHostNameFactory_Release( hostnamefactory ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0