wine-devel

wine-devel@winehq.org

84463 discussions

[PATCH 1/3] urlmon: Add basic implementation of MapBrowserEmulationModeToUserAgent.
by Gabriel Ivăncescu 11 Apr '22

11 Apr '22

This is necessary for mshtml's navigator userAgent to work properly, since some apps expect it. The second argument seems to be output pointer that gets allocated (by CoTaskMemAlloc, or something compatible with it), but the first argument seems to be a pointer to an unknown struct, which makes it almost impossible to guess reliably what it does by just inspecting its behavior... Thankfully, it seems only the first DWORD field is necessary for this. Changing it returns the user agent for that given mode, if the rest is zeros. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Unfortunately I was not able to find a public structure that starts with such a field in urlmon. Sending these to get some feedback if there's a better way... dlls/urlmon/session.c | 40 +++++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 53 +++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 10 -------- 4 files changed, 94 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 052444d..671d74d 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -504,6 +504,7 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) } static LPWSTR user_agent; +static BOOL user_agent_set; static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { @@ -710,6 +711,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf heap_free(user_agent); user_agent = new_user_agent; + user_agent_set = TRUE; update_user_agent(user_agent); LeaveCriticalSection(&session_cs); @@ -748,6 +750,44 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) return hres; } +/*********************************************************************** + * MapBrowserEmulationModeToUserAgent (URLMON.445) + * Undocumented, added in IE8 + */ +HRESULT WINAPI MapBrowserEmulationModeToUserAgent(const void *arg, WCHAR **ret) +{ + DWORD size, version; + const WCHAR *ua; + WCHAR buf[1024]; + + FIXME("%p %p\n", arg, ret); + + if(user_agent_set) { + /* Native ignores first arg if custom user agent has been set, doesn't crash even if NULL */ + size = (wcslen(user_agent) + 1) * sizeof(WCHAR); + ua = user_agent; + }else { + *ret = NULL; + + /* First arg seems to be a pointer to a structure of unknown size, and crashes + if it's too small (or filled with arbitrary values from the stack). For our + purposes, we only check first field which seems to be the requested version. */ + version = *(DWORD*)arg; + if(version == 5) + version = 7; + if(version < 7 || version > 11) + return E_FAIL; + + size = obtain_user_agent(version, buf, ARRAY_SIZE(buf)) * sizeof(WCHAR); + ua = buf; + } + + if(!(*ret = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + memcpy(*ret, ua, size); + return S_OK; +} + void free_session(void) { name_space *ns_iter, *ns_last; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0575a43..72b3442 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -83,6 +83,7 @@ static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); +static HRESULT (WINAPI *pMapBrowserEmulationModeToUserAgent)(const void*,WCHAR**); static WCHAR *a2co(const char *str) { @@ -2721,6 +2722,55 @@ static void test_bsc_marshaling(void) TerminateThread(thread, 0); } +static void test_MapBrowserEmulationModeToUserAgent(BOOL custom_ua) +{ + /* Undocumented structure of unknown size, crashes if it's too small (with random values from stack) */ + struct + { + DWORD version; + char unknown[252]; + } arg; + static char test_str[] = "test"; + const char *custom_ua_msg = ""; + HRESULT hres; + unsigned i; + WCHAR *ua; + + if(!pMapBrowserEmulationModeToUserAgent) { + win_skip("MapBrowserEmulationModeToUserAgent not available\n"); + return; + } + memset(&arg, 0, sizeof(arg)); + + if(custom_ua) { + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, sizeof(test_str), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres); + custom_ua_msg = " (with custom ua)"; + } + + for(i = 0; i < 12; i++) { + arg.version = i; + ua = (WCHAR*)0xdeadbeef; + hres = pMapBrowserEmulationModeToUserAgent(&arg, &ua); + ok(hres == (i == 5 || i >= 7 || custom_ua ? S_OK : E_FAIL), + "[%d] MapBrowserEmulationModeToUserAgent%s returned %08lx\n", i, custom_ua_msg, hres); + if(hres != S_OK) + ok(ua == NULL, "[%d] ua%s = %p\n", i, custom_ua_msg, ua); + else { + char buf[1024]; + DWORD size = sizeof(buf); + WCHAR *ua2; + + hres = pObtainUserAgentString(custom_ua ? 0 : i, buf, &size); + ok(hres == S_OK, "[%d] ObtainUserAgentString%s failed: %08lx\n", i, custom_ua_msg, hres); + ua2 = a2co(buf); + ok(!lstrcmpW(ua, ua2), "[%d] ua%s = %s, expected %s\n", i, custom_ua_msg, wine_dbgstr_w(ua), wine_dbgstr_w(ua2)); + CoTaskMemFree(ua2); + CoTaskMemFree(ua); + } + } +} + START_TEST(misc) { HMODULE hurlmon; @@ -2745,6 +2795,7 @@ START_TEST(misc) pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope"); + pMapBrowserEmulationModeToUserAgent = (void*) GetProcAddress(hurlmon, (const char*)445); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { @@ -2757,6 +2808,7 @@ START_TEST(misc) if(argc <= 2 || strcmp(argv[2], "internet_features")) { register_protocols(); + test_MapBrowserEmulationModeToUserAgent(FALSE); test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); @@ -2773,6 +2825,7 @@ START_TEST(misc) test_MkParseDisplayNameEx(); test_IsValidURL(); test_bsc_marshaling(); + test_MapBrowserEmulationModeToUserAgent(TRUE); } test_internet_features(); diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index ea3cd38..2fda69e 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -110,6 +110,6 @@ 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState -445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +445 stdcall @(ptr ptr) MapBrowserEmulationModeToUserAgent 446 stdcall @(long) CoInternetGetBrowserProfile 455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b540313..56c2257 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -791,16 +791,6 @@ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) return 0; } -/*********************************************************************** - * MapBrowserEmulationModeToUserAgent (URLMON.445) - * Undocumented, added in IE8 - */ -int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) -{ - FIXME("stub: %ld %ld\n", unk1, unk2); - return 0; -} - /*********************************************************************** * CoInternetGetBrowserProfile (URLMON.446) * Undocumented, added in IE8 -- 2.34.1

3 5

[PATCH] configure: Mark CROSSCC precious.
by Stefan Dösinger 11 Apr '22

11 Apr '22

So that configure remembers e.g. ccache for building PE files. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- One cache to rule them all, one hash to find them, one cache to bring them all and in .ccache bind them. In the land of $HOME where the disk is full. I probably spent more time making fun about "precious" than figuring out all this autoconf stuff, so maybe a better solution is needed. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..a941a148d0a 100644 --- a/configure.ac +++ b/configure.ac @@ -860,6 +860,7 @@ enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} dnl Check for cross compiler to build test programs +AC_ARG_VAR(CROSSCC, "Cross compiler for PE files") AC_SUBST(CROSSTARGET) if test "x$with_mingw" != xno then -- 2.35.1

1 0

[PATCH v3 0/4] Console support & CreateProcess
by Eric Pouech 11 Apr '22

11 Apr '22

The following series is the result of work from - Torge Matties, Jacek Caban and myself - and went through various convergence, merges, rewrite and improvements (especially patch #2 for various authors) it provides: - support for CREATE_NO_WINDOW flag in CreateProcess - a solution for regression introduced in f034084d49b354811096524d472ae5172ac1cebf (when a Wine initial process isn't attached to a unix console, it can generates lots new console window creation, with unwanted side effects) - with the correspondings non regression tests Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): dlls/kernel32/tests: Add more CreateProcess console management tests. dlls/{ntdll, kernel*}: Add support for CREATE_NO_WINDOW flag in CreateProcess. dlls/{ntdll,kernel*}: provide a pseudo console environment for initial CUI processes not tied to an Unix tty dlls/kernel32/tests: added tests for CreateProcess on a shell_no_window console dlls/kernel32/tests/console.c | 126 ++++++++++++++++++++++++++++++---- dlls/kernelbase/console.c | 44 +++++++++--- dlls/kernelbase/process.c | 11 +-- dlls/ntdll/unix/env.c | 2 + dlls/ntdll/unix/process.c | 2 + include/wine/condrv.h | 6 +- programs/conhost/conhost.c | 11 ++- programs/conhost/conhost.h | 1 + server/process.c | 4 +- 9 files changed, 172 insertions(+), 35 deletions(-)

4 13

[PATCH] win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandros Frantzis 11 Apr '22

11 Apr '22

Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++) -- 2.35.1

2 1

[PATCH 1/6] winex11: Directly use ntdll for registry access in setup_options.
by Jacek Caban 11 Apr '22

11 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/x11drv.h | 16 ++++- dlls/winex11.drv/x11drv_main.c | 118 ++++++++++++++++++++++++++++----- dlls/winex11.drv/xim.c | 13 ++-- 3 files changed, 124 insertions(+), 23 deletions(-)

3 3

[PATCH] mf: Implement MFCreateNetSchemePlugin().
by Nikolay Sivov 11 Apr '22

11 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 10 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 23 +++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 6b1d9293c8a..55e071d23f4 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1419,3 +1419,13 @@ HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) return protected ? S_OK : S_FALSE; } + +/*********************************************************************** + * MFCreateNetSchemePlugin (mf.@) + */ +HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **out) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), out); + + return CoCreateInstance(&CLSID_NetSchemePlugin, NULL, CLSCTX_INPROC_SERVER, riid, (void **)out); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 8f340243fc2..162feac4b34 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -41,7 +41,7 @@ @ stub MFCreateMediaProcessor @ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin -@ stub MFCreateNetSchemePlugin +@ stdcall MFCreateNetSchemePlugin(ptr ptr) @ stub MFCreatePMPHost @ stub MFCreatePMPMediaSession @ stub MFCreatePMPServer diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..4015ca79910 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6971,6 +6971,28 @@ failed: CoUninitialize(); } +static void test_MFCreateNetSchemePlugin(void) +{ + IMFSchemeHandler *handler; + HRESULT hr; + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + IMFSchemeHandler_Release(handler); + + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -7004,6 +7026,7 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_MFCreateNetSchemePlugin(); test_wma_encoder(); test_wma_decoder(); test_h264_decoder(); diff --git a/include/mfidl.idl b/include/mfidl.idl index 7034378f585..68057de54c8 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -673,6 +673,7 @@ cpp_quote("HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate); cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") +cpp_quote("HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") -- 2.35.1

2 1

[PATCH 6/6] winex11: Directly use ntdll for registry access in write_registry_settings.
by Jacek Caban 11 Apr '22

11 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/settings.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-)

2 1

[PATCH 5/6] winex11: Directly use ntdll for registry access in read_registry_settings.
by Jacek Caban 11 Apr '22

11 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 44 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-)

2 1

[PATCH 4/6] winex11: Directly use ntdll for registry access in get_display_device_reg_key.
by Jacek Caban 11 Apr '22

11 Apr '22

Also just open the key in write_registry_settings, it should be already created by win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 64 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 33 deletions(-)

2 1

[PATCH 3/6] winex11: Directly use ntdll for registry access in X11DRV_GetICMProfile.
by Jacek Caban 11 Apr '22

11 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-)

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel