Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [SHELL32] CFolderItemVerb: Zero-initialize output parameters
by Mark Jansen 14 Oct '22

14 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a9696f10b4b2de7b1d39… commit 6a9696f10b4b2de7b1d398477cd8f76bce33fe0f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 1 21:55:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 14 21:04:19 2022 +0200 [SHELL32] CFolderItemVerb: Zero-initialize output parameters --- dll/win32/shell32/CFolderItemVerbs.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/shell32/CFolderItemVerbs.cpp b/dll/win32/shell32/CFolderItemVerbs.cpp index 0397f724f8e..775f342f737 100644 --- a/dll/win32/shell32/CFolderItemVerbs.cpp +++ b/dll/win32/shell32/CFolderItemVerbs.cpp @@ -42,12 +42,20 @@ void CFolderItemVerb::Init(IContextMenu* menu, BSTR name) HRESULT STDMETHODCALLTYPE CFolderItemVerb::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolderItemVerb::get_Parent(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; }

1 0

[reactos] 01/02: [SHELL32] Fix CDefaultContextMenu DFM_MERGECONTEXTMENU handling
by Mark Jansen 14 Oct '22

14 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9efa7cc498d620808dd69… commit 9efa7cc498d620808dd69ee4283083dec9a4f1f5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 1 21:54:31 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 14 21:04:19 2022 +0200 [SHELL32] Fix CDefaultContextMenu DFM_MERGECONTEXTMENU handling --- dll/win32/shell32/CDefaultContextMenu.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 55aa8022af6..10cffcfe4f2 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -433,7 +433,7 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN if (SUCCEEDED(hr)) { info.iIdCmdFirst = cIds; - info.NumIds = LOWORD(hr); + info.NumIds = HRESULT_CODE(hr); (*pIndexMenu) += info.NumIds; cIds += info.NumIds; @@ -646,8 +646,9 @@ CDefaultContextMenu::QueryContextMenu( QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL}; if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo))) { - cIds += qcminfo.idCmdFirst; - IndexMenu += qcminfo.idCmdFirst; + UINT added = idCmdNext - (idCmdFirst + cIds); + cIds += added; + IndexMenu += added; m_iIdCBFirst = m_iIdSHELast; m_iIdCBLast = cIds; idCmdNext = idCmdFirst + cIds;

1 0

[reactos] 01/01: [SHELL32] Show file / drive properties at the position where the mouse was.
by Mark Jansen 14 Oct '22

14 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a1f287820e6ada7d957a… commit 6a1f287820e6ada7d957a6451a7ecc54f73c1876 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 22 19:27:33 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 14 21:02:33 2022 +0200 [SHELL32] Show file / drive properties at the position where the mouse was. CORE-18386 --- dll/win32/shell32/CDefView.cpp | 36 +++++++------ dll/win32/shell32/CDefaultContextMenu.cpp | 76 ++++++++++++++------------- dll/win32/shell32/dialogs/drive.cpp | 79 +++++++++++++++-------------- dll/win32/shell32/dialogs/fprop.cpp | 61 +++++++++++++--------- dll/win32/shell32/folders/CDrivesFolder.cpp | 4 +- dll/win32/shell32/folders/CFSFolder.cpp | 24 ++++++--- dll/win32/shell32/shlfolder.cpp | 27 +++------- dll/win32/shell32/wine/shell32_main.h | 4 +- sdk/include/reactos/shellutils.h | 26 ++++++++++ 9 files changed, 196 insertions(+), 141 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 0bff83e1c9f..fbee323ee7d 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -197,7 +197,7 @@ class CDefView : void OnDeactivate(); void DoActivate(UINT uState); HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand); + HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand, POINT* pt); LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection); // *** IOleWindow methods *** @@ -1496,9 +1496,9 @@ UINT CDefView::GetSelections() return m_cidl; } -HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand) +HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand, POINT* pt) { - CMINVOKECOMMANDINFO cmi; + CMINVOKECOMMANDINFOEX cmi; ZeroMemory(&cmi, sizeof(cmi)); cmi.cbSize = sizeof(cmi); @@ -1511,7 +1511,13 @@ HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCom if (GetKeyState(VK_CONTROL) & 0x8000) cmi.fMask |= CMIC_MASK_CONTROL_DOWN; - HRESULT hr = pCM->InvokeCommand(&cmi); + if (pt) + { + cmi.fMask |= CMIC_MASK_PTINVOKE; + cmi.ptInvoke = *pt; + } + + HRESULT hr = m_pCM->InvokeCommand((LPCMINVOKECOMMANDINFO)&cmi); // Most of our callers will do this, but in case they don't do that (File menu!) IUnknown_SetSite(pCM, NULL); pCM.Release(); @@ -1560,7 +1566,7 @@ HRESULT CDefView::OpenSelectedItems() return E_FAIL; } - InvokeContextMenuCommand(pCM, uCommand); + InvokeContextMenuCommand(pCM, uCommand, NULL); return hResult; } @@ -1570,7 +1576,7 @@ HRESULT CDefView::OpenSelectedItems() */ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - int x, y; + POINT pt; UINT uCommand; HRESULT hResult; @@ -1588,10 +1594,10 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (lParam != ~0) // unless app key (menu key) was pressed { - x = GET_X_LPARAM(lParam); - y = GET_Y_LPARAM(lParam); + pt.x = GET_X_LPARAM(lParam); + pt.y = GET_Y_LPARAM(lParam); - LV_HITTESTINFO hittest = { { x, y } }; + LV_HITTESTINFO hittest = { pt }; ScreenToClient(&hittest.pt); m_ListView.HitTest(&hittest); @@ -1621,7 +1627,6 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b { HWND hFocus = ::GetFocus(); int lvIndex = -1; - POINT pt; if (hFocus == m_ListView.m_hWnd || m_ListView.IsChild(hFocus)) { @@ -1648,21 +1653,19 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b } m_ListView.ClientToScreen(&pt); - x = pt.x; - y = pt.y; } // This runs the message loop, calling back to us with f.e. WM_INITPOPUP (hence why m_hContextMenu and m_pCM exist) uCommand = TrackPopupMenu(m_hContextMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, - x, y, 0, m_hWnd, NULL); + pt.x, pt.y, 0, m_hWnd, NULL); if (uCommand == 0) return 0; if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) return 0; - InvokeContextMenuCommand(m_pCM, uCommand - CONTEXT_MENU_BASE_ID); + InvokeContextMenuCommand(m_pCM, uCommand - CONTEXT_MENU_BASE_ID, &pt); return 0; } @@ -1710,7 +1713,8 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) return 0; } - InvokeContextMenuCommand(pCM, uCommand); + // FIXME: We should probably use the objects position? + InvokeContextMenuCommand(pCM, uCommand, NULL); return 0; } @@ -1950,7 +1954,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand { HMENU Dummy = NULL; MenuCleanup _(m_pFileMenu, Dummy); - InvokeContextMenuCommand(m_pFileMenu, dwCmdID); + InvokeContextMenuCommand(m_pFileMenu, dwCmdID, NULL); } } diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 6bddfafcb35..55aa8022af6 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -86,21 +86,21 @@ class CDefaultContextMenu : BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); - HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); - HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoDelete(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); - HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoUndo(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); - HRESULT DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy); - HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT InvokeRegVerb(LPCMINVOKECOMMANDINFO lpcmi); - DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); - HRESULT TryToBrowse(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags); - HRESULT InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry); + HRESULT DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink); + HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoCreateLink(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoDelete(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bCopy); + HRESULT DoRename(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoProperties(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoUndo(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFOEX lpici); + HRESULT DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFOEX lpici, BOOL bCopy); + HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFOEX lpcmi); + HRESULT InvokeRegVerb(LPCMINVOKECOMMANDINFOEX lpcmi); + DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFOEX lpcmi, PStaticShellEntry pEntry); + HRESULT TryToBrowse(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, DWORD wFlags); + HRESULT InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry); PDynamicShellEntry GetDynamicEntry(UINT idCmd); BOOL MapVerbToCmdId(PVOID Verb, PUINT idCmd, BOOL IsUnicode); @@ -695,7 +695,7 @@ CDefaultContextMenu::QueryContextMenu( return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); } -HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink) +HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink) { HRESULT hr; @@ -748,13 +748,13 @@ HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink) } HRESULT -CDefaultContextMenu::DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi) +CDefaultContextMenu::DoOpenOrExplore(LPCMINVOKECOMMANDINFOEX lpcmi) { UNIMPLEMENTED; return E_FAIL; } -HRESULT CDefaultContextMenu::DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT CDefaultContextMenu::DoCreateLink(LPCMINVOKECOMMANDINFOEX lpcmi) { if (!m_cidl || !m_pDataObj) return E_FAIL; @@ -769,7 +769,7 @@ HRESULT CDefaultContextMenu::DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi) return S_OK; } -HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFOEX lpcmi) { if (!m_cidl || !m_pDataObj) return E_FAIL; @@ -785,7 +785,7 @@ HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) return S_OK; } -HRESULT CDefaultContextMenu::DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy) +HRESULT CDefaultContextMenu::DoCopyOrCut(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bCopy) { if (!m_cidl || !m_pDataObj) return E_FAIL; @@ -808,7 +808,7 @@ HRESULT CDefaultContextMenu::DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy return S_OK; } -HRESULT CDefaultContextMenu::DoRename(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT CDefaultContextMenu::DoRename(LPCMINVOKECOMMANDINFOEX lpcmi) { CComPtr<IShellBrowser> psb; HRESULT hr; @@ -836,7 +836,7 @@ HRESULT CDefaultContextMenu::DoRename(LPCMINVOKECOMMANDINFO lpcmi) HRESULT CDefaultContextMenu::DoProperties( - LPCMINVOKECOMMANDINFO lpcmi) + LPCMINVOKECOMMANDINFOEX lpcmi) { HRESULT hr = _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); @@ -850,14 +850,14 @@ CDefaultContextMenu::DoProperties( } HRESULT -CDefaultContextMenu::DoUndo(LPCMINVOKECOMMANDINFO lpcmi) +CDefaultContextMenu::DoUndo(LPCMINVOKECOMMANDINFOEX lpcmi) { ERR("TODO: Undo\n"); return E_NOTIMPL; } HRESULT -CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy) +CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFOEX lpici, BOOL bCopy) { HRESULT hr = E_FAIL; if (!m_pDataObj) @@ -890,13 +890,13 @@ CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCop else lpici->lpVerb = "moveto"; - return pContextMenu->InvokeCommand(lpici); + return pContextMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)lpici); } // This code is taken from CNewMenu and should be shared between the 2 classes HRESULT CDefaultContextMenu::DoCreateNewFolder( - LPCMINVOKECOMMANDINFO lpici) + LPCMINVOKECOMMANDINFOEX lpici) { WCHAR wszPath[MAX_PATH]; WCHAR wszName[MAX_PATH]; @@ -1009,7 +1009,7 @@ CDefaultContextMenu::MapVerbToCmdId(PVOID Verb, PUINT idCmd, BOOL IsUnicode) HRESULT CDefaultContextMenu::InvokeShellExt( - LPCMINVOKECOMMANDINFO lpcmi) + LPCMINVOKECOMMANDINFOEX lpcmi) { TRACE("verb %p first %x last %x\n", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); @@ -1020,11 +1020,11 @@ CDefaultContextMenu::InvokeShellExt( /* invoke the dynamic context menu */ lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd - pEntry->iIdCmdFirst); - return pEntry->pCM->InvokeCommand(lpcmi); + return pEntry->pCM->InvokeCommand((LPCMINVOKECOMMANDINFO)lpcmi); } DWORD -CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) +CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFOEX lpcmi, PStaticShellEntry pEntry) { CComPtr<IShellBrowser> psb; HWND hwndTree; @@ -1064,7 +1064,7 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticSh HRESULT CDefaultContextMenu::TryToBrowse( - LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) + LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) { CComPtr<IShellBrowser> psb; HRESULT hr; @@ -1081,7 +1081,7 @@ CDefaultContextMenu::TryToBrowse( } HRESULT -CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) +CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) { LPITEMIDLIST pidlFull = ILCombine(m_pidlFolder, pidl); if (pidlFull == NULL) @@ -1127,7 +1127,7 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, HRESULT CDefaultContextMenu::InvokeRegVerb( - LPCMINVOKECOMMANDINFO lpcmi) + LPCMINVOKECOMMANDINFOEX lpcmi) { INT iCmd = LOWORD(lpcmi->lpVerb); HRESULT hr; @@ -1174,13 +1174,13 @@ WINAPI CDefaultContextMenu::InvokeCommand( LPCMINVOKECOMMANDINFO lpcmi) { - CMINVOKECOMMANDINFO LocalInvokeInfo; + CMINVOKECOMMANDINFOEX LocalInvokeInfo = {}; HRESULT Result; UINT CmdId; /* Take a local copy of the fixed members of the struct as we might need to modify the verb */ - LocalInvokeInfo = *lpcmi; + memcpy(&LocalInvokeInfo, lpcmi, min(sizeof(LocalInvokeInfo), lpcmi->cbSize)); /* Check if this is a string verb */ if (HIWORD(LocalInvokeInfo.lpVerb)) @@ -1219,6 +1219,14 @@ CDefaultContextMenu::InvokeCommand( CmdId += 0x7000; } + if (LocalInvokeInfo.cbSize >= sizeof(CMINVOKECOMMANDINFOEX) && (LocalInvokeInfo.fMask & CMIC_MASK_PTINVOKE)) + { + if (FAILED_UNEXPECTEDLY(DataObject_SetOffset(m_pDataObj, &LocalInvokeInfo.ptInvoke))) + { + ERR("Unable to add OFFSET to DataObject!\n"); + } + } + /* Check if this is a Id */ switch (CmdId) { diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 8f2484e298a..1a09a6ed712 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -166,59 +166,62 @@ typedef struct _DRIVE_PROP_PAGE UINT DriveType; } DRIVE_PROP_PAGE; -HRESULT -SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) +BOOL +SH_ShowDriveProperties(WCHAR *pwszDrive, IDataObject *pDataObj) { HPSXA hpsx = NULL; HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE]; - PROPSHEETHEADERW psh; CComObject<CDrvDefExt> *pDrvDefExt = NULL; - WCHAR wszName[256]; - ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); - psh.dwSize = sizeof(PROPSHEETHEADERW); - psh.dwFlags = 0; // FIXME: make it modeless - psh.hwndParent = NULL; - psh.nStartPage = 0; - psh.phpage = hpsp; + CDataObjectHIDA cida(pDataObj); + if (FAILED_UNEXPECTEDLY(cida.hr())) + return cida.hr(); - LPITEMIDLIST completePidl = ILCombine(pidlFolder, apidl[0]); - if (!completePidl) - return E_OUTOFMEMORY; - - if (ILGetDisplayNameExW(NULL, completePidl, wszName, ILGDN_NORMAL)) + RECT rcPosition = {CW_USEDEFAULT, CW_USEDEFAULT, 0, 0}; + POINT pt; + if (SUCCEEDED(DataObject_GetOffset(pDataObj, &pt))) { - psh.pszCaption = wszName; - psh.dwFlags |= PSH_PROPTITLE; + rcPosition.left = pt.x; + rcPosition.top = pt.y; } - ILFree(completePidl); + DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION; + DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW; + CStubWindow32 stub; + if (!stub.Create(NULL, rcPosition, NULL, style, exstyle)) + { + ERR("StubWindow32 creation failed\n"); + return FALSE; + } - CComPtr<IDataObject> pDataObj; - HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); + PROPSHEETHEADERW psh = {sizeof(PROPSHEETHEADERW)}; + psh.dwFlags = PSH_PROPTITLE; + psh.pszCaption = pwszDrive; + psh.hwndParent = stub; + psh.nStartPage = 0; + psh.phpage = hpsp; + HRESULT hr = CComObject<CDrvDefExt>::CreateInstance(&pDrvDefExt); if (SUCCEEDED(hr)) { - hr = CComObject<CDrvDefExt>::CreateInstance(&pDrvDefExt); + pDrvDefExt->AddRef(); // CreateInstance returns object with 0 ref count + hr = pDrvDefExt->Initialize(HIDA_GetPIDLFolder(cida), pDataObj, NULL); if (SUCCEEDED(hr)) { - pDrvDefExt->AddRef(); // CreateInstance returns object with 0 ref count - hr = pDrvDefExt->Initialize(pidlFolder, pDataObj, NULL); - if (SUCCEEDED(hr)) - { - hr = pDrvDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&psh); - if (FAILED(hr)) - ERR("AddPages failed\n"); - } else - ERR("Initialize failed\n"); + hr = pDrvDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&psh); + if (FAILED(hr)) + ERR("AddPages failed\n"); + } + else + { + ERR("Initialize failed\n"); } - - hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Drive", MAX_PROPERTY_SHEET_PAGE, pDataObj); - if (hpsx) - SHAddFromPropSheetExtArray(hpsx, (LPFNADDPROPSHEETPAGE)AddPropSheetPageCallback, (LPARAM)&psh); } - // NOTE: Currently property sheet is modal. If we make it modeless, then it returns HWND. + hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Drive", MAX_PROPERTY_SHEET_PAGE, pDataObj); + if (hpsx) + SHAddFromPropSheetExtArray(hpsx, (LPFNADDPROPSHEETPAGE)AddPropSheetPageCallback, (LPARAM)&psh); + INT_PTR ret = PropertySheetW(&psh); if (hpsx) @@ -226,9 +229,9 @@ SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHI if (pDrvDefExt) pDrvDefExt->Release(); - if (ret >= 0) - return S_OK; - return E_FAIL; + stub.DestroyWindow(); + + return ret != -1; } static VOID diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp index b43ee566e85..68872bc4c69 100644 --- a/dll/win32/shell32/dialogs/fprop.cpp +++ b/dll/win32/shell32/dialogs/fprop.cpp @@ -80,7 +80,7 @@ LoadPropSheetHandlers(LPCWSTR pwszPath, PROPSHEETHEADERW *pHeader, UINT cMaxPage */ BOOL -SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) +SH_ShowPropertiesDialog(LPCWSTR pwszPath, IDataObject *pDataObj) { HPSXA hpsxa[3] = {NULL, NULL, NULL}; CComObject<CFileDefExt> *pFileDefExt = NULL; @@ -100,14 +100,33 @@ SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CH /* remove trailing \\ at the end of path */ PathRemoveBackslashW(wszPath); + CDataObjectHIDA cida(pDataObj); + if (FAILED_UNEXPECTEDLY(cida.hr())) + return FALSE; + + if (cida->cidl == 0) + { + ERR("Empty HIDA\n"); + return FALSE; + } + /* Handle drives */ - if (PathIsRootW(wszPath)) - return SUCCEEDED(SH_ShowDriveProperties(wszPath, pidlFolder, apidl)); + if (_ILIsDrive(HIDA_GetPIDLItem(cida, 0))) + return SH_ShowDriveProperties(wszPath, pDataObj); + + + RECT rcPosition = {CW_USEDEFAULT, CW_USEDEFAULT, 0, 0}; + POINT pt; + if (SUCCEEDED(DataObject_GetOffset(pDataObj, &pt))) + { + rcPosition.left = pt.x; + rcPosition.top = pt.y; + } DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION; DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW; CStubWindow32 stub; - if (!stub.Create(NULL, NULL, NULL, style, exstyle)) + if (!stub.Create(NULL, rcPosition, NULL, style, exstyle)) { ERR("StubWindow32 creation failed\n"); return FALSE; @@ -122,35 +141,29 @@ SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CH Header.phpage = hppages; Header.pszCaption = PathFindFileNameW(wszPath); - CComPtr<IDataObject> pDataObj; - HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); - + HRESULT hr = CComObject<CFileDefExt>::CreateInstance(&pFileDefExt); if (SUCCEEDED(hr)) { - hr = CComObject<CFileDefExt>::CreateInstance(&pFileDefExt); - if (SUCCEEDED(hr)) + pFileDefExt->AddRef(); // CreateInstance returns object with 0 ref count + hr = pFileDefExt->Initialize(HIDA_GetPIDLFolder(cida), pDataObj, NULL); + if (!FAILED_UNEXPECTEDLY(hr)) { - pFileDefExt->AddRef(); // CreateInstance returns object with 0 ref count - hr = pFileDefExt->Initialize(pidlFolder, pDataObj, NULL); - if (!FAILED_UNEXPECTEDLY(hr)) - { - hr = pFileDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&Header); - if (FAILED_UNEXPECTEDLY(hr)) - { - ERR("AddPages failed\n"); - return FALSE; - } - } - else + hr = pFileDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&Header); + if (FAILED_UNEXPECTEDLY(hr)) { - ERR("Initialize failed\n"); + ERR("AddPages failed\n"); return FALSE; } } - - LoadPropSheetHandlers(wszPath, &Header, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj); + else + { + ERR("Initialize failed\n"); + return FALSE; + } } + LoadPropSheetHandlers(wszPath, &Header, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj); + INT_PTR Result = PropertySheetW(&Header); for (UINT i = 0; i < 3; ++i) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index b8ef36e2ea0..805bfee1ac0 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -329,7 +329,9 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, if (wParam == DFM_CMD_PROPERTIES) { - hr = SH_ShowDriveProperties(wszBuf, pidlFolder, apidl); + // pdtobj should be valid at this point! + ATLASSERT(pdtobj); + hr = SH_ShowDriveProperties(wszBuf, pdtobj); if (FAILED(hr)) { dwError = ERROR_CAN_NOT_COMPLETE; diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index cf8d0c99233..4b7d8b3990b 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -1811,14 +1811,24 @@ HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObjec { if (uMsg == DFM_INVOKECOMMAND && wParam == 0) { - PUITEMID_CHILD pidlChild = ILClone(ILFindLastID(m_pidlRoot)); - LPITEMIDLIST pidlParent = ILClone(m_pidlRoot); + // Create an data object + CComHeapPtr<ITEMID_CHILD> pidlChild(ILClone(ILFindLastID(m_pidlRoot))); + CComHeapPtr<ITEMIDLIST> pidlParent(ILClone(m_pidlRoot)); ILRemoveLastID(pidlParent); - BOOL bSuccess = SH_ShowPropertiesDialog(m_sPathTarget, pidlParent, &pidlChild); - if (!bSuccess) - ERR("SH_ShowPropertiesDialog failed\n"); - ILFree(pidlChild); - ILFree(pidlParent); + + CComPtr<IDataObject> pDataObj; + HRESULT hr = SHCreateDataObject(pidlParent, 1, &pidlChild, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); + if (!FAILED_UNEXPECTEDLY(hr)) + { + // Ask for a title to display + CComHeapPtr<WCHAR> wszName; + if (!FAILED_UNEXPECTEDLY(SHGetNameFromIDList(m_pidlRoot, SIGDN_PARENTRELATIVEPARSING, &wszName))) + { + BOOL bSuccess = SH_ShowPropertiesDialog(wszName, pDataObj); + if (!bSuccess) + ERR("SH_ShowPropertiesDialog failed\n"); + } + } } else if (uMsg == DFM_MERGECONTEXTMENU) { diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index 01018b44ede..315ad7d74c1 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -460,25 +460,14 @@ _ShowPropertiesDialogThread(LPVOID lpParameter) return E_FAIL; } - PCUIDLIST_ABSOLUTE pidlFolder = HIDA_GetPIDLFolder(cida); - CComPtr<IShellFolder> psfParent; - HRESULT hr = _SHBindToFolder(pidlFolder, &psfParent); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - STRRET strFile; - PCUIDLIST_RELATIVE apidl = HIDA_GetPIDLItem(cida, 0); - hr = psfParent->GetDisplayNameOf(apidl, SHGDN_FORPARSING, &strFile); - if (!FAILED_UNEXPECTEDLY(hr)) - { - BOOL bSuccess = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, &apidl); - if (!bSuccess) - ERR("SH_ShowPropertiesDialog failed\n"); - } - else - { - ERR("Failed to get display name\n"); - } + CComHeapPtr<ITEMIDLIST> completePidl(ILCombine(HIDA_GetPIDLFolder(cida), HIDA_GetPIDLItem(cida, 0))); + CComHeapPtr<WCHAR> wszName; + if (FAILED_UNEXPECTEDLY(SHGetNameFromIDList(completePidl, SIGDN_PARENTRELATIVEPARSING, &wszName))) + return 0; + + BOOL bSuccess = SH_ShowPropertiesDialog(wszName, pDataObject); + if (!bSuccess) + ERR("SH_ShowPropertiesDialog failed\n"); return 0; } diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index 1585f60aedd..a9da0b2e10f 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -186,9 +186,9 @@ BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle); -HRESULT SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); +BOOL SH_ShowDriveProperties(WCHAR *drive, IDataObject *pDataObj); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); -BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); +BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, IDataObject *pDataObj); LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf); HRESULT WINAPI DoRegisterServer(void); diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 7a3c7265059..f516d8c6830 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -560,6 +560,7 @@ static inline PCUIDLIST_RELATIVE HIDA_GetPIDLItem(CIDA const* pida, SIZE_T i) #ifdef __cplusplus DECLSPEC_SELECTANY CLIPFORMAT g_cfHIDA = NULL; +DECLSPEC_SELECTANY CLIPFORMAT g_cfShellIdListOffsets = NULL; // Allow to use the HIDA from an IDataObject without copying it struct CDataObjectHIDA @@ -684,6 +685,31 @@ HRESULT DataObject_SetData(IDataObject* pDataObject, CLIPFORMAT clipformat, PVOI return hr; } + +inline HRESULT +DataObject_GetOffset(IDataObject *pDataObject, POINT *point) +{ + if (g_cfShellIdListOffsets == NULL) + { + g_cfShellIdListOffsets = (CLIPFORMAT)RegisterClipboardFormatW(CFSTR_SHELLIDLISTOFFSETW); + } + + point->x = point->y = 0; + + return DataObject_GetData(pDataObject, g_cfShellIdListOffsets, point, sizeof(point[0])); +} + +inline HRESULT +DataObject_SetOffset(IDataObject* pDataObject, POINT* point) +{ + if (g_cfShellIdListOffsets == NULL) + { + g_cfShellIdListOffsets = (CLIPFORMAT)RegisterClipboardFormatW(CFSTR_SHELLIDLISTOFFSETW); + } + + return DataObject_SetData(pDataObject, g_cfShellIdListOffsets, point, sizeof(point[0])); +} + #endif

1 0

[reactos] 01/01: [INF][INTL.INF][SETUPLIB] We don't have preinstalled IMEs (#4774)
by Katayama Hirofumi MZ 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26408144a16c13c81d497… commit 26408144a16c13c81d4971052060ddfc89cb69d8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 14 07:17:24 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 14 07:17:24 2022 +0900 [INF][INTL.INF][SETUPLIB] We don't have preinstalled IMEs (#4774) Don't write the preinstalled IME keyboard layouts in Chinese, Japanese and Korean (CJK). CORE-18506 --- base/setup/lib/lang/ja-JP.h | 2 +- base/setup/lib/lang/ko-KR.h | 2 +- base/setup/lib/lang/zh-CN.h | 8 ++++---- base/setup/lib/lang/zh-HK.h | 2 +- base/setup/lib/lang/zh-MO.h | 6 +++--- base/setup/lib/lang/zh-SG.h | 8 ++++---- base/setup/lib/lang/zh-TW.h | 4 ++-- media/inf/intl.inf | 16 ++++++++-------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/setup/lib/lang/ja-JP.h b/base/setup/lib/lang/ja-JP.h index 2d8a6eb2bab..f73c488758b 100644 --- a/base/setup/lib/lang/ja-JP.h +++ b/base/setup/lib/lang/ja-JP.h @@ -2,7 +2,7 @@ MUI_LAYOUTS jaJPLayouts[] = { -// { L"0411", L"e0010411" }, +// { L"0411", L"E0010411" }, // We don't have preinstalled IMEs. { L"0411", L"00000411" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/ko-KR.h b/base/setup/lib/lang/ko-KR.h index 799ae3ab1f1..578c53a9c3f 100644 --- a/base/setup/lib/lang/ko-KR.h +++ b/base/setup/lib/lang/ko-KR.h @@ -2,7 +2,7 @@ MUI_LAYOUTS koKRLayouts[] = { -// { L"0412", L"E0010412" }, +// { L"0412", L"E0010412" }, // We don't have preinstalled IMEs. { L"0412", L"00000412" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-CN.h b/base/setup/lib/lang/zh-CN.h index d538e74d92a..5f5e74bfc4a 100644 --- a/base/setup/lib/lang/zh-CN.h +++ b/base/setup/lib/lang/zh-CN.h @@ -4,9 +4,9 @@ MUI_LAYOUTS zhCNLayouts[] = { { L"0409", L"00000409" }, { L"0804", L"00000804" }, - { L"0804", L"E00E0804" }, - { L"0804", L"E0010804" }, - { L"0804", L"E0030804" }, - { L"0804", L"E0040804" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0010804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0030804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0040804" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-HK.h b/base/setup/lib/lang/zh-HK.h index 82905a3a22d..4e7c99fe7f7 100644 --- a/base/setup/lib/lang/zh-HK.h +++ b/base/setup/lib/lang/zh-HK.h @@ -3,6 +3,6 @@ MUI_LAYOUTS zhHKLayouts[] = { { L"0409", L"00000409" }, - { L"0C04", L"E0080404" }, +// { L"0C04", L"E0080404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-MO.h b/base/setup/lib/lang/zh-MO.h index b12866fc0d2..31e8cb8672f 100644 --- a/base/setup/lib/lang/zh-MO.h +++ b/base/setup/lib/lang/zh-MO.h @@ -3,8 +3,8 @@ MUI_LAYOUTS zhMOLayouts[] = { { L"0409", L"00000409" }, - { L"0804", L"E00E0804" }, - { L"0404", L"E0020404" }, - { L"0404", L"E0080404" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0020404" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0080404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-SG.h b/base/setup/lib/lang/zh-SG.h index f59b1d98c49..5e4934b3d87 100644 --- a/base/setup/lib/lang/zh-SG.h +++ b/base/setup/lib/lang/zh-SG.h @@ -3,9 +3,9 @@ MUI_LAYOUTS zhSGLayouts[] = { { L"0409", L"00000409" }, - { L"0804", L"E00E0804" }, - { L"0804", L"E0010804" }, - { L"0804", L"E0030804" }, - { L"0804", L"E0040804" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0010804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0030804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0040804" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-TW.h b/base/setup/lib/lang/zh-TW.h index a1d3dad959c..7f05999fadf 100644 --- a/base/setup/lib/lang/zh-TW.h +++ b/base/setup/lib/lang/zh-TW.h @@ -4,7 +4,7 @@ MUI_LAYOUTS zhTWLayouts[] = { { L"0409", L"00000409" }, { L"0404", L"00000404" }, - { L"0404", L"E0080404" }, - { L"0404", L"E0010404" }, +// { L"0404", L"E0080404" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0010404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/media/inf/intl.inf b/media/inf/intl.inf index 35c441ac10e..1b09fbc522e 100644 --- a/media/inf/intl.inf +++ b/media/inf/intl.inf @@ -35,11 +35,11 @@ DriverVer = 05/29/2008,0.1 0000201a = %Bosnian_Cyrillic%, 855, 5, , 201a:0000201a,0409:00000409 00000402 = %Bulgarian%, 866, 5, , 0402:00000402,0409:00000409 00000403 = %Catalan%, 850, 1, , 0403:0000040a,0409:00000409 -00000404 = %Chinese_Taiwan%, 950, 9, , 0404:00000404,0404:e0080404,0404:E0010404 -00000804 = %Chinese_PRC%, 936, 10, , 0804:00000804,0804:e00e0804,0804:e0010804,0804:e0030804,0804:e0040804 -00000c04 = %Chinese_Hong_Kong%, 950, 10, 9, 0409:00000409,0c04:e0080404 -00001004 = %Chinese_Singapore%, 936, 10, , 0409:00000409,0804:e00e0804,0804:e0010804,0804:e0030804,0804:e0040804 -00001404 = %Chinese_Macau%, 950, 10, 9, 0409:00000409,0804:e00e0804,0404:e0020404,0404:e0080404 +00000404 = %Chinese_Taiwan%, 950, 9, , 0404:00000404,0409:00000409 +00000804 = %Chinese_PRC%, 936, 10, , 0804:00000804,0409:00000409 +00000c04 = %Chinese_Hong_Kong%, 950, 10, 9, 0409:00000409 +00001004 = %Chinese_Singapore%, 936, 10, , 0409:00000409 +00001404 = %Chinese_Macau%, 950, 10, 9, 0409:00000409 0000041a = %Croatian%, 852, 2, , 041a:0000041a,0409:00000409 0000101a = %Croatian_Bosnia%, 852, 2, , 101a:0000041a,0409:00000409 00000405 = %Czech%, 852, 2, , 0405:00000405,0409:00000409 @@ -91,12 +91,12 @@ DriverVer = 05/29/2008,0.1 0000083c = %Irish%, 850, 1, , 083c:00001809 00000410 = %Italian_Italy%, 850, 1, , 0410:00000410,0409:00000409 00000810 = %Italian_Switzerland%, 850, 1, , 0810:00000410,0409:00000409 -00000411 = %Japanese%, 932, 7, , 0411:e0010411 +00000411 = %Japanese%, 932, 7, , 0411:00000411 0000044b = %Kannada_India%, 437, 15, , 0409:00000409,044b:0000044b,0439:00010439 0000043f = %Kazakh%, 866, 5, , 043f:0000043f,0409:00000409,0419:00000419 00000457 = %Konkani%, 437, 15, , 0409:00000409,0457:00000439 -00000412 = %Korean%, 949, 8, , 0412:E0010412 -00000812 = %Korean_Johab%, 1361, 8, , 0812:E0010412 +00000412 = %Korean%, 949, 8, , 0412:00000412 +00000812 = %Korean_Johab%, 1361, 8, , 0812:00000412 00000440 = %Kyrgyz_Kyrgyzstan%, 866, 5, , 0440:00000440,0409:00000409 00000426 = %Latvian%, 775, 3, , 0426:00010426 00000427 = %Lithuanian%, 775, 3, , 0427:00010427

1 0

[reactos] 01/01: [WMIC] Update German translation
by Robert Naumann 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abaf0d1cbbdf0802344fe… commit abaf0d1cbbdf0802344fe4d671f9e23c795d021f Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Thu Oct 13 21:30:22 2022 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Thu Oct 13 21:30:22 2022 +0200 [WMIC] Update German translation --- base/applications/cmdutils/wmic/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/cmdutils/wmic/lang/de-DE.rc b/base/applications/cmdutils/wmic/lang/de-DE.rc index 2d5424e9e26..3fa2b962c57 100644 --- a/base/applications/cmdutils/wmic/lang/de-DE.rc +++ b/base/applications/cmdutils/wmic/lang/de-DE.rc @@ -5,5 +5,5 @@ STRINGTABLE STRING_CMDLINE_NOT_SUPPORTED, "Fehler: Befehlszeile nicht unterstützt\n" STRING_ALIAS_NOT_FOUND, "Fehler: Alias nicht gefunden\n" STRING_INVALID_QUERY, "Fehler: Ungültige Abfrage\n" - STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Fehler: Ungültige Syntax für PATH\n" }

1 0

[reactos] 01/01: [SYSDM] Improve license dialog icon (#4773)
by Thamatip Chitpong 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cc9a26392ea4cc246284… commit 9cc9a26392ea4cc246284af61185db01f8212ca9 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Thu Oct 13 21:52:14 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 13 17:52:14 2022 +0300 [SYSDM] Improve license dialog icon (#4773) - Use `mimetypes/application-certificate` icon from Tango Icon Theme 0.8.90 instead of `IDI_CPLSYSTEM` - Set large icon correctly - Add NULL check for DestroyIcon - Minor code formatting --- dll/cpl/sysdm/licence.c | 30 ++++++++++++++++++++---------- dll/cpl/sysdm/resource.h | 1 + dll/cpl/sysdm/resources/license.ico | Bin 0 -> 25214 bytes dll/cpl/sysdm/sysdm.rc | 1 + 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dll/cpl/sysdm/licence.c b/dll/cpl/sysdm/licence.c index 6894fd6598d..fb895143f60 100644 --- a/dll/cpl/sysdm/licence.c +++ b/dll/cpl/sysdm/licence.c @@ -12,6 +12,7 @@ typedef struct _LIC_CONTEXT { HICON hIcon; + HICON hIconSm; } LIC_CONTEXT, *PLIC_CONTEXT; @@ -23,16 +24,20 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) PCSTR LicenseText; pLicInfo->hIcon = LoadImage(hApplet, - MAKEINTRESOURCE(IDI_CPLSYSTEM), + MAKEINTRESOURCE(IDI_LICENSE), IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)pLicInfo->hIcon); + GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + LR_DEFAULTCOLOR); + pLicInfo->hIconSm = LoadImage(hApplet, + MAKEINTRESOURCE(IDI_LICENSE), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + LR_DEFAULTCOLOR); + + SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)pLicInfo->hIcon); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)pLicInfo->hIconSm); /* Load license from resource */ if (!(hResInfo = FindResource(hApplet, @@ -86,7 +91,12 @@ LicenceDlgProc(HWND hDlg, case WM_DESTROY: if (pLicInfo) { - DestroyIcon(pLicInfo->hIcon); + if (pLicInfo->hIconSm) + DestroyIcon(pLicInfo->hIconSm); + + if (pLicInfo->hIcon) + DestroyIcon(pLicInfo->hIcon); + HeapFree(GetProcessHeap(), 0, pLicInfo); } break; diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 4490a7d4eb2..ec4eaf07a39 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -6,6 +6,7 @@ #define IDI_DEVMGR 51 #define IDI_HARDPROF 52 #define IDI_USERPROF 53 +#define IDI_LICENSE 54 #define IDI_UP 2500 #define IDI_DOWN 2501 #define IDI_ADDHW 2502 diff --git a/dll/cpl/sysdm/resources/license.ico b/dll/cpl/sysdm/resources/license.ico new file mode 100644 index 00000000000..4cbfe98ccd9 Binary files /dev/null and b/dll/cpl/sysdm/resources/license.ico differ diff --git a/dll/cpl/sysdm/sysdm.rc b/dll/cpl/sysdm/sysdm.rc index 6ba6b87ba37..cb0e6914d06 100644 --- a/dll/cpl/sysdm/sysdm.rc +++ b/dll/cpl/sysdm/sysdm.rc @@ -16,6 +16,7 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/hwprofile.ico" IDI_DEVMGR ICON "resources/dev.ico" +IDI_LICENSE ICON "resources/license.ico" IDI_UP ICON "resources/up.ico" IDI_DOWN ICON "resources/down.ico" IDI_ADDHW ICON "resources/addhw.ico"

1 0

[reactos] 01/01: [KBSWITCH][IMM32][USER32] Consider keyboard layout corner cases
by Katayama Hirofumi MZ 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbef61803291ef306dc86… commit bbef61803291ef306dc86afe2249551c3aae593c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 13 16:01:02 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 13 16:01:02 2022 +0900 [KBSWITCH][IMM32][USER32] Consider keyboard layout corner cases Considering invalid Keyboard Layout registry entries. CORE-11700 --- base/applications/kbswitch/kbswitch.c | 2 +- dll/win32/imm32/utils.c | 6 +++--- win32ss/user/user32/windows/input.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 356209d0c6a..6e301ee5207 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -341,7 +341,7 @@ BuildLeftPopupMenu(VOID) } if (!GetLayoutName(szLayoutNum, szName, ARRAYSIZE(szName))) - break; + continue; AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName); } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 90fa7d6c1d1..cde837ece0e 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -898,7 +898,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) lError = RegOpenKeyW(hkeyLayouts, szImeKey, &hkeyIME); /* Open the IME key */ if (lError != ERROR_SUCCESS) - break; + continue; /* Load the "Ime File" value */ szImeFileName[0] = 0; @@ -910,12 +910,12 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) /* We don't allow the invalid "IME File" values for security reason */ if (!szImeFileName[0] || wcscspn(szImeFileName, L":\\/") != wcslen(szImeFileName)) - break; + continue; Imm32StrToUInt(szImeKey, &Value, 16); hKL = (HKL)(DWORD_PTR)Value; if (!IS_IME_HKL(hKL)) - break; + continue; /* Store the IME key and the IME filename */ pLayouts[nCount].hKL = hKL; diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 092a92efefc..a15e9b57810 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -796,6 +796,7 @@ IntLoadKeyboardLayout( { bIsIME = FALSE; wHigh = 0; + ERR("0x%X\n", dwKLID); } else { @@ -810,6 +811,7 @@ IntLoadKeyboardLayout( { bIsIME = FALSE; wHigh = 0; + ERR("'%s'\n", debugstr_w(szPath)); } } }

1 0

[reactos] 01/01: [IMM32] Silence CtfImmDispatchDefImeMessage's fixme
by Katayama Hirofumi MZ 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb86db15bbae396f0a9e4… commit fb86db15bbae396f0a9e40e34ccb2f633f734ec4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 13 12:08:02 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 13 12:08:02 2022 +0900 [IMM32] Silence CtfImmDispatchDefImeMessage's fixme Too noisy. CORE-11700 --- dll/win32/imm32/ctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 61a36b305ff..711e2d5cadf 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -100,7 +100,7 @@ DWORD WINAPI CtfImmHideToolbarWnd(VOID) */ LRESULT WINAPI CtfImmDispatchDefImeMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + /* FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); */ return 0; }

1 0

[reactos] 01/01: [BROWSEUI] Follow-up of 2e67c18 (#4767); Also check 'MenuText'
by Katayama Hirofumi MZ 13 Oct '22

13 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=337cbf5888d88f697ff19… commit 337cbf5888d88f697ff19c830761602bf56eedf7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 13 11:07:03 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 13 11:07:03 2022 +0900 [BROWSEUI] Follow-up of 2e67c18 (#4767); Also check 'MenuText' CORE-18394 --- dll/win32/browseui/shellbars/CBandSiteMenu.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp index 1ea45a47d68..bf227f5e4a4 100644 --- a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp +++ b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp @@ -103,8 +103,12 @@ HRESULT CBandSiteMenu::_CreateMenuPart() hr = SHLoadRegUIStringW(hKey, L"MenuTextPUI", wszBandName, _countof(wszBandName)); if (FAILED_UNEXPECTEDLY(hr)) { - hr = SHLoadRegUIStringW(hKey, NULL, wszBandName, _countof(wszBandName)); - FAILED_UNEXPECTEDLY(hr); + hr = SHLoadRegUIStringW(hKey, L"MenuText", wszBandName, _countof(wszBandName)); + if (FAILED_UNEXPECTEDLY(hr)) + { + hr = SHLoadRegUIStringW(hKey, NULL, wszBandName, _countof(wszBandName)); + FAILED_UNEXPECTEDLY(hr); + } } RegCloseKey(hKey); }

1 0

[reactos] 01/01: [IMM32] Implement Imm32ImeNonImeToggle (#4769)
by Katayama Hirofumi MZ 12 Oct '22

12 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31a33c5fcb08b9b770705… commit 31a33c5fcb08b9b7707052afa233ecdbd2ede5d6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 13 07:14:24 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 13 07:14:24 2022 +0900 [IMM32] Implement Imm32ImeNonImeToggle (#4769) - Rename Imm32ImeNonImeToggle as Imm32CImeNonImeToggle (Win: CIMENonIMEToggle). - Add Imm32ImeNonImeToggle (Win: IMENonIMEToggle) function. - Improve IME hot-key functions. CORE-11700 --- dll/win32/imm32/keymsg.c | 91 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index baea59d0ec8..bff0671da03 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -13,18 +13,68 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +/* Win: IMENonIMEToggle */ +BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, BOOL bNowIME, LANGID LangID) +{ + HKL hOldKL, LayoutList[32], hFoundKL = NULL; + UINT iLayout, nLayoutCount; + + /* Get the previous layout */ + hOldKL = (HKL)NtUserGetThreadState(THREADSTATE_OLDKEYBOARDLAYOUT); + + /* Get the layout list */ + nLayoutCount = GetKeyboardLayoutList(_countof(LayoutList), LayoutList); + + /* Is there hOldKL in the list in the specified language ID? */ + if (hOldKL && (LangID == 0 || LOWORD(hOldKL) == LangID)) + { + for (iLayout = 0; iLayout < nLayoutCount; ++iLayout) + { + if (LayoutList[iLayout] == hOldKL) + { + hFoundKL = hOldKL; + break; + } + } + } + + if (hFoundKL == NULL) /* Not found? */ + { + /* Is there the keyboard layout of another kind in LangID? */ + for (iLayout = 0; iLayout < nLayoutCount; ++iLayout) + { + if (bNowIME == ImmIsIME(LayoutList[iLayout])) /* Same kind? */ + continue; + + if (LangID == 0 || LangID == LOWORD(LayoutList[iLayout])) + { + hFoundKL = LayoutList[iLayout]; + break; + } + } + } + + if (hFoundKL && hKL != hFoundKL) /* Found and different layout */ + { + PostMessageW(hWnd, WM_INPUTLANGCHANGEREQUEST, 1, (LPARAM)hFoundKL); + } + + return ImmIsIME(hFoundKL); +} + +/* Open or close the IME on Chinese or Taiwanese */ /* Win: CIMENonIMEToggle */ -BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) +BOOL APIENTRY Imm32CImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) { LPINPUTCONTEXT pIC; BOOL fOpen; - if (hWnd != NULL) + if (hWnd == NULL) return FALSE; - if (!IS_IME_HKL(hKL) || LOWORD(hKL) != LangID) + if (LOWORD(hKL) != LangID || !ImmIsIME(hKL)) { - FIXME("We have to do something here\n"); + Imm32ImeNonImeToggle(hIMC, hKL, hWnd, FALSE, LangID); return TRUE; } @@ -35,16 +85,15 @@ BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) fOpen = pIC->fOpen; ImmUnlockIMC(hIMC); - if (!fOpen) - { + if (fOpen) + Imm32ImeNonImeToggle(hIMC, hKL, hWnd, TRUE, 0); + else ImmSetOpenStatus(hIMC, TRUE); - return TRUE; - } - FIXME("We have to do something here\n"); return TRUE; } +/* Toggle shape mode on Chinese or Taiwanese */ /* Win: TShapeToggle */ BOOL APIENTRY Imm32CShapeToggle(HIMC hIMC, HKL hKL, HWND hWnd) { @@ -52,7 +101,7 @@ BOOL APIENTRY Imm32CShapeToggle(HIMC hIMC, HKL hKL, HWND hWnd) BOOL fOpen; DWORD dwConversion, dwSentence; - if (hWnd == NULL || !IS_IME_HKL(hKL)) + if (hWnd == NULL || !ImmIsIME(hKL)) return FALSE; pIC = ImmLockIMC(hIMC); @@ -83,7 +132,7 @@ BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) BOOL fOpen; DWORD dwConversion, dwSentence; - if (hWnd == NULL || !IS_IME_HKL(hKL)) + if (hWnd == NULL || !ImmIsIME(hKL)) return FALSE; pIC = ImmLockIMC(hIMC); @@ -107,19 +156,31 @@ BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) return TRUE; } +/* Open or close Japanese IME */ /* Win: JCloseOpen */ BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) { BOOL fOpen; + LPINPUTCONTEXTDX pIC; - if (ImmIsIME(hKL) && LOWORD(hKL) == LANGID_JAPANESE) + if (LOWORD(hKL) == LANGID_JAPANESE && ImmIsIME(hKL)) /* Japanese IME is selected */ { fOpen = ImmGetOpenStatus(hIMC); ImmSetOpenStatus(hIMC, !fOpen); return TRUE; } - FIXME("We have to do something here\n"); + /* Japanese IME is not selected. Select now */ + if (Imm32ImeNonImeToggle(hIMC, hKL, hWnd, FALSE, LANGID_JAPANESE)) + { + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC) + { + pIC->dwChange |= INPUTCONTEXTDX_CHANGE_OPEN; /* Notify open change */ + ImmUnlockIMC(hIMC); + } + } + return TRUE; } @@ -198,7 +259,7 @@ BOOL APIENTRY Imm32ProcessHotKey(HWND hWnd, HIMC hIMC, HKL hKL, DWORD dwHotKeyID switch (dwHotKeyID) { case IME_CHOTKEY_IME_NONIME_TOGGLE: - return Imm32ImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_SIMPLIFIED); + return Imm32CImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_SIMPLIFIED); case IME_CHOTKEY_SHAPE_TOGGLE: return Imm32CShapeToggle(hIMC, hKL, hWnd); @@ -219,7 +280,7 @@ BOOL APIENTRY Imm32ProcessHotKey(HWND hWnd, HIMC hIMC, HKL hKL, DWORD dwHotKeyID return Imm32KEnglish(hIMC); case IME_THOTKEY_IME_NONIME_TOGGLE: - return Imm32ImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_TRADITIONAL); + return Imm32CImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_TRADITIONAL); case IME_THOTKEY_SHAPE_TOGGLE: return Imm32CShapeToggle(hIMC, hKL, hWnd);

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