wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Jeremy Newman : moving wine-announce and wine-releases mailing lists
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: website Branch: master Commit: d16bf733c69fd629d774ff278531cdd9a8c28acd URL: https://source.winehq.org/git/website.git/?a=commit;h=d16bf733c69fd629d774f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 7 11:49:24 2022 -0500 moving wine-announce and wine-releases mailing lists --- templates/en/forums.template | 15 ++++++--------- templates/fr/forums.template | 12 +++++------- templates/ko/forums.template | 15 +++++---------- templates/nl/forums.template | 15 +++++---------- templates/pl/forums.template | 12 ++++++------ templates/pt/forums.template | 14 ++++++-------- templates/tr/forums.template | 12 +++++------- templates/zh-cn/forums.template | 14 ++++++-------- 8 files changed, 44 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=d16bf733c69fd629d…

1 0

David Kahurani : oleaut32: Handle DATE in string form in VarFormat.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 9af3a79b96318471818e0abacfc1a6f8ecc91463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af3a79b96318471818e0aba… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 4 12:01:48 2022 +0300 oleaut32: Handle DATE in string form in VarFormat. Testing has proven that coercion functions should reject the value which indicates that this is handled as a special case in VarFormat Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=13778 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/oleaut32/tests/varformat.c | 4 ++-- dlls/oleaut32/varformat.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d238ef7b049..16506d8e97f 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -304,8 +304,8 @@ static void test_VarFormat(void) VARFMT(VT_BSTR,V_BSTR,bstrin,"<&>&",S_OK,"testing"); SysFreeString(bstrin); bstrin = SysAllocString(L"39697.11"); - todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); - todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); + VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); + VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); SysFreeString(bstrin); /* Numeric values are converted to strings then output */ VARFMT(VT_I1,V_I1,1,"<&>&",S_OK,"1"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 1d6fac4c518..3f69a45a897 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1585,8 +1585,34 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, USHORT usFlags = dwFlags & VARIANT_CALENDAR_HIJRI ? VAR_CALENDAR_HIJRI : 0; hRes = VariantChangeTypeEx(&vDate, pVarIn, lcid, usFlags, VT_DATE); + /* 31809.40 and similar are treated as invalid by coercion functions but + * it simply is a DATE in string form as far as VarFormat is concerned + */ if (FAILED(hRes)) - return hRes; + { + if (V_TYPE(pVarIn) == VT_BSTR) + { + DATE out; + OLECHAR *endptr = NULL; + /* Try consume the string with wcstod */ + double tmp = wcstod(V_BSTR(pVarIn), &endptr); + + /* Not a double in string form */ + if (*endptr) + return hRes; + + hRes = VarDateFromR8(tmp, &out); + + if (FAILED(hRes)) + return hRes; + + V_VT(&vDate) = VT_DATE; + V_DATE(&vDate) = out; + } + else + return hRes; + } + dateHeader = (FMT_DATE_HEADER*)(rgbTok + FmtGetPositive(header)); }

1 0

Hugh McMaster : regedit: Directly use RegQueryValueExW() instead of a helper function.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 97a380209391fd65fc99f2ee2a69efc181662ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a380209391fd65fc99f2ee… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 6 22:35:15 2022 +1000 regedit: Directly use RegQueryValueExW() instead of a helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index b70176fbbc2..330b535d732 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -178,11 +178,6 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name) -{ - return !RegQueryValueExW(hKey, value_name, NULL, NULL, NULL, NULL); -} - static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) { DWORD valueDataLen; @@ -523,7 +518,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC return FALSE; } - if (value_exists(hwnd, hKey, newName)) { + if (!RegQueryValueExW(hKey, newName, NULL, NULL, NULL, NULL)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; }

1 0

Hugh McMaster : regedit: Correctly calculate REG_MULTI_SZ size before reading from the buffer.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 101fe51b258bc4927dab5b92abc6a53e5e235c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=101fe51b258bc4927dab5b92… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 6 22:27:48 2022 +1000 regedit: Correctly calculate REG_MULTI_SZ size before reading from the buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 353925da90e..b70176fbbc2 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -312,12 +312,12 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) WCHAR *tmpValueData = NULL; INT i, j, count; - for ( i = 0, count = 0; i < len - 1; i++) + for (i = 0, count = 0; i < len / sizeof(WCHAR); i++) if ( !stringValueData[i] && stringValueData[i + 1] ) count++; - tmpValueData = heap_xalloc((len + count) * sizeof(WCHAR)); + tmpValueData = heap_xalloc(len + (count * sizeof(WCHAR))); - for ( i = 0, j = 0; i < len - 1; i++) + for ( i = 0, j = 0; i < len / sizeof(WCHAR); i++) { if ( !stringValueData[i] && stringValueData[i + 1]) { @@ -327,7 +327,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else tmpValueData[j++] = stringValueData[i]; } - tmpValueData[j] = stringValueData[i]; + heap_free(stringValueData); stringValueData = tmpValueData; tmpValueData = NULL; @@ -337,7 +337,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) len = lstrlenW( stringValueData ); tmpValueData = heap_xalloc((len + 2) * sizeof(WCHAR)); - for ( i = 0, j = 0; i < len - 1; i++) + for (i = 0, j = 0; i < len; i++) { if ( stringValueData[i] == char1 && stringValueData[i + 1] == char2) { @@ -348,7 +348,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else tmpValueData[j++] = stringValueData[i]; } - tmpValueData[j++] = stringValueData[i]; + tmpValueData[j++] = 0; tmpValueData[j++] = 0; heap_free(stringValueData);

1 0

Hugh McMaster : regedit: Remove unneeded valueDataLen override for DWORD values.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 159f3699ec5ed1e7742ef79a2fbc5b82fc12043f URL: https://source.winehq.org/git/wine.git/?a=commit;h=159f3699ec5ed1e7742ef79a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Jul 3 22:29:22 2022 +1000 regedit: Remove unneeded valueDataLen override for DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 47ce233039e..353925da90e 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -201,7 +201,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } - if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); + buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); if (lRet) {

1 0

Dmitry Timoshkov : sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: f2583de38d4a9370137f578f8c239041ae080ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2583de38d4a9370137f578f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 6 15:30:46 2022 +0300 sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++--- dlls/sechost/security.c | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..aeee279a86d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4219,6 +4219,7 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; DWORD GLE; DWORD altGLE; + DWORD ace_Mask; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -4239,9 +4240,12 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ - { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_ALL }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, 1 }, + { "D:(A;;020000000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ }, + { "D:(A;;0X40000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_WRITE }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, READ_CONTROL | DELETE | WRITE_DAC | WRITE_OWNER }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, @@ -4275,7 +4279,20 @@ static void test_ConvertStringSecurityDescriptor(void) (cssd[i].altGLE && GLE == cssd[i].altGLE), "(%02u) Unexpected last error %ld\n", i, GLE); if (ret) + { + if (cssd[i].ace_Mask) + { + ACCESS_ALLOWED_ACE *ace; + + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "(%02u) Got %u\n", i, acl->AclRevision); + + ace = (ACCESS_ALLOWED_ACE *)(acl + 1); + ok(ace->Mask == cssd[i].ace_Mask, "(%02u) Expected %08lx, got %08lx\n", + i, cssd[i].ace_Mask, ace->Mask); + } LocalFree(pSD); + } } /* test behaviour with NULL parameters */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..9b52d66ebe8 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -900,8 +900,8 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) const WCHAR *string = *string_ptr; unsigned int i; - if (string[0] == '0' && string[1] == 'x') - return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 0 ); for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) {

1 0

Rémi Bernon : win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 4ce220e4e837186217e69537d7888d8d5bf6dde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce220e4e837186217e69537… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 26 17:48:42 2022 +0200 win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 27 +++++++++++++++------------ dlls/wineandroid.drv/init.c | 8 -------- dlls/winemac.drv/display.c | 9 --------- dlls/winex11.drv/display.c | 25 ++++++++----------------- 4 files changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4528454f5b9..fa82566e24c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1926,14 +1926,14 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm /*********************************************************************** * NtUserEnumDisplaySettings (win32u.@) */ -BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, - DEVMODEW *dev_mode, DWORD flags ) +BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVMODEW *devmode, DWORD flags ) { + static const WCHAR wine_display_driverW[] = {'W','i','n','e',' ','D','i','s','p','l','a','y',' ','D','r','i','v','e','r',0}; WCHAR device_name[CCHDEVICENAME]; struct adapter *adapter; BOOL ret; - TRACE( "%s %#x %p %#x\n", debugstr_us(device), mode, dev_mode, flags ); + TRACE( "device %s, index %#x, devmode %p, flags %#x\n", debugstr_us(device), index, devmode, flags ); if (!lock_display_devices()) return FALSE; if ((adapter = find_adapter( device ))) lstrcpyW( device_name, adapter->dev.device_name ); @@ -1944,15 +1944,18 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, return FALSE; } - ret = user_driver->pEnumDisplaySettingsEx( device_name, mode, dev_mode, flags ); - if (ret) - TRACE( "device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " - "depth:%ubits orientation:%#x.\n", debugstr_w(device_name), mode, - dev_mode->dmPosition.x, dev_mode->dmPosition.y, dev_mode->dmPelsWidth, - dev_mode->dmPelsHeight, dev_mode->dmDisplayFrequency, dev_mode->dmBitsPerPel, - dev_mode->dmDisplayOrientation ); - else - WARN( "Failed to query %s display settings.\n", wine_dbgstr_w(device_name) ); + lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + devmode->dmSize = offsetof(DEVMODEW, dmICMMethod); + memset( &devmode->dmDriverExtra, 0, devmode->dmSize - offsetof(DEVMODEW, dmDriverExtra) ); + + ret = user_driver->pEnumDisplaySettingsEx( device_name, index, devmode, flags ); + + if (!ret) WARN( "Failed to query %s display settings.\n", debugstr_w(device_name) ); + else TRACE( "position %dx%d, resolution %ux%u, frequency %u, depth %u, orientation %#x.\n", + devmode->dmPosition.x, devmode->dmPosition.y, devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmDisplayFrequency, devmode->dmBitsPerPel, devmode->dmDisplayOrientation ); return ret; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5d1c81a77bf..e2cebb974c3 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -303,14 +303,6 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag */ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags ) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; - - devmode->dmSize = offsetof( DEVMODEW, dmICMMethod ); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - memcpy( devmode->dmDeviceName, dev_name, sizeof(dev_name) ); - devmode->dmDriverExtra = 0; devmode->u2.dmDisplayFlags = 0; devmode->dmDisplayFrequency = 0; devmode->u1.s2.dmPosition.x = 0; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 0507acae1a9..191dc1f789b 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1044,8 +1044,6 @@ better: */ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode, DWORD flags) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 }; struct macdrv_display *displays = NULL; int num_displays; CGDisplayModeRef display_mode; @@ -1058,13 +1056,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode init_original_display_mode(); - memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmDriverExtra = 0; - memset(&devmode->dmFields, 0, devmode->dmSize - FIELD_OFFSET(DEVMODEW, dmFields)); - if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 31f73898897..740e018247b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,9 +464,7 @@ static DWORD get_display_depth(ULONG_PTR display_id) */ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; - DEVMODEW *modes; + DEVMODEW *modes, mode; UINT mode_count; ULONG_PTR id; @@ -477,21 +475,20 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW ERR("Failed to get %s registry display settings.\n", wine_dbgstr_w(name)); return FALSE; } - goto done; + return TRUE; } if (n == ENUM_CURRENT_SETTINGS) { - if (!settings_handler.get_id(name, &id) || !settings_handler.get_current_mode(id, devmode)) + if (!settings_handler.get_id( name, &id ) || !settings_handler.get_current_mode( id, &mode )) { ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } - if (!is_detached_mode(devmode)) - devmode->dmBitsPerPel = get_display_depth(id); - - goto done; + memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) ); + if (!is_detached_mode( devmode )) devmode->dmBitsPerPel = get_display_depth( id ); + return TRUE; } pthread_mutex_lock( &settings_mutex ); @@ -522,16 +519,10 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW return FALSE; } - memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode)); + mode = *(DEVMODEW *)((BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n); pthread_mutex_unlock( &settings_mutex ); -done: - /* Set generic fields */ - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmDriverExtra = 0; - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - lstrcpyW(devmode->dmDeviceName, dev_name); + memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) ); return TRUE; }

1 0

Rémi Bernon : win32u: Move default UpdateDisplayDevices implementation out of nulldrv.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 360f12d307296dfa268bac963e1f8c8028c3f238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360f12d307296dfa268bac96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 08:57:18 2022 +0200 win32u: Move default UpdateDisplayDevices implementation out of nulldrv. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 9 ++++----- dlls/win32u/sysparams.c | 38 +++++++++++++++++++------------------- dlls/wineandroid.drv/init.c | 12 ++++++++++-- dlls/winemac.drv/display.c | 8 ++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/display.c | 9 ++++----- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 8 files changed, 45 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=360f12d307296dfa268b…

1 0

Rémi Bernon : win32u: Add invisible winstation virtual monitor outside of nulldrv.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 0f96698b6c2d4d13db4794917ce3871461545321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f96698b6c2d4d13db479491… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 08:17:19 2022 +0200 win32u: Add invisible winstation virtual monitor outside of nulldrv. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 1 - dlls/win32u/sysparams.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 4a853b516f4..af6d0d610fe 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -767,7 +767,6 @@ static BOOL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW m static void nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { - manager->add_monitor( NULL, param ); /* use virtual monitor */ } static BOOL nulldrv_CreateDesktopWindow( HWND hwnd ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3fa361c61a5..ca5c1377ccf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -192,8 +192,6 @@ static const WCHAR guid_devinterface_monitorW[] = {'{','E','6','F','0','7','B','5','F','-','E','E','9','7','-','4','A','9','0','-', 'B','0','7','6','-','3','3','F','5','7','B','F','4','E','A','A','7','}',0}; -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - /* Cached display device information */ struct display_device { @@ -233,9 +231,10 @@ static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER; BOOL enable_thunk_lock = FALSE; +#define VIRTUAL_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) static struct monitor virtual_monitor = { - .handle = NULLDRV_DEFAULT_HMONITOR, + .handle = VIRTUAL_HMONITOR, .flags = MONITORINFOF_PRIMARY, .rc_monitor.right = 1024, .rc_monitor.bottom = 768, @@ -804,7 +803,6 @@ struct device_manager_ctx WCHAR gpu_guid[64]; LUID gpu_luid; HKEY adapter_key; - BOOL virtual_monitor; }; static void link_device( const WCHAR *instance, const WCHAR *class ) @@ -1078,12 +1076,6 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR default_monitorW[] = {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; - if (!monitor) - { - ctx->virtual_monitor = TRUE; - return; - } - TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); @@ -1319,17 +1311,24 @@ static BOOL update_display_cache_from_registry(void) static BOOL update_display_cache(void) { - struct device_manager_ctx ctx = { 0 }; + HWINSTA winstation = NtUserGetProcessWindowStation(); + struct device_manager_ctx ctx = {0}; + USEROBJECTFLAGS flags; - user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); - release_display_manager_ctx( &ctx ); - if (ctx.virtual_monitor) + /* services do not have any adapters, only a virtual monitor */ + if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) + && !(flags.dwFlags & WSF_VISIBLE)) { + pthread_mutex_lock( &display_lock ); clear_display_devices(); list_add_tail( &monitors, &virtual_monitor.entry ); + pthread_mutex_unlock( &display_lock ); return TRUE; } + user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); + release_display_manager_ctx( &ctx ); + if (update_display_cache_from_registry()) return TRUE; if (ctx.gpu_count) {

1 0

Alexandre Julliard : server: Implement unlink_name() for registry keys.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 5414f648eeb00fcc29a37c90d76db211455b10b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5414f648eeb00fcc29a37c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:53:05 2022 +0200 server: Implement unlink_name() for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- server/registry.c | 104 ++++++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 54e9b10e530..5e141b1370d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -940,7 +940,7 @@ static void test_NtDeleteKey(void) ok(status == STATUS_KEY_DELETED, "got %#lx\n", status); status = pNtDeleteKey(hkey); - todo_wine ok(!status, "got %#lx\n", status); + ok(!status, "got %#lx\n", status); RtlInitUnicodeString(&string, L"subkey"); InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, hkey, NULL); diff --git a/server/registry.c b/server/registry.c index 985c124179a..b32b4eb08a0 100644 --- a/server/registry.c +++ b/server/registry.c @@ -434,6 +434,37 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) static void key_unlink_name( struct object *obj, struct object_name *name ) { + struct key *key = (struct key *)obj; + struct key *parent = (struct key *)name->parent; + int i, nb_subkeys; + + if (!parent) return; + + if (parent->obj.ops != &key_ops) + { + default_unlink_name( obj, name ); + return; + } + + for (i = 0; i <= parent->last_subkey; i++) if (parent->subkeys[i] == key) break; + assert( i <= parent->last_subkey ); + for ( ; i < parent->last_subkey; i++) parent->subkeys[i] = parent->subkeys[i + 1]; + parent->last_subkey--; + name->parent = NULL; + if (parent->wow6432node == key) parent->wow6432node = NULL; + release_object( key ); + + /* try to shrink the array */ + nb_subkeys = parent->nb_subkeys; + if (nb_subkeys > MIN_SUBKEYS && parent->last_subkey < nb_subkeys / 2) + { + struct key **new_subkeys; + nb_subkeys -= nb_subkeys / 3; /* shrink by 33% */ + if (nb_subkeys < MIN_SUBKEYS) nb_subkeys = MIN_SUBKEYS; + if (!(new_subkeys = realloc( parent->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) return; + parent->subkeys = new_subkeys; + parent->nb_subkeys = nb_subkeys; + } } /* close the notification associated with a handle */ @@ -648,36 +679,6 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n return key; } -/* free a subkey of a given key */ -static void free_subkey( struct key *parent, int index ) -{ - struct key *key; - int i, nb_subkeys; - - assert( index >= 0 ); - assert( index <= parent->last_subkey ); - - key = parent->subkeys[index]; - for (i = index; i < parent->last_subkey; i++) parent->subkeys[i] = parent->subkeys[i + 1]; - parent->last_subkey--; - key->flags |= KEY_DELETED; - key->obj.name->parent = NULL; - if (parent->wow6432node == key) parent->wow6432node = NULL; - release_object( key ); - - /* try to shrink the array */ - nb_subkeys = parent->nb_subkeys; - if (nb_subkeys > MIN_SUBKEYS && parent->last_subkey < nb_subkeys / 2) - { - struct key **new_subkeys; - nb_subkeys -= nb_subkeys / 3; /* shrink by 33% */ - if (nb_subkeys < MIN_SUBKEYS) nb_subkeys = MIN_SUBKEYS; - if (!(new_subkeys = realloc( parent->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) return; - parent->subkeys = new_subkeys; - parent->nb_subkeys = nb_subkeys; - } -} - /* find the named child of a given key and return its index */ static struct key *find_subkey( const struct key *key, const struct unicode_str *name, int *index ) { @@ -903,7 +904,7 @@ static struct key *create_key_recursive( struct key *key, const struct unicode_s /* we know the index is always 0 in a new key */ if (!(key = alloc_subkey( key, &token, 0, modif ))) { - free_subkey( base, index ); + unlink_named_object( &base->obj ); return NULL; } } @@ -1075,42 +1076,37 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) /* delete a key and its values */ static int delete_key( struct key *key, int recurse ) { - int index; struct key *parent = get_parent( key ); - /* must find parent and index */ - if (key == root_key) + if (key->flags & KEY_DELETED) return 1; + + if (!parent) { set_error( STATUS_ACCESS_DENIED ); - return -1; + return 0; } - assert( parent ); - if (key->flags & KEY_PREDEF) { set_error( STATUS_INVALID_HANDLE ); - return -1; + return 0; } - while (recurse && (key->last_subkey>=0)) - if (0 > delete_key(key->subkeys[key->last_subkey], 1)) - return -1; - - for (index = 0; index <= parent->last_subkey; index++) - if (parent->subkeys[index] == key) break; - assert( index <= parent->last_subkey ); - - /* we can only delete a key that has no subkeys */ - if (key->last_subkey >= 0) + if (recurse) + { + while (key->last_subkey >= 0) + if (!delete_key( key->subkeys[key->last_subkey], 1 )) return 0; + } + else if (key->last_subkey >= 0) /* we can only delete a key that has no subkeys */ { set_error( STATUS_ACCESS_DENIED ); - return -1; + return 0; } if (debug_level > 1) dump_operation( key, NULL, "Delete" ); - free_subkey( parent, index ); + key->flags |= KEY_DELETED; + unlink_named_object( &key->obj ); touch_key( parent, REG_NOTIFY_CHANGE_NAME ); - return 0; + return 1; } /* try to grow the array of values; return 1 if OK, 0 on error */ @@ -2254,11 +2250,11 @@ DECL_HANDLER(open_key) /* delete a registry key */ DECL_HANDLER(delete_key) { - struct key *key; + struct key *key = (struct key *)get_handle_obj( current->process, req->hkey, DELETE, &key_ops ); - if ((key = get_hkey_obj( req->hkey, DELETE ))) + if (key) { - delete_key( key, 0); + delete_key( key, 0 ); release_object( key ); } }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
64
Older →

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 July 2022