[reactos] 01/01: [EXPLORER] Check registry key for default shell (#7502)
by Brady McDermott 30 Nov '24
by Brady McDermott 30 Nov '24
30 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df197bc424f319585a137…
commit df197bc424f319585a1373ab6d4d033fb938fefb
Author: Brady McDermott <freedom7341(a)hotmail.com>
AuthorDate: Sat Nov 30 10:17:54 2024 -0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Nov 30 10:17:54 2024 -0700
[EXPLORER] Check registry key for default shell (#7502)
Improves detection of Explorer being the default shell.
- Check the "Software\Microsoft\Windows NT\CurrentVersion\Winlogon" key to see if Explorer is the default shell.
- Use this check to determine whether to start the desktop and taskbar or only open a file browser window.
JIRA issue CORE-19887
---
base/shell/explorer/explorer.cpp | 46 +++++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp
index a88cf050eea..d51a32976cc 100644
--- a/base/shell/explorer/explorer.cpp
+++ b/base/shell/explorer/explorer.cpp
@@ -87,6 +87,47 @@ HideMinimizedWindows(IN BOOL bHide)
}
#endif
+static BOOL
+IsExplorerSystemShell()
+{
+ BOOL bIsSystemShell = TRUE; // Assume we are the system shell by default.
+ WCHAR szPath[MAX_PATH];
+
+ if (!GetModuleFileNameW(NULL, szPath, _countof(szPath)))
+ return FALSE;
+
+ LPWSTR szExplorer = PathFindFileNameW(szPath);
+
+ HKEY hKeyWinlogon;
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
+ 0, KEY_READ, &hKeyWinlogon) != ERROR_SUCCESS)
+ {
+ // No registry access.
+ bIsSystemShell = TRUE;
+ }
+ else
+ {
+ LSTATUS Status;
+ DWORD dwType;
+ WCHAR szShell[MAX_PATH];
+ DWORD cbShell = sizeof(szShell);
+
+ // TODO: Add support for paths longer than MAX_PATH
+ Status = RegQueryValueExW(hKeyWinlogon, L"Shell", 0, &dwType, (LPBYTE)szShell, &cbShell);
+ if (Status == ERROR_SUCCESS)
+ {
+ if ((dwType == REG_SZ || dwType == REG_EXPAND_SZ) && StrStrI(szShell, szExplorer))
+ bIsSystemShell = TRUE;
+ else
+ bIsSystemShell = FALSE;
+ }
+
+ RegCloseKey(hKeyWinlogon);
+ }
+
+ return bIsSystemShell;
+}
+
#if !WIN7_COMPAT_MODE
static INT
StartWithCommandLine(IN HINSTANCE hInstance)
@@ -212,15 +253,14 @@ _tWinMain(IN HINSTANCE hInstance,
TRACE("Explorer starting... Command line: %S\n", lpCmdLine);
#if !WIN7_COMPAT_MODE
- if (GetShellWindow() == NULL)
- bExplorerIsShell = TRUE;
+ bExplorerIsShell = (GetShellWindow() == NULL) && IsExplorerSystemShell();
if (!bExplorerIsShell)
{
return StartWithCommandLine(hInstance);
}
#else
- bExplorerIsShell = TRUE;
+ bExplorerIsShell = IsExplorerSystemShell();
#endif
return StartWithDesktop(hInstance);
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=741535dc28a7c9803840e…
commit 741535dc28a7c9803840e402328410d3ab0b6281
Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org>
AuthorDate: Fri Nov 29 00:28:04 2024 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Nov 29 00:28:04 2024 +0700
[WINMINE] Update sounds license
Addendum to commit 580574fba8b7dc991cf44e8da67116fa07207732.
---
base/applications/games/winmine/rc/Sounds_License.txt | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/base/applications/games/winmine/rc/Sounds_License.txt b/base/applications/games/winmine/rc/Sounds_License.txt
index c1e25006e2e..8e4df0f52bd 100644
--- a/base/applications/games/winmine/rc/Sounds_License.txt
+++ b/base/applications/games/winmine/rc/Sounds_License.txt
@@ -1,24 +1,29 @@
box.wav
-License: CC0 1.0 Universal
+By: amitYunger123 <https://freesound.org/people/amitYunger123/>
+License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
URL: https://freesound.org/people/amitYunger123/sounds/737638/
Date: 30-May-2024
explode.wav
-License: CC0 1.0 Universal
+By: hoffy1138 <https://freesound.org/people/hoffy1138/>
+License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
URL: https://freesound.org/people/hoffy1138/sounds/276968/
Date: 31-May-2024
flag.wav
-License: CC0 1.0 Universal
+By: ProfoundSounds <https://freesound.org/people/profoundsounds/>
+License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
URL: https://freesound.org/people/profoundsounds/sounds/733230/
Date: 30-May-2024
question.wav
-License: CC0 1.0 Universal
+By: Irolan <https://freesound.org/people/Irolan/>
+License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
URL: https://freesound.org/people/Irolan/sounds/737510/
Date: 30-May-2024
win.wav
-License: CC0 1.0 Universal
+By: David819 <https://freesound.org/people/David819/>
+License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
URL: https://freesound.org/people/David819/sounds/668436/
Date: 31-May-2024
1
0
27 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2aadf2eb264c537e134fa…
commit 2aadf2eb264c537e134fade391c5a4fb333a8e4d
Author: Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Wed Nov 27 17:45:03 2024 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Nov 27 17:45:03 2024 +0100
[SHELL32] Implement and use SHOpenPropSheet (#7432)
- Implement SHOpenPropSheetW.
- Reuse already opened propertysheets and format dialogs by finding the existing unique stub window.
- Default .lnk property dialog to the shortcut tab.
---
dll/win32/shell32/CFolderOptions.cpp | 14 +-
dll/win32/shell32/CMakeLists.txt | 3 +-
dll/win32/shell32/CShellLink.cpp | 27 ++--
dll/win32/shell32/dialogs/drive.cpp | 122 ----------------
dll/win32/shell32/dialogs/drvdefext.cpp | 13 +-
dll/win32/shell32/dialogs/filedefext.cpp | 47 ++-----
dll/win32/shell32/dialogs/fprop.cpp | 180 ------------------------
dll/win32/shell32/dialogs/item_prop.cpp | 179 +++++++++++++++++++++++
dll/win32/shell32/dialogs/recycler_prop.cpp | 28 +---
dll/win32/shell32/folders/CDrivesFolder.cpp | 128 ++---------------
dll/win32/shell32/folders/CFSFolder.cpp | 20 +--
dll/win32/shell32/folders/CRecycleBin.cpp | 5 +-
dll/win32/shell32/folders/CRegFolder.cpp | 14 +-
dll/win32/shell32/precomp.h | 51 ++++++-
dll/win32/shell32/propsheet.cpp | 211 ++++++++++++++++++++++++++++
dll/win32/shell32/shell32.cpp | 2 +
dll/win32/shell32/shfldr.h | 17 ++-
dll/win32/shell32/shldataobject.cpp | 2 +
dll/win32/shell32/shlfolder.cpp | 51 ++-----
dll/win32/shell32/stubs.cpp | 19 ---
dll/win32/shell32/utils.cpp | 33 +++++
dll/win32/shell32/wine/shell32_main.h | 7 +-
22 files changed, 577 insertions(+), 596 deletions(-)
diff --git a/dll/win32/shell32/CFolderOptions.cpp b/dll/win32/shell32/CFolderOptions.cpp
index ba436c938fc..0f3513bcd8c 100644
--- a/dll/win32/shell32/CFolderOptions.cpp
+++ b/dll/win32/shell32/CFolderOptions.cpp
@@ -46,14 +46,18 @@ HRESULT STDMETHODCALLTYPE CFolderOptions::AddPages(LPFNSVADDPROPSHEETPAGE pfnAdd
HPROPSHEETPAGE hPage;
LPARAM sheetparam = (LPARAM)static_cast<CFolderOptions*>(this);
- hPage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_GENERAL, FolderOptionsGeneralDlg, sheetparam, NULL);
- if (hPage == NULL)
+ hPage = SH_CreatePropertySheetPageEx(IDD_FOLDER_OPTIONS_GENERAL, FolderOptionsGeneralDlg,
+ sheetparam, NULL, &PropSheetPageLifetimeCallback<CFolderOptions>);
+ HRESULT hr = AddPropSheetPage(hPage, pfnAddPage, lParam);
+ if (FAILED_UNEXPECTEDLY(hr))
{
ERR("Failed to create property sheet page FolderOptionsGeneral\n");
- return E_FAIL;
+ return hr;
+ }
+ else
+ {
+ AddRef(); // For PropSheetPageLifetimeCallback
}
- if (!pfnAddPage(hPage, lParam))
- return E_FAIL;
hPage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_VIEW, FolderOptionsViewDlg, sheetparam, NULL);
if (hPage == NULL)
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index d7f7672f581..258191318b6 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -31,7 +31,7 @@ list(APPEND SOURCE
dialogs/filedefext.cpp
dialogs/filetypes.cpp
dialogs/folder_options.cpp
- dialogs/fprop.cpp
+ dialogs/item_prop.cpp
dialogs/general.cpp
dialogs/recycler_prop.cpp
dialogs/view.cpp
@@ -40,6 +40,7 @@ list(APPEND SOURCE
CExtractIcon.cpp
folders.cpp
iconcache.cpp
+ propsheet.cpp
shell32.cpp
utils.cpp
CShellItem.cpp
diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp
index 582a605ba54..d99db2f1470 100644
--- a/dll/win32/shell32/CShellLink.cpp
+++ b/dll/win32/shell32/CShellLink.cpp
@@ -2903,10 +2903,13 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam)
ASSERT(FAILED(hr) || !(path[0] == ':' && path[1] == ':' && path[2] == '{'));
}
}
- EnableWindow(GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT), !disablecontrols);
+
+ HWND hWndTarget = GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT);
+ EnableWindow(hWndTarget, !disablecontrols);
+ PostMessage(hWndTarget, EM_SETSEL, 0, -1); // Fix caret bug when first opening the tab
/* auto-completion */
- SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT), SHACF_DEFAULT);
+ SHAutoComplete(hWndTarget, SHACF_DEFAULT);
SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_START_IN_EDIT), SHACF_DEFAULT);
m_bInInit = FALSE;
@@ -3095,17 +3098,15 @@ CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
HRESULT STDMETHODCALLTYPE CShellLink::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
{
- HPROPSHEETPAGE hPage = SH_CreatePropertySheetPage(IDD_SHORTCUT_PROPERTIES, SH_ShellLinkDlgProc, (LPARAM)this, NULL);
- if (hPage == NULL)
- {
- ERR("failed to create property sheet page\n");
- return E_FAIL;
- }
-
- if (!pfnAddPage(hPage, lParam))
- return E_FAIL;
-
- return S_OK;
+ HPROPSHEETPAGE hPage = SH_CreatePropertySheetPageEx(IDD_SHORTCUT_PROPERTIES, SH_ShellLinkDlgProc,
+ (LPARAM)this, NULL, &PropSheetPageLifetimeCallback<CShellLink>);
+ HRESULT hr = AddPropSheetPage(hPage, pfnAddPage, lParam);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+ else
+ AddRef(); // For PropSheetPageLifetimeCallback
+ enum { CShellLink_PageIndex_Shortcut = 0 };
+ return 1 + CShellLink_PageIndex_Shortcut; // Make this page the default (one-based)
}
HRESULT STDMETHODCALLTYPE CShellLink::ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam)
diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp
index 8bade5d68c8..ff97054fcda 100644
--- a/dll/win32/shell32/dialogs/drive.cpp
+++ b/dll/win32/shell32/dialogs/drive.cpp
@@ -32,9 +32,6 @@ typedef struct
BOOL bFormattingNow;
} FORMAT_DRIVE_CONTEXT, *PFORMAT_DRIVE_CONTEXT;
-EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj);
-HPROPSHEETPAGE SH_CreatePropertySheetPage(LPCSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle);
-
/*
* TODO: In Windows the Shell doesn't know by itself if a drive is
* a system one or not but rather a packet message is being sent by
@@ -159,125 +156,6 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum
return TRUE;
}
-typedef struct _DRIVE_PROP_PAGE
-{
- LPCSTR resname;
- DLGPROC dlgproc;
- UINT DriveType;
-} DRIVE_PROP_PAGE;
-
-struct DRIVE_PROP_DATA
-{
- PWSTR pwszDrive;
- IStream *pStream;
-};
-
-static DWORD WINAPI
-ShowDrivePropThreadProc(LPVOID pParam)
-{
- CHeapPtr<DRIVE_PROP_DATA, CComAllocator> pPropData((DRIVE_PROP_DATA *)pParam);
- CHeapPtr<WCHAR, CComAllocator> pwszDrive(pPropData->pwszDrive);
-
- // Unmarshall IDataObject from IStream
- CComPtr<IDataObject> pDataObj;
- CoGetInterfaceAndReleaseStream(pPropData->pStream, IID_PPV_ARG(IDataObject, &pDataObj));
-
- HPSXA hpsx = NULL;
- HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE];
- CComObject<CDrvDefExt> *pDrvDefExt = NULL;
-
- CDataObjectHIDA cida(pDataObj);
- if (FAILED_UNEXPECTEDLY(cida.hr()))
- return FAILED(cida.hr());
-
- RECT rcPosition = {CW_USEDEFAULT, CW_USEDEFAULT, 0, 0};
- POINT pt;
- if (SUCCEEDED(DataObject_GetOffset(pDataObj, &pt)))
- {
- rcPosition.left = pt.x;
- rcPosition.top = pt.y;
- }
-
- DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION;
- DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW;
- CStubWindow32 stub;
- if (!stub.Create(NULL, rcPosition, NULL, style, exstyle))
- {
- ERR("StubWindow32 creation failed\n");
- return FALSE;
- }
-
- PROPSHEETHEADERW psh = {sizeof(PROPSHEETHEADERW)};
- psh.dwFlags = PSH_PROPTITLE;
- psh.pszCaption = pwszDrive;
- psh.hwndParent = stub;
- psh.nStartPage = 0;
- psh.phpage = hpsp;
-
- HRESULT hr = CComObject<CDrvDefExt>::CreateInstance(&pDrvDefExt);
- if (SUCCEEDED(hr))
- {
- pDrvDefExt->AddRef(); // CreateInstance returns object with 0 ref count
- hr = pDrvDefExt->Initialize(HIDA_GetPIDLFolder(cida), pDataObj, NULL);
- if (SUCCEEDED(hr))
- {
- hr = pDrvDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&psh);
- if (FAILED(hr))
- ERR("AddPages failed\n");
- }
- else
- {
- ERR("Initialize failed\n");
- }
- }
-
- hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Drive", MAX_PROPERTY_SHEET_PAGE, pDataObj);
- if (hpsx)
- SHAddFromPropSheetExtArray(hpsx, (LPFNADDPROPSHEETPAGE)AddPropSheetPageCallback, (LPARAM)&psh);
-
- INT_PTR ret = PropertySheetW(&psh);
-
- if (hpsx)
- SHDestroyPropSheetExtArray(hpsx);
- if (pDrvDefExt)
- pDrvDefExt->Release();
-
- stub.DestroyWindow();
-
- return ret != -1;
-}
-
-BOOL
-SH_ShowDriveProperties(WCHAR *pwszDrive, IDataObject *pDataObj)
-{
- HRESULT hr = SHStrDupW(pwszDrive, &pwszDrive);
- if (FAILED_UNEXPECTEDLY(hr))
- return FALSE;
-
- // Prepare data for thread
- DRIVE_PROP_DATA *pData = (DRIVE_PROP_DATA *)SHAlloc(sizeof(*pData));
- if (!pData)
- {
- SHFree(pwszDrive);
- return FALSE;
- }
- pData->pwszDrive = pwszDrive;
-
- // Marshall IDataObject to IStream
- hr = CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObj, &pData->pStream);
- if (SUCCEEDED(hr))
- {
- // Run a property sheet in another thread
- if (SHCreateThread(ShowDrivePropThreadProc, pData, CTF_COINIT, NULL))
- return TRUE; // Success
-
- pData->pStream->Release();
- }
- SHFree(pData);
- SHFree(pwszDrive);
- return FALSE; // Failed
-}
-
static VOID
InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{
diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp
index c11375e0b88..f26413bea3a 100644
--- a/dll/win32/shell32/dialogs/drvdefext.cpp
+++ b/dll/win32/shell32/dialogs/drvdefext.cpp
@@ -750,12 +750,13 @@ CDrvDefExt::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
{
HPROPSHEETPAGE hPage;
- hPage = SH_CreatePropertySheetPage(IDD_DRIVE_PROPERTIES,
- GeneralPageProc,
- (LPARAM)this,
- NULL);
- if (hPage)
- pfnAddPage(hPage, lParam);
+ hPage = SH_CreatePropertySheetPageEx(IDD_DRIVE_PROPERTIES, GeneralPageProc, (LPARAM)this,
+ NULL, &PropSheetPageLifetimeCallback<CDrvDefExt>);
+ HRESULT hr = AddPropSheetPage(hPage, pfnAddPage, lParam);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+ else
+ AddRef(); // For PropSheetPageLifetimeCallback
if (GetDriveTypeW(m_wszDrive) == DRIVE_FIXED)
{
diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp
index dd3c5cd0b1e..e8beb7f936a 100644
--- a/dll/win32/shell32/dialogs/filedefext.cpp
+++ b/dll/win32/shell32/dialogs/filedefext.cpp
@@ -290,34 +290,6 @@ SH_FormatFileSizeWithBytes(const PULARGE_INTEGER lpQwSize, LPWSTR pwszResult, UI
return pwszResult;
}
-/*************************************************************************
- *
- * SH_CreatePropertySheetPage [Internal]
- *
- * creates a property sheet page from a resource id
- *
- */
-
-HPROPSHEETPAGE
-SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle)
-{
- PROPSHEETPAGEW Page;
-
- memset(&Page, 0x0, sizeof(PROPSHEETPAGEW));
- Page.dwSize = sizeof(PROPSHEETPAGEW);
- Page.dwFlags = PSP_DEFAULT;
- Page.hInstance = shell32_hInstance;
- Page.pszTemplate = MAKEINTRESOURCE(wDialogId);
- Page.pfnDlgProc = pfnDlgProc;
- Page.lParam = lParam;
- Page.pszTitle = pwszTitle;
-
- if (pwszTitle)
- Page.dwFlags |= PSP_USETITLE;
-
- return CreatePropertySheetPageW(&Page);
-}
-
VOID
CFileDefExt::InitOpensWithField(HWND hwndDlg)
{
@@ -1321,12 +1293,13 @@ CFileDefExt::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
HPROPSHEETPAGE hPage;
WORD wResId = m_bDir ? IDD_FOLDER_PROPERTIES : IDD_FILE_PROPERTIES;
- hPage = SH_CreatePropertySheetPage(wResId,
- GeneralPageProc,
- (LPARAM)this,
- NULL);
- if (hPage)
- pfnAddPage(hPage, lParam);
+ hPage = SH_CreatePropertySheetPageEx(wResId, GeneralPageProc, (LPARAM)this, NULL,
+ &PropSheetPageLifetimeCallback<CFileDefExt>);
+ HRESULT hr = AddPropSheetPage(hPage, pfnAddPage, lParam);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+ else
+ AddRef(); // For PropSheetPageLifetimeCallback
if (!m_bDir && GetFileVersionInfoSizeW(m_wszPath, NULL))
{
@@ -1334,8 +1307,7 @@ CFileDefExt::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
VersionPageProc,
(LPARAM)this,
NULL);
- if (hPage)
- pfnAddPage(hPage, lParam);
+ AddPropSheetPage(hPage, pfnAddPage, lParam);
}
if (m_bDir)
@@ -1344,8 +1316,7 @@ CFileDefExt::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
FolderCustomizePageProc,
(LPARAM)this,
NULL);
- if (hPage)
- pfnAddPage(hPage, lParam);
+ AddPropSheetPage(hPage, pfnAddPage, lParam);
}
return S_OK;
diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp
deleted file mode 100644
index 68872bc4c69..00000000000
--- a/dll/win32/shell32/dialogs/fprop.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Shell Library Functions
- *
- * Copyright 2005 Johannes Anderwald
- * Copyright 2012 Rafal Harabien
- * Copyright 2017-2018 Katayama Hirofumi MZ
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "precomp.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
-EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj);
-
-static UINT
-LoadPropSheetHandlers(LPCWSTR pwszPath, PROPSHEETHEADERW *pHeader, UINT cMaxPages, HPSXA *phpsxa, IDataObject *pDataObj)
-{
- WCHAR wszBuf[MAX_PATH];
- UINT cPages = 0, i = 0;
-
- LPWSTR pwszFilename = PathFindFileNameW(pwszPath);
- BOOL bDir = PathIsDirectoryW(pwszPath);
-
- if (bDir)
- {
- phpsxa[i] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Folder", cMaxPages - cPages, pDataObj);
- cPages += SHAddFromPropSheetExtArray(phpsxa[i++], AddPropSheetPageCallback, (LPARAM)pHeader);
-
- phpsxa[i] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Directory", cMaxPages - cPages, pDataObj);
- cPages += SHAddFromPropSheetExtArray(phpsxa[i++], AddPropSheetPageCallback, (LPARAM)pHeader);
- }
- else
- {
- /* Load property sheet handlers from ext key */
- LPWSTR pwszExt = PathFindExtensionW(pwszFilename);
- phpsxa[i] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, pwszExt, cMaxPages - cPages, pDataObj);
- cPages += SHAddFromPropSheetExtArray(phpsxa[i++], AddPropSheetPageCallback, (LPARAM)pHeader);
-
- /* Load property sheet handlers from prog id key */
- DWORD cbBuf = sizeof(wszBuf);
- if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, L"", RRF_RT_REG_SZ, NULL, wszBuf, &cbBuf) == ERROR_SUCCESS)
- {
- TRACE("EnumPropSheetExt wszBuf %s, pwszExt %s\n", debugstr_w(wszBuf), debugstr_w(pwszExt));
- phpsxa[i] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszBuf, cMaxPages - cPages, pDataObj);
- cPages += SHAddFromPropSheetExtArray(phpsxa[i++], AddPropSheetPageCallback, (LPARAM)pHeader);
- }
-
- /* Add property sheet handlers from "*" key */
- phpsxa[i] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"*", cMaxPages - cPages, pDataObj);
- cPages += SHAddFromPropSheetExtArray(phpsxa[i++], AddPropSheetPageCallback, (LPARAM)pHeader);
- }
-
- return cPages;
-}
-
-/*************************************************************************
- *
- * SH_ShowPropertiesDialog
- *
- * called from ShellExecuteExW32
- *
- * pwszPath contains path of folder/file
- *
- * TODO: provide button change application type if file has registered type
- * make filename field editable and apply changes to filename on close
- */
-
-BOOL
-SH_ShowPropertiesDialog(LPCWSTR pwszPath, IDataObject *pDataObj)
-{
- HPSXA hpsxa[3] = {NULL, NULL, NULL};
- CComObject<CFileDefExt> *pFileDefExt = NULL;
-
- TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(pwszPath));
-
- if (pwszPath == NULL || !wcslen(pwszPath))
- return FALSE;
-
- HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE];
- memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE);
-
- /* Make a copy of path */
- WCHAR wszPath[MAX_PATH];
- StringCbCopyW(wszPath, sizeof(wszPath), pwszPath);
-
- /* remove trailing \\ at the end of path */
- PathRemoveBackslashW(wszPath);
-
- CDataObjectHIDA cida(pDataObj);
- if (FAILED_UNEXPECTEDLY(cida.hr()))
- return FALSE;
-
- if (cida->cidl == 0)
- {
- ERR("Empty HIDA\n");
- return FALSE;
- }
-
- /* Handle drives */
- if (_ILIsDrive(HIDA_GetPIDLItem(cida, 0)))
- return SH_ShowDriveProperties(wszPath, pDataObj);
-
-
- RECT rcPosition = {CW_USEDEFAULT, CW_USEDEFAULT, 0, 0};
- POINT pt;
- if (SUCCEEDED(DataObject_GetOffset(pDataObj, &pt)))
- {
- rcPosition.left = pt.x;
- rcPosition.top = pt.y;
- }
-
- DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION;
- DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW;
- CStubWindow32 stub;
- if (!stub.Create(NULL, rcPosition, NULL, style, exstyle))
- {
- ERR("StubWindow32 creation failed\n");
- return FALSE;
- }
-
- /* Handle files and folders */
- PROPSHEETHEADERW Header;
- memset(&Header, 0x0, sizeof(PROPSHEETHEADERW));
- Header.dwSize = sizeof(PROPSHEETHEADERW);
- Header.hwndParent = stub;
- Header.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE;
- Header.phpage = hppages;
- Header.pszCaption = PathFindFileNameW(wszPath);
-
- HRESULT hr = CComObject<CFileDefExt>::CreateInstance(&pFileDefExt);
- if (SUCCEEDED(hr))
- {
- pFileDefExt->AddRef(); // CreateInstance returns object with 0 ref count
- hr = pFileDefExt->Initialize(HIDA_GetPIDLFolder(cida), pDataObj, NULL);
- if (!FAILED_UNEXPECTEDLY(hr))
- {
- hr = pFileDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&Header);
- if (FAILED_UNEXPECTEDLY(hr))
- {
- ERR("AddPages failed\n");
- return FALSE;
- }
- }
- else
- {
- ERR("Initialize failed\n");
- return FALSE;
- }
- }
-
- LoadPropSheetHandlers(wszPath, &Header, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj);
-
- INT_PTR Result = PropertySheetW(&Header);
-
- for (UINT i = 0; i < 3; ++i)
- if (hpsxa[i])
- SHDestroyPropSheetExtArray(hpsxa[i]);
- if (pFileDefExt)
- pFileDefExt->Release();
-
- stub.DestroyWindow();
-
- return (Result != -1);
-}
-
-/*EOF */
diff --git a/dll/win32/shell32/dialogs/item_prop.cpp b/dll/win32/shell32/dialogs/item_prop.cpp
new file mode 100644
index 00000000000..90160a8062e
--- /dev/null
+++ b/dll/win32/shell32/dialogs/item_prop.cpp
@@ -0,0 +1,179 @@
+/*
+ * PROJECT: shell32
+ * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+)
+ * PURPOSE: FileSystem PropertySheet implementation
+ * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me>
+ */
+
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+static HRESULT
+SHELL_GetCaptionFromDataObject(IDataObject *pDO, LPWSTR Buf, UINT cchBuf)
+{
+ HRESULT hr = E_INVALIDARG;
+ if (PIDLIST_ABSOLUTE pidl = SHELL_DataObject_ILCloneFullItem(pDO, 0))
+ {
+ hr = SHGetNameAndFlagsW(pidl, SHGDN_INFOLDER, Buf, cchBuf, NULL);
+ ILFree(pidl);
+ }
+ return hr;
+}
+
+struct ShellPropSheetDialog
+{
+ typedef void (CALLBACK*PFNINITIALIZE)(LPCWSTR InitString, IDataObject *pDO,
+ HKEY *hKeys, UINT *cKeys);
+
+ static HRESULT Show(const CLSID *pClsidDefault, IDataObject *pDO,
+ PFNINITIALIZE InitFunc, LPCWSTR InitString)
+ {
+ HRESULT hr;
+ CRegKeyHandleArray keys;
+ if (InitFunc)
+ InitFunc(InitString, pDO, keys, keys);
+ WCHAR szCaption[MAX_PATH], *pszCaption = NULL;
+ if (SUCCEEDED(SHELL_GetCaptionFromDataObject(pDO, szCaption, _countof(szCaption))))
+ pszCaption = szCaption;
+ hr = SHOpenPropSheetW(pszCaption, keys, keys, pClsidDefault, pDO, NULL, NULL) ? S_OK : E_FAIL;
+ return hr;
+ }
+
+ struct DATA
+ {
+ PFNINITIALIZE InitFunc;
+ LPWSTR InitString;
+ CLSID ClsidDefault;
+ const CLSID *pClsidDefault;
+ IStream *pObjStream;
+ };
+
+ static void FreeData(DATA *pData)
+ {
+ if (pData->InitString)
+ SHFree(pData->InitString);
+ SHFree(pData);
+ }
+
+ static HRESULT ShowAsync(const CLSID *pClsidDefault, IDataObject *pDO,
+ PFNINITIALIZE InitFunc, LPCWSTR InitString)
+ {
+ DATA *pData = (DATA*)SHAlloc(sizeof(*pData));
+ if (!pData)
+ return E_OUTOFMEMORY;
+ ZeroMemory(pData, sizeof(*pData));
+ pData->InitFunc = InitFunc;
+ if (InitString && FAILED(SHStrDupW(InitString, &pData->InitString)))
+ {
+ FreeData(pData);
+ return E_OUTOFMEMORY;
+ }
+ if (pClsidDefault)
+ {
+ pData->ClsidDefault = *pClsidDefault;
+ pData->pClsidDefault = &pData->ClsidDefault;
+ }
+
+ HRESULT hr = S_OK;
+ if (pDO)
+ hr = CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDO, &pData->pObjStream);
+
+ const UINT flags = CTF_COINIT | CTF_PROCESS_REF | CTF_INSIST;
+ if (SUCCEEDED(hr) && !SHCreateThread(ShowPropertiesThread, pData, flags, NULL))
+ {
+ if (pData->pObjStream)
+ pData->pObjStream->Release();
+ hr = E_FAIL;
+ }
+ if (FAILED(hr))
+ FreeData(pData);
+ return hr;
+ }
+
+ static DWORD CALLBACK ShowPropertiesThread(LPVOID Param)
+ {
+ DATA *pData = (DATA*)Param;
+ CComPtr<IDataObject> pDO;
+ if (pData->pObjStream)
+ CoGetInterfaceAndReleaseStream(pData->pObjStream, IID_PPV_ARG(IDataObject, &pDO));
+ Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString);
+ FreeData(pData);
+ return 0;
+ }
+};
+
+static void CALLBACK
+FSFolderItemPropDialogInitCallback(LPCWSTR InitString, IDataObject *pDO, HKEY *hKeys, UINT *cKeys)
+{
+ UNREFERENCED_PARAMETER(InitString);
+ CDataObjectHIDA cida(pDO);
+ if (SUCCEEDED(cida.hr()) && cida->cidl)
+ {
+ PCUITEMID_CHILD pidl = HIDA_GetPIDLItem(cida, 0);
+ AddFSClassKeysToArray(1, &pidl, hKeys, cKeys); // Add file-type specific pages
+ }
+}
+
+static void CALLBACK
+ClassPropDialogInitCallback(LPCWSTR InitString, IDataObject *pDO, HKEY *hKeys, UINT *cKeys)
+{
+ UNREFERENCED_PARAMETER(pDO);
+ AddClassKeyToArray(InitString, hKeys, cKeys); // Add pages from HKCR\%ProgId% (with shellex\PropertySheetHandlers appended later)
+}
+
+HRESULT
+SHELL32_ShowFilesystemItemPropertiesDialogAsync(IDataObject *pDO)
+{
+ CDataObjectHIDA cida(pDO);
+ HRESULT hr = cida.hr();
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
+ const CLSID *pClsid = NULL;
+ ShellPropSheetDialog::PFNINITIALIZE InitFunc = NULL;
+ LPCWSTR InitString = NULL;
+
+ if (_ILIsDrive(HIDA_GetPIDLItem(cida, 0)))
+ {
+ pClsid = &CLSID_ShellDrvDefExt;
+ InitFunc = ClassPropDialogInitCallback;
+ InitString = L"Drive";
+ }
+ else
+ {
+ pClsid = &CLSID_ShellFileDefExt;
+ InitFunc = FSFolderItemPropDialogInitCallback;
+ }
+ ShellPropSheetDialog Dialog;
+ return Dialog.ShowAsync(pClsid, pDO, InitFunc, InitString);
+}
+
+HRESULT
+SHELL32_ShowShellExtensionProperties(const CLSID *pClsid, IDataObject *pDO)
+{
+ WCHAR ClassBuf[6 + 38 + 1] = L"CLSID\\";
+ StringFromGUID2(*pClsid, ClassBuf + 6, 38 + 1);
+ ShellPropSheetDialog Dialog;
+ return Dialog.ShowAsync(NULL, pDO, ClassPropDialogInitCallback, ClassBuf);
+}
+
+HRESULT
+SHELL_ShowItemIDListProperties(LPCITEMIDLIST pidl)
+{
+ assert(pidl);
+
+ CComHeapPtr<ITEMIDLIST> alloc;
+ if (IS_INTRESOURCE(pidl))
+ {
+ HRESULT hr = SHGetSpecialFolderLocation(NULL, LOWORD(pidl), const_cast<LPITEMIDLIST*>(&pidl));
+ if (FAILED(hr))
+ return hr;
+ alloc.Attach(const_cast<LPITEMIDLIST>(pidl));
+ }
+ SHELLEXECUTEINFOA sei = {
+ sizeof(sei), SEE_MASK_INVOKEIDLIST | SEE_MASK_ASYNCOK, NULL, "properties",
+ NULL, NULL, NULL, SW_SHOWNORMAL, NULL, const_cast<LPITEMIDLIST>(pidl)
+ };
+ return ShellExecuteExA(&sei) ? S_OK : HResultFromWin32(GetLastError());
+}
diff --git a/dll/win32/shell32/dialogs/recycler_prop.cpp b/dll/win32/shell32/dialogs/recycler_prop.cpp
index ea1c9ca2cef..d7f79251a3e 100644
--- a/dll/win32/shell32/dialogs/recycler_prop.cpp
+++ b/dll/win32/shell32/dialogs/recycler_prop.cpp
@@ -401,30 +401,8 @@ RecycleBinDlg(
return FALSE;
}
-BOOL SH_ShowRecycleBinProperties(WCHAR sDrive)
+HRESULT RecycleBin_AddPropSheetPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
{
- HPROPSHEETPAGE hpsp[1];
- PROPSHEETHEADERW psh;
- HPROPSHEETPAGE hprop;
- INT_PTR ret;
-
- ZeroMemory(&psh, sizeof(psh));
- psh.dwSize = sizeof(psh);
- psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE;
- psh.pszCaption = MAKEINTRESOURCEW(IDS_RECYCLEBIN_FOLDER_NAME);
- psh.hwndParent = NULL;
- psh.phpage = hpsp;
- psh.hInstance = shell32_hInstance;
-
- hprop = SH_CreatePropertySheetPage(IDD_RECYCLE_BIN_PROPERTIES, RecycleBinDlg, (LPARAM)sDrive, NULL);
- if (!hprop)
- {
- ERR("Failed to create property sheet\n");
- return FALSE;
- }
- hpsp[psh.nPages] = hprop;
- psh.nPages++;
-
- ret = PropertySheetW(&psh);
- return (ret >= 0);
+ HPROPSHEETPAGE hpsp = SH_CreatePropertySheetPage(IDD_RECYCLE_BIN_PROPERTIES, RecycleBinDlg, 0, NULL);
+ return AddPropSheetPage(hpsp, pfnAddPage, lParam);
}
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
index fd41debc914..040511f03e9 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -186,117 +186,22 @@ static BOOL DoEjectDrive(const WCHAR *physical, UINT nDriveType, INT *pnStringID
return bResult;
}
-// A callback function for finding the stub windows.
-static BOOL CALLBACK
-EnumStubProc(HWND hwnd, LPARAM lParam)
+static DWORD CALLBACK DoFormatDriveThread(LPVOID args)
{
- CSimpleArray<HWND> *pStubs = reinterpret_cast<CSimpleArray<HWND> *>(lParam);
-
- WCHAR szClass[64];
- GetClassNameW(hwnd, szClass, _countof(szClass));
-
- if (lstrcmpiW(szClass, L"StubWindow32") == 0)
- {
- pStubs->Add(hwnd);
- }
-
- return TRUE;
-}
-
-// Another callback function to find the owned window of the stub window.
-static BOOL CALLBACK
-EnumStubProc2(HWND hwnd, LPARAM lParam)
-{
- HWND *phwnd = reinterpret_cast<HWND *>(lParam);
-
- if (phwnd[0] == GetWindow(hwnd, GW_OWNER))
- {
- phwnd[1] = hwnd;
- return FALSE;
- }
-
- return TRUE;
-}
-
-// Parameters for format_drive_thread function below.
-struct THREAD_PARAMS
-{
- UINT nDriveNumber;
-};
-
-static unsigned __stdcall format_drive_thread(void *args)
-{
- THREAD_PARAMS *params = (THREAD_PARAMS *)args;
- UINT nDriveNumber = params->nDriveNumber;
- LONG_PTR nProp = nDriveNumber | 0x7F00;
-
- // Search the stub windows that already exist.
- CSimpleArray<HWND> old_stubs;
- EnumWindows(EnumStubProc, (LPARAM)&old_stubs);
-
- for (INT n = 0; n < old_stubs.GetSize(); ++n)
- {
- HWND hwndStub = old_stubs[n];
-
- // The target stub window has the prop.
- if (GetPropW(hwndStub, L"DriveNumber") == (HANDLE)nProp)
- {
- // Found.
- HWND ahwnd[2];
- ahwnd[0] = hwndStub;
- ahwnd[1] = NULL;
- EnumWindows(EnumStubProc2, (LPARAM)ahwnd);
-
- // Activate.
- BringWindowToTop(ahwnd[1]);
-
- delete params;
- return 0;
- }
- }
-
- // Create a stub window.
- DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION;
- DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW;
+ UINT nDrive = PtrToUlong(args);
+ WCHAR szPath[] = { LOWORD(L'A' + nDrive), L'\0' }; // Arbitrary, just needs to include nDrive
CStubWindow32 stub;
- if (!stub.Create(NULL, NULL, NULL, style, exstyle))
- {
- ERR("StubWindow32 creation failed\n");
- delete params;
- return 0;
- }
-
- // Add prop to the target stub window.
- SetPropW(stub, L"DriveNumber", (HANDLE)nProp);
-
- // Do format.
- SHFormatDrive(stub, nDriveNumber, SHFMT_ID_DEFAULT, 0);
-
- // Clean up.
- RemovePropW(stub, L"DriveNumber");
- stub.DestroyWindow();
- delete params;
-
- return 0;
+ HRESULT hr = stub.CreateStub(CStubWindow32::TYPE_FORMATDRIVE, szPath, NULL);
+ if (FAILED(hr))
+ return hr;
+ SHFormatDrive(stub, nDrive, SHFMT_ID_DEFAULT, 0);
+ return stub.DestroyWindow();
}
-static HRESULT DoFormatDrive(HWND hwnd, UINT nDriveNumber)
+static HRESULT DoFormatDriveAsync(HWND hwnd, UINT nDrive)
{
- THREAD_PARAMS *params = new THREAD_PARAMS;
- params->nDriveNumber = nDriveNumber;
-
- // Create thread to avoid locked.
- unsigned tid;
- HANDLE hThread = (HANDLE)_beginthreadex(NULL, 0, format_drive_thread, params, 0, &tid);
- if (hThread == NULL)
- {
- delete params;
- return E_FAIL;
- }
-
- CloseHandle(hThread);
-
- return S_OK;
+ BOOL succ = SHCreateThread(DoFormatDriveThread, UlongToPtr(nDrive), CTF_PROCESS_REF, NULL);
+ return succ ? S_OK : E_FAIL;
}
HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf,
@@ -388,20 +293,15 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf,
if (wParam == DFM_CMD_PROPERTIES)
{
- // pdtobj should be valid at this point!
ATLASSERT(pdtobj);
- hr = SH_ShowDriveProperties(wszBuf, pdtobj) ? S_OK : E_UNEXPECTED;
- if (FAILED(hr))
- {
- dwError = ERROR_CAN_NOT_COMPLETE;
- nStringID = IDS_CANTSHOWPROPERTIES;
- }
+ hr = SHELL32_ShowFilesystemItemPropertiesDialogAsync(pdtobj);
+ // Not setting nStringID because SHOpenPropSheet already displayed an error box
}
else
{
if (wParam == CMDID_FORMAT)
{
- hr = DoFormatDrive(hwnd, szDrive[0] - 'A');
+ hr = DoFormatDriveAsync(hwnd, szDrive[0] - 'A');
}
else if (wParam == CMDID_EJECT)
{
diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp
index bb73ec85407..9ae1f53da1f 100644
--- a/dll/win32/shell32/folders/CFSFolder.cpp
+++ b/dll/win32/shell32/folders/CFSFolder.cpp
@@ -1959,25 +1959,7 @@ HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObjec
{
if (uMsg == DFM_INVOKECOMMAND && wParam == IDC_PROPERTIES)
{
- // Create an data object
- CComHeapPtr<ITEMID_CHILD> pidlChild(ILClone(ILFindLastID(m_pidlRoot)));
- CComHeapPtr<ITEMIDLIST> pidlParent(ILClone(m_pidlRoot));
- ILRemoveLastID(pidlParent);
-
- CComPtr<IDataObject> pDataObj;
- HRESULT hr = SHCreateDataObject(pidlParent, 1, &pidlChild.m_pData, NULL, IID_PPV_ARG(IDataObject, &pDataObj));
- if (!FAILED_UNEXPECTEDLY(hr))
- {
- // Ask for a title to display
- CComHeapPtr<WCHAR> wszName;
- if (!FAILED_UNEXPECTEDLY(SHGetNameFromIDList(m_pidlRoot, SIGDN_PARENTRELATIVEPARSING, &wszName)))
- {
- BOOL bSuccess = SH_ShowPropertiesDialog(wszName, pDataObj);
- if (!bSuccess)
- ERR("SH_ShowPropertiesDialog failed\n");
- }
- }
- return hr;
+ return SHELL_ShowItemIDListProperties(m_pidlRoot);
}
else if (uMsg == DFM_MERGECONTEXTMENU)
{
diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
index 78b3d033ba2..a9660e216a8 100644
--- a/dll/win32/shell32/folders/CRecycleBin.cpp
+++ b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -919,9 +919,8 @@ HRESULT WINAPI CRecycleBin::GetCommandString(UINT_PTR idCommand, UINT uFlags, UI
HRESULT WINAPI CRecycleBin::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
{
- FIXME("%p %p %lu\n", this, pfnAddPage, lParam);
-
- return E_NOTIMPL;
+ extern HRESULT RecycleBin_AddPropSheetPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
+ return RecycleBin_AddPropSheetPages(pfnAddPage, lParam);
}
HRESULT WINAPI CRecycleBin::ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam)
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index 510727a6b67..b983b5496a2 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -881,6 +881,7 @@ static HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, HWND hwn
if (FAILED_UNEXPECTEDLY(hr))
return hr;
+ const CLSID* pCLSID;
CRegFolder *pRegFolder = static_cast<CRegFolder*>(psf);
const REQUIREDREGITEM* pRequired = pRegFolder->IsRequiredItem(apidl[0]);
if (pRequired && pRequired->pszCpl)
@@ -895,10 +896,17 @@ static HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, HWND hwn
hr = SHELL_ExecuteControlPanelCPL(hwnd, L"desk.cpl") ? S_OK : E_FAIL;
}
#endif
- else if (_ILIsDesktop(pidlFolder) && _ILIsBitBucket(apidl[0]))
+ else if ((pCLSID = pRegFolder->IsRegItem(apidl[0])) != NULL)
{
- FIXME("Use SHOpenPropSheet on Recyclers PropertySheetHandlers from the registry\n");
- hr = SH_ShowRecycleBinProperties(L'C') ? S_OK : E_FAIL;
+ if (CLSID_MyDocuments != *pCLSID)
+ {
+ hr = SHELL32_ShowShellExtensionProperties(pCLSID, pdtobj);
+ }
+ else
+ {
+ FIXME("ROS MyDocs must implement IShellPropSheetExt\n");
+ hr = S_FALSE; // Just display the filesystem properties
+ }
}
else
{
diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h
index 614478a3d08..a28c023d244 100644
--- a/dll/win32/shell32/precomp.h
+++ b/dll/win32/shell32/precomp.h
@@ -126,10 +126,10 @@ extern const GUID CLSID_UnixDosFolder;
extern const GUID SHELL32_AdvtShortcutProduct;
extern const GUID SHELL32_AdvtShortcutComponent;
-#define MAX_PROPERTY_SHEET_PAGE 32
-
#define VERBKEY_CCHMAX 64 // Note: 63+\0 seems to be the limit on XP
+#define MAX_PROPERTY_SHEET_PAGE 32
+
extern inline
BOOL
CALLBACK
@@ -146,8 +146,36 @@ AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam)
return FALSE;
}
+static inline HRESULT
+AddPropSheetPage(HPROPSHEETPAGE hPage, LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
+{
+ if (!hPage)
+ return E_FAIL;
+ if (pfnAddPage(hPage, lParam))
+ return S_OK;
+ DestroyPropertySheetPage(hPage);
+ return E_FAIL;
+}
+
+template<class T> static UINT CALLBACK
+PropSheetPageLifetimeCallback(HWND hWnd, UINT uMsg, PROPSHEETPAGEW *pPSP)
+{
+ if (uMsg == PSPCB_RELEASE)
+ ((T*)(pPSP->lParam))->Release();
+ return TRUE;
+}
+
+EXTERN_C HRESULT WINAPI
+SHMultiFileProperties(IDataObject *pDataObject, DWORD dwFlags);
HRESULT
SHELL32_ShowPropertiesDialog(IDataObject *pdtobj);
+HRESULT
+SHELL32_ShowFilesystemItemPropertiesDialogAsync(IDataObject *pDO);
+HRESULT
+SHELL32_ShowShellExtensionProperties(const CLSID *pClsid, IDataObject *pDO);
+HRESULT
+SHELL_ShowItemIDListProperties(LPCITEMIDLIST pidl);
+
HRESULT
SHELL32_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdo, UINT msg);
UINT
@@ -167,12 +195,29 @@ static inline UINT SeeFlagsToCmicFlags(UINT flags)
// CStubWindow32 --- The owner window of file property sheets.
// This window hides taskbar button of property sheet.
+#define CSTUBWINDOW32_CLASSNAME _T("StubWindow32")
class CStubWindow32 : public CWindowImpl<CStubWindow32>
{
+ static HWND FindStubWindow(UINT Type, LPCWSTR Path);
public:
- DECLARE_WND_CLASS_EX(_T("StubWindow32"), 0, COLOR_WINDOWTEXT)
+ DECLARE_WND_CLASS_EX(CSTUBWINDOW32_CLASSNAME, 0, COLOR_WINDOWTEXT)
+ enum {
+ TYPE_FORMATDRIVE = 1,
+ TYPE_PROPERTYSHEET,
+ };
+ static LPCWSTR GetTypePropName() { return L"StubType"; }
+ HRESULT CreateStub(UINT Type, LPCWSTR Path, const POINT *pPt);
+
+ LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+ {
+ if (HICON hIco = (HICON)SendMessage(WM_SETICON, ICON_BIG, NULL))
+ DestroyIcon(hIco);
+ ::RemovePropW(m_hWnd, GetTypePropName());
+ return 0;
+ }
BEGIN_MSG_MAP(CStubWindow32)
+ MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
END_MSG_MAP()
};
diff --git a/dll/win32/shell32/propsheet.cpp b/dll/win32/shell32/propsheet.cpp
new file mode 100644
index 00000000000..3fccaa0ac1a
--- /dev/null
+++ b/dll/win32/shell32/propsheet.cpp
@@ -0,0 +1,211 @@
+/*
+ * PROJECT: shell32
+ * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+)
+ * PURPOSE: SHOpenPropSheetW implementation
+ * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me>
+ */
+
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+static HRESULT
+SHELL_GetShellExtensionRegCLSID(HKEY hKey, LPCWSTR KeyName, CLSID &clsid)
+{
+ // First try the key name
+ if (SUCCEEDED(SHCLSIDFromStringW(KeyName, &clsid)))
+ return S_OK;
+ WCHAR buf[42];
+ DWORD cb = sizeof(buf);
+ // and then the default value
+ DWORD err = RegGetValueW(hKey, KeyName, NULL, RRF_RT_REG_SZ, NULL, buf, &cb);
+ return !err ? SHCLSIDFromStringW(buf, &clsid) : HRESULT_FROM_WIN32(err);
+}
+
+static HRESULT
+SHELL_InitializeExtension(REFCLSID clsid, PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pDO, HKEY hkeyProgID, REFIID riid, void **ppv)
+{
+ *ppv = NULL;
+ IUnknown *pUnk;
+ HRESULT hr = SHCoCreateInstance(NULL, &clsid, NULL, riid, (void**)&pUnk);
+ if (SUCCEEDED(hr))
+ {
+ CComPtr<IShellExtInit> Init;
+ hr = pUnk->QueryInterface(IID_PPV_ARG(IShellExtInit, &Init));
+ if (SUCCEEDED(hr))
+ hr = Init->Initialize(pidlFolder, pDO, hkeyProgID);
+
+ if (SUCCEEDED(hr))
+ *ppv = (void*)pUnk;
+ else
+ pUnk->Release();
+ }
+ return hr;
+}
+
+static HRESULT
+AddPropSheetHandlerPages(REFCLSID clsid, IDataObject *pDO, HKEY hkeyProgID, PROPSHEETHEADERW &psh)
+{
+ CComPtr<IShellPropSheetExt> SheetExt;
+ HRESULT hr = SHELL_InitializeExtension(clsid, NULL, pDO, hkeyProgID, IID_PPV_ARG(IShellPropSheetExt, &SheetExt));
+ if (SUCCEEDED(hr))
+ {
+ UINT OldCount = psh.nPages;
+ hr = SheetExt->AddPages(AddPropSheetPageCallback, (LPARAM)&psh);
+ // The returned index is one-based (relative to this extension).
+ // See https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobji…
+ if (hr > 0)
+ {
+ hr += OldCount;
+ psh.nStartPage = hr - 1;
+ }
+ }
+ return hr;
+}
+
+static HRESULT
+SHELL_CreatePropSheetStubWindow(CStubWindow32 &stub, PCIDLIST_ABSOLUTE pidl, const POINT *pPt)
+{
+ PWSTR Path;
+ if (!pidl || FAILED(SHGetNameFromIDList(pidl, SIGDN_DESKTOPABSOLUTEPARSING, &Path)))
+ Path = NULL; // If we can't get a path, we simply will not be able to reuse this window
+
+ HRESULT hr = stub.CreateStub(CStubWindow32::TYPE_PROPERTYSHEET, Path, pPt);
+ SHFree(Path);
+ UINT flags = SHGFI_ICON | SHGFI_ADDOVERLAYS;
+ SHFILEINFO sfi;
+ if (SUCCEEDED(hr) && SHGetFileInfoW((LPWSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL | flags))
+ stub.SendMessage(WM_SETICON, ICON_BIG, (LPARAM)sfi.hIcon);
+ return hr;
+}
+
+/*************************************************************************
+ * SHELL32_PropertySheet [INTERNAL]
+ * PropertySheetW with stub window.
+ */
+static INT_PTR
+SHELL32_PropertySheet(LPPROPSHEETHEADERW ppsh, IDataObject *pDO)
+{
+ CStubWindow32 stub;
+ POINT pt, *ppt = NULL;
+ if (pDO && SUCCEEDED(DataObject_GetOffset(pDO, &pt)))
+ ppt = &pt;
+ PIDLIST_ABSOLUTE pidl = SHELL_DataObject_ILCloneFullItem(pDO, 0);
+ HRESULT hr = SHELL_CreatePropSheetStubWindow(stub, pidl, ppt);
+ ILFree(pidl);
+ if (FAILED(hr))
+ return hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) ? 0 : -1;
+
+ INT_PTR Result = -1;
+ ppsh->hwndParent = stub;
+ if (ppsh->nPages)
+ {
+ Result = PropertySheetW(ppsh);
+ }
+ else
+ {
+ WCHAR szFormat[128], szMessage[_countof(szFormat) + 42];
+ LoadStringW(shell32_hInstance, IDS_CANTSHOWPROPERTIES, szFormat, _countof(szFormat));
+ wsprintfW(szMessage, szFormat, ERROR_CAN_NOT_COMPLETE);
+ MessageBoxW(NULL, szMessage, NULL, MB_ICONERROR);
+ }
+ stub.DestroyWindow();
+ return Result;
+}
+
+/*************************************************************************
+ * SHELL32_OpenPropSheet [INTERNAL]
+ * The real implementation of SHOpenPropSheetW.
+ */
+static BOOL
+SHELL32_OpenPropSheet(LPCWSTR pszCaption, HKEY *ahKeys, UINT cKeys,
+ const CLSID *pclsidDefault, IDataObject *pDO, LPCWSTR pStartPage)
+{
+ HKEY hKeyProgID = cKeys ? ahKeys[cKeys - 1] : NULL; // Windows uses the last key for some reason
+ HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE];
+ PROPSHEETHEADERW psh = { sizeof(psh), PSH_PROPTITLE };
+ psh.phpage = hppages;
+ psh.hInstance = shell32_hInstance;
+ psh.pszCaption = pszCaption;
+ psh.pStartPage = pStartPage;
+
+ if (pclsidDefault)
+ AddPropSheetHandlerPages(*pclsidDefault, pDO, hKeyProgID, psh);
+
+ for (UINT i = 0; i < cKeys; ++i)
+ {
+ // Note: We can't use SHCreatePropSheetExtArrayEx because we need the AddPages() return value (see AddPropSheetHandlerPages).
+ HKEY hKey;
+ if (RegOpenKeyExW(ahKeys[i], L"shellex\\PropertySheetHandlers", 0, KEY_ENUMERATE_SUB_KEYS, &hKey))
+ continue;
+ for (UINT index = 0;; ++index)
+ {
+ WCHAR KeyName[MAX_PATH];
+ LRESULT err = RegEnumKeyW(hKey, index, KeyName, _countof(KeyName));
+ KeyName[_countof(KeyName)-1] = UNICODE_NULL;
+ if (err == ERROR_MORE_DATA)
+ continue;
+ if (err)
+ break;
+ CLSID clsid;
+ if (SUCCEEDED(SHELL_GetShellExtensionRegCLSID(hKey, KeyName, clsid)))
+ AddPropSheetHandlerPages(clsid, pDO, hKeyProgID, psh);
+ }
+ RegCloseKey(hKey);
+ }
+
+ if (pStartPage == psh.pStartPage && pStartPage)
+ psh.dwFlags |= PSH_USEPSTARTPAGE;
+ INT_PTR Result = SHELL32_PropertySheet(&psh, pDO);
+ return (Result != -1);
+}
+
+/*************************************************************************
+ * SHOpenPropSheetW [SHELL32.80]
+ *
+ * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopen…
+ */
+EXTERN_C BOOL WINAPI
+SHOpenPropSheetW(
+ _In_opt_ LPCWSTR pszCaption,
+ _In_opt_ HKEY *ahKeys,
+ _In_ UINT cKeys,
+ _In_ const CLSID *pclsidDefault,
+ _In_ IDataObject *pDataObject,
+ _In_opt_ IShellBrowser *pShellBrowser,
+ _In_opt_ LPCWSTR pszStartPage)
+{
+ UNREFERENCED_PARAMETER(pShellBrowser); /* MSDN says "Not used". */
+ return SHELL32_OpenPropSheet(pszCaption, ahKeys, cKeys, pclsidDefault, pDataObject, pszStartPage);
+}
+
+/*************************************************************************
+ * SH_CreatePropertySheetPage [Internal]
+ *
+ * creates a property sheet page from a resource id
+ */
+HPROPSHEETPAGE
+SH_CreatePropertySheetPageEx(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam,
+ LPCWSTR pwszTitle, LPFNPSPCALLBACK Callback)
+{
+ PROPSHEETPAGEW Page = { sizeof(Page), PSP_DEFAULT, shell32_hInstance };
+ Page.pszTemplate = MAKEINTRESOURCEW(wDialogId);
+ Page.pfnDlgProc = pfnDlgProc;
+ Page.lParam = lParam;
+ Page.pszTitle = pwszTitle;
+ Page.pfnCallback = Callback;
+
+ if (pwszTitle)
+ Page.dwFlags |= PSP_USETITLE;
+
+ if (Callback)
+ Page.dwFlags |= PSP_USECALLBACK;
+
+ return CreatePropertySheetPageW(&Page);
+}
+
+HPROPSHEETPAGE
+SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle)
+{
+ return SH_CreatePropertySheetPageEx(wDialogId, pfnDlgProc, lParam, pwszTitle, NULL);
+}
diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp
index 3d55c35794f..a43afe2dc60 100644
--- a/dll/win32/shell32/shell32.cpp
+++ b/dll/win32/shell32/shell32.cpp
@@ -275,6 +275,8 @@ BEGIN_OBJECT_MAP(ObjectMap)
OBJECT_ENTRY(CLSID_ShellFSFolder, CFSFolder)
OBJECT_ENTRY(CLSID_MyComputer, CDrivesFolder)
OBJECT_ENTRY(CLSID_ShellDesktop, CDesktopFolder)
+ OBJECT_ENTRY(CLSID_ShellFileDefExt, CFileDefExt)
+ OBJECT_ENTRY(CLSID_ShellDrvDefExt, CDrvDefExt)
OBJECT_ENTRY(CLSID_ShellItem, CShellItem)
OBJECT_ENTRY(CLSID_ShellLink, CShellLink)
OBJECT_ENTRY(CLSID_Shell, CShellDispatch)
diff --git a/dll/win32/shell32/shfldr.h b/dll/win32/shell32/shfldr.h
index ff397123b8e..b9cd4012864 100644
--- a/dll/win32/shell32/shfldr.h
+++ b/dll/win32/shell32/shfldr.h
@@ -126,8 +126,6 @@ HRESULT SHELL32_BindToSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* pp
extern "C"
BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey);
-void AddFSClassKeysToArray(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, HKEY* array, UINT* cKeys);
-
HRESULT CDefViewBckgrndMenu_CreateInstance(IShellFolder* psf, REFIID riid, void **ppv);
HRESULT SH_GetApidlFromDataObject(IDataObject *pDataObject, PIDLIST_ABSOLUTE* ppidlfolder, PUITEMID_CHILD **apidlItems, UINT *pcidl);
@@ -156,11 +154,26 @@ static __inline int SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str)
void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags);
BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath);
+void CloseRegKeyArray(HKEY* array, UINT cKeys);
LSTATUS AddClassKeyToArray(const WCHAR* szClass, HKEY* array, UINT* cKeys);
LSTATUS AddClsidKeyToArray(REFCLSID clsid, HKEY* array, UINT* cKeys);
+void AddFSClassKeysToArray(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, HKEY* array, UINT* cKeys);
#ifdef __cplusplus
+struct CRegKeyHandleArray
+{
+ HKEY hKeys[16];
+ UINT cKeys;
+
+ CRegKeyHandleArray() : cKeys(0) {}
+ ~CRegKeyHandleArray() { CloseRegKeyArray(hKeys, cKeys); }
+ operator HKEY*() { return hKeys; }
+ operator UINT*() { return &cKeys; }
+ operator UINT() { return cKeys; }
+ HKEY& operator [](SIZE_T i) { return hKeys[i]; }
+};
+
HRESULT inline SHSetStrRet(LPSTRRET pStrRet, DWORD resId)
{
return SHSetStrRet(pStrRet, shell32_hInstance, resId);
diff --git a/dll/win32/shell32/shldataobject.cpp b/dll/win32/shell32/shldataobject.cpp
index fb50c78e7ac..3a7d651424f 100644
--- a/dll/win32/shell32/shldataobject.cpp
+++ b/dll/win32/shell32/shldataobject.cpp
@@ -106,6 +106,8 @@ PIDLIST_ABSOLUTE SHELL_CIDA_ILCloneFull(_In_ const CIDA *pCIDA, _In_ UINT Index)
PIDLIST_ABSOLUTE SHELL_DataObject_ILCloneFullItem(_In_ IDataObject *pDO, _In_ UINT Index)
{
+ if (!pDO)
+ return NULL;
CDataObjectHIDA cida(pDO);
return SUCCEEDED(cida.hr()) ? SHELL_CIDA_ILCloneFull(cida, Index) : NULL;
}
diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp
index 37658ced2aa..4e08e19f54f 100644
--- a/dll/win32/shell32/shlfolder.cpp
+++ b/dll/win32/shell32/shlfolder.cpp
@@ -302,6 +302,12 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST
return MAKE_COMPARE_HRESULT(ret);
}
+void CloseRegKeyArray(HKEY* array, UINT cKeys)
+{
+ for (UINT i = 0; i < cKeys; ++i)
+ RegCloseKey(array[i]);
+}
+
LSTATUS AddClassKeyToArray(const WCHAR* szClass, HKEY* array, UINT* cKeys)
{
if (*cKeys >= 16)
@@ -495,36 +501,6 @@ SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder,
return E_FAIL;
}
-static
-DWORD WINAPI
-_ShowPropertiesDialogThread(LPVOID lpParameter)
-{
- CComPtr<IDataObject> pDataObject;
- pDataObject.Attach((IDataObject*)lpParameter);
-
- CDataObjectHIDA cida(pDataObject);
-
- if (FAILED_UNEXPECTEDLY(cida.hr()))
- return cida.hr();
-
- if (cida->cidl > 1)
- {
- ERR("SHMultiFileProperties is not yet implemented\n");
- return E_FAIL;
- }
-
- CComHeapPtr<ITEMIDLIST> completePidl(ILCombine(HIDA_GetPIDLFolder(cida), HIDA_GetPIDLItem(cida, 0)));
- CComHeapPtr<WCHAR> wszName;
- if (FAILED_UNEXPECTEDLY(SHGetNameFromIDList(completePidl, SIGDN_PARENTRELATIVEPARSING, &wszName)))
- return 0;
-
- BOOL bSuccess = SH_ShowPropertiesDialog(wszName, pDataObject);
- if (!bSuccess)
- ERR("SH_ShowPropertiesDialog failed\n");
-
- return 0;
-}
-
/*
* for internal use
*/
@@ -534,16 +510,15 @@ SHELL32_ShowPropertiesDialog(IDataObject *pdtobj)
if (!pdtobj)
return E_INVALIDARG;
- pdtobj->AddRef();
- if (!SHCreateThread(_ShowPropertiesDialogThread, pdtobj, CTF_INSIST | CTF_COINIT | CTF_PROCESS_REF, NULL))
- {
- pdtobj->Release();
- return HResultFromWin32(GetLastError());
- }
- else
+ CDataObjectHIDA cida(pdtobj);
+ if (FAILED_UNEXPECTEDLY(cida.hr()))
+ return cida.hr();
+ if (cida->cidl > 1)
{
- return S_OK;
+ ERR("SHMultiFileProperties is not yet implemented\n");
+ return E_FAIL;
}
+ return SHELL32_ShowFilesystemItemPropertiesDialogAsync(pdtobj);
}
HRESULT
diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp
index 6b6e1416788..77e674e795f 100644
--- a/dll/win32/shell32/stubs.cpp
+++ b/dll/win32/shell32/stubs.cpp
@@ -210,25 +210,6 @@ SHGetSetFolderCustomSettingsA(LPSHFOLDERCUSTOMSETTINGSA pfcs,
return E_FAIL;
}
-/*************************************************************************
- * SHOpenPropSheetW [SHELL32.80]
- *
- * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopen…
- */
-BOOL WINAPI
-SHOpenPropSheetW(
- _In_opt_ LPCWSTR pszCaption,
- _In_opt_ HKEY *ahKeys,
- _In_ UINT cKeys,
- _In_ const CLSID *pclsidDefault,
- _In_ IDataObject *pDataObject,
- _In_opt_ IShellBrowser *pShellBrowser,
- _In_opt_ LPCWSTR pszStartPage)
-{
- FIXME("SHOpenPropSheetW() stub\n");
- return FALSE;
-}
-
/*
* Unimplemented
*/
diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp
index 3fdce2eb5e3..ce2f6f40834 100644
--- a/dll/win32/shell32/utils.cpp
+++ b/dll/win32/shell32/utils.cpp
@@ -9,6 +9,39 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
+HWND
+CStubWindow32::FindStubWindow(UINT Type, LPCWSTR Path)
+{
+ for (HWND hWnd, hWndAfter = NULL;;)
+ {
+ hWnd = hWndAfter = FindWindowExW(NULL, hWndAfter, CSTUBWINDOW32_CLASSNAME, Path);
+ if (!hWnd || !Path)
+ return NULL;
+ if (GetPropW(hWnd, GetTypePropName()) == ULongToHandle(Type))
+ return hWnd;
+ }
+}
+
+HRESULT
+CStubWindow32::CreateStub(UINT Type, LPCWSTR Path, const POINT *pPt)
+{
+ if (HWND hWnd = FindStubWindow(Type, Path))
+ {
+ ::SwitchToThisWindow(::GetLastActivePopup(hWnd), TRUE);
+ return HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS);
+ }
+ RECT rcPosition = { pPt ? pPt->x : CW_USEDEFAULT, pPt ? pPt->y : CW_USEDEFAULT, 0, 0 };
+ DWORD Style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION;
+ DWORD ExStyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW;
+ if (!Create(NULL, rcPosition, Path, Style, ExStyle))
+ {
+ ERR("StubWindow32 creation failed\n");
+ return E_FAIL;
+ }
+ ::SetPropW(*this, GetTypePropName(), ULongToHandle(Type));
+ return S_OK;
+}
+
HRESULT
SHILClone(
_In_opt_ LPCITEMIDLIST pidl,
diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h
index 4392a50659a..d40e1a164b3 100644
--- a/dll/win32/shell32/wine/shell32_main.h
+++ b/dll/win32/shell32/wine/shell32_main.h
@@ -198,12 +198,9 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN;
/* Detect Shell Links */
BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN;
-INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle);
-BOOL SH_ShowDriveProperties(WCHAR *drive, IDataObject *pDataObj);
-BOOL SH_ShowRecycleBinProperties(WCHAR sDrive);
-BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, IDataObject *pDataObj);
+HPROPSHEETPAGE SH_CreatePropertySheetPageEx(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam,
+ LPCWSTR pwszTitle, LPFNPSPCALLBACK Callback);
LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf);
HRESULT WINAPI DoRegisterServer(void);
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53f498c96849edf7d9105…
commit 53f498c96849edf7d9105c8e0943fc426792b8c4
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sat Nov 16 21:48:13 2024 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Wed Nov 27 10:50:03 2024 +0200
[SDK][PSEH] Improve PSEH a bit
Add PSEH include dir globally, include pseh2.h from excpt.h and add compatibility macros to reduce hacks in 3rd-perty code.
---
CMakeLists.txt | 5 +++--
base/setup/lib/CMakeLists.txt | 1 -
modules/rostests/apitests/compiler/ms/seh/seh.h | 3 ---
sdk/include/vcruntime/excpt.h | 13 +++++++++----
sdk/lib/pseh/i386/pseh3.c | 5 +++--
sdk/lib/pseh/include/pseh/pseh2.h | 11 ++++++++++-
sdk/lib/pseh/include/pseh/pseh2_64.h | 11 +++++++++++
7 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 787f8e920ec..13916a9362a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,7 +324,8 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
sdk/include/ddk
sdk/include/ndk
sdk/include/reactos
- sdk/include/reactos/libs)
+ sdk/include/reactos/libs
+ sdk/lib/pseh/include)
if(ARCH STREQUAL "arm")
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
@@ -341,7 +342,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
add_subdirectory(sdk/include/asm)
if(ARCH MATCHES "64$")
- include(sdk/cmake/baseaddress64.cmake)
+ include(sdk/cmake/baseaddress64.cmake)
elseif(NO_ROSSYM)
include(sdk/cmake/baseaddress_dwarf.cmake)
elseif(MSVC)
diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt
index 34b43018c23..836c9ef5967 100644
--- a/base/setup/lib/CMakeLists.txt
+++ b/base/setup/lib/CMakeLists.txt
@@ -5,7 +5,6 @@ if(_WINKD_)
endif()
include_directories(spapisup utils)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/pseh/include)
list(APPEND SOURCE
spapisup/fileqsup.c
diff --git a/modules/rostests/apitests/compiler/ms/seh/seh.h b/modules/rostests/apitests/compiler/ms/seh/seh.h
index 35370152d24..0dc184001b4 100644
--- a/modules/rostests/apitests/compiler/ms/seh/seh.h
+++ b/modules/rostests/apitests/compiler/ms/seh/seh.h
@@ -23,9 +23,6 @@
#define leave _SEH2_LEAVE
#define endtry _SEH2_END
#define abnormal_termination _abnormal_termination
-#define GetExceptionInformation() _SEH2_GetExceptionInformation()
-#define GetExceptionCode() _SEH2_GetExceptionCode()
-#define AbnormalTermination() _SEH2_AbnormalTermination()
#define gcc_volatile volatile
#endif
diff --git a/sdk/include/vcruntime/excpt.h b/sdk/include/vcruntime/excpt.h
index 798b19180f1..8bd6e90cc46 100644
--- a/sdk/include/vcruntime/excpt.h
+++ b/sdk/include/vcruntime/excpt.h
@@ -8,6 +8,10 @@
#include <vcruntime.h>
+#if !defined(RC_INVOKED)
+#include <pseh/pseh2.h>
+#endif
+
#pragma pack(push,_CRT_PACKING)
#ifdef __cplusplus
@@ -71,16 +75,17 @@ typedef enum _EXCEPTION_DISPOSITION
#endif
#if defined(_MSC_VER) || (defined(__clang__) && defined(__SEH__))
+ unsigned long __cdecl _exception_code(void);
+ void *__cdecl _exception_info(void);
+ int __cdecl _abnormal_termination(void);
+#endif
+
#define GetExceptionCode _exception_code
#define exception_code _exception_code
#define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info
#define exception_info (struct _EXCEPTION_POINTERS *)_exception_info
#define AbnormalTermination _abnormal_termination
#define abnormal_termination _abnormal_termination
- unsigned long __cdecl _exception_code(void);
- void *__cdecl _exception_info(void);
- int __cdecl _abnormal_termination(void);
-#endif
#define EXCEPTION_EXECUTE_HANDLER 1
#define EXCEPTION_CONTINUE_SEARCH 0
diff --git a/sdk/lib/pseh/i386/pseh3.c b/sdk/lib/pseh/i386/pseh3.c
index ed7e0f43ad9..35db77d58b0 100644
--- a/sdk/lib/pseh/i386/pseh3.c
+++ b/sdk/lib/pseh/i386/pseh3.c
@@ -30,12 +30,13 @@
* |-----------|
*/
+/* We need the full structure with all non-volatile */
+#define _SEH3$_FRAME_ALL_NONVOLATILES 1
+
#include <stdarg.h>
#include <windef.h>
#include <winnt.h>
-/* We need the full structure with all non-volatile */
-#define _SEH3$_FRAME_ALL_NONVOLATILES 1
#include "pseh3.h"
#include "pseh3_asmdef.h"
diff --git a/sdk/lib/pseh/include/pseh/pseh2.h b/sdk/lib/pseh/include/pseh/pseh2.h
index 407557f2152..523d9ddd161 100644
--- a/sdk/lib/pseh/include/pseh/pseh2.h
+++ b/sdk/lib/pseh/include/pseh/pseh2.h
@@ -25,7 +25,6 @@
#if defined(_USE_NATIVE_SEH) || (defined(_MSC_VER) && !(defined(__clang__) && defined(_M_AMD64)))
-#include <excpt.h>
#define _SEH2_TRY __try
#define _SEH2_FINALLY __finally
#define _SEH2_EXCEPT(...) __except(__VA_ARGS__)
@@ -37,6 +36,8 @@
#define _SEH2_LEAVE __leave
#define _SEH2_VOLATILE
+#define __endtry
+
#elif defined(__GNUC__) && !defined(__clang__) && defined(_M_AMD64)
#include "pseh2_64.h"
@@ -101,6 +102,14 @@ _Pragma("GCC diagnostic pop")
#define _SEH2_YIELD(x) x
#define _SEH2_VOLATILE volatile
+#ifndef __try // Conflict with GCC's STL
+#define __try _SEH3_TRY
+#define __except _SEH3_EXCEPT
+#define __finally _SEH3_FINALLY
+#define __endtry _SEH3_END
+#define __leave _SEH3_LEAVE
+#endif
+
#elif defined(__GNUC__)
struct _EXCEPTION_RECORD;
diff --git a/sdk/lib/pseh/include/pseh/pseh2_64.h b/sdk/lib/pseh/include/pseh/pseh2_64.h
index 29af396a714..7d9414ddd2b 100644
--- a/sdk/lib/pseh/include/pseh/pseh2_64.h
+++ b/sdk/lib/pseh/include/pseh/pseh2_64.h
@@ -173,3 +173,14 @@ __seh2$$begin_except__: __MINGW_ATTRIB_UNUSED;
#define _SEH2_LEAVE goto __seh2$$leave_scope__
#define _SEH2_YIELD(__stmt) __stmt
#define _SEH2_VOLATILE volatile
+
+#ifndef __try // Conflict with GCC's STL
+#define __try _SEH2_TRY
+#define __except _SEH2_EXCEPT
+#define __finally _SEH2_FINALLY
+#define __endtry _SEH2_END
+#define __leave goto __seh2$$leave_scope__
+#define _exception_info() __seh2$$exception_ptr__
+#define _exception_code() __seh2$$exception_code__
+#define _abnormal_termination() __seh2$$abnormal_termination__
+#endif
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a61dd7fe771cb2a6b122…
commit 3a61dd7fe771cb2a6b122ec93a94bee28421fc14
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Wed Nov 27 10:37:18 2024 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Nov 27 10:37:18 2024 +0200
[CRT] Sync wine code to wine-7.0 (#7520)
* [WINESYNC] msvcrt: Respect allocation mode in malloc.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 70ac780e6ed26380fd2fcdfbb96352ca8548bc79 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _callnewh in operator new implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 7e9cba139d30d3b48567baaf6a8b901143c738e7 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Reimplement _set_new_mode function.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6113a251ef3955f2ac3436d90a523faf4c03bc0a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] ucrtbase: Change ptd fields offsets to match with native.
Makes it possible to use native vcruntime140_1.dll.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 9b94e4c80580325e62097ed6c08cc37c28575470 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 3f8ac955de59da9f81a17ccf9d20c7402d6b1773 by Jacek Caban <jacek(a)codeweavers.com>
* [WINESYNC] msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 95e117b3dcd604b544b816c230a4ee8252f0f2f9 by Jacek Caban <jacek(a)codeweavers.com>
* [WINESYNC] msvcrt: Use internal sprintf implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id bfa1e3ef8f592d74f1dfcc89ba940946ad327591 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Print assertion failure messages to stderr.
This matches Windows behaviour. In particular, redirecting stderr with freopen()
followed by assert(0) will print the failure message to the relevant file.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 3533605293e8083dae19c5fbd41e2077faf5adc6 by Zebediah Figura <z.figura12(a)gmail.com>
* [WINESYNC] msvcrt: Don't use strncmpW in msvcrt_get_flags.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c6f19b121e74935689eb9666d0d21729a713c2ad by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _wcsnicmp instead of strnicmpW.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 54b2a10659871032720df31ae9ca6cba2ff4acf0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use tolowerW in _tolower_l.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 0b35b779151d766f6741bc32d3b6d3c8d81f1cc4 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use tolowerW.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id bc47bff4a888872363005da93fe0b714493c835b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use toupperW.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a81f55093e11a12c25938dada2e3d7f0c8dfe86c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcalnum_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 19c05e60a3cbb7dfa040b919e8783d571fc6ae01 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcdigit_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id fd74aeb726e65c62a9e110bdbf282549cb8afce0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcgraph_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 71cd3d5e8ce831abe5f601671b307ecff8692f01 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcalpha_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 5f294e34d6eab6a217991994443c347aa44684b7 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbclower_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1ad209428442e5c571b8a8478c3821e6c303b3a9 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcupper_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 95b3ff9f74ada220295128ceee34a8e191b93baa by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcprint_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1750a6969becfb02f0fee9447878d4374db652ab by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add _ismbcpunct_l implementation.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 986aa52fc41e1cf022cc72a0f40996937bb567dc by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use get_char_typeW in _iswctype_l.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 068a419e4219c5bb5d8156ff9177676d9c174021 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Copy wcscat implementation from ntdll.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2c5bf68a5e7525ae9c50ee0dfc6d819da79c4861 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use wine/unicode.h header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 536be09b8449537925ad4635a06ae45283075c2e by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 450015781e7ad45a79df01225ee75271563317ce by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Don't use strtold in __STRINGTOLD_L.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a22adf1893d510660d7eeea5ef290399ce21e8b5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] ucrtbase: Support _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING flag in printf.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 25cc6ff62d22220f6da742fa47a7f5fe80ed0c1b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Handle rethrowing from nested try blocks on x64.
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f65fb09dff86dbb87564264481a23b1179e8d890 by Paul Gofman <pgofman(a)codeweavers.com>
* [WINESYNC] msvcr120: Add imaxabs.
Signed-off-by: Myah Caron <qsniyg(a)protonmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1bb193238fa9eb73668b1dd1bb086105af25727c by Myah Caron <qsniyg(a)protonmail.com>
* [WINESYNC] msvcrt: Fix count parameter type in printf functions family.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 68ca61a555b3118836dbf7b666686e1de3d988b0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Implement _mbbtype_l().
Fixes Midnight Castle Succubus.
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id ebe3fe536c6c0eb8d8144e9235ea8d1f88aa5657 by Paul Gofman <pgofman(a)codeweavers.com>
* [WINESYNC] msvcrt: Terminate on noexcept function trying to propagate exception (i386).
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 26c1f8fb07790f51c0fbe0012144e213edccd8ed by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Terminate on noexcept function trying to propagate exception (x86_64).
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 8468a3ed77ba22d9a33b2251240e2a4e5462e1b7 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Make locale and thread helper functions CDECL.
This prevent callers from having to save SSE registers to the stack.
It is for instance the case in MSVCRT__towlower_l, which is called on
every character by MSVCRT__wcsicmp_l.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a24ad51e3f2515c1970b56f8dfe2206e2b282dc9 by Rémi Bernon <rbernon(a)codeweavers.com>
* [WINESYNC] msvcrt: Introduce noalloc current locale lookup helpers.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id faf92fdedb16a6e35c556e389bf5ac7241058f75 by Rémi Bernon <rbernon(a)codeweavers.com>
* [WINESYNC] msvcrt: Add floating point classification macros.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id b9002cc8c7ae16b4a61476834318bcefd638e34f by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Use the msvcrt math functions internally.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1be5e83859229d0e8a6c4fb3913865beea00a085 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Use the msvcrt ctype functions internally.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id b7fe06d0fa6dbad7d2c3ae380557adcaa10b89f8 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Use the msvcrt atoi() function internally.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f48648aeec69f74899ba2f074b60aeb0de03615b by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Use the msvcrt string functions internally.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2fb08bed46fec302954578038566593bb108b57c by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Move math functions to a new Unix library.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c72e1b096d16a1e9a36b86fbc8c403ec3653a504 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Share ctype tables between threadlocinfo instances.
Signed-off-by: Chip Davis <cdavis(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 5ec7cb5a7f20afd6eef33d5799fb4c5c1ddaebe1 by Chip Davis <cdavis(a)codeweavers.com>
* [WINESYNC] msvcrt: Share __lc_time_data between threadlocinfo instances.
My testing shows that unk[1] is some sort of refcount.
Signed-off-by: Chip Davis <cdavis(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 898abfc18f409357939e66cd9a6767d4bc5b0672 by Chip Davis <cdavis(a)codeweavers.com>
* [WINESYNC] msvcrt: Enable multi-thread locking by default.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6482ce7666a5f8beb92879af5ae3fde3782627d7 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Build with msvcrt headers.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 191bdeaff3676f192148e17c6369865ec94c2ba2 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Don't overwrite threadmbcinfostruct structure in _setmbcp.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 35a8f15361022d9195bd141aa67b22e06007fa16 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt/tests: Remove the headers test.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 86b0a633c68dfceb884a74528c407ba359f10991 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Remove some duplicate definitions from msvcrt.h.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1f11f41f613264dd5b937d0df0a3ee746db0517c by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Move the fenv_t definition to the public header.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 34422eb56cad1ba799270bc6dd56f31bec86023a by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Use the public standard type definitions where possible in msvcrt.h.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 0edef50dfae4ec294a949654fa1e03700b954dcb by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Introduce flags field to describe locale stored in thread data.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 4fc2b7293378be93275e316c3940e7d21b5bda09 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Lock _MB_CP_LOCK lock in setmbcp.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d5b2c3f233d2a7263f3b79133ce6216fa991c1f2 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_lconv type.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 70c06601e6bc44aa7b78f440b43c5accbcf32038 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_pthreadlocinfo type.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d5c0458bd17e1759d25a94038414bf5d4f84a828 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_pthreadmbcinfo type.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d496099c74ba7ce4d445a14dceb22b2de2ab0ec5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT__locale_t type.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 5114c85a0365d29f49c63ca967dfd2e9159c6338 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT prefix from locale functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 17f3f548861dc2c7502690b7d3183e3b9b8a5510 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_wchar_t type.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c302397c7375157ccca7de977d83c95f38015238 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use type ranges definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 758460faf7080efaadfe92a221ad6c623f561be9 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use simple type definitions from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id fa272adaeb9df503a8fe04d503e07a41ae0c32a0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use WEOF from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 7acfe8fb73d88c354dcec0f56c3cdc6acacbdc04 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use EOF from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 8180f4001a6d5a0befe6dfb4c0c3118853b7a413 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use struct tm from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6c4b7758c691fad6fd5b5f629a8a01b6bc2f961a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from cpp.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 772f0331aa1c4e24f97ca5c5ae27a65805cea8d9 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _beginthread_start_routine_t from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id fbc9110d232fd5e86113fc73153b754278e0f5e9 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use errno values from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1317b935efaa841e8842b848d422d1bf2471e448 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _onexit_table_t from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id babe6ceb7f7b206ce8181e35934fc0aa1ee02ae5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use printf and scanf flags from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id eb6f79f96a81371d328476d255e27d3a47925b13 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _CRT_FLOAT and _CRT_DBL from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 811647dff44ab93b89200d873d7707a02331d89a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _exception definiotion from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 595ee43c48dc75ebc03900b027d000ebd15dffd4 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use locale category definiotion from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id e9a1ff11302bbcbb3db68fa4bbd827a7958067ca by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from errno.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id eeada5682b68ae2400271dbda0634be186f962b7 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from heap.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d784dbb89993d0565ea132109b110cc9500c97f4 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use FILE from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 926179938308b49a2ede5e9196d28535cfec782c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use __utimbuf{32,64} from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2d471db92f0df5d0682369651c0cbb94312cc988 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use ctype definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id eabef91a9701ac72c91e64d946d31d829da92d3a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use status word flags from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 09d018c73d4dbaeddf19333e9c5c6fae51d4c1ec by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use fpclass constants from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 480e25a5f6ae432f4688c79dbf7f0008a740aab6 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _ARGMAX from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 45ac13551966f7a89ad4678fbc0f76f858663bcb by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use floating point exception signals definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 9e085387ac8e6a6c34bc6e7bec8135ef84a247d6 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use signal definitions from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2d96d03006798dd64d42735ffbc3dc76fe6a1174 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use fpclassify constants from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d571f377e40082bf234c5b2e3b128598a370ae6b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use FPU control word definitions from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 4674860303badca0b88436fdc9c7d5be4f00b1b8 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from ctype.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 176aebb0c568e75043012fb0e6d61d6862323993 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from data.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 495f24ebb82af9864287f9cbc39aa4db108979d2 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use heap structures and definitions from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6d799bfa06a818b068bec6ce540477f89d4f63e1 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use stdio.h definitions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 0d479b9d8c54184cce9678b3095bf01d5b4a473c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from environ.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 9011b0b7c05c481ff043357be655f1fc7e66b924 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from except.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6bd9ea5be9c1e53d2cf7369c5eb75817b3c80df5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from exit.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2c35caa7671ec4fbf90651e3301cfc58c011031c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from mbcs.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 065cf4e71496d96baf5f7ff35af4f0bbfee9d1a8 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from misc.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 0364b7681fd6f628b06a9653119cd4f7d1c5cfdb by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from process.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f10c1118e2c2159140d32730f2e49ec70f37bd33 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from scanf.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a1662e3f7d6626618dc0158627ffbe8cf2c81be0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from string.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1514c54ce560acadb4cacb77cd4ee5915e8dbd67 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from wcs.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6ad42ee7f4df2a3a731e404f090abe383d40dd1c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from math.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 4f2f3545e59c00aac92448aebe7484467a8cedce by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from dir.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 41fa6e4b6f0e64bfe8be35c215a3c01d8290700c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove MSVCRT_ prefix from file.c functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1913affb7b4ee57740a0322e6962d588ae62aca0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _invalid_parameter_handler from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 264ba46bcdcd2119c2f9712ba52bb74c35bd369b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _purecall_handler from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 200fe8ac42ff0800c784ec686ccf494391f6907b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _Dcomplex definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 494a78940735ab31bef9a8ae1d5e58175667df37 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _JUMP_BUFFER from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 835a83e3f9699a83482bc5e74d2e931d87cb1a5a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _finddata_t definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 8a2dc3aa42551da56dfc3fb9f1b3979c032a9738 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _stat64 definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 951968c88a2a705ebe7bbb1ac02cd64f8f899f5b by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove non-needed defines from msvcrt.h.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f67f1ce79ee98f88aedde3a915bb6d85b9a934ab by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Remove non-needed function declarations from msvcrt.h.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 79e950bb7989809f62573e3209f2cb1bc0852d6e by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use _configthreadlocale arguments definition from public header.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a7b9948f396a904b43851105f14e86455ebae703 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] ucrtbase: Improve __intrinsic_abnormal_termination stub.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id e734d729461855a5ddaf81f4e08e0cc2b3286e37 by Jacek Caban <jacek(a)codeweavers.com>
* [WINESYNC] msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id df446b9c21f52b917a9c2a360bccaed35896a32e by Jacek Caban <jacek(a)codeweavers.com>
* [WINESYNC] msvcrt: Improve memmove performance on i386 and x86_64 architectures.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 38c490496000c5852f14e9c022868c5107d9ff03 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Make __lc_time_data more similar to native.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 859261f4809a47fd030b605a6e418b7ac52f0790 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Lazily initialize console handles.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d5ab1401c0988b8c8c14ae7c64da0a55f4e4bbeb by Rémi Bernon <rbernon(a)codeweavers.com>
* [WINESYNC] msvcrt: Add helpers for creating base class RTTI.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 16f6a567f4c259bc9b856558f4deebd2f4aeb88c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Fix _unDName crash when demangling class function pointer.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 7a1e7cbeee94756f3c474ba63b9fe9db8bddde3a by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] include: Disallow wcsncpy() in Wine, similarly to strncpy().
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id b35404aa61bf9d5c95ba9b51adb57df7cec1827b by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Make UCRT _beginthread[ex]() hold the DLL reference.
MSVCRT's _beginthread[ex]() doesn't exhibit the same behavior and using
ThreadExit() does leak the reference.
FreeLibraryAndExit() has to be used because the DLL may be the only user
of the given CRT.
This fixes Baldur's Gate 3 crashing shortly after launch.
Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 7435ca85453079283da43d716fac48aa1bf5ca3f by Arkadiusz Hiler <ahiler(a)codeweavers.com>
* [WINESYNC] msvcrt: Allow specifying destructor in DEFINE_CXX_DATA macro.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id bc05707364d722c7b8c105709962cb78c0469cd4 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Add macro that defines type_info vtable.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6c4cddc4f6324cfd6d37e269aaec111a8a665e22 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Rename scheduler.c file to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id eff57ac9c6280751f5f51a66fcac05d6f842fecb by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move _Trace_ppl_function to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id ce5c989171f458842bee6e168a65dc36d2ec61d5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Rename exception::what() implementation to exception_what.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f1fa214b9f936bd91fecbfd6f05436d22311f4dd by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Introduce macro for creating exception class.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f6f8b30c47bc28be5df692743fcf81c7952153ce by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move improper_lock implementation to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id ef81cfb5fbc6d8f2b892c2782bdd469a5bb2f526 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move scheduler_resource_allocation_error to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a8decf5c1511019e3cb22a0e4db06cb0e6b121b2 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move invalid_scheduler_policy_key to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 635f59f2765c03a91b589b810a898bb0b0e566e5 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move invalid_scheduler_policy_value to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id a7bbdea08994625411c94da97ef6b5fbcfb5aaf6 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c9189a411b7941377cb414eed15d1ce02d43959c by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move improper_scheduler_attach to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 9694fc11fee300134486ee359b525afe098748c8 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Move improper_scheduler_detach to concurrency.c.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 1c9a30f217ef0afcfeb86acf3911e51e81f49880 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Simplify throw_exception helper.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 5e3f959aed66b719d845e9e81b282210758444b0 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Fix _CxxThrowException prototype.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c306c527e708df33a67d31667be75adcbcbc7d7e by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] ntdll: Move some exception definitions to winternl.h.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 97479d3d32cd1adf1a77f74b19ecfd0560b78128 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] include: Use the standard va_list instead of __ms_va_list when building with msvcrt.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 2a92c58e1152e1d80395cf31d7cd3f282d094540 by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] ucrtbase: Avoid bool optimization in __std_exception_copy.
Otherwise GCC changes do_free = 1 assignment to *dst = *src which breaks
ucrtbase/cpp tests.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 21da1f2f1143cfc154a8d46c51d4922ff71008d6 by Piotr Caban <piotr(a)codeweavers.com>
* [WINESYNC] msvcrt: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id d8ed47ec21b255976131c82e4c14653846765adb by Alexandre Julliard <julliard(a)winehq.org>
* [WINESYNC] msvcrt: Don't set frame to 0 in arm and arm64 setjmp.
This matches what was done for x86_64 in
882980c17a9a033fa8e49a4c116af9583698d218.
Signed-off-by: Martin Storsjö <martin(a)martin.st>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 6a072b98c100f38a61fad00b6c96c86b3445efac by Martin Storsjö <martin(a)martin.st>
* [WINESYNC] msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51647
Signed-off-by: Doug Lyons <douglyons(a)douglyons.com>
Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 5a514d3f45472ce1a169f33d14cdcfb07c51441e by Doug Lyons <douglyons(a)douglyons.com>
* [WINESYNC] msvcrt: Fix double-free and memory leak in type_info destructor.
Spotted by toying with the gcc's static analyzer.
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 01111b941d469cb13ed9d3f63c2935930679bcb8 by Eric Pouech <eric.pouech(a)gmail.com>
* [WINESYNC]: crt is now in sync with wine-staging wine-7.0
---------
Co-authored-by: winesync <ros-dev(a)reactos.org>
---
dll/win32/crtdll/crtdll.spec | 6 +-
dll/win32/msvcrt/msvcrt.spec | 320 ++++----
dll/win32/msvcrt20/msvcrt20.spec | 26 +-
dll/win32/msvcrt40/msvcrt40.spec | 106 +--
media/doc/WINESYNC.txt | 16 +-
sdk/include/reactos/wine/asm.h | 8 +
sdk/lib/crt/crt.cmake | 1 -
sdk/lib/crt/except/amd64/cpp.s | 112 +--
sdk/lib/crt/except/arm/cpp.s | 100 +--
sdk/lib/crt/except/i386/cpp.s | 118 +--
sdk/lib/crt/include/internal/wine_msc.h | 72 +-
sdk/lib/crt/signal/xcptinfo.c | 9 -
sdk/lib/crt/wine/cpp.c | 969 +++++-----------------
sdk/lib/crt/wine/cppexcept.h | 151 +++-
sdk/lib/crt/wine/cxx.h | 73 +-
sdk/lib/crt/wine/except.c | 146 ++--
sdk/lib/crt/wine/except_arm.c | 12 +-
sdk/lib/crt/wine/except_arm64.c | 12 +-
sdk/lib/crt/wine/except_i386.c | 48 +-
sdk/lib/crt/wine/except_x86_64.c | 45 +-
sdk/lib/crt/wine/heap.c | 308 ++++---
sdk/lib/crt/wine/msvcrt.h | 1354 +++----------------------------
sdk/lib/crt/wine/mtdll.h | 13 -
sdk/lib/crt/wine/undname.c | 13 +-
sdk/tools/winesync/crt.cfg | 2 +-
25 files changed, 1274 insertions(+), 2766 deletions(-)
diff --git a/dll/win32/crtdll/crtdll.spec b/dll/win32/crtdll/crtdll.spec
index 0b8e0f74225..c8b9da5e884 100644
--- a/dll/win32/crtdll/crtdll.spec
+++ b/dll/win32/crtdll/crtdll.spec
@@ -1,8 +1,8 @@
# Old C runtime library.
-@ cdecl ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int)
-@ cdecl ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *)
-@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
+@ cdecl ??2@YAPAXI@Z(long) operator_new # void * __cdecl operator new(unsigned int)
+@ cdecl ??3@YAXPAX@Z(ptr) operator_delete # void __cdecl operator delete(void *)
+@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
@ cdecl _CIacos()
@ cdecl _CIasin()
@ cdecl _CIatan()
diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec
index 9e66349fc80..f2f12e95c10 100644
--- a/dll/win32/msvcrt/msvcrt.spec
+++ b/dll/win32/msvcrt/msvcrt.spec
@@ -3,154 +3,154 @@
@ cdecl -arch=x86_64 -version=0x502 $I10_OUTPUT() I10_OUTPUT
# **************** x86 C++ functions ****************
-@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &)
-@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *)
-@ cdecl -arch=i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *)
-@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &)
-@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &)
-@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *)
-@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &)
-@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *)
-@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &)
-@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int)
-@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &)
-@ cdecl -arch=i386 -norelay ??0exception@@QAE@XZ() MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void)
-@ cdecl -arch=i386 -norelay ??1__non_rtti_object@@UAE@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void)
-@ cdecl -arch=i386 -norelay ??1bad_cast@@UAE@XZ() MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void)
-@ cdecl -arch=i386 -norelay ??1bad_typeid@@UAE@XZ() MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void)
-@ cdecl -arch=i386 -norelay ??1exception@@UAE@XZ() MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void)
-@ cdecl -arch=i386 -norelay ??1type_info@@UAE@XZ() MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void)
-@ cdecl -arch=i386 ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int)
-;@ cdecl -arch=i386 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int)
-@ cdecl -arch=i386 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *)
-@ cdecl -arch=i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &)
-@ cdecl -arch=i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &)
-@ cdecl -arch=i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &)
-@ cdecl -arch=i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &)
-@ cdecl -arch=i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const
-@ cdecl -arch=i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const
-@ extern -arch=i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable'
-@ extern -arch=i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable'
-@ extern -arch=i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable'
-@ extern -arch=i386 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable'
-@ cdecl -arch=i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Eexception@@UAEPAXI@Z(long) MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Fbad_cast@@QAEXXZ() MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void)
-@ cdecl -arch=i386 -norelay ??_Fbad_typeid@@QAEXXZ() MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void)
-@ cdecl -arch=i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int)
-@ cdecl -arch=i386 -norelay ??_Gexception@@UAEPAXI@Z(long) MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int)
-@ cdecl -arch=i386 ??_U@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new[](unsigned int)
-;@ cdecl -arch=i386 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int)
-@ cdecl -arch=i386 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void *)
-@ cdecl -arch=i386 -norelay __uncaught_exception(ptr) MSVCRT___uncaught_exception
-@ cdecl -arch=i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
-@ cdecl -arch=i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void)
-@ cdecl -arch=i386 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
-@ cdecl -arch=i386 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int)
-@ cdecl -arch=i386 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
-@ cdecl -arch=i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const
-@ cdecl -arch=i386 -norelay ?name@type_info@@QBEPBDXZ() MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const
-@ cdecl -arch=i386 -norelay ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const
-@ cdecl -arch=i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)
-@ cdecl -arch=i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
-@ cdecl -arch=i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
-@ cdecl -arch=i386 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void)
-@ cdecl -arch=i386 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void)
-@ cdecl -arch=i386 -norelay ?what@exception@@UBEPBDXZ() MSVCRT_what_exception # public: virtual char const * __thiscall exception::what(void)const
+@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &)
+@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *)
+@ cdecl -arch=i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *)
+@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &)
+@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &)
+@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *)
+@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &)
+@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *)
+@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) exception_ctor # public: __thiscall exception::exception(char const * const &)
+@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int)
+@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) exception_copy_ctor # public: __thiscall exception::exception(class exception const &)
+@ cdecl -arch=i386 -norelay ??0exception@@QAE@XZ() exception_default_ctor # public: __thiscall exception::exception(void)
+@ cdecl -arch=i386 -norelay ??1__non_rtti_object@@UAE@XZ() __non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void)
+@ cdecl -arch=i386 -norelay ??1bad_cast@@UAE@XZ() bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void)
+@ cdecl -arch=i386 -norelay ??1bad_typeid@@UAE@XZ() bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void)
+@ cdecl -arch=i386 -norelay ??1exception@@UAE@XZ() exception_dtor # public: virtual __thiscall exception::~exception(void)
+@ cdecl -arch=i386 -norelay ??1type_info@@UAE@XZ() type_info_dtor # public: virtual __thiscall type_info::~type_info(void)
+@ cdecl -arch=i386 ??2@YAPAXI@Z(long) operator_new # void * __cdecl operator new(unsigned int)
+;@ cdecl -arch=i386 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int)
+@ cdecl -arch=i386 ??3@YAXPAX@Z(ptr) operator_delete # void __cdecl operator delete(void *)
+@ cdecl -arch=i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &)
+@ cdecl -arch=i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &)
+@ cdecl -arch=i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &)
+@ cdecl -arch=i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &)
+@ cdecl -arch=i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const
+@ cdecl -arch=i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const
+@ extern -arch=i386 ??_7__non_rtti_object@@6B@ __non_rtti_object_vtable # const __non_rtti_object::`vftable'
+@ extern -arch=i386 ??_7bad_cast@@6B@ bad_cast_vtable # const bad_cast::`vftable'
+@ extern -arch=i386 ??_7bad_typeid@@6B@ bad_typeid_vtable # const bad_typeid::`vftable'
+@ extern -arch=i386 ??_7exception@@6B@ exception_vtable # const exception::`vftable'
+@ cdecl -arch=i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) __non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Eexception@@UAEPAXI@Z(long) exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Fbad_cast@@QAEXXZ() bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void)
+@ cdecl -arch=i386 -norelay ??_Fbad_typeid@@QAEXXZ() bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void)
+@ cdecl -arch=i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) __non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int)
+@ cdecl -arch=i386 -norelay ??_Gexception@@UAEPAXI@Z(long) exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int)
+@ cdecl -arch=i386 ??_U@YAPAXI@Z(long) operator_new # void * __cdecl operator new[](unsigned int)
+;@ cdecl -arch=i386 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int)
+@ cdecl -arch=i386 ??_V@YAXPAX@Z(ptr) operator_delete # void __cdecl operator delete[](void *)
+@ cdecl -arch=i386 -norelay __uncaught_exception(ptr) __uncaught_exception
+@ cdecl -arch=i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
+@ cdecl -arch=i386 ?_query_new_mode@@YAHXZ() _query_new_mode # int __cdecl _query_new_mode(void)
+@ cdecl -arch=i386 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
+@ cdecl -arch=i386 ?_set_new_mode@@YAHH@Z(long) _set_new_mode # int __cdecl _set_new_mode(int)
+@ cdecl -arch=i386 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
+@ cdecl -arch=i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) type_info_before # public: int __thiscall type_info::before(class type_info const &)const
+@ cdecl -arch=i386 -norelay ?name@type_info@@QBEPBDXZ() type_info_name # public: char const * __thiscall type_info::name(void)const
+@ cdecl -arch=i386 -norelay ?raw_name@type_info@@QBEPBDXZ() type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const
+@ cdecl -arch=i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)
+@ cdecl -arch=i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
+@ cdecl -arch=i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
+@ cdecl -arch=i386 ?terminate@@YAXXZ() terminate # void __cdecl terminate(void)
+@ cdecl -arch=i386 ?unexpected@@YAXXZ() unexpected # void __cdecl unexpected(void)
+@ cdecl -arch=i386 -norelay ?what@exception@@UBEPBDXZ() exception_what # public: virtual char const * __thiscall exception::what(void)const
# **************** win64 C++ functions ****************
-@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@PEBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(char const * __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const near * const near *)
-@ cdecl -arch=win64 ??0bad_cast@@AEAA@PEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * __ptr64 const * __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const near * const near &)
-@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const * __ptr64 const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_cast@@QEAA@PEBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __cdecl bad_cast::bad_cast(char const * __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_typeid@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0bad_typeid@@QEAA@PEBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const * __ptr64) __ptr64
-@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBD@Z(ptr) MSVCRT_exception_ctor # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64,int) __ptr64
-@ cdecl -arch=win64 ??0exception@@QEAA@AEBV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __cdecl exception::exception(class exception const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??0exception@@QEAA@XZ() MSVCRT_exception_default_ctor # public: __cdecl exception::exception(void) __ptr64
-@ cdecl -arch=win64 ??1__non_rtti_object@@UEAA@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) __ptr64
-@ cdecl -arch=win64 ??1bad_cast@@UEAA@XZ() MSVCRT_bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void) __ptr64
-@ cdecl -arch=win64 ??1bad_typeid@@UEAA@XZ() MSVCRT_bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void) __ptr64
-@ cdecl -arch=win64 ??1exception@@UEAA@XZ() MSVCRT_exception_dtor # public: virtual __cdecl exception::~exception(void) __ptr64
-@ cdecl -arch=win64 ??1type_info@@UEAA@XZ() MSVCRT_type_info_dtor # public: virtual __cdecl type_info::~type_info(void) __ptr64
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # void * __ptr64 __cdecl operator new(unsigned __int64)
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(int64 long str long) MSVCRT_operator_new_dbg # void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int)
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void * __ptr64)
-@ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __ptr64 __cdecl __non_rtti_object::operator=(class __non_rtti_object const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??4bad_cast@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __ptr64 __cdecl bad_cast::operator=(class bad_cast const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_typeid_opequals # public: class bad_typeid & __ptr64 __cdecl bad_typeid::operator=(class bad_typeid const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __ptr64 __cdecl exception::operator=(class exception const & __ptr64) __ptr64
-@ cdecl -arch=win64 ??8type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const & __ptr64)const __ptr64
-@ cdecl -arch=win64 ??9type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const & __ptr64)const __ptr64
-@ extern -arch=win64 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable'
-@ extern -arch=win64 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable'
-@ extern -arch=win64 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable'
-@ extern -arch=win64 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable'
-@ cdecl -arch=win64 ??_Fbad_cast@@QEAAXXZ() MSVCRT_bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void) __ptr64
-@ cdecl -arch=win64 ??_Fbad_typeid@@QEAAXXZ() MSVCRT_bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void) __ptr64
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new # void * __ptr64 __cdecl operator new[](unsigned __int64)
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(int64 long str long) MSVCRT_operator_new_dbg # void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int)
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void * __ptr64)
-@ cdecl -arch=win64 __uncaught_exception(ptr) MSVCRT___uncaught_exception
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned __int64)
-@ cdecl -arch=win64 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void)
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned __int64)))(unsigned __int64)
-@ cdecl -arch=win64 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int)
-@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
-@ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr) MSVCRT_type_info_before # public: int __cdecl type_info::before(class type_info const & __ptr64)const __ptr64
-@ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_name # public: char const * __ptr64 __cdecl type_info::name(void)const __ptr64
-@ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_raw_name # public: char const * __ptr64 __cdecl type_info::raw_name(void)const __ptr64
-@ cdecl -arch=win64 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)
-@ cdecl -arch=win64 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
-@ cdecl -arch=win64 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
-@ cdecl -arch=win64 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void)
-@ cdecl -arch=win64 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void)
-@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ() MSVCRT_what_exception # public: virtual char const * __ptr64 __cdecl exception::what(void)const __ptr64
+@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) __non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@PEBD@Z(ptr) __non_rtti_object_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(char const * __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_cast@@AAE@PBQBD@Z(ptr) bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const near * const near *)
+@ cdecl -arch=win64 ??0bad_cast@@AEAA@PEBQEBD@Z(ptr) bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * __ptr64 const * __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_cast@@QAE@ABQBD@Z(ptr) bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const near * const near &)
+@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBQEBD@Z(ptr) bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const * __ptr64 const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBV0@@Z(ptr) bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_cast@@QEAA@PEBD@Z(ptr) bad_cast_ctor_charptr # public: __cdecl bad_cast::bad_cast(char const * __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_typeid@@QEAA@AEBV0@@Z(ptr) bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0bad_typeid@@QEAA@PEBD@Z(ptr) bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const * __ptr64) __ptr64
+@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBD@Z(ptr) exception_ctor # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBDH@Z(ptr long) exception_ctor_noalloc # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64,int) __ptr64
+@ cdecl -arch=win64 ??0exception@@QEAA@AEBV0@@Z(ptr) exception_copy_ctor # public: __cdecl exception::exception(class exception const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??0exception@@QEAA@XZ() exception_default_ctor # public: __cdecl exception::exception(void) __ptr64
+@ cdecl -arch=win64 ??1__non_rtti_object@@UEAA@XZ() __non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) __ptr64
+@ cdecl -arch=win64 ??1bad_cast@@UEAA@XZ() bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void) __ptr64
+@ cdecl -arch=win64 ??1bad_typeid@@UEAA@XZ() bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void) __ptr64
+@ cdecl -arch=win64 ??1exception@@UEAA@XZ() exception_dtor # public: virtual __cdecl exception::~exception(void) __ptr64
+@ cdecl -arch=win64 ??1type_info@@UEAA@XZ() type_info_dtor # public: virtual __cdecl type_info::~type_info(void) __ptr64
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) operator_new # void * __ptr64 __cdecl operator new(unsigned __int64)
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(int64 long str long) operator_new_dbg # void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int)
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete # void __cdecl operator delete(void * __ptr64)
+@ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr) __non_rtti_object_opequals # public: class __non_rtti_object & __ptr64 __cdecl __non_rtti_object::operator=(class __non_rtti_object const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??4bad_cast@@QEAAAEAV0@AEBV0@@Z(ptr) bad_cast_opequals # public: class bad_cast & __ptr64 __cdecl bad_cast::operator=(class bad_cast const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z(ptr) bad_typeid_opequals # public: class bad_typeid & __ptr64 __cdecl bad_typeid::operator=(class bad_typeid const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr) exception_opequals # public: class exception & __ptr64 __cdecl exception::operator=(class exception const & __ptr64) __ptr64
+@ cdecl -arch=win64 ??8type_info@@QEBAHAEBV0@@Z(ptr) type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const & __ptr64)const __ptr64
+@ cdecl -arch=win64 ??9type_info@@QEBAHAEBV0@@Z(ptr) type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const & __ptr64)const __ptr64
+@ extern -arch=win64 ??_7__non_rtti_object@@6B@ __non_rtti_object_vtable # const __non_rtti_object::`vftable'
+@ extern -arch=win64 ??_7bad_cast@@6B@ bad_cast_vtable # const bad_cast::`vftable'
+@ extern -arch=win64 ??_7bad_typeid@@6B@ bad_typeid_vtable # const bad_typeid::`vftable'
+@ extern -arch=win64 ??_7exception@@6B@ exception_vtable # const exception::`vftable'
+@ cdecl -arch=win64 ??_Fbad_cast@@QEAAXXZ() bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void) __ptr64
+@ cdecl -arch=win64 ??_Fbad_typeid@@QEAAXXZ() bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void) __ptr64
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new # void * __ptr64 __cdecl operator new[](unsigned __int64)
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(int64 long str long) operator_new_dbg # void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int)
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete # void __cdecl operator delete[](void * __ptr64)
+@ cdecl -arch=win64 __uncaught_exception(ptr) __uncaught_exception
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned __int64)
+@ cdecl -arch=win64 ?_query_new_mode@@YAHXZ() _query_new_mode # int __cdecl _query_new_mode(void)
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned __int64)))(unsigned __int64)
+@ cdecl -arch=win64 ?_set_new_mode@@YAHH@Z(long) _set_new_mode # int __cdecl _set_new_mode(int)
+@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
+@ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr) type_info_before # public: int __cdecl type_info::before(class type_info const & __ptr64)const __ptr64
+@ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ() type_info_name # public: char const * __ptr64 __cdecl type_info::name(void)const __ptr64
+@ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ() type_info_raw_name # public: char const * __ptr64 __cdecl type_info::raw_name(void)const __ptr64
+@ cdecl -arch=win64 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)
+@ cdecl -arch=win64 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
+@ cdecl -arch=win64 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
+@ cdecl -arch=win64 ?terminate@@YAXXZ() terminate # void __cdecl terminate(void)
+@ cdecl -arch=win64 ?unexpected@@YAXXZ() unexpected # void __cdecl unexpected(void)
+@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ() exception_what # public: virtual char const * __ptr64 __cdecl exception::what(void)const __ptr64
# **************** ARM C++ functions ****************
-@ cdecl -arch=arm ??0__non_rtti_object@@QAA@ABV0@@Z() MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const &)
-@ cdecl -arch=arm ??0__non_rtti_object@@QAA@PBD@Z() MSVCRT___non_rtti_object_ctor #public: __cdecl __non_rtti_object::__non_rtti_object(char const *)
-@ cdecl -arch=arm ??0bad_cast@@AAA@PBQBD@Z() MSVCRT_bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * const *)
-@ cdecl -arch=arm ??0bad_cast@@QAA@ABV0@@Z() MSVCRT_bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const &)
-@ cdecl -arch=arm ??0bad_cast@@QAA@PBD@Z() MSVCRT_bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const *)
-@ cdecl -arch=arm ??0bad_typeid@@QAA@ABV0@@Z() MSVCRT_bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &)
-@ cdecl -arch=arm ??0bad_typeid@@QAA@PBD@Z() MSVCRT_bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const *)
-@ cdecl -arch=arm ??0exception@@QAA@ABQBD@Z() MSVCRT_exception_ctor # public: __cdecl exception::exception(char const * const &)
-@ cdecl -arch=arm ??0exception@@QAA@ABQBDH@Z() MSVCRT_exception_ctor_noalloc # public: __cdecl exception::exception(char const * const &,int)
-@ cdecl -arch=arm ??0exception@@QAA@ABV0@@Z() MSVCRT_exception_copy_ctor # public: __cdecl exception::exception(class exception const &)
-@ cdecl -arch=arm ??0exception@@QAA@XZ() MSVCRT_exception_default_ctor # public: __cdecl exception::exception(void)
-@ cdecl -arch=arm ??1__non_rtti_object@@UAA@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void)
-@ cdecl -arch=arm ??1bad_cast@@UAA@XZ() MSVCRT_bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void)
-@ cdecl -arch=arm ??1bad_typeid@@UAA@XZ() MSVCRT_bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void)
-@ cdecl -arch=arm ??1exception@@UAA@XZ() MSVCRT_exception_dtor # public: virtual __cdecl exception::~exception(void)
-@ cdecl -arch=arm ??1type_info@@UAA@XZ() MSVCRT_type_info_dtor # public: virtual __cdecl type_info::~type_info(void)
-@ cdecl -arch=arm ??2@YAPAXI@Z() MSVCRT_operator_new # void * __cdecl operator new(unsigned int)
-@ cdecl -arch=arm ??2@YAPAXIHPBDH@Z() MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int)
-@ cdecl -arch=arm ??3@YAXPAX@Z() MSVCRT_operator_delete # void __cdecl operator delete(void *)
-@ cdecl -arch=arm ??4__non_rtti_object@@QAAAAV0@ABV0@@Z() MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &)
-@ cdecl -arch=arm ??4bad_cast@@QAAAAV0@ABV0@@Z() MSVCRT_bad_cast_opequals # public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &)
-@ cdecl -arch=arm ??4bad_typeid@@QAAAAV0@ABV0@@Z() MSVCRT_bad_typeid_opequals # public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &)
-@ cdecl -arch=arm ??4exception@@QAAAAV0@ABV0@@Z() MSVCRT_exception_opequals # public: class exception & __cdecl exception::operator=(class exception const &)
-@ cdecl -arch=arm ??8type_info@@QBAHABV0@@Z() MSVCRT_type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const &)const
-@ cdecl -arch=arm ??9type_info@@QBAHABV0@@Z() MSVCRT_type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const &)const
-@ extern -arch=arm ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable'
-@ extern -arch=arm ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable'
-@ extern -arch=arm ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable'
-@ extern -arch=arm ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable'
-@ cdecl -arch=arm ??_Fbad_cast@@QAAXXZ() MSVCRT_bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void)
-@ cdecl -arch=arm ??_Fbad_typeid@@QAAXXZ() MSVCRT_bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void)
-@ cdecl -arch=arm ??_U@YAPAXI@Z() MSVCRT_operator_new # void * __cdecl operator new[](unsigned int)
-@ cdecl -arch=arm ??_U@YAPAXIHPBDH@Z() MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int)
-@ cdecl -arch=arm ??_V@YAXPAX@Z() MSVCRT_operator_delete # void __cdecl operator delete[](void *)
+@ cdecl -arch=arm ??0__non_rtti_object@@QAA@ABV0@@Z() __non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const &)
+@ cdecl -arch=arm ??0__non_rtti_object@@QAA@PBD@Z() __non_rtti_object_ctor #public: __cdecl __non_rtti_object::__non_rtti_object(char const *)
+@ cdecl -arch=arm ??0bad_cast@@AAA@PBQBD@Z() bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * const *)
+@ cdecl -arch=arm ??0bad_cast@@QAA@ABV0@@Z() bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const &)
+@ cdecl -arch=arm ??0bad_cast@@QAA@PBD@Z() bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const *)
+@ cdecl -arch=arm ??0bad_typeid@@QAA@ABV0@@Z() bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &)
+@ cdecl -arch=arm ??0bad_typeid@@QAA@PBD@Z() bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const *)
+@ cdecl -arch=arm ??0exception@@QAA@ABQBD@Z() exception_ctor # public: __cdecl exception::exception(char const * const &)
+@ cdecl -arch=arm ??0exception@@QAA@ABQBDH@Z() exception_ctor_noalloc # public: __cdecl exception::exception(char const * const &,int)
+@ cdecl -arch=arm ??0exception@@QAA@ABV0@@Z() exception_copy_ctor # public: __cdecl exception::exception(class exception const &)
+@ cdecl -arch=arm ??0exception@@QAA@XZ() exception_default_ctor # public: __cdecl exception::exception(void)
+@ cdecl -arch=arm ??1__non_rtti_object@@UAA@XZ() __non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void)
+@ cdecl -arch=arm ??1bad_cast@@UAA@XZ() bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void)
+@ cdecl -arch=arm ??1bad_typeid@@UAA@XZ() bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void)
+@ cdecl -arch=arm ??1exception@@UAA@XZ() exception_dtor # public: virtual __cdecl exception::~exception(void)
+@ cdecl -arch=arm ??1type_info@@UAA@XZ() type_info_dtor # public: virtual __cdecl type_info::~type_info(void)
+@ cdecl -arch=arm ??2@YAPAXI@Z() operator_new # void * __cdecl operator new(unsigned int)
+@ cdecl -arch=arm ??2@YAPAXIHPBDH@Z() operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int)
+@ cdecl -arch=arm ??3@YAXPAX@Z() operator_delete # void __cdecl operator delete(void *)
+@ cdecl -arch=arm ??4__non_rtti_object@@QAAAAV0@ABV0@@Z() __non_rtti_object_opequals # public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &)
+@ cdecl -arch=arm ??4bad_cast@@QAAAAV0@ABV0@@Z() bad_cast_opequals # public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &)
+@ cdecl -arch=arm ??4bad_typeid@@QAAAAV0@ABV0@@Z() bad_typeid_opequals # public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &)
+@ cdecl -arch=arm ??4exception@@QAAAAV0@ABV0@@Z() exception_opequals # public: class exception & __cdecl exception::operator=(class exception const &)
+@ cdecl -arch=arm ??8type_info@@QBAHABV0@@Z() type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const &)const
+@ cdecl -arch=arm ??9type_info@@QBAHABV0@@Z() type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const &)const
+@ extern -arch=arm ??_7__non_rtti_object@@6B@ __non_rtti_object_vtable # const __non_rtti_object::`vftable'
+@ extern -arch=arm ??_7bad_cast@@6B@ bad_cast_vtable # const bad_cast::`vftable'
+@ extern -arch=arm ??_7bad_typeid@@6B@ bad_typeid_vtable # const bad_typeid::`vftable'
+@ extern -arch=arm ??_7exception@@6B@ exception_vtable # const exception::`vftable'
+@ cdecl -arch=arm ??_Fbad_cast@@QAAXXZ() bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void)
+@ cdecl -arch=arm ??_Fbad_typeid@@QAAXXZ() bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void)
+@ cdecl -arch=arm ??_U@YAPAXI@Z() operator_new # void * __cdecl operator new[](unsigned int)
+@ cdecl -arch=arm ??_U@YAPAXIHPBDH@Z() operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int)
+@ cdecl -arch=arm ??_V@YAXPAX@Z() operator_delete # void __cdecl operator delete[](void *)
;@ cdecl -arch=arm _CallMemberFunction0()
;@ cdecl -arch=arm _CallMemberFunction1()
;@ cdecl -arch=arm _CallMemberFunction2()
@@ -164,19 +164,19 @@
;@ cdecl -arch=arm __ExceptionPtrRethrow()
;@ cdecl -arch=arm __ExceptionPtrSwap()
;@ cdecl -arch=arm __ExceptionPtrToBool()
-@ cdecl -arch=arm __uncaught_exception(ptr) MSVCRT___uncaught_exception
-@ cdecl -arch=arm ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
-@ cdecl -arch=arm ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z() MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
-@ cdecl -arch=arm ?_set_new_mode@@YAHH@Z() MSVCRT__set_new_mode # int __cdecl _set_new_mode(int)
-@ cdecl -arch=arm ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z() MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
-@ cdecl -arch=arm ?before@type_info@@QBAHABV1@@Z() MSVCRT_type_info_before # public: int __cdecl type_info::before(class type_info const &)const
-@ cdecl -arch=arm ?name@type_info@@QBAPBDXZ() MSVCRT_type_info_name # public: char const * __cdecl type_info::name(void)const
-@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ() MSVCRT_type_info_raw_name # public: char const * __cdecl type_info::raw_name(void)const
-@ cdecl -arch=arm ?set_terminate@@YAP6AXXZP6AXXZ@Z() MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
-@ cdecl -arch=arm ?set_unexpected@@YAP6AXXZP6AXXZ@Z() MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
-@ cdecl -arch=arm ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void)
-@ cdecl -arch=arm ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void)
-@ cdecl -arch=arm ?what@exception@@UBAPBDXZ() MSVCRT_what_exception # public: virtual char const * __cdecl exception::what(void)const
+@ cdecl -arch=arm __uncaught_exception(ptr) __uncaught_exception
+@ cdecl -arch=arm ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
+@ cdecl -arch=arm ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z() _set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
+@ cdecl -arch=arm ?_set_new_mode@@YAHH@Z() _set_new_mode # int __cdecl _set_new_mode(int)
+@ cdecl -arch=arm ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z() _set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
+@ cdecl -arch=arm ?before@type_info@@QBAHABV1@@Z() type_info_before # public: int __cdecl type_info::before(class type_info const &)const
+@ cdecl -arch=arm ?name@type_info@@QBAPBDXZ() type_info_name # public: char const * __cdecl type_info::name(void)const
+@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ() type_info_raw_name # public: char const * __cdecl type_info::raw_name(void)const
+@ cdecl -arch=arm ?set_terminate@@YAP6AXXZP6AXXZ@Z() set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
+@ cdecl -arch=arm ?set_unexpected@@YAP6AXXZP6AXXZ@Z() set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
+@ cdecl -arch=arm ?terminate@@YAXXZ() terminate # void __cdecl terminate(void)
+@ cdecl -arch=arm ?unexpected@@YAXXZ() unexpected # void __cdecl unexpected(void)
+@ cdecl -arch=arm ?what@exception@@UBAPBDXZ() exception_what # public: virtual char const * __cdecl exception::what(void)const
# **************** Common functions ****************
@@ -248,9 +248,9 @@
@ cdecl -arch=i386 __CxxRegisterExceptionObject()
@ cdecl -arch=i386 __CxxUnregisterExceptionObject()
@ cdecl __DestructExceptionObject(ptr)
-@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
-@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
-@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid
+@ cdecl __RTCastToVoid(ptr) __RTCastToVoid
+@ cdecl __RTDynamicCast(ptr long ptr ptr long) __RTDynamicCast
+@ cdecl __RTtypeid(ptr) __RTtypeid
@ cdecl __STRINGTOLD(ptr ptr str long)
@ cdecl ___lc_codepage_func()
@ cdecl ___lc_collate_cp_func()
diff --git a/dll/win32/msvcrt20/msvcrt20.spec b/dll/win32/msvcrt20/msvcrt20.spec
index 8ace935a4db..0e499d055a1 100644
--- a/dll/win32/msvcrt20/msvcrt20.spec
+++ b/dll/win32/msvcrt20/msvcrt20.spec
@@ -77,10 +77,10 @@
@ stub ??1streambuf@@UAE@XZ #
@ stub ??1strstream@@UAE@XZ #
@ stub ??1strstreambuf@@UAE@XZ #
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) operator_new
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
@ stub ??4Iostream_init@@QAEAAV0@ABV0@@Z #
@ stub ??4filebuf@@QAEAAV0@ABV0@@Z #
@ stub ??4fstream@@QAEAAV0@AAV0@@Z #
@@ -226,11 +226,11 @@
@ stub ??_Gstreambuf@@UAEPAXI@Z #
@ stub ??_Gstrstream@@UAEPAXI@Z #
@ stub ??_Gstrstreambuf@@UAEPAXI@Z #
-@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
-@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator
+@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -i386 ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
+@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
@ stub ?adjustfield@ios@@2JB #
@ stub ?allocate@streambuf@@IAEHXZ #
@ stub ?attach@filebuf@@QAEPAV1@H@Z #
@@ -365,8 +365,8 @@
@ stub ?seekp@ostream@@QAEAAV1@J@Z #
@ stub ?seekp@ostream@@QAEAAV1@JW4seek_dir@ios@@@Z #
@ stub ?seekpos@streambuf@@UAEJJH@Z #
-@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate
-@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected
+@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
+@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ stub ?setb@streambuf@@IAEXPAD0H@Z #
@ stub ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z #
@ stub ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z #
@@ -409,7 +409,7 @@
@ stub ?sync_with_stdio@ios@@SAXXZ #
@ stub ?tellg@istream@@QAEJXZ #
@ stub ?tellp@ostream@@QAEJXZ #
-@ cdecl ?terminate@@YAXXZ() MSVCRT_terminate
+@ cdecl ?terminate@@YAXXZ() terminate
@ stub ?text@filebuf@@2HB #
@ stub ?tie@ios@@QAEPAVostream@@PAV2@@Z #
@ stub ?tie@ios@@QBEPAVostream@@XZ #
@@ -418,7 +418,7 @@
@ stub ?underflow@filebuf@@UAEHXZ #
@ stub ?underflow@stdiobuf@@UAEHXZ #
@ stub ?underflow@strstreambuf@@UAEHXZ #
-@ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected
+@ cdecl ?unexpected@@YAXXZ() unexpected
@ stub ?unlock@ios@@QAAXXZ #
@ stub ?unlock@streambuf@@QAEXXZ #
@ stub ?unlockbuf@ios@@QAAXXZ #
diff --git a/dll/win32/msvcrt40/msvcrt40.spec b/dll/win32/msvcrt40/msvcrt40.spec
index f60e59b6098..6e005a3f85d 100644
--- a/dll/win32/msvcrt40/msvcrt40.spec
+++ b/dll/win32/msvcrt40/msvcrt40.spec
@@ -1,14 +1,14 @@
@ stub ??0Iostream_init@@QAE@AAVios@@H@Z
@ stub ??0Iostream_init@@QAE@XZ
-@ cdecl -i386 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor
-@ cdecl -i386 ??0__non_rtti_object@@QAE@PBD@Z(ptr) MSVCRT___non_rtti_object_ctor
-@ cdecl -i386 ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor
-@ cdecl -i386 ??0bad_cast@@QAE@ABV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor
-@ cdecl -i386 ??0bad_typeid@@QAE@ABV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor
-@ cdecl -i386 ??0bad_typeid@@QAE@PBD@Z(ptr) MSVCRT_bad_typeid_ctor
-@ cdecl -i386 ??0exception@@QAE@ABQBD@Z(ptr) MSVCRT_exception_ctor
-@ cdecl -i386 ??0exception@@QAE@ABV0@@Z(ptr) MSVCRT_exception_copy_ctor
-@ cdecl -i386 ??0exception@@QAE@XZ() MSVCRT_exception_default_ctor
+@ cdecl -i386 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __non_rtti_object_copy_ctor
+@ cdecl -i386 ??0__non_rtti_object@@QAE@PBD@Z(ptr) __non_rtti_object_ctor
+@ cdecl -i386 ??0bad_cast@@QAE@ABQBD@Z(ptr) bad_cast_ctor
+@ cdecl -i386 ??0bad_cast@@QAE@ABV0@@Z(ptr) bad_cast_copy_ctor
+@ cdecl -i386 ??0bad_typeid@@QAE@ABV0@@Z(ptr) bad_typeid_copy_ctor
+@ cdecl -i386 ??0bad_typeid@@QAE@PBD@Z(ptr) bad_typeid_ctor
+@ cdecl -i386 ??0exception@@QAE@ABQBD@Z(ptr) exception_ctor
+@ cdecl -i386 ??0exception@@QAE@ABV0@@Z(ptr) exception_copy_ctor
+@ cdecl -i386 ??0exception@@QAE@XZ() exception_default_ctor
@ stub ??0filebuf@@QAE@ABV0@@Z
@ stub ??0filebuf@@QAE@H@Z
@ stub ??0filebuf@@QAE@HPADH@Z
@@ -70,10 +70,10 @@
@ stub ??0strstreambuf@@QAE@PADH0@Z
@ stub ??0strstreambuf@@QAE@XZ
@ stub ??1Iostream_init@@QAE@XZ
-@ cdecl -i386 ??1__non_rtti_object@@UAE@XZ() MSVCRT___non_rtti_object_dtor
-@ cdecl -i386 ??1bad_cast@@UAE@XZ() MSVCRT_bad_cast_dtor
-@ cdecl -i386 ??1bad_typeid@@UAE@XZ() MSVCRT_bad_typeid_dtor
-@ cdecl -i386 ??1exception@@UAE@XZ() MSVCRT_exception_dtor
+@ cdecl -i386 ??1__non_rtti_object@@UAE@XZ() __non_rtti_object_dtor
+@ cdecl -i386 ??1bad_cast@@UAE@XZ() bad_cast_dtor
+@ cdecl -i386 ??1bad_typeid@@UAE@XZ() bad_typeid_dtor
+@ cdecl -i386 ??1exception@@UAE@XZ() exception_dtor
@ stub ??1filebuf@@UAE@XZ
@ stub ??1fstream@@UAE@XZ
@ stub ??1ifstream@@UAE@XZ
@@ -92,16 +92,16 @@
@ stub ??1streambuf@@UAE@XZ
@ stub ??1strstream@@UAE@XZ
@ stub ??1strstreambuf@@UAE@XZ
-@ cdecl -i386 ??1type_info@@UAE@XZ() MSVCRT_type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -i386 ??1type_info@@UAE@XZ() type_info_dtor
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) operator_new
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
@ stub ??4Iostream_init@@QAEAAV0@ABV0@@Z
-@ cdecl -i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) MSVCRT___non_rtti_object_opequals
-@ cdecl -i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_cast_opequals
-@ cdecl -i386 ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_typeid_opequals
-@ cdecl -i386 ??4exception@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_exception_opequals
+@ cdecl -i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __non_rtti_object_opequals
+@ cdecl -i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) bad_cast_opequals
+@ cdecl -i386 ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) bad_typeid_opequals
+@ cdecl -i386 ??4exception@@QAEAAV0@ABV0@@Z(ptr) exception_opequals
@ stub ??4filebuf@@QAEAAV0@ABV0@@Z
@ stub ??4fstream@@QAEAAV0@AAV0@@Z
@ stub ??4ifstream@@QAEAAV0@ABV0@@Z
@@ -165,13 +165,13 @@
@ stub ??6ostream@@QAEAAV0@PBE@Z
@ stub ??6ostream@@QAEAAV0@PBX@Z
@ stub ??7ios@@QBEHXZ
-@ cdecl -i386 ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals
-@ cdecl -i386 ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opnot_equals
+@ cdecl -i386 ??8type_info@@QBEHABV0@@Z(ptr) type_info_opequals_equals
+@ cdecl -i386 ??9type_info@@QBEHABV0@@Z(ptr) type_info_opnot_equals
@ stub ??Bios@@QBEPAXXZ
-@ extern -i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable
-@ extern -i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable
-@ extern -i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable
-@ extern -i386 ??_7exception@@6B@ MSVCRT_exception_vtable
+@ extern -i386 ??_7__non_rtti_object@@6B@ __non_rtti_object_vtable
+@ extern -i386 ??_7bad_cast@@6B@ bad_cast_vtable
+@ extern -i386 ??_7bad_typeid@@6B@ bad_typeid_vtable
+@ extern -i386 ??_7exception@@6B@ exception_vtable
@ stub ??_7filebuf@@6B@
@ stub ??_7fstream@@6B@
@ stub ??_7ifstream@@6B@
@@ -219,10 +219,10 @@
@ stub ??_Dstdiostream@@QAEXXZ
@ stub ??_Dstrstream@@QAEXXZ
@ stub ??_EIostream_init@@QAEPAXI@Z
-@ cdecl -i386 ??_E__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_vector_dtor
-@ cdecl -i386 ??_Ebad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_vector_dtor
-@ cdecl -i386 ??_Ebad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_vector_dtor
-@ cdecl -i386 ??_Eexception@@UAEPAXI@Z(long) MSVCRT_exception_vector_dtor
+@ cdecl -i386 ??_E__non_rtti_object@@UAEPAXI@Z(long) __non_rtti_object_vector_dtor
+@ cdecl -i386 ??_Ebad_cast@@UAEPAXI@Z(long) bad_cast_vector_dtor
+@ cdecl -i386 ??_Ebad_typeid@@UAEPAXI@Z(long) bad_typeid_vector_dtor
+@ cdecl -i386 ??_Eexception@@UAEPAXI@Z(long) exception_vector_dtor
@ stub ??_Efilebuf@@UAEPAXI@Z
@ stub ??_Efstream@@UAEPAXI@Z
@ stub ??_Eifstream@@UAEPAXI@Z
@@ -242,10 +242,10 @@
@ stub ??_Estrstream@@UAEPAXI@Z
@ stub ??_Estrstreambuf@@UAEPAXI@Z
@ stub ??_GIostream_init@@QAEPAXI@Z
-@ cdecl -i386 ??_G__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_scalar_dtor
-@ cdecl -i386 ??_Gbad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_scalar_dtor
-@ cdecl -i386 ??_Gbad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_scalar_dtor
-@ cdecl -i386 ??_Gexception@@UAEPAXI@Z(long) MSVCRT_exception_scalar_dtor
+@ cdecl -i386 ??_G__non_rtti_object@@UAEPAXI@Z(long) __non_rtti_object_scalar_dtor
+@ cdecl -i386 ??_Gbad_cast@@UAEPAXI@Z(long) bad_cast_scalar_dtor
+@ cdecl -i386 ??_Gbad_typeid@@UAEPAXI@Z(long) bad_typeid_scalar_dtor
+@ cdecl -i386 ??_Gexception@@UAEPAXI@Z(long) exception_scalar_dtor
@ stub ??_Gfilebuf@@UAEPAXI@Z
@ stub ??_Gfstream@@UAEPAXI@Z
@ stub ??_Gifstream@@UAEPAXI@Z
@@ -264,11 +264,11 @@
@ stub ??_Gstreambuf@@UAEPAXI@Z
@ stub ??_Gstrstream@@UAEPAXI@Z
@ stub ??_Gstrstreambuf@@UAEPAXI@Z
-@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
-@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator
+@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -i386 ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
+@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
@ stub ?adjustfield@ios@@2JB
@ stub ?allocate@streambuf@@IAEHXZ
@ stub ?attach@filebuf@@QAEPAV1@H@Z
@@ -278,7 +278,7 @@
@ stub ?bad@ios@@QBEHXZ
@ stub ?base@streambuf@@IBEPADXZ
@ stub ?basefield@ios@@2JB
-@ cdecl -i386 ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_type_info_before
+@ cdecl -i386 ?before@type_info@@QBEHABV1@@Z(ptr) type_info_before
@ stub ?binary@filebuf@@2HB
@ stub ?bitalloc@ios@@SAJXZ
@ stub ?blen@streambuf@@IBEHXZ
@@ -356,7 +356,7 @@
@ stub ?lockc@ios@@KAXXZ
@ stub ?lockptr@ios@@IAEPAU_CRT_CRITICAL_SECTION@@XZ
@ stub ?lockptr@streambuf@@IAEPAU_CRT_CRITICAL_SECTION@@XZ
-@ cdecl -i386 ?name@type_info@@QBEPBDXZ() MSVCRT_type_info_name
+@ cdecl -i386 ?name@type_info@@QBEPBDXZ() type_info_name
@ stub ?oct@@YAAAVios@@AAV1@@Z
@ stub ?open@filebuf@@QAEPAV1@PBDHH@Z
@ stub ?open@fstream@@QAEXPBDHH@Z
@@ -384,7 +384,7 @@
@ stub ?put@ostream@@QAEAAV1@E@Z
@ stub ?putback@istream@@QAEAAV1@D@Z
@ stub ?pword@ios@@QBEAAPAXH@Z
-@ cdecl -i386 ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name
+@ cdecl -i386 ?raw_name@type_info@@QBEPBDXZ() type_info_raw_name
@ stub ?rdbuf@fstream@@QBEPAVfilebuf@@XZ
@ stub ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ
@ stub ?rdbuf@ios@@QBEPAVstreambuf@@XZ
@@ -407,9 +407,9 @@
@ stub ?seekp@ostream@@QAEAAV1@J@Z
@ stub ?seekp@ostream@@QAEAAV1@JW4seek_dir@ios@@@Z
@ stub ?seekpos@streambuf@@UAEJJH@Z
-@ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
-@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate
-@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected
+@ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
+@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
+@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ stub ?setb@streambuf@@IAEXPAD0H@Z
@ stub ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z
@ stub ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z
@@ -452,7 +452,7 @@
@ stub ?sync_with_stdio@ios@@SAXXZ
@ stub ?tellg@istream@@QAEJXZ
@ stub ?tellp@ostream@@QAEJXZ
-@ cdecl ?terminate@@YAXXZ() MSVCRT_terminate
+@ cdecl ?terminate@@YAXXZ() terminate
@ stub ?text@filebuf@@2HB
@ stub ?tie@ios@@QAEPAVostream@@PAV2@@Z
@ stub ?tie@ios@@QBEPAVostream@@XZ
@@ -461,13 +461,13 @@
@ stub ?underflow@filebuf@@UAEHXZ
@ stub ?underflow@stdiobuf@@UAEHXZ
@ stub ?underflow@strstreambuf@@UAEHXZ
-@ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected
+@ cdecl ?unexpected@@YAXXZ() unexpected
@ stub ?unlock@ios@@QAAXXZ
@ stub ?unlock@streambuf@@QAEXXZ
@ stub ?unlockbuf@ios@@QAAXXZ
@ stub ?unlockc@ios@@KAXXZ
@ stub ?unsetf@ios@@QAEJJ@Z
-@ cdecl -i386 ?what@exception@@UBEPBDXZ() MSVCRT_what_exception
+@ cdecl -i386 ?what@exception@@UBEPBDXZ() exception_what
@ stub ?width@ios@@QAEHH@Z
@ stub ?width@ios@@QBEHXZ
@ stub ?write@ostream@@QAEAAV1@PBCH@Z
@@ -505,9 +505,9 @@
@ cdecl _XcptFilter(long ptr)
@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr)
@ stdcall -i386 __CxxLongjmpUnwind(ptr)
-@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
-@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
-@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid
+@ cdecl __RTCastToVoid(ptr) __RTCastToVoid
+@ cdecl __RTDynamicCast(ptr long ptr ptr long) __RTDynamicCast
+@ cdecl __RTtypeid(ptr) __RTtypeid
@ cdecl __STRINGTOLD(ptr ptr str long)
@ extern __argc
@ extern __argv
diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt
index dec52405662..bf5b76bfb55 100644
--- a/media/doc/WINESYNC.txt
+++ b/media/doc/WINESYNC.txt
@@ -305,10 +305,7 @@ lpk -
msvcrt -
sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16
- sdk/lib/crt/except/cpp.c # Synced at 20080528
- sdk/lib/crt/except/cppexcept.c # Synced at 20071111
sdk/lib/crt/process/_cwait.c # Synced to WineStaging-1.7.37
- sdk/lib/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37
sdk/lib/crt/string/scanf.c/h # Synced to Wine-1.7.17
sdk/lib/crt/string/strtoi64.c # Synced to WineStaging-1.9.9
sdk/lib/crt/string/strtok.c # Synced to WineStaging-1.9.16
@@ -319,9 +316,18 @@ msvcrt -
sdk/lib/crt/string/wctype.c # Synced to WineStaging-1.9.16
sdk/lib/crt/string/wtoi64.c # Synced to Wine-1.9.16
sdk/lib/crt/mbstring/ischira.c # Synced to Wine-1.9.16
- sdk/lib/crt/wine/heap.c # Synced at 20080529
- sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.9.16
sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55
+ sdk/lib/crt/wine/cpp.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/cppexcept.h # Synced to Wine-7.0
+ sdk/lib/crt/wine/except.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/except_arm.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/except_arm64.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/except_i386.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/except_x86_64.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/heap.c # Synced to Wine-7.0
+ sdk/lib/crt/wine/msvcrt.h # Synced to Wine-7.0
+ sdk/lib/crt/wine/mtdll.h # Synced to Wine-7.0
+ sdk/lib/crt/wine/undname.c # Synced to Wine-7.0
regedit
base/applications/regedit/regedit.c # Synced to Wine-7.17
diff --git a/sdk/include/reactos/wine/asm.h b/sdk/include/reactos/wine/asm.h
index 14406b784eb..19a770fcf3b 100644
--- a/sdk/include/reactos/wine/asm.h
+++ b/sdk/include/reactos/wine/asm.h
@@ -55,6 +55,14 @@
# define __ASM_FUNC_TYPE(name) ".type " name ",@function"
#endif
+#if !defined(__GNUC__) && !defined(__clang__)
+# define __ASM_BLOCK_BEGIN(name) void __asm_dummy_##name(void) {
+# define __ASM_BLOCK_END }
+#else
+# define __ASM_BLOCK_BEGIN(name)
+# define __ASM_BLOCK_END
+#endif
+
/* ReactOS */
#if defined(_MSC_VER)
# define __ASM_DEFINE_FUNC(name,code)
diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake
index f4868b27080..1ca567d9de7 100644
--- a/sdk/lib/crt/crt.cmake
+++ b/sdk/lib/crt/crt.cmake
@@ -13,7 +13,6 @@ list(APPEND CRT_SOURCE
${CRT_PROCESS_SOURCE}
${CRT_SEARCH_SOURCE}
signal/signal.c
- signal/xcptinfo.c
${CRT_STARTUP_SOURCE}
${CRT_STDIO_SOURCE}
${CRT_STDLIB_SOURCE}
diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s
index 03b6d3dff9d..ad869b8d609 100644
--- a/sdk/lib/crt/except/amd64/cpp.s
+++ b/sdk/lib/crt/except/amd64/cpp.s
@@ -7,19 +7,19 @@
MACRO(START_VTABLE, shortname, cxxname)
EXTERN shortname&_rtti:PROC
-EXTERN MSVCRT_&shortname&_vector_dtor:PROC
+EXTERN &shortname&_vector_dtor:PROC
.quad shortname&_rtti
-PUBLIC MSVCRT_&shortname&_vtable
-MSVCRT_&shortname&_vtable:
+PUBLIC &shortname&_vtable
+&shortname&_vtable:
PUBLIC &cxxname
&cxxname:
- .quad MSVCRT_&shortname&_vector_dtor
+ .quad &shortname&_vector_dtor
ENDM
MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname)
START_VTABLE shortname, cxxname
- EXTERN MSVCRT_what_exception:ABS
- .quad MSVCRT_what_exception
+ EXTERN exception_what:ABS
+ .quad exception_what
ENDM
START_VTABLE type_info, __dummyname_type_info
@@ -34,56 +34,56 @@ EXTERN &orig:ABS
ALIAS <&alias> = <&orig>
ENDM
-DEFINE_ALIAS ??3@YAXPEAX@Z, MSVCRT_operator_delete
-DEFINE_ALIAS ??_U@YAPEAX_K@Z, MSVCRT_operator_new
-DEFINE_ALIAS ??_U@YAPEAX_KHPEBDH@Z, MSVCRT_operator_new_dbg
-DEFINE_ALIAS ??_V@YAXPEAX@Z, MSVCRT_operator_delete
-DEFINE_ALIAS ??2@YAPEAX_K@Z, MSVCRT_operator_new
-DEFINE_ALIAS ??2@YAPEAX_KHPEBDH@Z, MSVCRT_operator_new_dbg
-DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler
-DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler
-DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler
-DEFINE_ALIAS ?_query_new_mode@@YAHXZ, MSVCRT__query_new_mode
-DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode
-DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator
-DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate
-DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected
-DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate
-DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected
-DEFINE_ALIAS ?what@exception@@UEBAPEBDXZ, MSVCRT_what_exception
-DEFINE_ALIAS ??0exception@@QEAA@AEBQEBDH@Z, MSVCRT_exception_ctor_noalloc
-DEFINE_ALIAS ??0exception@@QEAA@AEBV0@@Z, MSVCRT_exception_copy_ctor
-DEFINE_ALIAS ??0exception@@QEAA@XZ, MSVCRT_exception_default_ctor
-DEFINE_ALIAS ??1exception@@UEAA@XZ, MSVCRT_exception_dtor
-DEFINE_ALIAS ??4exception@@QEAAAEAV0@AEBV0@@Z, MSVCRT_exception_opequals
-DEFINE_ALIAS ??1type_info@@UEAA@XZ, MSVCRT_type_info_dtor
-DEFINE_ALIAS ??0__non_rtti_object@@QEAA@AEBV0@@Z, MSVCRT___non_rtti_object_copy_ctor
-DEFINE_ALIAS ??0__non_rtti_object@@QEAA@PEBD@Z, MSVCRT___non_rtti_object_ctor
-DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, MSVCRT_bad_cast_ctor
-DEFINE_ALIAS ??0bad_cast@@AEAA@PEBQEBD@Z, MSVCRT_bad_cast_ctor
-DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, MSVCRT_bad_cast_ctor
-DEFINE_ALIAS ??0bad_cast@@QEAA@AEBQEBD@Z, MSVCRT_bad_cast_ctor
-DEFINE_ALIAS ??0bad_cast@@QEAA@AEBV0@@Z, MSVCRT_bad_cast_copy_ctor
-DEFINE_ALIAS ??0bad_cast@@QEAA@PEBD@Z, MSVCRT_bad_cast_ctor_charptr
-DEFINE_ALIAS ??0bad_typeid@@QEAA@AEBV0@@Z, MSVCRT_bad_typeid_copy_ctor
-DEFINE_ALIAS ??0bad_typeid@@QEAA@PEBD@Z, MSVCRT_bad_typeid_ctor
-DEFINE_ALIAS ??0exception@@QEAA@AEBQEBD@Z, MSVCRT_exception_ctor
-DEFINE_ALIAS ??1__non_rtti_object@@UEAA@XZ, MSVCRT___non_rtti_object_dtor
-DEFINE_ALIAS ??1bad_cast@@UEAA@XZ, MSVCRT_bad_cast_dtor
-DEFINE_ALIAS ??1bad_typeid@@UEAA@XZ, MSVCRT_bad_typeid_dtor
-DEFINE_ALIAS ??4bad_cast@@QEAAAEAV0@AEBV0@@Z, MSVCRT_bad_cast_opequals
-DEFINE_ALIAS ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z, MSVCRT_bad_typeid_opequals
-DEFINE_ALIAS ??8type_info@@QEBAHAEBV0@@Z, MSVCRT_type_info_opequals_equals
-DEFINE_ALIAS ??9type_info@@QEBAHAEBV0@@Z, MSVCRT_type_info_opnot_equals
-DEFINE_ALIAS ??_Fbad_cast@@QEAAXXZ, MSVCRT_bad_cast_default_ctor
-DEFINE_ALIAS ??_Fbad_typeid@@QEAAXXZ, MSVCRT_bad_typeid_default_ctor
-DEFINE_ALIAS ?_query_new_handler@@YAP6AH_K@ZXZ, MSVCRT__query_new_handler
-DEFINE_ALIAS ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z, MSVCRT__set_new_handler
-DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator
-DEFINE_ALIAS ?before@type_info@@QEBAHAEBV1@@Z, MSVCRT_type_info_before
-DEFINE_ALIAS ?name@type_info@@QEBAPEBDXZ, MSVCRT_type_info_name
-DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, MSVCRT_type_info_raw_name
-DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, MSVCRT___non_rtti_object_opequals
+DEFINE_ALIAS ??3@YAXPEAX@Z, operator_delete
+DEFINE_ALIAS ??_U@YAPEAX_K@Z, operator_new
+DEFINE_ALIAS ??_U@YAPEAX_KHPEBDH@Z, operator_new_dbg
+DEFINE_ALIAS ??_V@YAXPEAX@Z, operator_delete
+DEFINE_ALIAS ??2@YAPEAX_K@Z, operator_new
+DEFINE_ALIAS ??2@YAPEAX_KHPEBDH@Z, operator_new_dbg
+DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler
+DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler
+DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, set_new_handler
+DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _query_new_mode
+DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode
+DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator
+DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate
+DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected
+DEFINE_ALIAS ?terminate@@YAXXZ, terminate
+DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected
+DEFINE_ALIAS ?what@exception@@UEBAPEBDXZ, exception_what
+DEFINE_ALIAS ??0exception@@QEAA@AEBQEBDH@Z, exception_ctor_noalloc
+DEFINE_ALIAS ??0exception@@QEAA@AEBV0@@Z, exception_copy_ctor
+DEFINE_ALIAS ??0exception@@QEAA@XZ, exception_default_ctor
+DEFINE_ALIAS ??1exception@@UEAA@XZ, exception_dtor
+DEFINE_ALIAS ??4exception@@QEAAAEAV0@AEBV0@@Z, exception_opequals
+DEFINE_ALIAS ??1type_info@@UEAA@XZ, type_info_dtor
+DEFINE_ALIAS ??0__non_rtti_object@@QEAA@AEBV0@@Z, __non_rtti_object_copy_ctor
+DEFINE_ALIAS ??0__non_rtti_object@@QEAA@PEBD@Z, __non_rtti_object_ctor
+DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, bad_cast_ctor
+DEFINE_ALIAS ??0bad_cast@@AEAA@PEBQEBD@Z, bad_cast_ctor
+DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, bad_cast_ctor
+DEFINE_ALIAS ??0bad_cast@@QEAA@AEBQEBD@Z, bad_cast_ctor
+DEFINE_ALIAS ??0bad_cast@@QEAA@AEBV0@@Z, bad_cast_copy_ctor
+DEFINE_ALIAS ??0bad_cast@@QEAA@PEBD@Z, bad_cast_ctor_charptr
+DEFINE_ALIAS ??0bad_typeid@@QEAA@AEBV0@@Z, bad_typeid_copy_ctor
+DEFINE_ALIAS ??0bad_typeid@@QEAA@PEBD@Z, bad_typeid_ctor
+DEFINE_ALIAS ??0exception@@QEAA@AEBQEBD@Z, exception_ctor
+DEFINE_ALIAS ??1__non_rtti_object@@UEAA@XZ, __non_rtti_object_dtor
+DEFINE_ALIAS ??1bad_cast@@UEAA@XZ, bad_cast_dtor
+DEFINE_ALIAS ??1bad_typeid@@UEAA@XZ, bad_typeid_dtor
+DEFINE_ALIAS ??4bad_cast@@QEAAAEAV0@AEBV0@@Z, bad_cast_opequals
+DEFINE_ALIAS ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z, bad_typeid_opequals
+DEFINE_ALIAS ??8type_info@@QEBAHAEBV0@@Z, type_info_opequals_equals
+DEFINE_ALIAS ??9type_info@@QEBAHAEBV0@@Z, type_info_opnot_equals
+DEFINE_ALIAS ??_Fbad_cast@@QEAAXXZ, bad_cast_default_ctor
+DEFINE_ALIAS ??_Fbad_typeid@@QEAAXXZ, bad_typeid_default_ctor
+DEFINE_ALIAS ?_query_new_handler@@YAP6AH_K@ZXZ, _query_new_handler
+DEFINE_ALIAS ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z, _set_new_handler
+DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator
+DEFINE_ALIAS ?before@type_info@@QEBAHAEBV1@@Z, type_info_before
+DEFINE_ALIAS ?name@type_info@@QEBAPEBDXZ, type_info_name
+DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, type_info_raw_name
+DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, __non_rtti_object_opequals
END
diff --git a/sdk/lib/crt/except/arm/cpp.s b/sdk/lib/crt/except/arm/cpp.s
index 33014a8093d..5a45e587189 100644
--- a/sdk/lib/crt/except/arm/cpp.s
+++ b/sdk/lib/crt/except/arm/cpp.s
@@ -22,48 +22,48 @@ _Target SETS "|$Target|"
IMPORT $_FuncName, WEAK $_Target
MEND
- DEFINE_ALIAS ??0__non_rtti_object@@QAA@ABV0@@Z, MSVCRT___non_rtti_object_copy_ctor
- DEFINE_ALIAS ??0__non_rtti_object@@QAA@PBD@Z, MSVCRT___non_rtti_object_ctor
- DEFINE_ALIAS ??0bad_cast@@AAA@PBQBD@Z, MSVCRT_bad_cast_ctor // private: __cdecl bad_cast::bad_cast(char const * const *)
- DEFINE_ALIAS ??0bad_cast@@QAA@ABV0@@Z, MSVCRT_bad_cast_copy_ctor // public: __cdecl bad_cast::bad_cast(class bad_cast const &)
- DEFINE_ALIAS ??0bad_cast@@QAA@PBD@Z, MSVCRT_bad_cast_ctor // public: __cdecl bad_cast::bad_cast(char const *)
- DEFINE_ALIAS ??0bad_typeid@@QAA@ABV0@@Z, MSVCRT_bad_typeid_copy_ctor // public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &)
- DEFINE_ALIAS ??0bad_typeid@@QAA@PBD@Z, MSVCRT_bad_typeid_ctor // public: __cdecl bad_typeid::bad_typeid(char const *)
- DEFINE_ALIAS ??0exception@@QAA@ABQBD@Z, MSVCRT_exception_ctor // public: __cdecl exception::exception(char const * const &)
- DEFINE_ALIAS ??0exception@@QAA@ABQBDH@Z, MSVCRT_exception_ctor_noalloc // public: __cdecl exception::exception(char const * const &,int)
- DEFINE_ALIAS ??0exception@@QAA@ABV0@@Z, MSVCRT_exception_copy_ctor // public: __cdecl exception::exception(class exception const &)
- DEFINE_ALIAS ??0exception@@QAA@XZ, MSVCRT_exception_default_ctor // public: __cdecl exception::exception(void)
- DEFINE_ALIAS ??1__non_rtti_object@@UAA@XZ, MSVCRT___non_rtti_object_dtor // public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void)
- DEFINE_ALIAS ??1bad_cast@@UAA@XZ, MSVCRT_bad_cast_dtor // public: virtual __cdecl bad_cast::~bad_cast(void)
- DEFINE_ALIAS ??1bad_typeid@@UAA@XZ, MSVCRT_bad_typeid_dtor // public: virtual __cdecl bad_typeid::~bad_typeid(void)
- DEFINE_ALIAS ??1exception@@UAA@XZ, MSVCRT_exception_dtor // public: virtual __cdecl exception::~exception(void)
- DEFINE_ALIAS ??1type_info@@UAA@XZ, MSVCRT_type_info_dtor // public: virtual __cdecl type_info::~type_info(void)
- DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new // void * __cdecl operator new(unsigned int)
- DEFINE_ALIAS ??2@YAPAXIHPBDH@Z, MSVCRT_operator_new_dbg // void * __cdecl operator new(unsigned int,int,char const *,int)
- DEFINE_ALIAS ??3@YAXPAX@Z, MSVCRT_operator_delete // void __cdecl operator delete(void *)
- DEFINE_ALIAS ??4__non_rtti_object@@QAAAAV0@ABV0@@Z, MSVCRT___non_rtti_object_opequals // public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &)
- DEFINE_ALIAS ??4bad_cast@@QAAAAV0@ABV0@@Z, MSVCRT_bad_cast_opequals // public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &)
- DEFINE_ALIAS ??4bad_typeid@@QAAAAV0@ABV0@@Z, MSVCRT_bad_typeid_opequals // public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &)
- DEFINE_ALIAS ??4exception@@QAAAAV0@ABV0@@Z, MSVCRT_exception_opequals // public: class exception & __cdecl exception::operator=(class exception const &)
- DEFINE_ALIAS ??8type_info@@QBAHABV0@@Z, MSVCRT_type_info_opequals_equals // public: int __cdecl type_info::operator==(class type_info const &)const
- DEFINE_ALIAS ??9type_info@@QBAHABV0@@Z, MSVCRT_type_info_opnot_equals // public: int __cdecl type_info::operator!=(class type_info const &)const
- DEFINE_ALIAS ??_Fbad_cast@@QAAXXZ, MSVCRT_bad_cast_default_ctor // public: void __cdecl bad_cast::`default constructor closure'(void)
- DEFINE_ALIAS ??_Fbad_typeid@@QAAXXZ, MSVCRT_bad_typeid_default_ctor // public: void __cdecl bad_typeid::`default constructor closure'(void)
- DEFINE_ALIAS ??_U@YAPAXI@Z, MSVCRT_operator_new // void * __cdecl operator new[](unsigned int)
- DEFINE_ALIAS ??_U@YAPAXIHPBDH@Z, MSVCRT_operator_new_dbg // void * __cdecl operator new[](unsigned int,int,char const *,int)
- DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete // void __cdecl operator delete[](void *)
- DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler // int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
- DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler // int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
- DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode // int __cdecl _set_new_mode(int)
- DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator // void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
- DEFINE_ALIAS ?before@type_info@@QBAHABV1@@Z, MSVCRT_type_info_before // public: int __cdecl type_info::before(class type_info const &)const
- DEFINE_ALIAS ?name@type_info@@QBAPBDXZ, MSVCRT_type_info_name // public: char const * __cdecl type_info::name(void)const
- DEFINE_ALIAS ?raw_name@type_info@@QBAPBDXZ, MSVCRT_type_info_raw_name // public: char const * __cdecl type_info::raw_name(void)const
- DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate // void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
- DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected // void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
- DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate // void __cdecl terminate(void)
- DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected // void __cdecl unexpected(void)
- DEFINE_ALIAS ?what@exception@@UBAPBDXZ, MSVCRT_what_exception // public: virtual char const * __cdecl exception::what(void)const
+ DEFINE_ALIAS ??0__non_rtti_object@@QAA@ABV0@@Z, __non_rtti_object_copy_ctor
+ DEFINE_ALIAS ??0__non_rtti_object@@QAA@PBD@Z, __non_rtti_object_ctor
+ DEFINE_ALIAS ??0bad_cast@@AAA@PBQBD@Z, bad_cast_ctor // private: __cdecl bad_cast::bad_cast(char const * const *)
+ DEFINE_ALIAS ??0bad_cast@@QAA@ABV0@@Z, bad_cast_copy_ctor // public: __cdecl bad_cast::bad_cast(class bad_cast const &)
+ DEFINE_ALIAS ??0bad_cast@@QAA@PBD@Z, bad_cast_ctor // public: __cdecl bad_cast::bad_cast(char const *)
+ DEFINE_ALIAS ??0bad_typeid@@QAA@ABV0@@Z, bad_typeid_copy_ctor // public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &)
+ DEFINE_ALIAS ??0bad_typeid@@QAA@PBD@Z, bad_typeid_ctor // public: __cdecl bad_typeid::bad_typeid(char const *)
+ DEFINE_ALIAS ??0exception@@QAA@ABQBD@Z, exception_ctor // public: __cdecl exception::exception(char const * const &)
+ DEFINE_ALIAS ??0exception@@QAA@ABQBDH@Z, exception_ctor_noalloc // public: __cdecl exception::exception(char const * const &,int)
+ DEFINE_ALIAS ??0exception@@QAA@ABV0@@Z, exception_copy_ctor // public: __cdecl exception::exception(class exception const &)
+ DEFINE_ALIAS ??0exception@@QAA@XZ, exception_default_ctor // public: __cdecl exception::exception(void)
+ DEFINE_ALIAS ??1__non_rtti_object@@UAA@XZ, __non_rtti_object_dtor // public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void)
+ DEFINE_ALIAS ??1bad_cast@@UAA@XZ, bad_cast_dtor // public: virtual __cdecl bad_cast::~bad_cast(void)
+ DEFINE_ALIAS ??1bad_typeid@@UAA@XZ, bad_typeid_dtor // public: virtual __cdecl bad_typeid::~bad_typeid(void)
+ DEFINE_ALIAS ??1exception@@UAA@XZ, exception_dtor // public: virtual __cdecl exception::~exception(void)
+ DEFINE_ALIAS ??1type_info@@UAA@XZ, type_info_dtor // public: virtual __cdecl type_info::~type_info(void)
+ DEFINE_ALIAS ??2@YAPAXI@Z, operator_new // void * __cdecl operator new(unsigned int)
+ DEFINE_ALIAS ??2@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new(unsigned int,int,char const *,int)
+ DEFINE_ALIAS ??3@YAXPAX@Z, operator_delete // void __cdecl operator delete(void *)
+ DEFINE_ALIAS ??4__non_rtti_object@@QAAAAV0@ABV0@@Z, __non_rtti_object_opequals // public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &)
+ DEFINE_ALIAS ??4bad_cast@@QAAAAV0@ABV0@@Z, bad_cast_opequals // public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &)
+ DEFINE_ALIAS ??4bad_typeid@@QAAAAV0@ABV0@@Z, bad_typeid_opequals // public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &)
+ DEFINE_ALIAS ??4exception@@QAAAAV0@ABV0@@Z, exception_opequals // public: class exception & __cdecl exception::operator=(class exception const &)
+ DEFINE_ALIAS ??8type_info@@QBAHABV0@@Z, type_info_opequals_equals // public: int __cdecl type_info::operator==(class type_info const &)const
+ DEFINE_ALIAS ??9type_info@@QBAHABV0@@Z, type_info_opnot_equals // public: int __cdecl type_info::operator!=(class type_info const &)const
+ DEFINE_ALIAS ??_Fbad_cast@@QAAXXZ, bad_cast_default_ctor // public: void __cdecl bad_cast::`default constructor closure'(void)
+ DEFINE_ALIAS ??_Fbad_typeid@@QAAXXZ, bad_typeid_default_ctor // public: void __cdecl bad_typeid::`default constructor closure'(void)
+ DEFINE_ALIAS ??_U@YAPAXI@Z, operator_new // void * __cdecl operator new[](unsigned int)
+ DEFINE_ALIAS ??_U@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new[](unsigned int,int,char const *,int)
+ DEFINE_ALIAS ??_V@YAXPAX@Z, operator_delete // void __cdecl operator delete[](void *)
+ DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler // int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)
+ DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler // int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int)
+ DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode // int __cdecl _set_new_mode(int)
+ DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator // void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *)
+ DEFINE_ALIAS ?before@type_info@@QBAHABV1@@Z, type_info_before // public: int __cdecl type_info::before(class type_info const &)const
+ DEFINE_ALIAS ?name@type_info@@QBAPBDXZ, type_info_name // public: char const * __cdecl type_info::name(void)const
+ DEFINE_ALIAS ?raw_name@type_info@@QBAPBDXZ, type_info_raw_name // public: char const * __cdecl type_info::raw_name(void)const
+ DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate // void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void)
+ DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected // void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void)
+ DEFINE_ALIAS ?terminate@@YAXXZ, terminate // void __cdecl terminate(void)
+ DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected // void __cdecl unexpected(void)
+ DEFINE_ALIAS ?what@exception@@UBAPBDXZ, exception_what // public: virtual char const * __cdecl exception::what(void)const
#undef _MSVCRT_
MACRO
@@ -74,8 +74,8 @@ _Target SETS "|$Target|"
LCLS CxxLabel
CxxLabel SETS "|$CxxName|"
RttiName SETS "|$ShortName._rtti|"
-VtblName SETS "|MSVCRT_":CC:"$ShortName._vtable|"
-DtorName SETS "|MSVCRT_":CC:"$ShortName._vector_dtor|"
+VtblName SETS "|":CC:"$ShortName._vtable|"
+DtorName SETS "|":CC:"$ShortName._vector_dtor|"
EXTERN $RttiName
DCD $RttiName
EXPORT $VtblName
@@ -89,8 +89,8 @@ $CxxLabel
MACRO
DEFINE_EXCEPTION_VTABLE $ShortName, $CxxName
START_VTABLE $ShortName, $CxxName
- EXTERN MSVCRT_what_exception
- DCD MSVCRT_what_exception
+ EXTERN exception_what
+ DCD exception_what
MEND
START_VTABLE type_info, __dummyname_type_info
@@ -101,13 +101,13 @@ $CxxLabel
GBLS FuncName
- //EXTERN MSVCRT_operator_delete
+ //EXTERN operator_delete
//__ExportName ??3@YAXPAX@Z
- //b MSVCRT_operator_delete
+ //b operator_delete
- //EXTERN MSVCRT_operator_new
+ //EXTERN operator_new
//__ExportName ??_U@YAPAXI@Z
- //b MSVCRT_operator_new
+ //b operator_new
END
/* EOF */
diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s
index 7985dc1d9fe..99e2748edd6 100644
--- a/sdk/lib/crt/except/i386/cpp.s
+++ b/sdk/lib/crt/except/i386/cpp.s
@@ -17,61 +17,61 @@ MACRO(DEFINE_THISCALL_ALIAS, cxxname, target)
#endif
ENDM
-DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBD@Z, _MSVCRT_exception_ctor
-DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBDH@Z, _MSVCRT_exception_ctor_noalloc
-DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABV0@@Z, _MSVCRT_exception_copy_ctor
-DEFINE_THISCALL_ALIAS ??0exception@@QAE@XZ, _MSVCRT_exception_default_ctor
-DEFINE_THISCALL_ALIAS ??1exception@@UAE@XZ, _MSVCRT_exception_dtor
-DEFINE_THISCALL_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, _MSVCRT_exception_opequals
-DEFINE_THISCALL_ALIAS ??_Eexception@@UAEPAXI@Z, _MSVCRT_exception_vector_dtor
-DEFINE_THISCALL_ALIAS ??_Gexception@@UAEPAXI@Z, _MSVCRT_exception_scalar_dtor
-DEFINE_THISCALL_ALIAS ?what@exception@@UBEPBDXZ, _MSVCRT_what_exception
-DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, _MSVCRT_bad_typeid_copy_ctor
-DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@PBD@Z, _MSVCRT_bad_typeid_ctor
-DEFINE_THISCALL_ALIAS ??_Fbad_typeid@@QAEXXZ, _MSVCRT_bad_typeid_default_ctor
-DEFINE_THISCALL_ALIAS ??1bad_typeid@@UAE@XZ, _MSVCRT_bad_typeid_dtor
-DEFINE_THISCALL_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_typeid_opequals
-DEFINE_THISCALL_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_vector_dtor
-DEFINE_THISCALL_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_scalar_dtor
-DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, _MSVCRT___non_rtti_object_copy_ctor
-DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, _MSVCRT___non_rtti_object_ctor
-DEFINE_THISCALL_ALIAS ??1__non_rtti_object@@UAE@XZ, _MSVCRT___non_rtti_object_dtor
-DEFINE_THISCALL_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, _MSVCRT___non_rtti_object_opequals
-DEFINE_THISCALL_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_vector_dtor
-DEFINE_THISCALL_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_scalar_dtor
-DEFINE_THISCALL_ALIAS ??0bad_cast@@AAE@PBQBD@Z, _MSVCRT_bad_cast_ctor
-DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABQBD@Z, _MSVCRT_bad_cast_ctor
-DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABV0@@Z, _MSVCRT_bad_cast_copy_ctor
-DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@PBD@Z, _MSVCRT_bad_cast_ctor_charptr
-DEFINE_THISCALL_ALIAS ??_Fbad_cast@@QAEXXZ, _MSVCRT_bad_cast_default_ctor
-DEFINE_THISCALL_ALIAS ??1bad_cast@@UAE@XZ, _MSVCRT_bad_cast_dtor
-DEFINE_THISCALL_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_cast_opequals
-DEFINE_THISCALL_ALIAS ??_Ebad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_vector_dtor
-DEFINE_THISCALL_ALIAS ??_Gbad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_scalar_dtor
-DEFINE_THISCALL_ALIAS ??8type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opequals_equals
-DEFINE_THISCALL_ALIAS ??9type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opnot_equals
-DEFINE_THISCALL_ALIAS ?before@type_info@@QBEHABV1@@Z, _MSVCRT_type_info_before
-DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _MSVCRT_type_info_dtor
-DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _MSVCRT_type_info_name
-DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _MSVCRT_type_info_raw_name
+DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBD@Z, _exception_ctor
+DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBDH@Z, _exception_ctor_noalloc
+DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABV0@@Z, _exception_copy_ctor
+DEFINE_THISCALL_ALIAS ??0exception@@QAE@XZ, _exception_default_ctor
+DEFINE_THISCALL_ALIAS ??1exception@@UAE@XZ, _exception_dtor
+DEFINE_THISCALL_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, _exception_opequals
+DEFINE_THISCALL_ALIAS ??_Eexception@@UAEPAXI@Z, _exception_vector_dtor
+DEFINE_THISCALL_ALIAS ??_Gexception@@UAEPAXI@Z, _exception_scalar_dtor
+DEFINE_THISCALL_ALIAS ?what@exception@@UBEPBDXZ, _exception_what
+DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, _bad_typeid_copy_ctor
+DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@PBD@Z, _bad_typeid_ctor
+DEFINE_THISCALL_ALIAS ??_Fbad_typeid@@QAEXXZ, _bad_typeid_default_ctor
+DEFINE_THISCALL_ALIAS ??1bad_typeid@@UAE@XZ, _bad_typeid_dtor
+DEFINE_THISCALL_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, _bad_typeid_opequals
+DEFINE_THISCALL_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, _bad_typeid_vector_dtor
+DEFINE_THISCALL_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, _bad_typeid_scalar_dtor
+DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, ___non_rtti_object_copy_ctor
+DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, ___non_rtti_object_ctor
+DEFINE_THISCALL_ALIAS ??1__non_rtti_object@@UAE@XZ, ___non_rtti_object_dtor
+DEFINE_THISCALL_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, ___non_rtti_object_opequals
+DEFINE_THISCALL_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_vector_dtor
+DEFINE_THISCALL_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_scalar_dtor
+DEFINE_THISCALL_ALIAS ??0bad_cast@@AAE@PBQBD@Z, _bad_cast_ctor
+DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABQBD@Z, _bad_cast_ctor
+DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABV0@@Z, _bad_cast_copy_ctor
+DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@PBD@Z, _bad_cast_ctor_charptr
+DEFINE_THISCALL_ALIAS ??_Fbad_cast@@QAEXXZ, _bad_cast_default_ctor
+DEFINE_THISCALL_ALIAS ??1bad_cast@@UAE@XZ, _bad_cast_dtor
+DEFINE_THISCALL_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, _bad_cast_opequals
+DEFINE_THISCALL_ALIAS ??_Ebad_cast@@UAEPAXI@Z, _bad_cast_vector_dtor
+DEFINE_THISCALL_ALIAS ??_Gbad_cast@@UAEPAXI@Z, _bad_cast_scalar_dtor
+DEFINE_THISCALL_ALIAS ??8type_info@@QBEHABV0@@Z, _type_info_opequals_equals
+DEFINE_THISCALL_ALIAS ??9type_info@@QBEHABV0@@Z, _type_info_opnot_equals
+DEFINE_THISCALL_ALIAS ?before@type_info@@QBEHABV1@@Z, _type_info_before
+DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _type_info_dtor
+DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _type_info_name
+DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _type_info_raw_name
#undef _MSVCRT_
MACRO(START_VTABLE, shortname, cxxname)
EXTERN _&shortname&_rtti:PROC
-EXTERN ___thiscall_MSVCRT_&shortname&_vector_dtor:PROC
+EXTERN ___thiscall_&shortname&_vector_dtor:PROC
.long _&shortname&_rtti
-PUBLIC _MSVCRT_&shortname&_vtable
-_MSVCRT_&shortname&_vtable:
+PUBLIC _&shortname&_vtable
+_&shortname&_vtable:
PUBLIC &cxxname
&cxxname:
- .long ___thiscall_MSVCRT_&shortname&_vector_dtor
+ .long ___thiscall_&shortname&_vector_dtor
ENDM
MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname)
START_VTABLE shortname, cxxname
- EXTERN ___thiscall_MSVCRT_what_exception:PROC
- .long ___thiscall_MSVCRT_what_exception
+ EXTERN ___thiscall_exception_what:PROC
+ .long ___thiscall_exception_what
ENDM
START_VTABLE type_info, __dummyname_type_info
@@ -80,15 +80,15 @@ DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@
DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@
DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@
-EXTERN _MSVCRT_operator_delete:PROC
+EXTERN _operator_delete:PROC
PUBLIC ??3@YAXPAX@Z
??3@YAXPAX@Z:
- jmp _MSVCRT_operator_delete
+ jmp _operator_delete
-EXTERN _MSVCRT_operator_new:PROC
+EXTERN _operator_new:PROC
PUBLIC ??_U@YAPAXI@Z
??_U@YAPAXI@Z:
- jmp _MSVCRT_operator_new
+ jmp _operator_new
MACRO(DEFINE_ALIAS, alias, orig, type)
@@ -96,18 +96,18 @@ EXTERN &orig:&type
ALIAS <&alias> = <&orig>
ENDM
-DEFINE_ALIAS ??_V@YAXPAX@Z, _MSVCRT_operator_delete, PROC
-DEFINE_ALIAS ??2@YAPAXI@Z, _MSVCRT_operator_new, PROC
-DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _MSVCRT__query_new_handler, PROC
-DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _MSVCRT__set_new_handler, PROC
-DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_new_handler, PROC
-DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _MSVCRT__query_new_mode, PROC
-DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _MSVCRT__set_new_mode, PROC
-DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _MSVCRT__set_se_translator, PROC
-DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_terminate, PROC
-DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_unexpected, PROC
-DEFINE_ALIAS ?terminate@@YAXXZ, _MSVCRT_terminate, PROC
-DEFINE_ALIAS ?unexpected@@YAXXZ, _MSVCRT_unexpected, PROC
+DEFINE_ALIAS ??_V@YAXPAX@Z, _operator_delete, PROC
+DEFINE_ALIAS ??2@YAPAXI@Z, _operator_new, PROC
+DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, __query_new_handler, PROC
+DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, __set_new_handler, PROC
+DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _set_new_handler, PROC
+DEFINE_ALIAS ?_query_new_mode@@YAHXZ, __query_new_mode, PROC
+DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, __set_new_mode, PROC
+DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, __set_se_translator, PROC
+DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _set_terminate, PROC
+DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _set_unexpected, PROC
+DEFINE_ALIAS ?terminate@@YAXXZ, _terminate, PROC
+DEFINE_ALIAS ?unexpected@@YAXXZ, _unexpected, PROC
// void call_copy_ctor( void *func, void *this, void *src, int has_vbase );
diff --git a/sdk/lib/crt/include/internal/wine_msc.h b/sdk/lib/crt/include/internal/wine_msc.h
index ebe023b48d0..eb0447c93ac 100644
--- a/sdk/lib/crt/include/internal/wine_msc.h
+++ b/sdk/lib/crt/include/internal/wine_msc.h
@@ -1,41 +1,41 @@
exception * __thiscall MSVCRT_exception_ctor(exception * _this, const char ** name);
-exception * __thiscall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc);
-exception * __thiscall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs);
-exception * __thiscall MSVCRT_exception_default_ctor(exception * _this);
-void __thiscall MSVCRT_exception_dtor(exception * _this);
-exception * __thiscall MSVCRT_exception_opequals(exception * _this, const exception * rhs);
-void * __thiscall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags);
-void * __thiscall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags);
-const char * __thiscall MSVCRT_what_exception(exception * _this);
-bad_typeid * __thiscall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs);
-bad_typeid * __thiscall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name);
-bad_typeid * __thiscall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this);
-void __thiscall MSVCRT_bad_typeid_dtor(bad_typeid * _this);
-bad_typeid * __thiscall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs);
-void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags);
-void * __thiscall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags);
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this, const __non_rtti_object * rhs);
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this, const char * name);
-void __thiscall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this);
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this, const __non_rtti_object *rhs);
-void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags);
-void * __thiscall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags);
-bad_cast * __thiscall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name);
-bad_cast * __thiscall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs);
-bad_cast * __thiscall MSVCRT_bad_cast_ctor_charptr(bad_cast * _this, const char * name);
-bad_cast * __thiscall MSVCRT_bad_cast_default_ctor(bad_cast * _this);
-void __thiscall MSVCRT_bad_cast_dtor(bad_cast * _this);
-bad_cast * __thiscall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs);
-void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags);
-void * __thiscall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags);
-int __thiscall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs);
-int __thiscall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs);
-int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs);
-void __thiscall MSVCRT_type_info_dtor(type_info * _this);
-const char * __thiscall MSVCRT_type_info_name(type_info * _this);
-const char * __thiscall MSVCRT_type_info_raw_name(type_info * _this);
-void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags);
+exception * __thiscall exception_ctor_noalloc(exception * _this, char ** name, int noalloc);
+exception * __thiscall exception_copy_ctor(exception * _this, const exception * rhs);
+exception * __thiscall exception_default_ctor(exception * _this);
+void __thiscall exception_dtor(exception * _this);
+exception * __thiscall exception_opequals(exception * _this, const exception * rhs);
+void * __thiscall exception_vector_dtor(exception * _this, unsigned int flags);
+void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags);
+const char * __thiscall exception_what(exception * _this);
+bad_typeid * __thiscall bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs);
+bad_typeid * __thiscall bad_typeid_ctor(bad_typeid * _this, const char * name);
+bad_typeid * __thiscall bad_typeid_default_ctor(bad_typeid * _this);
+void __thiscall bad_typeid_dtor(bad_typeid * _this);
+bad_typeid * __thiscall bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs);
+void * __thiscall bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags);
+void * __thiscall bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags);
+__non_rtti_object * __thiscall __non_rtti_object_copy_ctor(__non_rtti_object * _this, const __non_rtti_object * rhs);
+__non_rtti_object * __thiscall __non_rtti_object_ctor(__non_rtti_object * _this, const char * name);
+void __thiscall __non_rtti_object_dtor(__non_rtti_object * _this);
+__non_rtti_object * __thiscall __non_rtti_object_opequals(__non_rtti_object * _this, const __non_rtti_object *rhs);
+void * __thiscall __non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags);
+void * __thiscall __non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags);
+bad_cast * __thiscall bad_cast_ctor(bad_cast * _this, const char ** name);
+bad_cast * __thiscall bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs);
+bad_cast * __thiscall bad_cast_ctor_charptr(bad_cast * _this, const char * name);
+bad_cast * __thiscall bad_cast_default_ctor(bad_cast * _this);
+void __thiscall bad_cast_dtor(bad_cast * _this);
+bad_cast * __thiscall bad_cast_opequals(bad_cast * _this, const bad_cast * rhs);
+void * __thiscall bad_cast_vector_dtor(bad_cast * _this, unsigned int flags);
+void * __thiscall bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags);
+int __thiscall type_info_opequals_equals(type_info * _this, const type_info * rhs);
+int __thiscall type_info_opnot_equals(type_info * _this, const type_info * rhs);
+int __thiscall type_info_before(type_info * _this, const type_info * rhs);
+void __thiscall type_info_dtor(type_info * _this);
+const char * __thiscall type_info_name(type_info * _this);
+const char * __thiscall type_info_raw_name(type_info * _this);
+void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags);
#if _MSVCR_VER >= 80
bad_alloc* __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc* _this, const bad_alloc* rhs);
bad_alloc* __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc* _this, const bad_alloc* rhs);
diff --git a/sdk/lib/crt/signal/xcptinfo.c b/sdk/lib/crt/signal/xcptinfo.c
deleted file mode 100644
index a476d9c41ce..00000000000
--- a/sdk/lib/crt/signal/xcptinfo.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <precomp.h>
-
-/*
- * @implemented
- */
-void** __pxcptinfoptrs(void)
-{
- return (void**)&msvcrt_get_thread_data()->xcptinfo;
-}
diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c
index b5636b1fb1a..a256569584b 100644
--- a/sdk/lib/crt/wine/cpp.c
+++ b/sdk/lib/crt/wine/cpp.c
@@ -19,22 +19,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdarg.h>
+#include <stdbool.h>
#include "windef.h"
#include "winternl.h"
#include "wine/exception.h"
#include "wine/debug.h"
#include "msvcrt.h"
-#include "cppexcept.h"
#include "mtdll.h"
#include "cxx.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+CREATE_TYPE_INFO_VTABLE
+CREATE_EXCEPTION_OBJECT(exception)
+
struct __type_info_node
{
void *memPtr;
@@ -45,11 +45,10 @@ typedef exception bad_cast;
typedef exception bad_typeid;
typedef exception __non_rtti_object;
-extern const vtable_ptr MSVCRT_exception_vtable;
-extern const vtable_ptr MSVCRT_bad_typeid_vtable;
-extern const vtable_ptr MSVCRT_bad_cast_vtable;
-extern const vtable_ptr MSVCRT___non_rtti_object_vtable;
-extern const vtable_ptr MSVCRT_type_info_vtable;
+extern const vtable_ptr bad_typeid_vtable;
+extern const vtable_ptr bad_cast_vtable;
+extern const vtable_ptr __non_rtti_object_vtable;
+extern const vtable_ptr type_info_vtable;
/* get the vtable pointer for a C++ object */
static inline const vtable_ptr *get_vtable( void *obj )
@@ -120,24 +119,6 @@ static void dump_obj_locator( const rtti_object_locator *ptr )
}
#endif
-/* Internal common ctor for exception */
-static void EXCEPTION_ctor(exception *_this, const char** name)
-{
- _this->vtable = &MSVCRT_exception_vtable;
- if (*name)
- {
- unsigned int name_len = strlen(*name) + 1;
- _this->name = MSVCRT_malloc(name_len);
- memcpy(_this->name, *name, name_len);
- _this->do_free = TRUE;
- }
- else
- {
- _this->name = NULL;
- _this->do_free = FALSE;
- }
-}
-
#ifdef __REACTOS__
#include <internal/wine_msc.h>
#endif /* __REACTOS__ */
@@ -145,191 +126,119 @@ static void EXCEPTION_ctor(exception *_this, const char** name)
/******************************************************************
* ??0exception@@QAE@ABQBD@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor,8)
-exception * __thiscall MSVCRT_exception_ctor(exception * _this, const char ** name)
+DEFINE_THISCALL_WRAPPER(exception_ctor,8)
+exception * __thiscall exception_ctor(exception * _this, const char ** name)
{
TRACE("(%p,%s)\n", _this, *name);
- EXCEPTION_ctor(_this, name);
- return _this;
+ return __exception_ctor(_this, *name, &exception_vtable);
}
/******************************************************************
* ??0exception@@QAE@ABQBDH@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor_noalloc,12)
-exception * __thiscall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc)
+DEFINE_THISCALL_WRAPPER(exception_ctor_noalloc,12)
+exception * __thiscall exception_ctor_noalloc(exception * _this, char ** name, int noalloc)
{
TRACE("(%p,%s)\n", _this, *name);
- _this->vtable = &MSVCRT_exception_vtable;
+ _this->vtable = &exception_vtable;
_this->name = *name;
_this->do_free = FALSE;
return _this;
}
-/******************************************************************
- * ??0exception@@QAE@ABV0@@Z (MSVCRT.@)
- */
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_copy_ctor,8)
-exception * __thiscall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs)
-{
- TRACE("(%p,%p)\n", _this, rhs);
-
- if (!rhs->do_free)
- {
- _this->vtable = &MSVCRT_exception_vtable;
- _this->name = rhs->name;
- _this->do_free = FALSE;
- }
- else
- EXCEPTION_ctor(_this, (const char**)&rhs->name);
- TRACE("name = %s\n", _this->name);
- return _this;
-}
-
/******************************************************************
* ??0exception@@QAE@XZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_default_ctor,4)
-exception * __thiscall MSVCRT_exception_default_ctor(exception * _this)
-{
- static const char* empty = NULL;
-
- TRACE("(%p)\n", _this);
- EXCEPTION_ctor(_this, &empty);
- return _this;
-}
-
-/******************************************************************
- * ??1exception@@UAE@XZ (MSVCRT.@)
- */
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_dtor,4)
-void __thiscall MSVCRT_exception_dtor(exception * _this)
+DEFINE_THISCALL_WRAPPER(exception_default_ctor,4)
+exception * __thiscall exception_default_ctor(exception * _this)
{
TRACE("(%p)\n", _this);
- _this->vtable = &MSVCRT_exception_vtable;
- if (_this->do_free) MSVCRT_free(_this->name);
+ return __exception_ctor(_this, NULL, &exception_vtable);
}
/******************************************************************
* ??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals,8)
-exception * __thiscall MSVCRT_exception_opequals(exception * _this, const exception * rhs)
+DEFINE_THISCALL_WRAPPER(exception_opequals,8)
+exception * __thiscall exception_opequals(exception * _this, const exception * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
if (_this != rhs)
{
- MSVCRT_exception_dtor(_this);
- MSVCRT_exception_copy_ctor(_this, rhs);
+ exception_dtor(_this);
+ exception_copy_ctor(_this, rhs);
}
TRACE("name = %s\n", _this->name);
return _this;
}
-/******************************************************************
- * ??_Eexception@@UAEPAXI@Z (MSVCRT.@)
- */
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor,8)
-void * __thiscall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags)
-{
- TRACE("(%p %x)\n", _this, flags);
- if (flags & 2)
- {
- /* we have an array, with the number of elements stored before the first object */
- INT_PTR i, *ptr = (INT_PTR *)_this - 1;
-
- for (i = *ptr - 1; i >= 0; i--) MSVCRT_exception_dtor(_this + i);
- MSVCRT_operator_delete(ptr);
- }
- else
- {
- MSVCRT_exception_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
- }
- return _this;
-}
-
/******************************************************************
* ??_Gexception@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_exception_scalar_dtor,8)
-void * __thiscall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(exception_scalar_dtor,8)
+void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
- MSVCRT_exception_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ exception_dtor(_this);
+ if (flags & 1) operator_delete(_this);
return _this;
}
-/******************************************************************
- * ?what@exception@@UBEPBDXZ (MSVCRT.@)
- */
-DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception,4)
-const char * __thiscall MSVCRT_what_exception(exception * _this)
-{
- TRACE("(%p) returning %s\n", _this, _this->name);
- return _this->name ? _this->name : "Unknown exception";
-}
-
/******************************************************************
* ??0bad_typeid@@QAE@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_copy_ctor,8)
-bad_typeid * __thiscall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs)
+DEFINE_THISCALL_WRAPPER(bad_typeid_copy_ctor,8)
+bad_typeid * __thiscall bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_bad_typeid_vtable;
- return _this;
+ return __exception_copy_ctor(_this, rhs, &bad_typeid_vtable);
}
/******************************************************************
* ??0bad_typeid@@QAE@PBD@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor,8)
-bad_typeid * __thiscall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name)
+DEFINE_THISCALL_WRAPPER(bad_typeid_ctor,8)
+bad_typeid * __thiscall bad_typeid_ctor(bad_typeid * _this, const char * name)
{
TRACE("(%p %s)\n", _this, name);
- EXCEPTION_ctor(_this, &name);
- _this->vtable = &MSVCRT_bad_typeid_vtable;
- return _this;
+ return __exception_ctor(_this, name, &bad_typeid_vtable);
}
/******************************************************************
* ??_Fbad_typeid@@QAEXXZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_default_ctor,4)
-bad_typeid * __thiscall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this)
+DEFINE_THISCALL_WRAPPER(bad_typeid_default_ctor,4)
+bad_typeid * __thiscall bad_typeid_default_ctor(bad_typeid * _this)
{
- return MSVCRT_bad_typeid_ctor( _this, "bad typeid" );
+ return bad_typeid_ctor( _this, "bad typeid" );
}
/******************************************************************
* ??1bad_typeid@@UAE@XZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor,4)
-void __thiscall MSVCRT_bad_typeid_dtor(bad_typeid * _this)
+DEFINE_THISCALL_WRAPPER(bad_typeid_dtor,4)
+void __thiscall bad_typeid_dtor(bad_typeid * _this)
{
TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
+ exception_dtor(_this);
}
/******************************************************************
* ??4bad_typeid@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals,8)
-bad_typeid * __thiscall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs)
+DEFINE_THISCALL_WRAPPER(bad_typeid_opequals,8)
+bad_typeid * __thiscall bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_opequals(_this, rhs);
+ exception_opequals(_this, rhs);
return _this;
}
/******************************************************************
* ??_Ebad_typeid@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor,8)
-void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(bad_typeid_vector_dtor,8)
+void * __thiscall bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
if (flags & 2)
@@ -337,13 +246,13 @@ void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int
/* we have an array, with the number of elements stored before the first object */
INT_PTR i, *ptr = (INT_PTR *)_this - 1;
- for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_typeid_dtor(_this + i);
- MSVCRT_operator_delete(ptr);
+ for (i = *ptr - 1; i >= 0; i--) bad_typeid_dtor(_this + i);
+ operator_delete(ptr);
}
else
{
- MSVCRT_bad_typeid_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ bad_typeid_dtor(_this);
+ if (flags & 1) operator_delete(_this);
}
return _this;
}
@@ -351,68 +260,64 @@ void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int
/******************************************************************
* ??_Gbad_typeid@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor,8)
-void * __thiscall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(bad_typeid_scalar_dtor,8)
+void * __thiscall bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
- MSVCRT_bad_typeid_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ bad_typeid_dtor(_this);
+ if (flags & 1) operator_delete(_this);
return _this;
}
/******************************************************************
* ??0__non_rtti_object@@QAE@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor,8)
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this,
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_copy_ctor,8)
+__non_rtti_object * __thiscall __non_rtti_object_copy_ctor(__non_rtti_object * _this,
const __non_rtti_object * rhs)
{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_bad_typeid_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT___non_rtti_object_vtable;
- return _this;
+ TRACE("(%p %p)\n", _this, rhs);
+ return __exception_copy_ctor(_this, rhs, &__non_rtti_object_vtable);
}
/******************************************************************
* ??0__non_rtti_object@@QAE@PBD@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor,8)
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this,
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_ctor,8)
+__non_rtti_object * __thiscall __non_rtti_object_ctor(__non_rtti_object * _this,
const char * name)
{
TRACE("(%p %s)\n", _this, name);
- EXCEPTION_ctor(_this, &name);
- _this->vtable = &MSVCRT___non_rtti_object_vtable;
- return _this;
+ return __exception_ctor(_this, name, &__non_rtti_object_vtable);
}
/******************************************************************
* ??1__non_rtti_object@@UAE@XZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor,4)
-void __thiscall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this)
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_dtor,4)
+void __thiscall __non_rtti_object_dtor(__non_rtti_object * _this)
{
TRACE("(%p)\n", _this);
- MSVCRT_bad_typeid_dtor(_this);
+ bad_typeid_dtor(_this);
}
/******************************************************************
* ??4__non_rtti_object@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals,8)
-__non_rtti_object * __thiscall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this,
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_opequals,8)
+__non_rtti_object * __thiscall __non_rtti_object_opequals(__non_rtti_object * _this,
const __non_rtti_object *rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_bad_typeid_opequals(_this, rhs);
+ bad_typeid_opequals(_this, rhs);
return _this;
}
/******************************************************************
* ??_E__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor,8)
-void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_vector_dtor,8)
+void * __thiscall __non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
if (flags & 2)
@@ -420,13 +325,13 @@ void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this
/* we have an array, with the number of elements stored before the first object */
INT_PTR i, *ptr = (INT_PTR *)_this - 1;
- for (i = *ptr - 1; i >= 0; i--) MSVCRT___non_rtti_object_dtor(_this + i);
- MSVCRT_operator_delete(ptr);
+ for (i = *ptr - 1; i >= 0; i--) __non_rtti_object_dtor(_this + i);
+ operator_delete(ptr);
}
else
{
- MSVCRT___non_rtti_object_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ __non_rtti_object_dtor(_this);
+ if (flags & 1) operator_delete(_this);
}
return _this;
}
@@ -434,12 +339,12 @@ void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this
/******************************************************************
* ??_G__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor,8)
-void * __thiscall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(__non_rtti_object_scalar_dtor,8)
+void * __thiscall __non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
- MSVCRT___non_rtti_object_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ __non_rtti_object_dtor(_this);
+ if (flags & 1) operator_delete(_this);
return _this;
}
@@ -447,74 +352,68 @@ void * __thiscall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this
* ??0bad_cast@@AAE@PBQBD@Z (MSVCRT.@)
* ??0bad_cast@@QAE@ABQBD@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor,8)
-bad_cast * __thiscall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name)
+DEFINE_THISCALL_WRAPPER(bad_cast_ctor,8)
+bad_cast * __thiscall bad_cast_ctor(bad_cast * _this, const char ** name)
{
TRACE("(%p %s)\n", _this, *name);
- EXCEPTION_ctor(_this, name);
- _this->vtable = &MSVCRT_bad_cast_vtable;
- return _this;
+ return __exception_ctor(_this, *name, &bad_cast_vtable);
}
/******************************************************************
* ??0bad_cast@@QAE@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor,8)
-bad_cast * __thiscall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs)
+DEFINE_THISCALL_WRAPPER(bad_cast_copy_ctor,8)
+bad_cast * __thiscall bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_bad_cast_vtable;
- return _this;
+ return __exception_copy_ctor(_this, rhs, &bad_cast_vtable);
}
/******************************************************************
* ??0bad_cast@@QAE@PBD@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor_charptr,8)
-bad_cast * __thiscall MSVCRT_bad_cast_ctor_charptr(bad_cast * _this, const char * name)
+DEFINE_THISCALL_WRAPPER(bad_cast_ctor_charptr,8)
+bad_cast * __thiscall bad_cast_ctor_charptr(bad_cast * _this, const char * name)
{
TRACE("(%p %s)\n", _this, name);
- EXCEPTION_ctor(_this, &name);
- _this->vtable = &MSVCRT_bad_cast_vtable;
- return _this;
+ return __exception_ctor(_this, name, &bad_cast_vtable);
}
/******************************************************************
* ??_Fbad_cast@@QAEXXZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_default_ctor,4)
-bad_cast * __thiscall MSVCRT_bad_cast_default_ctor(bad_cast * _this)
+DEFINE_THISCALL_WRAPPER(bad_cast_default_ctor,4)
+bad_cast * __thiscall bad_cast_default_ctor(bad_cast * _this)
{
- return MSVCRT_bad_cast_ctor_charptr( _this, "bad cast" );
+ return bad_cast_ctor_charptr( _this, "bad cast" );
}
/******************************************************************
* ??1bad_cast@@UAE@XZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor,4)
-void __thiscall MSVCRT_bad_cast_dtor(bad_cast * _this)
+DEFINE_THISCALL_WRAPPER(bad_cast_dtor,4)
+void __thiscall bad_cast_dtor(bad_cast * _this)
{
TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
+ exception_dtor(_this);
}
/******************************************************************
* ??4bad_cast@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals,8)
-bad_cast * __thiscall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs)
+DEFINE_THISCALL_WRAPPER(bad_cast_opequals,8)
+bad_cast * __thiscall bad_cast_opequals(bad_cast * _this, const bad_cast * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_opequals(_this, rhs);
+ exception_opequals(_this, rhs);
return _this;
}
/******************************************************************
* ??_Ebad_cast@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor,8)
-void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(bad_cast_vector_dtor,8)
+void * __thiscall bad_cast_vector_dtor(bad_cast * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
if (flags & 2)
@@ -522,13 +421,13 @@ void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int fla
/* we have an array, with the number of elements stored before the first object */
INT_PTR i, *ptr = (INT_PTR *)_this - 1;
- for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_cast_dtor(_this + i);
- MSVCRT_operator_delete(ptr);
+ for (i = *ptr - 1; i >= 0; i--) bad_cast_dtor(_this + i);
+ operator_delete(ptr);
}
else
{
- MSVCRT_bad_cast_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ bad_cast_dtor(_this);
+ if (flags & 1) operator_delete(_this);
}
return _this;
}
@@ -536,20 +435,20 @@ void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int fla
/******************************************************************
* ??_Gbad_cast@@UAEPAXI@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor,8)
-void * __thiscall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(bad_cast_scalar_dtor,8)
+void * __thiscall bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
- MSVCRT_bad_cast_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
+ bad_cast_dtor(_this);
+ if (flags & 1) operator_delete(_this);
return _this;
}
/******************************************************************
* ??8type_info@@QBEHABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals,8)
-int __thiscall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs)
+DEFINE_THISCALL_WRAPPER(type_info_opequals_equals,8)
+int __thiscall type_info_opequals_equals(type_info * _this, const type_info * rhs)
{
int ret = !strcmp(_this->mangled + 1, rhs->mangled + 1);
TRACE("(%p %p) returning %d\n", _this, rhs, ret);
@@ -559,8 +458,8 @@ int __thiscall MSVCRT_type_info_opequals_equals(type_info * _this, const type_in
/******************************************************************
* ??9type_info@@QBEHABV0@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals,8)
-int __thiscall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs)
+DEFINE_THISCALL_WRAPPER(type_info_opnot_equals,8)
+int __thiscall type_info_opnot_equals(type_info * _this, const type_info * rhs)
{
int ret = !!strcmp(_this->mangled + 1, rhs->mangled + 1);
TRACE("(%p %p) returning %d\n", _this, rhs, ret);
@@ -570,8 +469,8 @@ int __thiscall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info
/******************************************************************
* ?before@type_info@@QBEHABV1@@Z (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before,8)
-int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs)
+DEFINE_THISCALL_WRAPPER(type_info_before,8)
+int __thiscall type_info_before(type_info * _this, const type_info * rhs)
{
int ret = strcmp(_this->mangled + 1, rhs->mangled + 1) < 0;
TRACE("(%p %p) returning %d\n", _this, rhs, ret);
@@ -581,18 +480,18 @@ int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs)
/******************************************************************
* ??1type_info@@UAE@XZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4)
-void __thiscall MSVCRT_type_info_dtor(type_info * _this)
+DEFINE_THISCALL_WRAPPER(type_info_dtor,4)
+void __thiscall type_info_dtor(type_info * _this)
{
TRACE("(%p)\n", _this);
- MSVCRT_free(_this->name);
+ free(_this->name);
}
/******************************************************************
* ?name@type_info@@QBEPBDXZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name,4)
-const char * __thiscall MSVCRT_type_info_name(type_info * _this)
+DEFINE_THISCALL_WRAPPER(type_info_name,4)
+const char * __thiscall type_info_name(type_info * _this)
{
if (!_this->name)
{
@@ -602,7 +501,7 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this)
* Is this '.' really part of the mangled name, or has it some other meaning ?
*/
char* name = __unDName(0, _this->mangled + 1, 0,
- MSVCRT_malloc, MSVCRT_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE);
+ malloc, free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE);
if (name)
{
unsigned int len = strlen(name);
@@ -614,7 +513,7 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this)
if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL))
{
/* Another thread set this member since we checked above - use it */
- MSVCRT_free(name);
+ free(name);
}
}
}
@@ -625,475 +524,76 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this)
/******************************************************************
* ?raw_name@type_info@@QBEPBDXZ (MSVCRT.@)
*/
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name,4)
-const char * __thiscall MSVCRT_type_info_raw_name(type_info * _this)
+DEFINE_THISCALL_WRAPPER(type_info_raw_name,4)
+const char * __thiscall type_info_raw_name(type_info * _this)
{
TRACE("(%p) returning %s\n", _this, _this->mangled);
return _this->mangled;
}
-/* Unexported */
-DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_vector_dtor,8)
-void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags)
-{
- TRACE("(%p %x)\n", _this, flags);
- if (flags & 2)
- {
- /* we have an array, with the number of elements stored before the first object */
- INT_PTR i, *ptr = (INT_PTR *)_this - 1;
-
- for (i = *ptr - 1; i >= 0; i--) MSVCRT_type_info_dtor(_this + i);
- MSVCRT_operator_delete(ptr);
- }
- else
- {
- MSVCRT_type_info_dtor(_this);
- if (flags & 1) MSVCRT_operator_delete(_this);
- }
- return _this;
-}
-
#if _MSVCR_VER >= 80
typedef exception bad_alloc;
-extern const vtable_ptr MSVCRT_bad_alloc_vtable;
-
-static void bad_alloc_ctor(bad_alloc *this, const char **name)
-{
- MSVCRT_exception_ctor(this, name);
- this->vtable = &MSVCRT_bad_alloc_vtable;
-}
+extern const vtable_ptr bad_alloc_vtable;
/* bad_alloc class implementation */
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8)
-bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs)
+DEFINE_THISCALL_WRAPPER(bad_alloc_copy_ctor,8)
+bad_alloc * __thiscall bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_bad_alloc_vtable;
- return _this;
+ return __exception_copy_ctor(_this, rhs, &bad_alloc_vtable);
}
-DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4)
-void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this)
+DEFINE_THISCALL_WRAPPER(bad_alloc_dtor,4)
+void __thiscall bad_alloc_dtor(bad_alloc * _this)
{
TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
+ exception_dtor(_this);
}
#endif /* _MSVCR_VER >= 80 */
-#if _MSVCR_VER >= 100
-
-typedef struct {
- exception e;
- HRESULT hr;
-} scheduler_resource_allocation_error;
-extern const vtable_ptr MSVCRT_scheduler_resource_allocation_error_vtable;
-
-/* ??0scheduler_resource_allocation_error@Concurrency@@QAE@PBDJ@Z */
-/* ??0scheduler_resource_allocation_error@Concurrency@@QEAA@PEBDJ@Z */
-DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_ctor_name, 12)
-scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor_name(
- scheduler_resource_allocation_error *this, const char *name, HRESULT hr)
-{
- TRACE("(%p %s %x)\n", this, wine_dbgstr_a(name), hr);
- MSVCRT_exception_ctor(&this->e, &name);
- this->e.vtable = &MSVCRT_scheduler_resource_allocation_error_vtable;
- this->hr = hr;
- return this;
-}
-
-/* ??0scheduler_resource_allocation_error@Concurrency@@QAE@J@Z */
-/* ??0scheduler_resource_allocation_error@Concurrency@@QEAA@J@Z */
-DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_ctor, 8)
-scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor(
- scheduler_resource_allocation_error *this, HRESULT hr)
-{
- return scheduler_resource_allocation_error_ctor_name(this, NULL, hr);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_scheduler_resource_allocation_error_copy_ctor,8)
-scheduler_resource_allocation_error* __thiscall MSVCRT_scheduler_resource_allocation_error_copy_ctor(
- scheduler_resource_allocation_error *this,
- const scheduler_resource_allocation_error *rhs)
-{
- TRACE("(%p,%p)\n", this, rhs);
+__ASM_BLOCK_BEGIN(vtables)
- if (!rhs->e.do_free)
- memcpy(this, rhs, sizeof(*this));
- else
- scheduler_resource_allocation_error_ctor_name(this, rhs->e.name, rhs->hr);
- return this;
-}
-
-/* ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QBEJXZ */
-/* ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QEBAJXZ */
-DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_get_error_code, 4)
-HRESULT __thiscall scheduler_resource_allocation_error_get_error_code(
- const scheduler_resource_allocation_error *this)
-{
- TRACE("(%p)\n", this);
- return this->hr;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_scheduler_resource_allocation_error_dtor,4)
-void __thiscall MSVCRT_scheduler_resource_allocation_error_dtor(
- scheduler_resource_allocation_error * this)
-{
- TRACE("(%p)\n", this);
- MSVCRT_exception_dtor(&this->e);
-}
-
-typedef exception improper_lock;
-extern const vtable_ptr MSVCRT_improper_lock_vtable;
-
-/* ??0improper_lock@Concurrency@@QAE@PBD@Z */
-/* ??0improper_lock@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8)
-improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_improper_lock_vtable;
- return this;
-}
-
-/* ??0improper_lock@Concurrency@@QAE@XZ */
-/* ??0improper_lock@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4)
-improper_lock* __thiscall improper_lock_ctor(improper_lock *this)
-{
- return improper_lock_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_lock_copy_ctor,8)
-improper_lock * __thiscall MSVCRT_improper_lock_copy_ctor(improper_lock * _this, const improper_lock * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_improper_lock_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_lock_dtor,4)
-void __thiscall MSVCRT_improper_lock_dtor(improper_lock * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-typedef exception invalid_scheduler_policy_key;
-extern const vtable_ptr MSVCRT_invalid_scheduler_policy_key_vtable;
-
-/* ??0invalid_scheduler_policy_key@Concurrency@@QAE@PBD@Z */
-/* ??0invalid_scheduler_policy_key@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_ctor_str, 8)
-invalid_scheduler_policy_key* __thiscall invalid_scheduler_policy_key_ctor_str(
- invalid_scheduler_policy_key *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_invalid_scheduler_policy_key_vtable;
- return this;
-}
-
-/* ??0invalid_scheduler_policy_key@Concurrency@@QAE@XZ */
-/* ??0invalid_scheduler_policy_key@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_ctor, 4)
-invalid_scheduler_policy_key* __thiscall invalid_scheduler_policy_key_ctor(
- invalid_scheduler_policy_key *this)
-{
- return invalid_scheduler_policy_key_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_key_copy_ctor,8)
-invalid_scheduler_policy_key * __thiscall MSVCRT_invalid_scheduler_policy_key_copy_ctor(
- invalid_scheduler_policy_key * _this, const invalid_scheduler_policy_key * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_invalid_scheduler_policy_key_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_key_dtor,4)
-void __thiscall MSVCRT_invalid_scheduler_policy_key_dtor(
- invalid_scheduler_policy_key * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-typedef exception invalid_scheduler_policy_value;
-extern const vtable_ptr MSVCRT_invalid_scheduler_policy_value_vtable;
-
-/* ??0invalid_scheduler_policy_value@Concurrency@@QAE@PBD@Z */
-/* ??0invalid_scheduler_policy_value@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_value_ctor_str, 8)
-invalid_scheduler_policy_value* __thiscall invalid_scheduler_policy_value_ctor_str(
- invalid_scheduler_policy_value *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_invalid_scheduler_policy_value_vtable;
- return this;
-}
-
-/* ??0invalid_scheduler_policy_value@Concurrency@@QAE@XZ */
-/* ??0invalid_scheduler_policy_value@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_value_ctor, 4)
-invalid_scheduler_policy_value* __thiscall invalid_scheduler_policy_value_ctor(
- invalid_scheduler_policy_value *this)
-{
- return invalid_scheduler_policy_value_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_value_copy_ctor,8)
-invalid_scheduler_policy_value * __thiscall MSVCRT_invalid_scheduler_policy_value_copy_ctor(
- invalid_scheduler_policy_value * _this, const invalid_scheduler_policy_value * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_invalid_scheduler_policy_value_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_value_dtor,4)
-void __thiscall MSVCRT_invalid_scheduler_policy_value_dtor(
- invalid_scheduler_policy_value * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-typedef exception invalid_scheduler_policy_thread_specification;
-extern const vtable_ptr MSVCRT_invalid_scheduler_policy_thread_specification_vtable;
-
-/* ??0invalid_scheduler_policy_thread_specification@Concurrency@@QAE@PBD@Z */
-/* ??0invalid_scheduler_policy_thread_specification@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_thread_specification_ctor_str, 8)
-invalid_scheduler_policy_thread_specification* __thiscall invalid_scheduler_policy_thread_specification_ctor_str(
- invalid_scheduler_policy_thread_specification *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_invalid_scheduler_policy_thread_specification_vtable;
- return this;
-}
-
-/* ??0invalid_scheduler_policy_thread_specification@Concurrency@@QAE@XZ */
-/* ??0invalid_scheduler_policy_thread_specification@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_thread_specification_ctor, 4)
-invalid_scheduler_policy_thread_specification* __thiscall invalid_scheduler_policy_thread_specification_ctor(
- invalid_scheduler_policy_thread_specification *this)
-{
- return invalid_scheduler_policy_thread_specification_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_thread_specification_copy_ctor,8)
-invalid_scheduler_policy_thread_specification * __thiscall MSVCRT_invalid_scheduler_policy_thread_specification_copy_ctor(
- invalid_scheduler_policy_thread_specification * _this, const invalid_scheduler_policy_thread_specification * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_invalid_scheduler_policy_thread_specification_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_invalid_scheduler_policy_thread_specification_dtor,4)
-void __thiscall MSVCRT_invalid_scheduler_policy_thread_specification_dtor(
- invalid_scheduler_policy_thread_specification * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-typedef exception improper_scheduler_attach;
-extern const vtable_ptr MSVCRT_improper_scheduler_attach_vtable;
-
-/* ??0improper_scheduler_attach@Concurrency@@QAE@PBD@Z */
-/* ??0improper_scheduler_attach@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor_str, 8)
-improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor_str(
- improper_scheduler_attach *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_improper_scheduler_attach_vtable;
- return this;
-}
-
-/* ??0improper_scheduler_attach@Concurrency@@QAE@XZ */
-/* ??0improper_scheduler_attach@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor, 4)
-improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor(
- improper_scheduler_attach *this)
-{
- return improper_scheduler_attach_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_scheduler_attach_copy_ctor,8)
-improper_scheduler_attach * __thiscall MSVCRT_improper_scheduler_attach_copy_ctor(
- improper_scheduler_attach * _this, const improper_scheduler_attach * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_improper_scheduler_attach_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_scheduler_attach_dtor,4)
-void __thiscall MSVCRT_improper_scheduler_attach_dtor(
- improper_scheduler_attach * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-typedef exception improper_scheduler_detach;
-extern const vtable_ptr MSVCRT_improper_scheduler_detach_vtable;
-
-/* ??0improper_scheduler_detach@Concurrency@@QAE@PBD@Z */
-/* ??0improper_scheduler_detach@Concurrency@@QEAA@PEBD@Z */
-DEFINE_THISCALL_WRAPPER(improper_scheduler_detach_ctor_str, 8)
-improper_scheduler_detach* __thiscall improper_scheduler_detach_ctor_str(
- improper_scheduler_detach *this, const char *str)
-{
- TRACE("(%p %p)\n", this, str);
- MSVCRT_exception_ctor(this, &str);
- this->vtable = &MSVCRT_improper_scheduler_detach_vtable;
- return this;
-}
-
-/* ??0improper_scheduler_detach@Concurrency@@QAE@XZ */
-/* ??0improper_scheduler_detach@Concurrency@@QEAA@XZ */
-DEFINE_THISCALL_WRAPPER(improper_scheduler_detach_ctor, 4)
-improper_scheduler_detach* __thiscall improper_scheduler_detach_ctor(
- improper_scheduler_detach *this)
-{
- return improper_scheduler_detach_ctor_str(this, NULL);
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_scheduler_detach_copy_ctor,8)
-improper_scheduler_detach * __thiscall MSVCRT_improper_scheduler_detach_copy_ctor(
- improper_scheduler_detach * _this, const improper_scheduler_detach * rhs)
-{
- TRACE("(%p %p)\n", _this, rhs);
- MSVCRT_exception_copy_ctor(_this, rhs);
- _this->vtable = &MSVCRT_improper_scheduler_detach_vtable;
- return _this;
-}
-
-DEFINE_THISCALL_WRAPPER(MSVCRT_improper_scheduler_detach_dtor,4)
-void __thiscall MSVCRT_improper_scheduler_detach_dtor(
- improper_scheduler_detach * _this)
-{
- TRACE("(%p)\n", _this);
- MSVCRT_exception_dtor(_this);
-}
-
-#endif /* _MSVCR_VER >= 100 */
-
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
-
-__ASM_VTABLE(type_info,
- VTABLE_ADD_FUNC(MSVCRT_type_info_vector_dtor));
-__ASM_VTABLE(exception,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
#if _MSVCR_VER >= 80
__ASM_VTABLE(exception_old,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
+ VTABLE_ADD_FUNC(exception_vector_dtor)
+ VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(bad_alloc,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
+ VTABLE_ADD_FUNC(exception_vector_dtor)
+ VTABLE_ADD_FUNC(exception_what));
#endif
__ASM_VTABLE(bad_typeid,
- VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
+ VTABLE_ADD_FUNC(bad_typeid_vector_dtor)
+ VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(bad_cast,
- VTABLE_ADD_FUNC(MSVCRT_bad_cast_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
+ VTABLE_ADD_FUNC(bad_cast_vector_dtor)
+ VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(__non_rtti_object,
- VTABLE_ADD_FUNC(MSVCRT___non_rtti_object_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-#if _MSVCR_VER >= 100
-__ASM_VTABLE(scheduler_resource_allocation_error,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(improper_lock,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(invalid_scheduler_policy_key,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(invalid_scheduler_policy_value,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(invalid_scheduler_policy_thread_specification,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(improper_scheduler_attach,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-__ASM_VTABLE(improper_scheduler_detach,
- VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor)
- VTABLE_ADD_FUNC(MSVCRT_what_exception));
-#endif
+ VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor)
+ VTABLE_ADD_FUNC(exception_what));
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
-DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" )
#if _MSVCR_VER >= 80
-DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@std@@" )
DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" )
DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@std@@" )
DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@std@@" )
DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@std@@" )
DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@" )
#else
-DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" )
DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" )
DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" )
DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" )
#endif
-#if _MSVCR_VER >= 100
-DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &exception_rtti_base_descriptor,
- ".?AVscheduler_resource_allocation_error@Concurrency@@")
-DEFINE_RTTI_DATA1(improper_lock, 0, &exception_rtti_base_descriptor, ".?AVimproper_lock@Concurrency@@" )
-DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &exception_rtti_base_descriptor,
- ".?AVinvalid_scheduler_policy_key@Concurrency@@" )
-DEFINE_RTTI_DATA1(invalid_scheduler_policy_value, 0, &exception_rtti_base_descriptor,
- ".?AVinvalid_scheduler_policy_value@Concurrency@@" )
-DEFINE_RTTI_DATA1(invalid_scheduler_policy_thread_specification, 0, &exception_rtti_base_descriptor,
- ".?AVinvalid_scheduler_policy_thread_specification@Concurrency@@" )
-DEFINE_RTTI_DATA1(improper_scheduler_attach, 0, &exception_rtti_base_descriptor,
- ".?AVimproper_scheduler_attach@Concurrency@@" )
-DEFINE_RTTI_DATA1(improper_scheduler_detach, 0, &exception_rtti_base_descriptor,
- ".?AVimproper_scheduler_detach@Concurrency@@" )
-#endif
-DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL )
-DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL )
-DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL )
-DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info )
+DEFINE_CXX_EXCEPTION0( exception, exception_dtor )
+DEFINE_CXX_DATA1( bad_typeid, &exception_cxx_type_info, bad_typeid_dtor )
+DEFINE_CXX_DATA1( bad_cast, &exception_cxx_type_info, bad_cast_dtor )
+DEFINE_CXX_DATA2( __non_rtti_object, &bad_typeid_cxx_type_info,
+ &exception_cxx_type_info, __non_rtti_object_dtor )
#if _MSVCR_VER >= 80
-DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL )
-#endif
-#if _MSVCR_VER >= 100
-DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(improper_lock, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_key, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_value, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_thread_specification, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(improper_scheduler_attach, 1, &exception_cxx_type_info, NULL)
-DEFINE_EXCEPTION_TYPE_INFO(improper_scheduler_detach, 1, &exception_cxx_type_info, NULL)
+DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor )
#endif
void msvcrt_init_exception(void *base)
@@ -1108,15 +608,6 @@ void msvcrt_init_exception(void *base)
init_bad_typeid_rtti(base);
init_bad_cast_rtti(base);
init___non_rtti_object_rtti(base);
-#if _MSVCR_VER >= 100
- init_scheduler_resource_allocation_error_rtti(base);
- init_improper_lock_rtti(base);
- init_invalid_scheduler_policy_key_rtti(base);
- init_invalid_scheduler_policy_value_rtti(base);
- init_invalid_scheduler_policy_thread_specification_rtti(base);
- init_improper_scheduler_attach_rtti(base);
- init_improper_scheduler_detach_rtti(base);
-#endif
init_exception_cxx(base);
init_bad_typeid_cxx(base);
@@ -1125,65 +616,15 @@ void msvcrt_init_exception(void *base)
#if _MSVCR_VER >= 80
init_bad_alloc_cxx(base);
#endif
-#if _MSVCR_VER >= 100
- init_scheduler_resource_allocation_error_cxx(base);
- init_improper_lock_cxx(base);
- init_invalid_scheduler_policy_key_cxx(base);
- init_invalid_scheduler_policy_value_cxx(base);
- init_invalid_scheduler_policy_thread_specification_cxx(base);
- init_improper_scheduler_attach_cxx(base);
- init_improper_scheduler_detach_cxx(base);
-#endif
#endif
}
#if _MSVCR_VER >= 80
-void throw_exception(exception_type et, HRESULT hr, const char *str)
+void throw_bad_alloc(void)
{
- switch(et) {
- case EXCEPTION_BAD_ALLOC: {
- bad_alloc e;
- bad_alloc_ctor(&e, &str);
- _CxxThrowException(&e, &bad_alloc_exception_type);
- }
-#if _MSVCR_VER >= 100
- case EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR: {
- scheduler_resource_allocation_error e;
- scheduler_resource_allocation_error_ctor_name(&e, str, hr);
- _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type);
- }
- case EXCEPTION_IMPROPER_LOCK: {
- improper_lock e;
- improper_lock_ctor_str(&e, str);
- _CxxThrowException(&e, &improper_lock_exception_type);
- }
- case EXCEPTION_INVALID_SCHEDULER_POLICY_KEY: {
- invalid_scheduler_policy_key e;
- invalid_scheduler_policy_key_ctor_str(&e, str);
- _CxxThrowException(&e, &invalid_scheduler_policy_key_exception_type);
- }
- case EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE: {
- invalid_scheduler_policy_value e;
- invalid_scheduler_policy_value_ctor_str(&e, str);
- _CxxThrowException(&e, &invalid_scheduler_policy_value_exception_type);
- }
- case EXCEPTION_INVALID_SCHEDULER_POLICY_THREAD_SPECIFICATION: {
- invalid_scheduler_policy_thread_specification e;
- invalid_scheduler_policy_thread_specification_ctor_str(&e, str);
- _CxxThrowException(&e, &invalid_scheduler_policy_thread_specification_exception_type);
- }
- case EXCEPTION_IMPROPER_SCHEDULER_ATTACH: {
- improper_scheduler_attach e;
- improper_scheduler_attach_ctor_str(&e, str);
- _CxxThrowException(&e, &improper_scheduler_attach_exception_type);
- }
- case EXCEPTION_IMPROPER_SCHEDULER_DETACH: {
- improper_scheduler_detach e;
- improper_scheduler_detach_ctor_str(&e, str);
- _CxxThrowException(&e, &improper_scheduler_detach_exception_type);
- }
-#endif
- }
+ bad_alloc e;
+ __exception_ctor(&e, "bad allocation", &bad_alloc_vtable);
+ _CxxThrowException(&e, &bad_alloc_exception_type);
}
#endif
@@ -1198,10 +639,10 @@ void throw_exception(exception_type et, HRESULT hr, const char *str)
* RETURNS
* The previously installed handler function, if any.
*/
-MSVCRT_terminate_function CDECL MSVCRT_set_terminate(MSVCRT_terminate_function func)
+terminate_function CDECL set_terminate(terminate_function func)
{
thread_data_t *data = msvcrt_get_thread_data();
- MSVCRT_terminate_function previous = data->terminate_handler;
+ terminate_function previous = data->terminate_handler;
TRACE("(%p) returning %p\n",func,previous);
data->terminate_handler = func;
return previous;
@@ -1210,7 +651,7 @@ MSVCRT_terminate_function CDECL MSVCRT_set_terminate(MSVCRT_terminate_function f
/******************************************************************
* _get_terminate (MSVCRT.@)
*/
-MSVCRT_terminate_function CDECL MSVCRT__get_terminate(void)
+terminate_function CDECL _get_terminate(void)
{
thread_data_t *data = msvcrt_get_thread_data();
TRACE("returning %p\n", data->terminate_handler);
@@ -1228,10 +669,10 @@ MSVCRT_terminate_function CDECL MSVCRT__get_terminate(void)
* RETURNS
* The previously installed handler function, if any.
*/
-MSVCRT_unexpected_function CDECL MSVCRT_set_unexpected(MSVCRT_unexpected_function func)
+unexpected_function CDECL set_unexpected(unexpected_function func)
{
thread_data_t *data = msvcrt_get_thread_data();
- MSVCRT_unexpected_function previous = data->unexpected_handler;
+ unexpected_function previous = data->unexpected_handler;
TRACE("(%p) returning %p\n",func,previous);
data->unexpected_handler = func;
return previous;
@@ -1240,7 +681,7 @@ MSVCRT_unexpected_function CDECL MSVCRT_set_unexpected(MSVCRT_unexpected_functio
/******************************************************************
* _get_unexpected (MSVCRT.@)
*/
-MSVCRT_unexpected_function CDECL MSVCRT__get_unexpected(void)
+unexpected_function CDECL _get_unexpected(void)
{
thread_data_t *data = msvcrt_get_thread_data();
TRACE("returning %p\n", data->unexpected_handler);
@@ -1250,10 +691,10 @@ MSVCRT_unexpected_function CDECL MSVCRT__get_unexpected(void)
/******************************************************************
* ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z (MSVCRT.@)
*/
-MSVCRT__se_translator_function CDECL MSVCRT__set_se_translator(MSVCRT__se_translator_function func)
+_se_translator_function CDECL _set_se_translator(_se_translator_function func)
{
thread_data_t *data = msvcrt_get_thread_data();
- MSVCRT__se_translator_function previous = data->se_translator;
+ _se_translator_function previous = data->se_translator;
TRACE("(%p) returning %p\n",func,previous);
data->se_translator = func;
return previous;
@@ -1272,21 +713,21 @@ MSVCRT__se_translator_function CDECL MSVCRT__set_se_translator(MSVCRT__se_transl
* handler installed by calling set_terminate(), or (by default) abort()
* is called.
*/
-void CDECL MSVCRT_terminate(void)
+void CDECL terminate(void)
{
thread_data_t *data = msvcrt_get_thread_data();
if (data->terminate_handler) data->terminate_handler();
- MSVCRT_abort();
+ abort();
}
/******************************************************************
* ?unexpected@@YAXXZ (MSVCRT.@)
*/
-void CDECL MSVCRT_unexpected(void)
+void CDECL unexpected(void)
{
thread_data_t *data = msvcrt_get_thread_data();
if (data->unexpected_handler) data->unexpected_handler();
- MSVCRT_terminate();
+ terminate();
}
@@ -1309,16 +750,15 @@ void CDECL MSVCRT_unexpected(void)
* of using one of the C++ dynamic cast statements.
*/
#ifndef __x86_64__
-const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
+const type_info* CDECL __RTtypeid(void *cppobj)
{
const type_info *ret;
if (!cppobj)
{
bad_typeid e;
- MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" );
+ bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" );
_CxxThrowException( &e, &bad_typeid_exception_type );
- return NULL;
}
__TRY
@@ -1329,9 +769,8 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
__EXCEPT_PAGE_FAULT
{
__non_rtti_object e;
- MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" );
+ __non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
- return NULL;
}
__ENDTRY
return ret;
@@ -1339,16 +778,15 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
#else
-const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
+const type_info* CDECL __RTtypeid(void *cppobj)
{
const type_info *ret;
if (!cppobj)
{
bad_typeid e;
- MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" );
+ bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" );
_CxxThrowException( &e, &bad_typeid_exception_type );
- return NULL;
}
__TRY
@@ -1366,9 +804,8 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
__EXCEPT_PAGE_FAULT
{
__non_rtti_object e;
- MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" );
+ __non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
- return NULL;
}
__ENDTRY
return ret;
@@ -1398,7 +835,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
* of using one of the C++ dynamic cast statements.
*/
#ifndef __x86_64__
-void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
+void* CDECL __RTDynamicCast(void *cppobj, int unknown,
type_info *src, type_info *dst,
int do_throw)
{
@@ -1446,16 +883,15 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
{
const char *msg = "Bad dynamic_cast!";
bad_cast e;
- MSVCRT_bad_cast_ctor( &e, &msg );
+ bad_cast_ctor( &e, &msg );
_CxxThrowException( &e, &bad_cast_exception_type );
}
}
__EXCEPT_PAGE_FAULT
{
__non_rtti_object e;
- MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
+ __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
- return NULL;
}
__ENDTRY
return ret;
@@ -1463,7 +899,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
#else
-void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
+void* CDECL __RTDynamicCast(void *cppobj, int unknown,
type_info *src, type_info *dst,
int do_throw)
{
@@ -1509,16 +945,15 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
{
const char *msg = "Bad dynamic_cast!";
bad_cast e;
- MSVCRT_bad_cast_ctor( &e, &msg );
+ bad_cast_ctor( &e, &msg );
_CxxThrowException( &e, &bad_cast_exception_type );
}
}
__EXCEPT_PAGE_FAULT
{
__non_rtti_object e;
- MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
+ __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
- return NULL;
}
__ENDTRY
return ret;
@@ -1542,7 +977,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
* This function is usually called by compiler generated code as a result
* of using one of the C++ dynamic cast statements.
*/
-void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
+void* CDECL __RTCastToVoid(void *cppobj)
{
void *ret;
@@ -1556,9 +991,8 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
__EXCEPT_PAGE_FAULT
{
__non_rtti_object e;
- MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
+ __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
- return NULL;
}
__ENDTRY
return ret;
@@ -1569,7 +1003,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
* _CxxThrowException (MSVCRT.@)
*/
#ifndef __x86_64__
-void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type )
+void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type )
{
ULONG_PTR args[3];
@@ -1579,7 +1013,7 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ
RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args );
}
#else
-void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type )
+void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type )
{
ULONG_PTR args[4];
@@ -1632,7 +1066,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep)
__ENDTRY
if(ret == -1)
- MSVCRT_terminate();
+ terminate();
return ret;
}
#else
@@ -1673,7 +1107,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep)
__ENDTRY
if(ret == -1)
- MSVCRT_terminate();
+ terminate();
return ret;
}
#endif
@@ -1695,7 +1129,7 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct
static int once;
if (node && !once++) FIXME("type_info_node parameter ignored\n");
- return MSVCRT_type_info_name(_this);
+ return type_info_name(_this);
}
#endif /* _MSVCR_VER >= 80 */
@@ -1721,7 +1155,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep)
ep->ref = NULL;
}
-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER
extern void call_dtor(const cxx_exception_type *type, void *func, void *object);
__ASM_GLOBAL_FUNC( call_dtor,
@@ -1812,7 +1246,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep)
static const char *exception_msg = "bad exception";
exception e;
- MSVCRT_exception_ctor(&e, &exception_msg);
+ exception_ctor(&e, &exception_msg);
_CxxThrowException(&e, &exception_exception_type);
return;
}
@@ -1942,7 +1376,7 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep)
* ?__ExceptionPtrToBool@@YA_NPBX@Z
* ?__ExceptionPtrToBool@@YA_NPEBX@Z
*/
-MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep)
+bool __cdecl __ExceptionPtrToBool(exception_ptr *ep)
{
return !!ep->rec;
}
@@ -2031,7 +1465,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep,
}
#endif
-MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2)
+bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2)
{
return ep1->rec == ep2->rec;
}
@@ -2059,27 +1493,27 @@ typedef struct
char name[1];
} type_info_entry;
-static void* CDECL type_info_entry_malloc(MSVCRT_size_t size)
+static void* CDECL type_info_entry_malloc(size_t size)
{
- type_info_entry *ret = MSVCRT_malloc(FIELD_OFFSET(type_info_entry, name) + size);
+ type_info_entry *ret = malloc(FIELD_OFFSET(type_info_entry, name) + size);
return ret->name;
}
static void CDECL type_info_entry_free(void *ptr)
{
ptr = (char*)ptr - FIELD_OFFSET(type_info_entry, name);
- MSVCRT_free(ptr);
+ free(ptr);
}
/******************************************************************
* __std_type_info_compare (UCRTBASE.@)
*/
-int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r)
+int CDECL __std_type_info_compare(const type_info140 *l, const type_info140 *r)
{
int ret;
if (l == r) ret = 0;
- else ret = MSVCRT_strcmp(l->mangled + 1, r->mangled + 1);
+ else ret = strcmp(l->mangled + 1, r->mangled + 1);
TRACE("(%p %p) returning %d\n", l, r, ret);
return ret;
}
@@ -2087,7 +1521,7 @@ int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r)
/******************************************************************
* __std_type_info_name (UCRTBASE.@)
*/
-const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *header)
+const char* CDECL __std_type_info_name(type_info140 *ti, SLIST_HEADER *header)
{
if (!ti->name)
{
@@ -2118,7 +1552,7 @@ const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *hea
/******************************************************************
* __std_type_info_destroy_list (UCRTBASE.@)
*/
-void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header)
+void CDECL __std_type_info_destroy_list(SLIST_HEADER *header)
{
SLIST_ENTRY *cur, *next;
@@ -2127,16 +1561,16 @@ void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header)
for(cur = InterlockedFlushSList(header); cur; cur = next)
{
next = cur->Next;
- MSVCRT_free(cur);
+ free(cur);
}
}
/******************************************************************
* __std_type_info_hash (UCRTBASE.@)
*/
-MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti)
+size_t CDECL __std_type_info_hash(const type_info140 *ti)
{
- MSVCRT_size_t hash, fnv_prime;
+ size_t hash, fnv_prime;
const char *p;
#ifdef _WIN64
@@ -2162,26 +1596,3 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti)
}
#endif /* _MSVCR_VER >= 140 */
-
-#if _MSVCR_VER >= 100
-
-enum ConcRT_EventType
-{
- CONCRT_EVENT_GENERIC,
- CONCRT_EVENT_START,
- CONCRT_EVENT_END,
- CONCRT_EVENT_BLOCK,
- CONCRT_EVENT_UNBLOCK,
- CONCRT_EVENT_YIELD,
- CONCRT_EVENT_ATTACH,
- CONCRT_EVENT_DETACH
-};
-
-/* ?_Trace_ppl_function@Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType@1@@Z */
-/* ?_Trace_ppl_function@Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType@1@@Z */
-void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type)
-{
- FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type);
-}
-
-#endif /* _MSVCR_VER >= 100 */
diff --git a/sdk/lib/crt/wine/cppexcept.h b/sdk/lib/crt/wine/cppexcept.h
index 69fb3c5eed9..26abc4aed24 100644
--- a/sdk/lib/crt/wine/cppexcept.h
+++ b/sdk/lib/crt/wine/cppexcept.h
@@ -29,6 +29,7 @@
#define CXX_EXCEPTION 0xe06d7363
#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs and /EHsc) */
+#define FUNC_DESCR_NOEXCEPT 4 /* noexcept function */
typedef void (*vtable_ptr)(void);
@@ -124,7 +125,7 @@ typedef struct
} cxx_exception_type;
#endif
-void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);
+void WINAPI _CxxThrowException(void*,const cxx_exception_type*);
int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS);
static inline const char *dbgstr_type_info( const type_info *info )
@@ -155,36 +156,35 @@ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object
}
#ifndef __x86_64__
-#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \
-\
+#define DEFINE_CXX_TYPE_INFO(type) \
static const cxx_type_info type ## _cxx_type_info = { \
0, \
& type ##_type_info, \
{ 0, -1, 0 }, \
sizeof(type), \
- (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ##_copy_ctor) \
-}; \
-\
-static const cxx_type_info_table type ## _type_info_table = { \
+ (cxx_copy_ctor)THISCALL(type ##_copy_ctor) \
+};
+
+#define DEFINE_CXX_EXCEPTION(type, base_no, cl1, cl2, dtor) \
+static const cxx_type_info_table type ## _cxx_type_table = { \
base_no+1, \
{ \
& type ## _cxx_type_info, \
cl1, \
- cl2 \
+ cl2, \
} \
}; \
\
static const cxx_exception_type type ## _exception_type = { \
0, \
- (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ## _dtor), \
+ (cxx_copy_ctor)THISCALL(dtor), \
NULL, \
- & type ## _type_info_table \
+ & type ## _cxx_type_table \
};
#else
-#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \
-\
+#define DEFINE_CXX_TYPE_INFO(type) \
static cxx_type_info type ## _cxx_type_info = { \
0, \
0xdeadbeef, \
@@ -193,12 +193,19 @@ static cxx_type_info type ## _cxx_type_info = { \
0xdeadbeef \
}; \
\
-static cxx_type_info_table type ## _type_info_table = { \
+static void init_ ## type ## _cxx_type_info(char *base) \
+{ \
+ type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \
+ type ## _cxx_type_info.copy_ctor = (char *)type ## _copy_ctor - base; \
+}
+
+#define DEFINE_CXX_EXCEPTION(type, base_no, cl1, cl2, dtor) \
+static cxx_type_info_table type ## _cxx_type_table = { \
base_no+1, \
{ \
0xdeadbeef, \
0xdeadbeef, \
- 0xdeadbeef \
+ 0xdeadbeef, \
} \
}; \
\
@@ -211,14 +218,116 @@ static cxx_exception_type type ##_exception_type = { \
\
static void init_ ## type ## _cxx(char *base) \
{ \
- type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \
- type ## _cxx_type_info.copy_ctor = (char *)MSVCRT_ ## type ## _copy_ctor - base; \
- type ## _type_info_table.info[0] = (char *)&type ## _cxx_type_info - base; \
- type ## _type_info_table.info[1] = (char *)cl1 - base; \
- type ## _type_info_table.info[2] = (char *)cl2 - base; \
- type ## _exception_type.destructor = (char *)MSVCRT_ ## type ## _dtor - base; \
- type ## _exception_type.type_info_table = (char *)&type ## _type_info_table - base; \
+ init_ ## type ## _cxx_type_info(base); \
+ type ## _cxx_type_table.info[0] = (char *)&type ## _cxx_type_info - base; \
+ type ## _cxx_type_table.info[1] = (char *)cl1 - base; \
+ type ## _cxx_type_table.info[2] = (char *)cl2 - base; \
+ type ## _exception_type.destructor = (char *)dtor - base; \
+ type ## _exception_type.type_info_table = (char *)&type ## _cxx_type_table - base; \
}
+
#endif
+#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, dtor) \
+DEFINE_CXX_TYPE_INFO(type) \
+DEFINE_CXX_EXCEPTION(type, base_no, cl1, cl2, dtor)
+
+#define DEFINE_CXX_EXCEPTION0(name, dtor) \
+ DEFINE_CXX_EXCEPTION(name, 0, NULL, NULL, dtor)
+
+#define DEFINE_CXX_DATA0(name, dtor) \
+ DEFINE_CXX_DATA(name, 0, NULL, NULL, dtor)
+#define DEFINE_CXX_DATA1(name, cl1, dtor) \
+ DEFINE_CXX_DATA(name, 1, cl1, NULL, dtor)
+#define DEFINE_CXX_DATA2(name, cl1, cl2, dtor) \
+ DEFINE_CXX_DATA(name, 2, cl1, cl2, dtor)
+
+#if _MSVCR_VER >= 80
+#define EXCEPTION_MANGLED_NAME ".?AVexception@std@@"
+#else
+#define EXCEPTION_MANGLED_NAME ".?AVexception@@"
+#endif
+
+#define CREATE_EXCEPTION_OBJECT(exception_name) \
+static exception* __exception_ctor(exception *this, const char *str, const vtable_ptr *vtbl) \
+{ \
+ if (str) \
+ { \
+ unsigned int len = strlen(str) + 1; \
+ this->name = malloc(len); \
+ memcpy(this->name, str, len); \
+ this->do_free = TRUE; \
+ } \
+ else \
+ { \
+ this->name = NULL; \
+ this->do_free = FALSE; \
+ } \
+ this->vtable = vtbl; \
+ return this; \
+} \
+\
+static exception* __exception_copy_ctor(exception *this, const exception *rhs, const vtable_ptr *vtbl) \
+{ \
+ if (rhs->do_free) \
+ { \
+ __exception_ctor(this, rhs->name, vtbl); \
+ } \
+ else \
+ { \
+ *this = *rhs; \
+ this->vtable = vtbl; \
+ } \
+ return this; \
+} \
+extern const vtable_ptr exception_name ## _vtable; \
+exception* __thiscall exception_name ## _copy_ctor(exception *this, const exception *rhs); \
+DEFINE_THISCALL_WRAPPER(exception_name ## _copy_ctor,8) \
+exception* __thiscall exception_name ## _copy_ctor(exception *this, const exception *rhs) \
+{ \
+ return __exception_copy_ctor(this, rhs, & exception_name ## _vtable); \
+} \
+\
+void __thiscall exception_name ## _dtor(exception *this); \
+DEFINE_THISCALL_WRAPPER(exception_name ## _dtor,4) \
+void __thiscall exception_name ## _dtor(exception *this) \
+{ \
+ if (this->do_free) free(this->name); \
+} \
+\
+void* __thiscall exception_name ## _vector_dtor(exception *this, unsigned int flags); \
+DEFINE_THISCALL_WRAPPER(exception_name ## _vector_dtor,8) \
+void* __thiscall exception_name ## _vector_dtor(exception *this, unsigned int flags) \
+{ \
+ if (flags & 2) \
+ { \
+ INT_PTR i, *ptr = (INT_PTR *)this - 1; \
+\
+ for (i = *ptr - 1; i >= 0; i--) exception_name ## _dtor(this + i); \
+ operator_delete(ptr); \
+ } \
+ else \
+ { \
+ exception_name ## _dtor(this); \
+ if (flags & 1) operator_delete(this); \
+ } \
+ return this; \
+} \
+\
+const char* __thiscall exception_name ## _what(exception *this); \
+DEFINE_THISCALL_WRAPPER(exception_name ## _what,4) \
+const char* __thiscall exception_name ## _what(exception *this) \
+{ \
+ return this->name ? this->name : "Unknown exception"; \
+} \
+\
+__ASM_BLOCK_BEGIN(exception_name ## _vtables) \
+__ASM_VTABLE(exception_name, \
+ VTABLE_ADD_FUNC(exception_name ## _vector_dtor) \
+ VTABLE_ADD_FUNC(exception_name ## _what)); \
+__ASM_BLOCK_END \
+\
+DEFINE_RTTI_DATA0(exception_name, 0, EXCEPTION_MANGLED_NAME) \
+DEFINE_CXX_TYPE_INFO(exception_name)
+
#endif /* __MSVCRT_CPPEXCEPT_H */
diff --git a/sdk/lib/crt/wine/cxx.h b/sdk/lib/crt/wine/cxx.h
index 58afc75bd15..d1bfb7cc381 100644
--- a/sdk/lib/crt/wine/cxx.h
+++ b/sdk/lib/crt/wine/cxx.h
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/asm.h"
+#include "cppexcept.h"
#ifdef _MSC_VER
#define __ASM_VTABLE(name,funcs)
@@ -29,8 +29,8 @@
__asm__(".data\n" \
"\t.balign 8\n" \
"\t.quad " __ASM_NAME(#name "_rtti") "\n" \
- "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
- __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
+ "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
+ __ASM_NAME(#name "_vtable") ":\n" \
funcs "\n\t.text")
#else
@@ -41,8 +41,8 @@
__asm__(".data\n" \
"\t.balign 4\n" \
"\t.long " __ASM_NAME(#name "_rtti") "\n" \
- "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
- __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
+ "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
+ __ASM_NAME(#name "_vtable") ":\n" \
funcs "\n\t.text")
#endif /* _WIN64 */
@@ -50,9 +50,9 @@
#ifndef __x86_64__
-#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
static type_info name ## _type_info = { \
- &MSVCRT_type_info_vtable, \
+ &type_info_vtable, \
NULL, \
mangled_name \
}; \
@@ -62,7 +62,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \
base_classes_no, \
{ 0, -1, 0}, \
64 \
-}; \
+};
+
+#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+ DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
\
static const rtti_base_array name ## _rtti_base_array = { \
{ \
@@ -96,9 +99,9 @@ const rtti_object_locator name ## _rtti = { \
#else
-#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
static type_info name ## _type_info = { \
- &MSVCRT_type_info_vtable, \
+ &type_info_vtable, \
NULL, \
mangled_name \
}; \
@@ -108,7 +111,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \
base_classes_no, \
{ 0, -1, 0}, \
64 \
-}; \
+};
+
+#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+ __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+ \
+ static void init_ ## name ## _rtti(char *base) \
+ { \
+ name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \
+ }
+
+#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+ __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
\
static rtti_base_array name ## _rtti_base_array = { \
{ \
@@ -244,7 +258,7 @@ typedef struct
#endif
-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER
#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args
@@ -268,4 +282,37 @@ extern void *vtbl_wrapper_48;
#endif
-exception* __thiscall MSVCRT_exception_ctor(exception*, const char**);
+exception* __thiscall exception_ctor(exception*, const char**);
+
+extern const vtable_ptr type_info_vtable;
+
+#ifdef __REACTOS__
+void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags);
+#endif
+
+#define CREATE_TYPE_INFO_VTABLE \
+DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \
+void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \
+{ \
+ if (flags & 2) \
+ { \
+ /* we have an array, with the number of elements stored before the first object */ \
+ INT_PTR i, *ptr = (INT_PTR *)_this - 1; \
+\
+ for (i = *ptr - 1; i >= 0; i--) free(_this[i].name); \
+ free(ptr); \
+ } \
+ else \
+ { \
+ free(_this->name); \
+ if (flags & 1) free(_this); \
+ } \
+ return _this; \
+} \
+\
+DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \
+\
+__ASM_BLOCK_BEGIN(type_info_vtables) \
+ __ASM_VTABLE(type_info, \
+ VTABLE_ADD_FUNC(type_info_vector_dtor)); \
+__ASM_BLOCK_END
diff --git a/sdk/lib/crt/wine/except.c b/sdk/lib/crt/wine/except.c
index 147ed5e9ef0..4679560dae5 100644
--- a/sdk/lib/crt/wine/except.c
+++ b/sdk/lib/crt/wine/except.c
@@ -21,17 +21,19 @@
* FIXME: Incomplete support for nested exceptions/try block cleanup.
*/
-#include "config.h"
-#include "wine/port.h"
-
+#include <float.h>
+#include <signal.h>
#include <stdarg.h>
+#include <stdbool.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
+#ifdef __REACTOS__ // FIXME: Clean up wine headers!
#include "wine/exception.h"
+#endif // __REACTOS__
#include "msvcrt.h"
#include "excpt.h"
#include "wincon.h"
@@ -45,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh);
static MSVCRT_security_error_handler security_error_handler;
#endif
-static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL };
+static __sighandler_t sighandlers[NSIG] = { SIG_DFL };
static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType)
{
@@ -54,10 +56,10 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType)
switch (ctrlType)
{
case CTRL_C_EVENT:
- if (sighandlers[MSVCRT_SIGINT])
+ if (sighandlers[SIGINT])
{
- if (sighandlers[MSVCRT_SIGINT] != MSVCRT_SIG_IGN)
- sighandlers[MSVCRT_SIGINT](MSVCRT_SIGINT);
+ if (sighandlers[SIGINT] != SIG_IGN)
+ sighandlers[SIGINT](SIGINT);
ret = TRUE;
}
break;
@@ -68,7 +70,7 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType)
/*********************************************************************
* __pxcptinfoptrs (MSVCRT.@)
*/
-void** CDECL MSVCRT___pxcptinfoptrs(void)
+void** CDECL __pxcptinfoptrs(void)
{
return (void**)&msvcrt_get_thread_data()->xcptinfo;
}
@@ -81,19 +83,19 @@ static const struct
NTSTATUS status;
int signal;
} float_exception_map[] = {
- { EXCEPTION_FLT_DENORMAL_OPERAND, MSVCRT__FPE_DENORMAL },
- { EXCEPTION_FLT_DIVIDE_BY_ZERO, MSVCRT__FPE_ZERODIVIDE },
- { EXCEPTION_FLT_INEXACT_RESULT, MSVCRT__FPE_INEXACT },
- { EXCEPTION_FLT_INVALID_OPERATION, MSVCRT__FPE_INVALID },
- { EXCEPTION_FLT_OVERFLOW, MSVCRT__FPE_OVERFLOW },
- { EXCEPTION_FLT_STACK_CHECK, MSVCRT__FPE_STACKOVERFLOW },
- { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW },
+ { EXCEPTION_FLT_DENORMAL_OPERAND, _FPE_DENORMAL },
+ { EXCEPTION_FLT_DIVIDE_BY_ZERO, _FPE_ZERODIVIDE },
+ { EXCEPTION_FLT_INEXACT_RESULT, _FPE_INEXACT },
+ { EXCEPTION_FLT_INVALID_OPERATION, _FPE_INVALID },
+ { EXCEPTION_FLT_OVERFLOW, _FPE_OVERFLOW },
+ { EXCEPTION_FLT_STACK_CHECK, _FPE_STACKOVERFLOW },
+ { EXCEPTION_FLT_UNDERFLOW, _FPE_UNDERFLOW },
};
static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
{
LONG ret = EXCEPTION_CONTINUE_SEARCH;
- MSVCRT___sighandler_t handler;
+ __sighandler_t handler;
if (!except || !except->ExceptionRecord)
return EXCEPTION_CONTINUE_SEARCH;
@@ -101,16 +103,16 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
switch (except->ExceptionRecord->ExceptionCode)
{
case EXCEPTION_ACCESS_VIOLATION:
- if ((handler = sighandlers[MSVCRT_SIGSEGV]) != MSVCRT_SIG_DFL)
+ if ((handler = sighandlers[SIGSEGV]) != SIG_DFL)
{
- if (handler != MSVCRT_SIG_IGN)
+ if (handler != SIG_IGN)
{
- EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep;
+ EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep;
old_ep = *ep;
*ep = except;
- sighandlers[MSVCRT_SIGSEGV] = MSVCRT_SIG_DFL;
- handler(MSVCRT_SIGSEGV);
+ sighandlers[SIGSEGV] = SIG_DFL;
+ handler(SIGSEGV);
*ep = old_ep;
}
ret = EXCEPTION_CONTINUE_EXECUTION;
@@ -127,15 +129,15 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
case EXCEPTION_FLT_OVERFLOW:
case EXCEPTION_FLT_STACK_CHECK:
case EXCEPTION_FLT_UNDERFLOW:
- if ((handler = sighandlers[MSVCRT_SIGFPE]) != MSVCRT_SIG_DFL)
+ if ((handler = sighandlers[SIGFPE]) != SIG_DFL)
{
- if (handler != MSVCRT_SIG_IGN)
+ if (handler != SIG_IGN)
{
- EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep;
+ EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep;
unsigned int i;
- int float_signal = MSVCRT__FPE_INVALID;
+ int float_signal = _FPE_INVALID;
- sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL;
+ sighandlers[SIGFPE] = SIG_DFL;
for (i = 0; i < ARRAY_SIZE(float_exception_map); i++)
{
if (float_exception_map[i].status ==
@@ -148,7 +150,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
old_ep = *ep;
*ep = except;
- ((float_handler)handler)(MSVCRT_SIGFPE, float_signal);
+ ((float_handler)handler)(SIGFPE, float_signal);
*ep = old_ep;
}
ret = EXCEPTION_CONTINUE_EXECUTION;
@@ -156,16 +158,16 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
break;
case EXCEPTION_ILLEGAL_INSTRUCTION:
case EXCEPTION_PRIV_INSTRUCTION:
- if ((handler = sighandlers[MSVCRT_SIGILL]) != MSVCRT_SIG_DFL)
+ if ((handler = sighandlers[SIGILL]) != SIG_DFL)
{
- if (handler != MSVCRT_SIG_IGN)
+ if (handler != SIG_IGN)
{
- EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep;
+ EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep;
old_ep = *ep;
*ep = except;
- sighandlers[MSVCRT_SIGILL] = MSVCRT_SIG_DFL;
- handler(MSVCRT_SIGILL);
+ sighandlers[SIGILL] = SIG_DFL;
+ handler(SIGILL);
*ep = old_ep;
}
ret = EXCEPTION_CONTINUE_EXECUTION;
@@ -185,36 +187,37 @@ void msvcrt_free_signals(void)
SetConsoleCtrlHandler(msvcrt_console_handler, FALSE);
}
+#ifndef __REACTOS__ // Own implementation in signal/signal.c
/*********************************************************************
* signal (MSVCRT.@)
* Some signals may never be generated except through an explicit call to
* raise.
*/
-MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func)
+__sighandler_t CDECL signal(int sig, __sighandler_t func)
{
- MSVCRT___sighandler_t ret = MSVCRT_SIG_ERR;
+ __sighandler_t ret = SIG_ERR;
TRACE("(%d, %p)\n", sig, func);
- if (func == MSVCRT_SIG_ERR) return MSVCRT_SIG_ERR;
+ if (func == SIG_ERR) return SIG_ERR;
switch (sig)
{
/* Cases handled internally. Note SIGTERM is never generated by Windows,
* so we effectively mask it.
*/
- case MSVCRT_SIGABRT:
- case MSVCRT_SIGFPE:
- case MSVCRT_SIGILL:
- case MSVCRT_SIGSEGV:
- case MSVCRT_SIGINT:
- case MSVCRT_SIGTERM:
- case MSVCRT_SIGBREAK:
+ case SIGABRT:
+ case SIGFPE:
+ case SIGILL:
+ case SIGSEGV:
+ case SIGINT:
+ case SIGTERM:
+ case SIGBREAK:
ret = sighandlers[sig];
sighandlers[sig] = func;
break;
default:
- ret = MSVCRT_SIG_ERR;
+ ret = SIG_ERR;
}
return ret;
}
@@ -222,43 +225,43 @@ MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func)
/*********************************************************************
* raise (MSVCRT.@)
*/
-int CDECL MSVCRT_raise(int sig)
+int CDECL raise(int sig)
{
- MSVCRT___sighandler_t handler;
+ __sighandler_t handler;
TRACE("(%d)\n", sig);
switch (sig)
{
- case MSVCRT_SIGFPE:
- case MSVCRT_SIGILL:
- case MSVCRT_SIGSEGV:
+ case SIGFPE:
+ case SIGILL:
+ case SIGSEGV:
handler = sighandlers[sig];
- if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3);
- if (handler != MSVCRT_SIG_IGN)
+ if (handler == SIG_DFL) _exit(3);
+ if (handler != SIG_IGN)
{
- EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep;
+ EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep;
- sighandlers[sig] = MSVCRT_SIG_DFL;
+ sighandlers[sig] = SIG_DFL;
old_ep = *ep;
*ep = NULL;
- if (sig == MSVCRT_SIGFPE)
- ((float_handler)handler)(sig, MSVCRT__FPE_EXPLICITGEN);
+ if (sig == SIGFPE)
+ ((float_handler)handler)(sig, _FPE_EXPLICITGEN);
else
handler(sig);
*ep = old_ep;
}
break;
- case MSVCRT_SIGABRT:
- case MSVCRT_SIGINT:
- case MSVCRT_SIGTERM:
- case MSVCRT_SIGBREAK:
+ case SIGABRT:
+ case SIGINT:
+ case SIGTERM:
+ case SIGBREAK:
handler = sighandlers[sig];
- if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3);
- if (handler != MSVCRT_SIG_IGN)
+ if (handler == SIG_DFL) _exit(3);
+ if (handler != SIG_IGN)
{
- sighandlers[sig] = MSVCRT_SIG_DFL;
+ sighandlers[sig] = SIG_DFL;
handler(sig);
}
break;
@@ -267,6 +270,7 @@ int CDECL MSVCRT_raise(int sig)
}
return 0;
}
+#endif // __REACTOS__
/*********************************************************************
* _XcptFilter (MSVCRT.@)
@@ -282,7 +286,7 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
/*********************************************************************
* _abnormal_termination (MSVCRT.@)
*/
-int CDECL _abnormal_termination(void)
+int CDECL __intrinsic_abnormal_termination(void)
{
FIXME("(void)stub\n");
return 0;
@@ -292,7 +296,7 @@ int CDECL _abnormal_termination(void)
/******************************************************************
* __uncaught_exception (MSVCRT.@)
*/
-BOOL CDECL MSVCRT___uncaught_exception(void)
+BOOL CDECL __uncaught_exception(void)
{
return msvcrt_get_thread_data()->processing_throw != 0;
}
@@ -323,7 +327,7 @@ void CDECL __security_error_handler(int code, void *data)
else
FIXME("(%d, %p) stub\n", code, data);
- MSVCRT__exit(3);
+ _exit(3);
}
#endif /* _MSVCR_VER>=70 && _MSVCR_VER<=71 */
@@ -332,7 +336,7 @@ void CDECL __security_error_handler(int code, void *data)
/*********************************************************************
* __crtSetUnhandledExceptionFilter (MSVCR110.@)
*/
-LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter)
+LPTOP_LEVEL_EXCEPTION_FILTER CDECL __crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter)
{
return SetUnhandledExceptionFilter(filter);
}
@@ -479,8 +483,8 @@ void CDECL __CxxUnregisterExceptionObject(cxx_frame_info *frame_info, BOOL in_us
}
struct __std_exception_data {
- char *what;
- MSVCRT_bool dofree;
+ char *what;
+ char dofree;
};
#if _MSVCR_VER>=140
@@ -488,13 +492,13 @@ struct __std_exception_data {
/*********************************************************************
* __std_exception_copy (UCRTBASE.@)
*/
-void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src,
+void CDECL __std_exception_copy(const struct __std_exception_data *src,
struct __std_exception_data *dst)
{
TRACE("(%p %p)\n", src, dst);
if(src->dofree && src->what) {
- dst->what = MSVCRT__strdup(src->what);
+ dst->what = _strdup(src->what);
dst->dofree = 1;
} else {
dst->what = src->what;
@@ -505,12 +509,12 @@ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src,
/*********************************************************************
* __std_exception_destroy (UCRTBASE.@)
*/
-void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data)
+void CDECL __std_exception_destroy(struct __std_exception_data *data)
{
TRACE("(%p)\n", data);
if(data->dofree)
- MSVCRT_free(data->what);
+ free(data->what);
data->what = NULL;
data->dofree = 0;
}
diff --git a/sdk/lib/crt/wine/except_arm.c b/sdk/lib/crt/wine/except_arm.c
index 41b0c1c7d3e..fecbfe65929 100644
--- a/sdk/lib/crt/wine/except_arm.c
+++ b/sdk/lib/crt/wine/except_arm.c
@@ -19,12 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#ifdef __arm__
+#include <setjmp.h>
#include <stdarg.h>
+#include <fpieee.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -110,13 +109,12 @@ unsigned int CDECL __CxxQueryExceptionSize(void)
* _setjmp (MSVCRT.@)
*/
__ASM_GLOBAL_FUNC(MSVCRT__setjmp,
- "mov r1, #0\n\t" /* frame */
"b " __ASM_NAME("__wine_setjmpex"));
/*******************************************************************
* longjmp (MSVCRT.@)
*/
-void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
+void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval)
{
EXCEPTION_RECORD rec;
@@ -137,10 +135,10 @@ void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
/*********************************************************************
* _fpieee_flt (MSVCRT.@)
*/
-int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep,
+int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep,
int (__cdecl *handler)(_FPIEEE_RECORD*))
{
- FIXME("(%x %p %p)\n", exception_code, ep, handler);
+ FIXME("(%lx %p %p)\n", exception_code, ep, handler);
return EXCEPTION_CONTINUE_SEARCH;
}
diff --git a/sdk/lib/crt/wine/except_arm64.c b/sdk/lib/crt/wine/except_arm64.c
index 97059d13972..574e77485f9 100644
--- a/sdk/lib/crt/wine/except_arm64.c
+++ b/sdk/lib/crt/wine/except_arm64.c
@@ -20,12 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#ifdef __aarch64__
+#include <setjmp.h>
#include <stdarg.h>
+#include <fpieee.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -111,13 +110,12 @@ unsigned int CDECL __CxxQueryExceptionSize(void)
* _setjmp (MSVCRT.@)
*/
__ASM_GLOBAL_FUNC(MSVCRT__setjmp,
- "mov x1, #0\n\t" /* frame */
"b " __ASM_NAME("__wine_setjmpex"));
/*******************************************************************
* longjmp (MSVCRT.@)
*/
-void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
+void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval)
{
EXCEPTION_RECORD rec;
@@ -138,10 +136,10 @@ void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
/*********************************************************************
* _fpieee_flt (MSVCRT.@)
*/
-int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep,
+int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep,
int (__cdecl *handler)(_FPIEEE_RECORD*))
{
- FIXME("(%x %p %p)\n", exception_code, ep, handler);
+ FIXME("(%lx %p %p)\n", exception_code, ep, handler);
return EXCEPTION_CONTINUE_SEARCH;
}
diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c
index 68f6c75c1b3..fa8ec4997bd 100644
--- a/sdk/lib/crt/wine/except_i386.c
+++ b/sdk/lib/crt/wine/except_i386.c
@@ -25,12 +25,11 @@
* www.thecodeproject.com.
*/
-#include "config.h"
-#include "wine/port.h"
-
#ifdef __i386__
+#include <setjmp.h>
#include <stdarg.h>
+#include <fpieee.h>
#include "windef.h"
#include "winbase.h"
@@ -120,7 +119,7 @@ typedef struct _SCOPETABLE
void * (*lpfnHandler)(void);
} SCOPETABLE, *PSCOPETABLE;
-typedef struct _MSVCRT_EXCEPTION_FRAME
+typedef struct MSVCRT_EXCEPTION_FRAME
{
EXCEPTION_REGISTRATION_RECORD *prev;
void (*handler)(PEXCEPTION_RECORD, EXCEPTION_REGISTRATION_RECORD*,
@@ -328,7 +327,7 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des
if (trylevel < 0 || trylevel >= descr->unwind_count)
{
ERR( "invalid trylevel %d\n", trylevel );
- MSVCRT_terminate();
+ terminate();
}
handler = descr->unwind_table[trylevel].handler;
if (handler)
@@ -540,7 +539,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c )
if (rec->ExceptionCode != CXX_EXCEPTION)
{
TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode );
- MSVCRT_terminate();
+ terminate();
}
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
@@ -551,6 +550,18 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c )
return ExceptionContinueSearch;
}
+static void check_noexcept( PEXCEPTION_RECORD rec,
+ const cxx_function_descr *descr, BOOL nested )
+{
+ if (!nested && rec->ExceptionCode == CXX_EXCEPTION &&
+ descr->magic >= CXX_FRAME_MAGIC_VC8 &&
+ (descr->flags & FUNC_DESCR_NOEXCEPT))
+ {
+ ERR("noexcept function propagating exception\n");
+ terminate();
+ }
+}
+
/*********************************************************************
* cxx_frame_handler
*
@@ -578,7 +589,11 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 );
return ExceptionContinueSearch;
}
- if (!descr->tryblock_count) return ExceptionContinueSearch;
+ if (!descr->tryblock_count)
+ {
+ check_noexcept(rec, descr, nested_frame != NULL);
+ return ExceptionContinueSearch;
+ }
if(rec->ExceptionCode == CXX_EXCEPTION &&
rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0)
@@ -643,6 +658,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
call_catch_block( rec, context, frame, descr,
nested_frame, exc_type );
+ check_noexcept(rec, descr, nested_frame != NULL);
return ExceptionContinueSearch;
}
@@ -678,7 +694,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler,
*
* Callback meant to be used as UnwindFunc for setjmp/longjmp.
*/
-void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf )
+void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf )
{
cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration;
const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0];
@@ -1014,7 +1030,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void),
*/
#define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */
-typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFFER *);
+typedef void (__stdcall *MSVCRT_unwind_function)(const _JUMP_BUFFER *);
/* define an entrypoint for setjmp/setjmp3 that stores the registers in the jmp buf */
/* and then jumps to the C backend function */
@@ -1034,7 +1050,7 @@ typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFF
* _setjmp (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp)
-int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp)
+int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp)
{
jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList;
if (jmp->Registration == ~0UL)
@@ -1051,7 +1067,7 @@ int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp
* _setjmp3 (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 )
-int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...)
+int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, ...)
{
jmp->Cookie = MSVCRT_JMP_MAGIC;
jmp->UnwindFunc = 0;
@@ -1082,7 +1098,7 @@ int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *
/*********************************************************************
* longjmp (MSVCRT.@)
*/
-void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
+void CDECL MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval)
{
unsigned long cur_frame = 0;
@@ -1120,7 +1136,7 @@ void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval)
/*********************************************************************
* _seh_longjmp_unwind (MSVCRT.@)
*/
-void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp)
+void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp)
{
msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp );
}
@@ -1128,7 +1144,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp)
/*********************************************************************
* _seh_longjmp_unwind4 (MSVCRT.@)
*/
-void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp)
+void __stdcall _seh_longjmp_unwind4(_JUMP_BUFFER *jmp)
{
msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration,
jmp->TryLevel, (void *)jmp->Ebp );
@@ -1137,14 +1153,14 @@ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp)
/*********************************************************************
* _fpieee_flt (MSVCRT.@)
*/
-int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep,
+int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep,
int (__cdecl *handler)(_FPIEEE_RECORD*))
{
FLOATING_SAVE_AREA *ctx = &ep->ContextRecord->FloatSave;
_FPIEEE_RECORD rec;
int ret;
- TRACE("(%x %p %p)\n", exception_code, ep, handler);
+ TRACE("(%lx %p %p)\n", exception_code, ep, handler);
switch(exception_code) {
case STATUS_FLOAT_DIVIDE_BY_ZERO:
diff --git a/sdk/lib/crt/wine/except_x86_64.c b/sdk/lib/crt/wine/except_x86_64.c
index 9e7676413de..3c6e7af940c 100644
--- a/sdk/lib/crt/wine/except_x86_64.c
+++ b/sdk/lib/crt/wine/except_x86_64.c
@@ -18,12 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#ifdef __x86_64__
+#include <setjmp.h>
#include <stdarg.h>
+#include <fpieee.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -90,6 +89,7 @@ typedef struct
{
cxx_frame_info frame_info;
BOOL rethrow;
+ EXCEPTION_RECORD *prev_rec;
} cxx_catch_ctx;
typedef struct
@@ -290,7 +290,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
if (trylevel<0 || trylevel>=descr->unwind_count)
{
ERR("invalid trylevel %d\n", trylevel);
- MSVCRT_terminate();
+ terminate();
}
handler = rva_to_ptr(unwind_table[trylevel].handler, dispatch->ImageBase);
if (handler)
@@ -306,14 +306,13 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c)
{
EXCEPTION_RECORD *rec = eptrs->ExceptionRecord;
- thread_data_t *data = msvcrt_get_thread_data();
cxx_catch_ctx *ctx = c;
if (rec->ExceptionCode != CXX_EXCEPTION)
return EXCEPTION_CONTINUE_SEARCH;
if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])
return EXCEPTION_EXECUTE_HANDLER;
- if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1])
+ if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1])
ctx->rethrow = TRUE;
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -340,6 +339,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec)
TRACE("calling handler %p\n", handler);
ctx.rethrow = FALSE;
+ ctx.prev_rec = prev_rec;
__CxxRegisterExceptionObject(&ep, &ctx.frame_info);
msvcrt_get_thread_data()->processing_throw--;
__TRY
@@ -487,7 +487,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c)
if (rec->ExceptionCode != CXX_EXCEPTION)
{
TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode);
- MSVCRT_terminate();
+ terminate();
}
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
@@ -498,6 +498,18 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c)
return ExceptionContinueSearch;
}
+static void check_noexcept( PEXCEPTION_RECORD rec,
+ const cxx_function_descr *descr, BOOL nested )
+{
+ if (!nested && rec->ExceptionCode == CXX_EXCEPTION &&
+ descr->magic >= CXX_FRAME_MAGIC_VC8 &&
+ (descr->flags & FUNC_DESCR_NOEXCEPT))
+ {
+ ERR("noexcept function propagating exception\n");
+ terminate();
+ }
+}
+
static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
CONTEXT *context, DISPATCHER_CONTEXT *dispatch,
const cxx_function_descr *descr)
@@ -561,10 +573,20 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel);
return ExceptionContinueSearch;
}
- if (!descr->tryblock_count) return ExceptionContinueSearch;
+ if (!descr->tryblock_count)
+ {
+ check_noexcept(rec, descr, orig_frame != frame);
+ return ExceptionContinueSearch;
+ }
if (rec->ExceptionCode == CXX_EXCEPTION)
{
+ if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])
+ {
+ TRACE("rethrow detected.\n");
+ *rec = *msvcrt_get_thread_data()->exc_record;
+ }
+
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
if (TRACE_ON(seh))
@@ -605,6 +627,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
}
... 2427 lines suppressed ...
1
0
[reactos] 01/01: [EXPLORER] Implement ABM_GET/SETSTATE and ABM_GETTASKBARPOS (#7525)
by Whindmar Saksit 25 Nov '24
by Whindmar Saksit 25 Nov '24
25 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c569aee023adb113a3052…
commit c569aee023adb113a3052dd48f1644244858de7e
Author: Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Mon Nov 25 19:51:19 2024 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Nov 25 19:51:19 2024 +0100
[EXPLORER] Implement ABM_GET/SETSTATE and ABM_GETTASKBARPOS (#7525)
---
base/shell/explorer/appbar.cpp | 35 ++++++++++++++++++++++++-----------
sdk/include/psdk/shellapi.h | 1 +
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/base/shell/explorer/appbar.cpp b/base/shell/explorer/appbar.cpp
index 3f980ec589f..831231bb190 100644
--- a/base/shell/explorer/appbar.cpp
+++ b/base/shell/explorer/appbar.cpp
@@ -35,6 +35,8 @@
#include <wine/list.h>
+#define GetPrimaryTaskbar() FindWindowW(L"Shell_TrayWnd", NULL)
+
struct appbar_cmd
{
DWORD dwMsg;
@@ -198,22 +200,33 @@ static UINT_PTR handle_appbarmessage(DWORD msg, _AppBarData *abd)
}
return TRUE;
case ABM_GETSTATE:
- FIXME("SHAppBarMessage(ABM_GETSTATE): stub\n");
- return ABS_ALWAYSONTOP | ABS_AUTOHIDE;
+ TRACE("SHAppBarMessage(ABM_GETSTATE)\n");
+ return (g_TaskbarSettings.sr.AutoHide ? ABS_AUTOHIDE : 0) |
+ (g_TaskbarSettings.sr.AlwaysOnTop ? ABS_ALWAYSONTOP : 0);
+ case ABM_SETSTATE:
+ TRACE("SHAppBarMessage(ABM_SETSTATE lparam=%s)\n", wine_dbgstr_longlong(abd->lParam));
+ hwnd = GetPrimaryTaskbar();
+ if (hwnd)
+ {
+ TaskbarSettings settings = g_TaskbarSettings;
+ settings.sr.AutoHide = (abd->lParam & ABS_AUTOHIDE) != 0;
+ settings.sr.AlwaysOnTop = (abd->lParam & ABS_ALWAYSONTOP) != 0;
+ SendMessageW(hwnd, TWM_SETTINGSCHANGED, 0, (LPARAM)&settings);
+ return TRUE;
+ }
+ return FALSE;
case ABM_GETTASKBARPOS:
- FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", hwnd);
- /* Report the taskbar is at the bottom of the screen. */
- abd->rc.left = 0;
- abd->rc.right = GetSystemMetrics(SM_CXSCREEN);
- abd->rc.bottom = GetSystemMetrics(SM_CYSCREEN);
- abd->rc.top = abd->rc.bottom-1;
- abd->uEdge = ABE_BOTTOM;
- return TRUE;
+ TRACE("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p)\n", hwnd);
+ abd->uEdge = g_TaskbarSettings.sr.Position;
+ abd->hWnd = GetPrimaryTaskbar();
+ return abd->hWnd && GetWindowRect(abd->hWnd, &abd->rc);
case ABM_ACTIVATE:
return TRUE;
case ABM_GETAUTOHIDEBAR:
FIXME("SHAppBarMessage(ABM_GETAUTOHIDEBAR, hwnd=%p, edge=%x): stub\n", hwnd, abd->uEdge);
- return 0;
+ if (abd->uEdge == g_TaskbarSettings.sr.Position && g_TaskbarSettings.sr.AutoHide)
+ return (SIZE_T)GetPrimaryTaskbar();
+ return NULL;
case ABM_SETAUTOHIDEBAR:
FIXME("SHAppBarMessage(ABM_SETAUTOHIDEBAR, hwnd=%p, edge=%x, lparam=%s): stub\n",
hwnd, abd->uEdge, wine_dbgstr_longlong(abd->lParam));
diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h
index b153a18177a..479d27d228d 100644
--- a/sdk/include/psdk/shellapi.h
+++ b/sdk/include/psdk/shellapi.h
@@ -69,6 +69,7 @@ extern "C" {
#define ABM_GETAUTOHIDEBAR 7
#define ABM_SETAUTOHIDEBAR 8
#define ABM_WINDOWPOSCHANGED 9
+#define ABM_SETSTATE 10
#define ABN_STATECHANGE 0
#define ABN_POSCHANGED 1
#define ABN_FULLSCREENAPP 2
1
0
[reactos] 01/01: [NTOS:CC] CcRosInitializeFileCache: Fix a missing spinlock release
by Thamatip Chitpong 25 Nov '24
by Thamatip Chitpong 25 Nov '24
25 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af4e39385cc269eb8e351…
commit af4e39385cc269eb8e35132f5ed30a0d23fec41c
Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org>
AuthorDate: Mon Nov 25 23:35:48 2024 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Nov 25 23:35:48 2024 +0700
[NTOS:CC] CcRosInitializeFileCache: Fix a missing spinlock release
---
ntoskrnl/cc/view.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c
index e4b78d46402..774e5e9d426 100644
--- a/ntoskrnl/cc/view.c
+++ b/ntoskrnl/cc/view.c
@@ -1304,10 +1304,10 @@ CcRosInitializeFileCache (
SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
if (SharedCacheMap == NULL)
{
- Allocated = TRUE;
SharedCacheMap = ExAllocateFromNPagedLookasideList(&SharedCacheMapLookasideList);
if (SharedCacheMap == NULL)
{
+ KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql);
return STATUS_INSUFFICIENT_RESOURCES;
}
RtlZeroMemory(SharedCacheMap, sizeof(*SharedCacheMap));
@@ -1335,6 +1335,7 @@ CcRosInitializeFileCache (
NULL,
KernelMode);
+ Allocated = TRUE;
FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap;
//CcRosTraceCacheMap(SharedCacheMap, TRUE);
1
0
[reactos] 01/01: [SETUPLIB][REACTOS][USETUP] Finish unification of MBR extended and primary/logical partitions
by Hermès Bélusca-Maïto 24 Nov '24
by Hermès Bélusca-Maïto 24 Nov '24
24 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aee0280f971a5b24e9d4…
commit 4aee0280f971a5b24e9d4bd26807e00340e2ade5
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Fri Nov 22 22:20:58 2024 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Nov 24 18:13:17 2024 +0100
[SETUPLIB][REACTOS][USETUP] Finish unification of MBR extended and primary/logical partitions
Fixes previous attempt at commit 0ca4e6dcf, which was reverted by commit
bbdcc14b1 because the partitioning checks mistook unpartitioned disks as
GPT.
Addendum to commit 99f0937fd.
The partition-creation checks are unified for these partitions into one
single function. To prepare for GPT support, the specifics are put into
a separate MBRPartitionCreateChecks() helper, called for MBR disks by the
upper-level function. GPT disks will have a similar helper in the future.
---
base/setup/lib/utils/partlist.c | 87 +++++++++++++++++++----------------------
base/setup/lib/utils/partlist.h | 10 ++---
base/setup/reactos/drivepage.c | 4 +-
base/setup/usetup/usetup.c | 6 +--
4 files changed, 50 insertions(+), 57 deletions(-)
diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
index c045518cbfe..b138c9abdca 100644
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -2818,41 +2818,49 @@ GetAdjUnpartitionedEntry(
return NULL;
}
-ERROR_NUMBER
-PartitionCreationChecks(
- _In_ PPARTENTRY PartEntry)
+static ERROR_NUMBER
+MBRPartitionCreateChecks(
+ _In_ PPARTENTRY PartEntry,
+ _In_opt_ ULONGLONG SizeBytes,
+ _In_opt_ ULONG_PTR PartitionInfo)
{
PDISKENTRY DiskEntry = PartEntry->DiskEntry;
+ BOOLEAN isContainer = IsContainerPartition((UCHAR)PartitionInfo);
- if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT)
+ // TODO: Re-enable once we initialize unpartitioned disks before using them.
+ // ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR);
+ ASSERT(!PartEntry->IsPartitioned);
+
+ if (isContainer)
{
- DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n");
- return ERROR_WARN_PARTITION;
- }
+ /* Cannot create an extended partition within logical partition space */
+ if (PartEntry->LogicalPartition)
+ return ERROR_ONLY_ONE_EXTENDED;
- /* Fail if the partition is already in use */
- if (PartEntry->IsPartitioned)
- return ERROR_NEW_PARTITION;
+ /* Fail if there is another extended partition in the list */
+ if (DiskEntry->ExtendedPartition)
+ return ERROR_ONLY_ONE_EXTENDED;
+ }
/*
- * For primary partitions
+ * Primary or Extended partitions
*/
- if (!PartEntry->LogicalPartition)
+ if (!PartEntry->LogicalPartition || isContainer)
{
/* Only one primary partition is allowed on super-floppy */
if (IsSuperFloppy(DiskEntry))
return ERROR_PARTITION_TABLE_FULL;
- /* Fail if there are already 4 primary partitions in the list */
+ /* Fail if there are too many primary partitions */
if (GetPrimaryPartitionCount(DiskEntry) >= 4)
return ERROR_PARTITION_TABLE_FULL;
}
/*
- * For logical partitions
+ * Logical partitions
*/
else
{
- // TODO: Check that we are inside an extended partition!!
+ // TODO: Check that we are inside an extended partition!
// Then the following check will be useless.
/* Only one (primary) partition is allowed on super-floppy */
@@ -2864,38 +2872,28 @@ PartitionCreationChecks(
}
ERROR_NUMBER
-ExtendedPartitionCreationChecks(
- _In_ PPARTENTRY PartEntry)
+PartitionCreateChecks(
+ _In_ PPARTENTRY PartEntry,
+ _In_opt_ ULONGLONG SizeBytes,
+ _In_opt_ ULONG_PTR PartitionInfo)
{
- PDISKENTRY DiskEntry = PartEntry->DiskEntry;
-
- if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT)
- {
- DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n");
- return ERROR_WARN_PARTITION;
- }
+ // PDISKENTRY DiskEntry = PartEntry->DiskEntry;
/* Fail if the partition is already in use */
if (PartEntry->IsPartitioned)
return ERROR_NEW_PARTITION;
- /* Cannot create an extended partition within logical partition space */
- if (PartEntry->LogicalPartition)
- return ERROR_ONLY_ONE_EXTENDED;
-
- /* Only one primary partition is allowed on super-floppy */
- if (IsSuperFloppy(DiskEntry))
- return ERROR_PARTITION_TABLE_FULL;
-
- /* Fail if there are already 4 primary partitions in the list */
- if (GetPrimaryPartitionCount(DiskEntry) >= 4)
- return ERROR_PARTITION_TABLE_FULL;
-
- /* Fail if there is another extended partition in the list */
- if (DiskEntry->ExtendedPartition)
- return ERROR_ONLY_ONE_EXTENDED;
-
- return ERROR_SUCCESS;
+ // TODO: Re-enable once we initialize unpartitioned disks before
+ // using them; because such disks would be mistook as GPT otherwise.
+ // if (DiskEntry->DiskStyle == PARTITION_STYLE_MBR)
+ return MBRPartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo);
+#if 0
+ else // if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT)
+ {
+ DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n");
+ return ERROR_WARN_PARTITION;
+ }
+#endif
}
// TODO: Improve upon the PartitionInfo parameter later
@@ -2926,13 +2924,10 @@ CreatePartition(
return FALSE;
}
- if (isContainer)
- Error = ExtendedPartitionCreationChecks(PartEntry);
- else
- Error = PartitionCreationChecks(PartEntry);
+ Error = PartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo);
if (Error != NOT_AN_ERROR)
{
- DPRINT1("PartitionCreationChecks(%s) failed with error %lu\n", mainType, Error);
+ DPRINT1("PartitionCreateChecks(%s) failed with error %lu\n", mainType, Error);
return FALSE;
}
diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h
index fb20f1500c0..71b9eb99181 100644
--- a/base/setup/lib/utils/partlist.h
+++ b/base/setup/lib/utils/partlist.h
@@ -338,12 +338,10 @@ GetAdjUnpartitionedEntry(
_In_ BOOLEAN Direction);
ERROR_NUMBER
-PartitionCreationChecks(
- _In_ PPARTENTRY PartEntry);
-
-ERROR_NUMBER
-ExtendedPartitionCreationChecks(
- _In_ PPARTENTRY PartEntry);
+PartitionCreateChecks(
+ _In_ PPARTENTRY PartEntry,
+ _In_opt_ ULONGLONG SizeBytes,
+ _In_opt_ ULONG_PTR PartitionInfo);
BOOLEAN
CreatePartition(
diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c
index 5afdb57b084..dc4fc64cfb5 100644
--- a/base/setup/reactos/drivepage.c
+++ b/base/setup/reactos/drivepage.c
@@ -1975,7 +1975,7 @@ DriveDlgProc(
// TODO: In the future: first test needs to be augmented with:
// (... && PartEntry->Volume->IsSimpleVolume)
if ((PartEntry->IsPartitioned && PartEntry->Volume) ||
- (!PartEntry->IsPartitioned && (PartitionCreationChecks(PartEntry) == NOT_AN_ERROR)))
+ (!PartEntry->IsPartitioned && (PartitionCreateChecks(PartEntry, 0ULL, 0) == NOT_AN_ERROR)))
{
// ASSERT(PartEntry != PartEntry->DiskEntry->ExtendedPartition);
ASSERT(!IsContainerPartition(PartEntry->PartitionType));
@@ -2090,7 +2090,7 @@ DisableWizNext:
{
ULONG Error;
- Error = PartitionCreationChecks(PartEntry);
+ Error = PartitionCreateChecks(PartEntry, 0ULL, 0);
if (Error != NOT_AN_ERROR)
{
// MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index d5d569ede42..10d133eb560 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -1711,7 +1711,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
{
ASSERT(CurrentPartition);
- Error = PartitionCreationChecks(CurrentPartition);
+ Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0);
if (Error != NOT_AN_ERROR)
{
MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
@@ -1729,7 +1729,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
if (CurrentPartition->LogicalPartition)
continue;
- Error = ExtendedPartitionCreationChecks(CurrentPartition);
+ Error = PartitionCreateChecks(CurrentPartition, 0ULL, PARTITION_EXTENDED);
if (Error != NOT_AN_ERROR)
{
MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
@@ -1789,7 +1789,7 @@ CreateInstallPartition:
/* Create the partition if the selected region is empty */
if (!CurrentPartition->IsPartitioned)
{
- Error = PartitionCreationChecks(CurrentPartition);
+ Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0);
if (Error != NOT_AN_ERROR)
{
MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
1
0
[reactos] 01/01: [NTOS:MM][NTOS:CC] Rewrite some cache memory management functions (#7510)
by Thamatip Chitpong 24 Nov '24
by Thamatip Chitpong 24 Nov '24
24 Nov '24
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69bf14050686f81db153c…
commit 69bf14050686f81db153c70df4f874b5dfa4a5ff
Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org>
AuthorDate: Sun Nov 24 21:37:27 2024 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Nov 24 21:37:27 2024 +0700
[NTOS:MM][NTOS:CC] Rewrite some cache memory management functions (#7510)
Use section object pointer with byte offset instead of using base address. This simplifies the Mm functions themselves and also the code in Cc that calls them.
Also add minor fixes for MmFlushSegment and MmPurgeSegment.
---
ntoskrnl/cc/copy.c | 8 ++-
ntoskrnl/cc/pin.c | 11 ++--
ntoskrnl/cc/view.c | 11 ++--
ntoskrnl/include/internal/mm.h | 12 ++---
ntoskrnl/mm/section.c | 120 +++++++++++++++++++++++++++++++++++++++--
5 files changed, 138 insertions(+), 24 deletions(-)
diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c
index e01f2b46865..b969bfdb856 100644
--- a/ntoskrnl/cc/copy.c
+++ b/ntoskrnl/cc/copy.c
@@ -653,7 +653,9 @@ CcCopyWrite (
CurrentOffset += VacbLength;
/* Tell Mm */
- Status = MmMakePagesDirty(NULL, Add2Ptr(Vacb->BaseAddress, VacbOffset), VacbLength);
+ Status = MmMakeSegmentDirty(FileObject->SectionObjectPointer,
+ Vacb->FileOffset.QuadPart + VacbOffset,
+ VacbLength);
if (!NT_SUCCESS(Status))
ExRaiseStatus(Status);
}
@@ -913,7 +915,9 @@ CcZeroData (
Length -= VacbLength;
/* Tell Mm */
- Status = MmMakePagesDirty(NULL, Add2Ptr(Vacb->BaseAddress, VacbOffset), VacbLength);
+ Status = MmMakeSegmentDirty(FileObject->SectionObjectPointer,
+ Vacb->FileOffset.QuadPart + VacbOffset,
+ VacbLength);
if (!NT_SUCCESS(Status))
ExRaiseStatus(Status);
}
diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c
index dcd1d5483a5..e37a1c97d6b 100644
--- a/ntoskrnl/cc/pin.c
+++ b/ntoskrnl/cc/pin.c
@@ -551,17 +551,18 @@ CcSetDirtyPinnedData (
IN PLARGE_INTEGER Lsn)
{
PINTERNAL_BCB iBcb = CONTAINING_RECORD(Bcb, INTERNAL_BCB, PFCB);
+ PROS_VACB Vacb = iBcb->Vacb;
CCTRACE(CC_API_DEBUG, "Bcb=%p Lsn=%p\n", Bcb, Lsn);
/* Tell Mm */
- MmMakePagesDirty(NULL,
- Add2Ptr(iBcb->Vacb->BaseAddress, iBcb->PFCB.MappedFileOffset.QuadPart - iBcb->Vacb->FileOffset.QuadPart),
- iBcb->PFCB.MappedLength);
+ MmMakeSegmentDirty(Vacb->SharedCacheMap->FileObject->SectionObjectPointer,
+ iBcb->PFCB.MappedFileOffset.QuadPart,
+ iBcb->PFCB.MappedLength);
- if (!iBcb->Vacb->Dirty)
+ if (!Vacb->Dirty)
{
- CcRosMarkDirtyVacb(iBcb->Vacb);
+ CcRosMarkDirtyVacb(Vacb);
}
}
diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c
index f35d5c227c2..e4b78d46402 100644
--- a/ntoskrnl/cc/view.c
+++ b/ntoskrnl/cc/view.c
@@ -936,22 +936,22 @@ CcRosEnsureVacbResident(
_In_ ULONG Length
)
{
- PVOID BaseAddress;
+ PROS_SHARED_CACHE_MAP SharedCacheMap = Vacb->SharedCacheMap;
ASSERT((Offset + Length) <= VACB_MAPPING_GRANULARITY);
#if 0
- if ((Vacb->FileOffset.QuadPart + Offset) > Vacb->SharedCacheMap->SectionSize.QuadPart)
+ if ((Vacb->FileOffset.QuadPart + Offset) > SharedCacheMap->SectionSize.QuadPart)
{
DPRINT1("Vacb read beyond the file size!\n");
return FALSE;
}
#endif
- BaseAddress = (PVOID)((ULONG_PTR)Vacb->BaseAddress + Offset);
-
/* Check if the pages are resident */
- if (!MmArePagesResident(NULL, BaseAddress, Length))
+ if (!MmIsDataSectionResident(SharedCacheMap->FileObject->SectionObjectPointer,
+ Vacb->FileOffset.QuadPart + Offset,
+ Length))
{
if (!Wait)
{
@@ -960,7 +960,6 @@ CcRosEnsureVacbResident(
if (!NoRead)
{
- PROS_SHARED_CACHE_MAP SharedCacheMap = Vacb->SharedCacheMap;
NTSTATUS Status = MmMakeDataSectionResident(SharedCacheMap->FileObject->SectionObjectPointer,
Vacb->FileOffset.QuadPart + Offset,
Length,
diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h
index d1dad7a25c1..91bf7599df2 100644
--- a/ntoskrnl/include/internal/mm.h
+++ b/ntoskrnl/include/internal/mm.h
@@ -1502,16 +1502,16 @@ MmMapViewInSystemSpaceEx(
BOOLEAN
NTAPI
-MmArePagesResident(
- _In_ PEPROCESS Process,
- _In_ PVOID BaseAddress,
+MmIsDataSectionResident(
+ _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer,
+ _In_ LONGLONG Offset,
_In_ ULONG Length);
NTSTATUS
NTAPI
-MmMakePagesDirty(
- _In_ PEPROCESS Process,
- _In_ PVOID Address,
+MmMakeSegmentDirty(
+ _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer,
+ _In_ LONGLONG Offset,
_In_ ULONG Length);
NTSTATUS
diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c
index 50609bac71c..73b414315fe 100644
--- a/ntoskrnl/mm/section.c
+++ b/ntoskrnl/mm/section.c
@@ -4775,10 +4775,13 @@ MmCreateSection (OUT PVOID * Section,
return Status;
}
+/* This function is not used. It is left for future use, when per-process
+ * address space is considered. */
+#if 0
BOOLEAN
NTAPI
MmArePagesResident(
- _In_ PEPROCESS Process,
+ _In_opt_ PEPROCESS Process,
_In_ PVOID Address,
_In_ ULONG Length)
{
@@ -4826,6 +4829,7 @@ MmArePagesResident(
MmUnlockAddressSpace(AddressSpace);
return Ret;
}
+#endif
/* Like CcPurgeCache but for the in-memory segment */
BOOLEAN
@@ -4859,9 +4863,9 @@ MmPurgeSegment(
/* We must calculate the length for ourselves */
/* FIXME: All of this is suboptimal */
ULONG ElemCount = RtlNumberGenericTableElements(&Segment->PageTable);
- /* No page. Nothing to purge */
if (!ElemCount)
{
+ /* No page. Nothing to purge */
MmUnlockSectionSegment(Segment);
MmDereferenceSegment(Segment);
return TRUE;
@@ -4871,6 +4875,9 @@ MmPurgeSegment(
PurgeEnd.QuadPart = PageTable->FileOffset.QuadPart + _countof(PageTable->PageEntries) * PAGE_SIZE;
}
+ /* Find byte offset of the page to start */
+ PurgeStart.QuadPart = PAGE_ROUND_DOWN(PurgeStart.QuadPart);
+
while (PurgeStart.QuadPart < PurgeEnd.QuadPart)
{
ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &PurgeStart);
@@ -4920,6 +4927,48 @@ MmPurgeSegment(
return TRUE;
}
+BOOLEAN
+NTAPI
+MmIsDataSectionResident(
+ _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer,
+ _In_ LONGLONG Offset,
+ _In_ ULONG Length)
+{
+ PMM_SECTION_SEGMENT Segment;
+ LARGE_INTEGER RangeStart, RangeEnd;
+ BOOLEAN Ret = TRUE;
+
+ RangeStart.QuadPart = Offset;
+ if (!NT_SUCCESS(RtlLongLongAdd(RangeStart.QuadPart, Length, &RangeEnd.QuadPart)))
+ return FALSE;
+
+ Segment = MiGrabDataSection(SectionObjectPointer);
+ if (!Segment)
+ return FALSE;
+
+ /* Find byte offset of the page to start */
+ RangeStart.QuadPart = PAGE_ROUND_DOWN(RangeStart.QuadPart);
+
+ MmLockSectionSegment(Segment);
+
+ while (RangeStart.QuadPart < RangeEnd.QuadPart)
+ {
+ ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &RangeStart);
+ if ((Entry == 0) || IS_SWAP_FROM_SSE(Entry))
+ {
+ Ret = FALSE;
+ break;
+ }
+
+ RangeStart.QuadPart += PAGE_SIZE;
+ }
+
+ MmUnlockSectionSegment(Segment);
+ MmDereferenceSegment(Segment);
+
+ return Ret;
+}
+
NTSTATUS
NTAPI
MmMakeDataSectionResident(
@@ -4940,6 +4989,63 @@ MmMakeDataSectionResident(
return Status;
}
+NTSTATUS
+NTAPI
+MmMakeSegmentDirty(
+ _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer,
+ _In_ LONGLONG Offset,
+ _In_ ULONG Length)
+{
+ PMM_SECTION_SEGMENT Segment;
+ LARGE_INTEGER RangeStart, RangeEnd;
+ NTSTATUS Status;
+
+ RangeStart.QuadPart = Offset;
+ Status = RtlLongLongAdd(RangeStart.QuadPart, Length, &RangeEnd.QuadPart);
+ if (!NT_SUCCESS(Status))
+ return Status;
+
+ Segment = MiGrabDataSection(SectionObjectPointer);
+ if (!Segment)
+ return STATUS_NOT_MAPPED_VIEW;
+
+ /* Find byte offset of the page to start */
+ RangeStart.QuadPart = PAGE_ROUND_DOWN(RangeStart.QuadPart);
+
+ MmLockSectionSegment(Segment);
+
+ while (RangeStart.QuadPart < RangeEnd.QuadPart)
+ {
+ ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &RangeStart);
+
+ /* Let any pending read proceed */
+ while (MM_IS_WAIT_PTE(Entry))
+ {
+ MmUnlockSectionSegment(Segment);
+ KeDelayExecutionThread(KernelMode, FALSE, &TinyTime);
+ MmLockSectionSegment(Segment);
+ Entry = MmGetPageEntrySectionSegment(Segment, &RangeStart);
+ }
+
+ /* We are called from Cc, this can't be backed by the page files */
+ ASSERT(!IS_SWAP_FROM_SSE(Entry));
+
+ /* If there is no page there, there is nothing to make dirty */
+ if (Entry != 0)
+ {
+ /* Dirtify the entry */
+ MmSetPageEntrySectionSegment(Segment, &RangeStart, DIRTY_SSE(Entry));
+ }
+
+ RangeStart.QuadPart += PAGE_SIZE;
+ }
+
+ MmUnlockSectionSegment(Segment);
+ MmDereferenceSegment(Segment);
+
+ return STATUS_SUCCESS;
+}
+
NTSTATUS
NTAPI
MmFlushSegment(
@@ -4991,8 +5097,8 @@ MmFlushSegment(
FlushEnd.QuadPart = PageTable->FileOffset.QuadPart + _countof(PageTable->PageEntries) * PAGE_SIZE;
}
- FlushStart.QuadPart >>= PAGE_SHIFT;
- FlushStart.QuadPart <<= PAGE_SHIFT;
+ /* Find byte offset of the page to start */
+ FlushStart.QuadPart = PAGE_ROUND_DOWN(FlushStart.QuadPart);
while (FlushStart.QuadPart < FlushEnd.QuadPart)
{
@@ -5197,10 +5303,13 @@ MmCheckDirtySegment(
return FALSE;
}
+/* This function is not used. It is left for future use, when per-process
+ * address space is considered. */
+#if 0
NTSTATUS
NTAPI
MmMakePagesDirty(
- _In_ PEPROCESS Process,
+ _In_opt_ PEPROCESS Process,
_In_ PVOID Address,
_In_ ULONG Length)
{
@@ -5267,6 +5376,7 @@ MmMakePagesDirty(
MmUnlockAddressSpace(AddressSpace);
return STATUS_SUCCESS;
}
+#endif
NTSTATUS
NTAPI
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=541cb0d9b282fb07c0f18…
commit 541cb0d9b282fb07c0f18b6a81b6f81480eeb49d
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Fri Nov 22 14:03:58 2024 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sun Nov 24 13:40:11 2024 +0200
[USER32] ordinals -> @
---
win32ss/user/user32/user32.spec | 1460 +++++++++++++++++++--------------------
1 file changed, 730 insertions(+), 730 deletions(-)
diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec
index a5b4fd5b4d2..7fe69be95a4 100644
--- a/win32ss/user/user32/user32.spec
+++ b/win32ss/user/user32/user32.spec
@@ -1,752 +1,752 @@
; Functions exported by Win 2K3 SP2
-1 stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout
-2 stdcall AdjustWindowRect(ptr long long)
-3 stdcall AdjustWindowRectEx(ptr long long long)
-4 stdcall AlignRects(ptr long long long)
-5 stdcall AllowForegroundActivation()
-6 stdcall AllowSetForegroundWindow(long)
-7 stdcall AnimateWindow(long long long)
-8 stdcall AnyPopup()
-9 stdcall AppendMenuA(long long long ptr)
-10 stdcall AppendMenuW(long long long ptr)
-11 stdcall ArrangeIconicWindows(long)
-12 stdcall AttachThreadInput(long long long) NtUserAttachThreadInput
-13 stdcall BeginDeferWindowPos(long)
-14 stdcall BeginPaint(long ptr) NtUserBeginPaint
-15 stdcall BlockInput(long) NtUserBlockInput
-16 stdcall BringWindowToTop(long)
-17 stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA
-18 stdcall BroadcastSystemMessageA(long ptr long long long)
-19 stdcall BroadcastSystemMessageExA(long ptr long long long ptr)
-20 stdcall BroadcastSystemMessageExW(long ptr long long long ptr)
-21 stdcall BroadcastSystemMessageW(long ptr long long long)
-22 stdcall BuildReasonArray(ptr)
-23 stdcall CalcMenuBar(long long long long long) NtUserCalcMenuBar
-24 stdcall CallMsgFilter(ptr long) CallMsgFilterA
-25 stdcall CallMsgFilterA(ptr long)
-26 stdcall CallMsgFilterW(ptr long)
-27 stdcall CallNextHookEx(long long long long)
-28 stdcall CallWindowProcA(ptr long long long long)
-29 stdcall CallWindowProcW(ptr long long long long)
-30 stdcall CascadeChildWindows(long long)
-31 stdcall CascadeWindows(long long ptr long ptr)
-32 stdcall ChangeClipboardChain(long long) NtUserChangeClipboardChain
-33 stdcall ChangeDisplaySettingsA(ptr long)
-34 stdcall ChangeDisplaySettingsExA(str ptr long long ptr)
-35 stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr)
-36 stdcall ChangeDisplaySettingsW(ptr long)
-37 stdcall ChangeMenuA(long long ptr long long)
-38 stdcall ChangeMenuW(long long ptr long long)
-39 stdcall CharLowerA(str)
-40 stdcall CharLowerBuffA(str long)
-41 stdcall CharLowerBuffW(wstr long)
-42 stdcall CharLowerW(wstr)
-43 stdcall CharNextA(str)
-44 stdcall CharNextExA(long str long)
-45 stdcall CharNextW(wstr)
-46 stdcall CharPrevA(str str)
-47 stdcall CharPrevExA(long str str long)
-48 stdcall CharPrevW(wstr wstr)
-49 stdcall CharToOemA(str ptr)
-50 stdcall CharToOemBuffA(str ptr long)
-51 stdcall CharToOemBuffW(wstr ptr long)
-52 stdcall CharToOemW(wstr ptr)
-53 stdcall CharUpperA(str)
-54 stdcall CharUpperBuffA(str long)
-55 stdcall CharUpperBuffW(wstr long)
-56 stdcall CharUpperW(wstr)
-57 stdcall CheckDlgButton(long long long)
-58 stdcall CheckMenuItem(long long long)
-59 stdcall CheckMenuRadioItem(long long long long long)
-60 stdcall CheckRadioButton(long long long long)
-61 stdcall ChildWindowFromPoint(long double)
-62 stdcall ChildWindowFromPointEx(long double long) ; Direct call NtUserChildWindowFromPointEx
-63 stdcall CliImmSetHotKey(long long long ptr)
-64 stdcall ClientThreadSetup()
-65 stdcall ClientToScreen(long ptr)
-66 stdcall ClipCursor(ptr) NtUserClipCursor
-67 stdcall CloseClipboard() NtUserCloseClipboard
-68 stdcall CloseDesktop(long) NtUserCloseDesktop
-69 stdcall CloseWindow(long)
-70 stdcall CloseWindowStation(long) NtUserCloseWindowStation
-71 stdcall CopyAcceleratorTableA(long ptr long)
-72 stdcall CopyAcceleratorTableW(long ptr long) NtUserCopyAcceleratorTable
-73 stdcall CopyIcon(long)
-74 stdcall CopyImage(long long long long long)
-75 stdcall CopyRect(ptr ptr)
-76 stdcall CountClipboardFormats() NtUserCountClipboardFormats
-77 stdcall CreateAcceleratorTableA(ptr long)
-78 stdcall CreateAcceleratorTableW(ptr long) NtUserCreateAcceleratorTable
-79 stdcall CreateCaret(long long long long) NtUserCreateCaret
-80 stdcall CreateCursor(long long long long long ptr ptr)
-81 stdcall CreateDesktopA(str str ptr long long ptr)
-82 stdcall CreateDesktopW(wstr wstr ptr long long ptr)
-83 stdcall CreateDialogIndirectParamA(long ptr long ptr long)
-84 stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long)
-85 stdcall CreateDialogIndirectParamW(long ptr long ptr long)
-86 stdcall CreateDialogParamA(long ptr long ptr long)
-87 stdcall CreateDialogParamW(long ptr long ptr long)
-88 stdcall CreateIcon(long long long long long ptr ptr)
-89 stdcall CreateIconFromResource (ptr long long long)
-90 stdcall CreateIconFromResourceEx(ptr long long long long long long)
-91 stdcall CreateIconIndirect(ptr)
-92 stdcall CreateMDIWindowA(ptr ptr long long long long long long long long)
-93 stdcall CreateMDIWindowW(ptr ptr long long long long long long long long)
-94 stdcall CreateMenu()
-95 stdcall CreatePopupMenu()
-96 stdcall CreateSystemThreads(long)
-97 stdcall CreateWindowExA(long str str long long long long long long long long ptr)
-98 stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr)
-99 stdcall CreateWindowStationA(str long long ptr)
-100 stdcall CreateWindowStationW(wstr long long ptr)
-101 stdcall CsrBroadcastSystemMessageExW(long ptr long long long ptr)
-102 stdcall CtxInitUser32()
+@ stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout
+@ stdcall AdjustWindowRect(ptr long long)
+@ stdcall AdjustWindowRectEx(ptr long long long)
+@ stdcall AlignRects(ptr long long long)
+@ stdcall AllowForegroundActivation()
+@ stdcall AllowSetForegroundWindow(long)
+@ stdcall AnimateWindow(long long long)
+@ stdcall AnyPopup()
+@ stdcall AppendMenuA(long long long ptr)
+@ stdcall AppendMenuW(long long long ptr)
+@ stdcall ArrangeIconicWindows(long)
+@ stdcall AttachThreadInput(long long long) NtUserAttachThreadInput
+@ stdcall BeginDeferWindowPos(long)
+@ stdcall BeginPaint(long ptr) NtUserBeginPaint
+@ stdcall BlockInput(long) NtUserBlockInput
+@ stdcall BringWindowToTop(long)
+@ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA
+@ stdcall BroadcastSystemMessageA(long ptr long long long)
+@ stdcall BroadcastSystemMessageExA(long ptr long long long ptr)
+@ stdcall BroadcastSystemMessageExW(long ptr long long long ptr)
+@ stdcall BroadcastSystemMessageW(long ptr long long long)
+@ stdcall BuildReasonArray(ptr)
+@ stdcall CalcMenuBar(long long long long long) NtUserCalcMenuBar
+@ stdcall CallMsgFilter(ptr long) CallMsgFilterA
+@ stdcall CallMsgFilterA(ptr long)
+@ stdcall CallMsgFilterW(ptr long)
+@ stdcall CallNextHookEx(long long long long)
+@ stdcall CallWindowProcA(ptr long long long long)
+@ stdcall CallWindowProcW(ptr long long long long)
+@ stdcall CascadeChildWindows(long long)
+@ stdcall CascadeWindows(long long ptr long ptr)
+@ stdcall ChangeClipboardChain(long long) NtUserChangeClipboardChain
+@ stdcall ChangeDisplaySettingsA(ptr long)
+@ stdcall ChangeDisplaySettingsExA(str ptr long long ptr)
+@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr)
+@ stdcall ChangeDisplaySettingsW(ptr long)
+@ stdcall ChangeMenuA(long long ptr long long)
+@ stdcall ChangeMenuW(long long ptr long long)
+@ stdcall CharLowerA(str)
+@ stdcall CharLowerBuffA(str long)
+@ stdcall CharLowerBuffW(wstr long)
+@ stdcall CharLowerW(wstr)
+@ stdcall CharNextA(str)
+@ stdcall CharNextExA(long str long)
+@ stdcall CharNextW(wstr)
+@ stdcall CharPrevA(str str)
+@ stdcall CharPrevExA(long str str long)
+@ stdcall CharPrevW(wstr wstr)
+@ stdcall CharToOemA(str ptr)
+@ stdcall CharToOemBuffA(str ptr long)
+@ stdcall CharToOemBuffW(wstr ptr long)
+@ stdcall CharToOemW(wstr ptr)
+@ stdcall CharUpperA(str)
+@ stdcall CharUpperBuffA(str long)
+@ stdcall CharUpperBuffW(wstr long)
+@ stdcall CharUpperW(wstr)
+@ stdcall CheckDlgButton(long long long)
+@ stdcall CheckMenuItem(long long long)
+@ stdcall CheckMenuRadioItem(long long long long long)
+@ stdcall CheckRadioButton(long long long long)
+@ stdcall ChildWindowFromPoint(long double)
+@ stdcall ChildWindowFromPointEx(long double long) ; Direct call NtUserChildWindowFromPointEx
+@ stdcall CliImmSetHotKey(long long long ptr)
+@ stdcall ClientThreadSetup()
+@ stdcall ClientToScreen(long ptr)
+@ stdcall ClipCursor(ptr) NtUserClipCursor
+@ stdcall CloseClipboard() NtUserCloseClipboard
+@ stdcall CloseDesktop(long) NtUserCloseDesktop
+@ stdcall CloseWindow(long)
+@ stdcall CloseWindowStation(long) NtUserCloseWindowStation
+@ stdcall CopyAcceleratorTableA(long ptr long)
+@ stdcall CopyAcceleratorTableW(long ptr long) NtUserCopyAcceleratorTable
+@ stdcall CopyIcon(long)
+@ stdcall CopyImage(long long long long long)
+@ stdcall CopyRect(ptr ptr)
+@ stdcall CountClipboardFormats() NtUserCountClipboardFormats
+@ stdcall CreateAcceleratorTableA(ptr long)
+@ stdcall CreateAcceleratorTableW(ptr long) NtUserCreateAcceleratorTable
+@ stdcall CreateCaret(long long long long) NtUserCreateCaret
+@ stdcall CreateCursor(long long long long long ptr ptr)
+@ stdcall CreateDesktopA(str str ptr long long ptr)
+@ stdcall CreateDesktopW(wstr wstr ptr long long ptr)
+@ stdcall CreateDialogIndirectParamA(long ptr long ptr long)
+@ stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long)
+@ stdcall CreateDialogIndirectParamW(long ptr long ptr long)
+@ stdcall CreateDialogParamA(long ptr long ptr long)
+@ stdcall CreateDialogParamW(long ptr long ptr long)
+@ stdcall CreateIcon(long long long long long ptr ptr)
+@ stdcall CreateIconFromResource (ptr long long long)
+@ stdcall CreateIconFromResourceEx(ptr long long long long long long)
+@ stdcall CreateIconIndirect(ptr)
+@ stdcall CreateMDIWindowA(ptr ptr long long long long long long long long)
+@ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long)
+@ stdcall CreateMenu()
+@ stdcall CreatePopupMenu()
+@ stdcall CreateSystemThreads(long)
+@ stdcall CreateWindowExA(long str str long long long long long long long long ptr)
+@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr)
+@ stdcall CreateWindowStationA(str long long ptr)
+@ stdcall CreateWindowStationW(wstr long long ptr)
+@ stdcall CsrBroadcastSystemMessageExW(long ptr long long long ptr)
+@ stdcall CtxInitUser32()
# DbgWin32HeapFail
# DbgWin32HeapStat
-105 stdcall DdeAbandonTransaction(long long long)
-106 stdcall DdeAccessData(long ptr)
-107 stdcall DdeAddData(long ptr long long)
-108 stdcall DdeClientTransaction(ptr long long long long long long ptr)
-109 stdcall DdeCmpStringHandles(long long)
-110 stdcall DdeConnect(long long long ptr)
-111 stdcall DdeConnectList(long long long long ptr)
-112 stdcall DdeCreateDataHandle(long ptr long long long long long)
-113 stdcall DdeCreateStringHandleA(long str long)
-114 stdcall DdeCreateStringHandleW(long wstr long)
-115 stdcall DdeDisconnect(long)
-116 stdcall DdeDisconnectList(long)
-117 stdcall DdeEnableCallback(long long long)
-118 stdcall DdeFreeDataHandle(long)
-119 stdcall DdeFreeStringHandle(long long)
-120 stdcall DdeGetData(long ptr long long)
-121 stdcall DdeGetLastError(long)
-122 stdcall DdeGetQualityOfService(long long ptr) ; Direct call NtUserDdeGetQualityOfService
-123 stdcall DdeImpersonateClient(long)
-124 stdcall DdeInitializeA(ptr ptr long long)
-125 stdcall DdeInitializeW(ptr ptr long long)
-126 stdcall DdeKeepStringHandle(long long)
-127 stdcall DdeNameService(long long long long)
-128 stdcall DdePostAdvise(long long long)
-129 stdcall DdeQueryConvInfo(long long ptr)
-130 stdcall DdeQueryNextServer(long long)
-131 stdcall DdeQueryStringA(long long ptr long long)
-132 stdcall DdeQueryStringW(long long ptr long long)
-133 stdcall DdeReconnect(long)
-134 stdcall DdeSetQualityOfService(long ptr ptr) ; Direct call NtUserDdeSetQualityOfService
-135 stdcall DdeSetUserHandle (long long long)
-136 stdcall DdeUnaccessData(long)
-137 stdcall DdeUninitialize(long)
-138 stdcall DefDlgProcA(long long long long)
-139 stdcall DefDlgProcW(long long long long)
-140 stdcall DefFrameProcA(long long long long long)
-141 stdcall DefFrameProcW(long long long long long)
-142 stdcall DefMDIChildProcA(long long long long)
-143 stdcall DefMDIChildProcW(long long long long)
-144 stdcall DefRawInputProc(ptr long long)
-145 stdcall DefWindowProcA(long long long long)
-146 stdcall DefWindowProcW(long long long long)
-147 stdcall DeferWindowPos(long long long long long long long long) ; Direct call NtUserDeferWindowPos
-148 stdcall DeleteMenu(long long long) NtUserDeleteMenu
-149 stdcall DeregisterShellHookWindow (long)
-150 stdcall DestroyAcceleratorTable(long)
-151 stdcall DestroyCaret()
-152 stdcall DestroyCursor(long)
-153 stdcall DestroyIcon(long)
-154 stdcall DestroyMenu(long) NtUserDestroyMenu
-155 stdcall DestroyReasons(ptr)
-156 stdcall DestroyWindow(long) NtUserDestroyWindow
-157 stdcall DeviceEventWorker(long long long long long)
-158 stdcall DialogBoxIndirectParamA(long ptr long ptr long)
-159 stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long)
-160 stdcall DialogBoxIndirectParamW(long ptr long ptr long)
-161 stdcall DialogBoxParamA(long str long ptr long)
-162 stdcall DialogBoxParamW(long wstr long ptr long)
-163 stdcall DisableProcessWindowsGhosting()
-164 stdcall DispatchMessageA(ptr)
-165 stdcall DispatchMessageW(ptr)
-166 stdcall DisplayExitWindowsWarnings(long)
-167 stdcall DlgDirListA(long str long long long)
-168 stdcall DlgDirListComboBoxA(long ptr long long long)
-169 stdcall DlgDirListComboBoxW(long ptr long long long)
-170 stdcall DlgDirListW(long wstr long long long)
-171 stdcall DlgDirSelectComboBoxExA(long ptr long long)
-172 stdcall DlgDirSelectComboBoxExW(long ptr long long)
-173 stdcall DlgDirSelectExA(long ptr long long)
-174 stdcall DlgDirSelectExW(long ptr long long)
-175 stdcall DragDetect(long double) ; Direct call NtUserDragDetect
-176 stdcall DragObject(long long long long long) NtUserDragObject
-177 stdcall DrawAnimatedRects(long long ptr ptr) NtUserDrawAnimatedRects
-178 stdcall DrawCaption(long long ptr long)
-179 stdcall DrawCaptionTempA(long long ptr long long str long)
-180 stdcall DrawCaptionTempW(long long ptr long long wstr long)
-181 stdcall DrawEdge(long ptr long long)
-182 stdcall DrawFocusRect(long ptr)
-183 stdcall DrawFrame(long ptr long long)
-184 stdcall DrawFrameControl(long ptr long long)
-185 stdcall DrawIcon(long long long long)
-186 stdcall DrawIconEx(long long long long long long long long long)
-187 stdcall DrawMenuBar(long)
-188 stdcall DrawMenuBarTemp(long long long long long) NtUserDrawMenuBarTemp
-189 stdcall DrawStateA(long long ptr long long long long long long long)
-190 stdcall DrawStateW(long long ptr long long long long long long long)
-191 stdcall DrawTextA(long str long ptr long)
-192 stdcall DrawTextExA(long str long ptr long ptr)
-193 stdcall DrawTextExW(long wstr long ptr long ptr)
-194 stdcall DrawTextW(long wstr long ptr long)
-195 stdcall EditWndProc(long long long long) EditWndProcA
-196 stdcall EmptyClipboard() NtUserEmptyClipboard
-197 stdcall EnableMenuItem(long long long)
-198 stdcall EnableScrollBar(long long long)
-199 stdcall EnableWindow(long long)
-200 stdcall EndDeferWindowPos(long)
-201 stdcall EndDialog(long long)
-202 stdcall EndMenu() NtUserEndMenu
-203 stdcall EndPaint(long ptr) NtUserEndPaint
-204 stdcall EndTask(ptr long long)
-205 stdcall EnterReaderModeHelper(ptr)
-206 stdcall EnumChildWindows(long ptr long)
-207 stdcall EnumClipboardFormats(long)
-208 stdcall EnumDesktopWindows(long ptr ptr)
-209 stdcall EnumDesktopsA(ptr ptr long)
-210 stdcall EnumDesktopsW(ptr ptr long)
-211 stdcall EnumDisplayDevicesA(ptr long ptr long)
-212 stdcall EnumDisplayDevicesW(ptr long ptr long)
-213 stdcall EnumDisplayMonitors(long ptr ptr long) ; Direct call NtUserEnumDisplayMonitors
-214 stdcall EnumDisplaySettingsA(str long ptr)
-215 stdcall EnumDisplaySettingsExA(str long ptr long)
-216 stdcall EnumDisplaySettingsExW(wstr long ptr long)
-217 stdcall EnumDisplaySettingsW(wstr long ptr )
-218 stdcall EnumPropsA(long ptr)
-219 stdcall EnumPropsExA(long ptr long)
-220 stdcall EnumPropsExW(long ptr long)
-221 stdcall EnumPropsW(long ptr)
-222 stdcall EnumThreadWindows(long ptr long)
-223 stdcall EnumWindowStationsA(ptr long)
-224 stdcall EnumWindowStationsW(ptr long)
-225 stdcall EnumWindows(ptr long)
-226 stdcall EqualRect(ptr ptr)
-227 stdcall ExcludeUpdateRgn(long long) NtUserExcludeUpdateRgn
-228 stdcall ExitWindowsEx(long long)
-229 stdcall FillRect(long ptr long)
-230 stdcall FindWindowA(str str)
-231 stdcall FindWindowExA(long long str str)
-232 stdcall FindWindowExW(long long wstr wstr)
-233 stdcall FindWindowW(wstr wstr)
-234 stdcall FlashWindow(long long)
-235 stdcall FlashWindowEx(ptr) NtUserFlashWindowEx
-236 stdcall FrameRect(long ptr long)
-237 stdcall FreeDDElParam(long long)
-238 stdcall GetActiveWindow()
-239 stdcall GetAltTabInfo(long long ptr ptr long) GetAltTabInfoA
-240 stdcall GetAltTabInfoA(long long ptr ptr long)
-241 stdcall GetAltTabInfoW(long long ptr ptr long)
-242 stdcall GetAncestor(long long) ; Direct call NtUserGetAncestor
-243 stdcall GetAppCompatFlags(long)
-244 stdcall GetAppCompatFlags2(long)
-245 stdcall GetAsyncKeyState(long)
-246 stdcall GetCapture()
-247 stdcall GetCaretBlinkTime() NtUserGetCaretBlinkTime
-248 stdcall GetCaretPos(ptr) NtUserGetCaretPos
-249 stdcall GetClassInfoA(long str ptr)
-250 stdcall GetClassInfoExA(long str ptr)
-251 stdcall GetClassInfoExW(long wstr ptr)
-252 stdcall GetClassInfoW(long wstr ptr)
-253 stdcall GetClassLongA(long long)
+@ stdcall DdeAbandonTransaction(long long long)
+@ stdcall DdeAccessData(long ptr)
+@ stdcall DdeAddData(long ptr long long)
+@ stdcall DdeClientTransaction(ptr long long long long long long ptr)
+@ stdcall DdeCmpStringHandles(long long)
+@ stdcall DdeConnect(long long long ptr)
+@ stdcall DdeConnectList(long long long long ptr)
+@ stdcall DdeCreateDataHandle(long ptr long long long long long)
+@ stdcall DdeCreateStringHandleA(long str long)
+@ stdcall DdeCreateStringHandleW(long wstr long)
+@ stdcall DdeDisconnect(long)
+@ stdcall DdeDisconnectList(long)
+@ stdcall DdeEnableCallback(long long long)
+@ stdcall DdeFreeDataHandle(long)
+@ stdcall DdeFreeStringHandle(long long)
+@ stdcall DdeGetData(long ptr long long)
+@ stdcall DdeGetLastError(long)
+@ stdcall DdeGetQualityOfService(long long ptr) ; Direct call NtUserDdeGetQualityOfService
+@ stdcall DdeImpersonateClient(long)
+@ stdcall DdeInitializeA(ptr ptr long long)
+@ stdcall DdeInitializeW(ptr ptr long long)
+@ stdcall DdeKeepStringHandle(long long)
+@ stdcall DdeNameService(long long long long)
+@ stdcall DdePostAdvise(long long long)
+@ stdcall DdeQueryConvInfo(long long ptr)
+@ stdcall DdeQueryNextServer(long long)
+@ stdcall DdeQueryStringA(long long ptr long long)
+@ stdcall DdeQueryStringW(long long ptr long long)
+@ stdcall DdeReconnect(long)
+@ stdcall DdeSetQualityOfService(long ptr ptr) ; Direct call NtUserDdeSetQualityOfService
+@ stdcall DdeSetUserHandle (long long long)
+@ stdcall DdeUnaccessData(long)
+@ stdcall DdeUninitialize(long)
+@ stdcall DefDlgProcA(long long long long)
+@ stdcall DefDlgProcW(long long long long)
+@ stdcall DefFrameProcA(long long long long long)
+@ stdcall DefFrameProcW(long long long long long)
+@ stdcall DefMDIChildProcA(long long long long)
+@ stdcall DefMDIChildProcW(long long long long)
+@ stdcall DefRawInputProc(ptr long long)
+@ stdcall DefWindowProcA(long long long long)
+@ stdcall DefWindowProcW(long long long long)
+@ stdcall DeferWindowPos(long long long long long long long long) ; Direct call NtUserDeferWindowPos
+@ stdcall DeleteMenu(long long long) NtUserDeleteMenu
+@ stdcall DeregisterShellHookWindow (long)
+@ stdcall DestroyAcceleratorTable(long)
+@ stdcall DestroyCaret()
+@ stdcall DestroyCursor(long)
+@ stdcall DestroyIcon(long)
+@ stdcall DestroyMenu(long) NtUserDestroyMenu
+@ stdcall DestroyReasons(ptr)
+@ stdcall DestroyWindow(long) NtUserDestroyWindow
+@ stdcall DeviceEventWorker(long long long long long)
+@ stdcall DialogBoxIndirectParamA(long ptr long ptr long)
+@ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long)
+@ stdcall DialogBoxIndirectParamW(long ptr long ptr long)
+@ stdcall DialogBoxParamA(long str long ptr long)
+@ stdcall DialogBoxParamW(long wstr long ptr long)
+@ stdcall DisableProcessWindowsGhosting()
+@ stdcall DispatchMessageA(ptr)
+@ stdcall DispatchMessageW(ptr)
+@ stdcall DisplayExitWindowsWarnings(long)
+@ stdcall DlgDirListA(long str long long long)
+@ stdcall DlgDirListComboBoxA(long ptr long long long)
+@ stdcall DlgDirListComboBoxW(long ptr long long long)
+@ stdcall DlgDirListW(long wstr long long long)
+@ stdcall DlgDirSelectComboBoxExA(long ptr long long)
+@ stdcall DlgDirSelectComboBoxExW(long ptr long long)
+@ stdcall DlgDirSelectExA(long ptr long long)
+@ stdcall DlgDirSelectExW(long ptr long long)
+@ stdcall DragDetect(long double) ; Direct call NtUserDragDetect
+@ stdcall DragObject(long long long long long) NtUserDragObject
+@ stdcall DrawAnimatedRects(long long ptr ptr) NtUserDrawAnimatedRects
+@ stdcall DrawCaption(long long ptr long)
+@ stdcall DrawCaptionTempA(long long ptr long long str long)
+@ stdcall DrawCaptionTempW(long long ptr long long wstr long)
+@ stdcall DrawEdge(long ptr long long)
+@ stdcall DrawFocusRect(long ptr)
+@ stdcall DrawFrame(long ptr long long)
+@ stdcall DrawFrameControl(long ptr long long)
+@ stdcall DrawIcon(long long long long)
+@ stdcall DrawIconEx(long long long long long long long long long)
+@ stdcall DrawMenuBar(long)
+@ stdcall DrawMenuBarTemp(long long long long long) NtUserDrawMenuBarTemp
+@ stdcall DrawStateA(long long ptr long long long long long long long)
+@ stdcall DrawStateW(long long ptr long long long long long long long)
+@ stdcall DrawTextA(long str long ptr long)
+@ stdcall DrawTextExA(long str long ptr long ptr)
+@ stdcall DrawTextExW(long wstr long ptr long ptr)
+@ stdcall DrawTextW(long wstr long ptr long)
+@ stdcall EditWndProc(long long long long) EditWndProcA
+@ stdcall EmptyClipboard() NtUserEmptyClipboard
+@ stdcall EnableMenuItem(long long long)
+@ stdcall EnableScrollBar(long long long)
+@ stdcall EnableWindow(long long)
+@ stdcall EndDeferWindowPos(long)
+@ stdcall EndDialog(long long)
+@ stdcall EndMenu() NtUserEndMenu
+@ stdcall EndPaint(long ptr) NtUserEndPaint
+@ stdcall EndTask(ptr long long)
+@ stdcall EnterReaderModeHelper(ptr)
+@ stdcall EnumChildWindows(long ptr long)
+@ stdcall EnumClipboardFormats(long)
+@ stdcall EnumDesktopWindows(long ptr ptr)
+@ stdcall EnumDesktopsA(ptr ptr long)
+@ stdcall EnumDesktopsW(ptr ptr long)
+@ stdcall EnumDisplayDevicesA(ptr long ptr long)
+@ stdcall EnumDisplayDevicesW(ptr long ptr long)
+@ stdcall EnumDisplayMonitors(long ptr ptr long) ; Direct call NtUserEnumDisplayMonitors
+@ stdcall EnumDisplaySettingsA(str long ptr)
+@ stdcall EnumDisplaySettingsExA(str long ptr long)
+@ stdcall EnumDisplaySettingsExW(wstr long ptr long)
+@ stdcall EnumDisplaySettingsW(wstr long ptr )
+@ stdcall EnumPropsA(long ptr)
+@ stdcall EnumPropsExA(long ptr long)
+@ stdcall EnumPropsExW(long ptr long)
+@ stdcall EnumPropsW(long ptr)
+@ stdcall EnumThreadWindows(long ptr long)
+@ stdcall EnumWindowStationsA(ptr long)
+@ stdcall EnumWindowStationsW(ptr long)
+@ stdcall EnumWindows(ptr long)
+@ stdcall EqualRect(ptr ptr)
+@ stdcall ExcludeUpdateRgn(long long) NtUserExcludeUpdateRgn
+@ stdcall ExitWindowsEx(long long)
+@ stdcall FillRect(long ptr long)
+@ stdcall FindWindowA(str str)
+@ stdcall FindWindowExA(long long str str)
+@ stdcall FindWindowExW(long long wstr wstr)
+@ stdcall FindWindowW(wstr wstr)
+@ stdcall FlashWindow(long long)
+@ stdcall FlashWindowEx(ptr) NtUserFlashWindowEx
+@ stdcall FrameRect(long ptr long)
+@ stdcall FreeDDElParam(long long)
+@ stdcall GetActiveWindow()
+@ stdcall GetAltTabInfo(long long ptr ptr long) GetAltTabInfoA
+@ stdcall GetAltTabInfoA(long long ptr ptr long)
+@ stdcall GetAltTabInfoW(long long ptr ptr long)
+@ stdcall GetAncestor(long long) ; Direct call NtUserGetAncestor
+@ stdcall GetAppCompatFlags(long)
+@ stdcall GetAppCompatFlags2(long)
+@ stdcall GetAsyncKeyState(long)
+@ stdcall GetCapture()
+@ stdcall GetCaretBlinkTime() NtUserGetCaretBlinkTime
+@ stdcall GetCaretPos(ptr) NtUserGetCaretPos
+@ stdcall GetClassInfoA(long str ptr)
+@ stdcall GetClassInfoExA(long str ptr)
+@ stdcall GetClassInfoExW(long wstr ptr)
+@ stdcall GetClassInfoW(long wstr ptr)
+@ stdcall GetClassLongA(long long)
@ stdcall -arch=x86_64,arm64 GetClassLongPtrA(ptr long)
@ stdcall -arch=x86_64,arm64 GetClassLongPtrW(ptr long)
-254 stdcall GetClassLongW(long long)
-255 stdcall GetClassNameA(long ptr long)
-256 stdcall GetClassNameW(long ptr long)
-257 stdcall GetClassWord(long long)
-258 stdcall GetClientRect(long long)
-259 stdcall GetClipCursor(ptr) NtUserGetClipCursor
-260 stdcall GetClipboardData(long)
-261 stdcall GetClipboardFormatNameA(long ptr long)
-262 stdcall GetClipboardFormatNameW(long ptr long)
-263 stdcall GetClipboardOwner() NtUserGetClipboardOwner
-264 stdcall GetClipboardSequenceNumber() NtUserGetClipboardSequenceNumber
-265 stdcall GetClipboardViewer() NtUserGetClipboardViewer
-266 stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo
-267 stdcall GetCursor()
-268 stdcall GetCursorFrameInfo(long long long long long)
-269 stdcall GetCursorInfo(ptr) NtUserGetCursorInfo
-270 stdcall GetCursorPos(ptr)
-271 stdcall GetDC(long) NtUserGetDC
-272 stdcall GetDCEx(long long long) NtUserGetDCEx
+@ stdcall GetClassLongW(long long)
+@ stdcall GetClassNameA(long ptr long)
+@ stdcall GetClassNameW(long ptr long)
+@ stdcall GetClassWord(long long)
+@ stdcall GetClientRect(long long)
+@ stdcall GetClipCursor(ptr) NtUserGetClipCursor
+@ stdcall GetClipboardData(long)
+@ stdcall GetClipboardFormatNameA(long ptr long)
+@ stdcall GetClipboardFormatNameW(long ptr long)
+@ stdcall GetClipboardOwner() NtUserGetClipboardOwner
+@ stdcall GetClipboardSequenceNumber() NtUserGetClipboardSequenceNumber
+@ stdcall GetClipboardViewer() NtUserGetClipboardViewer
+@ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo
+@ stdcall GetCursor()
+@ stdcall GetCursorFrameInfo(long long long long long)
+@ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo
+@ stdcall GetCursorPos(ptr)
+@ stdcall GetDC(long) NtUserGetDC
+@ stdcall GetDCEx(long long long) NtUserGetDCEx
# GetDbgTagFlags
-274 stdcall GetDesktopWindow()
-275 stdcall GetDialogBaseUnits()
-276 stdcall GetDlgCtrlID(long)
-277 stdcall GetDlgItem(long long)
-278 stdcall GetDlgItemInt(long long ptr long)
-279 stdcall GetDlgItemTextA(long long ptr long)
-280 stdcall GetDlgItemTextW(long long ptr long)
-281 stdcall GetDoubleClickTime() NtUserGetDoubleClickTime
+@ stdcall GetDesktopWindow()
+@ stdcall GetDialogBaseUnits()
+@ stdcall GetDlgCtrlID(long)
+@ stdcall GetDlgItem(long long)
+@ stdcall GetDlgItemInt(long long ptr long)
+@ stdcall GetDlgItemTextA(long long ptr long)
+@ stdcall GetDlgItemTextW(long long ptr long)
+@ stdcall GetDoubleClickTime() NtUserGetDoubleClickTime
@ stdcall -version=0xA00+ GetDpiForSystem()
@ stdcall -version=0xA00+ GetDpiForWindow(ptr)
-282 stdcall GetFocus()
-283 stdcall GetForegroundWindow() NtUserGetForegroundWindow
-284 stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo
-285 stdcall GetGuiResources(long long) NtUserGetGuiResources
-286 stdcall GetIconInfo(long ptr)
-287 stdcall GetInputDesktop()
-288 stdcall GetInputState()
-289 stdcall GetInternalWindowPos(long ptr ptr) NtUserGetInternalWindowPos
-290 stdcall GetKBCodePage()
-291 stdcall GetKeyNameTextA(long ptr long)
-292 stdcall GetKeyNameTextW(long ptr long)
-293 stdcall GetKeyState(long)
-294 stdcall GetKeyboardLayout(long)
-295 stdcall GetKeyboardLayoutList(long ptr) NtUserGetKeyboardLayoutList
-296 stdcall GetKeyboardLayoutNameA(ptr)
-297 stdcall GetKeyboardLayoutNameW(ptr)
-298 stdcall GetKeyboardState(ptr) NtUserGetKeyboardState
-299 stdcall GetKeyboardType(long)
-300 stdcall GetLastActivePopup(long)
-301 stdcall GetLastInputInfo(ptr)
-302 stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes
-303 stdcall GetListBoxInfo(long) NtUserGetListBoxInfo
-304 stdcall GetMenu(long)
-305 stdcall GetMenuBarInfo(long long long ptr) NtUserGetMenuBarInfo
-306 stdcall GetMenuCheckMarkDimensions()
-307 stdcall GetMenuContextHelpId(long)
-308 stdcall GetMenuDefaultItem(long long long)
-309 stdcall GetMenuInfo(long ptr)
-310 stdcall GetMenuItemCount(long)
-311 stdcall GetMenuItemID(long long)
-312 stdcall GetMenuItemInfoA(long long long ptr)
-313 stdcall GetMenuItemInfoW(long long long ptr)
-314 stdcall GetMenuItemRect(long long long ptr) NtUserGetMenuItemRect
-315 stdcall GetMenuState(long long long)
-316 stdcall GetMenuStringA(long long ptr long long)
-317 stdcall GetMenuStringW(long long ptr long long)
-318 stdcall GetMessageA(ptr long long long)
-319 stdcall GetMessageExtraInfo()
-320 stdcall GetMessagePos()
-321 stdcall GetMessageTime()
-322 stdcall GetMessageW(ptr long long long)
-323 stdcall GetMonitorInfoA(long ptr)
-324 stdcall GetMonitorInfoW(long ptr)
-325 stdcall GetMouseMovePointsEx(long ptr ptr long long) NtUserGetMouseMovePointsEx
-326 stdcall GetNextDlgGroupItem(long long long)
-327 stdcall GetNextDlgTabItem(long long long)
-328 stdcall GetOpenClipboardWindow() NtUserGetOpenClipboardWindow
-329 stdcall GetParent(long)
-330 stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat
-331 stdcall GetProcessDefaultLayout(ptr)
-332 stdcall GetProcessWindowStation() NtUserGetProcessWindowStation
-333 stdcall GetProgmanWindow ()
-334 stdcall GetPropA(long str)
-335 stdcall GetPropW(long wstr)
-336 stdcall GetQueueStatus(long)
-337 stdcall GetRawInputBuffer(ptr ptr long)
-338 stdcall GetRawInputData(ptr long ptr ptr long)
-339 stdcall GetRawInputDeviceInfoA(ptr long ptr ptr)
-340 stdcall GetRawInputDeviceInfoW(ptr long ptr ptr)
-341 stdcall GetRawInputDeviceList(ptr ptr long)
-342 stdcall GetReasonTitleFromReasonCode(long long long)
-343 stdcall GetRegisteredRawInputDevices(ptr ptr long)
+@ stdcall GetFocus()
+@ stdcall GetForegroundWindow() NtUserGetForegroundWindow
+@ stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo
+@ stdcall GetGuiResources(long long) NtUserGetGuiResources
+@ stdcall GetIconInfo(long ptr)
+@ stdcall GetInputDesktop()
+@ stdcall GetInputState()
+@ stdcall GetInternalWindowPos(long ptr ptr) NtUserGetInternalWindowPos
+@ stdcall GetKBCodePage()
+@ stdcall GetKeyNameTextA(long ptr long)
+@ stdcall GetKeyNameTextW(long ptr long)
+@ stdcall GetKeyState(long)
+@ stdcall GetKeyboardLayout(long)
+@ stdcall GetKeyboardLayoutList(long ptr) NtUserGetKeyboardLayoutList
+@ stdcall GetKeyboardLayoutNameA(ptr)
+@ stdcall GetKeyboardLayoutNameW(ptr)
+@ stdcall GetKeyboardState(ptr) NtUserGetKeyboardState
+@ stdcall GetKeyboardType(long)
+@ stdcall GetLastActivePopup(long)
+@ stdcall GetLastInputInfo(ptr)
+@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes
+@ stdcall GetListBoxInfo(long) NtUserGetListBoxInfo
+@ stdcall GetMenu(long)
+@ stdcall GetMenuBarInfo(long long long ptr) NtUserGetMenuBarInfo
+@ stdcall GetMenuCheckMarkDimensions()
+@ stdcall GetMenuContextHelpId(long)
+@ stdcall GetMenuDefaultItem(long long long)
+@ stdcall GetMenuInfo(long ptr)
+@ stdcall GetMenuItemCount(long)
+@ stdcall GetMenuItemID(long long)
+@ stdcall GetMenuItemInfoA(long long long ptr)
+@ stdcall GetMenuItemInfoW(long long long ptr)
+@ stdcall GetMenuItemRect(long long long ptr) NtUserGetMenuItemRect
+@ stdcall GetMenuState(long long long)
+@ stdcall GetMenuStringA(long long ptr long long)
+@ stdcall GetMenuStringW(long long ptr long long)
+@ stdcall GetMessageA(ptr long long long)
+@ stdcall GetMessageExtraInfo()
+@ stdcall GetMessagePos()
+@ stdcall GetMessageTime()
+@ stdcall GetMessageW(ptr long long long)
+@ stdcall GetMonitorInfoA(long ptr)
+@ stdcall GetMonitorInfoW(long ptr)
+@ stdcall GetMouseMovePointsEx(long ptr ptr long long) NtUserGetMouseMovePointsEx
+@ stdcall GetNextDlgGroupItem(long long long)
+@ stdcall GetNextDlgTabItem(long long long)
+@ stdcall GetOpenClipboardWindow() NtUserGetOpenClipboardWindow
+@ stdcall GetParent(long)
+@ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat
+@ stdcall GetProcessDefaultLayout(ptr)
+@ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation
+@ stdcall GetProgmanWindow ()
+@ stdcall GetPropA(long str)
+@ stdcall GetPropW(long wstr)
+@ stdcall GetQueueStatus(long)
+@ stdcall GetRawInputBuffer(ptr ptr long)
+@ stdcall GetRawInputData(ptr long ptr ptr long)
+@ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr)
+@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr)
+@ stdcall GetRawInputDeviceList(ptr ptr long)
+@ stdcall GetReasonTitleFromReasonCode(long long long)
+@ stdcall GetRegisteredRawInputDevices(ptr ptr long)
# GetRipFlags
-345 stdcall GetScrollBarInfo(long long ptr) ; NtUserGetScrollBarInfo
-346 stdcall GetScrollInfo(long long ptr)
-347 stdcall GetScrollPos(long long)
-348 stdcall GetScrollRange(long long ptr ptr)
-349 stdcall GetShellWindow()
-350 stdcall GetSubMenu(long long)
-351 stdcall GetSysColor(long)
-352 stdcall GetSysColorBrush(long)
-353 stdcall GetSystemMenu(long long) ; NtUserGetSystemMenu
-354 stdcall GetSystemMetrics(long)
-355 stdcall GetTabbedTextExtentA(long str long long ptr)
-356 stdcall GetTabbedTextExtentW(long wstr long long ptr)
-357 stdcall GetTaskmanWindow ()
-358 stdcall GetThreadDesktop(long)
-359 stdcall GetTitleBarInfo(long ptr) NtUserGetTitleBarInfo
-360 stdcall GetTopWindow(long)
-361 stdcall GetUpdateRect(long ptr long)
-362 stdcall GetUpdateRgn(long long long)
-363 stdcall GetUserObjectInformationA(long long ptr long ptr)
-364 stdcall GetUserObjectInformationW(long long ptr long ptr) NtUserGetObjectInformation
-365 stdcall GetUserObjectSecurity (long ptr ptr long ptr)
-366 stdcall GetWinStationInfo(ptr)
-367 stdcall GetWindow(long long)
-368 stdcall GetWindowContextHelpId(long)
-369 stdcall GetWindowDC(long) NtUserGetWindowDC
-370 stdcall GetWindowInfo(long ptr)
-371 stdcall GetWindowLongA(long long)
+@ stdcall GetScrollBarInfo(long long ptr) ; NtUserGetScrollBarInfo
+@ stdcall GetScrollInfo(long long ptr)
+@ stdcall GetScrollPos(long long)
+@ stdcall GetScrollRange(long long ptr ptr)
+@ stdcall GetShellWindow()
+@ stdcall GetSubMenu(long long)
+@ stdcall GetSysColor(long)
+@ stdcall GetSysColorBrush(long)
+@ stdcall GetSystemMenu(long long) ; NtUserGetSystemMenu
+@ stdcall GetSystemMetrics(long)
+@ stdcall GetTabbedTextExtentA(long str long long ptr)
+@ stdcall GetTabbedTextExtentW(long wstr long long ptr)
+@ stdcall GetTaskmanWindow ()
+@ stdcall GetThreadDesktop(long)
+@ stdcall GetTitleBarInfo(long ptr) NtUserGetTitleBarInfo
+@ stdcall GetTopWindow(long)
+@ stdcall GetUpdateRect(long ptr long)
+@ stdcall GetUpdateRgn(long long long)
+@ stdcall GetUserObjectInformationA(long long ptr long ptr)
+@ stdcall GetUserObjectInformationW(long long ptr long ptr) NtUserGetObjectInformation
+@ stdcall GetUserObjectSecurity (long ptr ptr long ptr)
+@ stdcall GetWinStationInfo(ptr)
+@ stdcall GetWindow(long long)
+@ stdcall GetWindowContextHelpId(long)
+@ stdcall GetWindowDC(long) NtUserGetWindowDC
+@ stdcall GetWindowInfo(long ptr)
+@ stdcall GetWindowLongA(long long)
@ stdcall -arch=x86_64,arm64 GetWindowLongPtrA(ptr long)
@ stdcall -arch=x86_64,arm64 GetWindowLongPtrW(ptr long)
-372 stdcall GetWindowLongW(long long)
-373 stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA
-374 stdcall GetWindowModuleFileNameA(long ptr long)
-375 stdcall GetWindowModuleFileNameW(long ptr long)
-376 stdcall GetWindowPlacement(long ptr) NtUserGetWindowPlacement
-377 stdcall GetWindowRect(long ptr)
-378 stdcall GetWindowRgn(long long)
-379 stdcall GetWindowRgnBox(long ptr)
-380 stdcall GetWindowTextA(long ptr long)
-381 stdcall GetWindowTextLengthA(long)
-382 stdcall GetWindowTextLengthW(long)
-383 stdcall GetWindowTextW(long ptr long)
-384 stdcall GetWindowThreadProcessId(long ptr)
-385 stdcall GetWindowWord(long long)
-386 stdcall GrayStringA(long long ptr long long long long long long)
-387 stdcall GrayStringW(long long ptr long long long long long long)
-388 stdcall HideCaret(long) NtUserHideCaret
-389 stdcall HiliteMenuItem(long long long long) NtUserHiliteMenuItem
-390 stdcall IMPGetIMEA(long ptr)
-391 stdcall IMPGetIMEW(long ptr)
-392 stdcall IMPQueryIMEA(ptr)
-393 stdcall IMPQueryIMEW(ptr)
-394 stdcall IMPSetIMEA(long ptr)
-395 stdcall IMPSetIMEW(long ptr)
-396 stdcall ImpersonateDdeClientWindow(long long) ; Direct call NtUserImpersonateDdeClientWindow
-397 stdcall InSendMessage()
-398 stdcall InSendMessageEx(ptr)
-399 stdcall InflateRect(ptr long long)
-400 stdcall InitializeLpkHooks(ptr)
-401 stdcall InitializeWin32EntryTable(ptr)
-402 stdcall InsertMenuA(long long long long ptr)
-403 stdcall InsertMenuItemA(long long long ptr)
-404 stdcall InsertMenuItemW(long long long ptr)
-405 stdcall InsertMenuW(long long long long ptr)
-406 stdcall InternalGetWindowText(long long long)
-407 stdcall IntersectRect(ptr ptr ptr)
-408 stdcall InvalidateRect(long ptr long) NtUserInvalidateRect
-409 stdcall InvalidateRgn(long long long) NtUserInvalidateRgn
-410 stdcall InvertRect(long ptr)
-411 stdcall IsCharAlphaA(long)
-412 stdcall IsCharAlphaNumericA(long)
-413 stdcall IsCharAlphaNumericW(long)
-414 stdcall IsCharAlphaW(long)
-415 stdcall IsCharLowerA(long)
-416 stdcall IsCharLowerW(long)
-417 stdcall IsCharUpperA(long)
-418 stdcall IsCharUpperW(long)
-419 stdcall IsChild(long long)
-420 stdcall IsClipboardFormatAvailable(long) NtUserIsClipboardFormatAvailable
-421 stdcall IsDialogMessage(long ptr) IsDialogMessageA
-422 stdcall IsDialogMessageA(long ptr)
-423 stdcall IsDialogMessageW(long ptr)
-424 stdcall IsDlgButtonChecked(long long)
-425 stdcall IsGUIThread(long)
-426 stdcall IsHungAppWindow(long)
-427 stdcall IsIconic(long)
-428 stdcall IsMenu(long)
-429 stdcall -stub IsProcess16Bit()
-430 stdcall IsRectEmpty(ptr)
-431 stdcall IsSETEnabled()
-432 stdcall IsServerSideWindow(long)
-433 stdcall IsWinEventHookInstalled(long)
-434 stdcall IsWindow(long)
-435 stdcall IsWindowEnabled(long)
-436 stdcall IsWindowInDestroy(long)
-437 stdcall IsWindowUnicode(long)
-438 stdcall IsWindowVisible(long)
-439 stdcall -stub IsWow64Message()
-440 stdcall IsZoomed(long)
-441 stdcall KillSystemTimer(long long)
-442 stdcall KillTimer(long long) NtUserKillTimer
-443 stdcall LoadAcceleratorsA(long str)
-444 stdcall LoadAcceleratorsW(long wstr)
-445 stdcall LoadBitmapA(long str)
-446 stdcall LoadBitmapW(long wstr)
-447 stdcall LoadCursorA(long str)
-448 stdcall LoadCursorFromFileA(str)
-449 stdcall LoadCursorFromFileW(wstr)
-450 stdcall LoadCursorW(long wstr)
-451 stdcall LoadIconA(long str)
-452 stdcall LoadIconW(long wstr)
-453 stdcall LoadImageA(long str long long long long)
-454 stdcall LoadImageW(long wstr long long long long)
-455 stdcall LoadKeyboardLayoutA(str long)
-456 stdcall LoadKeyboardLayoutEx(long ptr long)
-457 stdcall LoadKeyboardLayoutW(wstr long)
-458 stdcall LoadLocalFonts()
-459 stdcall LoadMenuA(long str)
-460 stdcall LoadMenuIndirectA(ptr)
-461 stdcall LoadMenuIndirectW(ptr)
-462 stdcall LoadMenuW(long wstr)
-463 stdcall LoadRemoteFonts()
-464 stdcall LoadStringA(long long ptr long)
-465 stdcall LoadStringW(long long ptr long)
-466 stdcall LockSetForegroundWindow (long)
-467 stdcall LockWindowStation(long) NtUserLockWindowStation
-468 stdcall LockWindowUpdate(long) NtUserLockWindowUpdate
-469 stdcall LockWorkStation() NtUserLockWorkStation
-470 stdcall LookupIconIdFromDirectory(ptr long)
-471 stdcall LookupIconIdFromDirectoryEx(ptr long long long long)
-472 stdcall MBToWCSEx(long str long wstr long long)
-473 stdcall MB_GetString(ptr)
-474 stdcall MapDialogRect(long ptr)
-475 stdcall MapVirtualKeyA(long long)
-476 stdcall MapVirtualKeyExA(long long long)
-477 stdcall MapVirtualKeyExW(long long long)
-478 stdcall MapVirtualKeyW(long long)
-479 stdcall MapWindowPoints(long long ptr long)
-480 stdcall MenuItemFromPoint(long long double) NtUserMenuItemFromPoint
-481 stdcall MenuWindowProcA (long ptr long long long)
-482 stdcall MenuWindowProcW (long ptr long long long)
-483 stdcall MessageBeep(long)
-484 stdcall MessageBoxA(long str str long)
-485 stdcall MessageBoxExA(long str str long long)
-486 stdcall MessageBoxExW(long wstr wstr long long)
-487 stdcall MessageBoxIndirectA(ptr)
-488 stdcall MessageBoxIndirectW(ptr)
-489 stdcall MessageBoxTimeoutA(ptr str str long long long)
-490 stdcall MessageBoxTimeoutW(ptr wstr wstr long long long)
-491 stdcall MessageBoxW(long wstr wstr long)
-492 stdcall ModifyMenuA(long long long long ptr)
-493 stdcall ModifyMenuW(long long long long ptr)
-494 stdcall MonitorFromPoint(double long)
-495 stdcall MonitorFromRect(ptr long)
-496 stdcall MonitorFromWindow(long long)
-497 stdcall MoveWindow(long long long long long long) NtUserMoveWindow
-498 stdcall MsgWaitForMultipleObjects(long ptr long long long)
-499 stdcall MsgWaitForMultipleObjectsEx(long ptr long long long)
-500 stdcall NotifyWinEvent(long long long long)
-501 stdcall OemKeyScan(long)
-502 stdcall OemToCharA(ptr ptr)
-503 stdcall OemToCharBuffA(ptr ptr long)
-504 stdcall OemToCharBuffW(ptr ptr long)
-505 stdcall OemToCharW(ptr ptr)
-506 stdcall OffsetRect(ptr long long)
-507 stdcall OpenClipboard(long)
-508 stdcall OpenDesktopA(str long long long)
-509 stdcall OpenDesktopW(wstr long long long)
-510 stdcall OpenIcon(long)
-511 stdcall OpenInputDesktop(long long long) NtUserOpenInputDesktop
-512 stdcall OpenWindowStationA(str long long)
-513 stdcall OpenWindowStationW(wstr long long)
-514 stdcall PackDDElParam(long long long)
-515 stdcall PaintDesktop(long) NtUserPaintDesktop
-516 stdcall PaintMenuBar(long long long long long long) NtUserPaintMenuBar
-517 stdcall PeekMessageA(ptr long long long long)
-518 stdcall PeekMessageW(ptr long long long long)
-519 stdcall PostMessageA(long long long long)
-520 stdcall PostMessageW(long long long long)
-521 stdcall PostQuitMessage(long)
-522 stdcall PostThreadMessageA(long long long long)
-523 stdcall PostThreadMessageW(long long long long)
-524 stdcall PrintWindow(ptr ptr long) NtUserPrintWindow
-525 stdcall PrivateExtractIconExA(str long ptr ptr long)
-526 stdcall PrivateExtractIconExW(wstr long ptr ptr long)
-527 stdcall PrivateExtractIconsA(str long long long ptr ptr long long)
-528 stdcall PrivateExtractIconsW(wstr long long long ptr ptr long long)
+@ stdcall GetWindowLongW(long long)
+@ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA
+@ stdcall GetWindowModuleFileNameA(long ptr long)
+@ stdcall GetWindowModuleFileNameW(long ptr long)
+@ stdcall GetWindowPlacement(long ptr) NtUserGetWindowPlacement
+@ stdcall GetWindowRect(long ptr)
+@ stdcall GetWindowRgn(long long)
+@ stdcall GetWindowRgnBox(long ptr)
+@ stdcall GetWindowTextA(long ptr long)
+@ stdcall GetWindowTextLengthA(long)
+@ stdcall GetWindowTextLengthW(long)
+@ stdcall GetWindowTextW(long ptr long)
+@ stdcall GetWindowThreadProcessId(long ptr)
+@ stdcall GetWindowWord(long long)
+@ stdcall GrayStringA(long long ptr long long long long long long)
+@ stdcall GrayStringW(long long ptr long long long long long long)
+@ stdcall HideCaret(long) NtUserHideCaret
+@ stdcall HiliteMenuItem(long long long long) NtUserHiliteMenuItem
+@ stdcall IMPGetIMEA(long ptr)
+@ stdcall IMPGetIMEW(long ptr)
+@ stdcall IMPQueryIMEA(ptr)
+@ stdcall IMPQueryIMEW(ptr)
+@ stdcall IMPSetIMEA(long ptr)
+@ stdcall IMPSetIMEW(long ptr)
+@ stdcall ImpersonateDdeClientWindow(long long) ; Direct call NtUserImpersonateDdeClientWindow
+@ stdcall InSendMessage()
+@ stdcall InSendMessageEx(ptr)
+@ stdcall InflateRect(ptr long long)
+@ stdcall InitializeLpkHooks(ptr)
+@ stdcall InitializeWin32EntryTable(ptr)
+@ stdcall InsertMenuA(long long long long ptr)
+@ stdcall InsertMenuItemA(long long long ptr)
+@ stdcall InsertMenuItemW(long long long ptr)
+@ stdcall InsertMenuW(long long long long ptr)
+@ stdcall InternalGetWindowText(long long long)
+@ stdcall IntersectRect(ptr ptr ptr)
+@ stdcall InvalidateRect(long ptr long) NtUserInvalidateRect
+@ stdcall InvalidateRgn(long long long) NtUserInvalidateRgn
+@ stdcall InvertRect(long ptr)
+@ stdcall IsCharAlphaA(long)
+@ stdcall IsCharAlphaNumericA(long)
+@ stdcall IsCharAlphaNumericW(long)
+@ stdcall IsCharAlphaW(long)
+@ stdcall IsCharLowerA(long)
+@ stdcall IsCharLowerW(long)
+@ stdcall IsCharUpperA(long)
+@ stdcall IsCharUpperW(long)
+@ stdcall IsChild(long long)
+@ stdcall IsClipboardFormatAvailable(long) NtUserIsClipboardFormatAvailable
+@ stdcall IsDialogMessage(long ptr) IsDialogMessageA
+@ stdcall IsDialogMessageA(long ptr)
+@ stdcall IsDialogMessageW(long ptr)
+@ stdcall IsDlgButtonChecked(long long)
+@ stdcall IsGUIThread(long)
+@ stdcall IsHungAppWindow(long)
+@ stdcall IsIconic(long)
+@ stdcall IsMenu(long)
+@ stdcall -stub IsProcess16Bit()
+@ stdcall IsRectEmpty(ptr)
+@ stdcall IsSETEnabled()
+@ stdcall IsServerSideWindow(long)
+@ stdcall IsWinEventHookInstalled(long)
+@ stdcall IsWindow(long)
+@ stdcall IsWindowEnabled(long)
+@ stdcall IsWindowInDestroy(long)
+@ stdcall IsWindowUnicode(long)
+@ stdcall IsWindowVisible(long)
+@ stdcall -stub IsWow64Message()
+@ stdcall IsZoomed(long)
+@ stdcall KillSystemTimer(long long)
+@ stdcall KillTimer(long long) NtUserKillTimer
+@ stdcall LoadAcceleratorsA(long str)
+@ stdcall LoadAcceleratorsW(long wstr)
+@ stdcall LoadBitmapA(long str)
+@ stdcall LoadBitmapW(long wstr)
+@ stdcall LoadCursorA(long str)
+@ stdcall LoadCursorFromFileA(str)
+@ stdcall LoadCursorFromFileW(wstr)
+@ stdcall LoadCursorW(long wstr)
+@ stdcall LoadIconA(long str)
+@ stdcall LoadIconW(long wstr)
+@ stdcall LoadImageA(long str long long long long)
+@ stdcall LoadImageW(long wstr long long long long)
+@ stdcall LoadKeyboardLayoutA(str long)
+@ stdcall LoadKeyboardLayoutEx(long ptr long)
+@ stdcall LoadKeyboardLayoutW(wstr long)
+@ stdcall LoadLocalFonts()
+@ stdcall LoadMenuA(long str)
+@ stdcall LoadMenuIndirectA(ptr)
+@ stdcall LoadMenuIndirectW(ptr)
+@ stdcall LoadMenuW(long wstr)
+@ stdcall LoadRemoteFonts()
+@ stdcall LoadStringA(long long ptr long)
+@ stdcall LoadStringW(long long ptr long)
+@ stdcall LockSetForegroundWindow (long)
+@ stdcall LockWindowStation(long) NtUserLockWindowStation
+@ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate
+@ stdcall LockWorkStation() NtUserLockWorkStation
+@ stdcall LookupIconIdFromDirectory(ptr long)
+@ stdcall LookupIconIdFromDirectoryEx(ptr long long long long)
+@ stdcall MBToWCSEx(long str long wstr long long)
+@ stdcall MB_GetString(ptr)
+@ stdcall MapDialogRect(long ptr)
+@ stdcall MapVirtualKeyA(long long)
+@ stdcall MapVirtualKeyExA(long long long)
+@ stdcall MapVirtualKeyExW(long long long)
+@ stdcall MapVirtualKeyW(long long)
+@ stdcall MapWindowPoints(long long ptr long)
+@ stdcall MenuItemFromPoint(long long double) NtUserMenuItemFromPoint
+@ stdcall MenuWindowProcA (long ptr long long long)
+@ stdcall MenuWindowProcW (long ptr long long long)
+@ stdcall MessageBeep(long)
+@ stdcall MessageBoxA(long str str long)
+@ stdcall MessageBoxExA(long str str long long)
+@ stdcall MessageBoxExW(long wstr wstr long long)
+@ stdcall MessageBoxIndirectA(ptr)
+@ stdcall MessageBoxIndirectW(ptr)
+@ stdcall MessageBoxTimeoutA(ptr str str long long long)
+@ stdcall MessageBoxTimeoutW(ptr wstr wstr long long long)
+@ stdcall MessageBoxW(long wstr wstr long)
+@ stdcall ModifyMenuA(long long long long ptr)
+@ stdcall ModifyMenuW(long long long long ptr)
+@ stdcall MonitorFromPoint(double long)
+@ stdcall MonitorFromRect(ptr long)
+@ stdcall MonitorFromWindow(long long)
+@ stdcall MoveWindow(long long long long long long) NtUserMoveWindow
+@ stdcall MsgWaitForMultipleObjects(long ptr long long long)
+@ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long)
+@ stdcall NotifyWinEvent(long long long long)
+@ stdcall OemKeyScan(long)
+@ stdcall OemToCharA(ptr ptr)
+@ stdcall OemToCharBuffA(ptr ptr long)
+@ stdcall OemToCharBuffW(ptr ptr long)
+@ stdcall OemToCharW(ptr ptr)
+@ stdcall OffsetRect(ptr long long)
+@ stdcall OpenClipboard(long)
+@ stdcall OpenDesktopA(str long long long)
+@ stdcall OpenDesktopW(wstr long long long)
+@ stdcall OpenIcon(long)
+@ stdcall OpenInputDesktop(long long long) NtUserOpenInputDesktop
+@ stdcall OpenWindowStationA(str long long)
+@ stdcall OpenWindowStationW(wstr long long)
+@ stdcall PackDDElParam(long long long)
+@ stdcall PaintDesktop(long) NtUserPaintDesktop
+@ stdcall PaintMenuBar(long long long long long long) NtUserPaintMenuBar
+@ stdcall PeekMessageA(ptr long long long long)
+@ stdcall PeekMessageW(ptr long long long long)
+@ stdcall PostMessageA(long long long long)
+@ stdcall PostMessageW(long long long long)
+@ stdcall PostQuitMessage(long)
+@ stdcall PostThreadMessageA(long long long long)
+@ stdcall PostThreadMessageW(long long long long)
+@ stdcall PrintWindow(ptr ptr long) NtUserPrintWindow
+@ stdcall PrivateExtractIconExA(str long ptr ptr long)
+@ stdcall PrivateExtractIconExW(wstr long ptr ptr long)
+@ stdcall PrivateExtractIconsA(str long long long ptr ptr long long)
+@ stdcall PrivateExtractIconsW(wstr long long long ptr ptr long long)
# PrivateSetDbgTag
# PrivateSetRipFlags
-531 stdcall PtInRect(ptr double)
-532 stdcall QuerySendMessage(ptr) NtUserQuerySendMessage
-533 stdcall RealChildWindowFromPoint(long double) ; Direct call NtUserRealChildWindowFromPoint
-534 stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA
-535 stdcall RealGetWindowClassA(long ptr long)
-536 stdcall RealGetWindowClassW(long ptr long)
-537 stdcall ReasonCodeNeedsBugID(long)
-538 stdcall ReasonCodeNeedsComment(long)
-539 stdcall RecordShutdownReason(long)
-540 stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow
-541 stdcall RegisterClassA(ptr)
-542 stdcall RegisterClassExA(ptr)
-543 stdcall RegisterClassExW(ptr)
-544 stdcall RegisterClassW(ptr)
-545 stdcall RegisterClipboardFormatA(str)
-546 stdcall RegisterClipboardFormatW(wstr)
-547 stdcall RegisterDeviceNotificationA(long ptr long) RegisterDeviceNotificationW
-548 stdcall RegisterDeviceNotificationW(long ptr long)
-549 stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey
-550 stdcall RegisterLogonProcess(long long)
-551 stdcall RegisterMessagePumpHook(ptr)
-552 stdcall RegisterRawInputDevices(ptr long long)
-553 stdcall RegisterServicesProcess(long)
-554 stdcall RegisterShellHookWindow(long)
-555 stdcall RegisterSystemThread(long long)
-556 stdcall RegisterTasklist(long) NtUserRegisterTasklist
-557 stdcall RegisterUserApiHook(ptr)
-558 stdcall RegisterWindowMessageA(str)
-559 stdcall RegisterWindowMessageW(wstr)
-560 stdcall ReleaseCapture()
-561 stdcall ReleaseDC(long long)
-562 stdcall RemoveMenu(long long long) NtUserRemoveMenu
-563 stdcall RemovePropA(long str)
-564 stdcall RemovePropW(long wstr)
-565 stdcall ReplyMessage(long)
+@ stdcall PtInRect(ptr double)
+@ stdcall QuerySendMessage(ptr) NtUserQuerySendMessage
+@ stdcall RealChildWindowFromPoint(long double) ; Direct call NtUserRealChildWindowFromPoint
+@ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA
+@ stdcall RealGetWindowClassA(long ptr long)
+@ stdcall RealGetWindowClassW(long ptr long)
+@ stdcall ReasonCodeNeedsBugID(long)
+@ stdcall ReasonCodeNeedsComment(long)
+@ stdcall RecordShutdownReason(long)
+@ stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow
+@ stdcall RegisterClassA(ptr)
+@ stdcall RegisterClassExA(ptr)
+@ stdcall RegisterClassExW(ptr)
+@ stdcall RegisterClassW(ptr)
+@ stdcall RegisterClipboardFormatA(str)
+@ stdcall RegisterClipboardFormatW(wstr)
+@ stdcall RegisterDeviceNotificationA(long ptr long) RegisterDeviceNotificationW
+@ stdcall RegisterDeviceNotificationW(long ptr long)
+@ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey
+@ stdcall RegisterLogonProcess(long long)
+@ stdcall RegisterMessagePumpHook(ptr)
+@ stdcall RegisterRawInputDevices(ptr long long)
+@ stdcall RegisterServicesProcess(long)
+@ stdcall RegisterShellHookWindow(long)
+@ stdcall RegisterSystemThread(long long)
+@ stdcall RegisterTasklist(long) NtUserRegisterTasklist
+@ stdcall RegisterUserApiHook(ptr)
+@ stdcall RegisterWindowMessageA(str)
+@ stdcall RegisterWindowMessageW(wstr)
+@ stdcall ReleaseCapture()
+@ stdcall ReleaseDC(long long)
+@ stdcall RemoveMenu(long long long) NtUserRemoveMenu
+@ stdcall RemovePropA(long str)
+@ stdcall RemovePropW(long wstr)
+@ stdcall ReplyMessage(long)
# ResolveDesktopForWOW
-567 stdcall ReuseDDElParam(long long long long long)
-568 stdcall ScreenToClient(long ptr)
-569 stdcall ScrollChildren(long long long long)
-570 stdcall ScrollDC(long long long ptr ptr long ptr)
-571 stdcall ScrollWindow(long long long ptr ptr)
-572 stdcall ScrollWindowEx(long long long ptr ptr long ptr long)
-573 stdcall SendDlgItemMessageA(long long long long long)
-574 stdcall SendDlgItemMessageW(long long long long long)
-575 stdcall SendIMEMessageExA(long long)
-576 stdcall SendIMEMessageExW(long long)
-577 stdcall SendInput(long ptr long) NtUserSendInput
-578 stdcall SendMessageA(long long long long)
-579 stdcall SendMessageCallbackA(long long long long ptr long)
-580 stdcall SendMessageCallbackW(long long long long ptr long)
-581 stdcall SendMessageTimeoutA(long long long long long long ptr)
-582 stdcall SendMessageTimeoutW(long long long long long long ptr)
-583 stdcall SendMessageW(long long long long)
-584 stdcall SendNotifyMessageA(long long long long)
-585 stdcall SendNotifyMessageW(long long long long)
-586 stdcall SetActiveWindow(long) NtUserSetActiveWindow
-587 stdcall SetCapture(long) NtUserSetCapture
-588 stdcall SetCaretBlinkTime(long)
-589 stdcall SetCaretPos(long long)
-590 stdcall SetClassLongA(long long long)
+@ stdcall ReuseDDElParam(long long long long long)
+@ stdcall ScreenToClient(long ptr)
+@ stdcall ScrollChildren(long long long long)
+@ stdcall ScrollDC(long long long ptr ptr long ptr)
+@ stdcall ScrollWindow(long long long ptr ptr)
+@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long)
+@ stdcall SendDlgItemMessageA(long long long long long)
+@ stdcall SendDlgItemMessageW(long long long long long)
+@ stdcall SendIMEMessageExA(long long)
+@ stdcall SendIMEMessageExW(long long)
+@ stdcall SendInput(long ptr long) NtUserSendInput
+@ stdcall SendMessageA(long long long long)
+@ stdcall SendMessageCallbackA(long long long long ptr long)
+@ stdcall SendMessageCallbackW(long long long long ptr long)
+@ stdcall SendMessageTimeoutA(long long long long long long ptr)
+@ stdcall SendMessageTimeoutW(long long long long long long ptr)
+@ stdcall SendMessageW(long long long long)
+@ stdcall SendNotifyMessageA(long long long long)
+@ stdcall SendNotifyMessageW(long long long long)
+@ stdcall SetActiveWindow(long) NtUserSetActiveWindow
+@ stdcall SetCapture(long) NtUserSetCapture
+@ stdcall SetCaretBlinkTime(long)
+@ stdcall SetCaretPos(long long)
+@ stdcall SetClassLongA(long long long)
@ stdcall -arch=x86_64 SetClassLongPtrA(ptr long ptr)
@ stdcall -arch=x86_64 SetClassLongPtrW(ptr long ptr)
-591 stdcall SetClassLongW(long long long)
-592 stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord
-593 stdcall SetClipboardData(long long)
-594 stdcall SetClipboardViewer(long) NtUserSetClipboardViewer
-595 stdcall SetConsoleReserveKeys(long long) NtUserSetConsoleReserveKeys
-596 stdcall SetCursor(long) NtUserSetCursor
-597 stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents
-598 stdcall SetCursorPos(long long)
+@ stdcall SetClassLongW(long long long)
+@ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord
+@ stdcall SetClipboardData(long long)
+@ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer
+@ stdcall SetConsoleReserveKeys(long long) NtUserSetConsoleReserveKeys
+@ stdcall SetCursor(long) NtUserSetCursor
+@ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents
+@ stdcall SetCursorPos(long long)
# SetDbgTag
-600 stdcall SetDebugErrorLevel(long)
-601 stdcall SetDeskWallpaper(ptr)
-602 stdcall SetDlgItemInt(long long long long)
-603 stdcall SetDlgItemTextA(long long str)
-604 stdcall SetDlgItemTextW(long long wstr)
-605 stdcall SetDoubleClickTime(long)
-606 stdcall SetFocus(long) NtUserSetFocus
-607 stdcall SetForegroundWindow(long)
-608 stdcall SetInternalWindowPos(long long ptr ptr) NtUserSetInternalWindowPos
-609 stdcall SetKeyboardState(ptr) NtUserSetKeyboardState
-610 stdcall SetLastErrorEx(long long)
-611 stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes
-612 stdcall SetLogonNotifyWindow(long) ; Direct call NtUserSetLogonNotifyWindow
-613 stdcall SetMenu(long long)
-614 stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId
-615 stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem
-616 stdcall SetMenuInfo(long ptr)
-617 stdcall SetMenuItemBitmaps(long long long long long)
-618 stdcall SetMenuItemInfoA(long long long ptr)
-619 stdcall SetMenuItemInfoW(long long long ptr)
-620 stdcall SetMessageExtraInfo(long)
-621 stdcall SetMessageQueue(long)
-622 stdcall SetParent(long long) NtUserSetParent
-623 stdcall SetProcessDefaultLayout(long)
-624 stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation
-625 stdcall SetProgmanWindow (long)
-626 stdcall SetPropA(long str long)
-627 stdcall SetPropW(long wstr long)
-628 stdcall SetRect(ptr long long long long)
-629 stdcall SetRectEmpty(ptr)
+@ stdcall SetDebugErrorLevel(long)
+@ stdcall SetDeskWallpaper(ptr)
+@ stdcall SetDlgItemInt(long long long long)
+@ stdcall SetDlgItemTextA(long long str)
+@ stdcall SetDlgItemTextW(long long wstr)
+@ stdcall SetDoubleClickTime(long)
+@ stdcall SetFocus(long) NtUserSetFocus
+@ stdcall SetForegroundWindow(long)
+@ stdcall SetInternalWindowPos(long long ptr ptr) NtUserSetInternalWindowPos
+@ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState
+@ stdcall SetLastErrorEx(long long)
+@ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes
+@ stdcall SetLogonNotifyWindow(long) ; Direct call NtUserSetLogonNotifyWindow
+@ stdcall SetMenu(long long)
+@ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId
+@ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem
+@ stdcall SetMenuInfo(long ptr)
+@ stdcall SetMenuItemBitmaps(long long long long long)
+@ stdcall SetMenuItemInfoA(long long long ptr)
+@ stdcall SetMenuItemInfoW(long long long ptr)
+@ stdcall SetMessageExtraInfo(long)
+@ stdcall SetMessageQueue(long)
+@ stdcall SetParent(long long) NtUserSetParent
+@ stdcall SetProcessDefaultLayout(long)
+@ stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation
+@ stdcall SetProgmanWindow (long)
+@ stdcall SetPropA(long str long)
+@ stdcall SetPropW(long wstr long)
+@ stdcall SetRect(ptr long long long long)
+@ stdcall SetRectEmpty(ptr)
# SetRipFlags
-631 stdcall SetScrollInfo(long long ptr long) ; Direct call NtUserSetScrollInfo
-632 stdcall SetScrollPos(long long long long)
-633 stdcall SetScrollRange(long long long long long)
-634 stdcall SetShellWindow(long)
-635 stdcall SetShellWindowEx(long long) NtUserSetShellWindowEx
-636 stdcall SetSysColors(long ptr ptr)
-637 stdcall SetSysColorsTemp(ptr ptr long)
-638 stdcall SetSystemCursor(long long)
-639 stdcall SetSystemMenu(long long) ; NtUserSetSystemMenu
-640 stdcall SetSystemTimer(long long long ptr) NtUserSetSystemTimer
-641 stdcall SetTaskmanWindow (long)
-642 stdcall SetThreadDesktop(long) NtUserSetThreadDesktop
-643 stdcall SetTimer(long long long ptr) NtUserSetTimer
-644 stdcall SetUserObjectInformationA(long long ptr long) NtUserSetObjectInformation
-645 stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation
-646 stdcall SetUserObjectSecurity(long ptr ptr)
-647 stdcall SetWinEventHook(long long long ptr long long long)
-648 stdcall SetWindowContextHelpId(long long)
-649 stdcall SetWindowLongA(long long long)
+@ stdcall SetScrollInfo(long long ptr long) ; Direct call NtUserSetScrollInfo
+@ stdcall SetScrollPos(long long long long)
+@ stdcall SetScrollRange(long long long long long)
+@ stdcall SetShellWindow(long)
+@ stdcall SetShellWindowEx(long long) NtUserSetShellWindowEx
+@ stdcall SetSysColors(long ptr ptr)
+@ stdcall SetSysColorsTemp(ptr ptr long)
+@ stdcall SetSystemCursor(long long)
+@ stdcall SetSystemMenu(long long) ; NtUserSetSystemMenu
+@ stdcall SetSystemTimer(long long long ptr) NtUserSetSystemTimer
+@ stdcall SetTaskmanWindow (long)
+@ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop
+@ stdcall SetTimer(long long long ptr) NtUserSetTimer
+@ stdcall SetUserObjectInformationA(long long ptr long) NtUserSetObjectInformation
+@ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation
+@ stdcall SetUserObjectSecurity(long ptr ptr)
+@ stdcall SetWinEventHook(long long long ptr long long long)
+@ stdcall SetWindowContextHelpId(long long)
+@ stdcall SetWindowLongA(long long long)
@ stdcall -arch=x86_64,arm64 SetWindowLongPtrA(ptr long ptr)
@ stdcall -arch=x86_64,arm64 SetWindowLongPtrW(ptr long ptr)
-650 stdcall SetWindowLongW(long long long)
-651 stdcall SetWindowPlacement(long ptr) NtUserSetWindowPlacement
-652 stdcall SetWindowPos(long long long long long long long) NtUserSetWindowPos
-653 stdcall SetWindowRgn(long long long)
-654 stdcall SetWindowStationUser(long long long long)
-655 stdcall SetWindowTextA(long str)
-656 stdcall SetWindowTextW(long wstr)
-657 stdcall SetWindowWord(long long long) ; Direct call NtUserSetWindowWord
-658 stdcall SetWindowsHookA(long ptr)
-659 stdcall SetWindowsHookExA(long long long long)
-660 stdcall SetWindowsHookExW(long long long long)
-661 stdcall SetWindowsHookW(long ptr)
-662 stdcall ShowCaret(long) NtUserShowCaret
-663 stdcall ShowCursor(long)
-664 stdcall ShowOwnedPopups(long long)
-665 stdcall ShowScrollBar(long long long) NtUserShowScrollBar
-666 stdcall ShowStartGlass(long)
-667 stdcall ShowWindow(long long) NtUserShowWindow
-668 stdcall ShowWindowAsync(long long) NtUserShowWindowAsync
-669 stdcall SoftModalMessageBox(ptr)
-670 stdcall SubtractRect(ptr ptr ptr)
-671 stdcall SwapMouseButton(long)
-672 stdcall SwitchDesktop(long) NtUserSwitchDesktop
-673 stdcall SwitchToThisWindow(long long)
-674 stdcall SystemParametersInfoA(long long ptr long)
-675 stdcall SystemParametersInfoW(long long ptr long)
-676 stdcall TabbedTextOutA(long long long str long long ptr long)
-677 stdcall TabbedTextOutW(long long long wstr long long ptr long)
-678 stdcall TileChildWindows(long long)
-679 stdcall TileWindows(long long ptr long ptr)
-680 stdcall ToAscii(long long ptr ptr long)
-681 stdcall ToAsciiEx(long long ptr ptr long long)
-682 stdcall ToUnicode(long long ptr ptr long long)
-683 stdcall ToUnicodeEx(long long ptr ptr long long long)
-684 stdcall TrackMouseEvent(ptr) NtUserTrackMouseEvent
-685 stdcall TrackPopupMenu(long long long long long long ptr)
-686 stdcall TrackPopupMenuEx(long long long long long ptr) NtUserTrackPopupMenuEx
-687 stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorA
-688 stdcall TranslateAcceleratorA(long long ptr)
-689 stdcall TranslateAcceleratorW(long long ptr)
-690 stdcall TranslateMDISysAccel(long ptr)
-691 stdcall TranslateMessage(ptr)
-692 stdcall TranslateMessageEx(ptr long)
-693 stdcall UnhookWinEvent(long) NtUserUnhookWinEvent
-694 stdcall UnhookWindowsHook(long ptr)
-695 stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx
-696 stdcall UnionRect(ptr ptr ptr)
-697 stdcall UnloadKeyboardLayout(ptr)
-698 stdcall UnlockWindowStation(long) NtUserUnlockWindowStation
-699 stdcall UnpackDDElParam(long long ptr ptr)
-700 stdcall UnregisterClassA(str long)
-701 stdcall UnregisterClassW(wstr long)
-702 stdcall UnregisterDeviceNotification(long)
-703 stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey
-704 stdcall UnregisterMessagePumpHook()
-705 stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook
-706 stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long)
-707 stdcall UpdateLayeredWindowIndirect(long ptr)
-708 stdcall UpdatePerUserSystemParameters(long long)
-709 stdcall UpdateWindow(long)
-710 stdcall User32InitializeImmEntryTable(ptr)
-711 stdcall UserClientDllInitialize(ptr long ptr) DllMain
-712 stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess
-713 stdcall UserLpkPSMTextOut(long long long wstr long long)
-714 stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long)
-715 stdcall UserRealizePalette(long)
-716 stdcall UserRegisterWowHandlers(ptr ptr)
+@ stdcall SetWindowLongW(long long long)
+@ stdcall SetWindowPlacement(long ptr) NtUserSetWindowPlacement
+@ stdcall SetWindowPos(long long long long long long long) NtUserSetWindowPos
+@ stdcall SetWindowRgn(long long long)
+@ stdcall SetWindowStationUser(long long long long)
+@ stdcall SetWindowTextA(long str)
+@ stdcall SetWindowTextW(long wstr)
+@ stdcall SetWindowWord(long long long) ; Direct call NtUserSetWindowWord
+@ stdcall SetWindowsHookA(long ptr)
+@ stdcall SetWindowsHookExA(long long long long)
+@ stdcall SetWindowsHookExW(long long long long)
+@ stdcall SetWindowsHookW(long ptr)
+@ stdcall ShowCaret(long) NtUserShowCaret
+@ stdcall ShowCursor(long)
+@ stdcall ShowOwnedPopups(long long)
+@ stdcall ShowScrollBar(long long long) NtUserShowScrollBar
+@ stdcall ShowStartGlass(long)
+@ stdcall ShowWindow(long long) NtUserShowWindow
+@ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync
+@ stdcall SoftModalMessageBox(ptr)
+@ stdcall SubtractRect(ptr ptr ptr)
+@ stdcall SwapMouseButton(long)
+@ stdcall SwitchDesktop(long) NtUserSwitchDesktop
+@ stdcall SwitchToThisWindow(long long)
+@ stdcall SystemParametersInfoA(long long ptr long)
+@ stdcall SystemParametersInfoW(long long ptr long)
+@ stdcall TabbedTextOutA(long long long str long long ptr long)
+@ stdcall TabbedTextOutW(long long long wstr long long ptr long)
+@ stdcall TileChildWindows(long long)
+@ stdcall TileWindows(long long ptr long ptr)
+@ stdcall ToAscii(long long ptr ptr long)
+@ stdcall ToAsciiEx(long long ptr ptr long long)
+@ stdcall ToUnicode(long long ptr ptr long long)
+@ stdcall ToUnicodeEx(long long ptr ptr long long long)
+@ stdcall TrackMouseEvent(ptr) NtUserTrackMouseEvent
+@ stdcall TrackPopupMenu(long long long long long long ptr)
+@ stdcall TrackPopupMenuEx(long long long long long ptr) NtUserTrackPopupMenuEx
+@ stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorA
+@ stdcall TranslateAcceleratorA(long long ptr)
+@ stdcall TranslateAcceleratorW(long long ptr)
+@ stdcall TranslateMDISysAccel(long ptr)
+@ stdcall TranslateMessage(ptr)
+@ stdcall TranslateMessageEx(ptr long)
+@ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent
+@ stdcall UnhookWindowsHook(long ptr)
+@ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx
+@ stdcall UnionRect(ptr ptr ptr)
+@ stdcall UnloadKeyboardLayout(ptr)
+@ stdcall UnlockWindowStation(long) NtUserUnlockWindowStation
+@ stdcall UnpackDDElParam(long long ptr ptr)
+@ stdcall UnregisterClassA(str long)
+@ stdcall UnregisterClassW(wstr long)
+@ stdcall UnregisterDeviceNotification(long)
+@ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey
+@ stdcall UnregisterMessagePumpHook()
+@ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook
+@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long)
+@ stdcall UpdateLayeredWindowIndirect(long ptr)
+@ stdcall UpdatePerUserSystemParameters(long long)
+@ stdcall UpdateWindow(long)
+@ stdcall User32InitializeImmEntryTable(ptr)
+@ stdcall UserClientDllInitialize(ptr long ptr) DllMain
+@ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess
+@ stdcall UserLpkPSMTextOut(long long long wstr long long)
+@ stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long)
+@ stdcall UserRealizePalette(long)
+@ stdcall UserRegisterWowHandlers(ptr ptr)
# VRipOutput
# VTagOutput
-719 stdcall ValidateRect(long ptr) NtUserValidateRect
-720 stdcall ValidateRgn(long long)
-721 stdcall VkKeyScanA(long)
-722 stdcall VkKeyScanExA(long long)
-723 stdcall VkKeyScanExW(long long)
-724 stdcall VkKeyScanW(long)
-725 stdcall WCSToMBEx(long wstr long str long long)
-726 stdcall WINNLSEnableIME(long long)
-727 stdcall WINNLSGetEnableStatus(long)
-728 stdcall WINNLSGetIMEHotkey(long)
-729 stdcall WaitForInputIdle(long long)
-730 stdcall WaitMessage() NtUserWaitMessage
-731 stdcall Win32PoolAllocationStats(long long long long long)
-732 stdcall WinHelpA(long str long long)
-733 stdcall WinHelpW(long wstr long long)
-734 stdcall WindowFromDC(long)
-735 stdcall WindowFromPoint(double)
-736 stdcall keybd_event(long long long long)
-737 stdcall mouse_event(long long long long long)
-738 varargs wsprintfA(ptr str)
-739 varargs wsprintfW(ptr wstr)
-740 stdcall wvsprintfA(ptr str ptr)
-741 stdcall wvsprintfW(ptr wstr ptr)
+@ stdcall ValidateRect(long ptr) NtUserValidateRect
+@ stdcall ValidateRgn(long long)
+@ stdcall VkKeyScanA(long)
+@ stdcall VkKeyScanExA(long long)
+@ stdcall VkKeyScanExW(long long)
+@ stdcall VkKeyScanW(long)
+@ stdcall WCSToMBEx(long wstr long str long long)
+@ stdcall WINNLSEnableIME(long long)
+@ stdcall WINNLSGetEnableStatus(long)
+@ stdcall WINNLSGetIMEHotkey(long)
+@ stdcall WaitForInputIdle(long long)
+@ stdcall WaitMessage() NtUserWaitMessage
+@ stdcall Win32PoolAllocationStats(long long long long long)
+@ stdcall WinHelpA(long str long long)
+@ stdcall WinHelpW(long wstr long long)
+@ stdcall WindowFromDC(long)
+@ stdcall WindowFromPoint(double)
+@ stdcall keybd_event(long long long long)
+@ stdcall mouse_event(long long long long long)
+@ varargs wsprintfA(ptr str)
+@ varargs wsprintfW(ptr wstr)
+@ stdcall wvsprintfA(ptr str ptr)
+@ stdcall wvsprintfW(ptr wstr ptr)
1
0