Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [SHELL32] CShellItem: Implement BindToHandler and improve GetAttributes based on wine Fixes lots of tests.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d7313273c50358922b7d… commit 9d7313273c50358922b7d2e253c186d0081ec0e0 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 16:31:28 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 16:33:30 2018 +0200 [SHELL32] CShellItem: Implement BindToHandler and improve GetAttributes based on wine Fixes lots of tests. --- dll/win32/shell32/CShellItem.cpp | 82 +++++++++++++++++++++++++++++++++++----- dll/win32/shell32/CShellItem.h | 1 + 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index 5ef965de47..f0a6ee650a 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -76,13 +76,68 @@ HRESULT CShellItem::get_parent_shellfolder(IShellFolder **ppsf) return hr; } +HRESULT CShellItem::get_shellfolder(IBindCtx *pbc, REFIID riid, void **ppvOut) +{ + CComPtr<IShellFolder> psf; + CComPtr<IShellFolder> psfDesktop; + HRESULT ret; + + ret = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + + if (_ILIsDesktop(m_pidl)) + psf = psfDesktop; + else + { + ret = psfDesktop->BindToObject(m_pidl, pbc, IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + } + + return psf->QueryInterface(riid, ppvOut); +} + HRESULT WINAPI CShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { - FIXME("(%p,%p,%s,%p,%p)\n", this, pbc, shdebugstr_guid(&rbhid), riid, ppvOut); + HRESULT ret; + TRACE("(%p, %p,%s,%p,%p)\n", this, pbc, shdebugstr_guid(&rbhid), riid, ppvOut); *ppvOut = NULL; + if (IsEqualGUID(rbhid, BHID_SFObject)) + { + return get_shellfolder(pbc, riid, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_SFUIObject)) + { + CComPtr<IShellFolder> psf_parent; + if (_ILIsDesktop(m_pidl)) + ret = SHGetDesktopFolder(&psf_parent); + else + ret = get_parent_shellfolder(&psf_parent); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; - return E_NOTIMPL; + LPCITEMIDLIST pidl = ILFindLastID(m_pidl); + return psf_parent->GetUIObjectOf(NULL, 1, &pidl, riid, NULL, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_DataObject)) + { + return BindToHandler(pbc, BHID_SFUIObject, IID_IDataObject, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_SFViewObject)) + { + CComPtr<IShellFolder> psf; + ret = get_shellfolder(NULL, IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + + return psf->CreateViewObject(NULL, riid, ppvOut); + } + + FIXME("Unsupported BHID %s.\n", debugstr_guid(&rbhid)); + + return MK_E_NOOBJECT; } HRESULT WINAPI CShellItem::GetParent(IShellItem **ppsi) @@ -160,15 +215,22 @@ HRESULT WINAPI CShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs TRACE("(%p,%x,%p)\n", this, sfgaoMask, psfgaoAttribs); - hr = get_parent_shellfolder(&parent_folder); - if (SUCCEEDED(hr)) - { - child_pidl = ILFindLastID(m_pidl); - *psfgaoAttribs = sfgaoMask; - hr = parent_folder->GetAttributesOf(1, &child_pidl, psfgaoAttribs); - } + if (_ILIsDesktop(m_pidl)) + hr = SHGetDesktopFolder(&parent_folder); + else + hr = get_parent_shellfolder(&parent_folder); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - return hr; + child_pidl = ILFindLastID(m_pidl); + *psfgaoAttribs = sfgaoMask; + hr = parent_folder->GetAttributesOf(1, &child_pidl, psfgaoAttribs); + *psfgaoAttribs &= sfgaoMask; + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return (sfgaoMask == *psfgaoAttribs) ? S_OK : S_FALSE; } HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) diff --git a/dll/win32/shell32/CShellItem.h b/dll/win32/shell32/CShellItem.h index a75698edfa..57c318523d 100644 --- a/dll/win32/shell32/CShellItem.h +++ b/dll/win32/shell32/CShellItem.h @@ -36,6 +36,7 @@ public: ~CShellItem(); HRESULT get_parent_pidl(LPITEMIDLIST *parent_pidl); HRESULT get_parent_shellfolder(IShellFolder **ppsf); + HRESULT get_shellfolder(IBindCtx *pbc, REFIID riid, void **ppvOut); // IShellItem virtual HRESULT WINAPI BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut);

6 years, 10 months

01/01: [SHELL32] CShellItem: Fix return value of Compare method

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af97de39a2bc350928656… commit af97de39a2bc3509286565f670a9feef723deaf3 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 14:36:31 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 14:36:31 2018 +0200 [SHELL32] CShellItem: Fix return value of Compare method --- dll/win32/shell32/CShellItem.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index 1e06c8cff8..5ef965de47 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -199,9 +199,13 @@ HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) } } - if (SUCCEEDED(hr)) + if(FAILED(hr)) + return hr; + + if(*piOrder) + return S_FALSE; + else return S_OK; - return hr; } HRESULT WINAPI CShellItem::GetClassID(CLSID *pClassID)

6 years, 10 months

01/01: [SHELL32] CDefaultContextMenu: Implement GetCommandString

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c361e475b4af5dc1cfe57… commit c361e475b4af5dc1cfe57062ebc111794106fd2d Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 13:05:59 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 13:05:59 2018 +0200 [SHELL32] CDefaultContextMenu: Implement GetCommandString --- dll/win32/shell32/CDefaultContextMenu.cpp | 69 +++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 0834995abd..fac9b50907 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -13,6 +13,7 @@ extern "C" //fixme: this isn't in wine's shlwapi header, and the definition doesnt match the // windows headers. When wine's header and lib are fixed this can be removed. DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen); + INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen); }; WINE_DEFAULT_DEBUG_CHANNEL(dmenu); @@ -47,7 +48,14 @@ struct _StaticInvokeCommandMap_ { "Print", 0 }, // Unimplemented { "Preview", 0 }, // Unimplemented { "Open", FCIDM_SHVIEW_OPEN }, - { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER } + { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER }, + { "cut", FCIDM_SHVIEW_CUT}, + { "copy", FCIDM_SHVIEW_COPY}, + { "paste", FCIDM_SHVIEW_INSERT}, + { "link", FCIDM_SHVIEW_CREATELINK}, + { "delete", FCIDM_SHVIEW_DELETE}, + { "properties", FCIDM_SHVIEW_PROPERTIES}, + { "rename", FCIDM_SHVIEW_RENAME}, }; @@ -1237,7 +1245,7 @@ CDefaultContextMenu::InvokeCommand( Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: - Result = E_UNEXPECTED; + Result = E_INVALIDARG; ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); break; } @@ -1256,15 +1264,68 @@ CDefaultContextMenu::GetCommandString( { /* We don't handle the help text yet */ if (uFlags == GCS_HELPTEXTA || - uFlags == GCS_HELPTEXTW) + uFlags == GCS_HELPTEXTW || + HIWORD(idCommand) != 0) { return E_NOTIMPL; } + UINT CmdId = LOWORD(idCommand); + + if (m_pDynamicEntries && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) + { + idCommand -= m_iIdSHEFirst; + PDynamicShellEntry pEntry = GetDynamicEntry(idCommand); + if (!pEntry) + return E_FAIL; + + idCommand -= pEntry->iIdCmdFirst; + return pEntry->pCM->GetCommandString(idCommand, + uFlags, + lpReserved, + lpszName, + uMaxNameLen); + } + + if (m_pStaticEntries && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) + { + /* Validation just returns S_OK on a match. The id exists. */ + if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW) + return S_OK; + + CmdId -= m_iIdSCMFirst; + + PStaticShellEntry pEntry = m_pStaticEntries; + while (pEntry && (CmdId--) > 0) + pEntry = pEntry->pNext; + + if (!pEntry) + return E_INVALIDARG; + + if (uFlags == GCS_VERBW) + return StringCchCopyW((LPWSTR)lpszName, uMaxNameLen, pEntry->szVerb); + + if (uFlags == GCS_VERBA) + { + if (SHUnicodeToAnsi(pEntry->szVerb, lpszName, uMaxNameLen)) + return S_OK; + } + + return E_INVALIDARG; + } + + //FIXME: Should we handle callbacks here? + if (m_iIdDfltFirst != m_iIdDfltLast && CmdId >= m_iIdDfltFirst && CmdId < m_iIdDfltLast) + { + CmdId -= m_iIdDfltFirst; + /* See the definitions of IDM_CUT and co to see how this works */ + CmdId += 0x7000; + } + /* Loop looking for a matching Id */ for (UINT i = 0; i < _countof(g_StaticInvokeCmdMap); i++) { - if (g_StaticInvokeCmdMap[i].IntVerb == idCommand) + if (g_StaticInvokeCmdMap[i].IntVerb == CmdId) { /* Validation just returns S_OK on a match */ if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW)

6 years, 10 months

01/01: [SHELL32] Fix a couple of tests

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e48c20b3b6b4290387ab… commit 7e48c20b3b6b4290387abbc459ac15702c8374bf Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 11:48:40 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 11:48:40 2018 +0200 [SHELL32] Fix a couple of tests --- dll/win32/shell32/CShellItem.cpp | 3 ++- dll/win32/shell32/folders/CDesktopFolder.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index d684870c05..1e06c8cff8 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -250,6 +250,8 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); + *ppsi = NULL; + if (!pidl) return E_INVALIDARG; @@ -291,7 +293,6 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, hr = CShellItem::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellItem, &newShellItem)); if (FAILED(hr)) { - *ppsi = NULL; ILFree(new_pidl); return hr; } diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index fc52702696..9a1a452ea8 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -819,6 +819,9 @@ HRESULT WINAPI CDesktopFolder::Initialize(LPCITEMIDLIST pidl) { TRACE ("(%p)->(%p)\n", this, pidl); + if (!pidl) + return S_OK; + return E_INVALIDARG; }

6 years, 10 months

01/01: [SHELL32] shellpath: sync a part of _SHGetDefaultValue with wine on 32bit builds CSIDL_PROGRAM_FILESX86 is treated as CSIDL_PROGRAM_FILES and on wow64 builds CSIDL_PROGRAM_FILES gets treated as CSIDL_PROGRAM_FILESX86

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac950ea01d31e8a2a1058… commit ac950ea01d31e8a2a1058ae9d621ff1da91c736c Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 10:58:14 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 10:58:14 2018 +0200 [SHELL32] shellpath: sync a part of _SHGetDefaultValue with wine on 32bit builds CSIDL_PROGRAM_FILESX86 is treated as CSIDL_PROGRAM_FILES and on wow64 builds CSIDL_PROGRAM_FILES gets treated as CSIDL_PROGRAM_FILESX86 --- dll/win32/shell32/wine/shellpath.c | 49 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 3e2cd089ad..df6d98b2f2 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -49,30 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); static const BOOL is_win64 = sizeof(void *) > sizeof(int); -typedef BOOL(WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); - -static LPFN_ISWOW64PROCESS fnIsWow64Process = NULL; - -BOOL IsWow64() -{ - BOOL bIsWow64 = FALSE; - - if (!fnIsWow64Process) - { - fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress( - GetModuleHandle(TEXT("kernel32")), "IsWow64Process"); - } - - if (!fnIsWow64Process) - return FALSE; - - if (!fnIsWow64Process(GetCurrentProcess(), &bIsWow64)) - return FALSE; - - return bIsWow64; -} - - /* ########## Combining and Constructing paths ########## */ @@ -1513,16 +1489,23 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) if (!pszPath) return E_INVALIDARG; - switch (folder) + if (!is_win64) { - case CSIDL_PROGRAM_FILES: - if (IsWow64()) - folder = CSIDL_PROGRAM_FILESX86; - break; - case CSIDL_PROGRAM_FILES_COMMON: - if (IsWow64()) - folder = CSIDL_PROGRAM_FILESX86; - break; + BOOL is_wow64; + + switch (folder) + { + case CSIDL_PROGRAM_FILES: + case CSIDL_PROGRAM_FILESX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILESX86 : CSIDL_PROGRAM_FILES; + break; + case CSIDL_PROGRAM_FILES_COMMON: + case CSIDL_PROGRAM_FILES_COMMONX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILES_COMMONX86 : CSIDL_PROGRAM_FILES_COMMON; + break; + } } switch (CSIDL_Data[folder].type)

6 years, 10 months

01/01: [SHELL32] Fix some test failures

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=730d81b9f7a7231668832… commit 730d81b9f7a7231668832be2d9f38a0c93739956 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Feb 19 03:23:15 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 10:15:23 2018 +0200 [SHELL32] Fix some test failures --- dll/win32/shell32/folders/CDesktopFolder.cpp | 2 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- dll/win32/shell32/folders/CMyDocsFolder.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 6d9b66eb72..fc52702696 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -182,7 +182,7 @@ static const shvheader DesktopSFHeader[] = { static const DWORD dwDesktopAttributes = SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | - SFGAO_STORAGEANCESTOR | SFGAO_HASPROPSHEET | SFGAO_STORAGE | SFGAO_CANLINK; + SFGAO_STORAGEANCESTOR | SFGAO_HASPROPSHEET | SFGAO_STORAGE; static const DWORD dwMyComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 91ffc4d506..a4c09b1f9e 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -373,7 +373,7 @@ static const shvheader MyComputerSFHeader[] = { static const DWORD dwComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; static const DWORD dwControlPanelAttributes = SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; static const DWORD dwDriveAttributes = diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp index 0e1ae1b93c..f27448d811 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.cpp +++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp @@ -74,7 +74,7 @@ HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a if(cidl) return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); - if (!rgfInOut || !apidl) + if (!rgfInOut) return E_INVALIDARG; if (*rgfInOut == 0)

6 years, 10 months

02/02: [REACTOS] Fix a number of Get/SetWindowsLong*Ptr* issues and use GWLP_* instead of GWL_* where appropriate.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d281d14fd1291216c37b2… commit d281d14fd1291216c37b2b94a96fc1461899eb91 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 5 02:42:14 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Feb 19 22:36:36 2018 +0100 [REACTOS] Fix a number of Get/SetWindowsLong*Ptr* issues and use GWLP_* instead of GWL_* where appropriate. --- base/applications/games/solitaire/solitaire.cpp | 4 +- base/applications/games/spider/spider.cpp | 4 +- base/applications/mspaint/toolbox.cpp | 4 +- base/applications/network/telnet/src/tnmisc.cpp | 4 +- base/setup/reactos/drivepage.c | 8 ++-- base/setup/reactos/reactos.c | 24 +++++----- dll/cpl/sysdm/environment.c | 4 +- dll/cpl/sysdm/general.c | 2 +- dll/cpl/timedate/dateandtime.c | 2 +- dll/shellext/netshell/setup.cpp | 14 +++--- dll/win32/browseui/shellbrowser.cpp | 6 +-- dll/win32/newdev/wizard.c | 32 ++++++------- dll/win32/shimgvw/shimgvw.c | 4 +- dll/win32/syssetup/wizard.c | 16 +++---- .../applications/screensavers/ssstars/settings.c | 4 +- .../applications/screensavers/ssstars/ssstars.c | 2 +- modules/rosapps/lib/vfdlib/vfdguisave.c | 6 +-- modules/rosapps/lib/vfdlib/vfdguitip.c | 8 ++-- modules/rosapps/templates/mdi/childwnd.c | 4 +- modules/rosapps/templates/mdi/framewnd.c | 2 +- modules/rosapps/templates/mdi/panelwnd.c | 2 +- modules/rostests/tests/button2/buttontst2.c | 52 +++++++++++----------- modules/rostests/tests/subclass/subclass.c | 16 +++---- .../rostests/win32/user32/kbdlayout/kbdlayout.c | 6 +-- sdk/include/psdk/windowsx.h | 6 +-- 25 files changed, 118 insertions(+), 118 deletions(-) diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp index 6eca4023c7..a5b9da40a7 100644 --- a/base/applications/games/solitaire/solitaire.cpp +++ b/base/applications/games/solitaire/solitaire.cpp @@ -427,7 +427,7 @@ CardImageWndProc(HWND hwnd, LPARAM lParam) { PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, - GWL_USERDATA); + GWLP_USERDATA); static WNDPROC hOldProc = NULL; if (!hOldProc && pCardBack) @@ -528,7 +528,7 @@ INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, (LONG_PTR)CardImageWndProc); SetWindowLongPtr(pCardBacks[i].hSelf, - GWL_USERDATA, + GWLP_USERDATA, (LONG_PTR)&pCardBacks[i]); } diff --git a/base/applications/games/spider/spider.cpp b/base/applications/games/spider/spider.cpp index 519b534dc1..8b5ab8b9e2 100644 --- a/base/applications/games/spider/spider.cpp +++ b/base/applications/games/spider/spider.cpp @@ -155,7 +155,7 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm LRESULT CALLBACK CardImageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, GWL_USERDATA); + PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, GWLP_USERDATA); static WNDPROC hOldProc = NULL; if (!pCardBack) @@ -248,7 +248,7 @@ INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa GWLP_WNDPROC, (LONG_PTR)CardImageWndProc); - SetWindowLongPtr(pCardBacks[i].hSelf, GWL_USERDATA, (LONG_PTR)&pCardBacks[i]); + SetWindowLongPtr(pCardBacks[i].hSelf, GWLP_USERDATA, (LONG_PTR)&pCardBacks[i]); } return TRUE; diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 7455917092..6bf67b8849 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -29,7 +29,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS); hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); toolbar.SendMessage(TB_SETIMAGELIST, 0, (LPARAM) hImageList); - tempBm = (HBITMAP) LoadImage((HINSTANCE) GetWindowLong(GWL_HINSTANCE), MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); + tempBm = (HBITMAP) LoadImage((HINSTANCE)GetWindowLongPtr(GWLP_HINSTANCE), MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); ImageList_AddMasked(hImageList, tempBm, 0xff00ff); DeleteObject(tempBm); toolbar.SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); @@ -42,7 +42,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl if (i % 2 == 1) wrapnow = TBSTATE_WRAP; - LoadString((HINSTANCE) GetWindowLong(GWL_HINSTANCE), IDS_TOOLTIP1 + i, tooltips[i], 30); + LoadString((HINSTANCE)GetWindowLongPtr(GWLP_HINSTANCE), IDS_TOOLTIP1 + i, tooltips[i], 30); ZeroMemory(&tbbutton, sizeof(TBBUTTON)); tbbutton.iString = (INT_PTR) tooltips[i]; tbbutton.fsStyle = TBSTYLE_CHECKGROUP; diff --git a/base/applications/network/telnet/src/tnmisc.cpp b/base/applications/network/telnet/src/tnmisc.cpp index abd30607e5..6c98739806 100644 --- a/base/applications/network/telnet/src/tnmisc.cpp +++ b/base/applications/network/telnet/src/tnmisc.cpp @@ -153,8 +153,8 @@ bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldS #else // load the icon from the resource file -crn(a)ozemail.com.au 16/12/98 if(!hIcon) { - hIcon = LoadIcon ((HANDLE)GetWindowLongPtr(hConsoleWindow, - GWL_HINSTANCE), "TELNETICON"); + hIcon = LoadIcon((HANDLE)GetWindowLongPtr(hConsoleWindow, + GWLP_HINSTANCE), "TELNETICON"); } #endif diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 014a23ec9c..c1213f97e0 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -45,14 +45,14 @@ MoreOptDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); SendMessage(GetDlgItem(hwndDlg, IDC_PATH), @@ -157,7 +157,7 @@ DriveDlgProc( #endif /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -165,7 +165,7 @@ DriveDlgProc( { /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); CreateListViewColumns(pSetupData->hInstance, GetDlgItem(hwndDlg, IDC_PARTITION)); diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index d5aa41ecac..14eb3dc7f7 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -92,14 +92,14 @@ StartDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); @@ -145,14 +145,14 @@ TypeDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Check the 'install' radio button */ CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED); @@ -213,14 +213,14 @@ DeviceDlgProc(HWND hwndDlg, HWND hList; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); hList = GetDlgItem(hwndDlg, IDC_COMPUTER); @@ -328,14 +328,14 @@ SummaryDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); break; case WM_NOTIFY: @@ -378,14 +378,14 @@ ProcessDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); break; case WM_NOTIFY: @@ -430,14 +430,14 @@ RestartDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Set title font */ /*SendDlgItemMessage(hwndDlg, diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index e6d9fe39ae..2d6ecf9a17 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -56,12 +56,12 @@ EditVariableDlgProc(HWND hwndDlg, DWORD dwNameLength; DWORD dwValueLength; - VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)lParam); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam); VarData = (PVARIABLE_DATA)lParam; if (VarData->lpName != NULL) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 9516c33756..2d89021d31 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -516,7 +516,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM } InitLogo(hwndDlg); - SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWL_WNDPROC, (LONG)RosImageProc); + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWLP_WNDPROC, (LONG_PTR)RosImageProc); GetSystemInformation(hwndDlg); break; diff --git a/dll/cpl/timedate/dateandtime.c b/dll/cpl/timedate/dateandtime.c index fbd1dc39f5..237f916f7a 100644 --- a/dll/cpl/timedate/dateandtime.c +++ b/dll/cpl/timedate/dateandtime.c @@ -293,7 +293,7 @@ DateTimePageProc(HWND hwndDlg, SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); - pOldWndProc = (WNDPROC) SetWindowLongPtrW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); + pOldWndProc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWLP_WNDPROC, (LONG_PTR)DTPProc); break; case WM_TIMER: diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index bafeaed22c..b5730fc092 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -42,7 +42,7 @@ NetworkSettingsPageDlgProc( LPNMHDR lpnm; /* Retrieve pointer to the global setup data */ - pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); if ((pNetworkSetupData != NULL) && (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) pSetupData = pNetworkSetupData->pSetupData; @@ -52,7 +52,7 @@ NetworkSettingsPageDlgProc( case WM_INITDIALOG: /* Save pointer to the global setup data */ pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pNetworkSetupData); pSetupData = pNetworkSetupData->pSetupData; /* Set the fonts of both the options to bold */ @@ -127,7 +127,7 @@ NetworkComponentPageDlgProc( LPNMHDR lpnm; /* Retrieve pointer to the global setup data */ - pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); if ((pNetworkSetupData != NULL) && (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) pSetupData = pNetworkSetupData->pSetupData; @@ -137,7 +137,7 @@ NetworkComponentPageDlgProc( case WM_INITDIALOG: /* Save pointer to the global setup data */ pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pNetworkSetupData); pSetupData = pNetworkSetupData->pSetupData; SetBoldText(hwndDlg, IDC_NETWORK_DEVICE, pSetupData); @@ -198,7 +198,7 @@ NetworkDomainPageDlgProc( LPNMHDR lpnm; /* Retrieve pointer to the global setup data */ - pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); if ((pNetworkSetupData != NULL) && (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) pSetupData = pNetworkSetupData->pSetupData; @@ -208,7 +208,7 @@ NetworkDomainPageDlgProc( case WM_INITDIALOG: /* Save pointer to the global setup data */ pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pNetworkSetupData); pSetupData = pNetworkSetupData->pSetupData; /* Set the workgroup option as the default */ @@ -237,7 +237,7 @@ NetworkDomainPageDlgProc( (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) HeapFree(GetProcessHeap(), 0, pNetworkSetupData); - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)NULL); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)NULL); } break; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index ada76502b3..7bc511b338 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -1402,10 +1402,10 @@ LRESULT CALLBACK CShellBrowser::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, { if (uMsg == WM_NCDESTROY) { - saveWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWL_WNDPROC)); + saveWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWLP_WNDPROC)); lResult = pThis->DefWindowProc(uMsg, wParam, lParam); - if (saveWindowProc == reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWL_WNDPROC))) - ::SetWindowLongPtr(hWnd, GWL_WNDPROC, (LONG_PTR)pThis->m_pfnSuperWindowProc); + if (saveWindowProc == reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWLP_WNDPROC))) + ::SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)pThis->m_pfnSuperWindowProc); pThis->m_dwState |= WINSTATE_DESTROYED; } else diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 8f91b324aa..1fc943bede 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -457,7 +457,7 @@ WelcomeDlgProc( UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -468,7 +468,7 @@ WelcomeDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); hwndControl = GetParent(hwndDlg); @@ -567,7 +567,7 @@ CHSourceDlgProc( PDEVINSTDATA DevInstData; /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -578,7 +578,7 @@ CHSourceDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); hwndControl = GetParent(hwndDlg); @@ -716,7 +716,7 @@ SearchDrvDlgProc( DWORD dwThreadId; /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -727,7 +727,7 @@ SearchDrvDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); DevInstData->hDialog = hwndDlg; hwndControl = GetParent(hwndDlg); @@ -811,7 +811,7 @@ InstallDrvDlgProc( DWORD dwThreadId; /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -822,7 +822,7 @@ InstallDrvDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); DevInstData->hDialog = hwndDlg; hwndControl = GetParent(hwndDlg); @@ -924,7 +924,7 @@ NoDriverDlgProc( UNREFERENCED_PARAMETER(wParam); /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -934,7 +934,7 @@ NoDriverDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); @@ -1043,7 +1043,7 @@ InstallFailedDlgProc( UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -1053,7 +1053,7 @@ InstallFailedDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); @@ -1122,7 +1122,7 @@ NeedRebootDlgProc( UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -1132,7 +1132,7 @@ NeedRebootDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); @@ -1201,7 +1201,7 @@ FinishDlgProc( UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -1211,7 +1211,7 @@ FinishDlgProc( /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)DevInstData); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 6d3471e8d4..4177ac2d68 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -623,7 +623,7 @@ ImageView_InitControls(HWND hwnd) 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); SetClassLongPtr(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - PrevProc = (WNDPROC) SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM) ImageView_DispWndProc); + PrevProc = (WNDPROC) SetWindowLongPtr(hDispWnd, GWLP_WNDPROC, (LPARAM) ImageView_DispWndProc); ImageView_CreateToolBar(hwnd); } @@ -794,7 +794,7 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { ImageView_SaveSettings(hwnd); - SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc); + SetWindowLongPtr(hDispWnd, GWLP_WNDPROC, (LPARAM) PrevProc); PostQuitMessage(0); break; } diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 9ef4fd755b..a4af15c792 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -943,7 +943,7 @@ LocalePageDlgProc(HWND hwndDlg, PSETUPDATA SetupData; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -951,7 +951,7 @@ LocalePageDlgProc(HWND hwndDlg, { /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); WriteUserLocale(); SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT)); @@ -1529,14 +1529,14 @@ DateTimePageDlgProc(HWND hwndDlg, PSETUPDATA SetupData; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); CreateTimeZoneList(SetupData); @@ -1616,7 +1616,7 @@ ThemePageDlgProc(HWND hwndDlg, PSETUPDATA SetupData; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -1626,7 +1626,7 @@ ThemePageDlgProc(HWND hwndDlg, /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, 0x00FF00FF, IMAGE_BITMAP, LR_CREATEDIBSECTION); SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); @@ -1963,7 +1963,7 @@ ProcessPageDlgProc(HWND hwndDlg, WCHAR Title[64]; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -1971,7 +1971,7 @@ ProcessPageDlgProc(HWND hwndDlg, { /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); } break; diff --git a/modules/rosapps/applications/screensavers/ssstars/settings.c b/modules/rosapps/applications/screensavers/ssstars/settings.c index d470dafe54..97b5addc7a 100644 --- a/modules/rosapps/applications/screensavers/ssstars/settings.c +++ b/modules/rosapps/applications/screensavers/ssstars/settings.c @@ -176,7 +176,7 @@ static void SetupControls(HWND hWnd) SIZE sizeStarfield; BITMAP bm; - hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); SendDlgItemMessage(hWnd, IDC_SLIDER_NUM_OF_STARS, TBM_SETRANGE, FALSE, MAKELPARAM(MIN_STARS, MAX_STARS)); @@ -273,7 +273,7 @@ static BOOL OnCommandAbout(HWND hWnd) TCHAR szAuthor[256]; TCHAR szLicense[1024]; - hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_STARFIELD)); diff --git a/modules/rosapps/applications/screensavers/ssstars/ssstars.c b/modules/rosapps/applications/screensavers/ssstars/ssstars.c index e92ea5d7ed..1b5388bf88 100644 --- a/modules/rosapps/applications/screensavers/ssstars/ssstars.c +++ b/modules/rosapps/applications/screensavers/ssstars/ssstars.c @@ -100,7 +100,7 @@ static HBITMAP CreateStarBitmap(HWND hWnd, HDC hDC) HINSTANCE hInstance; // Get instance for loading the texture - hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); // Load the texture hFileBmp = (HBITMAP) diff --git a/modules/rosapps/lib/vfdlib/vfdguisave.c b/modules/rosapps/lib/vfdlib/vfdguisave.c index ffaf4e329f..0a9aa3ae02 100644 --- a/modules/rosapps/lib/vfdlib/vfdguisave.c +++ b/modules/rosapps/lib/vfdlib/vfdguisave.c @@ -187,7 +187,7 @@ void OnInit( { // Store parameters - SetWindowLong(hDlg, GWL_USERDATA, (ULONG)pParam); + SetWindowLongPtr(hDlg, GWLP_USERDATA, (ULONG_PTR)pParam); // clear the target existence flag @@ -285,7 +285,7 @@ void OnTarget( // // get the current image info // - param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); + param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); if (_stricmp(param->ImageName, buf) == 0) { @@ -461,7 +461,7 @@ DWORD OnOK( BOOL truncate; DWORD ret; - param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); + param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); if (!param) { return ERROR_INVALID_FUNCTION; diff --git a/modules/rosapps/lib/vfdlib/vfdguitip.c b/modules/rosapps/lib/vfdlib/vfdguitip.c index a8bbb8586e..c3fcc3a769 100644 --- a/modules/rosapps/lib/vfdlib/vfdguitip.c +++ b/modules/rosapps/lib/vfdlib/vfdguitip.c @@ -41,8 +41,8 @@ static LRESULT CALLBACK ToolTipProc( switch (uMsg) { case WM_CREATE: // Store Font handle - SetWindowLong(hWnd, GWL_USERDATA, - (LONG)((LPCREATESTRUCT)lParam)->lpCreateParams); + SetWindowLongPtr(hWnd, GWLP_USERDATA, + (LONG_PTR)((LPCREATESTRUCT)lParam)->lpCreateParams); return 0; case WM_PAINT: @@ -56,7 +56,7 @@ static LRESULT CALLBACK ToolTipProc( RECT rc; - SelectObject(hDC, (HFONT)GetWindowLong(hWnd, GWL_USERDATA)); + SelectObject(hDC, (HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); SetTextColor(hDC, GetSysColor(COLOR_INFOTEXT)); SetBkMode(hDC, TRANSPARENT); @@ -121,7 +121,7 @@ static LRESULT CALLBACK ToolTipProc( case WM_DESTROY: // delete font - DeleteObject((HFONT)GetWindowLong(hWnd, GWL_USERDATA)); + DeleteObject((HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); return 0; } diff --git a/modules/rosapps/templates/mdi/childwnd.c b/modules/rosapps/templates/mdi/childwnd.c index 9adea23c6a..3fb05deaa3 100644 --- a/modules/rosapps/templates/mdi/childwnd.c +++ b/modules/rosapps/templates/mdi/childwnd.c @@ -101,7 +101,7 @@ static void OnSize(ChildWnd* pChildWnd, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static int last_split; - ChildWnd* pChildWnd = (ChildWnd*)GetWindowLong(hWnd, GWL_USERDATA); + ChildWnd* pChildWnd = (ChildWnd*)GetWindowLongPtr(hWnd, GWLP_USERDATA); ASSERT(pChildWnd); switch(message) { @@ -121,7 +121,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa return 0; case WM_NCDESTROY: - // SetWindowLong(hWnd, GWL_USERDATA, 0); + // SetWindowLongPtr(hWnd, GWLP_USERDATA, 0); break; case WM_SETCURSOR: diff --git a/modules/rosapps/templates/mdi/framewnd.c b/modules/rosapps/templates/mdi/framewnd.c index 90aeee204d..ef4e5d0d46 100644 --- a/modules/rosapps/templates/mdi/framewnd.c +++ b/modules/rosapps/templates/mdi/framewnd.c @@ -95,7 +95,7 @@ LRESULT CALLBACK CBTProc(int code, WPARAM wParam, LPARAM lParam) ChildWnd* pChildWnd = newchild; newchild = NULL; pChildWnd->hWnd = (HWND)wParam; - SetWindowLong(pChildWnd->hWnd, GWL_USERDATA, (LPARAM)pChildWnd); + SetWindowLongPtr(pChildWnd->hWnd, GWLP_USERDATA, (LPARAM)pChildWnd); } return CallNextHookEx(hcbthook, code, wParam, lParam); } diff --git a/modules/rosapps/templates/mdi/panelwnd.c b/modules/rosapps/templates/mdi/panelwnd.c index 2872061345..2cb889736e 100644 --- a/modules/rosapps/templates/mdi/panelwnd.c +++ b/modules/rosapps/templates/mdi/panelwnd.c @@ -82,7 +82,7 @@ static void OnPaint(HWND hWnd, ChildWnd* pChildWnd) LRESULT CALLBACK PanelWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { // Pane* pane; -// ChildWnd* pChildWnd = (ChildWnd*)GetWindowLong(hWnd, GWL_USERDATA); +// ChildWnd* pChildWnd = (ChildWnd*)GetWindowLongPtr(hWnd, GWLP_USERDATA); // ChildWnd* new_child; // ASSERT(pChildWnd); diff --git a/modules/rostests/tests/button2/buttontst2.c b/modules/rostests/tests/button2/buttontst2.c index 0564f7ec7b..af8775e806 100644 --- a/modules/rostests/tests/button2/buttontst2.c +++ b/modules/rostests/tests/button2/buttontst2.c @@ -58,109 +58,109 @@ WinMain(HINSTANCE hInstance, hbtn[0] = CreateWindow( "BUTTON","BS_DEFPUSHBUTTON",WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, - 10, 10, 200, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 10, 200, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[1] = CreateWindow( "BUTTON","BS_3STATE",WS_VISIBLE | WS_CHILD | BS_3STATE, - 10, 60, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 60, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[2] = CreateWindow( "BUTTON","BS_AUTO3STATE",WS_VISIBLE | WS_CHILD | BS_AUTO3STATE, - 10, 90, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 90, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[3] = CreateWindow( "BUTTON","BS_AUTOCHECKBOX",WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX, - 10, 120, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 120, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[4] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON, - 10, 150, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 150, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[5] = CreateWindow( "BUTTON","BS_CHECKBOX",WS_VISIBLE | WS_CHILD | BS_CHECKBOX, - 10, 180, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 180, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[6] = CreateWindow( "BUTTON","BS_GROUPBOX",WS_VISIBLE | WS_CHILD | BS_GROUPBOX, - 10, 210, 200, 80, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 210, 200, 80, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[7] = CreateWindow( "BUTTON","BS_PUSHBUTTON",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON, - 20, 230, 180, 30, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 20, 230, 180, 30, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[8] = CreateWindow( "BUTTON","BS_RADIOBUTTON",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON, - 10, 300, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 300, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[9] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON, - 220, 160, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 220, 160, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[10] = CreateWindow( "BUTTON","BS_DEFPUSHBUTTON|BS_BOTTOM",WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON | BS_BOTTOM, - 220, 10, 250, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 220, 10, 250, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[11] = CreateWindow( "BUTTON","BS_DEFPUSHBUTTON|BS_LEFT",WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON | BS_LEFT, - 480, 10, 250, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 480, 10, 250, 40, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[12] = CreateWindow( "BUTTON","BS_DEFPUSHBUTTON|BS_RIGHT|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON | BS_RIGHT |BS_MULTILINE, - 740, 10, 150, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 740, 10, 150, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[13] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON|BS_TOP",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_TOP, - 220, 60, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 220, 60, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); // Other Combinations hbtn[14] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON|BS_BOTTOM|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_BOTTOM | BS_MULTILINE, - 480, 60, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 480, 60, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[15] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON|BS_LEFT",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_LEFT, - 740, 80, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 740, 80, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[16] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON|BS_RIGHT|BS_TOP",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_RIGHT | BS_TOP, - 220, 130, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 220, 130, 200, 20, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[17] = CreateWindow( "BUTTON","BS_AUTORADIOBUTTON|BS_TOP|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_TOP| BS_MULTILINE, - 480, 130, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 480, 130, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[18] = CreateWindow( "BUTTON","BS_AUTOCHECKBOX|BS_BOTTOM|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX | BS_BOTTOM | BS_MULTILINE, - 740, 130, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 740, 130, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[19] = CreateWindow( "BUTTON","BS_AUTOCHECKBOX|BS_TOP|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE, - 480, 190, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 480, 190, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[20] = CreateWindow( "BUTTON","BS_AUTOCHECKBOX|BS_LEFT|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX | BS_LEFT | BS_MULTILINE, - 220, 230, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 220, 230, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[21] = CreateWindow( "BUTTON","BS_AUTOCHECKBOX|BS_RIGHT|BS_MULTILINE",WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX | BS_RIGHT | BS_MULTILINE, - 480, 240, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 480, 240, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[22] = CreateWindow( "BUTTON","BS_GROUPBOX|BS_TOP",WS_VISIBLE | WS_CHILD | BS_GROUPBOX | BS_TOP, - 10, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[23] = CreateWindow( "BUTTON","BS_GROUPBOX|BS_BOTTOM",WS_VISIBLE | WS_CHILD | BS_GROUPBOX | BS_BOTTOM, - 10, 410, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 10, 410, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[24] = CreateWindow( "BUTTON","BS_GROUPBOXBOX|BS_LEFT",WS_VISIBLE | WS_CHILD | BS_GROUPBOX | BS_LEFT, - 520, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 520, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); hbtn[25] = CreateWindow( "BUTTON","BS_GROUPBOX|BS_RIGHT|BS_BOTTOM",WS_VISIBLE | WS_CHILD | BS_GROUPBOX | BS_BOTTOM | BS_RIGHT, - 300, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWL_HINSTANCE),NULL); + 300, 340, 200, 60, hWnd, NULL, (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE),NULL); while(GetMessage(&msg, NULL, 0, 0)) { diff --git a/modules/rostests/tests/subclass/subclass.c b/modules/rostests/tests/subclass/subclass.c index 8504dd294a..5c1640c08c 100644 --- a/modules/rostests/tests/subclass/subclass.c +++ b/modules/rostests/tests/subclass/subclass.c @@ -74,17 +74,17 @@ WinMain(HINSTANCE hInstance, printf("GetWindowTextA returned Ansi string \"%s\"\n", WindowTextA); printf("\n"); - SavedWndProcW = (WNDPROC) GetWindowLongW(hWnd, GWL_WNDPROC); + SavedWndProcW = (WNDPROC) GetWindowLongPtrW(hWnd, GWLP_WNDPROC); printf("GetWindowLongW returned 0x%p\n", SavedWndProcW); - SavedWndProcA = (WNDPROC) GetWindowLongA(hWnd, GWL_WNDPROC); + SavedWndProcA = (WNDPROC) GetWindowLongPtrA(hWnd, GWLP_WNDPROC); printf("GetWindowLongA returned 0x%p\n", SavedWndProcA); printf("\n"); printf("Subclassing window using SetWindowLongW, new WndProc 0x%p\n", UnicodeSubclassProc); - SetWindowLongW(hWnd, GWL_WNDPROC, (LONG) UnicodeSubclassProc); + SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR) UnicodeSubclassProc); printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", - IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), - GetWindowLongW(hWnd, GWL_WNDPROC)); + IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongPtrA(hWnd, GWLP_WNDPROC), + GetWindowLongPtrW(hWnd, GWLP_WNDPROC)); printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) @@ -96,10 +96,10 @@ WinMain(HINSTANCE hInstance, printf("\n"); printf("Subclassing window using SetWindowLongA, new WndProc 0x%p\n", AnsiSubclassProc); - SetWindowLongA(hWnd, GWL_WNDPROC, (LONG) AnsiSubclassProc); + SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR) AnsiSubclassProc); printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", - IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), - GetWindowLongW(hWnd, GWL_WNDPROC)); + IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongPtrA(hWnd, GWLP_WNDPROC), + GetWindowLongPtrW(hWnd, GWLP_WNDPROC)); printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) diff --git a/modules/rostests/win32/user32/kbdlayout/kbdlayout.c b/modules/rostests/win32/user32/kbdlayout/kbdlayout.c index ade01ba195..b8fd1800c2 100644 --- a/modules/rostests/win32/user32/kbdlayout/kbdlayout.c +++ b/modules/rostests/win32/user32/kbdlayout/kbdlayout.c @@ -122,7 +122,7 @@ void FormatBox(HWND hWnd, DWORD Flags, WCHAR *Caption, WCHAR *Format, ...) LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - WND_DATA *data = (WND_DATA*)GetWindowLongPtr(hwnd, GWL_USERDATA); + WND_DATA *data = (WND_DATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); if(uMsg == WM_INPUTLANGCHANGE) { @@ -143,9 +143,9 @@ LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP void SubclassWnd(HWND hWnd, WCHAR* Name) { WND_DATA *data = HeapAlloc(GetProcessHeap(), 0, sizeof(WND_DATA)); - data->OrigProc = (WNDPROC)SetWindowLongPtr( hWnd, GWL_WNDPROC, (LONG_PTR)WndSubclassProc); + data->OrigProc = (WNDPROC)SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)WndSubclassProc); wcsncpy(data->WndName, Name, 25); - SetWindowLongPtr(hWnd, GWL_USERDATA, (LONG_PTR)data); + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)data); return; } diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index fa7a0f5d82..530da54970 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -285,7 +285,7 @@ #define GetWindowExStyle(hwnd) ((DWORD)GetWindowLong(hwnd,GWL_EXSTYLE)) #define GetWindowFont(hwnd) FORWARD_WM_GETFONT((hwnd),SendMessage) #define GetWindowID(hwnd) GetDlgCtrlID(hwnd) -#define GetWindowInstance(hwnd) ((HMODULE)GetWindowLong(hwnd,GWL_HINSTANCE)) +#define GetWindowInstance(hwnd) ((HMODULE)GetWindowLongPtr(hwnd,GWLP_HINSTANCE)) #define GetWindowOwner(hwnd) GetWindow(hwnd,GW_OWNER) #define GetWindowStyle(hwnd) ((DWORD)GetWindowLong(hwnd,GWL_STYLE)) #define GlobalAllocPtr(flags,cb) (GlobalLock(GlobalAlloc((flags),(cb)))) @@ -494,8 +494,8 @@ #define Static_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl) #define Static_SetIcon(hwndCtl,hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl),STM_SETICON,(WPARAM)(HICON)(hIcon),0)) #define Static_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz)) -#define SubclassDialog(hwndDlg,lpfn) ((DLGPROC)SetWindowLong(hwndDlg,DWL_DLGPROC,(LPARAM)(DLGPROC)(lpfn))) -#define SubclassWindow(hwnd,lpfn) ((WNDPROC)SetWindowLong((hwnd),GWL_WNDPROC,(LPARAM)(WNDPROC)(lpfn))) +#define SubclassDialog(hwndDlg,lpfn) ((DLGPROC)SetWindowLongPtr(hwndDlg,DWLP_DLGPROC,(LPARAM)(DLGPROC)(lpfn))) +#define SubclassWindow(hwnd,lpfn) ((WNDPROC)SetWindowLongPtr((hwnd),GWLP_WNDPROC,(LPARAM)(WNDPROC)(lpfn))) #define SubtractRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_DIFF) #define UnionRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_OR) #define XorRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_XOR)

6 years, 10 months

01/02: [WIN32K] Implement NtUserSetWindowLongPtr for 64 bit builds Also fix return type of NtUserQueryWindow and type of WND::dwUserData and the value for bAnsi in SetWindowLongPtrA

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173971d947635026d1d0e… commit 173971d947635026d1d0ee9cf1db7b7847ad9a36 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Dec 29 10:46:19 2017 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Feb 19 22:36:36 2018 +0100 [WIN32K] Implement NtUserSetWindowLongPtr for 64 bit builds Also fix return type of NtUserQueryWindow and type of WND::dwUserData and the value for bAnsi in SetWindowLongPtrA --- win32ss/include/ntuser.h | 14 +++- win32ss/user/ntuser/window.c | 134 +++++++++++++++++++++++++----------- win32ss/user/ntuser/window.h | 1 + win32ss/user/user32/windows/class.c | 4 +- win32ss/w32ksvc.h | 3 + 5 files changed, 111 insertions(+), 45 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 0195b08d8d..d3661fb779 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -702,7 +702,7 @@ typedef struct _WND ULONG cbwndExtra; struct _WND *spwndLastActive; HIMC hImc; // Input context associated with this window. - LONG dwUserData; + LONG_PTR dwUserData; PVOID pActCtx; //PD3DMATRIX pTransForm; struct _WND *spwndClipboardListener; @@ -2801,7 +2801,7 @@ NtUserQueryUserCounters( #define QUERY_WINDOW_REAL_ID 0x05 #define QUERY_WINDOW_FOREGROUND 0x06 -DWORD +DWORD_PTR NTAPI NtUserQueryWindow( HWND hWnd, @@ -3235,6 +3235,16 @@ NtUserSetWindowLong( LONG NewValue, BOOL Ansi); +#ifdef _WIN64 +LONG_PTR +NTAPI +NtUserSetWindowLongPtr( + HWND hWnd, + DWORD Index, + LONG_PTR NewValue, + BOOL Ansi); +#endif // _WIN64 + BOOL NTAPI NtUserSetWindowPlacement( diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 9c7627cece..b52e3dcfe9 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3566,12 +3566,12 @@ IntCheckFrameEdge(ULONG Style, ULONG ExStyle) return FALSE; } -static LONG -co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) +static LONG_PTR +co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULONG Size, BOOL bAlter) { PWND Window, Parent; PWINSTATION_OBJECT WindowStation; - LONG OldValue; + LONG_PTR OldValue; STYLESTRUCT Style; if (!(Window = UserGetWindowObject(hWnd))) @@ -3581,29 +3581,53 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte if ((INT)Index >= 0) { - if ((Index + sizeof(LONG)) > Window->cbwndExtra) + if ((Index + Size) > Window->cbwndExtra) { EngSetLastError(ERROR_INVALID_INDEX); return( 0); } - OldValue = *((LONG *)((PCHAR)(Window + 1) + Index)); -/* - if ( Index == DWLP_DLGPROC && Wnd->state & WNDS_DIALOGWINDOW) +#ifdef _WIN64 + if (Size == sizeof(LONG)) { - OldValue = (LONG)IntSetWindowProc( Wnd, - (WNDPROC)NewValue, - Ansi); - if (!OldValue) return 0; + OldValue = *((LONG *)((PCHAR)(Window + 1) + Index)); + *((LONG*)((PCHAR)(Window + 1) + Index)) = (LONG)NewValue; } - */ - *((LONG *)((PCHAR)(Window + 1) + Index)) = NewValue; + else +#endif + { + OldValue = *((LONG_PTR *)((PCHAR)(Window + 1) + Index)); + /* + if ( Index == DWLP_DLGPROC && Wnd->state & WNDS_DIALOGWINDOW) + { + OldValue = (LONG_PTR)IntSetWindowProc( Wnd, (WNDPROC)NewValue, Ansi); + if (!OldValue) return 0; + } + */ + *((LONG_PTR*)((PCHAR)(Window + 1) + Index)) = NewValue; + } + } else { +#ifdef _WIN64 + if (Size == sizeof(LONG)) + { + if ((Index != GWL_STYLE) && + (Index != GWL_EXSTYLE) && + (Index != GWL_ID) && + (Index != GWL_USERDATA)) + { + ERR("NtUserSetWindowLong(): Index requires pointer size: %lu\n", Index); + EngSetLastError(ERROR_INVALID_INDEX); + return 0; + } + } +#endif + switch (Index) { - case GWL_EXSTYLE: + case GWL_EXSTYLE: // LONG OldValue = (LONG) Window->ExStyle; Style.styleOld = OldValue; Style.styleNew = NewValue; @@ -3635,7 +3659,7 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); break; - case GWL_STYLE: + case GWL_STYLE: // LONG OldValue = (LONG) Window->style; Style.styleOld = OldValue; Style.styleNew = NewValue; @@ -3689,7 +3713,7 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); break; - case GWL_WNDPROC: + case GWLP_WNDPROC: // LONG_PTR { if ( Window->head.pti->ppi != PsGetCurrentProcessWin32Process() || Window->fnid & FNID_FREED) @@ -3697,31 +3721,31 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte EngSetLastError(ERROR_ACCESS_DENIED); return( 0); } - OldValue = (LONG)IntSetWindowProc(Window, - (WNDPROC)NewValue, - Ansi); + OldValue = (LONG_PTR)IntSetWindowProc(Window, + (WNDPROC)NewValue, + Ansi); break; } - case GWL_HINSTANCE: - OldValue = (LONG) Window->hModule; + case GWLP_HINSTANCE: // LONG_PTR + OldValue = (LONG_PTR) Window->hModule; Window->hModule = (HINSTANCE) NewValue; break; - case GWL_HWNDPARENT: + case GWLP_HWNDPARENT: // LONG_PTR Parent = Window->spwndParent; if (Parent && (Parent->head.h == IntGetDesktopWindow())) - OldValue = (LONG) IntSetOwner(Window->head.h, (HWND) NewValue); + OldValue = (LONG_PTR) IntSetOwner(Window->head.h, (HWND) NewValue); else - OldValue = (LONG) co_UserSetParent(Window->head.h, (HWND) NewValue); + OldValue = (LONG_PTR) co_UserSetParent(Window->head.h, (HWND) NewValue); break; - case GWL_ID: + case GWLP_ID: // LONG OldValue = (LONG) Window->IDMenu; Window->IDMenu = (UINT) NewValue; break; - case GWL_USERDATA: + case GWLP_USERDATA: // LONG or LONG_PTR OldValue = Window->dwUserData; Window->dwUserData = NewValue; break; @@ -3737,11 +3761,16 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte return( OldValue); } - LONG FASTCALL co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { - return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + return (LONG)co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG), FALSE); +} + +LONG_PTR FASTCALL +co_UserSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi) +{ + return co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG_PTR), FALSE); } /* @@ -3769,13 +3798,36 @@ NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) return 0; } - ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + ret = (LONG)co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG), FALSE); UserLeave(); return ret; } +#ifdef _WIN64 +LONG_PTR APIENTRY +NtUserSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi) +{ + LONG_PTR ret; + + UserEnterExclusive(); + + if (hWnd == IntGetDesktopWindow()) + { + EngSetLastError(STATUS_ACCESS_DENIED); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG_PTR), FALSE); + + UserLeave(); + + return ret; +} +#endif // _WIN64 + DWORD APIENTRY NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) { @@ -3790,7 +3842,7 @@ NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) return 0; } - ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); + ret = co_IntSetWindowLongPtr(hWnd, Index, NewValue, FALSE, sizeof(LONG), TRUE); UserLeave(); @@ -3876,7 +3928,7 @@ CLEANUP: /* * @implemented */ -DWORD APIENTRY +DWORD_PTR APIENTRY NtUserQueryWindow(HWND hWnd, DWORD Index) { /* Console Leader Process CID Window offsets */ @@ -3884,7 +3936,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) #define GWLP_CONSOLE_LEADER_TID 4 PWND pWnd; - DWORD Result; + DWORD_PTR Result; DECLARE_RETURN(UINT); TRACE("Enter NtUserQueryWindow\n"); @@ -3903,11 +3955,11 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_PID) - Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_PID))); + Result = (DWORD_PTR)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_PID))); } else { - Result = (DWORD)IntGetWndProcessId(pWnd); + Result = (DWORD_PTR)IntGetWndProcessId(pWnd); } break; } @@ -3918,29 +3970,29 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_TID) - Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_TID))); + Result = (DWORD_PTR)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_TID))); } else { - Result = (DWORD)IntGetWndThreadId(pWnd); + Result = (DWORD_PTR)IntGetWndThreadId(pWnd); } break; } case QUERY_WINDOW_ACTIVE: - Result = (DWORD)(pWnd->head.pti->MessageQueue->spwndActive ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndActive) : 0); + Result = (DWORD_PTR)(pWnd->head.pti->MessageQueue->spwndActive ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndActive) : 0); break; case QUERY_WINDOW_FOCUS: - Result = (DWORD)(pWnd->head.pti->MessageQueue->spwndFocus ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndFocus) : 0); + Result = (DWORD_PTR)(pWnd->head.pti->MessageQueue->spwndFocus ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndFocus) : 0); break; case QUERY_WINDOW_ISHUNG: - Result = (DWORD)MsqIsHung(pWnd->head.pti); + Result = (DWORD_PTR)MsqIsHung(pWnd->head.pti); break; case QUERY_WINDOW_REAL_ID: - Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; + Result = (DWORD_PTR)pWnd->head.pti->pEThread->Cid.UniqueProcess; break; case QUERY_WINDOW_FOREGROUND: @@ -3948,7 +4000,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) break; default: - Result = (DWORD)NULL; + Result = 0; break; } diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 47f5533f14..6c811914af 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -69,6 +69,7 @@ ULONG FASTCALL IntSetStyle(PWND,ULONG,ULONG); PWND FASTCALL VerifyWnd(PWND); PWND FASTCALL IntGetNonChildAncestor(PWND); LONG FASTCALL co_UserSetWindowLong(HWND,DWORD,LONG,BOOL); +LONG_PTR FASTCALL co_UserSetWindowLongPtr(HWND, DWORD, LONG_PTR, BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index cf9d88dbbb..b7451639ba 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1841,7 +1841,7 @@ SetWindowLongPtrA(HWND hWnd, INT nIndex, LONG_PTR dwNewLong) { - return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); + return NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, TRUE); } /* @@ -1853,7 +1853,7 @@ SetWindowLongPtrW(HWND hWnd, INT nIndex, LONG_PTR dwNewLong) { - return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); + return NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, FALSE); } #endif diff --git a/win32ss/w32ksvc.h b/win32ss/w32ksvc.h index 1e50b3181f..b10dde4b71 100644 --- a/win32ss/w32ksvc.h +++ b/win32ss/w32ksvc.h @@ -544,6 +544,9 @@ SVC_(UserSetTimer, 4) SVC_(UserSetWindowFNID, 2) SVC_(UserSetWindowLong, 4) +#ifdef _WIN64 + SVC_(UserSetWindowLongPtr, 4) +#endif // _WIN64 SVC_(UserSetWindowPlacement, 2) SVC_(UserSetWindowPos, 7) SVC_(UserSetWindowRgn, 3)

6 years, 10 months

01/01: [RTL][XDK][KERNERL32_WINETEST] Import wine actctx changes from 3.2-37c98396 This adds support for reading the trustInfo (requestedExecutionLevel), and the compatibility (supportedOs) sections.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee7f479c57623dffcf925… commit ee7f479c57623dffcf92507380a16d7b0a51dbb5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Feb 19 22:23:39 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 19 22:23:39 2018 +0100 [RTL][XDK][KERNERL32_WINETEST] Import wine actctx changes from 3.2-37c98396 This adds support for reading the trustInfo (requestedExecutionLevel), and the compatibility (supportedOs) sections. --- dll/win32/kernel32/client/actctx.c | 2 + modules/rostests/winetests/kernel32/actctx.c | 303 +++++++++++++++++++++--- sdk/include/xdk/winnt_old.h | 16 ++ sdk/lib/rtl/actctx.c | 337 +++++++++++++++++++++++++-- 4 files changed, 610 insertions(+), 48 deletions(-) diff --git a/dll/win32/kernel32/client/actctx.c b/dll/win32/kernel32/client/actctx.c index f268e2731a..302d6c86a3 100644 --- a/dll/win32/kernel32/client/actctx.c +++ b/dll/win32/kernel32/client/actctx.c @@ -374,6 +374,8 @@ QueryActCtxW(IN DWORD dwFlags, { case ActivationContextBasicInformation: case ActivationContextDetailedInformation: + case CompatibilityInformationInActivationContext: + case RunlevelInformationInActivationContext: /* Nothing to check */ break; diff --git a/modules/rostests/winetests/kernel32/actctx.c b/modules/rostests/winetests/kernel32/actctx.c index 5a41c40218..8bd37c43f3 100644 --- a/modules/rostests/winetests/kernel32/actctx.c +++ b/modules/rostests/winetests/kernel32/actctx.c @@ -395,6 +395,57 @@ static const char wrong_depmanifest1[] = "<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"" ARCH "\" />" "</assembly>"; +static const char compat_manifest_no_supportedOs[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" +" <application>" +" </application>" +" </compatibility>" +"</assembly>"; + +static const char compat_manifest_vista[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" +" <application>" +" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" />" /* Windows Vista */ +" </application>" +" </compatibility>" +"</assembly>"; + +static const char compat_manifest_vista_7_8_10_81[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" +" <application>" +" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" />" /* Windows Vista */ +" <supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" />" /* Windows 7 */ +" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" />" /* Windows 8 */ +" <supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" />" /* Windows 10 */ +" <supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" />" /* Windows 8.1 */ +" </application>" +" </compatibility>" +"</assembly>"; + +static const char compat_manifest_other_guid[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" +" <application>" +" <supportedOS Id=\"{12345566-1111-2222-3333-444444444444}\" />" +" </application>" +" </compatibility>" +"</assembly>"; + +DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); +DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); +DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); +DEFINE_GUID(WIN81_COMPAT_GUID, 0x1f676c76, 0x80e1, 0x4239, 0x95, 0xbb, 0x83, 0xd0, 0xf6, 0xd0, 0xda, 0x78); +DEFINE_GUID(WIN10_COMPAT_GUID, 0x8e0f7a12, 0xbfb3, 0x4fe8, 0xb9, 0xa5, 0x48, 0xfd, 0x50, 0xa1, 0x5a, 0x9a); +DEFINE_GUID(OTHER_COMPAT_GUID, 0x12345566, 0x1111, 0x2222, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44); + + static const WCHAR testlib_dll[] = {'t','e','s','t','l','i','b','.','d','l','l',0}; static const WCHAR testlib2_dll[] = @@ -894,7 +945,7 @@ static HANDLE test_create(const char *file) return handle; } -static void test_create_and_fail(const char *manifest, const char *depmanifest, int todo) +static void test_create_and_fail(const char *manifest, const char *depmanifest, int todo, BOOL is_broken) { ACTCTXW actctx; HANDLE handle; @@ -909,8 +960,14 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, handle = pCreateActCtxW(&actctx); todo_wine_if(todo) { - ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); - ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); + if (is_broken) + ok(broken(handle != INVALID_HANDLE_VALUE) || handle == INVALID_HANDLE_VALUE, + "Unexpected context handle %p.\n", handle); + else + ok(handle == INVALID_HANDLE_VALUE, "Unexpected context handle %p.\n", handle); + + if (handle == INVALID_HANDLE_VALUE) + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "Unexpected error %d.\n", GetLastError()); } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx( handle ); DeleteFileA("bad.manifest"); @@ -953,31 +1010,31 @@ static void test_create_fail(void) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError == %u\n", GetLastError()); trace("wrong_manifest1\n"); - test_create_and_fail(wrong_manifest1, NULL, 0 ); + test_create_and_fail(wrong_manifest1, NULL, 0, FALSE); trace("wrong_manifest2\n"); - test_create_and_fail(wrong_manifest2, NULL, 0 ); + test_create_and_fail(wrong_manifest2, NULL, 0, FALSE); trace("wrong_manifest3\n"); - test_create_and_fail(wrong_manifest3, NULL, 1 ); + test_create_and_fail(wrong_manifest3, NULL, 1, FALSE); trace("wrong_manifest4\n"); - test_create_and_fail(wrong_manifest4, NULL, 1 ); + test_create_and_fail(wrong_manifest4, NULL, 1, FALSE); trace("wrong_manifest5\n"); - test_create_and_fail(wrong_manifest5, NULL, 0 ); + test_create_and_fail(wrong_manifest5, NULL, 0, FALSE); trace("wrong_manifest6\n"); - test_create_and_fail(wrong_manifest6, NULL, 0 ); + test_create_and_fail(wrong_manifest6, NULL, 0, FALSE); trace("wrong_manifest7\n"); - test_create_and_fail(wrong_manifest7, NULL, 1 ); + test_create_and_fail(wrong_manifest7, NULL, 1, FALSE); trace("wrong_manifest8\n"); - test_create_and_fail(wrong_manifest8, NULL, 0 ); + test_create_and_fail(wrong_manifest8, NULL, 0, FALSE); trace("wrong_manifest9\n"); - test_create_and_fail(wrong_manifest9, NULL, 0 ); + test_create_and_fail(wrong_manifest9, NULL, 0, TRUE /* WinXP */); trace("wrong_manifest10\n"); - test_create_and_fail(wrong_manifest10, NULL, 0 ); + test_create_and_fail(wrong_manifest10, NULL, 0, TRUE /* WinXP */); trace("UTF-16 manifest1 without BOM\n"); test_create_wide_and_fail(manifest1, FALSE ); trace("manifest2\n"); - test_create_and_fail(manifest2, NULL, 0 ); + test_create_and_fail(manifest2, NULL, 0, FALSE); trace("manifest2+depmanifest1\n"); - test_create_and_fail(manifest2, wrong_depmanifest1, 0 ); + test_create_and_fail(manifest2, wrong_depmanifest1, 0, FALSE); } struct strsection_header @@ -1909,8 +1966,6 @@ static void test_actctx(void) HANDLE handle; BOOL b; - test_create_fail(); - trace("default actctx\n"); b = pGetCurrentActCtx(&handle); @@ -2095,7 +2150,8 @@ static void test_actctx(void) if(create_manifest_file("test6.manifest", manifest6, -1, NULL, NULL)) { handle = test_create("test6.manifest"); - ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* WinXP */, + "Unexpected context handle %p.\n", handle); DeleteFileA("test6.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) @@ -2267,7 +2323,7 @@ static HANDLE create_manifest(const char *filename, const char *data, int line) return handle; } -static void kernel32_find(ULONG section, const char *string_to_find, BOOL should_find, int line) +static void kernel32_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line) { UNICODE_STRING string_to_findW; ACTCTX_SECTION_KEYED_DATA data; @@ -2284,6 +2340,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); + todo_wine_if(todo) ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), "FindActCtxSectionStringA: unexpected error %u\n", err); @@ -2295,6 +2352,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); + todo_wine_if(todo) ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), "FindActCtxSectionStringW: unexpected error %u\n", err); @@ -2317,7 +2375,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should pRtlFreeUnicodeString(&string_to_findW); } -static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_find, int line) +static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line) { UNICODE_STRING string_to_findW; ACTCTX_SECTION_KEYED_DATA data; @@ -2329,10 +2387,12 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi data.cbSize = sizeof(data); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data); + todo_wine_if(todo) ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); + todo_wine_if(todo) ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); @@ -2350,22 +2410,22 @@ static void test_findsectionstring(void) ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); /* first we show the parameter validation from kernel32 */ - kernel32_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, __LINE__); - kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__); /* then we show that ntdll plays by different rules */ - ntdll_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, __LINE__); - ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__); ret = pDeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); @@ -2683,6 +2743,179 @@ todo_wine pReleaseActCtx(handle); } +/* Test structure to verify alignment */ +typedef struct _test_act_ctx_compat_info { + DWORD ElementCount; + COMPATIBILITY_CONTEXT_ELEMENT Elements[10]; +} test_act_ctx_compat_info; + +static void test_no_compat(HANDLE handle, int line) +{ + test_act_ctx_compat_info compat_info; + SIZE_T size; + BOOL b; + + memset(&compat_info, 0, sizeof(compat_info)); + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, + CompatibilityInformationInActivationContext, &compat_info, + sizeof(compat_info), &size); + + ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); + ok_(__FILE__, line)(size == sizeof(DWORD), "size mismatch (got %lu, expected 4)\n", size); + ok_(__FILE__, line)(compat_info.ElementCount == 0, "unexpected ElementCount %u\n", compat_info.ElementCount); +} + +static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expected_compat[], int line) +{ + test_act_ctx_compat_info compat_info; + SIZE_T size; + SIZE_T expected = sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * num_compat + sizeof(DWORD); + DWORD n; + BOOL b; + + memset(&compat_info, 0, sizeof(compat_info)); + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, + CompatibilityInformationInActivationContext, &compat_info, + sizeof(compat_info), &size); + + ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); + ok_(__FILE__, line)(size == expected, "size mismatch (got %lu, expected %lu)\n", size, expected); + ok_(__FILE__, line)(compat_info.ElementCount == num_compat, "unexpected ElementCount %u\n", compat_info.ElementCount); + + for (n = 0; n < num_compat; ++n) + { + ok_(__FILE__, line)(IsEqualGUID(&compat_info.Elements[n].Id, expected_compat[n]), + "got wrong clsid %s, expected %s for %u\n", + wine_dbgstr_guid(&compat_info.Elements[n].Id), + wine_dbgstr_guid(expected_compat[n]), + n); + ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS, + "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); + } +} + +static void test_compatibility(void) +{ + HANDLE handle; + + /* No compat results returned */ + trace("manifest1\n"); + if(!create_manifest_file("test1.manifest", manifest1, -1, NULL, NULL)) + { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("test1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("test1.manifest"); + if(handle != INVALID_HANDLE_VALUE) + { + char buffer[sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 2 + sizeof(DWORD)]; + SIZE_T size; + BOOL b; + + memset(buffer, 0, sizeof(buffer)); + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, + CompatibilityInformationInActivationContext, buffer, + sizeof(buffer), &size); + + if (!b && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("CompatibilityInformationInActivationContext not supported.\n"); + pReleaseActCtx(handle); + return; + } + + test_basic_info(handle, __LINE__); + test_no_compat(handle, __LINE__); + pReleaseActCtx(handle); + } + + /* Still no compat results returned */ + trace("no_supportedOs\n"); + if(!create_manifest_file("no_supportedOs.manifest", compat_manifest_no_supportedOs, -1, NULL, NULL)) + { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("no_supportedOs.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("no_supportedOs.manifest"); + if(handle != INVALID_HANDLE_VALUE) + { + test_basic_info(handle, __LINE__); + test_no_compat(handle, __LINE__); + pReleaseActCtx(handle); + } + + /* Just one result returned */ + trace("manifest_vista\n"); + if(!create_manifest_file("manifest_vista.manifest", compat_manifest_vista, -1, NULL, NULL)) + { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("manifest_vista.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("manifest_vista.manifest"); + if(handle != INVALID_HANDLE_VALUE) + { + static const GUID* expect_manifest[] = + { + &VISTA_COMPAT_GUID + }; + test_basic_info(handle, __LINE__); + test_with_compat(handle, 1, expect_manifest, __LINE__); + pReleaseActCtx(handle); + } + + /* Show that the order is retained */ + trace("manifest_vista_7_8_10_81\n"); + if(!create_manifest_file("manifest_vista_7_8_10_81.manifest", compat_manifest_vista_7_8_10_81, -1, NULL, NULL)) + { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("manifest_vista_7_8_10_81.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("manifest_vista_7_8_10_81.manifest"); + if(handle != INVALID_HANDLE_VALUE) + { + static const GUID* expect_manifest[] = + { + &VISTA_COMPAT_GUID, + &WIN7_COMPAT_GUID, + &WIN8_COMPAT_GUID, + &WIN10_COMPAT_GUID, + &WIN81_COMPAT_GUID, + }; + test_basic_info(handle, __LINE__); + test_with_compat(handle, 5, expect_manifest, __LINE__); + pReleaseActCtx(handle); + } + + /* Show that even unknown GUID's are stored */ + trace("manifest_other_guid\n"); + if(!create_manifest_file("manifest_other_guid.manifest", compat_manifest_other_guid, -1, NULL, NULL)) + { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("manifest_other_guid.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("manifest_other_guid.manifest"); + if(handle != INVALID_HANDLE_VALUE) + { + static const GUID* expect_manifest[] = + { + &OTHER_COMPAT_GUID, + }; + test_basic_info(handle, __LINE__); + test_with_compat(handle, 1, expect_manifest, __LINE__); + pReleaseActCtx(handle); + } +} + START_TEST(actctx) { int argc; @@ -2703,8 +2936,10 @@ START_TEST(actctx) } test_actctx(); + test_create_fail(); test_CreateActCtx(); test_findsectionstring(); test_ZombifyActCtx(); run_child_process(); + test_compatibility(); } diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 415f332a82..f03582ab88 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -3908,6 +3908,22 @@ typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { DWORD UiAccess; } ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; +typedef enum { + ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS +} ACTCTX_COMPATIBILITY_ELEMENT_TYPE; + +typedef struct _COMPATIBILITY_CONTEXT_ELEMENT { + GUID Id; + ACTCTX_COMPATIBILITY_ELEMENT_TYPE Type; +} COMPATIBILITY_CONTEXT_ELEMENT, *PCOMPATIBILITY_CONTEXT_ELEMENT; + +typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { + DWORD ElementCount; + COMPATIBILITY_CONTEXT_ELEMENT Elements[]; +} ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; + + #define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1 #define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE 2 #define ACTIVATION_CONTEXT_PATH_TYPE_URL 3 diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 396b442fcd..545f5fe1a1 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -12,7 +12,7 @@ * Samuel Serapi�n */ -/* Based on Wine Staging 1.7.37 */ +/* Based on Wine 3.2-37c98396 */ #include <rtl.h> #include <ntstrsafe.h> @@ -441,15 +441,19 @@ enum assembly_type struct assembly { - enum assembly_type type; - struct assembly_identity id; - struct file_info manifest; - WCHAR *directory; - BOOL no_inherit; - struct dll_redirect *dlls; - unsigned int num_dlls; - unsigned int allocated_dlls; - struct entity_array entities; + enum assembly_type type; + struct assembly_identity id; + struct file_info manifest; + WCHAR *directory; + BOOL no_inherit; + struct dll_redirect *dlls; + unsigned int num_dlls; + unsigned int allocated_dlls; + struct entity_array entities; + COMPATIBILITY_CONTEXT_ELEMENT *compat_contexts; + ULONG num_compat_contexts; + ACTCTX_REQUESTED_RUN_LEVEL run_level; + ULONG ui_access; }; enum context_sections @@ -652,6 +656,16 @@ static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; static const WCHAR supportsmultilevelundoW[] = {'s','u','p','p','o','r','t','s','m','u','l','t','i','l','e','v','e','l','u','n','d','o',0}; static const WCHAR wantstomenumergeW[] = {'w','a','n','t','s','t','o','m','e','n','u','m','e','r','g','e',0}; +static const WCHAR compatibilityW[] = {'c','o','m','p','a','t','i','b','i','l','i','t','y',0}; +static const WCHAR compatibilityNSW[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','c','o','m','p','a','t','i','b','i','l','i','t','y','.','v','1',0}; +static const WCHAR applicationW[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; +static const WCHAR supportedOSW[] = {'s','u','p','p','o','r','t','e','d','O','S',0}; +static const WCHAR IdW[] = {'I','d',0}; +static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e','d','E','x','e','c','u','t','i','o','n','L','e','v','e','l',0}; +static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; +static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; +static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; + struct olemisc_entry { const WCHAR *name; @@ -827,6 +841,25 @@ static struct dll_redirect* add_dll_redirect(struct assembly* assembly) return &assembly->dlls[assembly->num_dlls++]; } +static PCOMPATIBILITY_CONTEXT_ELEMENT add_compat_context(struct assembly* assembly) +{ + void *ptr; + if (assembly->num_compat_contexts) + { + unsigned int new_count = assembly->num_compat_contexts + 1; + ptr = RtlReAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + assembly->compat_contexts, + new_count * sizeof(COMPATIBILITY_CONTEXT_ELEMENT) ); + } + else + { + ptr = RtlAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(COMPATIBILITY_CONTEXT_ELEMENT) ); + } + if (!ptr) return NULL; + assembly->compat_contexts = ptr; + return &assembly->compat_contexts[assembly->num_compat_contexts++]; +} + static void free_assembly_identity(struct assembly_identity *ai) { RtlFreeHeap( RtlGetProcessHeap(), 0, ai->name ); @@ -1118,6 +1151,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) RtlFreeHeap( RtlGetProcessHeap(), 0, assembly->dlls ); RtlFreeHeap( RtlGetProcessHeap(), 0, assembly->manifest.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, assembly->directory ); + RtlFreeHeap( RtlGetProcessHeap(), 0, assembly->compat_contexts ); free_entity_array( &assembly->entities ); free_assembly_identity(&assembly->id); } @@ -2319,6 +2353,229 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl) +{ + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, applicationW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, supportedOSW)) + { + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + UNICODE_STRING str; + COMPATIBILITY_CONTEXT_ELEMENT* compat; + GUID compat_id; + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); + DPRINT1("Invalid guid %wZ\n", &attr_valueU); + } + } + else + { + UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); + UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + } + } + } + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, compatibilityW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, applicationW)) + { + ret = parse_compatibility_application_elem(xmlbuf, assembly, acl); + } + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; +} + +static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + static const WCHAR levelW[] = {'l','e','v','e','l',0}; + static const WCHAR asInvokerW[] = {'a','s','I','n','v','o','k','e','r',0}; + static const WCHAR requireAdministratorW[] = {'r','e','q','u','i','r','e','A','d','m','i','n','i','s','t','r','a','t','o','r',0}; + static const WCHAR highestAvailableW[] = {'h','i','g','h','e','s','t','A','v','a','i','l','a','b','l','e',0}; + static const WCHAR uiAccessW[] = {'u','i','A','c','c','e','s','s',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error; + + /* Multiple requestedExecutionLevel elements are not supported. */ + if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) + return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); + UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); + if (xmlstr_cmp(&attr_name, levelW)) + { + if (xmlstr_cmpi(&attr_value, asInvokerW)) + assembly->run_level = ACTCTX_RUN_LEVEL_AS_INVOKER; + else if (xmlstr_cmpi(&attr_value, highestAvailableW)) + assembly->run_level = ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE; + else if (xmlstr_cmpi(&attr_value, requireAdministratorW)) + assembly->run_level = ACTCTX_RUN_LEVEL_REQUIRE_ADMIN; + else + DPRINT1("unknown execution level: %wZ\n", &attr_valueU); + } + else if (xmlstr_cmp(&attr_name, uiAccessW)) + { + if (xmlstr_cmpi(&attr_value, falseW)) + assembly->ui_access = FALSE; + else if (xmlstr_cmpi(&attr_value, trueW)) + assembly->ui_access = TRUE; + else + DPRINT1("unknown uiAccess value: %wZ\n", &attr_valueU); + } + else + DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + } + + if (error) return FALSE; + if (end) return TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedExecutionLevelW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown element %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedPrivilegesW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedExecutionLevelW)) + ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, securityW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedPrivilegesW)) + ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, trustInfoW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, securityW)) + ret = parse_security_elem(xmlbuf, assembly, acl); + else + { + UNICODE_STRING elemU = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elemU); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -2411,6 +2668,11 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_clr_surrogate_elem(xmlbuf, assembly, acl); } + else if (xml_elem_cmp(&elem, trustInfoW, asmv2W) || + xml_elem_cmp(&elem, trustInfoW, asmv1W)) + { + ret = parse_trust_info_elem(xmlbuf, assembly, acl); + } else if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; @@ -2440,12 +2702,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, } } } -#ifdef __REACTOS__ - else if (xml_elem_cmp(&elem, L"trustInfo", asmv1W)) + else if (xml_elem_cmp(&elem, compatibilityW, compatibilityNSW)) { - ret = parse_unknown_elem(xmlbuf, &elem); + ret = parse_compatibility_elem(xmlbuf, assembly, acl); } -#endif else { attr_nameU = xmlstr2unicode(&elem); @@ -5273,6 +5533,55 @@ NTSTATUS NTAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, } break; + case CompatibilityInformationInActivationContext: + { + /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci = buffer; + COMPATIBILITY_CONTEXT_ELEMENT *elements; + struct assembly *assembly = NULL; + ULONG num_compat_contexts = 0, n; + SIZE_T len; + + if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; + + if (actctx->num_assemblies) assembly = actctx->assemblies; + + if (assembly) + num_compat_contexts = assembly->num_compat_contexts; + len = sizeof(*acci) + num_compat_contexts * sizeof(COMPATIBILITY_CONTEXT_ELEMENT); + + if (retlen) *retlen = len; + if (!buffer || bufsize < len) return STATUS_BUFFER_TOO_SMALL; + + *acci = num_compat_contexts; + elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); + for (n = 0; n < num_compat_contexts; ++n) + { + elements[n] = assembly->compat_contexts[n]; + } + } + break; + + case RunlevelInformationInActivationContext: + { + ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION *acrli = buffer; + struct assembly *assembly; + SIZE_T len; + + if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; + + len = sizeof(*acrli); + if (retlen) *retlen = len; + if (!buffer || bufsize < len) + return STATUS_BUFFER_TOO_SMALL; + + assembly = actctx->assemblies; + + acrli->ulFlags = 0; + acrli->RunLevel = assembly ? assembly->run_level : ACTCTX_RUN_LEVEL_UNSPECIFIED; + acrli->UiAccess = assembly ? assembly->ui_access : 0; + } + break; + default: DPRINT( "class %u not implemented\n", class ); return STATUS_NOT_IMPLEMENTED;

6 years, 10 months

01/01: [RAPPS] Various fixes - Ask the user if they want to continue on cab certificate problems - Fix memory leaks in failure paths - Properly disable caching

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07f3691cd82df5ba4b951… commit 07f3691cd82df5ba4b951fdcfa956dad6578c5b9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 18 15:27:08 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 19 11:54:33 2018 +0100 [RAPPS] Various fixes - Ask the user if they want to continue on cab certificate problems - Fix memory leaks in failure paths - Properly disable caching --- base/applications/rapps/include/resource.h | 3 +- base/applications/rapps/lang/bg-BG.rc | 3 +- base/applications/rapps/lang/cs-CZ.rc | 3 +- base/applications/rapps/lang/de-DE.rc | 3 +- base/applications/rapps/lang/en-US.rc | 3 +- base/applications/rapps/lang/es-ES.rc | 3 +- base/applications/rapps/lang/fr-FR.rc | 3 +- base/applications/rapps/lang/he-IL.rc | 3 +- base/applications/rapps/lang/it-IT.rc | 3 +- base/applications/rapps/lang/ja-JP.rc | 3 +- base/applications/rapps/lang/no-NO.rc | 3 +- base/applications/rapps/lang/pl-PL.rc | 3 +- base/applications/rapps/lang/pt-BR.rc | 3 +- base/applications/rapps/lang/ro-RO.rc | 3 +- base/applications/rapps/lang/ru-RU.rc | 3 +- base/applications/rapps/lang/sk-SK.rc | 3 +- base/applications/rapps/lang/sq-AL.rc | 3 +- base/applications/rapps/lang/sv-SE.rc | 3 +- base/applications/rapps/lang/tr-TR.rc | 3 +- base/applications/rapps/lang/uk-UA.rc | 3 +- base/applications/rapps/lang/zh-CN.rc | 3 +- base/applications/rapps/lang/zh-TW.rc | 3 +- base/applications/rapps/loaddlg.cpp | 107 ++++++++++++++++++----------- 23 files changed, 111 insertions(+), 62 deletions(-) diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 6e768227fa..9f4c4b15de 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -101,7 +101,7 @@ #define IDS_UNABLE_TO_REMOVE 118 #define IDS_UNABLE_TO_DOWNLOAD 119 #define IDS_UNABLE_TO_DOWNLOAD2 120 -#define IDS_CERT_DOES_NOT_MATCH 121 +#define IDS_UNABLE_TO_QUERY_CERT 121 #define IDS_INTEG_CHECK_TITLE 122 #define IDS_INTEG_CHECK_FAIL 123 #define IDS_INTERRUPTED_DOWNLOAD 124 @@ -110,6 +110,7 @@ #define IDS_INSTALL_SELECTED 127 #define IDS_UNABLE_TO_INSTALL 128 #define IDS_SELECTEDFORINST 129 +#define IDS_MISMATCH_CERT_INFO 130 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index e23799f519..3fbb5f420b 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -207,7 +207,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е невъзможно!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -215,6 +215,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 19945538c3..21eef64d9a 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -208,7 +208,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -216,6 +216,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 923787d607..749f3eb64b 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!" IDS_UNABLE_TO_INSTALL "Paket konnte nicht installiert werden!" - IDS_CERT_DOES_NOT_MATCH "Überprüfung des SSL-Zertifikats fehlgeschlagen." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Integritätsprüfung…" IDS_INTEG_CHECK_FAIL "Das Paket hat die Integritätsprüfung nicht bestanden. Mögliche Ursachen sind Übertragungsfehler, Datenbankfehler oder Manipulation durch einen Angreifer. Sie sollten die Software nicht ausführen." IDS_INTERRUPTED_DOWNLOAD "Übertragung unterbrochen. Prüfen Sie Ihre Internetverbindung!" @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" IDS_SELECTEDFORINST "Zur Installation ausgewählt" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 3ecbc2c081..50f2ab1e95 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 015ad42745..1a2e5e0b7b 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -206,7 +206,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalación del programa." IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobación del certificado SSL." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete…" IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexión a Internet." @@ -214,6 +214,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 9c0b5777f4..6ed35f5836 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Impossible de télécharger le paquet : vérifiez votre connexion à Internet !" IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les données du programme !" IDS_UNABLE_TO_INSTALL "Impossible d'ouvrir l'installeur !" - IDS_CERT_DOES_NOT_MATCH "La vérification du certificat SSL a échoué." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Vérification de l'intégrité du paquet…" IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée." IDS_INTERRUPTED_DOWNLOAD "Le téléchargement a été interrompu. Vérifiez votre connexion à Internet." @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_INSTALL_SELECTED "Installer la sélection" IDS_SELECTEDFORINST "Sélectionnées pour installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 3b09f0931e..6eb11e73b1 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -209,7 +209,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -217,6 +217,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 316d1c90a5..69f58d715a 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Impossibile scaricare il pacchetto! Controlla la tua connessione internet!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" IDS_UNABLE_TO_INSTALL "Impossibile aprire l'installer!" - IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto…" IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata." IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet." @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" IDS_SELECTEDFORINST "Selezionate per l'installazione" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 75459912d7..227e07f5e0 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "レジストリからこのプログラムに関するデータを削除できません!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 2799009115..c2d7a4835e 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -202,7 +202,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -210,6 +210,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 2852d4b3c0..54549b0589 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -211,7 +211,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Nie można pobrać pakietu! Sprawdź połączenie z siecią!" IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!" IDS_UNABLE_TO_INSTALL "Nie można uruchomić instalatora!" - IDS_CERT_DOES_NOT_MATCH "Weryfikacja certyfikatu SSL nieudana." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Weryfikowanie integralności pakietu…" IDS_INTEG_CHECK_FAIL "Pakiet nie przeszedł kontroli integralności, mógł zostać uszkodzony lub naruszony podczas pobierania. Uruchamianie tego programu nie jest zalecane." IDS_INTERRUPTED_DOWNLOAD "Pobieranie zostało przerwane. Sprawdź połączenie z siecią" @@ -219,6 +219,7 @@ BEGIN IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" IDS_SELECTEDFORINST "Wybrane do instalacji" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 3e40ea0377..f4f1ffde91 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -205,7 +205,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Não foi possível remover as informações do programa do registro!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -213,6 +213,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 8d2d4f55e1..0bb9498618 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -212,7 +212,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!" IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!" IDS_UNABLE_TO_INSTALL "Programul de instalare nu poate fi executat!" - IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." @@ -220,6 +220,7 @@ BEGIN IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" IDS_SELECTEDFORINST "Selectate pentru instalare" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 85f31871a8..9a631a39d3 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -203,7 +203,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Не удалось скачать приложение! Проверьте подключение к сети Интернет!" IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!" IDS_UNABLE_TO_INSTALL "Не удалось завершить установку!" - IDS_CERT_DOES_NOT_MATCH "Ошибка проверки SSL сертификата." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Проверка целостности приложения…" IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется." IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет." @@ -211,6 +211,7 @@ BEGIN IDS_SELECT_ALL "Выбрать все" IDS_INSTALL_SELECTED "Установить выбранное" IDS_SELECTEDFORINST "Выбрано для установки" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index e8233ee617..4eaa41a38b 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -208,7 +208,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nie je možné odstrániť z registrov údaje o programe!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -216,6 +216,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 2415b5d685..8e2e338d18 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -207,7 +207,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -215,6 +215,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index df91a696f0..56f06fe7e6 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -210,7 +210,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data från registret!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Verifying package integrity…" IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -218,6 +218,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index b389825f20..a46e0a98e0 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -205,7 +205,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Paket indirilemez! Umûmî Ağ bağlantınızı yoklayınız!" IDS_UNABLE_TO_REMOVE "İzlencenin girişi değer defterinden silinemiyor." IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doğrulaması başarısız." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Paket bütünlüğü doğrulanıyor…" IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veyâ indirme esnâsında oynanmış olabilir. Yazılımı çalıştırmak önerilmez." IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. Umûmî Ağ bağlantınızı denetleyiniz." @@ -213,6 +213,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index b75be5cedd..08788f7e8b 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -211,7 +211,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Неможливо завантажити додаток! Перевірте підключення до мережі Інтернет!" IDS_UNABLE_TO_REMOVE "Не вдалося видалити дані про програму з реєстру!" IDS_UNABLE_TO_INSTALL "Не вдалося завершити інсталювання!" - IDS_CERT_DOES_NOT_MATCH "Помилка перевіки сертифікату SSL." + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "Перевірка цілістності додатку…" IDS_INTEG_CHECK_FAIL "Додаток не пройшов перевірку цілістності, його молги пошкодити чи замінити. Запуск додатку не рекомендується." IDS_INTERRUPTED_DOWNLOAD "Завантаження перервано. Перевірте підключення до мережі Інтернет." @@ -219,6 +219,7 @@ BEGIN IDS_SELECT_ALL "Вибрати все" IDS_INSTALL_SELECTED "Встановити обране" IDS_SELECTEDFORINST "Обрані для встановлення" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 88e6b28b14..e7431800c3 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -205,7 +205,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "无法下载该软件包！请检查网络连接！" IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据！" IDS_UNABLE_TO_INSTALL "无法打开安装程序！" - IDS_CERT_DOES_NOT_MATCH "SSL 证书验证失败。" + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "正在验证包完整性…" IDS_INTEG_CHECK_FAIL "这个包没有通过完整性验证，它可能在下载过程中损坏或被人为篡改了。不推荐运行这个程序。" IDS_INTERRUPTED_DOWNLOAD "下载中断。请检查网络连接。" @@ -213,6 +213,7 @@ BEGIN IDS_SELECT_ALL "全选/全反选" IDS_INSTALL_SELECTED "安装已选中的" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 12bcc373f7..fa7ef74026 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -205,7 +205,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "SSL 憑證驗證失敗。" + IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性…" IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。" IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." @@ -213,6 +213,7 @@ BEGIN IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" + IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" END STRINGTABLE diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 8e2e76ac44..30aa4a2f3c 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -331,11 +331,24 @@ HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, REFIID r } #ifdef USE_CERT_PINNING -static BOOL CertIsValid(HINTERNET hFile, LPWSTR lpszHostName) +typedef CHeapPtr<char, CLocalAllocator> CLocalPtr; + +static BOOL CertGetSubjectAndIssuer(HINTERNET hFile, CLocalPtr& subjectInfo, CLocalPtr& issuerInfo) { DWORD certInfoLength; INTERNET_CERTIFICATE_INFOA certInfo; - int ValidFlags = 0; + DWORD size, flags; + + size = sizeof(flags); + if (!InternetQueryOptionA(hFile, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size)) + { + return FALSE; + } + + if (!flags & SECURITY_FLAG_SECURE) + { + return FALSE; + } /* Despite what the header indicates, the implementation of INTERNET_CERTIFICATE_INFO is not Unicode-aware. */ certInfoLength = sizeof(certInfo); @@ -347,18 +360,9 @@ static BOOL CertIsValid(HINTERNET hFile, LPWSTR lpszHostName) return FALSE; } - if (certInfo.lpszSubjectInfo) - { - if (strcmp(certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) == 0) - ValidFlags |= 1; - LocalFree(certInfo.lpszSubjectInfo); - } - if (certInfo.lpszIssuerInfo) - { - if (strcmp(certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) == 0) - ValidFlags |= 2; - LocalFree(certInfo.lpszIssuerInfo); - } + subjectInfo.Attach(certInfo.lpszSubjectInfo); + issuerInfo.Attach(certInfo.lpszIssuerInfo); + if (certInfo.lpszProtocolName) LocalFree(certInfo.lpszProtocolName); if (certInfo.lpszSignatureAlgName) @@ -366,13 +370,13 @@ static BOOL CertIsValid(HINTERNET hFile, LPWSTR lpszHostName) if (certInfo.lpszEncryptionAlgName) LocalFree(certInfo.lpszEncryptionAlgName); - return ValidFlags == 3; + return certInfo.lpszSubjectInfo && certInfo.lpszIssuerInfo; } #endif inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID) { - ATL::CString szMsgText; + ATL::CStringW szMsgText; if (szMsgText.LoadStringW(StringID)) { MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); @@ -616,6 +620,19 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) SendMessageW(Item, PBM_SETPOS, 0, 0); } + // is this URL an update package for RAPPS? if so store it in a different place + if (InfoArray[iAppId].szUrl == APPLICATION_DATABASE_URL) + { + bCab = TRUE; + if (!GetStorageDirectory(Path)) + goto end; + } + else + { + bCab = FALSE; + Path = SettingsInfo.szDownloadDir; + } + // Change caption to show the currently downloaded app if (!bCab) { @@ -644,18 +661,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (q && q > p && (q - p) > 0) filenameLength -= wcslen(q - 1) * sizeof(WCHAR); - // is this URL an update package for RAPPS? if so store it in a different place - if (InfoArray[iAppId].szUrl == APPLICATION_DATABASE_URL) - { - bCab = TRUE; - if (!GetStorageDirectory(Path)) - goto end; - } - else - { - Path = SettingsInfo.szDownloadDir; - } - // is the path valid? can we access it? if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES) { @@ -690,6 +695,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) switch (SettingsInfo.Proxy) { case 0: // preconfig + default: hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); break; case 1: // direct (no proxy) @@ -698,15 +704,14 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) case 2: // use proxy hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0); break; - default: // preconfig - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); - break; } if (!hOpen) goto end; - hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); + hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, + INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, + 0); if (!hFile) { @@ -740,7 +745,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) dwContentLen = 0; if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) - HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); + HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatusLen, 0); if (urlComponents.nScheme == INTERNET_SCHEME_FTP) dwContentLen = FtpGetFileSize(hFile, &dwStatus); @@ -751,20 +756,42 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) SetProgressMarquee(Item, TRUE); } + free(urlComponents.lpszScheme); + free(urlComponents.lpszHostName); + #ifdef USE_CERT_PINNING // are we using HTTPS to download the RAPPS update package? check if the certificate is original if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && - (wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0) && - (!CertIsValid(hFile, urlComponents.lpszHostName))) + (wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0)) { - MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH); - goto end; + CLocalPtr subjectName, issuerName; + CStringW szMsgText; + bool bAskQuestion = false; + if (!CertGetSubjectAndIssuer(hFile, subjectName, issuerName)) + { + szMsgText.LoadStringW(IDS_UNABLE_TO_QUERY_CERT); + bAskQuestion = true; + } + else + { + if (strcmp(subjectName, CERT_SUBJECT_INFO) || + strcmp(issuerName, CERT_ISSUER_INFO)) + { + szMsgText.Format(IDS_MISMATCH_CERT_INFO, (char*)subjectName, (const char*)issuerName); + bAskQuestion = true; + } + } + + if (bAskQuestion) + { + if (MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES) + { + goto end; + } + } } #endif - free(urlComponents.lpszScheme); - free(urlComponents.lpszHostName); - hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); if (hOut == INVALID_HANDLE_VALUE)

6 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018