Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SETUPAPI] Fix wrong buffer size given to CM_Get_Device_ID_List_ExW
by Hervé Poussineau 02 Apr '21

02 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4712deb8a87394e502cc1… commit 4712deb8a87394e502cc1bdbed6bf9eaa7ef74ae Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 3 00:51:23 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 3 00:52:01 2021 +0200 [SETUPAPI] Fix wrong buffer size given to CM_Get_Device_ID_List_ExW This buffer overflow was introduced in previous commit. --- dll/win32/setupapi/devclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index b8531b0093d..56398262437 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -142,7 +142,7 @@ SETUP_CreateDevicesList( { cr = CM_Get_Device_ID_List_ExW(Enumerator, Buffer, - BufferLength, + BufferLength / sizeof(WCHAR), Enumerator ? CM_GETIDLIST_FILTER_ENUMERATOR : CM_GETIDLIST_FILTER_NONE, list->hMachine); if (cr == CR_BUFFER_SMALL)

1 0

[reactos] 01/01: [SETUPAPI] Use CM_* functions to get list of devices
by Hervé Poussineau 02 Apr '21

02 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3133c308093d78975d9… commit 0f3133c308093d78975d9f34f38d0a4ed2cd97b3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Apr 2 20:00:31 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Apr 2 21:41:09 2021 +0200 [SETUPAPI] Use CM_* functions to get list of devices - this prevents duplicating the code with umpnpmgr::PNP_GetDeviceList - we can enumerate devices on other computers This is part of the bugfix for CORE-17529 --- dll/win32/setupapi/devclass.c | 280 ++++++++++------------------------ dll/win32/setupapi/devinst.c | 2 +- dll/win32/setupapi/setupapi_private.h | 3 + 3 files changed, 86 insertions(+), 199 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 86fc33d281b..b8531b0093d 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -117,231 +117,115 @@ SetupDiDestroyClassImageList( return ret; } -/*********************************************************************** - * SETUP_CreateDevicesListFromEnumerator - * - * PARAMS - * list [IO] Device info set to fill with discovered devices. - * pClassGuid [I] If specified, only devices which belong to this class will be added. - * Enumerator [I] Location to search devices to add. - * hEnumeratorKey [I] Registry key corresponding to Enumerator key. Must have KEY_ENUMERATE_SUB_KEYS right. - * - * RETURNS - * Success: ERROR_SUCCESS. - * Failure: an error code. - */ -static LONG -SETUP_CreateDevicesListFromEnumerator( +LONG +SETUP_CreateDevicesList( IN OUT struct DeviceInfoSet *list, - IN CONST GUID *pClassGuid OPTIONAL, - IN LPCWSTR Enumerator, - IN HKEY hEnumeratorKey) /* handle to Enumerator registry key */ + IN PCWSTR MachineName OPTIONAL, + IN CONST GUID *Class OPTIONAL, + IN PCWSTR Enumerator OPTIONAL) { - HKEY hDeviceIdKey = NULL, hInstanceIdKey; - WCHAR KeyBuffer[MAX_PATH]; - WCHAR InstancePath[MAX_PATH]; - LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ + PWCHAR Buffer = NULL; + DWORD BufferLength = 4096; + PCWSTR InstancePath; struct DeviceInfo *deviceInfo; - DWORD i = 0, j; - DWORD dwLength, dwRegType; - DWORD rc; + WCHAR ClassGuidBuffer[MAX_GUID_STRING_LEN]; + DWORD ClassGuidBufferSize; + GUID ClassGuid; + DEVINST dnDevInst; + CONFIGRET cr; - /* Enumerate device IDs (subkeys of hEnumeratorKey) */ - while (TRUE) - { - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hEnumeratorKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto cleanup; - i++; - - /* Open device id sub key */ - if (hDeviceIdKey != NULL) - RegCloseKey(hDeviceIdKey); - rc = RegOpenKeyExW(hEnumeratorKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hDeviceIdKey); - if (rc != ERROR_SUCCESS) - goto cleanup; + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferLength); + if (!Buffer) + return ERROR_NOT_ENOUGH_MEMORY; - if (FAILED(StringCchCopyW(InstancePath, _countof(InstancePath), Enumerator)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), BackSlash)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), KeyBuffer)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), BackSlash))) + do + { + cr = CM_Get_Device_ID_List_ExW(Enumerator, + Buffer, + BufferLength, + Enumerator ? CM_GETIDLIST_FILTER_ENUMERATOR : CM_GETIDLIST_FILTER_NONE, + list->hMachine); + if (cr == CR_BUFFER_SMALL) { - rc = ERROR_GEN_FAILURE; - goto cleanup; + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + BufferLength *= 2; + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferLength); + if (!Buffer) + return ERROR_NOT_ENOUGH_MEMORY; } - - pEndOfInstancePath = &InstancePath[strlenW(InstancePath)]; - - /* Enumerate instance IDs (subkeys of hDeviceIdKey) */ - j = 0; - while (TRUE) + else if (cr != CR_SUCCESS) { - GUID KeyGuid; + TRACE("CM_Get_Device_ID_List_ExW() failed with status 0x%x\n", cr); + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + return GetErrorCodeFromCrCode(cr); + } + } + while (cr != CR_SUCCESS); - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto cleanup; - j++; + for (InstancePath = Buffer; *InstancePath != UNICODE_NULL; InstancePath += wcslen(InstancePath) + 1) + { + /* Check that device really exists */ + TRACE("Checking %S\n", InstancePath); + cr = CM_Locate_DevNode_Ex(&dnDevInst, + (DEVINSTID_W)InstancePath, + CM_LOCATE_DEVNODE_NORMAL, + list->hMachine); + if (cr != CR_SUCCESS) + { + ERR("CM_Locate_DevNode_ExW('%S') failed with status 0x%x\n", InstancePath, cr); + continue; + } - /* Open instance id sub key */ - rc = RegOpenKeyExW(hDeviceIdKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hInstanceIdKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - *pEndOfInstancePath = '\0'; - strcatW(InstancePath, KeyBuffer); - - /* Read ClassGUID value */ - dwLength = sizeof(KeyBuffer) - sizeof(WCHAR); - rc = RegQueryValueExW(hInstanceIdKey, ClassGUID, NULL, &dwRegType, (LPBYTE)KeyBuffer, &dwLength); - RegCloseKey(hInstanceIdKey); - if (rc == ERROR_FILE_NOT_FOUND) + /* Retrieve GUID of this device */ + if (Class) + { + ClassGuidBufferSize = sizeof(ClassGuidBuffer); + cr = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidBuffer, + &ClassGuidBufferSize, + 0, + list->hMachine); + if (cr == CR_SUCCESS) { - if (pClassGuid) - /* Skip this bad entry as we can't verify it */ + ClassGuidBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&ClassGuidBuffer[1], &ClassGuid) != RPC_S_OK) + { + /* Bad GUID, skip the entry */ + ERR("Invalid ClassGUID '%S' for device %S\n", ClassGuidBuffer, InstancePath); continue; - /* Set a default GUID for this device */ - memcpy(&KeyGuid, &GUID_NULL, sizeof(GUID)); - } - else if (rc != ERROR_SUCCESS) - { - goto cleanup; - } - else if (dwRegType != REG_SZ || dwLength < MAX_GUID_STRING_LEN * sizeof(WCHAR)) - { - rc = ERROR_GEN_FAILURE; - goto cleanup; + } } else { - KeyBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) - /* Bad GUID, skip the entry */ - continue; + TRACE("Using default class GUID_NULL for device %S\n", InstancePath); + memcpy(&ClassGuid, &GUID_NULL, sizeof(GUID)); } - if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) + if (!IsEqualIID(&ClassGuid, Class)) { - /* Skip this entry as it is not the right device class */ + TRACE("Skipping %S due to wrong class GUID\n", InstancePath); continue; } - - /* Add the entry to the list */ - if (!CreateDeviceInfo(list, InstancePath, &KeyGuid, &deviceInfo)) - { - rc = GetLastError(); - goto cleanup; - } - TRACE("Adding '%s' to device info set %p\n", debugstr_w(InstancePath), list); - InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } - } - - rc = ERROR_SUCCESS; - -cleanup: - if (hDeviceIdKey != NULL) - RegCloseKey(hDeviceIdKey); - return rc; -} - -LONG -SETUP_CreateDevicesList( - IN OUT struct DeviceInfoSet *list, - IN PCWSTR MachineName OPTIONAL, - IN CONST GUID *Class OPTIONAL, - IN PCWSTR Enumerator OPTIONAL) -{ - HKEY HKLM = HKEY_LOCAL_MACHINE; - HKEY hEnumKey = NULL; - HKEY hEnumeratorKey = NULL; - WCHAR KeyBuffer[MAX_PATH]; - DWORD i; - DWORD dwLength; - DWORD rc; - - if (Class && IsEqualIID(Class, &GUID_NULL)) - Class = NULL; - - /* Open Enum key (if applicable) */ - if (MachineName != NULL) - { - rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); - if (rc != ERROR_SUCCESS) - goto cleanup; - } - - rc = RegOpenKeyExW( - HKLM, - REGSTR_PATH_SYSTEMENUM, - 0, - KEY_ENUMERATE_SUB_KEYS, - &hEnumKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - /* If enumerator is provided, call directly SETUP_CreateDevicesListFromEnumerator. - * Else, enumerate all enumerators and call SETUP_CreateDevicesListFromEnumerator - * for each one. - */ - if (Enumerator) - { - rc = RegOpenKeyExW( - hEnumKey, - Enumerator, - 0, - KEY_ENUMERATE_SUB_KEYS, - &hEnumeratorKey); - if (rc != ERROR_SUCCESS) + /* Good! Create a device info element */ + if (!CreateDeviceInfo(list, InstancePath, &ClassGuid, &deviceInfo)) { - if (rc == ERROR_FILE_NOT_FOUND) - rc = ERROR_INVALID_DATA; - goto cleanup; + ERR("Failed to create info for %S\n", InstancePath); + HeapFree(GetProcessHeap(), 0, Buffer); + return GetLastError(); } - rc = SETUP_CreateDevicesListFromEnumerator(list, Class, Enumerator, hEnumeratorKey); - } - else - { - /* Enumerate enumerators */ - i = 0; - while (TRUE) - { - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hEnumKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - else if (rc != ERROR_SUCCESS) - goto cleanup; - i++; - - /* Open sub key */ - if (hEnumeratorKey != NULL) - RegCloseKey(hEnumeratorKey); - rc = RegOpenKeyExW(hEnumKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - /* Call SETUP_CreateDevicesListFromEnumerator */ - rc = SETUP_CreateDevicesListFromEnumerator(list, Class, KeyBuffer, hEnumeratorKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - } - rc = ERROR_SUCCESS; + TRACE("Adding device %s to list\n", debugstr_w(InstancePath)); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } -cleanup: - if (HKLM != HKEY_LOCAL_MACHINE) - RegCloseKey(HKLM); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - if (hEnumeratorKey != NULL) - RegCloseKey(hEnumeratorKey); - return rc; + HeapFree(GetProcessHeap(), 0, Buffer); + return ERROR_SUCCESS; } static BOOL diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 167d8062c98..d629e138f1d 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -88,7 +88,7 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } -static DWORD +DWORD GetErrorCodeFromCrCode(const IN CONFIGRET cr) { switch (cr) diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 63c391867bb..fb758142645 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -298,6 +298,9 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, U /* devinst.c */ +DWORD +GetErrorCodeFromCrCode(const IN CONFIGRET cr); + BOOL CreateDeviceInfo( IN struct DeviceInfoSet *list,

1 0

[reactos] 01/01: [SHELL32] Auto-completion on Properties for Shortcut (#3574)
by Katayama Hirofumi MZ 02 Apr '21

02 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ade54133625e0a002cd34… commit ade54133625e0a002cd34d4bc2df4eb5bec29b40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 2 17:04:43 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 2 17:04:43 2021 +0900 [SHELL32] Auto-completion on Properties for Shortcut (#3574) Enable auto-completion on "Properties for Shortcut files". CORE-9281 --- dll/win32/shell32/CShellLink.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 2800510990a..7da9b8cf916 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -6,7 +6,7 @@ * Copyright 2009 Andrew Hill * Copyright 2013 Dominik Hornung * Copyright 2017 Hermes Belusca-Maito - * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2018-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2887,6 +2887,10 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam) if (m_sDescription) SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_COMMENT_EDIT, m_sDescription); + /* auto-completion */ + SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT), SHACF_DEFAULT); + SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_START_IN_EDIT), SHACF_DEFAULT); + m_bInInit = FALSE; return TRUE;

1 0

[reactos] 01/01: [NEWDEV] Enable auto-completion on Hardware Wizard (#3573)
by Katayama Hirofumi MZ 02 Apr '21

02 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62b13979f596812c72202… commit 62b13979f596812c722026a0a60f2409e519a649 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 2 11:06:01 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 2 11:06:01 2021 +0900 [NEWDEV] Enable auto-completion on Hardware Wizard (#3573) Realize auto-completion on Hardware Wizard. CORE-9281 --- dll/win32/newdev/CMakeLists.txt | 2 +- dll/win32/newdev/wizard.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index 1b4b76d0b65..3ff64749177 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -15,6 +15,6 @@ add_library(newdev MODULE set_module_type(newdev win32dll UNICODE) target_link_libraries(newdev wine) -add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) +add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_pch(newdev newdev_private.h SOURCE) add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index d682964c85a..739795fef6e 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -23,6 +23,7 @@ #include <wincon.h> #include <cfgmgr32.h> #include <shlobj.h> +#include <shlwapi.h> HANDLE hThread; @@ -573,8 +574,9 @@ CHSourceDlgProc( { case WM_INITDIALOG: { - HWND hwndControl; + HWND hwndControl, hwndCombo; DWORD dwStyle; + COMBOBOXINFO info = { sizeof(info) }; /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; @@ -589,7 +591,11 @@ CHSourceDlgProc( dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - PopulateCustomPathCombo(GetDlgItem(hwndDlg, IDC_COMBO_PATH)); + hwndCombo = GetDlgItem(hwndDlg, IDC_COMBO_PATH); + PopulateCustomPathCombo(hwndCombo); + + GetComboBoxInfo(hwndCombo, &info); + SHAutoComplete(info.hwndItem, SHACF_FILESYS_DIRS); SendDlgItemMessage( hwndDlg, @@ -1303,6 +1309,7 @@ DisplayWizard( PROPSHEETHEADER psh = {0}; HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; PROPSHEETPAGE psp = {0}; + HRESULT hr = CoInitialize(NULL); /* for SHAutoComplete */ /* zero based index */ startPage -= IDD_FIRSTPAGE; @@ -1382,5 +1389,7 @@ DisplayWizard( DeleteObject(DevInstData->hTitleFont); + if (SUCCEEDED(hr)) + CoUninitialize(); return TRUE; }

1 0

[reactos] 01/01: [NEWDEV] Use new UI dialog for browsing folder
by Katayama Hirofumi MZ 01 Apr '21

01 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b591bd33548f967465fc1… commit b591bd33548f967465fc11cbc74c89416ae33b00 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 2 08:58:09 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Apr 2 08:58:09 2021 +0900 [NEWDEV] Use new UI dialog for browsing folder Add BIF_USENEWUI flag to BROWSEINFO. CORE-9281 --- dll/win32/newdev/wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index ee24b059d8a..d682964c85a 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -628,7 +628,7 @@ CHSourceDlgProc( LPITEMIDLIST pidl; bi.hwndOwner = hwndDlg; - bi.ulFlags = BIF_RETURNONLYFSDIRS; + bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS; pidl = SHBrowseForFolder(&bi); if (pidl) {

1 0

[reactos] 01/01: [NOTEPAD][WORDPAD][MSPAINT]... Use newer file open dialog (#3571)
by Katayama Hirofumi MZ 01 Apr '21

01 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bebdfda8b76c342aabec2… commit bebdfda8b76c342aabec28cb25fb787c7762a310 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 1 22:50:32 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 1 22:50:32 2021 +0900 [NOTEPAD][WORDPAD][MSPAINT]... Use newer file open dialog (#3571) Use new-style file open/save-as dialog. - Add OFN_EXPLORER flag to OPENFILENAME structure in notepad, wordpad, mspaint, clipbrd, mmc, mplay32, mscutils, regedit, winhlp32, progman, shellbtrfs, cryptui, shell32, setupapi, vgafontedit, infinst, and vfdlib modules. --- base/applications/clipbrd/clipbrd.c | 2 +- base/applications/mmc/console.c | 2 +- base/applications/mplay32/mplay32.c | 2 +- base/applications/mscutils/eventvwr/eventvwr.c | 2 +- base/applications/mscutils/servman/propsheet_recovery.c | 2 +- base/applications/mspaint/main.cpp | 4 ++-- base/applications/notepad/dialog.c | 2 +- base/applications/regedit/framewnd.c | 2 +- base/applications/winhlp32/winhelp.c | 2 +- base/applications/wordpad/print.c | 2 +- base/applications/wordpad/wordpad.c | 4 ++-- base/shell/progman/dialog.c | 2 +- dll/shellext/shellbtrfs/recv.cpp | 2 +- dll/shellext/shellbtrfs/send.cpp | 1 + dll/win32/cryptui/main.c | 3 +++ dll/win32/setupapi/dialog.c | 2 +- dll/win32/shell32/COpenWithMenu.cpp | 2 +- dll/win32/shell32/dialogs/filetypes.cpp | 2 +- modules/rosapps/applications/devutils/vgafontedit/opensave.c | 2 +- modules/rosapps/applications/sysutils/utils/infinst/infinst.c | 2 +- modules/rosapps/lib/vfdlib/vfdguiopen.c | 2 +- modules/rosapps/lib/vfdlib/vfdguisave.c | 2 +- 22 files changed, 26 insertions(+), 22 deletions(-) diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index aa14d44cdc3..6f5733cae48 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -32,7 +32,7 @@ static void SaveClipboardToFile(void) sfn.lpstrFilter = szFilterMask; sfn.lpstrFile = szFileName; sfn.nMaxFile = ARRAYSIZE(szFileName); - sfn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; + sfn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; sfn.lpstrDefExt = L"clp"; if (!GetSaveFileNameW(&sfn)) diff --git a/base/applications/mmc/console.c b/base/applications/mmc/console.c index f56fbc546f3..a9fc833c401 100644 --- a/base/applications/mmc/console.c +++ b/base/applications/mmc/console.c @@ -249,7 +249,7 @@ DoSaveFileAs( saveas.lpstrFilter = L"MSC Files\0*.msc\0"; saveas.lpstrFile = szPath; saveas.nMaxFile = MAX_PATH; - saveas.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; + saveas.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; saveas.lpstrDefExt = L"msc"; if (GetSaveFileName(&saveas)) diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index f3df906dcf9..adb0babe581 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1158,7 +1158,7 @@ OpenFileDialog(HWND hwnd, DWORD dwFilterIndex, LPTSTR lpType) OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFile = szFile; OpenFileName.nMaxFile = ARRAYSIZE(szFile); - OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; + OpenFileName.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); OpenFileName.nFilterIndex = dwFilterIndex; diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 348844ff145..5bc96ced583 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3268,7 +3268,7 @@ InitInstance(HINSTANCE hInstance) sfn.hInstance = hInstance; sfn.lpstrFilter = szSaveFilter; sfn.lpstrInitialDir = NULL; - sfn.Flags = OFN_HIDEREADONLY | OFN_SHAREAWARE; + sfn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_SHAREAWARE; sfn.lpstrDefExt = NULL; ShowWindow(hwndMainWindow, Settings.wpPos.showCmd); diff --git a/base/applications/mscutils/servman/propsheet_recovery.c b/base/applications/mscutils/servman/propsheet_recovery.c index 59205f24c01..d41b32c41fe 100644 --- a/base/applications/mscutils/servman/propsheet_recovery.c +++ b/base/applications/mscutils/servman/propsheet_recovery.c @@ -351,7 +351,7 @@ BrowseFile( ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.hwndOwner = hwndDlg; ofn.lpstrFilter = pszFilter; ofn.lpstrFile = szFile; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 927eb7fa99f..f176f3b7c86 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -282,7 +282,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument ofn.nMaxFile = SIZEOF(ofnFilename); ofn.lpstrFileTitle = ofnFiletitle; ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); - ofn.Flags = OFN_HIDEREADONLY; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY; ofn.lpstrDefExt = L"bmp"; CopyMemory(sfnFilename, filepathname, sizeof(filepathname)); @@ -298,7 +298,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sfn.nMaxFile = SIZEOF(sfnFilename); sfn.lpstrFileTitle = sfnFiletitle; sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); - sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; + sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.lpfnHook = OFNHookProc; sfn.lpstrDefExt = L"bmp"; diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index c5b743e0ba4..3befb566503 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -440,7 +440,7 @@ VOID DIALOG_FileOpen(VOID) openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; openfilename.nMaxFile = ARRAY_SIZE(szPath); - openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + openfilename.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; openfilename.lpstrDefExt = szDefaultExt; if (GetOpenFileName(&openfilename)) { diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index b9717cb4958..1e6a8b20d84 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -288,7 +288,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn) pofn->nMaxFile = _MAX_PATH; pofn->lpstrFileTitle = FileTitleBuffer; pofn->nMaxFileTitle = _MAX_PATH; - pofn->Flags = OFN_HIDEREADONLY; + pofn->Flags = OFN_EXPLORER | OFN_HIDEREADONLY; pofn->lpstrDefExt = L"reg"; return TRUE; } diff --git a/base/applications/winhlp32/winhelp.c b/base/applications/winhlp32/winhelp.c index 7ce5d4a0a8f..a4bfbd6e292 100644 --- a/base/applications/winhlp32/winhelp.c +++ b/base/applications/winhlp32/winhelp.c @@ -178,7 +178,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) openfilename.nMaxFileTitle = 0; openfilename.lpstrInitialDir = szDir; openfilename.lpstrTitle = 0; - openfilename.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_READONLY; + openfilename.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_READONLY; openfilename.nFileOffset = 0; openfilename.nFileExtension = 0; openfilename.lpstrDefExt = 0; diff --git a/base/applications/wordpad/print.c b/base/applications/wordpad/print.c index 6e0b3d139db..dc219c8e9b5 100644 --- a/base/applications/wordpad/print.c +++ b/base/applications/wordpad/print.c @@ -253,7 +253,7 @@ static LPWSTR dialog_print_to_file(HWND hMainWnd) ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; + ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = file_filter; ofn.lpstrFile = file; diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c index 4cd8cc21b19..6e87e3268d4 100644 --- a/base/applications/wordpad/wordpad.c +++ b/base/applications/wordpad/wordpad.c @@ -905,7 +905,7 @@ static BOOL DialogSaveFile(void) ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); - sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; + sfn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; sfn.hwndOwner = hMainWnd; sfn.lpstrFilter = wszFilter; sfn.lpstrFile = wszFile; @@ -989,7 +989,7 @@ static void DialogOpenFile(void) ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = wszFilter; ofn.lpstrFile = wszFile; diff --git a/base/shell/progman/dialog.c b/base/shell/progman/dialog.c index 452b1bc4c7b..90c696d4bea 100644 --- a/base/shell/progman/dialog.c +++ b/base/shell/progman/dialog.c @@ -69,7 +69,7 @@ DIALOG_Browse(HWND hWnd, LPCWSTR lpszzFilter, LPWSTR lpstrFile, INT nMaxFile) openfilename.lpstrFile = lpstrFile; openfilename.nMaxFile = nMaxFile; openfilename.lpstrInitialDir = szDir; - openfilename.Flags = 0; + openfilename.Flags = OFN_EXPLORER; openfilename.lpstrDefExt = L"exe"; openfilename.lpstrCustomFilter = NULL; openfilename.nMaxCustFilter = 0; diff --git a/dll/shellext/shellbtrfs/recv.cpp b/dll/shellext/shellbtrfs/recv.cpp index 87e337f98d7..c18b5c92627 100644 --- a/dll/shellext/shellbtrfs/recv.cpp +++ b/dll/shellext/shellbtrfs/recv.cpp @@ -1700,7 +1700,7 @@ void CALLBACK RecvSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int ofn.hInstance = module; ofn.lpstrFile = file; ofn.nMaxFile = sizeof(file) / sizeof(WCHAR); - ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; if (GetOpenFileNameW(&ofn)) { BtrfsRecv recv; diff --git a/dll/shellext/shellbtrfs/send.cpp b/dll/shellext/shellbtrfs/send.cpp index ac4dbfb6898..f61e7510c3e 100644 --- a/dll/shellext/shellbtrfs/send.cpp +++ b/dll/shellext/shellbtrfs/send.cpp @@ -303,6 +303,7 @@ void BtrfsSend::Browse(HWND hwnd) { ofn.hInstance = module; ofn.lpstrFile = file; ofn.nMaxFile = sizeof(file) / sizeof(WCHAR); + ofn.Flags = OFN_EXPLORER; if (!GetSaveFileNameW(&ofn)) return; diff --git a/dll/win32/cryptui/main.c b/dll/win32/cryptui/main.c index 3d27d82e64f..f4dee4aded1 100644 --- a/dll/win32/cryptui/main.c +++ b/dll/win32/cryptui/main.c @@ -5114,6 +5114,9 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ofn.lpstrFilter = make_import_file_filter(data->dwFlags); ofn.lpstrFile = fileBuf; ofn.nMaxFile = ARRAY_SIZE(fileBuf); +#ifdef __REACTOS__ + ofn.Flags = OFN_EXPLORER; +#endif fileBuf[0] = 0; if (GetOpenFileNameW(&ofn)) SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT, diff --git a/dll/win32/setupapi/dialog.c b/dll/win32/setupapi/dialog.c index b513183a47d..b1611dc32ba 100644 --- a/dll/win32/setupapi/dialog.c +++ b/dll/win32/setupapi/dialog.c @@ -119,7 +119,7 @@ static void promptdisk_browse(HWND hwnd, struct promptdisk_params *params) ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; ofn.hwndOwner = hwnd; ofn.nMaxFile = MAX_PATH; ofn.lpstrFile = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index ee6828bcbc5..903d66f5d53 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -882,7 +882,7 @@ VOID COpenWithDialog::Browse() ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hInstance = shell32_hInstance; ofn.hwndOwner = m_hDialog; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; ofn.nMaxFile = (sizeof(wszPath) / sizeof(WCHAR)); ofn.lpstrFile = wszPath; ofn.lpstrInitialDir = L"%programfiles%"; diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index f54203d0511..c1e08e02198 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -834,7 +834,7 @@ ActionDlg_OnBrowse(HWND hwndDlg, PACTION_DIALOG pNewAct, BOOL bEdit = FALSE) ofn.lpstrFile = szFile; ofn.nMaxFile = _countof(szFile); ofn.lpstrTitle = strTitle; - ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; ofn.lpstrDefExt = L"exe"; if (GetOpenFileNameW(&ofn)) { diff --git a/modules/rosapps/applications/devutils/vgafontedit/opensave.c b/modules/rosapps/applications/devutils/vgafontedit/opensave.c index 020507d0387..3296a3c8a31 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/opensave.c +++ b/modules/rosapps/applications/devutils/vgafontedit/opensave.c @@ -43,7 +43,7 @@ DoOpenFile(OUT PWSTR pszFileName) PrepareFilter(pszFilter); ofn.lpstrFilter = pszFilter; ofn.lpstrFile = pszFileName; - ofn.Flags = OFN_FILEMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST; bRet = GetOpenFileNameW(&ofn); HeapFree(hProcessHeap, 0, pszFilter); diff --git a/modules/rosapps/applications/sysutils/utils/infinst/infinst.c b/modules/rosapps/applications/sysutils/utils/infinst/infinst.c index 4b321b1f3b1..ae9d5bb7ccc 100644 --- a/modules/rosapps/applications/sysutils/utils/infinst/infinst.c +++ b/modules/rosapps/applications/sysutils/utils/infinst/infinst.c @@ -56,7 +56,7 @@ _tmain(int argc, TCHAR *argv[]) ofc.lpstrFilter = FILEOPEN_FILTER; ofc.nFilterIndex = 1; ofc.lpstrTitle = FILEOPEN_TITLE; - ofc.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST; + ofc.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST; ofc.lpstrDefExt = FILEOPEN_DEFEXT; ofc.lpstrFile = FileName; ofc.nMaxFile = sizeof(FileName) / sizeof(TCHAR); diff --git a/modules/rosapps/lib/vfdlib/vfdguiopen.c b/modules/rosapps/lib/vfdlib/vfdguiopen.c index 11d7bab3151..e7fb6262b59 100644 --- a/modules/rosapps/lib/vfdlib/vfdguiopen.c +++ b/modules/rosapps/lib/vfdlib/vfdguiopen.c @@ -404,7 +404,7 @@ void OnBrowse( ofn.nMaxFile = sizeof(file); ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : FALLBACK_IMAGE_TITLE; - ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; // show the open file dialog box diff --git a/modules/rosapps/lib/vfdlib/vfdguisave.c b/modules/rosapps/lib/vfdlib/vfdguisave.c index ff1d39566f7..b0ea780d450 100644 --- a/modules/rosapps/lib/vfdlib/vfdguisave.c +++ b/modules/rosapps/lib/vfdlib/vfdguisave.c @@ -422,7 +422,7 @@ void OnBrowse( ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : "Save Image"; ofn.lpstrFilter = "*.*\0*.*\0"; - ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; if (GetSaveFileName(&ofn)) { SetDlgItemText(hDlg, IDC_TARGETFILE, file);

1 0

[reactos] 01/01: [COMDLG32] Enable auto-completion on comdlg32 (#3564)
by Katayama Hirofumi MZ 31 Mar '21

31 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e6550b35e306b3914896… commit 7e6550b35e306b39148965632d60d3509c352d02 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 1 06:41:24 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 1 06:41:24 2021 +0900 [COMDLG32] Enable auto-completion on comdlg32 (#3564) Auto-completion will be enabled when the user opens "Open" or "Save As" dialog of the common dialogs. CORE-9281 NOTE: The relative pathes, "..\" and "\" are not working. Those are bugs in CLSID_ACListISF. --- dll/win32/comdlg32/CMakeLists.txt | 1 + dll/win32/comdlg32/autocomp.cpp | 115 ++++++++++++++++++++++++++++++++++++ dll/win32/comdlg32/filedlg.c | 6 ++ dll/win32/comdlg32/filedlgbrowser.c | 6 ++ dll/win32/comdlg32/filedlgbrowser.h | 5 ++ 5 files changed, 133 insertions(+) diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt index bb87894e2c8..a0f2d69ca75 100644 --- a/dll/win32/comdlg32/CMakeLists.txt +++ b/dll/win32/comdlg32/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB) list(APPEND SOURCE + autocomp.cpp cdlg32.c colordlg.c filedlg.c diff --git a/dll/win32/comdlg32/autocomp.cpp b/dll/win32/comdlg32/autocomp.cpp new file mode 100644 index 00000000000..f5762a23246 --- /dev/null +++ b/dll/win32/comdlg32/autocomp.cpp @@ -0,0 +1,115 @@ +/* + * PROJECT: ReactOS Common Dialogs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Implement auto-completion for comdlg32 + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +EXTERN_C HRESULT +DoInitAutoCompleteWithCWD(FileOpenDlgInfos *pInfo, HWND hwndEdit) +{ + pInfo->pvCWD = pInfo->pvDropDown = pInfo->pvACList = NULL; + + WCHAR szClass[32]; + GetClassNameW(hwndEdit, szClass, _countof(szClass)); + if (lstrcmpiW(szClass, WC_COMBOBOXW) == 0) + { + COMBOBOXINFO info = { sizeof(info) }; + GetComboBoxInfo(hwndEdit, &info); + hwndEdit = info.hwndItem; + } + else if (lstrcmpiW(szClass, WC_COMBOBOXEXW) == 0) + { + hwndEdit = (HWND)SendMessageW(hwndEdit, CBEM_GETEDITCONTROL, 0, 0); + } + + IACList2 *pACList = NULL; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_INPROC_SERVER, + IID_IACList2, reinterpret_cast<LPVOID *>(&pACList)); + if (FAILED(hr)) + { + TRACE("CoCreateInstance(CLSID_ACListISF): 0x%08lX\n", hr); + return hr; + } + pInfo->pvACList = static_cast<LPVOID>(pACList); + + IAutoComplete2 *pAC = NULL; + hr = CoCreateInstance(CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, + IID_IAutoComplete2, reinterpret_cast<LPVOID *>(&pAC)); + if (SUCCEEDED(hr)) + { + pAC->Init(hwndEdit, pACList, NULL, NULL); + pAC->SetOptions(ACO_AUTOSUGGEST); + pAC->QueryInterface(IID_IAutoCompleteDropDown, &pInfo->pvDropDown); + pAC->Release(); + } + else + { + TRACE("CoCreateInstance(CLSID_AutoComplete): 0x%08lX\n", hr); + pACList->Release(); + pInfo->pvACList = NULL; + return hr; + } + + pACList->QueryInterface(IID_ICurrentWorkingDirectory, &pInfo->pvCWD); + + return hr; +} + +EXTERN_C HRESULT +DoUpdateAutoCompleteWithCWD(const FileOpenDlgInfos *info, LPCITEMIDLIST pidl) +{ + FileOpenDlgInfos *pInfo = const_cast<FileOpenDlgInfos*>(info); + if (!pInfo) + return E_POINTER; + + ICurrentWorkingDirectory* pCWD = + reinterpret_cast<ICurrentWorkingDirectory*>(pInfo->pvCWD); + + IAutoCompleteDropDown* pDropDown = + reinterpret_cast<IAutoCompleteDropDown*>(pInfo->pvDropDown); + + IACList2* pACList = static_cast<IACList2*>(pInfo->pvACList); + + WCHAR szPath[MAX_PATH]; + if (!pidl || !SHGetPathFromIDListW(pidl, szPath)) + { + GetCurrentDirectoryW(_countof(szPath), szPath); + } + + if (pCWD) + pCWD->SetDirectory(szPath); + if (pDropDown) + pDropDown->ResetEnumerator(); + if (pACList) + pACList->Expand(L""); + + return S_OK; +} + +EXTERN_C HRESULT +DoReleaseAutoCompleteWithCWD(FileOpenDlgInfos *pInfo) +{ + if (!pInfo) + return E_POINTER; + + ICurrentWorkingDirectory* pCWD = + reinterpret_cast<ICurrentWorkingDirectory*>(pInfo->pvCWD); + if (pCWD) + pCWD->Release(); + + IAutoCompleteDropDown* pDropDown = + reinterpret_cast<IAutoCompleteDropDown*>(pInfo->pvDropDown); + if (pDropDown) + pDropDown->Release(); + + IACList2 *pACList = static_cast<IACList2*>(pInfo->pvACList); + if (pACList) + pACList->Release(); + + pInfo->pvCWD = pInfo->pvDropDown = pInfo->pvACList = NULL; + return S_OK; +} diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 49bd1d006b1..cf1d2bc34c2 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -79,6 +79,8 @@ #include "wine/heap.h" #ifdef __REACTOS__ #include "wine/unicode.h" +EXTERN_C HRESULT DoInitAutoCompleteWithCWD(FileOpenDlgInfos *pInfo, HWND hwndEdit); +EXTERN_C HRESULT DoReleaseAutoCompleteWithCWD(FileOpenDlgInfos *pInfo); #endif WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -1558,6 +1560,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l s_hFileDialogHook = NULL; } LeaveCriticalSection(&COMDLG32_OpenFileLock); + DoReleaseAutoCompleteWithCWD(fodInfos); #endif return FALSE; } @@ -2030,6 +2033,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* Initialize the filter combo box */ FILEDLG95_FILETYPE_Init(hwnd); +#ifdef __REACTOS__ + DoInitAutoCompleteWithCWD(fodInfos, fodInfos->DlgInfos.hwndFileName); +#endif return 0; } diff --git a/dll/win32/comdlg32/filedlgbrowser.c b/dll/win32/comdlg32/filedlgbrowser.c index 83d5f5e9e09..feaa5557ea7 100644 --- a/dll/win32/comdlg32/filedlgbrowser.c +++ b/dll/win32/comdlg32/filedlgbrowser.c @@ -41,6 +41,9 @@ #include "servprov.h" #include "wine/debug.h" #include "wine/heap.h" +#ifdef __REACTOS__ +EXTERN_C HRESULT DoUpdateAutoCompleteWithCWD(const FileOpenDlgInfos *info, LPCITEMIDLIST pidl); +#endif WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -143,6 +146,9 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) if (SUCCEEDED(res)) SetCurrentDirectoryW(wszCurrentDir); } +#ifdef __REACTOS__ + DoUpdateAutoCompleteWithCWD(fodInfos, fodInfos->ShellInfos.pidlAbsCurrent); +#endif IShellFolder_Release(psfDesktop); } diff --git a/dll/win32/comdlg32/filedlgbrowser.h b/dll/win32/comdlg32/filedlgbrowser.h index 21eb3d56dfe..67c07a8793c 100644 --- a/dll/win32/comdlg32/filedlgbrowser.h +++ b/dll/win32/comdlg32/filedlgbrowser.h @@ -94,6 +94,11 @@ typedef struct BOOL ole_initialized; LPITEMIDLIST places[5]; +#ifdef __REACTOS__ + LPVOID pvCWD; /* ICurrentWorkingDirectory */ + LPVOID pvDropDown; /* IAutoCompleteDropDown */ + LPVOID pvACList; /* IACList2 */ +#endif } FileOpenDlgInfos; /***********************************************************************

1 0

[reactos] 05/05: [WIN32K] Fix getting long value from float object
by Jérôme Gardou 31 Mar '21

31 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12dfa8ce390917db814d0… commit 12dfa8ce390917db814d0ace0c40ffc376fa6c04 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Mar 22 12:39:08 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 31 18:35:31 2021 +0200 [WIN32K] Fix getting long value from float object Most importantly, do not shift 32-bit integers by 32 or more. --- win32ss/CMakeLists.txt | 1 + win32ss/gdi/eng/floatobj.h | 23 ++++++++++------------- win32ss/gdi/eng/i386/floatobj.S | 34 +--------------------------------- win32ss/gdi/eng/i386/floatobj.c | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 46 deletions(-) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index 44dc77cd381..727461031cd 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -213,6 +213,7 @@ list(APPEND ASM_SOURCE gdi/dib/i386/dib32bpp_hline.s gdi/dib/i386/dib32bpp_colorfill.s gdi/eng/i386/floatobj.S) +list(APPEND SOURCE gdi/eng/i386/floatobj.c) else() list(APPEND SOURCE gdi/dib/dib24bppc.c diff --git a/win32ss/gdi/eng/floatobj.h b/win32ss/gdi/eng/floatobj.h index aa85a4e80b5..5cad6830af6 100644 --- a/win32ss/gdi/eng/floatobj.h +++ b/win32ss/gdi/eng/floatobj.h @@ -16,15 +16,6 @@ _FLOATOBJ_Equal(FLOATOBJ *pf1, FLOATOBJ *pf2) } #define FLOATOBJ_Equal _FLOATOBJ_Equal -FORCEINLINE -LONG -_FLOATOBJ_GetLong(FLOATOBJ *pf) -{ - EFLOAT_S *pef = (EFLOAT_S*)pf; - return pef->lMant >> (32 - pef->lExp); -} -#define FLOATOBJ_GetLong _FLOATOBJ_GetLong - /*! * \brief Converts a FLOATOBJ into a LONG by truncating the value to integer * @@ -37,16 +28,22 @@ _FLOATOBJ_GetLong(FLOATOBJ *pf) */ FORCEINLINE BOOL -FASTCALL FLOATOBJ_bConvertToLong(FLOATOBJ *pf, PLONG pl) { EFLOAT_S *pef = (EFLOAT_S*)pf; - LONG lShift = 32 - pef->lExp; - if (lShift < 0) + + if (pef->lExp > 32) { return FALSE; } - *pl = pef->lMant >> lShift; + + if (pef->lExp < 2) + { + *pl = 0; + return TRUE; + } + + *pl = EngMulDiv(pef->lMant, 1 << (pef->lExp - 2), 0x40000000); return TRUE; } diff --git a/win32ss/gdi/eng/i386/floatobj.S b/win32ss/gdi/eng/i386/floatobj.S index 7eb9f64cb76..0b36e1b4559 100644 --- a/win32ss/gdi/eng/i386/floatobj.S +++ b/win32ss/gdi/eng/i386/floatobj.S @@ -52,7 +52,7 @@ * FLOATOBJ_SetFloat - implemented, tested * FLOATOBJ_SetLong - implemented, tested * FLOATOBJ_GetFloat - implemented, tested - * FLOATOBJ_GetLong - implemented, tested + * FLOATOBJ_GetLong - implemented in C * FLOATOBJ_Equal - implemented, tested * FLOATOBJ_EqualLong - implemented * FLOATOBJ_GreaterThan - implemented @@ -249,34 +249,6 @@ SetLong0: ret 8 -/******************************************************************************* - * LONG - * APIENTRY - * FLOATOBJ_GetLong(IN PFLOATOBJ pf); - * - */ -_FLOATOBJ_GetLong@4: -PUBLIC _FLOATOBJ_GetLong@4 - push ebp - mov ebp, esp - - mov edx, [ebp + PARAM1] /* Load pf into edx */ - mov ecx, 32 /* Load (32 - lExp) into ecx */ - sub ecx, [edx + lExp] - jle short GetLong2 /* Check for Overflow */ - - mov eax, [edx + lMant] /* Load mantissa into eax */ - sar eax, cl /* Signed shift mantissa according to exponent */ - - pop ebp /* Return */ - ret 4 - -GetLong2: - xor eax, eax /* Overflow, return 0 */ - pop ebp - ret 4 - - /****************************************************************************** * BOOL * APIENTRY @@ -842,7 +814,6 @@ PUBLIC _FLOATOBJ_DivLong@8 pop ebp ret 8 - /******************************************************************************* * VOID * APIENTRY @@ -940,7 +911,6 @@ AddIs0: pop ebp ret 8 - /****************************************************************************** * VOID * APIENTRY @@ -998,7 +968,6 @@ PUBLIC _FLOATOBJ_AddLong@8 pop ebp ret 8 - /******************************************************************************* * VOID * APIENTRY @@ -1095,7 +1064,6 @@ SubIs0: mov dword ptr [eax + lExp], 0 pop ebp ret 8 - /****************************************************************************** * VOID * APIENTRY diff --git a/win32ss/gdi/eng/i386/floatobj.c b/win32ss/gdi/eng/i386/floatobj.c new file mode 100644 index 00000000000..d5b623d164f --- /dev/null +++ b/win32ss/gdi/eng/i386/floatobj.c @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS win32 kernel mode subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: win32ss/gdi/eng/i386/floatobj.c + * PURPOSE: FLOATOBJ API + * PROGRAMMERS: Jérôme Gardou + */ + +/** Includes ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +LONG +APIENTRY +FLOATOBJ_GetLong(FLOATOBJ* pf) +{ + LONG val = 0; + (void)FLOATOBJ_bConvertToLong(pf, &val); + return val; +}

1 0

[reactos] 04/05: [WIN32K] More cleanup & improvements
by Jérôme Gardou 31 Mar '21

31 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=405ce532118f5c5d7dd20… commit 405ce532118f5c5d7dd2094aea8b65cb89c7b83f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Mar 17 18:43:59 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 31 18:35:31 2021 +0200 [WIN32K] More cleanup & improvements Use FLOATOBJs to perform device<->world transformations, avoiding use of XFORMOBJ all the time Remove unused macros & functions --- win32ss/gdi/ntgdi/coord.c | 37 +++++++------ win32ss/gdi/ntgdi/coord.h | 123 ++++++++++++++++++++++++++----------------- win32ss/gdi/ntgdi/dcutil.c | 4 +- win32ss/gdi/ntgdi/gdifloat.h | 75 -------------------------- win32ss/win32kp.h | 1 - 5 files changed, 96 insertions(+), 144 deletions(-) diff --git a/win32ss/gdi/ntgdi/coord.c b/win32ss/gdi/ntgdi/coord.c index bea04e28aa0..e0d05971697 100644 --- a/win32ss/gdi/ntgdi/coord.c +++ b/win32ss/gdi/ntgdi/coord.c @@ -416,11 +416,11 @@ NtGdiTransformPoints( switch (iMode) { case GdiDpToLp: - DC_vXformDeviceToWorld(pdc, Count, Points, Points); + ret = INTERNAL_APPLY_MATRIX(DC_pmxDeviceToWorld(pdc), Points, Count); break; case GdiLpToDp: - DC_vXformWorldToDevice(pdc, Count, Points, Points); + ret = INTERNAL_APPLY_MATRIX(DC_pmxWorldToDevice(pdc), Points, Count); break; case 2: // Not supported yet. Need testing. @@ -432,17 +432,20 @@ NtGdiTransformPoints( } } - _SEH2_TRY - { - /* Pointer was already probed! */ - RtlCopyMemory(UnsafePtOut, Points, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + if (ret) { - /* Do not set last error */ - ret = 0; + _SEH2_TRY + { + /* Pointer was already probed! */ + RtlCopyMemory(UnsafePtOut, Points, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do not set last error */ + ret = FALSE; + } + _SEH2_END; } - _SEH2_END; // // If we are getting called that means User XForms is a mess! @@ -866,22 +869,22 @@ IntGdiSetMapMode( break; case MM_LOENGLISH: - pdcattr->szlWindowExt.cx = MulDiv(1000, pdcattr->szlVirtualDeviceMm.cx, 254); - pdcattr->szlWindowExt.cy = MulDiv(1000, pdcattr->szlVirtualDeviceMm.cy, 254); + pdcattr->szlWindowExt.cx = EngMulDiv(1000, pdcattr->szlVirtualDeviceMm.cx, 254); + pdcattr->szlWindowExt.cy = EngMulDiv(1000, pdcattr->szlVirtualDeviceMm.cy, 254); pdcattr->szlViewportExt.cx = pdcattr->szlVirtualDevicePixel.cx; pdcattr->szlViewportExt.cy = -pdcattr->szlVirtualDevicePixel.cy; break; case MM_HIENGLISH: - pdcattr->szlWindowExt.cx = MulDiv(10000, pdcattr->szlVirtualDeviceMm.cx, 254); - pdcattr->szlWindowExt.cy = MulDiv(10000, pdcattr->szlVirtualDeviceMm.cy, 254); + pdcattr->szlWindowExt.cx = EngMulDiv(10000, pdcattr->szlVirtualDeviceMm.cx, 254); + pdcattr->szlWindowExt.cy = EngMulDiv(10000, pdcattr->szlVirtualDeviceMm.cy, 254); pdcattr->szlViewportExt.cx = pdcattr->szlVirtualDevicePixel.cx; pdcattr->szlViewportExt.cy = -pdcattr->szlVirtualDevicePixel.cy; break; case MM_TWIPS: - pdcattr->szlWindowExt.cx = MulDiv(14400, pdcattr->szlVirtualDeviceMm.cx, 254); - pdcattr->szlWindowExt.cy = MulDiv(14400, pdcattr->szlVirtualDeviceMm.cy, 254); + pdcattr->szlWindowExt.cx = EngMulDiv(14400, pdcattr->szlVirtualDeviceMm.cx, 254); + pdcattr->szlWindowExt.cy = EngMulDiv(14400, pdcattr->szlVirtualDeviceMm.cy, 254); pdcattr->szlViewportExt.cx = pdcattr->szlVirtualDevicePixel.cx; pdcattr->szlViewportExt.cy = -pdcattr->szlVirtualDevicePixel.cy; break; diff --git a/win32ss/gdi/ntgdi/coord.h b/win32ss/gdi/ntgdi/coord.h index a62abadabbe..e8d159926d1 100644 --- a/win32ss/gdi/ntgdi/coord.h +++ b/win32ss/gdi/ntgdi/coord.h @@ -4,21 +4,58 @@ #define MIN_COORD (INT_MIN / 16) #define MAX_COORD (INT_MAX / 16) -#define IntLPtoDP(pdc, ppt, count) do { \ - DC_vUpdateWorldToDevice(pdc); \ - INTERNAL_LPTODP(pdc, ppt, count); \ - } while (0) -#define CoordLPtoDP(pdc, ppt) \ - DC_vXformWorldToDevice(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); -#define IntDPtoLP(pdc, ppt, count) do { \ - DC_vUpdateDeviceToWorld(pdc); \ - DC_vXformDeviceToWorld(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); \ - } while (0) -#define CoordDPtoLP(pdc, ppt) \ - DC_vXformDeviceToWorld(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); +/* + * Applies matrix (which is made of FLOATOBJs) to the points array, which are made of integers. + */ +static +inline +BOOLEAN +INTERNAL_APPLY_MATRIX(PMATRIX matrix, LPPOINT points, UINT count) +{ + while (count--) + { + FLOATOBJ x, y; + FLOATOBJ tmp; + + /* x = x * matrix->efM11 + y * matrix->efM21 + matrix->efDx; */ + FLOATOBJ_SetLong(&x, points[count].x); + FLOATOBJ_Mul(&x, &matrix->efM11); + tmp = matrix->efM21; + FLOATOBJ_MulLong(&tmp, points[count].y); + FLOATOBJ_Add(&x, &tmp); + FLOATOBJ_Add(&x, &matrix->efDx); + + /* y = x * matrix->efM12 + y * matrix->efM22 + matrix->efDy; */ + FLOATOBJ_SetLong(&y, points[count].y); + FLOATOBJ_Mul(&y, &matrix->efM22); + tmp = matrix->efM12; + FLOATOBJ_MulLong(&tmp, points[count].x); + FLOATOBJ_Add(&y, &tmp); + FLOATOBJ_Add(&y, &matrix->efDy); + + if (!FLOATOBJ_bConvertToLong(&x, &points[count].x)) + return FALSE; + if (!FLOATOBJ_bConvertToLong(&y, &points[count].y)) + return FALSE; + } + return TRUE; +} -#define XForm2MatrixS(m, x) XFormToMatrix(m, (XFORML*)x) -#define MatrixS2XForm(x, m) MatrixToXForm((XFORML*)x, m) +static +inline +BOOLEAN +INTERNAL_LPTODP(DC *dc, LPPOINT points, UINT count) +{ + return INTERNAL_APPLY_MATRIX(&dc->pdcattr->mxWorldToDevice, points, count); +} + +static +inline +BOOLEAN +INTERNAL_DPTOLP(DC *dc, LPPOINT points, UINT count) +{ + return INTERNAL_APPLY_MATRIX(&dc->pdcattr->mxDeviceToWorld, points, count); +} FORCEINLINE void @@ -121,41 +158,6 @@ DC_pmxDeviceToWorld(PDC pdc) return &pdc->pdcattr->mxDeviceToWorld; } -FORCEINLINE -VOID -DC_vXformDeviceToWorld( - IN PDC pdc, - IN ULONG cNumPoints, - OUT PPOINTL pptlDest, - IN PPOINTL pptlSource) -{ - XFORMOBJ xo; - PMATRIX pmx; - - pmx = DC_pmxDeviceToWorld(pdc); - if (!MX_IsInvertible(pmx)) - return; - - XFORMOBJ_vInit(&xo, pmx); - XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); -} - -FORCEINLINE -VOID -DC_vXformWorldToDevice( - IN PDC pdc, - IN ULONG cNumPoints, - OUT PPOINTL pptlDest, - IN PPOINTL pptlSource) -{ - XFORMOBJ xo; - PMATRIX pmx; - - pmx = DC_pmxWorldToDevice(pdc); - XFORMOBJ_vInit(&xo, pmx); - XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); -} - BOOL NTAPI GreModifyWorldTransform( @@ -173,3 +175,26 @@ BOOL WINAPI GreGetViewportExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize); BOOL FASTCALL GreSetViewportOrgEx(HDC,int,int,LPPOINT); BOOL WINAPI GreGetDCOrgEx(_In_ HDC, _Out_ PPOINTL, _Out_ PRECTL); BOOL WINAPI GreSetDCOrg(_In_ HDC, _In_ LONG, _In_ LONG, _In_opt_ PRECTL); + +static +inline +BOOLEAN +IntLPtoDP(DC* pdc, PPOINTL ppt, UINT count) +{ + DC_vUpdateWorldToDevice(pdc); + return INTERNAL_LPTODP(pdc, (LPPOINT)ppt, count); +} +#define CoordLPtoDP(pdc, ppt) INTERNAL_LPTODP(pdc, ppt, 1) + +static +inline +BOOLEAN +IntDPtoLP(DC* pdc, PPOINTL ppt, UINT count) +{ + DC_vUpdateDeviceToWorld(pdc); + return INTERNAL_DPTOLP(pdc, (LPPOINT)ppt, count); +} +#define CoordDPtoLP(pdc, ppt) INTERNAL_DPTOLP(pdc, ppt, 1) + +#define XForm2MatrixS(m, x) XFormToMatrix(m, (XFORML*)x) +#define MatrixS2XForm(x, m) MatrixToXForm((XFORML*)x, m) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index 056fd7f2140..cb41e6cfcd5 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -743,7 +743,7 @@ NtGdiGetBoundsRect( DPRINT(" r %d b %d\n",rc.right,rc.bottom); ret = DCB_SET; } - IntDPtoLP( pdc, &rc, 2 ); + IntDPtoLP(pdc, (PPOINTL)&rc, 2); DPRINT("rc1 l %d t %d\n",rc.left,rc.top); DPRINT(" r %d b %d\n",rc.right,rc.bottom); } @@ -838,7 +838,7 @@ NtGdiSetBoundsRect( RECTL_vMakeWellOrdered(&rcl); if (!(flags & DCB_WINDOWMGR)) - { + { IntLPtoDP( pdc, (POINT *)&rcl, 2 ); RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, &rcl); } diff --git a/win32ss/gdi/ntgdi/gdifloat.h b/win32ss/gdi/ntgdi/gdifloat.h deleted file mode 100644 index 86962ece449..00000000000 --- a/win32ss/gdi/ntgdi/gdifloat.h +++ /dev/null @@ -1,75 +0,0 @@ -#pragma once - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:28110) // disable "Drivers must protect floating point hardware state" warning -#endif - -static __inline INT GDI_ROUND(FLOAT val) -{ - return (int)floor(val + 0.5); -} - - -/* - * Performs a world-to-viewport transformation on the specified point, - * which is in integer format. - */ -static -inline -VOID -INTERNAL_LPTODP(DC *dc, LPPOINT point, UINT Count) -{ - MATRIX* WorldToDevice = &dc->pdcattr->mxWorldToDevice; - - while (Count--) - { - FLOATOBJ x, y; - FLOATOBJ tmp; - - /* x = x * mxWorldToDevice.efM11 + y * mxWorldToDevice.efM21 + mxWorldToDevice.efDx; */ - FLOATOBJ_SetLong(&x, point[Count].x); - FLOATOBJ_Mul(&x, &WorldToDevice->efM11); - tmp = WorldToDevice->efM21; - FLOATOBJ_MulLong(&tmp, point[Count].y); - FLOATOBJ_Add(&x, &tmp); - FLOATOBJ_Add(&x, &WorldToDevice->efDx); - - /* y = x * mxWorldToDevice.efM12 + y * mxWorldToDevice.efM22 + mxWorldToDevice.efDy; */ - FLOATOBJ_SetLong(&y, point[Count].y); - FLOATOBJ_Mul(&y, &WorldToDevice->efM22); - tmp = WorldToDevice->efM12; - FLOATOBJ_MulLong(&tmp, point[Count].x); - FLOATOBJ_Add(&y, &tmp); - FLOATOBJ_Add(&y, &WorldToDevice->efDy); - - point[Count].x = FLOATOBJ_GetLong(&x); - point[Count].y = FLOATOBJ_GetLong(&y); - } -} - -#define MulDiv( x, y, z ) EngMulDiv( x, y, z ) - -#define XDPTOLP(pdcattr,tx) \ - (MulDiv(((tx)-(pdcattr)->ptlViewportOrg.x), (pdcattr)->szlWindowExt.cx, (pdcattr)->szlViewportExt.cx) + (pdcattr)->ptlWindowOrg.x) -#define YDPTOLP(pdcattr,ty) \ - (MulDiv(((ty)-(pdcattr)->ptlViewportOrg.y), (pdcattr)->szlWindowExt.cy, (pdcattr)->szlViewportExt.cy) + (pdcattr)->ptlWindowOrg.y) -#define XLPTODP(pdcattr,tx) \ - (MulDiv(((tx)-(pdcattr)->ptlWindowOrg.x), (pdcattr)->szlViewportExt.cx, (pdcattr)->szlWindowExt.cx) + (pdcattr)->ptlViewportOrg.x) -#define YLPTODP(pdcattr,ty) \ - (MulDiv(((ty)-(pdcattr)->ptlWindowOrg.y), (pdcattr)->szlViewportExt.cy, (pdcattr)->szlWindowExt.cy) + (pdcattr)->ptlViewportOrg.y) - - /* Device <-> logical size conversion */ - -#define XDSTOLS(pdcattr,tx) \ - MulDiv((tx), (pdcattr)->szlWindowExt.cx, (pdcattr)->szlViewportExt.cx) -#define YDSTOLS(DC_Attr,ty) \ - MulDiv((ty), (pdcattr)->szlWindowExt.cy, (pdcattr)->szlViewportExt.cy) -#define XLSTODS(pdcattr,tx) \ - MulDiv((tx), (pdcattr)->szlViewportExt.cx, (pdcattr)->szlWindowExt.cx) -#define YLSTODS(pdcattr,ty) \ - MulDiv((ty), (pdcattr)->szlViewportExt.cy, (pdcattr)->szlWindowExt.cy) - -#ifdef _MSC_VER -#pragma warning(pop) -#endif diff --git a/win32ss/win32kp.h b/win32ss/win32kp.h index 2d0f358597c..06ff74638ff 100644 --- a/win32ss/win32kp.h +++ b/win32ss/win32kp.h @@ -49,7 +49,6 @@ typedef struct _DC *PDC; #include "gdi/ntgdi/pen.h" #include "gdi/ntgdi/cliprgn.h" #include "gdi/ntgdi/coord.h" -#include "gdi/ntgdi/gdifloat.h" #include "gdi/ntgdi/path.h" #include "gdi/dib/dib.h" #include "reactx/ntddraw/intddraw.h"

1 0

[reactos] 03/05: [WIN32K] Use INTERNAL_LPTODP in IntLPtoDP
by Jérôme Gardou 31 Mar '21

31 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bad3c49e1f378a829d30… commit 3bad3c49e1f378a829d306783a8172a1089a0a9a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Mar 17 16:21:58 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 31 18:35:31 2021 +0200 [WIN32K] Use INTERNAL_LPTODP in IntLPtoDP Instead of initializing a XFORMOBJ and whatnot --- win32ss/gdi/ntgdi/cliprgn.c | 2 +- win32ss/gdi/ntgdi/coord.h | 2 +- win32ss/gdi/ntgdi/line.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/cliprgn.c b/win32ss/gdi/ntgdi/cliprgn.c index 0964f5559da..3084416a331 100644 --- a/win32ss/gdi/ntgdi/cliprgn.c +++ b/win32ss/gdi/ntgdi/cliprgn.c @@ -560,7 +560,7 @@ NtGdiOffsetClipRgn( apt[0].y = 0; apt[1].x = xOffset; apt[1].y = yOffset; - IntLPtoDP(pdc, &apt, 2); + IntLPtoDP(pdc, apt, 2); /* Offset the clip region */ if (!REGION_bOffsetRgn(pdc->dclevel.prgnClip, diff --git a/win32ss/gdi/ntgdi/coord.h b/win32ss/gdi/ntgdi/coord.h index 6dcf58fc982..a62abadabbe 100644 --- a/win32ss/gdi/ntgdi/coord.h +++ b/win32ss/gdi/ntgdi/coord.h @@ -6,7 +6,7 @@ #define IntLPtoDP(pdc, ppt, count) do { \ DC_vUpdateWorldToDevice(pdc); \ - DC_vXformWorldToDevice(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); \ + INTERNAL_LPTODP(pdc, ppt, count); \ } while (0) #define CoordLPtoDP(pdc, ppt) \ DC_vXformWorldToDevice(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c index c922995925d..aeebebc58a1 100644 --- a/win32ss/gdi/ntgdi/line.c +++ b/win32ss/gdi/ntgdi/line.c @@ -24,7 +24,7 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) /* Get BRUSH from current pen. */ pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); - + lWidth = 0; // Setup bounds @@ -55,7 +55,7 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) rect.top = points->y - lWidth; rect.right = points->x + lWidth + 1; rect.bottom = points->y + lWidth + 1; - RECTL_bUnionRect(&bounds, &bounds, &rect); + RECTL_bUnionRect(&bounds, &bounds, &rect); points++; } @@ -444,7 +444,7 @@ NtGdiLineTo(HDC hDC, rcLockRect.right = XEnd; rcLockRect.bottom = YEnd; - IntLPtoDP(dc, &rcLockRect, 2); + IntLPtoDP(dc, (PPOINT)&rcLockRect, 2); /* The DCOrg is in device coordinates */ rcLockRect.left += dc->ptlDCOrig.x;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs