wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : mmdevapi: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: e636c2a22aee33c19dbe5d5cb3426f5abf7dab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e636c2a22aee33c19dbe5d5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:39:53 2021 +0100 mmdevapi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++++++---------------------- dlls/mmdevapi/spatialaudio.c | 4 ++-- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 6ac491f980d..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,5 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 07b4dca028b..fc33cac17ec 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -160,28 +160,28 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT case REG_SZ: { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->u.pwszVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->pwszVal, &size); break; } case REG_DWORD: { pv->vt = VT_UI4; - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->u.ulVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->ulVal, &size); break; } case REG_BINARY: { pv->vt = VT_BLOB; - pv->u.blob.cbSize = size; - pv->u.blob.pBlobData = CoTaskMemAlloc(size); - if (!pv->u.blob.pBlobData) + pv->blob.cbSize = size; + pv->blob.pBlobData = CoTaskMemAlloc(size); + if (!pv->blob.pBlobData) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->u.blob.pBlobData, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->blob.pBlobData, &size); break; } default: @@ -211,19 +211,19 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT { case VT_UI4: { - ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->u.ulVal, sizeof(DWORD)); + ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->ulVal, sizeof(DWORD)); break; } case VT_BLOB: { - ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->u.blob.pBlobData, pv->u.blob.cbSize); - TRACE("Blob %p %u\n", pv->u.blob.pBlobData, pv->u.blob.cbSize); + ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->blob.pBlobData, pv->blob.cbSize); + TRACE("Blob %p %u\n", pv->blob.pBlobData, pv->blob.cbSize); break; } case VT_LPWSTR: { - ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->u.pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->u.pwszVal))); + ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->pwszVal))); break; } default: @@ -327,12 +327,12 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st PROPVARIANT pv; pv.vt = VT_LPWSTR; - pv.u.pwszVal = name; + pv.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); - pv.u.pwszVal = guidstr; + pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); set_driver_prop_value(id, flow, &devicepath_key); @@ -340,7 +340,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4; - pv.u.ulVal = (flow == eCapture) ? Microphone : Speakers; + pv.ulVal = (flow == eCapture) ? Microphone : Speakers; MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); } @@ -423,12 +423,12 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); - memcpy(name, pv.u.pwszVal, size_bytes); + memcpy(name, pv.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); - CoTaskMemFree(pv.u.pwszVal); + CoTaskMemFree(pv.pwszVal); } } while (1); @@ -455,8 +455,8 @@ static HRESULT set_format(MMDevice *dev) IAudioClient_Release(client); pv.vt = VT_BLOB; - pv.u.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; - pv.u.blob.pBlobData = (BYTE*)fmt; + pv.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; + pv.blob.pBlobData = (BYTE*)fmt; MMDevice_SetPropValue(&dev->devguid, dev->flow, &PKEY_AudioEngine_DeviceFormat, &pv); MMDevice_SetPropValue(&dev->devguid, dev->flow, @@ -1420,10 +1420,10 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY if (IsEqualPropertyKey(*key, PKEY_AudioEndpoint_GUID)) { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); + if (!pv->pwszVal) return E_OUTOFMEMORY; - StringFromGUID2(&This->parent->devguid, pv->u.pwszVal, 39); + StringFromGUID2(&This->parent->devguid, pv->pwszVal, 39); return S_OK; } @@ -1545,10 +1545,10 @@ static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, { INT size = (lstrlenW(drvs.module_name) + 1) * sizeof(WCHAR); pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) return E_OUTOFMEMORY; - memcpy(pv->u.pwszVal, drvs.module_name, size); + memcpy(pv->pwszVal, drvs.module_name, size); return S_OK; } diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 7ec09b663aa..597c2d29933 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -757,13 +757,13 @@ static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, if(prop && (prop->vt != VT_BLOB || - prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + prop->blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ WARN("Got invalid params\n"); *stream = NULL; return E_INVALIDARG; } - params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->blob.pBlobData; if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ *stream = NULL;

1 0

Jacek Caban : qcap: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: d5ab8f3dc9d40bdcfe1aa4b0e12f5ee0ef178308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ab8f3dc9d40bdcfe1aa4b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:13 2021 +0100 qcap: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/qcap/qcap_main.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index ff90788ff14..417e7f332c0 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,6 +1,5 @@ MODULE = qcap.dll IMPORTS = strmbase strmiids uuid ole32 oleaut32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION DELAYIMPORTS = msvfw32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 2c7c1216996..5f608c16310 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_NAMELESS_EXTENSION + #include "qcap_private.h" #include "rpcproxy.h"

1 0

Jacek Caban : qedit: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: b9393340f77508a0b45cd46e903aeb3850bf006e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9393340f77508a0b45cd46e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:05 2021 +0100 qedit: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 1 - dlls/qedit/main.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 6576db84de6..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,6 +1,5 @@ MODULE = qedit.dll IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a4a4f5ec38c..158fb4bc0b8 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_NAMELESS_EXTENSION + #include "qedit_private.h" #include "rpcproxy.h" #include "wine/debug.h"

1 0

Jacek Caban : msi: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: cc2cc1463a493651f765fe18852a16c01184ad92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2cc1463a493651f765fe18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:39:49 2021 +0100 msi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 1 - dlls/msi/suminfo.c | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index bc000573d98..cf6d498e344 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,6 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRAIDLFLAGS = --prefix-server=s_ diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 19317713a3c..82463be73cc 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -91,7 +91,7 @@ static HRESULT (WINAPI *pPropVariantChangeType) static void free_prop( PROPVARIANT *prop ) { if (prop->vt == VT_LPSTR ) - msi_free( prop->u.pszVal ); + msi_free( prop->pszVal ); prop->vt = VT_EMPTY; } @@ -213,14 +213,14 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz LPSTR str = msi_alloc( propdata->u.str.len ); memcpy( str, propdata->u.str.str, propdata->u.str.len ); str[ propdata->u.str.len - 1 ] = 0; - property.u.pszVal = str; + property.pszVal = str; } else if( propdata->type == VT_FILETIME ) - property.u.filetime = propdata->u.ft; + property.filetime = propdata->u.ft; else if( propdata->type == VT_I2 ) - property.u.iVal = propdata->u.i2; + property.iVal = propdata->u.i2; else if( propdata->type == VT_I4 ) - property.u.lVal = propdata->u.i4; + property.lVal = propdata->u.i4; /* check the type is the same as we expect */ if( type != propdata->type ) @@ -344,16 +344,16 @@ static UINT write_property_to_data( const PROPVARIANT *prop, LPBYTE data ) switch( prop->vt ) { case VT_I2: - sz += write_dword( data, sz, prop->u.iVal ); + sz += write_dword( data, sz, prop->iVal ); break; case VT_I4: - sz += write_dword( data, sz, prop->u.lVal ); + sz += write_dword( data, sz, prop->lVal ); break; case VT_FILETIME: - sz += write_filetime( data, sz, &prop->u.filetime ); + sz += write_filetime( data, sz, &prop->filetime ); break; case VT_LPSTR: - sz += write_string( data, sz, prop->u.pszVal ); + sz += write_string( data, sz, prop->pszVal ); break; } return sz; @@ -642,11 +642,11 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN { case VT_I2: if( piValue ) - *piValue = prop->u.iVal; + *piValue = prop->iVal; break; case VT_I4: if( piValue ) - *piValue = prop->u.lVal; + *piValue = prop->lVal; break; case VT_LPSTR: if( pcchValueBuf ) @@ -655,14 +655,14 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN if( str->unicode ) { - len = MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, NULL, 0 ) - 1; - MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, str->str.w, *pcchValueBuf ); + len = MultiByteToWideChar( CP_ACP, 0, prop->pszVal, -1, NULL, 0 ) - 1; + MultiByteToWideChar( CP_ACP, 0, prop->pszVal, -1, str->str.w, *pcchValueBuf ); } else { - len = lstrlenA( prop->u.pszVal ); + len = lstrlenA( prop->pszVal ); if( str->str.a ) - lstrcpynA(str->str.a, prop->u.pszVal, *pcchValueBuf ); + lstrcpynA(str->str.a, prop->pszVal, *pcchValueBuf ); } if (len >= *pcchValueBuf) ret = ERROR_MORE_DATA; @@ -671,7 +671,7 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN break; case VT_FILETIME: if( pftValue ) - *pftValue = prop->u.filetime; + *pftValue = prop->filetime; break; case VT_EMPTY: break; @@ -691,7 +691,7 @@ LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) prop = &si->property[uiProperty]; if( prop->vt != VT_LPSTR ) return NULL; - return strdupAtoW( prop->u.pszVal ); + return strdupAtoW( prop->pszVal ); } INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) @@ -703,7 +703,7 @@ INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) prop = &si->property[uiProperty]; if( prop->vt != VT_I4 ) return -1; - return prop->u.lVal; + return prop->lVal; } LPWSTR msi_get_suminfo_product( IStorage *stg ) @@ -850,28 +850,28 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, switch( type ) { case VT_I4: - prop->u.lVal = iValue; + prop->lVal = iValue; break; case VT_I2: - prop->u.iVal = iValue; + prop->iVal = iValue; break; case VT_FILETIME: - prop->u.filetime = *pftValue; + prop->filetime = *pftValue; break; case VT_LPSTR: if( str->unicode ) { len = WideCharToMultiByte( CP_ACP, 0, str->str.w, -1, NULL, 0, NULL, NULL ); - prop->u.pszVal = msi_alloc( len ); + prop->pszVal = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, str->str.w, -1, - prop->u.pszVal, len, NULL, NULL ); + prop->pszVal, len, NULL, NULL ); } else { len = lstrlenA( str->str.a ) + 1; - prop->u.pszVal = msi_alloc( len ); - lstrcpyA( prop->u.pszVal, str->str.a ); + prop->pszVal = msi_alloc( len ); + lstrcpyA( prop->pszVal, str->str.a ); } break; }

1 0

Alexandre Julliard : ntdll: Check the loadorder for .so dlls on the Unix side.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: f17483b93696396cf98e8a33b0d27417e9cc8fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17483b93696396cf98e8a33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 16:15:01 2021 +0100 ntdll: Check the loadorder for .so dlls on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 24 +++++------------------- dlls/ntdll/unix/loader.c | 1 + 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1e89edf3bec..7dada146044 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2349,10 +2349,11 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, UNICODE_STRING win_name = *nt_name; TRACE( "trying %s as so lib\n", debugstr_us(&win_name) ); - if (unix_funcs->load_so_dll( &win_name, &module )) + if ((status = unix_funcs->load_so_dll( &win_name, &module ))) { WARN( "failed to load .so lib %s\n", debugstr_us(nt_name) ); - return STATUS_INVALID_IMAGE_FORMAT; + if (status == STATUS_INVALID_IMAGE_FORMAT) status = STATUS_INVALID_IMAGE_NOT_MZ; + return status; } if ((wm = get_modref( module ))) /* already loaded */ @@ -2690,7 +2691,6 @@ done: static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, DWORD flags, WINE_MODREF** pwm ) { - enum loadorder loadorder; UNICODE_STRING nt_name; struct file_id id; HANDLE mapping = 0; @@ -2715,27 +2715,13 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC if (nts && nts != STATUS_DLL_NOT_FOUND && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; - loadorder = unix_funcs->get_load_order( &nt_name ); - prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; switch (nts) { case STATUS_INVALID_IMAGE_NOT_MZ: /* not in PE format, maybe it's a .so file */ - switch (loadorder) - { - case LO_NATIVE: - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - if (!load_so_dll( load_path, &nt_name, flags, pwm )) nts = STATUS_SUCCESS; - break; - default: - nts = STATUS_DLL_NOT_FOUND; - break; - } + nts = load_so_dll( load_path, &nt_name, flags, pwm ); break; case STATUS_SUCCESS: /* valid PE file */ @@ -2743,7 +2729,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC break; case STATUS_DLL_NOT_FOUND: /* no file found, try builtin */ - switch (loadorder) + switch (unix_funcs->get_load_order( &nt_name )) { case LO_NATIVE_BUILTIN: case LO_BUILTIN: diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d9db518ee76..438ff474a92 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1153,6 +1153,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) NTSTATUS status; DWORD len; + if (get_load_order( nt_name ) == LO_DISABLED) return STATUS_DLL_NOT_FOUND; if (nt_to_unix_file_name( nt_name, &unix_name, NULL, FILE_OPEN )) return STATUS_DLL_NOT_FOUND; /* remove .so extension from Windows name */

1 0

Alexandre Julliard : ntdll: Don't pass the application name to get_load_order().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: e8ec7a8cec819ec40341fdc8b58a759c909979ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ec7a8cec819ec40341fdc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 16:04:22 2021 +0100 ntdll: Don't pass the application name to get_load_order(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/unix/loader.c | 6 +----- dlls/ntdll/unix/loadorder.c | 6 +++++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 01644df7763..1e89edf3bec 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2691,7 +2691,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WINE_MODREF *main_exe; UNICODE_STRING nt_name; struct file_id id; HANDLE mapping = 0; @@ -2716,8 +2715,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC if (nts && nts != STATUS_DLL_NOT_FOUND && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; - main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - loadorder = unix_funcs->get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); + loadorder = unix_funcs->get_load_order( &nt_name ); prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dd966729763..d9db518ee76 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1395,13 +1395,9 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, UNICODE_STRING nt_name; SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; - const WCHAR *app_name = NULL; - - if (NtCurrentTeb()->Peb->ImageBaseAddress) - app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; init_unicode_string( &nt_name, filename ); - loadorder = get_load_order( app_name, &nt_name ); + loadorder = get_load_order( &nt_name ); if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) { diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index f7360bdf7e1..67a7473dc7f 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -378,15 +378,19 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) +enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; + const WCHAR *app_name = NULL; WCHAR *module, *basename; int len; + if (NtCurrentTeb()->Peb->ImageBaseAddress) + app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if (!init_done) init_load_order(); std_key = get_standard_key(); if (app_name) app_key = get_app_key( app_name ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c51aee2d8e4..1557aa2371a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -400,7 +400,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) } #endif -extern enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; +extern enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; static inline size_t ntdll_wcslen( const WCHAR *str ) { diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 71cc4177c06..80e4eaefc75 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -37,7 +37,7 @@ enum loadorder }; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 118 +#define NTDLL_UNIXLIB_VERSION 119 struct unix_funcs { @@ -91,7 +91,7 @@ struct unix_funcs NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - enum loadorder (CDECL *get_load_order)( const WCHAR *app_name, const UNICODE_STRING *nt_name ); + enum loadorder (CDECL *get_load_order)( const UNICODE_STRING *nt_name ); /* debugging functions */ unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel );

1 0

Alexandre Julliard : ntdll: Make the is_win64 variable global.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 4e2bd548b1ccee3c76568de19aa50904d4834fa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2bd548b1ccee3c76568de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 14:23:02 2021 +0100 ntdll: Make the is_win64 variable global. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/process.c | 2 -- dlls/ntdll/unix/server.c | 2 -- dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unix/virtual.c | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f89ec12dc7e..dd966729763 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -114,8 +114,6 @@ static const BOOL use_preloader = TRUE; static const BOOL use_preloader = FALSE; #endif -static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); - static char *argv0; static const char *bin_dir; static const char *dll_dir; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 1a92235de20..b020e15eaee 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -70,8 +70,6 @@ static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > size MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | MEM_EXECUTE_OPTION_PERMANENT : 0); -static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); - static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; static UINT process_error_mode; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 7d1231bf925..3f446e8348a 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -99,8 +99,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ -static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); - static const char *server_dir; unsigned int server_cpus = 0; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 904667399f2..c51aee2d8e4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -41,6 +41,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; #endif +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + struct debug_info { unsigned int str_pos; /* current position in strings buffer */ diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8ceba611875..149555f4fce 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -141,7 +141,6 @@ static const BYTE VIRTUAL_Win32Flags[16] = static struct wine_rb_tree views_tree; static pthread_mutex_t virtual_mutex; -static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const UINT page_shift = 12; static const UINT_PTR page_mask = 0xfff; static const UINT_PTR granularity_mask = 0xffff;

1 0

Alexandre Julliard : ntdll: Use the same builtin check for process creation and initial image loading.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 482a26e13503a9779107d6e7f1bf9229b6cecea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482a26e13503a9779107d6e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 11:34:36 2021 +0100 ntdll: Use the same builtin check for process creation and initial image loading. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 47 +++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/process.c | 39 ++--------------------------------- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2467b640a79..f89ec12dc7e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1452,6 +1452,42 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, } +/*************************************************************************** + * is_builtin_path + */ +BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) +{ + static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','w','o','w','6','4'}; + unsigned int len; + + *machine = current_machine; + if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && + !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) + { +#ifndef _WIN64 + if (NtCurrentTeb64() && NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]) + *machine = IMAGE_FILE_MACHINE_AMD64; +#endif + goto found; + } + if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && + !wcsnicmp( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) + { + *machine = IMAGE_FILE_MACHINE_I386; + goto found; + } + return FALSE; + +found: + /* check that there are no other path components */ + len = wcslen(system_dir); + while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; + while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; + return len == path->Length / sizeof(WCHAR); +} + + /*********************************************************************** * open_main_image */ @@ -1507,7 +1543,7 @@ NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *c NTSTATUS status; SIZE_T size; struct stat st; - const WCHAR *p; + WORD machine; /* special case for Unix file name */ if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) @@ -1523,13 +1559,10 @@ NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *c if (status != STATUS_DLL_NOT_FOUND) return status; /* if path is in system dir, we can load the builtin even if the file itself doesn't exist */ - if (!wcsnicmp( *image, system_dir, wcslen(system_dir) )) + init_unicode_string( &nt_name, *image ); + if (is_builtin_path( &nt_name, &machine )) { - p = *image + wcslen( system_dir ); - while (*p == '\\') p++; - if (wcschr( p, '\\' )) goto failed; - init_unicode_string( &nt_name, *image ); - status = find_builtin_dll( &nt_name, module, &size, image_info, current_machine, FALSE ); + status = find_builtin_dll( &nt_name, module, &size, image_info, machine, FALSE ); if (status != STATUS_DLL_NOT_FOUND) return status; } /* if name contains a path, bail out */ diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index d2fd08e155f..1a92235de20 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -226,33 +226,6 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p } -/*************************************************************************** - * is_builtin_path - */ -static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) -{ - static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','w','o','w','6','4'}; - - *is_64bit = is_win64; - if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && - !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) - { -#ifndef _WIN64 - if (NtCurrentTeb64() && NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]) *is_64bit = TRUE; -#endif - return TRUE; - } - if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && - !wcsnicmp( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) - { - *is_64bit = FALSE; - return TRUE; - } - return FALSE; -} - - /*********************************************************************** * get_so_file_info */ @@ -373,17 +346,9 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT ))) { - BOOL is_64bit; - - if (is_builtin_path( path, &is_64bit )) + if (is_builtin_path( path, &info->machine )) { - TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); - /* assume current arch */ -#if defined(__i386__) || defined(__x86_64__) - info->machine = is_64bit ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; -#else - info->machine = current_machine; -#endif + TRACE( "assuming %04x builtin for %s\n", info->machine, debugstr_us(path)); return STATUS_SUCCESS; } return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3f84fa9c065..904667399f2 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -143,6 +143,7 @@ extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; +extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot/TestLauncher: Fix the spelling of an error message.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: tools Branch: master Commit: 71ec3a5096711cf2a4cb19f0b4412e7e1194b87f URL: https://source.winehq.org/git/tools.git/?a=commit;h=71ec3a5096711cf2a4cb19f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 17:13:53 2021 +0100 testbot/TestLauncher: Fix the spelling of an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 58eed76..2a423d2 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - Error("Cauld not get the test executable full path %s (error %lu)\n", + Error("Could not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); return 1; }

1 0

Francois Gouget : testbot/TestWTBS: Fix a couple of typos in the documentation.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: tools Branch: master Commit: 4bd805aad4d35dd070009c4d618db588f74c74ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bd805aad4d35dd070009c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 17:13:36 2021 +0100 testbot/TestWTBS: Fix a couple of typos in the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index b76aad5..8067a62 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -675,8 +675,8 @@ there is no error one would declare an empty group such as below, though a g 0 tests.report.kernel32 Finally, note that while the error directives are inherited by subcategories, -they are not merged. So if if both win and win32 have error-matching -directives, win32 will not inherit anything from the win category. +they are not merged. So if both win and win32 have error-matching directives, +win32 will not inherit anything from the win category. =item <tasks.(report|log|testbot).Errors> @@ -873,8 +873,8 @@ Checks that the TestBot applied the patch and did not find it necessary to run make_requests and make_opengl. Finally, note that while the Grep* directives are inherited by subcategories, -they are not merged. So if if both win and win32 have Grep directives, win32 -will not inherit anything from the win category. +they are not merged. So if both win and win32 have Grep directives, win32 will +not inherit anything from the win category. =cut

1 0

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-commits March 2021