- Wine-Devel - list.winehq.org

[PATCH] mouse.c: Ensure mouse does not get stuck after grab release.
by Mark Redmann July 19, 2021

July 19, 2021

1 0

Re: [PATCH] wineboot: Add network adapter information to the registry.
by Huw Davies July 19, 2021

July 19, 2021

On Mon, Jul 19, 2021 at 03:39:16PM +0800, Haoyang Chen wrote: > 在 2021/7/19 下午3:16, Huw Davies 写道: > > We're already adding some network card keys in ndis.sys, so probably > > this should go there instead of wineboot. > > > > Also, which is these does the app you're looking at actually need? I > > don't see DefaultNameIndex and DefaultNameResourceId in my Windows 10 > > VM and don't see PnpInstanceID on many of the adaptors in my Windows 7 > > VM. > > > > Huw. > > > Hi, > > There is an application which needs to query the "real" MAC address. > > It first enumerates all the MAC addresses through the GetAdaptersInfo() > > function, and then goes to the registry to look up the PnpInstanceID > > value of the corresponding network card. Ok, so we don't need the DefaultName* values. > It does not query the ndis.sys key. I'm not sure why you mention this. I was simply suggesting moving the creation of these keys to ndis.sys, so that all of this stuff is in the same place. Since we need the PnpInstanceID value, that should set in ndis.sys and then wbemprox should be changed to read it from the registry. Huw.

1 0

[PATCH] wineboot: Add network adapter information to the registry.
by Haoyang Chen July 19, 2021

July 19, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- loader/wine.inf.in | 7 ++ programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 119 ++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 49e4f45da27..1f9e964d060 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -41,6 +41,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -65,6 +66,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -92,6 +94,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -119,6 +122,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -764,6 +768,9 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" +[Network] +HKLM,System\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318} + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"l_intl.nls" HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"l_intl.nls" diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 0a1f5e4152f..5cb778f65cc 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 ws2_32 kernelbase +IMPORTS = uuid advapi32 ws2_32 kernelbase oleaut32 ole32 DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 92276fcbe76..1d3a43fedff 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -79,6 +79,8 @@ #include <setupapi.h> #include <newdev.h> #include "resource.h" +#include "initguid.h" +#include <wbemcli.h> WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -1586,6 +1588,122 @@ done: return ret; } +static HRESULT query_property(IWbemClassObject *obj, const WCHAR *prop, WCHAR *buf, DWORD bufLen ) +{ + CIMTYPE type = 0xdeadbeef; + VARIANT val; + HRESULT hr = S_OK; + + if (!buf || !bufLen) return WBEM_E_INVALID_QUERY; + + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, prop, 0, &val, &type, NULL ); + if (hr != S_OK) return hr; + + if (V_VT(&val) == VT_BSTR) + wcscpy(buf,V_BSTR(&val)); + else + hr = WBEM_E_INVALID_QUERY_TYPE; + VariantClear( &val ); + return hr; +} + +static void insert_adapter(HKEY hkey, IWbemClassObject *obj) +{ + WCHAR value[MAX_PATH]; + WCHAR connection[MAX_PATH]; + HKEY subhkey; + LSTATUS status; + static int index = 0; + + if (S_OK != query_property( obj, L"GUID", value, ARRAYSIZE(value))) + return; + + swprintf( connection, ARRAYSIZE(connection), L"%s\\Connection", value); + + if ((status = RegCreateKeyExW( hkey, connection, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &subhkey, NULL ))) + return; + set_reg_value_dword(subhkey, L"DefaultNameIndex", index++); + set_reg_value_dword(subhkey, L"DefaultNameResourceId", 0x709); /* FIXME */ + + if (S_OK == query_property( obj, L"Name", value, ARRAYSIZE(value))) + set_reg_value(subhkey, L"Name", value); + if (S_OK == query_property( obj, L"PNPDeviceID", value, ARRAYSIZE(value))) + set_reg_value(subhkey, L"PnpInstanceID", value); + RegCloseKey( subhkey ); +} + +static void update_networkAdapter(void) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result = NULL; + IWbemClassObject *obj = NULL; + HRESULT hr = S_OK; + DWORD count = 0; + BSTR path = SysAllocString( L"ROOT\\CIMV2" ); + IWbemLocator *locator = NULL; + IWbemServices *services = NULL; + HKEY key; + + CoInitialize( NULL ); + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", &key )) + { + WINE_WARN("can't open network adapter registry.\n"); + goto done; + } + + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) + { + WINE_TRACE("can't create instance of WbemLocator\n"); + goto done; + } + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + if (hr != S_OK) + { + WINE_TRACE( "failed to get IWbemServices interface %08x\n", hr ); + goto done; + } + + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + if (hr != S_OK) + { + WINE_TRACE( "failed to set proxyBlanket %08x\n", hr ); + goto done; + } + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + WINE_TRACE( "failed to exec query %08x\n", hr ); + goto done; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + insert_adapter(key, obj); + + IWbemClassObject_Release( obj ); + } + +done: + if (result) IEnumWbemClassObject_Release( result ); + if (query) SysFreeString( query ); + if (wql) SysFreeString( wql ); + if (path) SysFreeString( path ); + if (services) IWbemServices_Release( services ); + if (locator) IWbemLocator_Release( locator ); + RegCloseKey( key ); + CoUninitialize(); +} + static void usage( int status ) { WINE_MESSAGE( "Usage: wineboot [options]\n" ); @@ -1713,6 +1831,7 @@ int __cdecl main( int argc, char *argv[] ) if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); + update_networkAdapter(); ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE ); -- 2.20.1

2 2

[PATCH] gdi32: Fix a typo in unix_face_create().
by Jactry Zeng July 19, 2021

July 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51382 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> This also fixes test failures in test_lang_names() when on Japanese system. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 490e4c501aa..ee14bd25119 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1245,7 +1245,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = decode_opentype_name( &style_name.face_name ); memset( &full_name, 0, sizeof(full_name) ); - style_name.primary_langid = primary_langid; + full_name.primary_langid = primary_langid; opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); This->full_name = decode_opentype_name( &full_name.face_name ); -- 2.30.2

2 1

[PATCH 11/15] gdi32: Introduce DC_ATTR struct and use it to store current position.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++++++++++++++++----- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/painting.c | 30 +++++++++++++++--------------- dlls/gdi32/path.c | 2 +- include/ntgdi.h | 10 ++++++++++ 8 files changed, 53 insertions(+), 29 deletions(-)

2 1

[PATCH v2 10/15] gdi32: Handle metafiles directly in Arc implementation.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo spotted by Saulius. dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-)

2 1

[PATCH 09/15] gdi32: Handle metafiles directly in Chord and Pie implementations.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/mfdrv/graphics.c | 20 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 15 +++++++++++++-- dlls/gdi32/mfdrv/metafiledrv.h | 7 +++---- 5 files changed, 38 insertions(+), 16 deletions(-)

2 1

[PATCH v2 08/15] gdi32: Handle metafiles directly in MoveToEx implementation.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests, spotted by Nikolay. dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 12 ++++-------- 6 files changed, 11 insertions(+), 13 deletions(-)

2 1

[PATCH 07/15] gdi32: Handle metafiles directly in LineTo implementation.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Metafiles are handled entirely in user space on Windows, so we can't use driver interface for them, which will ultimately live kernel/unix part. On Windows, they don't even have a proper DC associated with them, which is easily observed by very different behaviour from other DC types in a number of functions. We even have some todo_wine tests for that. dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 18 +++++++++++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +++- include/ntgdi.h | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-)

2 1

[PATCH 06/15] gdi32: Use NtGdiArcInternal for Pie implementation.
by Jacek Caban July 19, 2021

July 19, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/painting.c | 28 ++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-)

2 1