Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 01/01: [SHELL32] Initial implement SHLimitInputEdit (#2323)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6ed215eef9727d0bd061… commit c6ed215eef9727d0bd0617f3cf21d7e255b19c6f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 10 15:57:30 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 10 15:57:30 2020 +0900 [SHELL32] Initial implement SHLimitInputEdit (#2323) Popup balloon window is not implemented yet. CORE-11701 --- dll/win32/shell32/stubs.cpp | 11 --- dll/win32/shell32/wine/shellord.c | 180 +++++++++++++++++++++++++++++++++++++- 2 files changed, 179 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 1c7996df8a9..3be6d2ec3b5 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -36,17 +36,6 @@ SHFindComputer(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) return FALSE; } -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHLimitInputEdit(HWND hWnd, IShellFolder *psf) -{ - FIXME("SHLimitInputEdit() stub\n"); - return S_FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index a8bdab0e62c..f63e0b1a59a 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -2147,4 +2147,182 @@ SHTestTokenMembership(HANDLE TokenHandle, ULONG ulRID) BOOL WINAPI IsUserAnAdmin(VOID) { return SHTestTokenMembership(NULL, DOMAIN_ALIAS_RID_ADMINS); -} \ No newline at end of file +} + +/************************************************************************* + * SHLimitInputEdit(SHELL32.@) + */ + +/* TODO: Show baloon popup window using SetWindowRgn */ + +typedef struct UxSubclassInfo +{ + HWND hwnd; + WNDPROC fnWndProc; + LPWSTR pwszValidChars; + LPWSTR pwszInvalidChars; +} UxSubclassInfo; + +static void +UxSubclassInfo_Destroy(UxSubclassInfo *pInfo) +{ + if (!pInfo) + return; + + RemovePropW(pInfo->hwnd, L"UxSubclassInfo"); + + CoTaskMemFree(pInfo->pwszValidChars); + CoTaskMemFree(pInfo->pwszInvalidChars); + + SetWindowLongPtr(pInfo->hwnd, GWLP_WNDPROC, (LONG_PTR)pInfo->fnWndProc); + + HeapFree(GetProcessHeap(), 0, pInfo); +} + +static LRESULT CALLBACK +LimitEditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + WNDPROC fnWndProc; + UxSubclassInfo *pInfo = GetPropW(hwnd, L"UxSubclassInfo"); + if (!pInfo) + return DefWindowProc(hwnd, uMsg, wParam, lParam); + + fnWndProc = pInfo->fnWndProc; + + switch (uMsg) + { + case WM_CHAR: + { + if (pInfo->pwszInvalidChars) + { + if (wcschr(pInfo->pwszInvalidChars, (WCHAR)wParam) != NULL) + { + MessageBeep(0xFFFFFFFF); + break; + } + } + else if (pInfo->pwszValidChars) + { + if (wcschr(pInfo->pwszValidChars, (WCHAR)wParam) == NULL) + { + MessageBeep(0xFFFFFFFF); + break; + } + } + return fnWndProc(hwnd, uMsg, wParam, lParam); + } + + case WM_IME_CHAR: + { + WCHAR wch = (WCHAR)wParam; + if (!IsWindowUnicode(hwnd) && HIBYTE(wch) != 0) + { + CHAR data[] = {HIBYTE(wch), LOBYTE(wch)}; + MultiByteToWideChar(CP_ACP, 0, data, 2, &wch, 1); + } + + if (pInfo->pwszInvalidChars) + { + if (wcschr(pInfo->pwszInvalidChars, wch) != NULL) + { + MessageBeep(0xFFFFFFFF); + break; + } + } + else if (pInfo->pwszValidChars) + { + if (wcschr(pInfo->pwszValidChars, wch) == NULL) + { + MessageBeep(0xFFFFFFFF); + break; + } + } + return fnWndProc(hwnd, uMsg, wParam, lParam); + } + + case WM_NCDESTROY: + { + UxSubclassInfo_Destroy(pInfo); + return fnWndProc(hwnd, uMsg, wParam, lParam); + } + + default: + return fnWndProc(hwnd, uMsg, wParam, lParam); + } + + return 0; +} + +static UxSubclassInfo * +UxSubclassInfo_Create(HWND hwnd, LPWSTR valid, LPWSTR invalid) +{ + UxSubclassInfo *pInfo; + pInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(UxSubclassInfo)); + if (!pInfo) + { + ERR("HeapAlloc failed.\n"); + CoTaskMemFree(valid); + CoTaskMemFree(invalid); + return NULL; + } + + pInfo->fnWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)LimitEditWindowProc); + if (!pInfo->fnWndProc) + { + ERR("SetWindowLongPtr failed\n"); + CoTaskMemFree(valid); + CoTaskMemFree(invalid); + HeapFree(GetProcessHeap(), 0, pInfo); + return NULL; + } + + pInfo->hwnd = hwnd; + pInfo->pwszValidChars = valid; + pInfo->pwszInvalidChars = invalid; + if (!SetPropW(hwnd, L"UxSubclassInfo", pInfo)) + { + UxSubclassInfo_Destroy(pInfo); + pInfo = NULL; + } + return pInfo; +} + +HRESULT WINAPI +SHLimitInputEdit(HWND hWnd, IShellFolder *psf) +{ + IItemNameLimits *pLimits; + HRESULT hr; + LPWSTR pwszValidChars, pwszInvalidChars; + UxSubclassInfo *pInfo; + + pInfo = GetPropW(hWnd, L"UxSubclassInfo"); + if (pInfo) + { + UxSubclassInfo_Destroy(pInfo); + pInfo = NULL; + } + + hr = psf->lpVtbl->QueryInterface(psf, &IID_IItemNameLimits, (LPVOID *)&pLimits); + if (FAILED(hr)) + { + ERR("hr: %x\n", hr); + return hr; + } + + pwszValidChars = pwszInvalidChars = NULL; + hr = pLimits->lpVtbl->GetValidCharacters(pLimits, &pwszValidChars, &pwszInvalidChars); + if (FAILED(hr)) + { + ERR("hr: %x\n", hr); + pLimits->lpVtbl->Release(pLimits); + return hr; + } + + pInfo = UxSubclassInfo_Create(hWnd, pwszValidChars, pwszInvalidChars); + if (!pInfo) + hr = E_FAIL; + + pLimits->lpVtbl->Release(pLimits); + + return hr; +}

4 years, 10 months

[reactos] 01/01: [SHELL32][SYSSETUP] Add Product Options page to ReactOS Setup (#2315)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48160c74b724395105b14… commit 48160c74b724395105b14958d0b3bf4ff4487e14 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 10 11:10:42 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 10 11:10:42 2020 +0900 [SHELL32][SYSSETUP] Add Product Options page to ReactOS Setup (#2315) - Add "Product Options" wizard page into ReactOS Setup. - Implement CSIDL_Type_InMyDocuments CSIDL type. - If the product type is workstation, then some special folders will be in My Documents. CORE-13795 --- dll/win32/shell32/wine/shellpath.c | 111 ++++++++++++++++- dll/win32/syssetup/lang/bg-BG.rc | 28 +++++ dll/win32/syssetup/lang/cs-CZ.rc | 28 +++++ dll/win32/syssetup/lang/da-DK.rc | 28 +++++ dll/win32/syssetup/lang/de-DE.rc | 28 +++++ dll/win32/syssetup/lang/el-GR.rc | 29 +++++ dll/win32/syssetup/lang/en-US.rc | 28 +++++ dll/win32/syssetup/lang/es-ES.rc | 28 +++++ dll/win32/syssetup/lang/et-EE.rc | 28 +++++ dll/win32/syssetup/lang/fi-FI.rc | 28 +++++ dll/win32/syssetup/lang/fr-FR.rc | 28 +++++ dll/win32/syssetup/lang/he-IL.rc | 28 +++++ dll/win32/syssetup/lang/hi-IN.rc | 28 +++++ dll/win32/syssetup/lang/hu-HU.rc | 28 +++++ dll/win32/syssetup/lang/id-ID.rc | 28 +++++ dll/win32/syssetup/lang/it-IT.rc | 28 +++++ dll/win32/syssetup/lang/ja-JP.rc | 28 +++++ dll/win32/syssetup/lang/lt-LT.rc | 28 +++++ dll/win32/syssetup/lang/nl-NL.rc | 28 +++++ dll/win32/syssetup/lang/no-NO.rc | 28 +++++ dll/win32/syssetup/lang/pl-PL.rc | 28 +++++ dll/win32/syssetup/lang/pt-BR.rc | 28 +++++ dll/win32/syssetup/lang/pt-PT.rc | 28 +++++ dll/win32/syssetup/lang/ro-RO.rc | 28 +++++ dll/win32/syssetup/lang/ru-RU.rc | 28 +++++ dll/win32/syssetup/lang/sk-SK.rc | 28 +++++ dll/win32/syssetup/lang/sq-AL.rc | 28 +++++ dll/win32/syssetup/lang/sv-SE.rc | 28 +++++ dll/win32/syssetup/lang/th-TH.rc | 28 +++++ dll/win32/syssetup/lang/tr-TR.rc | 28 +++++ dll/win32/syssetup/lang/uk-UA.rc | 28 +++++ dll/win32/syssetup/lang/zh-CN.rc | 28 +++++ dll/win32/syssetup/lang/zh-TW.rc | 28 +++++ dll/win32/syssetup/resource.h | 14 +++ dll/win32/syssetup/wizard.c | 175 ++++++++++++++++++++++++++- sdk/include/reactos/libs/syssetup/syssetup.h | 8 ++ 36 files changed, 1203 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 9ca628f4bbe..5bf0c98e617 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -3,7 +3,7 @@ * * Copyright 1998, 1999, 2000 Juergen Schmied * Copyright 2004 Juan Lang - * Copyright 2018-2019 Katayama Hirofumi MZ + * Copyright 2018-2020 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 @@ -54,6 +54,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); static const BOOL is_win64 = sizeof(void *) > sizeof(int); +#ifdef __REACTOS__ +/* FIXME: Remove this */ +typedef enum _NT_PRODUCT_TYPE +{ + NtProductWinNt = 1, + NtProductLanManNt, + NtProductServer +} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; + +/* FIXME: We cannot refresh the RtlGetNtProductType value before reboot. */ +static BOOL +DoGetProductType(PNT_PRODUCT_TYPE ProductType) +{ + static const WCHAR ProductOptions[] = L"System\\CurrentControlSet\\Control\\ProductOptions"; + HKEY hKey; + LONG error; + WCHAR szValue[32]; + DWORD cbValue; + static DWORD s_dwProductType = 0; + + if (s_dwProductType != 0) + { + *ProductType = s_dwProductType; + return TRUE; + } + + *ProductType = NtProductServer; + + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProductOptions, 0, KEY_READ, &hKey); + if (error) + return FALSE; + + cbValue = sizeof(szValue); + error = RegQueryValueExW(hKey, L"ProductType", NULL, NULL, (LPBYTE)szValue, &cbValue); + if (!error) + { + if (lstrcmpW(szValue, L"WinNT") == 0) + *ProductType = NtProductWinNt; + } + + s_dwProductType = *ProductType; + + RegCloseKey(hKey); + return TRUE; +} +#endif /* ########## Combining and Constructing paths ########## */ @@ -648,6 +694,9 @@ static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { CSIDL_Type_User, +#ifdef __REACTOS__ + CSIDL_Type_InMyDocuments, +#endif CSIDL_Type_AllUsers, CSIDL_Type_CurrVer, CSIDL_Type_Disallowed, @@ -767,14 +816,22 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x0d - CSIDL_MYMUSIC */ &FOLDERID_Music, +#ifdef __REACTOS__ + CSIDL_Type_InMyDocuments, +#else CSIDL_Type_User, +#endif My_MusicW, MAKEINTRESOURCEW(IDS_MYMUSIC), -IDI_SHELL_MY_MUSIC }, { /* 0x0e - CSIDL_MYVIDEO */ &FOLDERID_Videos, +#ifdef __REACTOS__ + CSIDL_Type_InMyDocuments, +#else CSIDL_Type_User, +#endif My_VideoW, MAKEINTRESOURCEW(IDS_MYVIDEO), -IDI_SHELL_MY_MOVIES @@ -938,7 +995,11 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x27 - CSIDL_MYPICTURES */ &FOLDERID_Pictures, +#ifdef __REACTOS__ + CSIDL_Type_InMyDocuments, +#else CSIDL_Type_User, +#endif My_PicturesW, MAKEINTRESOURCEW(IDS_MYPICTURES), -IDI_SHELL_MY_PICTURES @@ -1142,7 +1203,11 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x47 - CSIDL_DOWNLOADS */ &FOLDERID_Downloads, +#ifdef __REACTOS__ + CSIDL_Type_InMyDocuments, +#else CSIDL_Type_User, +#endif NULL, DownloadsW }, @@ -1549,6 +1614,9 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) { HRESULT hr; WCHAR resourcePath[MAX_PATH]; +#ifdef __REACTOS__ + NT_PRODUCT_TYPE ProductType; +#endif TRACE("0x%02x,%p\n", folder, pszPath); @@ -1589,6 +1657,26 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) case CSIDL_Type_User: strcpyW(pszPath, UserProfileW); break; +#ifdef __REACTOS__ + case CSIDL_Type_InMyDocuments: + strcpyW(pszPath, UserProfileW); + if (DoGetProductType(&ProductType) && ProductType == NtProductWinNt) + { + if (IS_INTRESOURCE(CSIDL_Data[CSIDL_MYDOCUMENTS].szDefaultPath)) + { + WCHAR szItem[MAX_PATH]; + LoadStringW(shell32_hInstance, + LOWORD(CSIDL_Data[CSIDL_MYDOCUMENTS].szDefaultPath), + szItem, ARRAY_SIZE(szItem)); + PathAppendW(pszPath, szItem); + } + else + { + PathAppendW(pszPath, CSIDL_Data[CSIDL_MYDOCUMENTS].szDefaultPath); + } + } + break; +#endif case CSIDL_Type_AllUsers: #ifndef __REACTOS__ strcpyW(pszPath, PublicProfileW); @@ -1756,8 +1844,15 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; +#ifdef __REACTOS__ + if (CSIDL_Data[folder].type != CSIDL_Type_User && + CSIDL_Data[folder].type != CSIDL_Type_InMyDocuments) +#else if (CSIDL_Data[folder].type != CSIDL_Type_User) +#endif + { return E_INVALIDARG; + } if (!pszPath) return E_INVALIDARG; @@ -2222,6 +2317,9 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( hr = _SHGetCurrentVersionPath(dwFlags, folder, szTemp); break; case CSIDL_Type_User: +#ifdef __REACTOS__ + case CSIDL_Type_InMyDocuments: +#endif hr = _SHGetUserProfilePath(hToken, dwFlags, folder, szTemp); break; case CSIDL_Type_AllUsers: @@ -2387,7 +2485,13 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, /* For CSIDL_Type_User we also use the GUID if no szValueName is provided */ szValueName = CSIDL_Data[folders[i]].szValueName; +#ifdef __REACTOS__ + if (!szValueName && + (CSIDL_Data[folders[i]].type == CSIDL_Type_User || + CSIDL_Data[folders[i]].type == CSIDL_Type_InMyDocuments)) +#else if (!szValueName && CSIDL_Data[folders[i]].type == CSIDL_Type_User) +#endif { StringFromGUID2( CSIDL_Data[folders[i]].id, buffer, 39 ); szValueName = &buffer[0]; @@ -2403,7 +2507,12 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, else { *path = '\0'; +#ifdef __REACTOS__ + if (CSIDL_Data[folders[i]].type == CSIDL_Type_User || + CSIDL_Data[folders[i]].type == CSIDL_Type_InMyDocuments) +#else if (CSIDL_Data[folders[i]].type == CSIDL_Type_User) +#endif _SHGetUserProfilePath(hToken, SHGFP_TYPE_CURRENT, folders[i], path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index b5022a60af3..7085c419204 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Натиснете „Напред“ за продължаване на настройката.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройка на РеактОС" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 99a4505e586..1b2852bf952 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -28,6 +28,24 @@ BEGIN LTEXT "Kliknutím na Další pokračujte v instalaci.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Instalátor" @@ -230,3 +248,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 44678b4e1d9..39fd84a4d29 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 22f6486d0ae..494f16a19df 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Klicken Sie auf Weiter, um mit der Einrichtung fortzufahren.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS-Installation" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 5754105de1a..2c049b8e793 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Πατήστε το κουμπί 'Επόμενο' για να συνεχίσετε.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εγκατάσταση του ReactOS" @@ -222,4 +240,15 @@ BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" IDS_LUNAR "Lunar" + IDS_MIZU "Mizu" +END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index bd37f8f4ad2..2414e315d11 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -244,3 +262,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 3a83a1870f8..90abbfed4ef 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -30,6 +30,24 @@ BEGIN LTEXT "Pulse Siguiente para continuar con la instalación.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de ReactOS" @@ -232,3 +250,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index e5a3c41a6ef..f88511359bc 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Vajuta Edasi paigaldamise jätkamiseks.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS'i paigaldus" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 1c132723381..a1c5f140666 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 1050e7e2aab..04171476ba9 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Cliquez sur Suivant pour continuer l'installation.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 351bb266ac5..e1076999634 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "לחץ על הבא כדי להמשיך עם ההתקנה", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "התקנת ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index aca7e2365fd..c7d9da274bb 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -29,6 +29,24 @@ BEGIN LTEXT "सेटअप के साथ जारी रखने के लिए अगला क्लिक करें।", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "रिऐक्ट ओएस सेटअप" @@ -232,3 +250,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index efef37f952d..362d203bb78 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Kattintson a Tovább gombra a folytatáshoz.", IDC_STATIC, 15, 136, 170, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS telepítő" @@ -223,3 +241,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 89269861501..aef4e7ce0e1 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Klik Lanjut untuk melanjutkan Penyetelan.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Penyetelan ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index c30141ca067..333044dc9a5 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Selezionare Avanti per proseguire con la configurazione.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installazione di ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 6d1581d80c6..9984cff78ee 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "セットアップを続行するには [次へ] をクリックして下さい。", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS セットアップ" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index ef56bcff3be..0307968d8ba 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 3a4ccc69d0b..01f6bb3b858 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Klik op Volgende om voort te gaan met de installatie.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index d3b30cb7d01..bd436c889a7 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Klikk Neste for å fortsette installasjonen.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS installasjon" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 7646291ae48..4b8013bd391 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Kliknij Dalej, by kontynuować.", IDC_STATIC, 15, 135, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator systemu ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 9b065c57f40..7b79334b32a 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Clique Avançar para continuar com a instalação.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index be85577b0a4..71b3c00a849 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -22,6 +22,24 @@ BEGIN LTEXT "Clique Avançar para continuar com a instalação.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" @@ -224,3 +242,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 4a0369ea026..4c8f51e1711 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -31,6 +31,24 @@ BEGIN LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Asistent de instalare ReactOS" @@ -233,3 +251,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 4b3d7f3e4ca..3c2d9d18864 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -24,6 +24,24 @@ BEGIN LTEXT "Нажмите ""Далее"" для продолжения установки.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Установка ReactOS" @@ -226,3 +244,13 @@ BEGIN IDS_LUNAR "Тема ""Lunar""" IDS_MIZU "Тема ""Mizu""" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index a85cae8db79..12f30a74604 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -28,6 +28,24 @@ BEGIN LTEXT "Kliknutím na Ďalej pokračujte v inštalácii.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inštalátor systému ReactOS" @@ -230,3 +248,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index dd71148eb36..d34e7d26a9c 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Klikoni Tjetër për të vazhduar me Ndërtimin.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ndërto ReactOS" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 430050a31f5..1cdc8880559 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 6ef8cbdf87d..1194b0d55cf 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -41,6 +41,24 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -243,3 +261,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index fe7e29b9fcf..7f4a8fd1eca 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -24,6 +24,24 @@ BEGIN LTEXT "Kur'la sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kur" @@ -226,3 +244,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index e416c4748c6..596e176a786 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -30,6 +30,24 @@ BEGIN LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Встановлення ReactOS" @@ -232,3 +250,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index afb83e0650d..e2efd6d9705 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -24,6 +24,24 @@ BEGIN LTEXT "请单击“下一步”继续安装。", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安装程序 " @@ -229,3 +247,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index ce4b0ad1080..156c9ed33a9 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -44,6 +44,24 @@ BEGIN LTEXT "按 [下一步] 繼續安裝程式。", IDC_STATIC, 15, 136, 195, 17 END +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Setup" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 + EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 + EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL + LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" @@ -251,3 +269,13 @@ BEGIN IDS_LUNAR "Lunar" IDS_MIZU "Mizu" END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Product Options" + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." +END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index f38658476a4..469c22e3fad 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -88,6 +88,13 @@ #define IDC_PS2MOUSEFASTINIT 2305 #define IDC_PS2MOUSEDEFAULTS 2306 +#define IDD_PRODUCT 2400 +#define IDC_PRODUCT_ICON 2401 +#define IDC_PRODUCT_OPTIONS 2402 +#define IDC_PRODUCT_SUITE 2403 +#define IDC_PRODUCT_TYPE 2404 +#define IDC_PRODUCT_DESCRIPTION 2405 + #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 @@ -146,4 +153,11 @@ #define IDS_LUNAR 3802 #define IDS_MIZU 3803 +#define IDS_PRODUCTTITLE 3900 +#define IDS_PRODUCTSUBTITLE 3901 +#define IDS_PRODUCTSERVERNAME 3902 +#define IDS_PRODUCTWORKSTATIONNAME 3903 +#define IDS_PRODUCTSERVERINFO 3904 +#define IDS_PRODUCTWORKSTATIONINFO 3905 + #define IDR_GPL 4000 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index d3aaf7c71f3..ba2403e6667 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -355,11 +355,176 @@ AckPageDlgProc(HWND hwndDlg, PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (pSetupData->UnattendSetup) { + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_PRODUCT); + return TRUE; + } + break; + + case PSN_WIZBACK: + pSetupData->UnattendSetup = FALSE; + break; + + default: + break; + } + } + break; + + default: + break; + } + + return FALSE; +} + +static BOOL +DoWriteProductOption(PRODUCT_OPTION nOption) +{ + static const WCHAR s_szProductOptions[] = L"System\\CurrentControlSet\\Control\\ProductOptions"; + HKEY hKey; + LONG error; + LPCWSTR pData; + DWORD cbData; + + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szProductOptions, 0, KEY_WRITE, &hKey); + if (error) + return FALSE; + + switch (nOption) + { + case PRODUCT_OPTION_SERVER: + /* write ProductSuite */ + pData = L"Terminal Server\0"; + cbData = sizeof(L"Terminal Server\0"); + error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); + if (error) + break; + + /* write ProductType */ + pData = L"ServerNT"; + cbData = sizeof(L"ServerNT"); + error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); + break; + + case PRODUCT_OPTION_WORKSTATION: + /* write ProductSuite */ + pData = L"\0"; + cbData = sizeof(L"\0"); + error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); + if (error) + break; + + /* write ProductType */ + pData = L"WinNT"; + cbData = sizeof(L"WinNT"); + error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); + break; + } + + RegCloseKey(hKey); + return error == ERROR_SUCCESS; +} + +static void +OnChooseServer(HWND hwndDlg) +{ + WCHAR szText[256]; + + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L"Terminal Server"); + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"ServerNT"); + + LoadStringW(hDllInstance, IDS_PRODUCTSERVERINFO, szText, _countof(szText)); + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); +} + +static void +OnChooseWorkstation(HWND hwndDlg) +{ + WCHAR szText[256]; + + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L""); + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"WinNT"); + + LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONINFO, szText, _countof(szText)); + SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); +} + +static INT_PTR CALLBACK +ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LPNMHDR lpnm; + PSETUPDATA pSetupData; + INT iItem; + WCHAR szText[64]; + HICON hIcon; + + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + + LoadStringW(hDllInstance, IDS_PRODUCTSERVERNAME, szText, _countof(szText)); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); + + LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONNAME, szText, _countof(szText)); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); + + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_SERVER, 0); + OnChooseServer(hwndDlg); + + hIcon = LoadIcon(NULL, IDI_WINLOGO); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_ICON, STM_SETICON, (WPARAM)hIcon, 0); + return TRUE; + } + + case WM_COMMAND: + if (HIWORD(wParam) == CBN_SELCHANGE && IDC_PRODUCT_OPTIONS == LOWORD(wParam)) + { + iItem = SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_GETCURSEL, 0, 0); + switch ((PRODUCT_OPTION)iItem) + { + case PRODUCT_OPTION_SERVER: + OnChooseServer(hwndDlg); + break; + + case PRODUCT_OPTION_WORKSTATION: + OnChooseWorkstation(hwndDlg); + break; + + default: + break; + } + } + break; + + case WM_NOTIFY: + { + lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the Back and Next buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (pSetupData->UnattendSetup) + { + pSetupData->ProductOption = PRODUCT_OPTION_SERVER; + DoWriteProductOption(pSetupData->ProductOption); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_LOCALEPAGE); return TRUE; } break; + case PSN_WIZNEXT: + iItem = SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_GETCURSEL, 0, 0); + pSetupData->ProductOption = (PRODUCT_OPTION)iItem; + DoWriteProductOption(pSetupData->ProductOption); + break; + case PSN_WIZBACK: pSetupData->UnattendSetup = FALSE; break; @@ -2670,7 +2835,7 @@ InstallWizard(VOID) PSETUPDATA pSetupData = NULL; HMODULE hNetShell = NULL; PFNREQUESTWIZARDPAGES pfn = NULL; - DWORD dwPageCount = 9, dwNetworkPageCount = 0; + DWORD dwPageCount = 10, dwNetworkPageCount = 0; LogItem(L"BEGIN_SECTION", L"InstallWizard"); @@ -2737,6 +2902,14 @@ InstallWizard(VOID) psp.pfnDlgProc = AckPageDlgProc; phpage[nPages++] = CreatePropertySheetPage(&psp); + /* Create the Product page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PRODUCTTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PRODUCTSUBTITLE); + psp.pszTemplate = MAKEINTRESOURCE(IDD_PRODUCT); + psp.pfnDlgProc = ProductPageDlgProc; + phpage[nPages++] = CreatePropertySheetPage(&psp); + /* Create the Locale page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LOCALETITLE); diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index ddd7bce85b0..d22ad08ac79 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -44,6 +44,12 @@ typedef struct _TIMEZONE_ENTRY ULONG Index; } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; +typedef enum _PRODUCT_OPTION +{ + PRODUCT_OPTION_SERVER, + PRODUCT_OPTION_WORKSTATION +} PRODUCT_OPTION, *PPRODUCT_OPTION; + /* Private Setup data shared between syssetup.dll and netshell.dll */ typedef struct _SETUPDATA { @@ -71,6 +77,8 @@ typedef struct _SETUPDATA UINT uFirstNetworkWizardPage; UINT uPostNetworkWizardPage; + + PRODUCT_OPTION ProductOption; } SETUPDATA, *PSETUPDATA;

4 years, 10 months

[reactos] 02/02: [LIBJPEG] Update to version 9d. CORE-16686

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d5741919d7def3f2bb9a… commit 1d5741919d7def3f2bb9aff0568c5c130f99a381 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 9 21:15:50 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 9 21:23:33 2020 +0100 [LIBJPEG] Update to version 9d. CORE-16686 --- dll/3rdparty/libjpeg/README | 19 +- dll/3rdparty/libjpeg/change.log | 49 ++ dll/3rdparty/libjpeg/djpeg.c | 25 +- dll/3rdparty/libjpeg/jcarith.c | 17 +- dll/3rdparty/libjpeg/jccolor.c | 97 ++-- dll/3rdparty/libjpeg/jchuff.c | 151 ++++-- dll/3rdparty/libjpeg/jcmarker.c | 8 +- dll/3rdparty/libjpeg/jcmaster.c | 33 +- dll/3rdparty/libjpeg/jcomapi.c | 138 ++++++ dll/3rdparty/libjpeg/jcparam.c | 113 +---- dll/3rdparty/libjpeg/jdarith.c | 28 +- dll/3rdparty/libjpeg/jdatadst.c | 23 +- dll/3rdparty/libjpeg/jdatasrc.c | 31 +- dll/3rdparty/libjpeg/jdcolor.c | 130 +++--- dll/3rdparty/libjpeg/jdhuff.c | 106 +++-- dll/3rdparty/libjpeg/jdmarker.c | 20 +- dll/3rdparty/libjpeg/jdmaster.c | 47 +- dll/3rdparty/libjpeg/jdmerge.c | 65 ++- dll/3rdparty/libjpeg/jfdctint.c | 116 ++--- dll/3rdparty/libjpeg/jidctint.c | 12 +- dll/3rdparty/libjpeg/jmemmgr.c | 60 ++- dll/3rdparty/libjpeg/jmemnobs.c | 8 +- dll/3rdparty/libjpeg/jpegtran.c | 91 +++- dll/3rdparty/libjpeg/jutils.c | 6 +- dll/3rdparty/libjpeg/rdbmp.c | 97 ++-- dll/3rdparty/libjpeg/rdgif.c | 667 ++++++++++++++++++++++++++- dll/3rdparty/libjpeg/rdppm.c | 27 +- dll/3rdparty/libjpeg/rdrle.c | 67 ++- dll/3rdparty/libjpeg/rdswitch.c | 7 +- dll/3rdparty/libjpeg/rdtarga.c | 34 +- dll/3rdparty/libjpeg/transupp.c | 682 ++++++++++++++++++++++++++-- dll/3rdparty/libjpeg/wrbmp.c | 48 +- dll/3rdparty/libjpeg/wrgif.c | 334 ++++++++++---- dll/3rdparty/libjpeg/wrppm.c | 18 +- dll/3rdparty/libjpeg/wrrle.c | 54 +-- dll/3rdparty/libjpeg/wrtarga.c | 36 +- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libjpeg/cdjpeg.h | 4 +- sdk/include/reactos/libs/libjpeg/jdct.h | 9 +- sdk/include/reactos/libs/libjpeg/jerror.h | 4 +- sdk/include/reactos/libs/libjpeg/jpegint.h | 9 +- sdk/include/reactos/libs/libjpeg/jpeglib.h | 11 +- sdk/include/reactos/libs/libjpeg/jversion.h | 6 +- sdk/include/reactos/libs/libjpeg/transupp.h | 31 +- 44 files changed, 2572 insertions(+), 968 deletions(-) diff --git a/dll/3rdparty/libjpeg/README b/dll/3rdparty/libjpeg/README index 56cdb600386..13b245c5ca8 100644 --- a/dll/3rdparty/libjpeg/README +++ b/dll/3rdparty/libjpeg/README @@ -1,7 +1,7 @@ The Independent JPEG Group's JPEG software ========================================== -README for release 9c of 14-Jan-2018 +README for release 9d of 12-Jan-2020 ==================================== This distribution contains the ninth public release of the Independent JPEG @@ -10,8 +10,8 @@ to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone, Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson, -Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers, -and other members of the Independent JPEG Group. +John Korejwa, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, +Ge' Weijers, and other members of the Independent JPEG Group. IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee (previously known as JPEG, together with ITU-T SG16). @@ -115,7 +115,7 @@ with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. -This software is copyright (C) 1991-2018, Thomas G. Lane, Guido Vollbeding. +This software is copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding. All Rights Reserved except as specified below. Permission is hereby granted to use, copy, modify, and distribute this @@ -152,13 +152,6 @@ The same holds for its supporting scripts (config.guess, config.sub, ltmain.sh). Another support script, install-sh, is copyright by X Consortium but is also freely distributable. -The IJG distribution formerly included code to read and write GIF files. -To avoid entanglement with the Unisys LZW patent (now expired), GIF reading -support has been removed altogether, and the GIF writer has been simplified -to produce "uncompressed GIFs". This technique does not use the LZW -algorithm; the resulting GIF files are larger than usual, but are readable -by all standard GIF decoders. - REFERENCES ========== @@ -246,8 +239,8 @@ ARCHIVE LOCATIONS The "official" archive site for this software is www.ijg.org. The most recent released version can always be found there in directory "files". This particular version will be archived as -http://www.ijg.org/files/jpegsrc.v9c.tar.gz, and in Windows-compatible -"zip" archive format as http://www.ijg.org/files/jpegsr9c.zip. +http://www.ijg.org/files/jpegsrc.v9d.tar.gz, and in Windows-compatible +"zip" archive format as http://www.ijg.org/files/jpegsr9d.zip. The JPEG FAQ (Frequently Asked Questions) article is a source of some general information about JPEG. diff --git a/dll/3rdparty/libjpeg/change.log b/dll/3rdparty/libjpeg/change.log index 674a558a727..ed8ec6afcf0 100644 --- a/dll/3rdparty/libjpeg/change.log +++ b/dll/3rdparty/libjpeg/change.log @@ -1,6 +1,55 @@ CHANGE LOG for Independent JPEG Group's JPEG software +Version 9d 12-Jan-2020 +----------------------- + +Optimize the optimal Huffman code table generation to produce +slightly smaller files. Thank to John Korejwa for suggestion. +Note: Requires rebuild of testimgp.jpg. + +Decoding Huffman: Use default tables if tables are not defined. +Thank to Simone Azzalin for report (Motion JPEG), +and to Martin Strunz for hint. + +Add sanity check in optimal Huffman code table generation. +Thank to Adam Farley for suggestion. + +rdtarga.c: use read_byte(), with EOF check, instead of getc() +in read_*_pixel(). +Thank to Chijin Zhou for cjpeg potential vulnerability report. + +jmemnobs.c: respect the max_memory_to_use setting in +jpeg_mem_available() computation. Thank to Sheng Shu and +Dongdong She for djpeg potential vulnerability report. + +jdarith.c, jdhuff.c: avoid left shift of negative value +compiler warning in decode_mcu_AC_refine(). +Thank to Indu Bhagat for suggestion. + +Add x64 (64-bit) platform support, avoid compiler warnings. +Thank to Jonathan Potter, Feiyun Wang, and Sheng Shu for suggestion. + +Adjust libjpeg version specification for pkg-config file. +Thank to Chen Chen for suggestion. + +Restore GIF read and write support from libjpeg version 6a. +Thank to Wolfgang Werner (W.W.) Heinz for suggestion. + +Improve consistency in raw (downsampled) image data processing mode. +Thank to Zhongyuan Zhou for hint. + +Avoid out of bounds array read (AC derived table pointers) +in start pass in jdhuff.c. Thank to Peng Li for report. + +Improve code sanity (jdhuff.c). +Thank to Reza Mirzazade farkhani for reports. + +Add jpegtran -drop option; add options to the crop extension and wipe +to fill the extra area with content from the source image region, +instead of gray out. + + Version 9c 14-Jan-2018 ----------------------- diff --git a/dll/3rdparty/libjpeg/djpeg.c b/dll/3rdparty/libjpeg/djpeg.c index 0c9b89bdd5f..a01b3968477 100644 --- a/dll/3rdparty/libjpeg/djpeg.c +++ b/dll/3rdparty/libjpeg/djpeg.c @@ -2,7 +2,7 @@ * djpeg.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009-2015 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -59,7 +59,8 @@ static const char * const cdjpeg_message_table[] = { typedef enum { FMT_BMP, /* BMP format (Windows flavor) */ - FMT_GIF, /* GIF format */ + FMT_GIF, /* GIF format (LZW compressed) */ + FMT_GIF0, /* GIF format (uncompressed) */ FMT_OS2, /* BMP format (OS/2 flavor) */ FMT_PPM, /* PPM/PGM (PBMPLUS formats) */ FMT_RLE, /* RLE format */ @@ -111,8 +112,10 @@ usage (void) (DEFAULT_FMT == FMT_BMP ? " (default)" : "")); #endif #ifdef GIF_SUPPORTED - fprintf(stderr, " -gif Select GIF output format%s\n", + fprintf(stderr, " -gif Select GIF output format (LZW compressed)%s\n", (DEFAULT_FMT == FMT_GIF ? " (default)" : "")); + fprintf(stderr, " -gif0 Select GIF output format (uncompressed)%s\n", + (DEFAULT_FMT == FMT_GIF0 ? " (default)" : "")); #endif #ifdef BMP_SUPPORTED fprintf(stderr, " -os2 Select BMP output format (OS/2 style)%s\n", @@ -195,7 +198,7 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv, arg++; /* advance past switch marker character */ if (keymatch(arg, "bmp", 1)) { - /* BMP output format. */ + /* BMP output format (Windows flavor). */ requested_fmt = FMT_BMP; } else if (keymatch(arg, "colors", 1) || keymatch(arg, "colours", 1) || @@ -258,9 +261,13 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv, cinfo->do_fancy_upsampling = FALSE; } else if (keymatch(arg, "gif", 1)) { - /* GIF output format. */ + /* GIF output format (LZW compressed). */ requested_fmt = FMT_GIF; + } else if (keymatch(arg, "gif0", 4)) { + /* GIF output format (uncompressed). */ + requested_fmt = FMT_GIF0; + } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) { /* Force monochrome output. */ cinfo->out_color_space = JCS_GRAYSCALE; @@ -461,7 +468,7 @@ main (int argc, char **argv) * APP12 is used by some digital camera makers for textual info, * so we provide the ability to display it as text. * If you like, additional APPn marker types can be selected for display, - * but don't try to override APP0 or APP14 this way (see libjpeg.doc). + * but don't try to override APP0 or APP14 this way (see libjpeg.txt). */ jpeg_set_marker_processor(&cinfo, JPEG_COM, print_text_marker); jpeg_set_marker_processor(&cinfo, JPEG_APP0+12, print_text_marker); @@ -554,7 +561,10 @@ main (int argc, char **argv) #endif #ifdef GIF_SUPPORTED case FMT_GIF: - dest_mgr = jinit_write_gif(&cinfo); + dest_mgr = jinit_write_gif(&cinfo, TRUE); + break; + case FMT_GIF0: + dest_mgr = jinit_write_gif(&cinfo, FALSE); break; #endif #ifdef PPM_SUPPORTED @@ -574,7 +584,6 @@ main (int argc, char **argv) #endif default: ERREXIT(&cinfo, JERR_UNSUPPORTED_FORMAT); - break; } dest_mgr->output_file = output_file; diff --git a/dll/3rdparty/libjpeg/jcarith.c b/dll/3rdparty/libjpeg/jcarith.c index a64190e72e0..46ce6c6a392 100644 --- a/dll/3rdparty/libjpeg/jcarith.c +++ b/dll/3rdparty/libjpeg/jcarith.c @@ -1,7 +1,7 @@ /* * jcarith.c * - * Developed 1997-2013 by Guido Vollbeding. + * Developed 1997-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -181,11 +181,11 @@ finish_pass (j_compress_ptr cinfo) if (e->zc) /* output final pending zero bytes */ do emit_byte(0x00, cinfo); while (--e->zc); - emit_byte((e->c >> 19) & 0xFF, cinfo); + emit_byte((int) ((e->c >> 19) & 0xFF), cinfo); if (((e->c >> 19) & 0xFF) == 0xFF) emit_byte(0x00, cinfo); if (e->c & 0x7F800L) { - emit_byte((e->c >> 11) & 0xFF, cinfo); + emit_byte((int) ((e->c >> 11) & 0xFF), cinfo); if (((e->c >> 11) & 0xFF) == 0xFF) emit_byte(0x00, cinfo); } @@ -280,7 +280,8 @@ arith_encode (j_compress_ptr cinfo, unsigned char *st, int val) /* Note: The 3 spacer bits in the C register guarantee * that the new buffer byte can't be 0xFF here * (see page 160 in the P&M JPEG book). */ - e->buffer = temp & 0xFF; /* new output byte, might overflow later */ + /* New output byte, might overflow later */ + e->buffer = (int) (temp & 0xFF); } else if (temp == 0xFF) { ++e->sc; /* stack 0xFF byte (which might overflow later) */ } else { @@ -302,7 +303,8 @@ arith_encode (j_compress_ptr cinfo, unsigned char *st, int val) emit_byte(0x00, cinfo); } while (--e->sc); } - e->buffer = temp & 0xFF; /* new output byte (can still overflow) */ + /* New output byte (can still overflow) */ + e->buffer = (int) (temp & 0xFF); } e->c &= 0x7FFFFL; e->ct += 8; @@ -926,9 +928,8 @@ jinit_arith_encoder (j_compress_ptr cinfo) arith_entropy_ptr entropy; int i; - entropy = (arith_entropy_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(arith_entropy_encoder)); + entropy = (arith_entropy_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(arith_entropy_encoder)); cinfo->entropy = &entropy->pub; entropy->pub.start_pass = start_pass; entropy->pub.finish_pass = finish_pass; diff --git a/dll/3rdparty/libjpeg/jccolor.c b/dll/3rdparty/libjpeg/jccolor.c index f6b4a493fda..db2ca429e8f 100644 --- a/dll/3rdparty/libjpeg/jccolor.c +++ b/dll/3rdparty/libjpeg/jccolor.c @@ -2,7 +2,7 @@ * jccolor.c * * Copyright (C) 1991-1996, Thomas G. Lane. - * Modified 2011-2013 by Guido Vollbeding. + * Modified 2011-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -105,14 +105,14 @@ rgb_ycc_start (j_compress_ptr cinfo) /* Allocate and fill in the conversion tables. */ cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (TABLE_SIZE * SIZEOF(INT32))); + TABLE_SIZE * SIZEOF(INT32)); for (i = 0; i <= MAXJSAMPLE; i++) { rgb_ycc_tab[i+R_Y_OFF] = FIX(0.299) * i; rgb_ycc_tab[i+G_Y_OFF] = FIX(0.587) * i; rgb_ycc_tab[i+B_Y_OFF] = FIX(0.114) * i + ONE_HALF; - rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.168735892)) * i; - rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.331264108)) * i; + rgb_ycc_tab[i+R_CB_OFF] = (- FIX(0.168735892)) * i; + rgb_ycc_tab[i+G_CB_OFF] = (- FIX(0.331264108)) * i; /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr. * This ensures that the maximum output will round to MAXJSAMPLE * not MAXJSAMPLE+1, and thus that we don't have to range-limit. @@ -121,8 +121,8 @@ rgb_ycc_start (j_compress_ptr cinfo) /* B=>Cb and R=>Cr tables are the same rgb_ycc_tab[i+R_CR_OFF] = FIX(0.5) * i + CBCR_OFFSET + ONE_HALF-1; */ - rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.418687589)) * i; - rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.081312411)) * i; + rgb_ycc_tab[i+G_CR_OFF] = (- FIX(0.418687589)) * i; + rgb_ycc_tab[i+B_CR_OFF] = (- FIX(0.081312411)) * i; } } @@ -131,12 +131,12 @@ rgb_ycc_start (j_compress_ptr cinfo) * Convert some rows of samples to the JPEG colorspace. * * Note that we change from the application's interleaved-pixel format - * to our internal noninterleaved, one-plane-per-component format. - * The input buffer is therefore three times as wide as the output buffer. + * to our internal noninterleaved, one-plane-per-component format. The + * input buffer is therefore three times as wide as the output buffer. * - * A starting row offset is provided only for the output buffer. The caller - * can easily adjust the passed input_buf value to accommodate any row - * offset required on that side. + * A starting row offset is provided only for the output buffer. The + * caller can easily adjust the passed input_buf value to accommodate + * any row offset required on that side. */ METHODDEF(void) @@ -145,8 +145,8 @@ rgb_ycc_convert (j_compress_ptr cinfo, JDIMENSION output_row, int num_rows) { my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; - register INT32 * ctab = cconvert->rgb_ycc_tab; register int r, g, b; + register INT32 * ctab = cconvert->rgb_ycc_tab; register JSAMPROW inptr; register JSAMPROW outptr0, outptr1, outptr2; register JDIMENSION col; @@ -162,6 +162,7 @@ rgb_ycc_convert (j_compress_ptr cinfo, r = GETJSAMPLE(inptr[RGB_RED]); g = GETJSAMPLE(inptr[RGB_GREEN]); b = GETJSAMPLE(inptr[RGB_BLUE]); + inptr += RGB_PIXELSIZE; /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations * must be too; we do not need an explicit range-limiting operation. * Hence the value being shifted is never negative, and we don't @@ -179,7 +180,6 @@ rgb_ycc_convert (j_compress_ptr cinfo, outptr2[col] = (JSAMPLE) ((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) >> SCALEBITS); - inptr += RGB_PIXELSIZE; } } } @@ -201,8 +201,8 @@ rgb_gray_convert (j_compress_ptr cinfo, JDIMENSION output_row, int num_rows) { my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; - register INT32 * ctab = cconvert->rgb_ycc_tab; register int r, g, b; + register INT32 * ctab = cconvert->rgb_ycc_tab; register JSAMPROW inptr; register JSAMPROW outptr; register JDIMENSION col; @@ -215,11 +215,11 @@ rgb_gray_convert (j_compress_ptr cinfo, r = GETJSAMPLE(inptr[RGB_RED]); g = GETJSAMPLE(inptr[RGB_GREEN]); b = GETJSAMPLE(inptr[RGB_BLUE]); + inptr += RGB_PIXELSIZE; /* Y */ outptr[col] = (JSAMPLE) ((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF]) >> SCALEBITS); - inptr += RGB_PIXELSIZE; } } } @@ -228,8 +228,8 @@ rgb_gray_convert (j_compress_ptr cinfo, /* * Convert some rows of samples to the JPEG colorspace. * This version handles Adobe-style CMYK->YCCK conversion, - * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same - * conversion as above, while passing K (black) unchanged. + * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the + * same conversion as above, while passing K (black) unchanged. * We assume rgb_ycc_start has been called. */ @@ -239,8 +239,8 @@ cmyk_ycck_convert (j_compress_ptr cinfo, JDIMENSION output_row, int num_rows) { my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; - register INT32 * ctab = cconvert->rgb_ycc_tab; register int r, g, b; + register INT32 * ctab = cconvert->rgb_ycc_tab; register JSAMPROW inptr; register JSAMPROW outptr0, outptr1, outptr2, outptr3; register JDIMENSION col; @@ -259,6 +259,7 @@ cmyk_ycck_convert (j_compress_ptr cinfo, b = MAXJSAMPLE - GETJSAMPLE(inptr[2]); /* K passes through as-is */ outptr3[col] = inptr[3]; /* don't need GETJSAMPLE here */ + inptr += 4; /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations * must be too; we do not need an explicit range-limiting operation. * Hence the value being shifted is never negative, and we don't @@ -276,7 +277,6 @@ cmyk_ycck_convert (j_compress_ptr cinfo, outptr2[col] = (JSAMPLE) ((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) >> SCALEBITS); - inptr += 4; } } } @@ -312,13 +312,13 @@ rgb_rgb1_convert (j_compress_ptr cinfo, r = GETJSAMPLE(inptr[RGB_RED]); g = GETJSAMPLE(inptr[RGB_GREEN]); b = GETJSAMPLE(inptr[RGB_BLUE]); + inptr += RGB_PIXELSIZE; /* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD * (modulo) operator is equivalent to the bitmask operator AND. */ outptr0[col] = (JSAMPLE) ((r - g + CENTERJSAMPLE) & MAXJSAMPLE); outptr1[col] = (JSAMPLE) g; outptr2[col] = (JSAMPLE) ((b - g + CENTERJSAMPLE) & MAXJSAMPLE); - inptr += RGB_PIXELSIZE; } } } @@ -335,17 +335,17 @@ grayscale_convert (j_compress_ptr cinfo, JSAMPARRAY input_buf, JSAMPIMAGE output_buf, JDIMENSION output_row, int num_rows) { - int instride = cinfo->input_components; register JSAMPROW inptr; register JSAMPROW outptr; - register JDIMENSION col; + register JDIMENSION count; + register int instride = cinfo->input_components; JDIMENSION num_cols = cinfo->image_width; while (--num_rows >= 0) { inptr = *input_buf++; outptr = output_buf[0][output_row++]; - for (col = 0; col < num_cols; col++) { - outptr[col] = inptr[0]; /* don't need GETJSAMPLE() here */ + for (count = num_cols; count > 0; count--) { + *outptr++ = *inptr; /* don't need GETJSAMPLE() here */ inptr += instride; } } @@ -396,21 +396,21 @@ null_convert (j_compress_ptr cinfo, JSAMPARRAY input_buf, JSAMPIMAGE output_buf, JDIMENSION output_row, int num_rows) { - int ci; - register int nc = cinfo->num_components; register JSAMPROW inptr; register JSAMPROW outptr; - register JDIMENSION col; + register JDIMENSION count; + register int num_comps = cinfo->num_components; JDIMENSION num_cols = cinfo->image_width; + int ci; while (--num_rows >= 0) { /* It seems fastest to make a separate pass for each component. */ - for (ci = 0; ci < nc; ci++) { + for (ci = 0; ci < num_comps; ci++) { inptr = input_buf[0] + ci; outptr = output_buf[ci][output_row]; - for (col = 0; col < num_cols; col++) { + for (count = num_cols; count > 0; count--) { *outptr++ = *inptr; /* don't need GETJSAMPLE() here */ - inptr += nc; + inptr += num_comps; } } input_buf++; @@ -439,9 +439,8 @@ jinit_color_converter (j_compress_ptr cinfo) { my_cconvert_ptr cconvert; - cconvert = (my_cconvert_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_color_converter)); + cconvert = (my_cconvert_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_color_converter)); cinfo->cconvert = &cconvert->pub; /* set start_pass to null method until we find out differently */ cconvert->pub.start_pass = null_method; @@ -455,9 +454,11 @@ jinit_color_converter (j_compress_ptr cinfo) case JCS_RGB: case JCS_BG_RGB: +#if RGB_PIXELSIZE != 3 if (cinfo->input_components != RGB_PIXELSIZE) ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); break; +#endif /* else share code with YCbCr */ case JCS_YCbCr: case JCS_BG_YCC: @@ -474,7 +475,6 @@ jinit_color_converter (j_compress_ptr cinfo) default: /* JCS_UNKNOWN can be anything */ if (cinfo->input_components < 1) ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); - break; } /* Support color transform only for RGB colorspaces */ @@ -507,19 +507,18 @@ jinit_color_converter (j_compress_ptr cinfo) case JCS_BG_RGB: if (cinfo->num_components != 3) ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); - if (cinfo->in_color_space == cinfo->jpeg_color_space) { - switch (cinfo->color_transform) { - case JCT_NONE: - cconvert->pub.color_convert = rgb_convert; - break; - case JCT_SUBTRACT_GREEN: - cconvert->pub.color_convert = rgb_rgb1_convert; - break; - default: - ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); - } - } else + if (cinfo->in_color_space != cinfo->jpeg_color_space) ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); + switch (cinfo->color_transform) { + case JCT_NONE: + cconvert->pub.color_convert = rgb_convert; + break; + case JCT_SUBTRACT_GREEN: + cconvert->pub.color_convert = rgb_rgb1_convert; + break; + default: + ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); + } break; case JCS_YCbCr: @@ -572,10 +571,9 @@ jinit_color_converter (j_compress_ptr cinfo) case JCS_CMYK: if (cinfo->num_components != 4) ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); - if (cinfo->in_color_space == JCS_CMYK) - cconvert->pub.color_convert = null_convert; - else + if (cinfo->in_color_space != JCS_CMYK) ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); + cconvert->pub.color_convert = null_convert; break; case JCS_YCCK: @@ -599,6 +597,5 @@ jinit_color_converter (j_compress_ptr cinfo) cinfo->num_components != cinfo->input_components) ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); cconvert->pub.color_convert = null_convert; - break; } } diff --git a/dll/3rdparty/libjpeg/jchuff.c b/dll/3rdparty/libjpeg/jchuff.c index d1313f676f6..02fc275b7ab 100644 --- a/dll/3rdparty/libjpeg/jchuff.c +++ b/dll/3rdparty/libjpeg/jchuff.c @@ -2,7 +2,7 @@ * jchuff.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2006-2013 by Guido Vollbeding. + * Modified 2006-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -178,13 +178,12 @@ jpeg_make_c_derived_tbl (j_compress_ptr cinfo, boolean isDC, int tblno, htbl = isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno]; if (htbl == NULL) - ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno); + htbl = jpeg_std_huff_table((j_common_ptr) cinfo, isDC, tblno); /* Allocate a workspace if we haven't already done so. */ if (*pdtbl == NULL) - *pdtbl = (c_derived_tbl *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(c_derived_tbl)); + *pdtbl = (c_derived_tbl *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(c_derived_tbl)); dtbl = *pdtbl; /* Figure C.1: make table of Huffman code length for each symbol */ @@ -1256,22 +1255,88 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) UINT8 bits[MAX_CLEN+1]; /* bits[k] = # of symbols with code length k */ int codesize[257]; /* codesize[k] = code length of symbol k */ int others[257]; /* next symbol in current branch of tree */ - int c1, c2; - int p, i, j; + int c1, c2, i, j; + UINT8 *p; long v; + freq[256] = 1; /* make sure 256 has a nonzero count */ + /* Including the pseudo-symbol 256 in the Huffman procedure guarantees + * that no real symbol is given code-value of all ones, because 256 + * will be placed last in the largest codeword category. + * In the symbol list build procedure this element serves as sentinel + * for the zero run loop. + */ + +#ifndef DONT_USE_FANCY_HUFF_OPT + + /* Build list of symbols sorted in order of descending frequency */ + /* This approach has several benefits (thank to John Korejwa for the idea): + * 1. + * If a codelength category is split during the length limiting procedure + * below, the feature that more frequent symbols are assigned shorter + * codewords remains valid for the adjusted code. + * 2. + * To reduce consecutive ones in a Huffman data stream (thus reducing the + * number of stuff bytes in JPEG) it is preferable to follow 0 branches + * (and avoid 1 branches) as much as possible. This is easily done by + * assigning symbols to leaves of the Huffman tree in order of decreasing + * frequency, with no secondary sort based on codelengths. + * 3. + * The symbol list can be built independently from the assignment of code + * lengths by the Huffman procedure below. + * Note: The symbol list build procedure must be performed first, because + * the Huffman procedure assigning the codelengths clobbers the frequency + * counts! + */ + + /* Here we use the others array as a linked list of nonzero frequencies + * to be sorted. Already sorted elements are removed from the list. + */ + + /* Building list */ + + /* This item does not correspond to a valid symbol frequency and is used + * as starting index. + */ + j = 256; + + for (i = 0;; i++) { + if (freq[i] == 0) /* skip zero frequencies */ + continue; + if (i > 255) + break; + others[j] = i; /* this symbol value */ + j = i; /* previous symbol value */ + } + others[j] = -1; /* mark end of list */ + + /* Sorting list */ + + p = htbl->huffval; + while ((c1 = others[256]) >= 0) { + v = freq[c1]; + i = c1; /* first symbol value */ + j = 256; /* pseudo symbol value for starting index */ + while ((c2 = others[c1]) >= 0) { + if (freq[c2] > v) { + v = freq[c2]; + i = c2; /* this symbol value */ + j = c1; /* previous symbol value */ + } + c1 = c2; + } + others[j] = others[i]; /* remove this symbol i from list */ + *p++ = (UINT8) i; + } + +#endif /* DONT_USE_FANCY_HUFF_OPT */ + /* This algorithm is explained in section K.2 of the JPEG standard */ MEMZERO(bits, SIZEOF(bits)); MEMZERO(codesize, SIZEOF(codesize)); for (i = 0; i < 257; i++) others[i] = -1; /* init links to empty */ - - freq[256] = 1; /* make sure 256 has a nonzero count */ - /* Including the pseudo-symbol 256 in the Huffman procedure guarantees - * that no real symbol is given code-value of all ones, because 256 - * will be placed last in the largest codeword category. - */ /* Huffman's basic algorithm to assign optimal code lengths to symbols */ @@ -1301,7 +1366,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) /* Done if we've merged everything into one frequency */ if (c2 < 0) break; - + /* Else merge the two counts/trees */ freq[c1] += freq[c2]; freq[c2] = 0; @@ -1312,9 +1377,9 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) c1 = others[c1]; codesize[c1]++; } - + others[c1] = c2; /* chain c2 onto c1's tree branch */ - + /* Increment the codesize of everything in c2's tree branch */ codesize[c2]++; while (others[c2] >= 0) { @@ -1329,7 +1394,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) /* The JPEG standard seems to think that this can't happen, */ /* but I'm paranoid... */ if (codesize[i] > MAX_CLEN) - ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW); + ERREXIT(cinfo, JERR_HUFF_CLEN_OUTOFBOUNDS); bits[codesize[i]]++; } @@ -1345,13 +1410,16 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) * shortest nonzero BITS entry is converted into a prefix for two code words * one bit longer. */ - + for (i = MAX_CLEN; i > 16; i--) { while (bits[i] > 0) { j = i - 2; /* find length of new prefix to be used */ - while (bits[j] == 0) + while (bits[j] == 0) { + if (j == 0) + ERREXIT(cinfo, JERR_HUFF_CLEN_OUTOFBOUNDS); j--; - + } + bits[i] -= 2; /* remove two symbols */ bits[i-1]++; /* one goes in this length */ bits[j+1] += 2; /* two new symbols in this length */ @@ -1363,24 +1431,27 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) while (bits[i] == 0) /* find largest codelength still in use */ i--; bits[i]--; - + /* Return final symbol counts (only for lengths 0..16) */ MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits)); - + +#ifdef DONT_USE_FANCY_HUFF_OPT + /* Return a list of the symbols sorted by code length */ - /* It's not real clear to me why we don't need to consider the codelength - * changes made above, but the JPEG spec seems to think this works. + /* Note: Due to the codelength changes made above, it can happen + * that more frequent symbols are assigned longer codewords. */ - p = 0; + p = htbl->huffval; for (i = 1; i <= MAX_CLEN; i++) { for (j = 0; j <= 255; j++) { if (codesize[j] == i) { - htbl->huffval[p] = (UINT8) j; - p++; + *p++ = (UINT8) j; } } } +#endif /* DONT_USE_FANCY_HUFF_OPT */ + /* Set sent_table FALSE so updated table will be written to JPEG file. */ htbl->sent_table = FALSE; } @@ -1400,13 +1471,13 @@ finish_pass_gather (j_compress_ptr cinfo) boolean did_dc[NUM_HUFF_TBLS]; boolean did_ac[NUM_HUFF_TBLS]; - /* It's important not to apply jpeg_gen_optimal_table more than once - * per table, because it clobbers the input frequency counts! - */ if (cinfo->progressive_mode) /* Flush out buffered data (all we care about is counting the EOB symbol) */ emit_eobrun(entropy); + /* It's important not to apply jpeg_gen_optimal_table more than once + * per table, because it clobbers the input frequency counts! + */ MEMZERO(did_dc, SIZEOF(did_dc)); MEMZERO(did_ac, SIZEOF(did_ac)); @@ -1475,9 +1546,8 @@ start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics) entropy->pub.encode_mcu = encode_mcu_AC_refine; /* AC refinement needs a correction bit buffer */ if (entropy->bit_buffer == NULL) - entropy->bit_buffer = (char *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - MAX_CORR_BITS * SIZEOF(char)); + entropy->bit_buffer = (char *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, MAX_CORR_BITS * SIZEOF(char)); } } @@ -1505,9 +1575,8 @@ start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics) /* Allocate and zero the statistics tables */ /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */ if (entropy->dc_count_ptrs[tbl] == NULL) - entropy->dc_count_ptrs[tbl] = (long *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - 257 * SIZEOF(long)); + entropy->dc_count_ptrs[tbl] = (long *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, 257 * SIZEOF(long)); MEMZERO(entropy->dc_count_ptrs[tbl], 257 * SIZEOF(long)); } else { /* Compute derived values for Huffman tables */ @@ -1525,9 +1594,8 @@ start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics) if (tbl < 0 || tbl >= NUM_HUFF_TBLS) ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl); if (entropy->ac_count_ptrs[tbl] == NULL) - entropy->ac_count_ptrs[tbl] = (long *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - 257 * SIZEOF(long)); + entropy->ac_count_ptrs[tbl] = (long *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, 257 * SIZEOF(long)); MEMZERO(entropy->ac_count_ptrs[tbl], 257 * SIZEOF(long)); } else { jpeg_make_c_derived_tbl(cinfo, FALSE, tbl, @@ -1556,9 +1624,8 @@ jinit_huff_encoder (j_compress_ptr cinfo) huff_entropy_ptr entropy; int i; - entropy = (huff_entropy_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(huff_entropy_encoder)); + entropy = (huff_entropy_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(huff_entropy_encoder)); cinfo->entropy = &entropy->pub; entropy->pub.start_pass = start_pass_huff; diff --git a/dll/3rdparty/libjpeg/jcmarker.c b/dll/3rdparty/libjpeg/jcmarker.c index ca2bb39922f..8874cd86705 100644 --- a/dll/3rdparty/libjpeg/jcmarker.c +++ b/dll/3rdparty/libjpeg/jcmarker.c @@ -2,7 +2,7 @@ * jcmarker.c * * Copyright (C) 1991-1998, Thomas G. Lane. - * Modified 2003-2013 by Guido Vollbeding. + * Modified 2003-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -471,7 +471,6 @@ emit_adobe_app14 (j_compress_ptr cinfo) break; default: emit_byte(cinfo, 0); /* Color transform = 0 */ - break; } } @@ -702,9 +701,8 @@ jinit_marker_writer (j_compress_ptr cinfo) my_marker_ptr marker; /* Create the subobject */ - marker = (my_marker_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_marker_writer)); + marker = (my_marker_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_marker_writer)); cinfo->marker = &marker->pub; /* Initialize method pointers */ marker->pub.write_file_header = write_file_header; diff --git a/dll/3rdparty/libjpeg/jcmaster.c b/dll/3rdparty/libjpeg/jcmaster.c index 43d49aec45a..89dcf78c2ac 100644 --- a/dll/3rdparty/libjpeg/jcmaster.c +++ b/dll/3rdparty/libjpeg/jcmaster.c @@ -2,7 +2,7 @@ * jcmaster.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2003-2017 by Guido Vollbeding. + * Modified 2003-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -62,7 +62,7 @@ initial_setup (j_compress_ptr cinfo) case 5: cinfo->natural_order = jpeg_natural_order5; break; case 6: cinfo->natural_order = jpeg_natural_order6; break; case 7: cinfo->natural_order = jpeg_natural_order7; break; - default: cinfo->natural_order = jpeg_natural_order; break; + default: cinfo->natural_order = jpeg_natural_order; } /* Derive lim_Se from block_size */ @@ -114,20 +114,24 @@ initial_setup (j_compress_ptr cinfo) */ ssize = 1; #ifdef DCT_SCALING_SUPPORTED - while (cinfo->min_DCT_h_scaled_size * ssize <= - (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) && - (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == 0) { - ssize = ssize * 2; - } + if (! cinfo->raw_data_in) + while (cinfo->min_DCT_h_scaled_size * ssize <= + (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) && + (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == + 0) { + ssize = ssize * 2; + } #endif compptr->DCT_h_scaled_size = cinfo->min_DCT_h_scaled_size * ssize; ssize = 1; #ifdef DCT_SCALING_SUPPORTED - while (cinfo->min_DCT_v_scaled_size * ssize <= - (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) && - (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == 0) { - ssize = ssize * 2; - } + if (! cinfo->raw_data_in) + while (cinfo->min_DCT_v_scaled_size * ssize <= + (cinfo->do_fancy_downsampling ? DCTSIZE : DCTSIZE / 2) && + (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == + 0) { + ssize = ssize * 2; + } #endif compptr->DCT_v_scaled_size = cinfo->min_DCT_v_scaled_size * ssize; @@ -620,9 +624,8 @@ jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only) { my_master_ptr master; - master = (my_master_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_comp_master)); + master = (my_master_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_comp_master)); cinfo->master = &master->pub; master->pub.prepare_for_pass = prepare_for_pass; master->pub.pass_startup = pass_startup; diff --git a/dll/3rdparty/libjpeg/jcomapi.c b/dll/3rdparty/libjpeg/jcomapi.c index 9b1fa7568a6..678c5d12d03 100644 --- a/dll/3rdparty/libjpeg/jcomapi.c +++ b/dll/3rdparty/libjpeg/jcomapi.c @@ -2,6 +2,7 @@ * jcomapi.c * * Copyright (C) 1994-1997, Thomas G. Lane. + * Modified 2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -104,3 +105,140 @@ jpeg_alloc_huff_table (j_common_ptr cinfo) tbl->sent_table = FALSE; /* make sure this is false in any new table */ return tbl; } + + +/* + * Set up the standard Huffman tables (cf. JPEG standard section K.3). + * IMPORTANT: these are only valid for 8-bit data precision! + * (Would jutils.c be a more reasonable place to put this?) + */ + +GLOBAL(JHUFF_TBL *) +jpeg_std_huff_table (j_common_ptr cinfo, boolean isDC, int tblno) +{ + JHUFF_TBL **htblptr, *htbl; + const UINT8 *bits, *val; + int nsymbols, len; + + static const UINT8 bits_dc_luminance[17] = + { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; + static const UINT8 val_dc_luminance[] = + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + + static const UINT8 bits_dc_chrominance[17] = + { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; + static const UINT8 val_dc_chrominance[] = + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + + static const UINT8 bits_ac_luminance[17] = + { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; + static const UINT8 val_ac_luminance[] = + { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, + 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, + 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, + 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, + 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, + 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, + 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, + 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, + 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, + 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, + 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, + 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, + 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, + 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, + 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, + 0xf9, 0xfa }; + + static const UINT8 bits_ac_chrominance[17] = + { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; + static const UINT8 val_ac_chrominance[] = + { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, + 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, + 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, + 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, + 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, + 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, + 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, + 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, + 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, + 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, + 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, + 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, + 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, + 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, + 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, + 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, + 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, + 0xf9, 0xfa }; + + if (cinfo->is_decompressor) { + if (isDC) + htblptr = ((j_decompress_ptr) cinfo)->dc_huff_tbl_ptrs; + else + htblptr = ((j_decompress_ptr) cinfo)->ac_huff_tbl_ptrs; + } else { + if (isDC) + htblptr = ((j_compress_ptr) cinfo)->dc_huff_tbl_ptrs; + else + htblptr = ((j_compress_ptr) cinfo)->ac_huff_tbl_ptrs; + } + + switch (tblno) { + case 0: + if (isDC) { + bits = bits_dc_luminance; + val = val_dc_luminance; + } else { + bits = bits_ac_luminance; + val = val_ac_luminance; + } + break; + case 1: + if (isDC) { + bits = bits_dc_chrominance; + val = val_dc_chrominance; + } else { + bits = bits_ac_chrominance; + val = val_ac_chrominance; + } + break; + default: + ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno); + return NULL; /* avoid compiler warnings for uninitialized variables */ + } + + if (htblptr[tblno] == NULL) + htblptr[tblno] = jpeg_alloc_huff_table(cinfo); + + htbl = htblptr[tblno]; + + /* Copy the number-of-symbols-of-each-code-length counts */ + MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits)); + + /* Validate the counts. We do this here mainly so we can copy the right + * number of symbols from the val[] array, without risking marching off + * the end of memory. jxhuff.c will do a more thorough test later. + */ + nsymbols = 0; + for (len = 1; len <= 16; len++) + nsymbols += bits[len]; + if (nsymbols > 256) + ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); + + if (nsymbols > 0) + MEMCOPY(htbl->huffval, val, nsymbols * SIZEOF(UINT8)); + + /* Initialize sent_table FALSE so table will be written to JPEG file. */ + htbl->sent_table = FALSE; + + return htbl; +} diff --git a/dll/3rdparty/libjpeg/jcparam.c b/dll/3rdparty/libjpeg/jcparam.c index 4b2bee24976..3b7014ff2c4 100644 --- a/dll/3rdparty/libjpeg/jcparam.c +++ b/dll/3rdparty/libjpeg/jcparam.c @@ -2,7 +2,7 @@ * jcparam.c * * Copyright (C) 1991-1998, Thomas G. Lane. - * Modified 2003-2013 by Guido Vollbeding. + * Modified 2003-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -162,112 +162,23 @@ jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline) /* - * Huffman table setup routines + * Reset standard Huffman tables */ LOCAL(void) -add_huff_table (j_compress_ptr cinfo, - JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) -/* Define a Huffman table */ +std_huff_tables (j_compress_ptr cinfo) { - int nsymbols, len; - - if (*htblptr == NULL) - *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); - - /* Copy the number-of-symbols-of-each-code-length counts */ - MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); + if (cinfo->dc_huff_tbl_ptrs[0] != NULL) + (void) jpeg_std_huff_table((j_common_ptr) cinfo, TRUE, 0); - /* Validate the counts. We do this here mainly so we can copy the right - * number of symbols from the val[] array, without risking marching off - * the end of memory. jchuff.c will do a more thorough test later. - */ - nsymbols = 0; - for (len = 1; len <= 16; len++) - nsymbols += bits[len]; - if (nsymbols < 1 || nsymbols > 256) - ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); + if (cinfo->ac_huff_tbl_ptrs[0] != NULL) + (void) jpeg_std_huff_table((j_common_ptr) cinfo, FALSE, 0); - MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8)); + if (cinfo->dc_huff_tbl_ptrs[1] != NULL) + (void) jpeg_std_huff_table((j_common_ptr) cinfo, TRUE, 1); - /* Initialize sent_table FALSE so table will be written to JPEG file. */ - (*htblptr)->sent_table = FALSE; -} - - -LOCAL(void) -std_huff_tables (j_compress_ptr cinfo) -/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ -/* IMPORTANT: these are only valid for 8-bit data precision! */ -{ - static const UINT8 bits_dc_luminance[17] = - { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; - static const UINT8 val_dc_luminance[] = - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; - - static const UINT8 bits_dc_chrominance[17] = - { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; - static const UINT8 val_dc_chrominance[] = - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; - - static const UINT8 bits_ac_luminance[17] = - { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; - static const UINT8 val_ac_luminance[] = - { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, - 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, - 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, - 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, - 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, - 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, - 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, - 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, - 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, - 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, - 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, - 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, - 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, - 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, - 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, - 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, - 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, - 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, - 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, - 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa }; - - static const UINT8 bits_ac_chrominance[17] = - { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; - static const UINT8 val_ac_chrominance[] = - { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, - 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, - 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, - 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, - 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, - 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, - 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, - 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, - 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, - 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, - 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, - 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, - 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, - 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, - 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, - 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, - 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, - 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, - 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, - 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa }; - - add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0], - bits_dc_luminance, val_dc_luminance); - add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0], - bits_ac_luminance, val_ac_luminance); - add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1], - bits_dc_chrominance, val_dc_chrominance); - add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1], - bits_ac_chrominance, val_ac_chrominance); + if (cinfo->ac_huff_tbl_ptrs[1] != NULL) + (void) jpeg_std_huff_table((j_common_ptr) cinfo, FALSE, 1); } @@ -306,7 +217,7 @@ jpeg_set_defaults (j_compress_ptr cinfo) cinfo->data_precision = BITS_IN_JSAMPLE; /* Set up two quantization tables using default quality of 75 */ jpeg_set_quality(cinfo, 75, TRUE); - /* Set up two Huffman tables */ + /* Reset standard Huffman tables */ std_huff_tables(cinfo); /* Initialize default arithmetic coding conditioning */ diff --git a/dll/3rdparty/libjpeg/jdarith.c b/dll/3rdparty/libjpeg/jdarith.c index 5533c07397f..9e4dfdf76df 100644 --- a/dll/3rdparty/libjpeg/jdarith.c +++ b/dll/3rdparty/libjpeg/jdarith.c @@ -1,7 +1,7 @@ /* * jdarith.c * - * Developed 1997-2015 by Guido Vollbeding. + * Developed 1997-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -280,7 +280,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) if ((m = arith_decode(cinfo, st)) != 0) { st = entropy->dc_stats[tbl] + 20; /* Table F.4: X1 = 20 */ while (arith_decode(cinfo, st)) { - if ((m <<= 1) == 0x8000) { + if ((m <<= 1) == (int) 0x8000U) { WARNMS(cinfo, JWRN_ARITH_BAD_CODE); entropy->ct = -1; /* magnitude overflow */ return TRUE; @@ -370,7 +370,7 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) st = entropy->ac_stats[tbl] + (k <= cinfo->arith_ac_K[tbl] ? 189 : 217); while (arith_decode(cinfo, st)) { - if ((m <<= 1) == 0x8000) { + if ((m <<= 1) == (int) 0x8000U) { WARNMS(cinfo, JWRN_ARITH_BAD_CODE); entropy->ct = -1; /* magnitude overflow */ return TRUE; @@ -404,7 +404,8 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) { arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy; unsigned char *st; - int p1, blkn; + JCOEF p1; + int blkn; /* Process restart marker if needed */ if (cinfo->restart_interval) { @@ -440,7 +441,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) JCOEFPTR thiscoef; unsigned char *st; int tbl, k, kex; - int p1, m1; + JCOEF p1, m1; const int * natural_order; /* Process restart marker if needed */ @@ -459,7 +460,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) tbl = cinfo->cur_comp_info[0]->ac_tbl_no; p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ - m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */ + m1 = -p1; /* -1 in the bit position being coded */ /* Establish EOBx (previous stage end-of-block) index */ kex = cinfo->Se; @@ -555,7 +556,7 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) if ((m = arith_decode(cinfo, st)) != 0) { st = entropy->dc_stats[tbl] + 20; /* Table F.4: X1 = 20 */ while (arith_decode(cinfo, st)) { - if ((m <<= 1) == 0x8000) { + if ((m <<= 1) == (int) 0x8000U) { WARNMS(cinfo, JWRN_ARITH_BAD_CODE); entropy->ct = -1; /* magnitude overflow */ return TRUE; @@ -612,7 +613,7 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) st = entropy->ac_stats[tbl] + (k <= cinfo->arith_ac_K[tbl] ? 189 : 217); while (arith_decode(cinfo, st)) { - if ((m <<= 1) == 0x8000) { + if ((m <<= 1) == (int) 0x8000U) { WARNMS(cinfo, JWRN_ARITH_BAD_CODE); entropy->ct = -1; /* magnitude overflow */ return TRUE; @@ -766,9 +767,8 @@ jinit_arith_decoder (j_decompress_ptr cinfo) arith_entropy_ptr entropy; int i; - entropy = (arith_entropy_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(arith_entropy_decoder)); + entropy = (arith_entropy_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(arith_entropy_decoder)); cinfo->entropy = &entropy->pub; entropy->pub.start_pass = start_pass; entropy->pub.finish_pass = finish_pass; @@ -785,9 +785,9 @@ jinit_arith_decoder (j_decompress_ptr cinfo) if (cinfo->progressive_mode) { /* Create progression status table */ int *coef_bit_ptr, ci; - cinfo->coef_bits = (int (*)[DCTSIZE2]) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - cinfo->num_components*DCTSIZE2*SIZEOF(int)); + cinfo->coef_bits = (int (*)[DCTSIZE2]) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, + cinfo->num_components * DCTSIZE2 * SIZEOF(int)); coef_bit_ptr = & cinfo->coef_bits[0][0]; for (ci = 0; ci < cinfo->num_components; ci++) for (i = 0; i < DCTSIZE2; i++) diff --git a/dll/3rdparty/libjpeg/jdatadst.c b/dll/3rdparty/libjpeg/jdatadst.c index dcac2293ae7..75ebd7c22d2 100644 --- a/dll/3rdparty/libjpeg/jdatadst.c +++ b/dll/3rdparty/libjpeg/jdatadst.c @@ -2,7 +2,7 @@ * jdatadst.c * * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009-2017 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -46,7 +46,7 @@ typedef struct { struct jpeg_destination_mgr pub; /* public fields */ unsigned char ** outbuffer; /* target buffer */ - unsigned long * outsize; + size_t * outsize; unsigned char * newbuffer; /* newly allocated buffer */ JOCTET * buffer; /* start of buffer */ size_t bufsize; @@ -66,9 +66,8 @@ init_destination (j_compress_ptr cinfo) my_dest_ptr dest = (my_dest_ptr) cinfo->dest; /* Allocate the output buffer --- it will be released when done with image */ - dest->buffer = (JOCTET *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - OUTPUT_BUF_SIZE * SIZEOF(JOCTET)); + dest->buffer = (JOCTET *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, OUTPUT_BUF_SIZE * SIZEOF(JOCTET)); dest->pub.next_output_byte = dest->buffer; dest->pub.free_in_buffer = OUTPUT_BUF_SIZE; @@ -131,7 +130,7 @@ empty_mem_output_buffer (j_compress_ptr cinfo) nextbuffer = (JOCTET *) malloc(nextsize); if (nextbuffer == NULL) - ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10); + ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 11); MEMCOPY(nextbuffer, dest->buffer, dest->bufsize); @@ -204,9 +203,8 @@ jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile) * sizes may be different. Caveat programmer. */ if (cinfo->dest == NULL) { /* first time for this JPEG object? */ - cinfo->dest = (struct jpeg_destination_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - SIZEOF(my_destination_mgr)); + cinfo->dest = (struct jpeg_destination_mgr *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(my_destination_mgr)); } dest = (my_dest_ptr) cinfo->dest; @@ -233,7 +231,7 @@ jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile) GLOBAL(void) jpeg_mem_dest (j_compress_ptr cinfo, - unsigned char ** outbuffer, unsigned long * outsize) + unsigned char ** outbuffer, size_t * outsize) { my_mem_dest_ptr dest; @@ -244,9 +242,8 @@ jpeg_mem_dest (j_compress_ptr cinfo, * can be written to the same buffer without re-executing jpeg_mem_dest. */ if (cinfo->dest == NULL) { /* first time for this JPEG object? */ - cinfo->dest = (struct jpeg_destination_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - SIZEOF(my_mem_destination_mgr)); + cinfo->dest = (struct jpeg_destination_mgr *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(my_mem_destination_mgr)); } dest = (my_mem_dest_ptr) cinfo->dest; diff --git a/dll/3rdparty/libjpeg/jdatasrc.c b/dll/3rdparty/libjpeg/jdatasrc.c index 2a27cfed809..606ae11b4cc 100644 --- a/dll/3rdparty/libjpeg/jdatasrc.c +++ b/dll/3rdparty/libjpeg/jdatasrc.c @@ -2,7 +2,7 @@ * jdatasrc.c * * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009-2015 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -156,21 +156,23 @@ METHODDEF(void) skip_input_data (j_decompress_ptr cinfo, long num_bytes) { struct jpeg_source_mgr * src = cinfo->src; + size_t nbytes; /* Just a dumb implementation for now. Could use fseek() except * it doesn't work on pipes. Not clear that being smart is worth * any trouble anyway --- large skips are infrequent. */ if (num_bytes > 0) { - while (num_bytes > (long) src->bytes_in_buffer) { - num_bytes -= (long) src->bytes_in_buffer; + nbytes = (size_t) num_bytes; + while (nbytes > src->bytes_in_buffer) { + nbytes -= src->bytes_in_buffer; (void) (*src->fill_input_buffer) (cinfo); /* note we assume that fill_input_buffer will never return FALSE, * so suspension need not be handled. */ } - src->next_input_byte += (size_t) num_bytes; - src->bytes_in_buffer -= (size_t) num_bytes; + src->next_input_byte += nbytes; + src->bytes_in_buffer -= nbytes; } } @@ -219,13 +221,11 @@ jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile) * manager serially with the same JPEG object. Caveat programmer. */ if (cinfo->src == NULL) { /* first time for this JPEG object? */ - cinfo->src = (struct jpeg_source_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - SIZEOF(my_source_mgr)); + cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(my_source_mgr)); src = (my_src_ptr) cinfo->src; - src->buffer = (JOCTET *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - INPUT_BUF_SIZE * SIZEOF(JOCTET)); + src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET)); } src = (my_src_ptr) cinfo->src; @@ -247,7 +247,7 @@ jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile) GLOBAL(void) jpeg_mem_src (j_decompress_ptr cinfo, - const unsigned char * inbuffer, unsigned long insize) + const unsigned char * inbuffer, size_t insize) { struct jpeg_source_mgr * src; @@ -259,9 +259,8 @@ jpeg_mem_src (j_decompress_ptr cinfo, * the first one. */ if (cinfo->src == NULL) { /* first time for this JPEG object? */ - cinfo->src = (struct jpeg_source_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - SIZEOF(struct jpeg_source_mgr)); + cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(struct jpeg_source_mgr)); } src = cinfo->src; @@ -270,6 +269,6 @@ jpeg_mem_src (j_decompress_ptr cinfo, src->skip_input_data = skip_input_data; src->resync_to_restart = jpeg_resync_to_restart; /* use default method */ src->term_source = term_source; - src->bytes_in_buffer = (size_t) insize; + src->bytes_in_buffer = insize; src->next_input_byte = (const JOCTET *) inbuffer; } diff --git a/dll/3rdparty/libjpeg/jdcolor.c b/dll/3rdparty/libjpeg/jdcolor.c index 0316354dace..3746c2e973f 100644 --- a/dll/3rdparty/libjpeg/jdcolor.c +++ b/dll/3rdparty/libjpeg/jdcolor.c @@ -2,7 +2,7 @@ * jdcolor.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2011-2017 by Guido Vollbeding. + * Modified 2011-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -124,28 +124,22 @@ build_ycc_rgb_table (j_decompress_ptr cinfo) INT32 x; SHIFT_TEMPS - cconvert->Cr_r_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - cconvert->Cb_b_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - cconvert->Cr_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); - cconvert->Cb_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); + cconvert->Cr_r_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + cconvert->Cb_b_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + cconvert->Cr_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); + cconvert->Cb_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) { /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */ /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */ /* Cr=>R value is nearest int to 1.402 * x */ - cconvert->Cr_r_tab[i] = (int) - RIGHT_SHIFT(FIX(1.402) * x + ONE_HALF, SCALEBITS); + cconvert->Cr_r_tab[i] = (int) DESCALE(FIX(1.402) * x, SCALEBITS); /* Cb=>B value is nearest int to 1.772 * x */ - cconvert->Cb_b_tab[i] = (int) - RIGHT_SHIFT(FIX(1.772) * x + ONE_HALF, SCALEBITS); + cconvert->Cb_b_tab[i] = (int) DESCALE(FIX(1.772) * x, SCALEBITS); /* Cr=>G value is scaled-up -0.714136286 * x */ cconvert->Cr_g_tab[i] = (- FIX(0.714136286)) * x; /* Cb=>G value is scaled-up -0.344136286 * x */ @@ -164,28 +158,22 @@ build_bg_ycc_rgb_table (j_decompress_ptr cinfo) INT32 x; SHIFT_TEMPS - cconvert->Cr_r_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - cconvert->Cb_b_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - cconvert->Cr_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); - cconvert->Cb_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); + cconvert->Cr_r_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + cconvert->Cb_b_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + cconvert->Cr_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); + cconvert->Cb_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) { /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */ /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */ /* Cr=>R value is nearest int to 2.804 * x */ - cconvert->Cr_r_tab[i] = (int) - RIGHT_SHIFT(FIX(2.804) * x + ONE_HALF, SCALEBITS); + cconvert->Cr_r_tab[i] = (int) DESCALE(FIX(2.804) * x, SCALEBITS); /* Cb=>B value is nearest int to 3.544 * x */ - cconvert->Cb_b_tab[i] = (int) - RIGHT_SHIFT(FIX(3.544) * x + ONE_HALF, SCALEBITS); + cconvert->Cb_b_tab[i] = (int) DESCALE(FIX(3.544) * x, SCALEBITS); /* Cr=>G value is scaled-up -1.428272572 * x */ cconvert->Cr_g_tab[i] = (- FIX(1.428272572)) * x; /* Cb=>G value is scaled-up -0.688272572 * x */ @@ -201,6 +189,7 @@ build_bg_ycc_rgb_table (j_decompress_ptr cinfo) * Note that we change from noninterleaved, one-plane-per-component format * to interleaved-pixel format. The output buffer is therefore three times * as wide as the input buffer. + * * A starting row offset is provided only for the input buffer. The caller * can easily adjust the passed output_buf value to accommodate any row * offset required on that side. @@ -264,9 +253,8 @@ build_rgb_y_table (j_decompress_ptr cinfo) INT32 i; /* Allocate and fill in the conversion tables. */ - cconvert->rgb_y_tab = rgb_y_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (TABLE_SIZE * SIZEOF(INT32))); + cconvert->rgb_y_tab = rgb_y_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, TABLE_SIZE * SIZEOF(INT32)); for (i = 0; i <= MAXJSAMPLE; i++) { rgb_y_tab[i+R_Y_OFF] = FIX(0.299) * i; @@ -286,8 +274,8 @@ rgb_gray_convert (j_decompress_ptr cinfo, JSAMPARRAY output_buf, int num_rows) { my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; - register INT32 * ctab = cconvert->rgb_y_tab; register int r, g, b; + register INT32 * ctab = cconvert->rgb_y_tab; register JSAMPROW outptr; register JSAMPROW inptr0, inptr1, inptr2; register JDIMENSION col; @@ -313,6 +301,7 @@ rgb_gray_convert (j_decompress_ptr cinfo, /* + * Convert some rows of samples to the output colorspace. * [R-G,G,B-G] to [R,G,B] conversion with modulo calculation * (inverse color transform). * This can be seen as an adaption of the general YCbCr->RGB @@ -364,8 +353,8 @@ rgb1_gray_convert (j_decompress_ptr cinfo, JSAMPARRAY output_buf, int num_rows) { my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; - register INT32 * ctab = cconvert->rgb_y_tab; register int r, g, b; + register INT32 * ctab = cconvert->rgb_y_tab; register JSAMPROW outptr; register JSAMPROW inptr0, inptr1, inptr2; register JDIMENSION col; @@ -396,6 +385,7 @@ rgb1_gray_convert (j_decompress_ptr cinfo, /* + * Convert some rows of samples to the output colorspace. * No colorspace change, but conversion from separate-planes * to interleaved representation. */ @@ -430,6 +420,7 @@ rgb_convert (j_decompress_ptr cinfo, /* * Color conversion for no colorspace change: just copy the data, * converting from separate-planes to interleaved representation. + * We assume out_color_components == num_components. */ METHODDEF(void) @@ -437,20 +428,21 @@ null_convert (j_decompress_ptr cinfo, JSAMPIMAGE input_buf, JDIMENSION input_row, JSAMPARRAY output_buf, int num_rows) { - int ci; - register int nc = cinfo->num_components; register JSAMPROW outptr; register JSAMPROW inptr; - register JDIMENSION col; + register JDIMENSION count; + register int num_comps = cinfo->num_components; JDIMENSION num_cols = cinfo->output_width; + int ci; while (--num_rows >= 0) { - for (ci = 0; ci < nc; ci++) { + /* It seems fastest to make a separate pass for each component. */ + for (ci = 0; ci < num_comps; ci++) { inptr = input_buf[ci][input_row]; outptr = output_buf[0] + ci; - for (col = 0; col < num_cols; col++) { - *outptr = *inptr++; /* needn't bother with GETJSAMPLE() here */ - outptr += nc; + for (count = num_cols; count > 0; count--) { + *outptr = *inptr++; /* don't need GETJSAMPLE() here */ + outptr += num_comps; } } input_row++; @@ -504,9 +496,10 @@ gray_rgb_convert (j_decompress_ptr cinfo, /* - * Adobe-style YCCK->CMYK conversion. - * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same - * conversion as above, while passing K (black) unchanged. + * Convert some rows of samples to the output colorspace. + * This version handles Adobe-style YCCK->CMYK conversion, + * where we convert YCbCr to R=1-C, G=1-M, and B=1-Y using the + * same conversion as above, while passing K (black) unchanged. * We assume build_ycc_rgb_table has been called. */ @@ -577,9 +570,8 @@ jinit_color_deconverter (j_decompress_ptr cinfo) my_cconvert_ptr cconvert; int ci; - cconvert = (my_cconvert_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_color_deconverter)); + cconvert = (my_cconvert_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_color_deconverter)); cinfo->cconvert = &cconvert->pub; cconvert->pub.start_pass = start_pass_dcolor; @@ -607,7 +599,6 @@ jinit_color_deconverter (j_decompress_ptr cinfo) default: /* JCS_UNKNOWN can be anything */ if (cinfo->num_components < 1) ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); - break; } /* Support color transform only for RGB colorspaces */ @@ -684,19 +675,18 @@ jinit_color_deconverter (j_decompress_ptr cinfo) case JCS_BG_RGB: cinfo->out_color_components = RGB_PIXELSIZE; - if (cinfo->jpeg_color_space == JCS_BG_RGB) { - switch (cinfo->color_transform) { - case JCT_NONE: - cconvert->pub.color_convert = rgb_convert; - break; - case JCT_SUBTRACT_GREEN: - cconvert->pub.color_convert = rgb1_rgb_convert; - break; - default: - ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); - } - } else + if (cinfo->jpeg_color_space != JCS_BG_RGB) ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); + switch (cinfo->color_transform) { + case JCT_NONE: + cconvert->pub.color_convert = rgb_convert; + break; + case JCT_SUBTRACT_GREEN: + cconvert->pub.color_convert = rgb1_rgb_convert; + break; + default: + ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); + } break; case JCS_CMYK: @@ -714,14 +704,12 @@ jinit_color_deconverter (j_decompress_ptr cinfo) } break; - default: - /* Permit null conversion to same output space */ - if (cinfo->out_color_space == cinfo->jpeg_color_space) { - cinfo->out_color_components = cinfo->num_components; - cconvert->pub.color_convert = null_convert; - } else /* unsupported non-null conversion */ + default: /* permit null conversion to same output space */ + if (cinfo->out_color_space != cinfo->jpeg_color_space) + /* unsupported non-null conversion */ ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); - break; + cinfo->out_color_components = cinfo->num_components; + cconvert->pub.color_convert = null_convert; } if (cinfo->quantize_colors) diff --git a/dll/3rdparty/libjpeg/jdhuff.c b/dll/3rdparty/libjpeg/jdhuff.c index 835d06ecb6a..aea06f60397 100644 --- a/dll/3rdparty/libjpeg/jdhuff.c +++ b/dll/3rdparty/libjpeg/jdhuff.c @@ -2,7 +2,7 @@ * jdhuff.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2006-2016 by Guido Vollbeding. + * Modified 2006-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -341,13 +341,12 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, htbl = isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno]; if (htbl == NULL) - ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno); + htbl = jpeg_std_huff_table((j_common_ptr) cinfo, isDC, tblno); /* Allocate a workspace if we haven't already done so. */ if (*pdtbl == NULL) - *pdtbl = (d_derived_tbl *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(d_derived_tbl)); + *pdtbl = (d_derived_tbl *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(d_derived_tbl)); dtbl = *pdtbl; dtbl->pub = htbl; /* fill in back link */ @@ -706,7 +705,7 @@ process_restart (j_decompress_ptr cinfo) METHODDEF(boolean) decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) -{ +{ huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy; int Al = cinfo->Al; register int s, r; @@ -730,7 +729,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) if (! entropy->insufficient_data) { /* Load up working state */ - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(state, entropy->saved); /* Outer loop handles each block in the MCU */ @@ -759,12 +758,13 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } /* Completed MCU, so update state */ - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(entropy->saved, state); } - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; } @@ -777,7 +777,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) METHODDEF(boolean) decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) -{ +{ huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy; register int s, k, r; unsigned int EOBRUN; @@ -809,7 +809,7 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) if (EOBRUN) /* if it's a band of zeroes... */ EOBRUN--; /* ...process it now (we do nothing) */ else { - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); Se = cinfo->Se; Al = cinfo->Al; natural_order = cinfo->natural_order; @@ -842,15 +842,16 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } } - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); } /* Completed MCU, so update state */ entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */ } - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; } @@ -864,9 +865,10 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) METHODDEF(boolean) decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) -{ +{ huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy; - int p1, blkn; + JCOEF p1; + int blkn; BITREAD_STATE_VARS; /* Process restart marker if needed; may have to suspend */ @@ -881,7 +883,7 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) */ /* Load up working state */ - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ @@ -896,10 +898,11 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } /* Completed MCU, so update state */ - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; } @@ -911,11 +914,12 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) METHODDEF(boolean) decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) -{ +{ huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy; register int s, k, r; unsigned int EOBRUN; - int Se, p1, m1; + int Se; + JCOEF p1, m1; const int * natural_order; JBLOCKROW block; JCOEFPTR thiscoef; @@ -937,11 +941,11 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) Se = cinfo->Se; p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ - m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */ + m1 = -p1; /* -1 in the bit position being coded */ natural_order = cinfo->natural_order; /* Load up working state */ - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */ /* There is always only one block per MCU */ @@ -1043,12 +1047,13 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } /* Completed MCU, so update state */ - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */ } - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; @@ -1091,7 +1096,7 @@ decode_mcu_sub (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) Se = cinfo->lim_Se; /* Load up working state */ - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(state, entropy->saved); /* Outer loop handles each block in the MCU */ @@ -1178,12 +1183,13 @@ decode_mcu_sub (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } /* Completed MCU, so update state */ - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(entropy->saved, state); } - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; } @@ -1215,7 +1221,7 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) if (! entropy->insufficient_data) { /* Load up working state */ - BITREAD_LOAD_STATE(cinfo,entropy->bitstate); + BITREAD_LOAD_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(state, entropy->saved); /* Outer loop handles each block in the MCU */ @@ -1302,12 +1308,13 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) } /* Completed MCU, so update state */ - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); + BITREAD_SAVE_STATE(cinfo, entropy->bitstate); ASSIGN_STATE(entropy->saved, state); } - /* Account for restart interval (no-op if not using restarts) */ - entropy->restarts_to_go--; + /* Account for restart interval if using restarts */ + if (cinfo->restart_interval) + entropy->restarts_to_go--; return TRUE; } @@ -1343,11 +1350,11 @@ start_pass_huff_decoder (j_decompress_ptr cinfo) goto bad; } if (cinfo->Al > 13) { /* need not check for < 0 */ - /* Arguably the maximum Al value should be less than 13 for 8-bit precision, - * but the spec doesn't say so, and we try to be liberal about what we - * accept. Note: large Al values could result in out-of-range DC - * coefficients during early scans, leading to bizarre displays due to - * overflows in the IDCT math. But we won't crash. + /* Arguably the maximum Al value should be less than 13 for 8-bit + * precision, but the spec doesn't say so, and we try to be liberal + * about what we accept. Note: large Al values could result in + * out-of-range DC coefficients during early scans, leading to bizarre + * displays due to overflows in the IDCT math. But we won't crash. */ bad: ERREXIT4(cinfo, JERR_BAD_PROGRESSION, @@ -1451,7 +1458,8 @@ start_pass_huff_decoder (j_decompress_ptr cinfo) compptr = cinfo->cur_comp_info[ci]; /* Precalculate which table to use for each block */ entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no]; - entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no]; + entropy->ac_cur_tbls[blkn] = /* AC needs no table when not present */ + cinfo->lim_Se ? entropy->ac_derived_tbls[compptr->ac_tbl_no] : NULL; /* Decide whether we really care about the coefficient values */ if (compptr->component_needed) { ci = compptr->DCT_v_scaled_size; @@ -1494,7 +1502,6 @@ start_pass_huff_decoder (j_decompress_ptr cinfo) if (ci <= 0 || ci > 8) ci = 8; if (i <= 0 || i > 8) i = 8; entropy->coef_limit[blkn] = 1 + jpeg_zigzag_order[ci - 1][i - 1]; - break; } } else { entropy->coef_limit[blkn] = 0; @@ -1522,9 +1529,8 @@ jinit_huff_decoder (j_decompress_ptr cinfo) huff_entropy_ptr entropy; int i; - entropy = (huff_entropy_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(huff_entropy_decoder)); + entropy = (huff_entropy_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(huff_entropy_decoder)); cinfo->entropy = &entropy->pub; entropy->pub.start_pass = start_pass_huff_decoder; entropy->pub.finish_pass = finish_pass_huff; @@ -1532,9 +1538,9 @@ jinit_huff_decoder (j_decompress_ptr cinfo) if (cinfo->progressive_mode) { /* Create progression status table */ int *coef_bit_ptr, ci; - cinfo->coef_bits = (int (*)[DCTSIZE2]) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - cinfo->num_components*DCTSIZE2*SIZEOF(int)); + cinfo->coef_bits = (int (*)[DCTSIZE2]) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, + cinfo->num_components * DCTSIZE2 * SIZEOF(int)); coef_bit_ptr = & cinfo->coef_bits[0][0]; for (ci = 0; ci < cinfo->num_components; ci++) for (i = 0; i < DCTSIZE2; i++) @@ -1545,7 +1551,7 @@ jinit_huff_decoder (j_decompress_ptr cinfo) entropy->derived_tbls[i] = NULL; } } else { - /* Mark tables unallocated */ + /* Mark derived tables unallocated */ for (i = 0; i < NUM_HUFF_TBLS; i++) { entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; } diff --git a/dll/3rdparty/libjpeg/jdmarker.c b/dll/3rdparty/libjpeg/jdmarker.c index 3fbe5c16578..c10fde60534 100644 --- a/dll/3rdparty/libjpeg/jdmarker.c +++ b/dll/3rdparty/libjpeg/jdmarker.c @@ -2,7 +2,7 @@ * jdmarker.c * * Copyright (C) 1991-1998, Thomas G. Lane. - * Modified 2009-2013 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -496,8 +496,6 @@ get_dht (j_decompress_ptr cinfo) if (count > 256 || ((INT32) count) > length) ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); - MEMZERO(huffval, SIZEOF(huffval)); /* pre-zero array for later copy */ - for (i = 0; i < count; i++) INPUT_BYTE(cinfo, huffval[i], return FALSE); @@ -517,7 +515,8 @@ get_dht (j_decompress_ptr cinfo) *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); - MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval)); + if (count > 0) + MEMCOPY((*htblptr)->huffval, huffval, count * SIZEOF(UINT8)); } if (length != 0) @@ -577,14 +576,14 @@ get_dqt (j_decompress_ptr cinfo) count = DCTSIZE2; } - switch (count) { + switch ((int) count) { case (2*2): natural_order = jpeg_natural_order2; break; case (3*3): natural_order = jpeg_natural_order3; break; case (4*4): natural_order = jpeg_natural_order4; break; case (5*5): natural_order = jpeg_natural_order5; break; case (6*6): natural_order = jpeg_natural_order6; break; case (7*7): natural_order = jpeg_natural_order7; break; - default: natural_order = jpeg_natural_order; break; + default: natural_order = jpeg_natural_order; } for (i = 0; i < count; i++) { @@ -784,7 +783,6 @@ examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data, default: TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION, GETJOCTET(data[5]), (int) totallen); - break; } } else { /* Start of APP0 does not match "JFIF" or "JFXX", or too short */ @@ -858,7 +856,6 @@ get_interesting_appn (j_decompress_ptr cinfo) default: /* can't get here unless jpeg_save_markers chooses wrong processor */ ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker); - break; } /* skip any remaining data -- could be lots */ @@ -964,7 +961,6 @@ save_marker (j_decompress_ptr cinfo) default: TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) (data_length + length)); - break; } /* skip any remaining data -- could be lots */ @@ -1240,7 +1236,6 @@ read_markers (j_decompress_ptr cinfo) * ought to change! */ ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker); - break; } /* Successfully processed marker, so reset state variable */ cinfo->unread_marker = 0; @@ -1416,9 +1411,8 @@ jinit_marker_reader (j_decompress_ptr cinfo) int i; /* Create subobject in permanent pool */ - marker = (my_marker_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - SIZEOF(my_marker_reader)); + marker = (my_marker_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(my_marker_reader)); cinfo->marker = &marker->pub; /* Initialize public method pointers */ marker->pub.reset_marker_reader = reset_marker_reader; diff --git a/dll/3rdparty/libjpeg/jdmaster.c b/dll/3rdparty/libjpeg/jdmaster.c index 62c07671f77..c309f7629fa 100644 --- a/dll/3rdparty/libjpeg/jdmaster.c +++ b/dll/3rdparty/libjpeg/jdmaster.c @@ -2,7 +2,7 @@ * jdmaster.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2002-2017 by Guido Vollbeding. + * Modified 2002-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -104,7 +104,7 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) */ { #ifdef IDCT_SCALING_SUPPORTED - int ci; + int ci, ssize; jpeg_component_info *compptr; #endif @@ -124,19 +124,23 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) */ for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - int ssize = 1; - while (cinfo->min_DCT_h_scaled_size * ssize <= - (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) && - (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == 0) { - ssize = ssize * 2; - } + ssize = 1; + if (! cinfo->raw_data_out) + while (cinfo->min_DCT_h_scaled_size * ssize <= + (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) && + (cinfo->max_h_samp_factor % (compptr->h_samp_factor * ssize * 2)) == + 0) { + ssize = ssize * 2; + } compptr->DCT_h_scaled_size = cinfo->min_DCT_h_scaled_size * ssize; ssize = 1; - while (cinfo->min_DCT_v_scaled_size * ssize <= - (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) && - (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == 0) { - ssize = ssize * 2; - } + if (! cinfo->raw_data_out) + while (cinfo->min_DCT_v_scaled_size * ssize <= + (cinfo->do_fancy_upsampling ? DCTSIZE : DCTSIZE / 2) && + (cinfo->max_v_samp_factor % (compptr->v_samp_factor * ssize * 2)) == + 0) { + ssize = ssize * 2; + } compptr->DCT_v_scaled_size = cinfo->min_DCT_v_scaled_size * ssize; /* We don't support IDCT ratios larger than 2. */ @@ -144,13 +148,10 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) compptr->DCT_h_scaled_size = compptr->DCT_v_scaled_size * 2; else if (compptr->DCT_v_scaled_size > compptr->DCT_h_scaled_size * 2) compptr->DCT_v_scaled_size = compptr->DCT_h_scaled_size * 2; - } - /* Recompute downsampled dimensions of components; - * application needs to know these if using raw downsampled data. - */ - for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; - ci++, compptr++) { + /* Recompute downsampled dimensions of components; + * application needs to know these if using raw downsampled data. + */ /* Size in samples, after IDCT scaling */ compptr->downsampled_width = (JDIMENSION) jdiv_round_up((long) cinfo->image_width * @@ -172,8 +173,10 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) break; case JCS_RGB: case JCS_BG_RGB: +#if RGB_PIXELSIZE != 3 cinfo->out_color_components = RGB_PIXELSIZE; break; +#endif /* else share code with YCbCr */ case JCS_YCbCr: case JCS_BG_YCC: cinfo->out_color_components = 3; @@ -184,7 +187,6 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) break; default: /* else must be same colorspace as in file */ cinfo->out_color_components = cinfo->num_components; - break; } cinfo->output_components = (cinfo->quantize_colors ? 1 : cinfo->out_color_components); @@ -525,9 +527,8 @@ jinit_master_decompress (j_decompress_ptr cinfo) { my_master_ptr master; - master = (my_master_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_decomp_master)); + master = (my_master_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_decomp_master)); cinfo->master = &master->pub; master->pub.prepare_for_output_pass = prepare_for_output_pass; master->pub.finish_output_pass = finish_output_pass; diff --git a/dll/3rdparty/libjpeg/jdmerge.c b/dll/3rdparty/libjpeg/jdmerge.c index 866693f5294..8b5c899cce8 100644 --- a/dll/3rdparty/libjpeg/jdmerge.c +++ b/dll/3rdparty/libjpeg/jdmerge.c @@ -2,7 +2,7 @@ * jdmerge.c * * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2013-2017 by Guido Vollbeding. + * Modified 2013-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -95,28 +95,22 @@ build_ycc_rgb_table (j_decompress_ptr cinfo) INT32 x; SHIFT_TEMPS - upsample->Cr_r_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - upsample->Cb_b_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - upsample->Cr_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); - upsample->Cb_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); + upsample->Cr_r_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + upsample->Cb_b_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + upsample->Cr_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); + upsample->Cb_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) { /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */ /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */ /* Cr=>R value is nearest int to 1.402 * x */ - upsample->Cr_r_tab[i] = (int) - RIGHT_SHIFT(FIX(1.402) * x + ONE_HALF, SCALEBITS); + upsample->Cr_r_tab[i] = (int) DESCALE(FIX(1.402) * x, SCALEBITS); /* Cb=>B value is nearest int to 1.772 * x */ - upsample->Cb_b_tab[i] = (int) - RIGHT_SHIFT(FIX(1.772) * x + ONE_HALF, SCALEBITS); + upsample->Cb_b_tab[i] = (int) DESCALE(FIX(1.772) * x, SCALEBITS); /* Cr=>G value is scaled-up -0.714136286 * x */ upsample->Cr_g_tab[i] = (- FIX(0.714136286)) * x; /* Cb=>G value is scaled-up -0.344136286 * x */ @@ -135,28 +129,22 @@ build_bg_ycc_rgb_table (j_decompress_ptr cinfo) INT32 x; SHIFT_TEMPS - upsample->Cr_r_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - upsample->Cb_b_tab = (int *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(int)); - upsample->Cr_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); - upsample->Cb_g_tab = (INT32 *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (MAXJSAMPLE+1) * SIZEOF(INT32)); + upsample->Cr_r_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + upsample->Cb_b_tab = (int *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(int)); + upsample->Cr_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); + upsample->Cb_g_tab = (INT32 *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE+1) * SIZEOF(INT32)); for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) { /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */ /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */ /* Cr=>R value is nearest int to 2.804 * x */ - upsample->Cr_r_tab[i] = (int) - RIGHT_SHIFT(FIX(2.804) * x + ONE_HALF, SCALEBITS); + upsample->Cr_r_tab[i] = (int) DESCALE(FIX(2.804) * x, SCALEBITS); /* Cb=>B value is nearest int to 3.544 * x */ - upsample->Cb_b_tab[i] = (int) - RIGHT_SHIFT(FIX(3.544) * x + ONE_HALF, SCALEBITS); + upsample->Cb_b_tab[i] = (int) DESCALE(FIX(3.544) * x, SCALEBITS); /* Cr=>G value is scaled-up -1.428272572 * x */ upsample->Cr_g_tab[i] = (- FIX(1.428272572)) * x; /* Cb=>G value is scaled-up -0.688272572 * x */ @@ -419,9 +407,8 @@ jinit_merged_upsampler (j_decompress_ptr cinfo) { my_upsample_ptr upsample; - upsample = (my_upsample_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(my_upsampler)); + upsample = (my_upsample_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_upsampler)); cinfo->upsample = &upsample->pub; upsample->pub.start_pass = start_pass_merged_upsample; upsample->pub.need_context_rows = FALSE; @@ -432,9 +419,9 @@ jinit_merged_upsampler (j_decompress_ptr cinfo) upsample->pub.upsample = merged_2v_upsample; upsample->upmethod = h2v2_merged_upsample; /* Allocate a spare row buffer */ - upsample->spare_row = (JSAMPROW) - (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (size_t) (upsample->out_row_width * SIZEOF(JSAMPLE))); + upsample->spare_row = (JSAMPROW) (*cinfo->mem->alloc_large) + ((j_common_ptr) cinfo, JPOOL_IMAGE, + (size_t) upsample->out_row_width * SIZEOF(JSAMPLE)); } else { upsample->pub.upsample = merged_1v_upsample; upsample->upmethod = h2v1_merged_upsample; diff --git a/dll/3rdparty/libjpeg/jfdctint.c b/dll/3rdparty/libjpeg/jfdctint.c index 7ed42e5db5e..05df4750bbc 100644 --- a/dll/3rdparty/libjpeg/jfdctint.c +++ b/dll/3rdparty/libjpeg/jfdctint.c @@ -2,7 +2,7 @@ * jfdctint.c * * Copyright (C) 1991-1996, Thomas G. Lane. - * Modification developed 2003-2015 by Guido Vollbeding. + * Modification developed 2003-2018 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -3261,78 +3261,84 @@ jpeg_fdct_6x3 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col) GLOBAL(void) jpeg_fdct_4x2 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col) { - INT32 tmp0, tmp1; - INT32 tmp10, tmp11; - DCTELEM *dataptr; + DCTELEM tmp0, tmp2, tmp10, tmp12, tmp4, tmp5; + INT32 tmp1, tmp3, tmp11, tmp13; + INT32 z1, z2, z3; JSAMPROW elemptr; - int ctr; SHIFT_TEMPS /* Pre-zero output coefficient block. */ MEMZERO(data, SIZEOF(DCTELEM) * DCTSIZE2); /* Pass 1: process rows. - * Note results are scaled up by sqrt(8) compared to a true DCT; - * furthermore, we scale the results by 2**PASS1_BITS. - * We must also scale the output by (8/4)*(8/2) = 2**3, which we add here. + * Note results are scaled up by sqrt(8) compared to a true DCT. * 4-point FDCT kernel, * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT]. */ - dataptr = data; - for (ctr = 0; ctr < 2; ctr++) { - elemptr = sample_data[ctr] + start_col; + /* Row 0 */ + elemptr = sample_data[0] + start_col; - /* Even part */ + /* Even part */ - tmp0 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]); - tmp1 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]); + tmp4 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]); + tmp5 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]); - tmp10 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]); - tmp11 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]); + tmp0 = tmp4 + tmp5; + tmp2 = tmp4 - tmp5; - /* Apply unsigned->signed conversion. */ - dataptr[0] = (DCTELEM) - ((tmp0 + tmp1 - 4 * CENTERJSAMPLE) << (PASS1_BITS+3)); - dataptr[2] = (DCTELEM) ((tmp0 - tmp1) << (PASS1_BITS+3)); + /* Odd part */ - /* Odd part */ + z2 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]); + z3 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]); - tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100); /* c6 */ - /* Add fudge factor here for final descale. */ - tmp0 += ONE << (CONST_BITS-PASS1_BITS-4); + z1 = MULTIPLY(z2 + z3, FIX_0_541196100); /* c6 */ + /* Add fudge factor here for final descale. */ + z1 += ONE << (CONST_BITS-3-1); + tmp1 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */ + tmp3 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */ - dataptr[1] = (DCTELEM) - RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */ - CONST_BITS-PASS1_BITS-3); - dataptr[3] = (DCTELEM) - RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */ - CONST_BITS-PASS1_BITS-3); + /* Row 1 */ + elemptr = sample_data[1] + start_col; - dataptr += DCTSIZE; /* advance pointer to next row */ - } + /* Even part */ - /* Pass 2: process columns. - * We remove the PASS1_BITS scaling, but leave the results scaled up - * by an overall factor of 8. - */ + tmp4 = GETJSAMPLE(elemptr[0]) + GETJSAMPLE(elemptr[3]); + tmp5 = GETJSAMPLE(elemptr[1]) + GETJSAMPLE(elemptr[2]); - dataptr = data; - for (ctr = 0; ctr < 4; ctr++) { - /* Even part */ + tmp10 = tmp4 + tmp5; + tmp12 = tmp4 - tmp5; - /* Add fudge factor here for final descale. */ - tmp0 = dataptr[DCTSIZE*0] + (ONE << (PASS1_BITS-1)); - tmp1 = dataptr[DCTSIZE*1]; + /* Odd part */ - dataptr[DCTSIZE*0] = (DCTELEM) RIGHT_SHIFT(tmp0 + tmp1, PASS1_BITS); + z2 = GETJSAMPLE(elemptr[0]) - GETJSAMPLE(elemptr[3]); + z3 = GETJSAMPLE(elemptr[1]) - GETJSAMPLE(elemptr[2]); - /* Odd part */ + z1 = MULTIPLY(z2 + z3, FIX_0_541196100); /* c6 */ + tmp11 = z1 + MULTIPLY(z2, FIX_0_765366865); /* c2-c6 */ + tmp13 = z1 - MULTIPLY(z3, FIX_1_847759065); /* c2+c6 */ - dataptr[DCTSIZE*1] = (DCTELEM) RIGHT_SHIFT(tmp0 - tmp1, PASS1_BITS); + /* Pass 2: process columns. + * We leave the results scaled up by an overall factor of 8. + * We must also scale the output by (8/4)*(8/2) = 2**3. + */ - dataptr++; /* advance pointer to next column */ - } + /* Column 0 */ + /* Apply unsigned->signed conversion. */ + data[DCTSIZE*0] = (tmp0 + tmp10 - 8 * CENTERJSAMPLE) << 3; + data[DCTSIZE*1] = (tmp0 - tmp10) << 3; + + /* Column 1 */ + data[DCTSIZE*0+1] = (DCTELEM) RIGHT_SHIFT(tmp1 + tmp11, CONST_BITS-3); + data[DCTSIZE*1+1] = (DCTELEM) RIGHT_SHIFT(tmp1 - tmp11, CONST_BITS-3); + + /* Column 2 */ + data[DCTSIZE*0+2] = (tmp2 + tmp12) << 3; + data[DCTSIZE*1+2] = (tmp2 - tmp12) << 3; + + /* Column 3 */ + data[DCTSIZE*0+3] = (DCTELEM) RIGHT_SHIFT(tmp3 + tmp13, CONST_BITS-3); + data[DCTSIZE*1+3] = (DCTELEM) RIGHT_SHIFT(tmp3 - tmp13, CONST_BITS-3); } @@ -4312,7 +4318,6 @@ jpeg_fdct_2x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col) /* Pass 1: process rows. * Note results are scaled up by sqrt(8) compared to a true DCT. - * We must also scale the output by (8/2)*(8/4) = 2**3, which we add here. */ dataptr = data; @@ -4325,17 +4330,18 @@ jpeg_fdct_2x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col) tmp1 = GETJSAMPLE(elemptr[1]); /* Apply unsigned->signed conversion. */ - dataptr[0] = (DCTELEM) ((tmp0 + tmp1 - 2 * CENTERJSAMPLE) << 3); + dataptr[0] = (DCTELEM) (tmp0 + tmp1 - 2 * CENTERJSAMPLE); /* Odd part */ - dataptr[1] = (DCTELEM) ((tmp0 - tmp1) << 3); + dataptr[1] = (DCTELEM) (tmp0 - tmp1); dataptr += DCTSIZE; /* advance pointer to next row */ } /* Pass 2: process columns. * We leave the results scaled up by an overall factor of 8. + * We must also scale the output by (8/2)*(8/4) = 2**3. * 4-point FDCT kernel, * cK represents sqrt(2) * cos(K*pi/16) [refers to 8-point FDCT]. */ @@ -4350,21 +4356,21 @@ jpeg_fdct_2x4 (DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col) tmp10 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*3]; tmp11 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*2]; - dataptr[DCTSIZE*0] = (DCTELEM) (tmp0 + tmp1); - dataptr[DCTSIZE*2] = (DCTELEM) (tmp0 - tmp1); + dataptr[DCTSIZE*0] = (DCTELEM) ((tmp0 + tmp1) << 3); + dataptr[DCTSIZE*2] = (DCTELEM) ((tmp0 - tmp1) << 3); /* Odd part */ tmp0 = MULTIPLY(tmp10 + tmp11, FIX_0_541196100); /* c6 */ /* Add fudge factor here for final descale. */ - tmp0 += ONE << (CONST_BITS-1); + tmp0 += ONE << (CONST_BITS-3-1); dataptr[DCTSIZE*1] = (DCTELEM) RIGHT_SHIFT(tmp0 + MULTIPLY(tmp10, FIX_0_765366865), /* c2-c6 */ - CONST_BITS); + CONST_BITS-3); dataptr[DCTSIZE*3] = (DCTELEM) RIGHT_SHIFT(tmp0 - MULTIPLY(tmp11, FIX_1_847759065), /* c2+c6 */ - CONST_BITS); + CONST_BITS-3); dataptr++; /* advance pointer to next column */ } diff --git a/dll/3rdparty/libjpeg/jidctint.c b/dll/3rdparty/libjpeg/jidctint.c index 6437079a31c..e30ec8c8a46 100644 --- a/dll/3rdparty/libjpeg/jidctint.c +++ b/dll/3rdparty/libjpeg/jidctint.c @@ -2,7 +2,7 @@ * jidctint.c * * Copyright (C) 1991-1998, Thomas G. Lane. - * Modification developed 2002-2016 by Guido Vollbeding. + * Modification developed 2002-2018 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -1474,7 +1474,7 @@ jpeg_idct_10x10 (j_decompress_ptr cinfo, jpeg_component_info * compptr, /* * Perform dequantization and inverse DCT on one block of coefficients, - * producing a 11x11 output block. + * producing an 11x11 output block. * * Optimized algorithm with 24 multiplications in the 1-D kernel. * cK represents sqrt(2) * cos(K*pi/22). @@ -3675,7 +3675,7 @@ jpeg_idct_10x5 (j_decompress_ptr cinfo, jpeg_component_info * compptr, /* * Perform dequantization and inverse DCT on one block of coefficients, - * producing a 8x4 output block. + * producing an 8x4 output block. * * 4-point IDCT in pass 1 (columns), 8-point in pass 2 (rows). */ @@ -3835,7 +3835,7 @@ jpeg_idct_8x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr, /* * Perform dequantization and inverse DCT on one block of coefficients, - * producing a reduced-size 6x3 output block. + * producing a 6x3 output block. * * 3-point IDCT in pass 1 (columns), 6-point in pass 2 (rows). */ @@ -4082,7 +4082,7 @@ jpeg_idct_2x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr, /* * Perform dequantization and inverse DCT on one block of coefficients, - * producing a 8x16 output block. + * producing an 8x16 output block. * * 16-point IDCT in pass 1 (columns), 8-point in pass 2 (rows). */ @@ -5004,7 +5004,7 @@ jpeg_idct_4x8 (j_decompress_ptr cinfo, jpeg_component_info * compptr, /* * Perform dequantization and inverse DCT on one block of coefficients, - * producing a reduced-size 3x6 output block. + * producing a 3x6 output block. * * 6-point IDCT in pass 1 (columns), 3-point in pass 2 (rows). */ diff --git a/dll/3rdparty/libjpeg/jmemmgr.c b/dll/3rdparty/libjpeg/jmemmgr.c index 0a137cdde43..40377de4706 100644 --- a/dll/3rdparty/libjpeg/jmemmgr.c +++ b/dll/3rdparty/libjpeg/jmemmgr.c @@ -2,7 +2,7 @@ * jmemmgr.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2011-2012 by Guido Vollbeding. + * Modified 2011-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -130,7 +130,7 @@ typedef struct { jvirt_barray_ptr virt_barray_list; /* This counts total space obtained from jpeg_get_small/large */ - long total_space_allocated; + size_t total_space_allocated; /* alloc_sarray and alloc_barray set this value for use by virtual * array routines. @@ -195,7 +195,7 @@ print_mem_stats (j_common_ptr cinfo, int pool_id) * This is helpful because message parm array can't handle longs. */ fprintf(stderr, "Freeing pool %d, total space = %ld\n", - pool_id, mem->total_space_allocated); + pool_id, (long) mem->total_space_allocated); for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL; lhdr_ptr = lhdr_ptr->hdr.next) { @@ -260,11 +260,11 @@ alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject) { my_mem_ptr mem = (my_mem_ptr) cinfo->mem; small_pool_ptr hdr_ptr, prev_hdr_ptr; - char * data_ptr; size_t odd_bytes, min_request, slop; + char * data_ptr; /* Check for unsatisfiable request (do now to ensure no overflow below) */ - if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr))) + if (sizeofobject > (size_t) MAX_ALLOC_CHUNK - SIZEOF(small_pool_hdr)) out_of_memory(cinfo, 1); /* request exceeds malloc's ability */ /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */ @@ -293,8 +293,8 @@ alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject) else slop = extra_pool_slop[pool_id]; /* Don't ask for more than MAX_ALLOC_CHUNK */ - if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request)) - slop = (size_t) (MAX_ALLOC_CHUNK-min_request); + if (slop > (size_t) MAX_ALLOC_CHUNK - min_request) + slop = (size_t) MAX_ALLOC_CHUNK - min_request; /* Try to get space, if fail reduce slop and try again */ for (;;) { hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop); @@ -348,7 +348,7 @@ alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject) size_t odd_bytes; /* Check for unsatisfiable request (do now to ensure no overflow below) */ - if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr))) + if (sizeofobject > (size_t) MAX_ALLOC_CHUNK - SIZEOF(large_pool_hdr)) out_of_memory(cinfo, 3); /* request exceeds malloc's ability */ /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */ @@ -404,7 +404,7 @@ alloc_sarray (j_common_ptr cinfo, int pool_id, long ltemp; /* Calculate max # of rows allowed in one allocation chunk */ - ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) / + ltemp = (MAX_ALLOC_CHUNK - SIZEOF(large_pool_hdr)) / ((long) samplesperrow * SIZEOF(JSAMPLE)); if (ltemp <= 0) ERREXIT(cinfo, JERR_WIDTH_OVERFLOW); @@ -416,15 +416,14 @@ alloc_sarray (j_common_ptr cinfo, int pool_id, /* Get space for row pointers (small object) */ result = (JSAMPARRAY) alloc_small(cinfo, pool_id, - (size_t) (numrows * SIZEOF(JSAMPROW))); + (size_t) numrows * SIZEOF(JSAMPROW)); /* Get the rows themselves (large objects) */ currow = 0; while (currow < numrows) { rowsperchunk = MIN(rowsperchunk, numrows - currow); workspace = (JSAMPROW) alloc_large(cinfo, pool_id, - (size_t) ((size_t) rowsperchunk * (size_t) samplesperrow - * SIZEOF(JSAMPLE))); + (size_t) rowsperchunk * (size_t) samplesperrow * SIZEOF(JSAMPLE)); for (i = rowsperchunk; i > 0; i--) { result[currow++] = workspace; workspace += samplesperrow; @@ -452,7 +451,7 @@ alloc_barray (j_common_ptr cinfo, int pool_id, long ltemp; /* Calculate max # of rows allowed in one allocation chunk */ - ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) / + ltemp = (MAX_ALLOC_CHUNK - SIZEOF(large_pool_hdr)) / ((long) blocksperrow * SIZEOF(JBLOCK)); if (ltemp <= 0) ERREXIT(cinfo, JERR_WIDTH_OVERFLOW); @@ -464,15 +463,14 @@ alloc_barray (j_common_ptr cinfo, int pool_id, /* Get space for row pointers (small object) */ result = (JBLOCKARRAY) alloc_small(cinfo, pool_id, - (size_t) (numrows * SIZEOF(JBLOCKROW))); + (size_t) numrows * SIZEOF(JBLOCKROW)); /* Get the rows themselves (large objects) */ currow = 0; while (currow < numrows) { rowsperchunk = MIN(rowsperchunk, numrows - currow); workspace = (JBLOCKROW) alloc_large(cinfo, pool_id, - (size_t) ((size_t) rowsperchunk * (size_t) blocksperrow - * SIZEOF(JBLOCK))); + (size_t) rowsperchunk * (size_t) blocksperrow * SIZEOF(JBLOCK)); for (i = rowsperchunk; i > 0; i--) { result[currow++] = workspace; workspace += blocksperrow; @@ -585,8 +583,8 @@ realize_virt_arrays (j_common_ptr cinfo) /* Allocate the in-memory buffers for any unrealized virtual arrays */ { my_mem_ptr mem = (my_mem_ptr) cinfo->mem; - long space_per_minheight, maximum_space, avail_mem; - long minheights, max_minheights; + long bytesperrow, space_per_minheight, maximum_space; + long avail_mem, minheights, max_minheights; jvirt_sarray_ptr sptr; jvirt_barray_ptr bptr; @@ -598,18 +596,16 @@ realize_virt_arrays (j_common_ptr cinfo) maximum_space = 0; for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) { if (sptr->mem_buffer == NULL) { /* if not realized yet */ - space_per_minheight += (long) sptr->maxaccess * - (long) sptr->samplesperrow * SIZEOF(JSAMPLE); - maximum_space += (long) sptr->rows_in_array * - (long) sptr->samplesperrow * SIZEOF(JSAMPLE); + bytesperrow = (long) sptr->samplesperrow * SIZEOF(JSAMPLE); + space_per_minheight += (long) sptr->maxaccess * bytesperrow; + maximum_space += (long) sptr->rows_in_array * bytesperrow; } } for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) { if (bptr->mem_buffer == NULL) { /* if not realized yet */ - space_per_minheight += (long) bptr->maxaccess * - (long) bptr->blocksperrow * SIZEOF(JBLOCK); - maximum_space += (long) bptr->rows_in_array * - (long) bptr->blocksperrow * SIZEOF(JBLOCK); + bytesperrow = (long) bptr->blocksperrow * SIZEOF(JBLOCK); + space_per_minheight += (long) bptr->maxaccess * bytesperrow; + maximum_space += (long) bptr->rows_in_array * bytesperrow; } } @@ -618,7 +614,7 @@ realize_virt_arrays (j_common_ptr cinfo) /* Determine amount of memory to actually use; this is system-dependent. */ avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space, - mem->total_space_allocated); + (long) mem->total_space_allocated); /* If the maximum space needed is available, make all the buffers full * height; otherwise parcel it out with the same number of minheights @@ -694,7 +690,7 @@ do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing) long bytesperrow, file_offset, byte_count, rows, thisrow, i; bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE); - file_offset = ptr->cur_start_row * bytesperrow; + file_offset = (long) ptr->cur_start_row * bytesperrow; /* Loop to read or write each allocation chunk in mem_buffer */ for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) { /* One chunk, but check for short chunk at end of buffer */ @@ -727,7 +723,7 @@ do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing) long bytesperrow, file_offset, byte_count, rows, thisrow, i; bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK); - file_offset = ptr->cur_start_row * bytesperrow; + file_offset = (long) ptr->cur_start_row * bytesperrow; /* Loop to read or write each allocation chunk in mem_buffer */ for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) { /* One chunk, but check for short chunk at end of buffer */ @@ -771,7 +767,7 @@ access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr, /* Make the desired part of the virtual array accessible */ if (start_row < ptr->cur_start_row || - end_row > ptr->cur_start_row+ptr->rows_in_mem) { + end_row > ptr->cur_start_row + ptr->rows_in_mem) { if (! ptr->b_s_open) ERREXIT(cinfo, JERR_VIRTUAL_BUG); /* Flush old buffer contents if necessary */ @@ -856,7 +852,7 @@ access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr, /* Make the desired part of the virtual array accessible */ if (start_row < ptr->cur_start_row || - end_row > ptr->cur_start_row+ptr->rows_in_mem) { + end_row > ptr->cur_start_row + ptr->rows_in_mem) { if (! ptr->b_s_open) ERREXIT(cinfo, JERR_VIRTUAL_BUG); /* Flush old buffer contents if necessary */ @@ -1093,7 +1089,7 @@ jinit_memory_mgr (j_common_ptr cinfo) mem->total_space_allocated = SIZEOF(my_memory_mgr); /* Declare ourselves open for business */ - cinfo->mem = & mem->pub; + cinfo->mem = &mem->pub; /* Check for an environment variable JPEGMEM; if found, override the * default max_memory setting from jpeg_mem_init. Note that the diff --git a/dll/3rdparty/libjpeg/jmemnobs.c b/dll/3rdparty/libjpeg/jmemnobs.c index eb8c337725f..a364cd8223b 100644 --- a/dll/3rdparty/libjpeg/jmemnobs.c +++ b/dll/3rdparty/libjpeg/jmemnobs.c @@ -2,6 +2,7 @@ * jmemnobs.c * * Copyright (C) 1992-1996, Thomas G. Lane. + * Modified 2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -12,7 +13,7 @@ * This is very portable in the sense that it'll compile on almost anything, * but you'd better have lots of main memory (or virtual memory) if you want * to process big images. - * Note that the max_memory_to_use option is ignored by this implementation. + * Note that the max_memory_to_use option is respected by this implementation. */ #define JPEG_INTERNALS @@ -66,13 +67,16 @@ jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject) /* * This routine computes the total memory space available for allocation. - * Here we always say, "we got all you want bud!" */ GLOBAL(long) jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed, long max_bytes_needed, long already_allocated) { + if (cinfo->mem->max_memory_to_use) + return cinfo->mem->max_memory_to_use - already_allocated; + + /* Here we say, "we got all you want bud!" */ return max_bytes_needed; } diff --git a/dll/3rdparty/libjpeg/jpegtran.c b/dll/3rdparty/libjpeg/jpegtran.c index 5269344e171..bfaa8aca759 100644 --- a/dll/3rdparty/libjpeg/jpegtran.c +++ b/dll/3rdparty/libjpeg/jpegtran.c @@ -1,7 +1,7 @@ /* * jpegtran.c * - * Copyright (C) 1995-2013, Thomas G. Lane, Guido Vollbeding. + * Copyright (C) 1995-2019, Thomas G. Lane, Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -37,6 +37,7 @@ static const char * progname; /* program name for error messages */ static char * outfilename; /* for -outfile switch */ +static char * dropfilename; /* for -drop switch */ static char * scaleoption; /* -scale switch */ static JCOPY_OPTION copyoption; /* -copy switch */ static jpeg_transform_info transformoption; /* image transformation options */ @@ -66,6 +67,7 @@ usage (void) fprintf(stderr, "Switches for modifying the image:\n"); #if TRANSFORMS_SUPPORTED fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular subarea\n"); + fprintf(stderr, " -drop +X+Y filename Drop another image\n"); fprintf(stderr, " -flip [horizontal|vertical] Mirror image (left-right or top-bottom)\n"); fprintf(stderr, " -grayscale Reduce to grayscale (omit color data)\n"); fprintf(stderr, " -perfect Fail if there is non-transformable edge blocks\n"); @@ -76,6 +78,7 @@ usage (void) fprintf(stderr, " -transpose Transpose image\n"); fprintf(stderr, " -transverse Transverse transpose image\n"); fprintf(stderr, " -trim Drop non-transformable edge blocks\n"); + fprintf(stderr, " with -drop: Requantize drop file to source file\n"); fprintf(stderr, " -wipe WxH+X+Y Wipe (gray out) a rectangular subarea\n"); #endif fprintf(stderr, "Switches for advanced users:\n"); @@ -188,7 +191,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, #if TRANSFORMS_SUPPORTED if (++argn >= argc) /* advance to next argument */ usage(); - if (transformoption.crop /* reject multiple crop/wipe requests */ || + if (transformoption.crop /* reject multiple crop/drop/wipe requests */ || ! jtransform_parse_crop_spec(&transformoption, argv[argn])) { fprintf(stderr, "%s: bogus -crop argument '%s'\n", progname, argv[argn]); @@ -198,6 +201,26 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, select_transform(JXFORM_NONE); /* force an error */ #endif + } else if (keymatch(arg, "drop", 2)) { +#if TRANSFORMS_SUPPORTED + if (++argn >= argc) /* advance to next argument */ + usage(); + if (transformoption.crop /* reject multiple crop/drop/wipe requests */ || + ! jtransform_parse_crop_spec(&transformoption, argv[argn]) || + transformoption.crop_width_set != JCROP_UNSET || + transformoption.crop_height_set != JCROP_UNSET) { + fprintf(stderr, "%s: bogus -drop argument '%s'\n", + progname, argv[argn]); + exit(EXIT_FAILURE); + } + if (++argn >= argc) /* advance to next argument */ + usage(); + dropfilename = argv[argn]; + select_transform(JXFORM_DROP); +#else + select_transform(JXFORM_NONE); /* force an error */ +#endif + } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) { /* Enable debug printouts. */ /* On first -d, print version identification */ @@ -342,7 +365,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, #if TRANSFORMS_SUPPORTED if (++argn >= argc) /* advance to next argument */ usage(); - if (transformoption.crop /* reject multiple crop/wipe requests */ || + if (transformoption.crop /* reject multiple crop/drop/wipe requests */ || ! jtransform_parse_crop_spec(&transformoption, argv[argn])) { fprintf(stderr, "%s: bogus -wipe argument '%s'\n", progname, argv[argn]); @@ -386,8 +409,14 @@ int main (int argc, char **argv) { struct jpeg_decompress_struct srcinfo; + struct jpeg_error_mgr jsrcerr; +#if TRANSFORMS_SUPPORTED + struct jpeg_decompress_struct dropinfo; + struct jpeg_error_mgr jdroperr; + FILE * drop_file; +#endif struct jpeg_compress_struct dstinfo; - struct jpeg_error_mgr jsrcerr, jdsterr; + struct jpeg_error_mgr jdsterr; #ifdef PROGRESS_REPORT struct cdjpeg_progress_mgr progress; #endif @@ -427,7 +456,7 @@ main (int argc, char **argv) * values read here are mostly ignored; we will rescan the switches after * opening the input file. Also note that most of the switches affect the * destination JPEG object, so we parse into that and then copy over what - * needs to affects the source too. + * needs to affect the source too. */ file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE); @@ -469,6 +498,21 @@ main (int argc, char **argv) fp = read_stdin(); } +#if TRANSFORMS_SUPPORTED + /* Open the drop file. */ + if (dropfilename != NULL) { + if ((drop_file = fopen(dropfilename, READ_BINARY)) == NULL) { + fprintf(stderr, "%s: can't open %s for reading\n", progname, dropfilename); + exit(EXIT_FAILURE); + } + dropinfo.err = jpeg_std_error(&jdroperr); + jpeg_create_decompress(&dropinfo); + jpeg_stdio_src(&dropinfo, drop_file); + } else { + drop_file = NULL; + } +#endif + #ifdef PROGRESS_REPORT start_progress_monitor((j_common_ptr) &dstinfo, &progress); #endif @@ -488,6 +532,17 @@ main (int argc, char **argv) &srcinfo.scale_num, &srcinfo.scale_denom) < 1) usage(); +#if TRANSFORMS_SUPPORTED + if (dropfilename != NULL) { + (void) jpeg_read_header(&dropinfo, TRUE); + transformoption.crop_width = dropinfo.image_width; + transformoption.crop_width_set = JCROP_POS; + transformoption.crop_height = dropinfo.image_height; + transformoption.crop_height_set = JCROP_POS; + transformoption.drop_ptr = &dropinfo; + } +#endif + /* Any space needed by a transform option must be requested before * jpeg_read_coefficients so that memory allocation will be done right. */ @@ -503,6 +558,12 @@ main (int argc, char **argv) /* Read source file as DCT coefficients */ src_coef_arrays = jpeg_read_coefficients(&srcinfo); +#if TRANSFORMS_SUPPORTED + if (dropfilename != NULL) { + transformoption.drop_coef_arrays = jpeg_read_coefficients(&dropinfo); + } +#endif + /* Initialize destination compression parameters from source values */ jpeg_copy_critical_parameters(&srcinfo, &dstinfo); @@ -560,18 +621,34 @@ main (int argc, char **argv) /* Finish compression and release memory */ jpeg_finish_compress(&dstinfo); jpeg_destroy_compress(&dstinfo); +#if TRANSFORMS_SUPPORTED + if (dropfilename != NULL) { + (void) jpeg_finish_decompress(&dropinfo); + jpeg_destroy_decompress(&dropinfo); + } +#endif (void) jpeg_finish_decompress(&srcinfo); jpeg_destroy_decompress(&srcinfo); /* Close output file, if we opened it */ if (fp != stdout) fclose(fp); +#if TRANSFORMS_SUPPORTED + if (drop_file != NULL) + fclose(drop_file); +#endif #ifdef PROGRESS_REPORT end_progress_monitor((j_common_ptr) &dstinfo); #endif /* All done. */ - exit(jsrcerr.num_warnings + jdsterr.num_warnings ?EXIT_WARNING:EXIT_SUCCESS); - return 0; /* suppress no-return-value warnings */ +#if TRANSFORMS_SUPPORTED + if (dropfilename != NULL) + exit(jsrcerr.num_warnings + jdroperr.num_warnings + + jdsterr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS); +#endif + exit(jsrcerr.num_warnings + jdsterr.num_warnings ? + EXIT_WARNING : EXIT_SUCCESS); + return 0; /* suppress no-return-value warnings */ } diff --git a/dll/3rdparty/libjpeg/jutils.c b/dll/3rdparty/libjpeg/jutils.c index 5b16b6d03c0..1e2dfb017b0 100644 --- a/dll/3rdparty/libjpeg/jutils.c +++ b/dll/3rdparty/libjpeg/jutils.c @@ -2,7 +2,7 @@ * jutils.c * * Copyright (C) 1991-1996, Thomas G. Lane. - * Modified 2009-2011 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -185,7 +185,7 @@ jcopy_sample_rows (JSAMPARRAY input_array, int source_row, { register JSAMPROW inptr, outptr; #ifdef FMEMCOPY - register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE)); + register size_t count = (size_t) num_cols * SIZEOF(JSAMPLE); #else register JDIMENSION count; #endif @@ -213,7 +213,7 @@ jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, /* Copy a row of coefficient blocks from one place to another. */ { #ifdef FMEMCOPY - FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF))); + FMEMCOPY(output_row, input_row, (size_t) num_blocks * (DCTSIZE2 * SIZEOF(JCOEF))); #else register JCOEFPTR inptr, outptr; register long count; diff --git a/dll/3rdparty/libjpeg/rdbmp.c b/dll/3rdparty/libjpeg/rdbmp.c index 6639ad06cb7..6749ea0146f 100644 --- a/dll/3rdparty/libjpeg/rdbmp.c +++ b/dll/3rdparty/libjpeg/rdbmp.c @@ -2,7 +2,7 @@ * rdbmp.c * * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009-2017 by Guido Vollbeding. + * Modified 2009-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -33,11 +33,10 @@ typedef unsigned char U_CHAR; #define UCH(x) ((int) (x)) #else /* !HAVE_UNSIGNED_CHAR */ -#ifdef CHAR_IS_UNSIGNED typedef char U_CHAR; +#ifdef CHAR_IS_UNSIGNED #define UCH(x) ((int) (x)) #else -typedef char U_CHAR; #define UCH(x) ((int) (x) & 0xFF) #endif #endif /* HAVE_UNSIGNED_CHAR */ @@ -105,7 +104,6 @@ read_colormap (bmp_source_ptr sinfo, int cmaplen, int mapentrysize) break; default: ERREXIT(sinfo->cinfo, JERR_BMP_BADCMAP); - break; } } @@ -122,7 +120,6 @@ get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* This version is for reading 8-bit colormap indexes */ { bmp_source_ptr source = (bmp_source_ptr) sinfo; - JSAMPARRAY image_ptr; register JSAMPROW inptr, outptr; register JSAMPARRAY colormap; register JDIMENSION col; @@ -131,12 +128,10 @@ get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* Fetch next row from virtual array */ source->source_row--; - image_ptr = (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->whole_image, - source->source_row, (JDIMENSION) 1, FALSE); + inptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->whole_image, source->source_row, (JDIMENSION) 1, FALSE); /* Expand the colormap indexes to real data */ - inptr = image_ptr[0]; outptr = source->pub.buffer[0]; colormap = source->colormap; cmaplen = source->cmap_length; @@ -152,26 +147,22 @@ get_8bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) return 1; } - METHODDEF(JDIMENSION) get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* This version is for reading 24-bit pixels */ { bmp_source_ptr source = (bmp_source_ptr) sinfo; - JSAMPARRAY image_ptr; register JSAMPROW inptr, outptr; register JDIMENSION col; /* Fetch next row from virtual array */ source->source_row--; - image_ptr = (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->whole_image, - source->source_row, (JDIMENSION) 1, FALSE); + inptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->whole_image, source->source_row, (JDIMENSION) 1, FALSE); /* Transfer data. Note source values are in BGR order * (even though Microsoft's own documents say the opposite). */ - inptr = image_ptr[0]; outptr = source->pub.buffer[0]; for (col = cinfo->image_width; col > 0; col--) { outptr[2] = *inptr++; /* can omit GETJSAMPLE() safely */ @@ -183,26 +174,22 @@ get_24bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) return 1; } - METHODDEF(JDIMENSION) get_32bit_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* This version is for reading 32-bit pixels */ { bmp_source_ptr source = (bmp_source_ptr) sinfo; - JSAMPARRAY image_ptr; register JSAMPROW inptr, outptr; register JDIMENSION col; /* Fetch next row from virtual array */ source->source_row--; - image_ptr = (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->whole_image, - source->source_row, (JDIMENSION) 1, FALSE); + inptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->whole_image, source->source_row, (JDIMENSION) 1, FALSE); /* Transfer data. Note source values are in BGR order * (even though Microsoft's own documents say the opposite). */ - inptr = image_ptr[0]; outptr = source->pub.buffer[0]; for (col = cinfo->image_width; col > 0; col--) { outptr[2] = *inptr++; /* can omit GETJSAMPLE() safely */ @@ -229,7 +216,6 @@ preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) register FILE *infile = source->pub.input_file; register int c; register JSAMPROW out_ptr; - JSAMPARRAY image_ptr; JDIMENSION row, col; cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress; @@ -240,10 +226,8 @@ preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) progress->pub.pass_limit = (long) cinfo->image_height; (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); } - image_ptr = (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->whole_image, - row, (JDIMENSION) 1, TRUE); - out_ptr = image_ptr[0]; + out_ptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->whole_image, row, (JDIMENSION) 1, TRUE); for (col = source->row_width; col > 0; col--) { /* inline copy of read_byte() for speed */ if ((c = getc(infile)) == EOF) @@ -285,12 +269,12 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) bmp_source_ptr source = (bmp_source_ptr) sinfo; U_CHAR bmpfileheader[14]; U_CHAR bmpinfoheader[64]; -#define GET_2B(array,offset) ((unsigned int) UCH(array[offset]) + \ - (((unsigned int) UCH(array[offset+1])) << 8)) -#define GET_4B(array,offset) ((INT32) UCH(array[offset]) + \ - (((INT32) UCH(array[offset+1])) << 8) + \ - (((INT32) UCH(array[offset+2])) << 16) + \ - (((INT32) UCH(array[offset+3])) << 24)) +#define GET_2B(array, offset) ((unsigned int) UCH(array[offset]) + \ + (((unsigned int) UCH(array[offset+1])) << 8)) +#define GET_4B(array, offset) ((INT32) UCH(array[offset]) + \ + (((INT32) UCH(array[offset+1])) << 8) + \ + (((INT32) UCH(array[offset+2])) << 16) + \ + (((INT32) UCH(array[offset+3])) << 24)) INT32 bfOffBits; INT32 headerSize; INT32 biWidth; @@ -306,9 +290,9 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* Read and verify the bitmap file header */ if (! ReadOK(source->pub.input_file, bmpfileheader, 14)) ERREXIT(cinfo, JERR_INPUT_EOF); - if (GET_2B(bmpfileheader,0) != 0x4D42) /* 'BM' */ + if (GET_2B(bmpfileheader, 0) != 0x4D42) /* 'BM' */ ERREXIT(cinfo, JERR_BMP_NOT); - bfOffBits = GET_4B(bmpfileheader,10); + bfOffBits = GET_4B(bmpfileheader, 10); /* We ignore the remaining fileheader fields */ /* The infoheader might be 12 bytes (OS/2 1.x), 40 bytes (Windows), @@ -316,19 +300,19 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) */ if (! ReadOK(source->pub.input_file, bmpinfoheader, 4)) ERREXIT(cinfo, JERR_INPUT_EOF); - headerSize = GET_4B(bmpinfoheader,0); + headerSize = GET_4B(bmpinfoheader, 0); if (headerSize < 12 || headerSize > 64) ERREXIT(cinfo, JERR_BMP_BADHEADER); - if (! ReadOK(source->pub.input_file, bmpinfoheader+4, headerSize-4)) + if (! ReadOK(source->pub.input_file, bmpinfoheader + 4, headerSize - 4)) ERREXIT(cinfo, JERR_INPUT_EOF); switch ((int) headerSize) { case 12: /* Decode OS/2 1.x header (Microsoft calls this a BITMAPCOREHEADER) */ - biWidth = (INT32) GET_2B(bmpinfoheader,4); - biHeight = (INT32) GET_2B(bmpinfoheader,6); - biPlanes = GET_2B(bmpinfoheader,8); - source->bits_per_pixel = (int) GET_2B(bmpinfoheader,10); + biWidth = (INT32) GET_2B(bmpinfoheader, 4); + biHeight = (INT32) GET_2B(bmpinfoheader, 6); + biPlanes = GET_2B(bmpinfoheader, 8); + source->bits_per_pixel = (int) GET_2B(bmpinfoheader, 10); switch (source->bits_per_pixel) { case 8: /* colormapped image */ @@ -342,21 +326,20 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; default: ERREXIT(cinfo, JERR_BMP_BADDEPTH); - break; } break; case 40: case 64: /* Decode Windows 3.x header (Microsoft calls this a BITMAPINFOHEADER) */ /* or OS/2 2.x header, which has additional fields that we ignore */ - biWidth = GET_4B(bmpinfoheader,4); - biHeight = GET_4B(bmpinfoheader,8); - biPlanes = GET_2B(bmpinfoheader,12); - source->bits_per_pixel = (int) GET_2B(bmpinfoheader,14); - biCompression = GET_4B(bmpinfoheader,16); - biXPelsPerMeter = GET_4B(bmpinfoheader,24); - biYPelsPerMeter = GET_4B(bmpinfoheader,28); - biClrUsed = GET_4B(bmpinfoheader,32); + biWidth = GET_4B(bmpinfoheader, 4); + biHeight = GET_4B(bmpinfoheader, 8); + biPlanes = GET_2B(bmpinfoheader, 12); + source->bits_per_pixel = (int) GET_2B(bmpinfoheader, 14); + biCompression = GET_4B(bmpinfoheader, 16); + biXPelsPerMeter = GET_4B(bmpinfoheader, 24); + biYPelsPerMeter = GET_4B(bmpinfoheader, 28); + biClrUsed = GET_4B(bmpinfoheader, 32); /* biSizeImage, biClrImportant fields are ignored */ switch (source->bits_per_pixel) { @@ -371,7 +354,6 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; default: ERREXIT(cinfo, JERR_BMP_BADDEPTH); - break; } if (biCompression != 0) ERREXIT(cinfo, JERR_BMP_COMPRESSED); @@ -404,9 +386,8 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) else if (biClrUsed > 256) ERREXIT(cinfo, JERR_BMP_BADCMAP); /* Allocate space to store the colormap */ - source->colormap = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, - (JDIMENSION) biClrUsed, (JDIMENSION) 3); + source->colormap = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) biClrUsed, (JDIMENSION) 3); source->cmap_length = (int) biClrUsed; /* and read it from the file */ read_colormap(source, (int) biClrUsed, mapentrysize); @@ -442,9 +423,8 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) } /* Allocate one-row buffer for returned data */ - source->pub.buffer = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, - (JDIMENSION) (biWidth * 3), (JDIMENSION) 1); + source->pub.buffer = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) (biWidth * 3), (JDIMENSION) 1); source->pub.buffer_height = 1; cinfo->in_color_space = JCS_RGB; @@ -476,9 +456,8 @@ jinit_read_bmp (j_compress_ptr cinfo) bmp_source_ptr source; /* Create module interface object */ - source = (bmp_source_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(bmp_source_struct)); + source = (bmp_source_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(bmp_source_struct)); source->cinfo = cinfo; /* make back link for subroutines */ /* Fill in method ptrs, except get_pixel_rows which start_input sets */ source->pub.start_input = start_input_bmp; diff --git a/dll/3rdparty/libjpeg/rdgif.c b/dll/3rdparty/libjpeg/rdgif.c index b27c1675d76..08803ae263b 100644 --- a/dll/3rdparty/libjpeg/rdgif.c +++ b/dll/3rdparty/libjpeg/rdgif.c @@ -1,28 +1,659 @@ /* * rdgif.c * - * Copyright (C) 1991-1997, Thomas G. Lane. + * Copyright (C) 1991-1996, Thomas G. Lane. + * Modified 2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * * This file contains routines to read input images in GIF format. * - ***************************************************************************** - * NOTE: to avoid entanglements with Unisys' patent on LZW compression, * - * the ability to read GIF files has been removed from the IJG distribution. * - * Sorry about that. * - ***************************************************************************** - * - * We are required to state that - * "The Graphics Interchange Format(c) is the Copyright property of - * CompuServe Incorporated. GIF(sm) is a Service Mark property of - * CompuServe Incorporated." + * These routines may need modification for non-Unix environments or + * specialized applications. As they stand, they assume input from + * an ordinary stdio stream. They further assume that reading begins + * at the start of the file; start_input may need work if the + * user interface has already read some data (e.g., to determine that + * the file is indeed GIF format). + */ + +/* + * This code is loosely based on giftoppm from the PBMPLUS distribution + * of Feb. 1991. That file contains the following copyright notice: + * +-------------------------------------------------------------------+ + * | Copyright 1990, David Koblas. | + * | Permission to use, copy, modify, and distribute this software | + * | and its documentation for any purpose and without fee is hereby | + * | granted, provided that the above copyright notice appear in all | + * | copies and that both that copyright notice and this permission | + * | notice appear in supporting documentation. This software is | + * | provided "as is" without express or implied warranty. | + * +-------------------------------------------------------------------+ */ #include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ #ifdef GIF_SUPPORTED + +/* Macros to deal with unsigned chars as efficiently as compiler allows */ + +#ifdef HAVE_UNSIGNED_CHAR +typedef unsigned char U_CHAR; +#define UCH(x) ((int) (x)) +#else /* !HAVE_UNSIGNED_CHAR */ +typedef char U_CHAR; +#ifdef CHAR_IS_UNSIGNED +#define UCH(x) ((int) (x)) +#else +#define UCH(x) ((int) (x) & 0xFF) +#endif +#endif /* HAVE_UNSIGNED_CHAR */ + + +#define ReadOK(file,buffer,len) (JFREAD(file,buffer,len) == ((size_t) (len))) + + +#define MAXCOLORMAPSIZE 256 /* max # of colors in a GIF colormap */ +#define NUMCOLORS 3 /* # of colors */ +#define CM_RED 0 /* color component numbers */ +#define CM_GREEN 1 +#define CM_BLUE 2 + +#define MAX_LZW_BITS 12 /* maximum LZW code size */ +#define LZW_TABLE_SIZE (1<<MAX_LZW_BITS) /* # of possible LZW symbols */ + +/* Macros for extracting header data --- note we assume chars may be signed */ + +#define LM_to_uint(array, offset) ((unsigned int) UCH(array[offset]) + \ + (((unsigned int) UCH(array[offset+1])) << 8)) + +#define BitSet(byte, bit) ((byte) & (bit)) +#define INTERLACE 0x40 /* mask for bit signifying interlaced image */ +#define COLORMAPFLAG 0x80 /* mask for bit signifying colormap presence */ + + +/* + * LZW decompression tables look like this: + * symbol_head[K] = prefix symbol of any LZW symbol K (0..LZW_TABLE_SIZE-1) + * symbol_tail[K] = suffix byte of any LZW symbol K (0..LZW_TABLE_SIZE-1) + * Note that entries 0..end_code of the above tables are not used, + * since those symbols represent raw bytes or special codes. + * + * The stack represents the not-yet-used expansion of the last LZW symbol. + * In the worst case, a symbol could expand to as many bytes as there are + * LZW symbols, so we allocate LZW_TABLE_SIZE bytes for the stack. + * (This is conservative since that number includes the raw-byte symbols.) + * + * The tables are allocated from FAR heap space since they would use up + * rather a lot of the near data space in a PC. + */ + + +/* Private version of data source object */ + +typedef struct { + struct cjpeg_source_struct pub; /* public fields */ + + j_compress_ptr cinfo; /* back link saves passing separate parm */ + + JSAMPARRAY colormap; /* GIF colormap (converted to my format) */ + + /* State for GetCode and LZWReadByte */ + U_CHAR code_buf[256+4]; /* current input data block */ + int last_byte; /* # of bytes in code_buf */ + int last_bit; /* # of bits in code_buf */ + int cur_bit; /* next bit index to read */ + boolean first_time; /* flags first call to GetCode */ + boolean out_of_blocks; /* TRUE if hit terminator data block */ + + int input_code_size; /* codesize given in GIF file */ + int clear_code, end_code; /* values for Clear and End codes */ + + int code_size; /* current actual code size */ + int limit_code; /* 2^code_size */ + int max_code; /* first unused code value */ + + /* Private state for LZWReadByte */ + int oldcode; /* previous LZW symbol */ + int firstcode; /* first byte of oldcode's expansion */ + + /* LZW symbol table and expansion stack */ + UINT16 FAR *symbol_head; /* => table of prefix symbols */ + UINT8 FAR *symbol_tail; /* => table of suffix bytes */ + UINT8 FAR *symbol_stack; /* => stack for symbol expansions */ + UINT8 FAR *sp; /* stack pointer */ + + /* State for interlaced image processing */ + boolean is_interlaced; /* TRUE if have interlaced image */ + jvirt_sarray_ptr interlaced_image; /* full image in interlaced order */ + JDIMENSION cur_row_number; /* need to know actual row number */ + JDIMENSION pass2_offset; /* # of pixel rows in pass 1 */ + JDIMENSION pass3_offset; /* # of pixel rows in passes 1&2 */ + JDIMENSION pass4_offset; /* # of pixel rows in passes 1,2,3 */ +} gif_source_struct; + +typedef gif_source_struct * gif_source_ptr; + + +/* Forward declarations */ +METHODDEF(JDIMENSION) get_pixel_rows + JPP((j_compress_ptr cinfo, cjpeg_source_ptr sinfo)); +METHODDEF(JDIMENSION) load_interlaced_image + JPP((j_compress_ptr cinfo, cjpeg_source_ptr sinfo)); +METHODDEF(JDIMENSION) get_interlaced_row + JPP((j_compress_ptr cinfo, cjpeg_source_ptr sinfo)); + + +LOCAL(int) +ReadByte (gif_source_ptr sinfo) +/* Read next byte from GIF file */ +{ + register FILE *infile = sinfo->pub.input_file; + register int c; + + if ((c = getc(infile)) == EOF) + ERREXIT(sinfo->cinfo, JERR_INPUT_EOF); + return c; +} + + +LOCAL(int) +GetDataBlock (gif_source_ptr sinfo, U_CHAR *buf) +/* Read a GIF data block, which has a leading count byte */ +/* A zero-length block marks the end of a data block sequence */ +{ + int count; + + count = ReadByte(sinfo); + if (count > 0) { + if (! ReadOK(sinfo->pub.input_file, buf, count)) + ERREXIT(sinfo->cinfo, JERR_INPUT_EOF); + } + return count; +} + + +LOCAL(void) +SkipDataBlocks (gif_source_ptr sinfo) +/* Skip a series of data blocks, until a block terminator is found */ +{ + U_CHAR buf[256]; + + while (GetDataBlock(sinfo, buf) > 0) + /* skip */; +} + + +LOCAL(void) +ReInitLZW (gif_source_ptr sinfo) +/* (Re)initialize LZW state; shared code for startup and Clear processing */ +{ + sinfo->code_size = sinfo->input_code_size + 1; + sinfo->limit_code = sinfo->clear_code << 1; /* 2^code_size */ + sinfo->max_code = sinfo->clear_code + 2; /* first unused code value */ + sinfo->sp = sinfo->symbol_stack; /* init stack to empty */ +} + + +LOCAL(void) +InitLZWCode (gif_source_ptr sinfo) +/* Initialize for a series of LZWReadByte (and hence GetCode) calls */ +{ + /* GetCode initialization */ + sinfo->last_byte = 2; /* make safe to "recopy last two bytes" */ + sinfo->code_buf[0] = 0; + sinfo->code_buf[1] = 0; + sinfo->last_bit = 0; /* nothing in the buffer */ + sinfo->cur_bit = 0; /* force buffer load on first call */ + sinfo->first_time = TRUE; + sinfo->out_of_blocks = FALSE; + + /* LZWReadByte initialization: */ + /* compute special code values (note that these do not change later) */ + sinfo->clear_code = 1 << sinfo->input_code_size; + sinfo->end_code = sinfo->clear_code + 1; + ReInitLZW(sinfo); +} + + +LOCAL(int) +GetCode (gif_source_ptr sinfo) +/* Fetch the next code_size bits from the GIF data */ +/* We assume code_size is less than 16 */ +{ + register INT32 accum; + int offs, count; + + while (sinfo->cur_bit + sinfo->code_size > sinfo->last_bit) { + /* Time to reload the buffer */ + /* First time, share code with Clear case */ + if (sinfo->first_time) { + sinfo->first_time = FALSE; + return sinfo->clear_code; + } + if (sinfo->out_of_blocks) { + WARNMS(sinfo->cinfo, JWRN_GIF_NOMOREDATA); + return sinfo->end_code; /* fake something useful */ + } + /* preserve last two bytes of what we have -- assume code_size <= 16 */ + sinfo->code_buf[0] = sinfo->code_buf[sinfo->last_byte-2]; + sinfo->code_buf[1] = sinfo->code_buf[sinfo->last_byte-1]; + /* Load more bytes; set flag if we reach the terminator block */ + if ((count = GetDataBlock(sinfo, &sinfo->code_buf[2])) == 0) { + sinfo->out_of_blocks = TRUE; + WARNMS(sinfo->cinfo, JWRN_GIF_NOMOREDATA); + return sinfo->end_code; /* fake something useful */ + } + /* Reset counters */ + sinfo->cur_bit = (sinfo->cur_bit - sinfo->last_bit) + 16; + sinfo->last_byte = 2 + count; + sinfo->last_bit = sinfo->last_byte * 8; + } + + /* Form up next 24 bits in accum */ + offs = sinfo->cur_bit >> 3; /* byte containing cur_bit */ + accum = (INT32) UCH(sinfo->code_buf[offs+2]); + accum <<= 8; + accum |= (INT32) UCH(sinfo->code_buf[offs+1]); + accum <<= 8; + accum |= (INT32) UCH(sinfo->code_buf[offs]); + + /* Right-align cur_bit in accum, then mask off desired number of bits */ + accum >>= (sinfo->cur_bit & 7); + sinfo->cur_bit += sinfo->code_size; + return ((int) accum) & ((1 << sinfo->code_size) - 1); +} + + +LOCAL(int) +LZWReadByte (gif_source_ptr sinfo) +/* Read an LZW-compressed byte */ +{ + register int code; /* current working code */ + int incode; /* saves actual input code */ + + /* If any codes are stacked from a previously read symbol, return them */ + if (sinfo->sp > sinfo->symbol_stack) + return (int) *(-- sinfo->sp); + + /* Time to read a new symbol */ + code = GetCode(sinfo); + + if (code == sinfo->clear_code) { + /* Reinit state, swallow any extra Clear codes, and */ + /* return next code, which is expected to be a raw byte. */ + ReInitLZW(sinfo); + do { + code = GetCode(sinfo); + } while (code == sinfo->clear_code); + if (code > sinfo->clear_code) { /* make sure it is a raw byte */ + WARNMS(sinfo->cinfo, JWRN_GIF_BADDATA); + code = 0; /* use something valid */ + } + /* make firstcode, oldcode valid! */ + sinfo->firstcode = sinfo->oldcode = code; + return code; + } + + if (code == sinfo->end_code) { + /* Skip the rest of the image, unless GetCode already read terminator */ + if (! sinfo->out_of_blocks) { + SkipDataBlocks(sinfo); + sinfo->out_of_blocks = TRUE; + } + /* Complain that there's not enough data */ + WARNMS(sinfo->cinfo, JWRN_GIF_ENDCODE); + /* Pad data with 0's */ + return 0; /* fake something usable */ + } + + /* Got normal raw byte or LZW symbol */ + incode = code; /* save for a moment */ + + if (code >= sinfo->max_code) { /* special case for not-yet-defined symbol */ + /* code == max_code is OK; anything bigger is bad data */ + if (code > sinfo->max_code) { + WARNMS(sinfo->cinfo, JWRN_GIF_BADDATA); + incode = 0; /* prevent creation of loops in symbol table */ + } + /* this symbol will be defined as oldcode/firstcode */ + *(sinfo->sp++) = (UINT8) sinfo->firstcode; + code = sinfo->oldcode; + } + + /* If it's a symbol, expand it into the stack */ + while (code >= sinfo->clear_code) { + *(sinfo->sp++) = sinfo->symbol_tail[code]; /* tail is a byte value */ + code = sinfo->symbol_head[code]; /* head is another LZW symbol */ + } + /* At this point code just represents a raw byte */ + sinfo->firstcode = code; /* save for possible future use */ + + /* If there's room in table... */ + if ((code = sinfo->max_code) < LZW_TABLE_SIZE) { + /* Define a new symbol = prev sym + head of this sym's expansion */ + sinfo->symbol_head[code] = (UINT16) sinfo->oldcode; + sinfo->symbol_tail[code] = (UINT8) sinfo->firstcode; + sinfo->max_code++; + /* Is it time to increase code_size? */ + if (sinfo->max_code >= sinfo->limit_code && + sinfo->code_size < MAX_LZW_BITS) { + sinfo->code_size++; + sinfo->limit_code <<= 1; /* keep equal to 2^code_size */ + } + } + + sinfo->oldcode = incode; /* save last input symbol for future use */ + return sinfo->firstcode; /* return first byte of symbol's expansion */ +} + + +LOCAL(void) +ReadColorMap (gif_source_ptr sinfo, int cmaplen, JSAMPARRAY cmap) +/* Read a GIF colormap */ +{ + int i; + + for (i = 0; i < cmaplen; i++) { +#if BITS_IN_JSAMPLE == 8 +#define UPSCALE(x) (x) +#else +#define UPSCALE(x) ((x) << (BITS_IN_JSAMPLE-8)) +#endif + cmap[CM_RED ][i] = (JSAMPLE) UPSCALE(ReadByte(sinfo)); + cmap[CM_GREEN][i] = (JSAMPLE) UPSCALE(ReadByte(sinfo)); + cmap[CM_BLUE ][i] = (JSAMPLE) UPSCALE(ReadByte(sinfo)); + } +} + + +LOCAL(void) +DoExtension (gif_source_ptr sinfo) +/* Process an extension block */ +/* Currently we ignore 'em all */ +{ + int extlabel; + + /* Read extension label byte */ + extlabel = ReadByte(sinfo); + TRACEMS1(sinfo->cinfo, 1, JTRC_GIF_EXTENSION, extlabel); + /* Skip the data block(s) associated with the extension */ + SkipDataBlocks(sinfo); +} + + +/* + * Read the file header; return image size and component count. + */ + +METHODDEF(void) +start_input_gif (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) +{ + gif_source_ptr source = (gif_source_ptr) sinfo; + U_CHAR hdrbuf[10]; /* workspace for reading control blocks */ + unsigned int width, height; /* image dimensions */ + int colormaplen, aspectRatio; + int c; + + /* Read and verify GIF Header */ + if (! ReadOK(source->pub.input_file, hdrbuf, 6)) + ERREXIT(cinfo, JERR_GIF_NOT); + if (hdrbuf[0] != 'G' || hdrbuf[1] != 'I' || hdrbuf[2] != 'F') + ERREXIT(cinfo, JERR_GIF_NOT); + /* Check for expected version numbers. + * If unknown version, give warning and try to process anyway; + * this is per recommendation in GIF89a standard. + */ + if ((hdrbuf[3] != '8' || hdrbuf[4] != '7' || hdrbuf[5] != 'a') && + (hdrbuf[3] != '8' || hdrbuf[4] != '9' || hdrbuf[5] != 'a')) + TRACEMS3(cinfo, 1, JTRC_GIF_BADVERSION, hdrbuf[3], hdrbuf[4], hdrbuf[5]); + + /* Read and decipher Logical Screen Descriptor */ + if (! ReadOK(source->pub.input_file, hdrbuf, 7)) + ERREXIT(cinfo, JERR_INPUT_EOF); + width = LM_to_uint(hdrbuf, 0); + height = LM_to_uint(hdrbuf, 2); + /* we ignore the color resolution, sort flag, and background color index */ + aspectRatio = UCH(hdrbuf[6]); + if (aspectRatio != 0 && aspectRatio != 49) + TRACEMS(cinfo, 1, JTRC_GIF_NONSQUARE); + + /* Allocate space to store the colormap */ + source->colormap = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) MAXCOLORMAPSIZE, (JDIMENSION) NUMCOLORS); + colormaplen = 0; /* indicate initialization */ + + /* Read global colormap if header indicates it is present */ + if (BitSet(hdrbuf[4], COLORMAPFLAG)) { + colormaplen = 2 << (hdrbuf[4] & 0x07); + ReadColorMap(source, colormaplen, source->colormap); + } + + /* Scan until we reach start of desired image. + * We don't currently support skipping images, but could add it easily. + */ + for (;;) { + c = ReadByte(source); + + if (c == ';') /* GIF terminator?? */ + ERREXIT(cinfo, JERR_GIF_IMAGENOTFOUND); + + if (c == '!') { /* Extension */ + DoExtension(source); + continue; + } + + if (c != ',') { /* Not an image separator? */ + WARNMS1(cinfo, JWRN_GIF_CHAR, c); + continue; + } + + /* Read and decipher Local Image Descriptor */ + if (! ReadOK(source->pub.input_file, hdrbuf, 9)) + ERREXIT(cinfo, JERR_INPUT_EOF); + /* we ignore top/left position info, also sort flag */ + width = LM_to_uint(hdrbuf, 4); + height = LM_to_uint(hdrbuf, 6); + source->is_interlaced = (BitSet(hdrbuf[8], INTERLACE) != 0); + + /* Read local colormap if header indicates it is present */ + /* Note: if we wanted to support skipping images, */ + /* we'd need to skip rather than read colormap for ignored images */ + if (BitSet(hdrbuf[8], COLORMAPFLAG)) { + colormaplen = 2 << (hdrbuf[8] & 0x07); + ReadColorMap(source, colormaplen, source->colormap); + } + + source->input_code_size = ReadByte(source); /* get min-code-size byte */ + if (source->input_code_size < 2 || source->input_code_size > 8) + ERREXIT1(cinfo, JERR_GIF_CODESIZE, source->input_code_size); + + /* Reached desired image, so break out of loop */ + /* If we wanted to skip this image, */ + /* we'd call SkipDataBlocks and then continue the loop */ + break; + } + + /* Prepare to read selected image: first initialize LZW decompressor */ + source->symbol_head = (UINT16 FAR *) (*cinfo->mem->alloc_large) + ((j_common_ptr) cinfo, JPOOL_IMAGE, LZW_TABLE_SIZE * SIZEOF(UINT16)); + source->symbol_tail = (UINT8 FAR *) (*cinfo->mem->alloc_large) + ((j_common_ptr) cinfo, JPOOL_IMAGE, LZW_TABLE_SIZE * SIZEOF(UINT8)); + source->symbol_stack = (UINT8 FAR *) (*cinfo->mem->alloc_large) + ((j_common_ptr) cinfo, JPOOL_IMAGE, LZW_TABLE_SIZE * SIZEOF(UINT8)); + InitLZWCode(source); + + /* + * If image is interlaced, we read it into a full-size sample array, + * decompressing as we go; then get_interlaced_row selects rows from the + * sample array in the proper order. + */ + if (source->is_interlaced) { + /* We request the virtual array now, but can't access it until virtual + * arrays have been allocated. Hence, the actual work of reading the + * image is postponed until the first call to get_pixel_rows. + */ + source->interlaced_image = (*cinfo->mem->request_virt_sarray) + ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE, + (JDIMENSION) width, (JDIMENSION) height, (JDIMENSION) 1); + if (cinfo->progress != NULL) { + cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress; + progress->total_extra_passes++; /* count file input as separate pass */ + } + source->pub.get_pixel_rows = load_interlaced_image; + } else { + source->pub.get_pixel_rows = get_pixel_rows; + } + + /* Create compressor input buffer. */ + source->pub.buffer = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) width * NUMCOLORS, (JDIMENSION) 1); + source->pub.buffer_height = 1; + + /* Pad colormap for safety. */ + for (c = colormaplen; c < source->clear_code; c++) { + source->colormap[CM_RED ][c] = + source->colormap[CM_GREEN][c] = + source->colormap[CM_BLUE ][c] = CENTERJSAMPLE; + } + + /* Return info about the image. */ + cinfo->in_color_space = JCS_RGB; + cinfo->input_components = NUMCOLORS; + cinfo->data_precision = BITS_IN_JSAMPLE; /* we always rescale data to this */ + cinfo->image_width = width; + cinfo->image_height = height; + + TRACEMS3(cinfo, 1, JTRC_GIF, width, height, colormaplen); +} + + +/* + * Read one row of pixels. + * This version is used for noninterlaced GIF images: + * we read directly from the GIF file. + */ + +METHODDEF(JDIMENSION) +get_pixel_rows (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) +{ + gif_source_ptr source = (gif_source_ptr) sinfo; + register int c; + register JSAMPROW ptr; + register JDIMENSION col; + register JSAMPARRAY colormap = source->colormap; + + ptr = source->pub.buffer[0]; + for (col = cinfo->image_width; col > 0; col--) { + c = LZWReadByte(source); + *ptr++ = colormap[CM_RED ][c]; + *ptr++ = colormap[CM_GREEN][c]; + *ptr++ = colormap[CM_BLUE ][c]; + } + return 1; +} + + +/* + * Read one row of pixels. + * This version is used for the first call on get_pixel_rows when + * reading an interlaced GIF file: we read the whole image into memory. + */ + +METHODDEF(JDIMENSION) +load_interlaced_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) +{ + gif_source_ptr source = (gif_source_ptr) sinfo; + register JSAMPROW sptr; + register JDIMENSION col; + JDIMENSION row; + cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress; + + /* Read the interlaced image into the virtual array we've created. */ + for (row = 0; row < cinfo->image_height; row++) { + if (progress != NULL) { + progress->pub.pass_counter = (long) row; + progress->pub.pass_limit = (long) cinfo->image_height; + (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); + } + sptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->interlaced_image, row, (JDIMENSION) 1, TRUE); + for (col = cinfo->image_width; col > 0; col--) { + *sptr++ = (JSAMPLE) LZWReadByte(source); + } + } + if (progress != NULL) + progress->completed_extra_passes++; + + /* Replace method pointer so subsequent calls don't come here. */ + source->pub.get_pixel_rows = get_interlaced_row; + /* Initialize for get_interlaced_row, and perform first call on it. */ + source->cur_row_number = 0; + source->pass2_offset = (cinfo->image_height + 7) / 8; + source->pass3_offset = source->pass2_offset + (cinfo->image_height + 3) / 8; + source->pass4_offset = source->pass3_offset + (cinfo->image_height + 1) / 4; + + return get_interlaced_row(cinfo, sinfo); +} + + +/* + * Read one row of pixels. + * This version is used for interlaced GIF images: + * we read from the virtual array. + */ + +METHODDEF(JDIMENSION) +get_interlaced_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) +{ + gif_source_ptr source = (gif_source_ptr) sinfo; + register int c; + register JSAMPROW sptr, ptr; + register JDIMENSION col; + register JSAMPARRAY colormap = source->colormap; + JDIMENSION irow; + + /* Figure out which row of interlaced image is needed, and access it. */ + switch ((int) (source->cur_row_number & 7)) { + case 0: /* first-pass row */ + irow = source->cur_row_number >> 3; + break; + case 4: /* second-pass row */ + irow = (source->cur_row_number >> 3) + source->pass2_offset; + break; + case 2: /* third-pass row */ + case 6: + irow = (source->cur_row_number >> 2) + source->pass3_offset; + break; + default: /* fourth-pass row */ + irow = (source->cur_row_number >> 1) + source->pass4_offset; + } + sptr = * (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->interlaced_image, irow, (JDIMENSION) 1, FALSE); + /* Scan the row, expand colormap, and output */ + ptr = source->pub.buffer[0]; + for (col = cinfo->image_width; col > 0; col--) { + c = GETJSAMPLE(*sptr++); + *ptr++ = colormap[CM_RED ][c]; + *ptr++ = colormap[CM_GREEN][c]; + *ptr++ = colormap[CM_BLUE ][c]; + } + source->cur_row_number++; /* for next time */ + return 1; +} + + +/* + * Finish up at the end of the file. + */ + +METHODDEF(void) +finish_input_gif (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) +{ + /* no work */ +} + + /* * The module selection routine for GIF format input. */ @@ -30,9 +661,17 @@ GLOBAL(cjpeg_source_ptr) jinit_read_gif (j_compress_ptr cinfo) { - fprintf(stderr, "GIF input is unsupported for legal reasons. Sorry.\n"); - exit(EXIT_FAILURE); - return NULL; /* keep compiler happy */ + gif_source_ptr source; + + /* Create module interface object */ + source = (gif_source_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(gif_source_struct)); + source->cinfo = cinfo; /* make back link for subroutines */ + /* Fill in method ptrs, except get_pixel_rows which start_input sets */ + source->pub.start_input = start_input_gif; + source->pub.finish_input = finish_input_gif; + + return &source->pub; } #endif /* GIF_SUPPORTED */ diff --git a/dll/3rdparty/libjpeg/rdppm.c b/dll/3rdparty/libjpeg/rdppm.c index 357ce9e35f4..33e469ac9f7 100644 --- a/dll/3rdparty/libjpeg/rdppm.c +++ b/dll/3rdparty/libjpeg/rdppm.c @@ -2,7 +2,7 @@ * rdppm.c * * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009-2017 by Bill Allombert, Guido Vollbeding. + * Modified 2009-2019 by Bill Allombert, Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -19,11 +19,6 @@ * the file is indeed PPM format). */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ - -#ifdef PPM_SUPPORTED - - /* Portions of this code are based on the PBMPLUS library, which is: ** ** Copyright (C) 1988 by Jef Poskanzer. @@ -36,6 +31,10 @@ ** implied warranty. */ +#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ + +#ifdef PPM_SUPPORTED + /* Macros to deal with unsigned chars as efficiently as compiler allows */ @@ -43,11 +42,10 @@ typedef unsigned char U_CHAR; #define UCH(x) ((int) (x)) #else /* !HAVE_UNSIGNED_CHAR */ -#ifdef CHAR_IS_UNSIGNED typedef char U_CHAR; +#ifdef CHAR_IS_UNSIGNED #define UCH(x) ((int) (x)) #else -typedef char U_CHAR; #define UCH(x) ((int) (x) & 0xFF) #endif #endif /* HAVE_UNSIGNED_CHAR */ @@ -358,7 +356,6 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; default: ERREXIT(cinfo, JERR_PPM_NOT); - break; } /* fetch the remaining header info */ @@ -449,9 +446,8 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) source->pub.buffer_height = 1; } else { /* Need to translate anyway, so make a separate sample buffer. */ - source->pub.buffer = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, - (JDIMENSION) w * cinfo->input_components, (JDIMENSION) 1); + source->pub.buffer = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) w * cinfo->input_components, (JDIMENSION) 1); source->pub.buffer_height = 1; } @@ -461,7 +457,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* On 16-bit-int machines we have to be careful of maxval = 65535 */ source->rescale = (JSAMPLE *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, - JPOOL_IMAGE, (size_t) (((long) maxval + 1L) * SIZEOF(JSAMPLE))); + JPOOL_IMAGE, ((size_t) maxval + (size_t) 1) * SIZEOF(JSAMPLE)); half_maxval = maxval / 2; for (val = 0; val <= (INT32) maxval; val++) { /* The multiplication here must be done in 32 bits to avoid overflow */ @@ -492,9 +488,8 @@ jinit_read_ppm (j_compress_ptr cinfo) ppm_source_ptr source; /* Create module interface object */ - source = (ppm_source_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(ppm_source_struct)); + source = (ppm_source_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(ppm_source_struct)); /* Fill in method ptrs, except get_pixel_rows which start_input sets */ source->pub.start_input = start_input_ppm; source->pub.finish_input = finish_input_ppm; diff --git a/dll/3rdparty/libjpeg/rdrle.c b/dll/3rdparty/libjpeg/rdrle.c index 542bc37490c..06f2e8aad4b 100644 --- a/dll/3rdparty/libjpeg/rdrle.c +++ b/dll/3rdparty/libjpeg/rdrle.c @@ -2,6 +2,7 @@ * rdrle.c * * Copyright (C) 1991-1996, Thomas G. Lane. + * Modified 2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -68,7 +69,7 @@ typedef struct _rle_source_struct { jvirt_sarray_ptr image; /* virtual array to hold the image */ JDIMENSION row; /* current row # in the virtual array */ rle_hdr header; /* Input file information */ - rle_pixel** rle_row; /* holds a row returned by rle_getrow() */ + rle_pixel **rle_row; /* holds a row returned by rle_getrow() */ } rle_source_struct; @@ -95,19 +96,14 @@ start_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; case RLE_NOT_RLE: ERREXIT(cinfo, JERR_RLE_NOT); - break; case RLE_NO_SPACE: ERREXIT(cinfo, JERR_RLE_MEM); - break; case RLE_EMPTY: ERREXIT(cinfo, JERR_RLE_EMPTY); - break; case RLE_EOF: ERREXIT(cinfo, JERR_RLE_EOF); - break; default: ERREXIT(cinfo, JERR_RLE_BADERROR); - break; } /* Figure out what we have, set private vars and return values accordingly */ @@ -155,16 +151,15 @@ start_input_rle (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) * (GRAYSCALE scanlines don't need converting) */ if (source->visual != GRAYSCALE) { - source->rle_row = (rle_pixel**) (*cinfo->mem->alloc_sarray) + source->rle_row = (rle_pixel **) (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, JPOOL_IMAGE, - (JDIMENSION) width, (JDIMENSION) cinfo->input_components); + width, (JDIMENSION) cinfo->input_components); } /* request a virtual array to hold the image */ source->image = (*cinfo->mem->request_virt_sarray) ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE, - (JDIMENSION) (width * source->header.ncolors), - (JDIMENSION) height, (JDIMENSION) 1); + width * (JDIMENSION) source->header.ncolors, height, (JDIMENSION) 1); #ifdef PROGRESS_REPORT if (progress != NULL) { @@ -242,7 +237,7 @@ load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) { rle_source_ptr source = (rle_source_ptr) sinfo; JDIMENSION row, col; - JSAMPROW scanline, red_ptr, green_ptr, blue_ptr; + JSAMPROW scanline, red_ptr, green_ptr, blue_ptr; rle_pixel **rle_row; rle_map *colormap; char channel; @@ -250,9 +245,6 @@ load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress; #endif - colormap = source->header.cmap; - rle_row = source->rle_row; - /* Read the RLE data into our virtual array. * We assume here that (a) rle_pixel is represented the same as JSAMPLE, * and (b) we are not on a machine where FAR pointers differ from regular. @@ -273,12 +265,12 @@ load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) case PSEUDOCOLOR: for (row = 0; row < cinfo->image_height; row++) { rle_row = (rle_pixel **) (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); + ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); rle_getrow(&source->header, rle_row); #ifdef PROGRESS_REPORT if (progress != NULL) { - progress->pub.pass_counter++; - (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); + progress->pub.pass_counter++; + (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); } #endif } @@ -286,48 +278,50 @@ load_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) case MAPPEDGRAY: case TRUECOLOR: + rle_row = source->rle_row; + colormap = source->header.cmap; for (row = 0; row < cinfo->image_height; row++) { - scanline = * (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); - rle_row = source->rle_row; rle_getrow(&source->header, rle_row); + scanline = * (*cinfo->mem->access_virt_sarray) + ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); for (col = 0; col < cinfo->image_width; col++) { - for (channel = 0; channel < source->header.ncolors; channel++) { - *scanline++ = (JSAMPLE) - (colormap[GETJSAMPLE(rle_row[channel][col]) + 256 * channel] >> 8); - } + for (channel = 0; channel < source->header.ncolors; channel++) { + *scanline++ = (JSAMPLE) + (colormap[GETJSAMPLE(rle_row[channel][col]) + 256 * channel] >> 8); + } } #ifdef PROGRESS_REPORT if (progress != NULL) { - progress->pub.pass_counter++; - (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); + progress->pub.pass_counter++; + (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); } #endif } break; case DIRECTCOLOR: + rle_row = source->rle_row; for (row = 0; row < cinfo->image_height; row++) { - scanline = * (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); rle_getrow(&source->header, rle_row); + scanline = * (*cinfo->mem->access_virt_sarray) + ((j_common_ptr) cinfo, source->image, row, (JDIMENSION) 1, TRUE); red_ptr = rle_row[0]; green_ptr = rle_row[1]; blue_ptr = rle_row[2]; for (col = cinfo->image_width; col > 0; col--) { - *scanline++ = *red_ptr++; - *scanline++ = *green_ptr++; - *scanline++ = *blue_ptr++; + *scanline++ = *red_ptr++; + *scanline++ = *green_ptr++; + *scanline++ = *blue_ptr++; } #ifdef PROGRESS_REPORT if (progress != NULL) { - progress->pub.pass_counter++; - (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); + progress->pub.pass_counter++; + (*progress->pub.progress_monitor) ((j_common_ptr) cinfo); } #endif } @@ -373,15 +367,14 @@ jinit_read_rle (j_compress_ptr cinfo) rle_source_ptr source; /* Create module interface object */ - source = (rle_source_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(rle_source_struct)); + source = (rle_source_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(rle_source_struct)); /* Fill in method ptrs */ source->pub.start_input = start_input_rle; source->pub.finish_input = finish_input_rle; source->pub.get_pixel_rows = load_image; - return (cjpeg_source_ptr) source; + return &source->pub; } #endif /* RLE_SUPPORTED */ diff --git a/dll/3rdparty/libjpeg/rdswitch.c b/dll/3rdparty/libjpeg/rdswitch.c index b5aba83cb8a..c0f7fed8ccd 100644 --- a/dll/3rdparty/libjpeg/rdswitch.c +++ b/dll/3rdparty/libjpeg/rdswitch.c @@ -2,7 +2,7 @@ * rdswitch.c * * Copyright (C) 1991-1996, Thomas G. Lane. - * Modified 2003-2015 by Guido Vollbeding. + * Modified 2003-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -249,9 +249,8 @@ bogus: * NOTE: for cjpeg's use, JPOOL_IMAGE is the right lifetime for this data, * but if you want to compress multiple images you'd want JPOOL_PERMANENT. */ - scanptr = (jpeg_scan_info *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - scanno * SIZEOF(jpeg_scan_info)); + scanptr = (jpeg_scan_info *) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, scanno * SIZEOF(jpeg_scan_info)); MEMCOPY(scanptr, scans, scanno * SIZEOF(jpeg_scan_info)); cinfo->scan_info = scanptr; cinfo->num_scans = scanno; diff --git a/dll/3rdparty/libjpeg/rdtarga.c b/dll/3rdparty/libjpeg/rdtarga.c index b3a7251cd53..c72ad73f6ce 100644 --- a/dll/3rdparty/libjpeg/rdtarga.c +++ b/dll/3rdparty/libjpeg/rdtarga.c @@ -2,7 +2,7 @@ * rdtarga.c * * Copyright (C) 1991-1996, Thomas G. Lane. - * Modified 2017 by Guido Vollbeding. + * Modified 2017-2019 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -29,11 +29,10 @@ typedef unsigned char U_CHAR; #define UCH(x) ((int) (x)) #else /* !HAVE_UNSIGNED_CHAR */ -#ifdef CHAR_IS_UNSIGNED typedef char U_CHAR; +#ifdef CHAR_IS_UNSIGNED #define UCH(x) ((int) (x)) #else -typedef char U_CHAR; #define UCH(x) ((int) (x) & 0xFF) #endif #endif /* HAVE_UNSIGNED_CHAR */ @@ -125,20 +124,17 @@ METHODDEF(void) read_non_rle_pixel (tga_source_ptr sinfo) /* Read one Targa pixel from the input file; no RLE expansion */ { - register FILE *infile = sinfo->pub.input_file; register int i; for (i = 0; i < sinfo->pixel_size; i++) { - sinfo->tga_pixel[i] = (U_CHAR) getc(infile); + sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); } } - METHODDEF(void) read_rle_pixel (tga_source_ptr sinfo) /* Read one Targa pixel from the input file, expanding RLE data as needed */ { - register FILE *infile = sinfo->pub.input_file; register int i; /* Duplicate previously read pixel? */ @@ -160,7 +156,7 @@ read_rle_pixel (tga_source_ptr sinfo) /* Read next pixel */ for (i = 0; i < sinfo->pixel_size; i++) { - sinfo->tga_pixel[i] = (U_CHAR) getc(infile); + sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); } } @@ -171,7 +167,6 @@ read_rle_pixel (tga_source_ptr sinfo) * We provide several different versions depending on input file format. */ - METHODDEF(JDIMENSION) get_8bit_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) /* This version is for reading 8-bit grayscale pixels */ @@ -288,9 +283,8 @@ get_memory_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) source_row = cinfo->image_height - source->current_row - 1; /* Fetch that row from virtual array */ - source->pub.buffer = (*cinfo->mem->access_virt_sarray) - ((j_common_ptr) cinfo, source->whole_image, - source_row, (JDIMENSION) 1, FALSE); + source->pub.buffer = (*cinfo->mem->access_virt_sarray) ((j_common_ptr) cinfo, + source->whole_image, source_row, (JDIMENSION) 1, FALSE); source->current_row++; return 1; @@ -409,7 +403,6 @@ start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; default: ERREXIT(cinfo, JERR_TGA_BADPARMS); - break; } TRACEMS2(cinfo, 1, JTRC_TGA, width, height); break; @@ -424,7 +417,6 @@ start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) break; default: ERREXIT(cinfo, JERR_TGA_BADPARMS); - break; } if (is_bottom_up) { @@ -442,9 +434,8 @@ start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) } else { /* Don't need a virtual array, but do need a one-row input buffer. */ source->whole_image = NULL; - source->pub.buffer = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, - (JDIMENSION) width * components, (JDIMENSION) 1); + source->pub.buffer = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) width * components, (JDIMENSION) 1); source->pub.buffer_height = 1; source->pub.get_pixel_rows = source->get_pixel_rows; } @@ -456,8 +447,8 @@ start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) if (maplen > 256 || GET_2B(3) != 0) ERREXIT(cinfo, JERR_TGA_BADCMAP); /* Allocate space to store the colormap */ - source->colormap = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, (JDIMENSION) maplen, (JDIMENSION) 3); + source->colormap = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, + JPOOL_IMAGE, (JDIMENSION) maplen, (JDIMENSION) 3); source->cmap_length = (int) maplen; /* and read it from the file */ read_colormap(source, (int) maplen, UCH(targaheader[7])); @@ -496,9 +487,8 @@ jinit_read_targa (j_compress_ptr cinfo) tga_source_ptr source; /* Create module interface object */ - source = (tga_source_ptr) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - SIZEOF(tga_source_struct)); + source = (tga_source_ptr) (*cinfo->mem->alloc_small) + ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(tga_source_struct)); source->cinfo = cinfo; /* make back link for subroutines */ /* Fill in method ptrs, except get_pixel_rows which start_input sets */ source->pub.start_input = start_input_tga; diff --git a/dll/3rdparty/libjpeg/transupp.c b/dll/3rdparty/libjpeg/transupp.c index d10f57b45e3..6d7d0902349 100644 --- a/dll/3rdparty/libjpeg/transupp.c +++ b/dll/3rdparty/libjpeg/transupp.c @@ -1,7 +1,7 @@ /* * transupp.c * - * Copyright (C) 1997-2017, Thomas G. Lane, Guido Vollbeding. + * Copyright (C) 1997-2019, Thomas G. Lane, Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -14,6 +14,8 @@ /* Although this file really shouldn't have access to the library internals, * it's helpful to let it call jround_up() and jcopy_block_row(). + * Also, the (switchable) virtual memory adaptation code for + * the drop feature has dependencies on library internals. */ #define JPEG_INTERNALS @@ -75,6 +77,274 @@ */ +/* Drop code may be used with or without virtual memory adaptation code. + * This code has some dependencies on internal library behavior, so you + * may choose to disable it. For example, it doesn't make a difference + * if you only use jmemnobs anyway. + */ +#ifndef DROP_REQUEST_FROM_SRC +#define DROP_REQUEST_FROM_SRC 1 /* 0 disables adaptation */ +#endif + + +#if DROP_REQUEST_FROM_SRC +/* Force jpeg_read_coefficients to request + * the virtual coefficient arrays from + * the source decompression object. + */ +METHODDEF(jvirt_barray_ptr) +drop_request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero, + JDIMENSION blocksperrow, JDIMENSION numrows, + JDIMENSION maxaccess) +{ + j_common_ptr srcinfo = (j_common_ptr) cinfo->client_data; + + return (*srcinfo->mem->request_virt_barray) + (srcinfo, pool_id, pre_zero, + blocksperrow, numrows, maxaccess); +} + + +/* Force jpeg_read_coefficients to return + * after requesting and before accessing + * the virtual coefficient arrays. + */ +METHODDEF(int) +drop_consume_input (j_decompress_ptr cinfo) +{ + return JPEG_SUSPENDED; +} + + +METHODDEF(void) +drop_start_input_pass (j_decompress_ptr cinfo) +{ + cinfo->inputctl->consume_input = drop_consume_input; +} + + +LOCAL(void) +drop_request_from_src (j_decompress_ptr dropinfo, j_decompress_ptr srcinfo) +{ + void *save_client_data; + JMETHOD(jvirt_barray_ptr, save_request_virt_barray, + (j_common_ptr cinfo, int pool_id, boolean pre_zero, + JDIMENSION blocksperrow, JDIMENSION numrows, JDIMENSION maxaccess)); + JMETHOD(void, save_start_input_pass, (j_decompress_ptr cinfo)); + + /* Set custom method pointers, save original pointers */ + save_client_data = dropinfo->client_data; + dropinfo->client_data = (void *) srcinfo; + save_request_virt_barray = dropinfo->mem->request_virt_barray; + dropinfo->mem->request_virt_barray = drop_request_virt_barray; + save_start_input_pass = dropinfo->inputctl->start_input_pass; + dropinfo->inputctl->start_input_pass = drop_start_input_pass; + + /* Execute only initialization part. + * Requested coefficient arrays will be realized later by the srcinfo object. + * Next call to the same function will then do the actual data reading. + * NB: since we request the coefficient arrays from another object, + * the inherent realization call is effectively a no-op. + */ + (void) jpeg_read_coefficients(dropinfo); + + /* Reset method pointers */ + dropinfo->client_data = save_client_data; + dropinfo->mem->request_virt_barray = save_request_virt_barray; + dropinfo->inputctl->start_input_pass = save_start_input_pass; + /* Do input initialization for first scan now, + * which also resets the consume_input method. + */ + (*save_start_input_pass)(dropinfo); +} +#endif /* DROP_REQUEST_FROM_SRC */ + + +LOCAL(void) +dequant_comp (j_decompress_ptr cinfo, jpeg_component_info *compptr, + jvirt_barray_ptr coef_array, JQUANT_TBL *qtblptr1) +{ + JDIMENSION blk_x, blk_y; + int offset_y, k; + JQUANT_TBL *qtblptr; + JBLOCKARRAY buffer; + JBLOCKROW block; + JCOEFPTR ptr; + + qtblptr = compptr->quant_table; + for (blk_y = 0; blk_y < compptr->height_in_blocks; + blk_y += compptr->v_samp_factor) { + buffer = (*cinfo->mem->access_virt_barray) + ((j_common_ptr) cinfo, coef_array, blk_y, + (JDIMENSION) compptr->v_samp_factor, TRUE); + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + block = buffer[offset_y]; + for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) { + ptr = block[blk_x]; + for (k = 0; k < DCTSIZE2; k++) + if (qtblptr->quantval[k] != qtblptr1->quantval[k]) + ptr[k] *= qtblptr->quantval[k] / qtblptr1->quantval[k]; + } + } + } +} + + +LOCAL(void) +requant_comp (j_decompress_ptr cinfo, jpeg_component_info *compptr, + jvirt_barray_ptr coef_array, JQUANT_TBL *qtblptr1) +{ + JDIMENSION blk_x, blk_y; + int offset_y, k; + JQUANT_TBL *qtblptr; + JBLOCKARRAY buffer; + JBLOCKROW block; + JCOEFPTR ptr; + JCOEF temp, qval; + + qtblptr = compptr->quant_table; + for (blk_y = 0; blk_y < compptr->height_in_blocks; + blk_y += compptr->v_samp_factor) { + buffer = (*cinfo->mem->access_virt_barray) + ((j_common_ptr) cinfo, coef_array, blk_y, + (JDIMENSION) compptr->v_samp_factor, TRUE); + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + block = buffer[offset_y]; + for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) { + ptr = block[blk_x]; + for (k = 0; k < DCTSIZE2; k++) { + temp = qtblptr->quantval[k]; + qval = qtblptr1->quantval[k]; + if (temp != qval) { + temp *= ptr[k]; + /* The following quantization code is a copy from jcdctmgr.c */ +#ifdef FAST_DIVIDE +#define DIVIDE_BY(a,b) a /= b +#else +#define DIVIDE_BY(a,b) if (a >= b) a /= b; else a = 0 +#endif + if (temp < 0) { + temp = -temp; + temp += qval>>1; /* for rounding */ + DIVIDE_BY(temp, qval); + temp = -temp; + } else { + temp += qval>>1; /* for rounding */ + DIVIDE_BY(temp, qval); + } + ptr[k] = temp; + } + } + } + } + } +} + + +/* Calculate largest common denominator with Euclid's algorithm. + */ +LOCAL(JCOEF) +largest_common_denominator(JCOEF a, JCOEF b) +{ + JCOEF c; + + do { + c = a % b; + a = b; + b = c; + } while (c); + + return a; +} + + +LOCAL(void) +adjust_quant(j_decompress_ptr srcinfo, jvirt_barray_ptr *src_coef_arrays, + j_decompress_ptr dropinfo, jvirt_barray_ptr *drop_coef_arrays, + boolean trim, j_compress_ptr dstinfo) +{ + jpeg_component_info *compptr1, *compptr2; + JQUANT_TBL *qtblptr1, *qtblptr2, *qtblptr3; + int ci, k; + + for (ci = 0; ci < dstinfo->num_components && + ci < dropinfo->num_components; ci++) { + compptr1 = srcinfo->comp_info + ci; + compptr2 = dropinfo->comp_info + ci; + qtblptr1 = compptr1->quant_table; + qtblptr2 = compptr2->quant_table; + for (k = 0; k < DCTSIZE2; k++) { + if (qtblptr1->quantval[k] != qtblptr2->quantval[k]) { + if (trim) + requant_comp(dropinfo, compptr2, drop_coef_arrays[ci], qtblptr1); + else { + qtblptr3 = dstinfo->quant_tbl_ptrs[compptr1->quant_tbl_no]; + for (k = 0; k < DCTSIZE2; k++) + if (qtblptr1->quantval[k] != qtblptr2->quantval[k]) + qtblptr3->quantval[k] = largest_common_denominator + (qtblptr1->quantval[k], qtblptr2->quantval[k]); + dequant_comp(srcinfo, compptr1, src_coef_arrays[ci], qtblptr3); + dequant_comp(dropinfo, compptr2, drop_coef_arrays[ci], qtblptr3); + } + break; + } + } + } +} + + +LOCAL(void) +do_drop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, + jvirt_barray_ptr *src_coef_arrays, + j_decompress_ptr dropinfo, jvirt_barray_ptr *drop_coef_arrays, + JDIMENSION drop_width, JDIMENSION drop_height) +/* Drop. If the dropinfo component number is smaller than the destination's, + * we fill in the remaining components with zero. This provides the feature + * of dropping grayscale into (arbitrarily sampled) color images. + */ +{ + JDIMENSION comp_width, comp_height; + JDIMENSION blk_y, x_drop_blocks, y_drop_blocks; + int ci, offset_y; + JBLOCKARRAY src_buffer, dst_buffer; + jpeg_component_info *compptr; + + for (ci = 0; ci < dstinfo->num_components; ci++) { + compptr = dstinfo->comp_info + ci; + comp_width = drop_width * compptr->h_samp_factor; + comp_height = drop_height * compptr->v_samp_factor; + x_drop_blocks = x_crop_offset * compptr->h_samp_factor; + y_drop_blocks = y_crop_offset * compptr->v_samp_factor; + for (blk_y = 0; blk_y < comp_height; blk_y += compptr->v_samp_factor) { + dst_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y + y_drop_blocks, + (JDIMENSION) compptr->v_samp_factor, TRUE); + if (ci < dropinfo->num_components) { +#if DROP_REQUEST_FROM_SRC + src_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, drop_coef_arrays[ci], blk_y, +#else + src_buffer = (*dropinfo->mem->access_virt_barray) + ((j_common_ptr) dropinfo, drop_coef_arrays[ci], blk_y, +#endif + (JDIMENSION) compptr->v_samp_factor, FALSE); + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + jcopy_block_row(src_buffer[offset_y], + dst_buffer[offset_y] + x_drop_blocks, + comp_width); + } + } else { + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + FMEMZERO(dst_buffer[offset_y] + x_drop_blocks, + comp_width * SIZEOF(JBLOCK)); + } + } + } + } +} + + LOCAL(void) do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -114,10 +384,10 @@ do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, LOCAL(void) -do_crop_ext (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) +do_crop_ext_zero (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) /* Crop. This is only used when no rotate/flip is requested with the crop. * Extension: If the destination size is larger than the source, we fill in * the extra area with zero (neutral gray). Note we also have to zero partial @@ -148,7 +418,7 @@ do_crop_ext (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, (JDIMENSION) compptr->v_samp_factor, TRUE); if (dstinfo->jpeg_height > srcinfo->output_height) { if (dst_blk_y < y_crop_blocks || - dst_blk_y >= comp_height + y_crop_blocks) { + dst_blk_y >= y_crop_blocks + comp_height) { for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { FMEMZERO(dst_buffer[offset_y], compptr->width_in_blocks * SIZEOF(JBLOCK)); @@ -174,11 +444,11 @@ do_crop_ext (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jcopy_block_row(src_buffer[offset_y], dst_buffer[offset_y] + x_crop_blocks, comp_width); - if (compptr->width_in_blocks > comp_width + x_crop_blocks) { + if (compptr->width_in_blocks > x_crop_blocks + comp_width) { FMEMZERO(dst_buffer[offset_y] + - comp_width + x_crop_blocks, + x_crop_blocks + comp_width, (compptr->width_in_blocks - - comp_width - x_crop_blocks) * SIZEOF(JBLOCK)); + x_crop_blocks - comp_width) * SIZEOF(JBLOCK)); } } else { jcopy_block_row(src_buffer[offset_y] + x_crop_blocks, @@ -191,6 +461,190 @@ do_crop_ext (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } +LOCAL(void) +do_crop_ext_flat (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) +/* Crop. This is only used when no rotate/flip is requested with the crop. + * Extension: The destination width is larger than the source and we fill in + * the extra area with the DC of the adjacent block. Note we also have to + * fill partial iMCUs at the right and bottom edge of the source image area + * in this case. + */ +{ + JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height; + JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks; + int ci, offset_y; + JCOEF dc; + JBLOCKARRAY src_buffer, dst_buffer; + jpeg_component_info *compptr; + + MCU_cols = srcinfo->output_width / + (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size); + MCU_rows = srcinfo->output_height / + (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size); + + for (ci = 0; ci < dstinfo->num_components; ci++) { + compptr = dstinfo->comp_info + ci; + comp_width = MCU_cols * compptr->h_samp_factor; + comp_height = MCU_rows * compptr->v_samp_factor; + x_crop_blocks = x_crop_offset * compptr->h_samp_factor; + y_crop_blocks = y_crop_offset * compptr->v_samp_factor; + for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; + dst_blk_y += compptr->v_samp_factor) { + dst_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, + (JDIMENSION) compptr->v_samp_factor, TRUE); + if (dstinfo->jpeg_height > srcinfo->output_height) { + if (dst_blk_y < y_crop_blocks || + dst_blk_y >= y_crop_blocks + comp_height) { + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + FMEMZERO(dst_buffer[offset_y], + compptr->width_in_blocks * SIZEOF(JBLOCK)); + } + continue; + } + src_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, src_coef_arrays[ci], + dst_blk_y - y_crop_blocks, + (JDIMENSION) compptr->v_samp_factor, FALSE); + } else { + src_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, src_coef_arrays[ci], + dst_blk_y + y_crop_blocks, + (JDIMENSION) compptr->v_samp_factor, FALSE); + } + for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { + if (x_crop_blocks > 0) { + FMEMZERO(dst_buffer[offset_y], + x_crop_blocks * SIZEOF(JBLOCK)); + dc = src_buffer[offset_y][0][0]; + for (dst_blk_x = 0; dst_blk_x < x_crop_blocks; dst_blk_x++) { + dst_buffer[offset_y][dst_blk_x][0] = dc; + } + } + jcopy_block_row(src_buffer[offset_y], + dst_buffer[offset_y] + x_crop_blocks, + comp_width); + if (compptr->width_in_blocks > x_crop_blocks + comp_width) { + FMEMZERO(dst_buffer[offset_y] + + x_crop_blocks + comp_width, + (compptr->width_in_blocks - + x_crop_blocks - comp_width) * SIZEOF(JBLOCK)); + dc = src_buffer[offset_y][comp_width - 1][0]; + for (dst_blk_x = x_crop_blocks + comp_width; + dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { + dst_buffer[offset_y][dst_blk_x][0] = dc; + } + } + } + } + } +} + + +LOCAL(void) +do_crop_ext_reflect (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) +/* Crop. This is only used when no rotate/flip is requested with the crop. + * Extension: The destination width is larger than the source and we fill in + * the extra area with repeated reflections of the source region. Note we + * also have to fill partial iMCUs at the right and bottom edge of the source ... 1626 lines suppressed ...

4 years, 10 months

[reactos] 01/02: [MBEDTLS] Update to version 2.7.13. CORE-16686

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d152519a4acf6e36bed83… commit d152519a4acf6e36bed83f5e30d5bc44fa7db754 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 9 20:56:36 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 9 21:23:22 2020 +0100 [MBEDTLS] Update to version 2.7.13. CORE-16686 --- dll/3rdparty/mbedtls/aes.c | 24 ++ dll/3rdparty/mbedtls/bignum.c | 97 ++++++++ dll/3rdparty/mbedtls/ctr_drbg.c | 112 ++++----- dll/3rdparty/mbedtls/ecdsa.c | 1 + dll/3rdparty/mbedtls/ecp.c | 10 +- dll/3rdparty/mbedtls/hmac_drbg.c | 25 +- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/mbedtls/bignum.h | 20 +- sdk/include/reactos/libs/mbedtls/check_config.h | 8 + sdk/include/reactos/libs/mbedtls/config.h | 4 + sdk/include/reactos/libs/mbedtls/ctr_drbg.h | 217 +++++++++++++---- sdk/include/reactos/libs/mbedtls/hmac_drbg.h | 296 +++++++++++++++--------- 12 files changed, 588 insertions(+), 228 deletions(-) diff --git a/dll/3rdparty/mbedtls/aes.c b/dll/3rdparty/mbedtls/aes.c index fed58bbc010..6004e80ab00 100644 --- a/dll/3rdparty/mbedtls/aes.c +++ b/dll/3rdparty/mbedtls/aes.c @@ -763,6 +763,18 @@ int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx, PUT_UINT32_LE( X2, output, 8 ); PUT_UINT32_LE( X3, output, 12 ); + mbedtls_zeroize( &X0, sizeof( X0 ) ); + mbedtls_zeroize( &X1, sizeof( X1 ) ); + mbedtls_zeroize( &X2, sizeof( X2 ) ); + mbedtls_zeroize( &X3, sizeof( X3 ) ); + + mbedtls_zeroize( &Y0, sizeof( Y0 ) ); + mbedtls_zeroize( &Y1, sizeof( Y1 ) ); + mbedtls_zeroize( &Y2, sizeof( Y2 ) ); + mbedtls_zeroize( &Y3, sizeof( Y3 ) ); + + mbedtls_zeroize( &RK, sizeof( RK ) ); + return( 0 ); } #endif /* !MBEDTLS_AES_ENCRYPT_ALT */ @@ -831,6 +843,18 @@ int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx, PUT_UINT32_LE( X2, output, 8 ); PUT_UINT32_LE( X3, output, 12 ); + mbedtls_zeroize( &X0, sizeof( X0 ) ); + mbedtls_zeroize( &X1, sizeof( X1 ) ); + mbedtls_zeroize( &X2, sizeof( X2 ) ); + mbedtls_zeroize( &X3, sizeof( X3 ) ); + + mbedtls_zeroize( &Y0, sizeof( Y0 ) ); + mbedtls_zeroize( &Y1, sizeof( Y1 ) ); + mbedtls_zeroize( &Y2, sizeof( Y2 ) ); + mbedtls_zeroize( &Y3, sizeof( Y3 ) ); + + mbedtls_zeroize( &RK, sizeof( RK ) ); + return( 0 ); } #endif /* !MBEDTLS_AES_DECRYPT_ALT */ diff --git a/dll/3rdparty/mbedtls/bignum.c b/dll/3rdparty/mbedtls/bignum.c index 62314c5bcd5..596e1a0164e 100644 --- a/dll/3rdparty/mbedtls/bignum.c +++ b/dll/3rdparty/mbedtls/bignum.c @@ -921,6 +921,103 @@ int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y ) return( 0 ); } +/** Decide if an integer is less than the other, without branches. + * + * \param x First integer. + * \param y Second integer. + * + * \return 1 if \p x is less than \p y, 0 otherwise + */ +static unsigned ct_lt_mpi_uint( const mbedtls_mpi_uint x, + const mbedtls_mpi_uint y ) +{ + mbedtls_mpi_uint ret; + mbedtls_mpi_uint cond; + + /* + * Check if the most significant bits (MSB) of the operands are different. + */ + cond = ( x ^ y ); + /* + * If the MSB are the same then the difference x-y will be negative (and + * have its MSB set to 1 during conversion to unsigned) if and only if x<y. + */ + ret = ( x - y ) & ~cond; + /* + * If the MSB are different, then the operand with the MSB of 1 is the + * bigger. (That is if y has MSB of 1, then x<y is true and it is false if + * the MSB of y is 0.) + */ + ret |= y & cond; + + + ret = ret >> ( biL - 1 ); + + return (unsigned) ret; +} + +/* + * Compare signed values in constant time + */ +int mbedtls_mpi_lt_mpi_ct( const mbedtls_mpi *X, const mbedtls_mpi *Y, + unsigned *ret ) +{ + size_t i; + /* The value of any of these variables is either 0 or 1 at all times. */ + unsigned cond, done, X_is_negative, Y_is_negative; + + if( X->n != Y->n ) + return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; + + /* + * Set sign_N to 1 if N >= 0, 0 if N < 0. + * We know that N->s == 1 if N >= 0 and N->s == -1 if N < 0. + */ + X_is_negative = ( X->s & 2 ) >> 1; + Y_is_negative = ( Y->s & 2 ) >> 1; + + /* + * If the signs are different, then the positive operand is the bigger. + * That is if X is negative (X_is_negative == 1), then X < Y is true and it + * is false if X is positive (X_is_negative == 0). + */ + cond = ( X_is_negative ^ Y_is_negative ); + *ret = cond & X_is_negative; + + /* + * This is a constant-time function. We might have the result, but we still + * need to go through the loop. Record if we have the result already. + */ + done = cond; + + for( i = X->n; i > 0; i-- ) + { + /* + * If Y->p[i - 1] < X->p[i - 1] then X < Y is true if and only if both + * X and Y are negative. + * + * Again even if we can make a decision, we just mark the result and + * the fact that we are done and continue looping. + */ + cond = ct_lt_mpi_uint( Y->p[i - 1], X->p[i - 1] ); + *ret |= cond & ( 1 - done ) & X_is_negative; + done |= cond; + + /* + * If X->p[i - 1] < Y->p[i - 1] then X < Y is true if and only if both + * X and Y are positive. + * + * Again even if we can make a decision, we just mark the result and + * the fact that we are done and continue looping. + */ + cond = ct_lt_mpi_uint( X->p[i - 1], Y->p[i - 1] ); + *ret |= cond & ( 1 - done ) & ( 1 - X_is_negative ); + done |= cond; + } + + return( 0 ); +} + /* * Compare signed values */ diff --git a/dll/3rdparty/mbedtls/ctr_drbg.c b/dll/3rdparty/mbedtls/ctr_drbg.c index f105391cc6e..1173f2209dc 100644 --- a/dll/3rdparty/mbedtls/ctr_drbg.c +++ b/dll/3rdparty/mbedtls/ctr_drbg.c @@ -68,56 +68,6 @@ void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx ) #endif } -/* - * Non-public function wrapped by mbedtls_ctr_drbg_seed(). Necessary to allow - * NIST tests to succeed (which require known length fixed entropy) - */ -int mbedtls_ctr_drbg_seed_entropy_len( - mbedtls_ctr_drbg_context *ctx, - int (*f_entropy)(void *, unsigned char *, size_t), - void *p_entropy, - const unsigned char *custom, - size_t len, - size_t entropy_len ) -{ - int ret; - unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE]; - - memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE ); - - mbedtls_aes_init( &ctx->aes_ctx ); - - ctx->f_entropy = f_entropy; - ctx->p_entropy = p_entropy; - - ctx->entropy_len = entropy_len; - ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL; - - /* - * Initialize with an empty key - */ - if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) - { - return( ret ); - } - - if( ( ret = mbedtls_ctr_drbg_reseed( ctx, custom, len ) ) != 0 ) - { - return( ret ); - } - return( 0 ); -} - -int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx, - int (*f_entropy)(void *, unsigned char *, size_t), - void *p_entropy, - const unsigned char *custom, - size_t len ) -{ - return( mbedtls_ctr_drbg_seed_entropy_len( ctx, f_entropy, p_entropy, custom, len, - MBEDTLS_CTR_DRBG_ENTROPY_LEN ) ); -} - void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx ) { if( ctx == NULL ) @@ -388,6 +338,52 @@ exit: return( ret ); } +int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx, + int (*f_entropy)(void *, unsigned char *, size_t), + void *p_entropy, + const unsigned char *custom, + size_t len ) +{ + int ret; + unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE]; + + memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE ); + + mbedtls_aes_init( &ctx->aes_ctx ); + + ctx->f_entropy = f_entropy; + ctx->p_entropy = p_entropy; + + if( ctx->entropy_len == 0 ) + ctx->entropy_len = MBEDTLS_CTR_DRBG_ENTROPY_LEN; + ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL; + + /* + * Initialize with an empty key + */ + if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) + { + return( ret ); + } + + if( ( ret = mbedtls_ctr_drbg_reseed( ctx, custom, len ) ) != 0 ) + { + return( ret ); + } + return( 0 ); +} + +/* Backward compatibility wrapper */ +int mbedtls_ctr_drbg_seed_entropy_len( + mbedtls_ctr_drbg_context *ctx, + int (*f_entropy)(void *, unsigned char *, size_t), void *p_entropy, + const unsigned char *custom, size_t len, + size_t entropy_len ) +{ + mbedtls_ctr_drbg_set_entropy_len( ctx, entropy_len ); + return( mbedtls_ctr_drbg_seed( ctx, f_entropy, p_entropy, custom, len ) ); +} + int mbedtls_ctr_drbg_random_with_add( void *p_rng, unsigned char *output, size_t output_len, const unsigned char *additional, size_t add_len ) @@ -459,7 +455,7 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng, exit: mbedtls_zeroize( add_input, sizeof( add_input ) ); mbedtls_zeroize( tmp, sizeof( tmp ) ); - return( 0 ); + return( ret ); } int mbedtls_ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len ) @@ -619,8 +615,11 @@ int mbedtls_ctr_drbg_self_test( int verbose ) mbedtls_printf( " CTR_DRBG (PR = TRUE) : " ); test_offset = 0; - CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy, - (void *) entropy_source_pr, nonce_pers_pr, 16, 32 ) ); + mbedtls_ctr_drbg_set_entropy_len( &ctx, 32 ); + CHK( mbedtls_ctr_drbg_seed( &ctx, + ctr_drbg_self_test_entropy, + (void *) entropy_source_pr, + nonce_pers_pr, 16 ) ); mbedtls_ctr_drbg_set_prediction_resistance( &ctx, MBEDTLS_CTR_DRBG_PR_ON ); CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) ); CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) ); @@ -640,8 +639,11 @@ int mbedtls_ctr_drbg_self_test( int verbose ) mbedtls_ctr_drbg_init( &ctx ); test_offset = 0; - CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy, - (void *) entropy_source_nopr, nonce_pers_nopr, 16, 32 ) ); + mbedtls_ctr_drbg_set_entropy_len( &ctx, 32 ); + CHK( mbedtls_ctr_drbg_seed( &ctx, + ctr_drbg_self_test_entropy, + (void *) entropy_source_nopr, + nonce_pers_nopr, 16 ) ); CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) ); CHK( mbedtls_ctr_drbg_reseed( &ctx, NULL, 0 ) ); CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) ); diff --git a/dll/3rdparty/mbedtls/ecdsa.c b/dll/3rdparty/mbedtls/ecdsa.c index 4f1ce8ad205..9defe41c5c7 100644 --- a/dll/3rdparty/mbedtls/ecdsa.c +++ b/dll/3rdparty/mbedtls/ecdsa.c @@ -155,6 +155,7 @@ static int ecdsa_sign_internal( mbedtls_ecp_group *grp, mbedtls_mpi *r, MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &e, &e, s ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &e, &e, &t ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &k, &k, &t ) ); + MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &k, &k, &grp->N ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( s, &k, &grp->N ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( s, s, &e ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( s, s, &grp->N ) ); diff --git a/dll/3rdparty/mbedtls/ecp.c b/dll/3rdparty/mbedtls/ecp.c index 5d20db854dd..89d1606a74f 100644 --- a/dll/3rdparty/mbedtls/ecp.c +++ b/dll/3rdparty/mbedtls/ecp.c @@ -1959,6 +1959,7 @@ int mbedtls_ecp_gen_privkey( const mbedtls_ecp_group *grp, { /* SEC1 3.2.1: Generate d such that 1 <= n < N */ int count = 0; + unsigned cmp = 0; /* * Match the procedure given in RFC 6979 (deterministic ECDSA): @@ -1983,9 +1984,14 @@ int mbedtls_ecp_gen_privkey( const mbedtls_ecp_group *grp, */ if( ++count > 30 ) return( MBEDTLS_ERR_ECP_RANDOM_FAILED ); + + ret = mbedtls_mpi_lt_mpi_ct( d, &grp->N, &cmp ); + if( ret != 0 ) + { + goto cleanup; + } } - while( mbedtls_mpi_cmp_int( d, 1 ) < 0 || - mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 ); + while( mbedtls_mpi_cmp_int( d, 1 ) < 0 || cmp != 1 ); } #endif /* ECP_SHORTWEIERSTRASS */ diff --git a/dll/3rdparty/mbedtls/hmac_drbg.c b/dll/3rdparty/mbedtls/hmac_drbg.c index 9a4a1a880e9..27c4a00c46a 100644 --- a/dll/3rdparty/mbedtls/hmac_drbg.c +++ b/dll/3rdparty/mbedtls/hmac_drbg.c @@ -277,16 +277,19 @@ int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx, ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL; - /* - * See SP800-57 5.6.1 (p. 65-66) for the security strength provided by - * each hash function, then according to SP800-90A rev1 10.1 table 2, - * min_entropy_len (in bits) is security_strength. - * - * (This also matches the sizes used in the NIST test vectors.) - */ - ctx->entropy_len = md_size <= 20 ? 16 : /* 160-bits hash -> 128 bits */ - md_size <= 28 ? 24 : /* 224-bits hash -> 192 bits */ - 32; /* better (256+) -> 256 bits */ + if( ctx->entropy_len == 0 ) + { + /* + * See SP800-57 5.6.1 (p. 65-66) for the security strength provided by + * each hash function, then according to SP800-90A rev1 10.1 table 2, + * min_entropy_len (in bits) is security_strength. + * + * (This also matches the sizes used in the NIST test vectors.) + */ + ctx->entropy_len = md_size <= 20 ? 16 : /* 160-bits hash -> 128 bits */ + md_size <= 28 ? 24 : /* 224-bits hash -> 192 bits */ + 32; /* better (256+) -> 256 bits */ + } if( ( ret = hmac_drbg_reseed_core( ctx, custom, len, 1 /* add nonce */ ) ) != 0 ) @@ -307,7 +310,7 @@ void mbedtls_hmac_drbg_set_prediction_resistance( mbedtls_hmac_drbg_context *ctx } /* - * Set entropy length grabbed for reseeds + * Set entropy length grabbed for seeding */ void mbedtls_hmac_drbg_set_entropy_len( mbedtls_hmac_drbg_context *ctx, size_t len ) { diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index f0964adf64e..26c1ac441d4 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -83,7 +83,7 @@ Used Version: 4.1.0 Website: http://www.simplesystems.org/libtiff/ Title: mbed TLS -Used Version: 2.7.12 +Used Version: 2.7.13 Website: https://tls.mbed.org/ Title: libpng diff --git a/sdk/include/reactos/libs/mbedtls/bignum.h b/sdk/include/reactos/libs/mbedtls/bignum.h index fd57d90fb28..c0ec3390d60 100644 --- a/sdk/include/reactos/libs/mbedtls/bignum.h +++ b/sdk/include/reactos/libs/mbedtls/bignum.h @@ -181,7 +181,7 @@ extern "C" { */ typedef struct { - int s; /*!< integer sign */ + int s; /*!< Sign: -1 if the mpi is negative, 1 otherwise */ size_t n; /*!< total # of limbs */ mbedtls_mpi_uint *p; /*!< pointer to limbs */ } @@ -486,6 +486,24 @@ int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y ); */ int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y ); +/** + * \brief Check if an MPI is less than the other in constant time. + * + * \param X The left-hand MPI. This must point to an initialized MPI + * with the same allocated length as Y. + * \param Y The right-hand MPI. This must point to an initialized MPI + * with the same allocated length as X. + * \param ret The result of the comparison: + * \c 1 if \p X is less than \p Y. + * \c 0 if \p X is greater than or equal to \p Y. + * + * \return 0 on success. + * \return MBEDTLS_ERR_MPI_BAD_INPUT_DATA if the allocated length of + * the two input MPIs is not the same. + */ +int mbedtls_mpi_lt_mpi_ct( const mbedtls_mpi *X, const mbedtls_mpi *Y, + unsigned *ret ); + /** * \brief Compare signed values * diff --git a/sdk/include/reactos/libs/mbedtls/check_config.h b/sdk/include/reactos/libs/mbedtls/check_config.h index 36927a90cb2..97af2d2d8f3 100644 --- a/sdk/include/reactos/libs/mbedtls/check_config.h +++ b/sdk/include/reactos/libs/mbedtls/check_config.h @@ -262,6 +262,14 @@ #error "MBEDTLS_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites" #endif +#if defined(MBEDTLS_MEMORY_BACKTRACE) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) +#error "MBEDTLS_MEMORY_BACKTRACE defined, but not all prerequesites" +#endif + +#if defined(MBEDTLS_MEMORY_DEBUG) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) +#error "MBEDTLS_MEMORY_DEBUG defined, but not all prerequesites" +#endif + #if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM) #error "MBEDTLS_PADLOCK_C defined, but not all prerequisites" #endif diff --git a/sdk/include/reactos/libs/mbedtls/config.h b/sdk/include/reactos/libs/mbedtls/config.h index 050ca896dea..d339b7c1b14 100644 --- a/sdk/include/reactos/libs/mbedtls/config.h +++ b/sdk/include/reactos/libs/mbedtls/config.h @@ -1886,6 +1886,10 @@ * * Enable the CTR_DRBG AES-256-based random generator. * + * \note This module only achieves a 256-bit security strength if + * the generator is seeded with sufficient entropy. + * See ctr_drbg.h for more details. + * * Module: library/ctr_drbg.c * Caller: * diff --git a/sdk/include/reactos/libs/mbedtls/ctr_drbg.h b/sdk/include/reactos/libs/mbedtls/ctr_drbg.h index eec3f7c8889..0be428b8561 100644 --- a/sdk/include/reactos/libs/mbedtls/ctr_drbg.h +++ b/sdk/include/reactos/libs/mbedtls/ctr_drbg.h @@ -1,13 +1,38 @@ /** * \file ctr_drbg.h * - * \brief CTR_DRBG is based on AES-256, as defined in NIST SP 800-90A: - * Recommendation for Random Number Generation Using Deterministic - * Random Bit Generators. - * + * \brief The CTR_DRBG pseudorandom generator. + * + * CTR_DRBG is a standardized way of building a PRNG from a block-cipher + * in counter mode operation, as defined in NIST SP 800-90A: + * Recommendation for Random Number Generation Using Deterministic Random + * Bit Generators. + * + * The Mbed TLS implementation of CTR_DRBG uses AES-256 + * as the underlying block cipher, with a derivation function. + * The initial seeding grabs #MBEDTLS_CTR_DRBG_ENTROPY_LEN bytes of entropy. + * See the documentation of mbedtls_ctr_drbg_seed() for more details. + * + * Based on NIST SP 800-90A §10.2.1 table 3 and NIST SP 800-57 part 1 table 2, + * here are the security strengths achieved in typical configuration: + * - 256 bits under the default configuration of the library, + * with #MBEDTLS_CTR_DRBG_ENTROPY_LEN set to 48 or more. + * - 256 bits if #MBEDTLS_CTR_DRBG_ENTROPY_LEN is set + * to 32 or more and the DRBG is initialized with an explicit + * nonce in the \c custom parameter to mbedtls_ctr_drbg_seed(). + * - 128 bits if #MBEDTLS_CTR_DRBG_ENTROPY_LEN is + * between 24 and 47 and the DRBG is not initialized with an explicit + * nonce (see mbedtls_ctr_drbg_seed()). + * + * Note that the value of #MBEDTLS_CTR_DRBG_ENTROPY_LEN defaults to: + * - \c 48 if the module \c MBEDTLS_SHA512_C is enabled and the symbol + * \c MBEDTLS_ENTROPY_FORCE_SHA256 is not enabled at compile time. + * This is the default configuration of the library. + * - \c 32 if the module \c MBEDTLS_SHA512_C is disabled at compile time. + * - \c 32 if \c MBEDTLS_ENTROPY_FORCE_SHA256 is enabled at compile time. */ /* - * Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved + * Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved * SPDX-License-Identifier: GPL-2.0 * * This program is free software; you can redistribute it and/or modify @@ -61,21 +86,29 @@ * \{ */ +/** \def MBEDTLS_CTR_DRBG_ENTROPY_LEN + * + * \brief The amount of entropy used per seed by default, in bytes. + */ #if !defined(MBEDTLS_CTR_DRBG_ENTROPY_LEN) #if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256) +/** This is 48 bytes because the entropy module uses SHA-512 + * (\c MBEDTLS_ENTROPY_FORCE_SHA256 is not set). + */ #define MBEDTLS_CTR_DRBG_ENTROPY_LEN 48 -/**< The amount of entropy used per seed by default: - * <ul><li>48 with SHA-512.</li> - * <li>32 with SHA-256.</li></ul> + +#else /* defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256) */ + +/** This is 32 bytes because the entropy module uses SHA-256 + * (the SHA512 module is disabled or + * \c MBEDTLS_ENTROPY_FORCE_SHA256 is enabled). + * + * \warning To achieve a 256-bit security strength, you must pass a nonce + * to mbedtls_ctr_drbg_seed(). */ -#else #define MBEDTLS_CTR_DRBG_ENTROPY_LEN 32 -/**< Amount of entropy used per seed by default: - * <ul><li>48 with SHA-512.</li> - * <li>32 with SHA-256.</li></ul> - */ -#endif -#endif +#endif /* defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256) */ +#endif /* !defined(MBEDTLS_CTR_DRBG_ENTROPY_LEN) */ #if !defined(MBEDTLS_CTR_DRBG_RESEED_INTERVAL) #define MBEDTLS_CTR_DRBG_RESEED_INTERVAL 10000 @@ -94,7 +127,7 @@ #if !defined(MBEDTLS_CTR_DRBG_MAX_SEED_INPUT) #define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT 384 -/**< The maximum size of seed or reseed buffer. */ +/**< The maximum size of seed or reseed buffer in bytes. */ #endif /* \} name SECTION: Module settings */ @@ -152,17 +185,67 @@ void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx ); * \brief This function seeds and sets up the CTR_DRBG * entropy source for future reseeds. * - * \note Personalization data can be provided in addition to the more generic - * entropy source, to make this instantiation as unique as possible. - * + * A typical choice for the \p f_entropy and \p p_entropy parameters is + * to use the entropy module: + * - \p f_entropy is mbedtls_entropy_func(); + * - \p p_entropy is an instance of ::mbedtls_entropy_context initialized + * with mbedtls_entropy_init() (which registers the platform's default + * entropy sources). + * + * The entropy length is #MBEDTLS_CTR_DRBG_ENTROPY_LEN by default. + * You can override it by calling mbedtls_ctr_drbg_set_entropy_len(). + * + * You can provide a personalization string in addition to the + * entropy source, to make this instantiation as unique as possible. + * + * \note The _seed_material_ value passed to the derivation + * function in the CTR_DRBG Instantiate Process + * described in NIST SP 800-90A §10.2.1.3.2 + * is the concatenation of the string obtained from + * calling \p f_entropy and the \p custom string. + * The origin of the nonce depends on the value of + * the entropy length relative to the security strength. + * - If the entropy length is at least 1.5 times the + * security strength then the nonce is taken from the + * string obtained with \p f_entropy. + * - If the entropy length is less than the security + * strength, then the nonce is taken from \p custom. + * In this case, for compliance with SP 800-90A, + * you must pass a unique value of \p custom at + * each invocation. See SP 800-90A §8.6.7 for more + * details. + */ +#if MBEDTLS_CTR_DRBG_ENTROPY_LEN < MBEDTLS_CTR_DRBG_KEYSIZE * 3 / 2 +/** \warning When #MBEDTLS_CTR_DRBG_ENTROPY_LEN is less than + * 48, to achieve a 256-bit security strength, + * you must pass a value of \p custom that is a nonce: + * this value must never be repeated in subsequent + * runs of the same application or on a different + * device. + */ +#endif +/** * \param ctx The CTR_DRBG context to seed. + * It must have been initialized with + * mbedtls_ctr_drbg_init(). + * After a successful call to mbedtls_ctr_drbg_seed(), + * you may not call mbedtls_ctr_drbg_seed() again on + * the same context unless you call + * mbedtls_ctr_drbg_free() and mbedtls_ctr_drbg_init() + * again first. * \param f_entropy The entropy callback, taking as arguments the * \p p_entropy context, the buffer to fill, and the - length of the buffer. - * \param p_entropy The entropy context. - * \param custom Personalization data, that is device-specific - identifiers. Can be NULL. - * \param len The length of the personalization data. + * length of the buffer. + * \p f_entropy is always called with a buffer size + * equal to the entropy length. + * \param p_entropy The entropy context to pass to \p f_entropy. + * \param custom The personalization string. + * This can be \c NULL, in which case the personalization + * string is empty regardless of the value of \p len. + * \param len The length of the personalization string. + * This must be at most + * #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + * - #MBEDTLS_CTR_DRBG_ENTROPY_LEN. * * \return \c 0 on success, or * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure. @@ -185,7 +268,8 @@ void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx ); * The default value is off. * * \note If enabled, entropy is gathered at the beginning of - * every call to mbedtls_ctr_drbg_random_with_add(). + * every call to mbedtls_ctr_drbg_random_with_add() + * or mbedtls_ctr_drbg_random(). * Only use this if your entropy source has sufficient * throughput. * @@ -197,18 +281,29 @@ void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx, /** * \brief This function sets the amount of entropy grabbed on each - * seed or reseed. The default value is - * #MBEDTLS_CTR_DRBG_ENTROPY_LEN. + * seed or reseed. + * + * The default value is #MBEDTLS_CTR_DRBG_ENTROPY_LEN. + * + * \note The security strength of CTR_DRBG is bounded by the + * entropy length. Thus \p len must be at least + * 32 (in bytes) to achieve a 256-bit strength. * * \param ctx The CTR_DRBG context. - * \param len The amount of entropy to grab. + * \param len The amount of entropy to grab, in bytes. + * This must be at most #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT. */ void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx, size_t len ); /** * \brief This function sets the reseed interval. - * The default value is #MBEDTLS_CTR_DRBG_RESEED_INTERVAL. + * + * The reseed interval is the number of calls to mbedtls_ctr_drbg_random() + * or mbedtls_ctr_drbg_random_with_add() after which the entropy function + * is called again. + * + * The default value is #MBEDTLS_CTR_DRBG_RESEED_INTERVAL. * * \param ctx The CTR_DRBG context. * \param interval The reseed interval. @@ -221,8 +316,12 @@ void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx, * extracts data from the entropy source. * * \param ctx The CTR_DRBG context. - * \param additional Additional data to add to the state. Can be NULL. + * \param additional Additional data to add to the state. Can be \c NULL. * \param len The length of the additional data. + * This must be less than + * #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - \c entropy_len + * where \c entropy_len is the entropy length + * configured for the context. * * \return \c 0 on success, or * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure. @@ -234,7 +333,8 @@ int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx, * \brief This function updates the state of the CTR_DRBG context. * * \param ctx The CTR_DRBG context. - * \param additional The data to update the state with. + * \param additional The data to update the state with. This must not be + * \c NULL unless \p add_len is \c 0. * \param add_len Length of \p additional in bytes. This must be at * most #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT. * @@ -260,8 +360,10 @@ int mbedtls_ctr_drbg_update_ret( mbedtls_ctr_drbg_context *ctx, * The remaining Bytes are silently discarded. * * \param ctx The CTR_DRBG context. - * \param additional The data to update the state with. - * \param add_len Length of \p additional data. + * \param additional The data to update the state with. This must not be + * \c NULL unless \p add_len is \c 0. + * \param add_len Length of \p additional data. This must be at + * most #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT. */ void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx, const unsigned char *additional, @@ -271,17 +373,26 @@ void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx, * \brief This function updates a CTR_DRBG instance with additional * data and uses it to generate random data. * - * \note The function automatically reseeds if the reseed counter is exceeded. + * This function automatically reseeds if the reseed counter is exceeded + * or prediction resistance is enabled. * * \param p_rng The CTR_DRBG context. This must be a pointer to a * #mbedtls_ctr_drbg_context structure. * \param output The buffer to fill. - * \param output_len The length of the buffer. - * \param additional Additional data to update. Can be NULL. - * \param add_len The length of the additional data. - * - * \return \c 0 on success, or - * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or + * \param output_len The length of the buffer in bytes. + * \param additional Additional data to update. Can be \c NULL, in which + * case the additional data is empty regardless of + * the value of \p add_len. + * \param add_len The length of the additional data + * if \p additional is not \c NULL. + * This must be less than #MBEDTLS_CTR_DRBG_MAX_INPUT + * and less than + * #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - \c entropy_len + * where \c entropy_len is the entropy length + * configured for the context. + * + * \return \c 0 on success. + * \return #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or * #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure. */ int mbedtls_ctr_drbg_random_with_add( void *p_rng, @@ -291,15 +402,17 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng, /** * \brief This function uses CTR_DRBG to generate random data. * - * \note The function automatically reseeds if the reseed counter is exceeded. + * This function automatically reseeds if the reseed counter is exceeded + * or prediction resistance is enabled. + * * * \param p_rng The CTR_DRBG context. This must be a pointer to a * #mbedtls_ctr_drbg_context structure. * \param output The buffer to fill. - * \param output_len The length of the buffer. + * \param output_len The length of the buffer in bytes. * - * \return \c 0 on success, or - * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or + * \return \c 0 on success. + * \return #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or * #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure. */ int mbedtls_ctr_drbg_random( void *p_rng, @@ -312,9 +425,9 @@ int mbedtls_ctr_drbg_random( void *p_rng, * \param ctx The CTR_DRBG context. * \param path The name of the file. * - * \return \c 0 on success, - * #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error, or - * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on + * \return \c 0 on success. + * \return #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error. + * \return #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on reseed * failure. */ int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path ); @@ -326,10 +439,12 @@ int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char * \param ctx The CTR_DRBG context. * \param path The name of the file. * - * \return \c 0 on success, - * #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error, - * #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or - * #MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG on failure. + * \return \c 0 on success. + * \return #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error. + * \return #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on + * reseed failure. + * \return #MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG if the existing + * seed file is too large. */ int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path ); #endif /* MBEDTLS_FS_IO */ diff --git a/sdk/include/reactos/libs/mbedtls/hmac_drbg.h b/sdk/include/reactos/libs/mbedtls/hmac_drbg.h index 6085d476f09..03939759c6a 100644 --- a/sdk/include/reactos/libs/mbedtls/hmac_drbg.h +++ b/sdk/include/reactos/libs/mbedtls/hmac_drbg.h @@ -1,10 +1,14 @@ /** * \file hmac_drbg.h * - * \brief HMAC_DRBG (NIST SP 800-90A) + * \brief The HMAC_DRBG pseudorandom generator. + * + * This module implements the HMAC_DRBG pseudorandom generator described + * in NIST SP 800-90A: Recommendation for Random Number Generation Using + * Deterministic Random Bit Generators. */ /* - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2019, ARM Limited, All Rights Reserved * SPDX-License-Identifier: GPL-2.0 * * This program is free software; you can redistribute it and/or modify @@ -106,38 +110,72 @@ typedef struct } mbedtls_hmac_drbg_context; /** - * \brief HMAC_DRBG context initialization - * Makes the context ready for mbedtls_hmac_drbg_seed(), - * mbedtls_hmac_drbg_seed_buf() or - * mbedtls_hmac_drbg_free(). + * \brief HMAC_DRBG context initialization. + * + * This function makes the context ready for mbedtls_hmac_drbg_seed(), + * mbedtls_hmac_drbg_seed_buf() or mbedtls_hmac_drbg_free(). * - * \param ctx HMAC_DRBG context to be initialized + * \param ctx HMAC_DRBG context to be initialized. */ void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx ); /** - * \brief HMAC_DRBG initial seeding - * Seed and setup entropy source for future reseeds. - * - * \param ctx HMAC_DRBG context to be seeded - * \param md_info MD algorithm to use for HMAC_DRBG - * \param f_entropy Entropy callback (p_entropy, buffer to fill, buffer - * length) - * \param p_entropy Entropy context - * \param custom Personalization data (Device specific identifiers) - * (Can be NULL) - * \param len Length of personalization data - * - * \note The "security strength" as defined by NIST is set to: - * 128 bits if md_alg is SHA-1, - * 192 bits if md_alg is SHA-224, - * 256 bits if md_alg is SHA-256 or higher. - * Note that SHA-256 is just as efficient as SHA-224. + * \brief HMAC_DRBG initial seeding. + * + * Set the initial seed and set up the entropy source for future reseeds. + * + * A typical choice for the \p f_entropy and \p p_entropy parameters is + * to use the entropy module: + * - \p f_entropy is mbedtls_entropy_func(); + * - \p p_entropy is an instance of ::mbedtls_entropy_context initialized + * with mbedtls_entropy_init() (which registers the platform's default + * entropy sources). * - * \return 0 if successful, or - * MBEDTLS_ERR_MD_BAD_INPUT_DATA, or - * MBEDTLS_ERR_MD_ALLOC_FAILED, or - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED. + * You can provide a personalization string in addition to the + * entropy source, to make this instantiation as unique as possible. + * + * \note By default, the security strength as defined by NIST is: + * - 128 bits if \p md_info is SHA-1; + * - 192 bits if \p md_info is SHA-224; + * - 256 bits if \p md_info is SHA-256, SHA-384 or SHA-512. + * Note that SHA-256 is just as efficient as SHA-224. + * The security strength can be reduced if a smaller + * entropy length is set with + * mbedtls_hmac_drbg_set_entropy_len(). + * + * \note The default entropy length is the security strength + * (converted from bits to bytes). You can override + * it by calling mbedtls_hmac_drbg_set_entropy_len(). + * + * \note During the initial seeding, this function calls + * the entropy source to obtain a nonce + * whose length is half the entropy length. + * + * \param ctx HMAC_DRBG context to be seeded. + * \param md_info MD algorithm to use for HMAC_DRBG. + * \param f_entropy The entropy callback, taking as arguments the + * \p p_entropy context, the buffer to fill, and the + * length of the buffer. + * \p f_entropy is always called with a length that is + * less than or equal to the entropy length. + * \param p_entropy The entropy context to pass to \p f_entropy. + * \param custom The personalization string. + * This can be \c NULL, in which case the personalization + * string is empty regardless of the value of \p len. + * \param len The length of the personalization string. + * This must be at most #MBEDTLS_HMAC_DRBG_MAX_INPUT + * and also at most + * #MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT - \p entropy_len * 3 / 2 + * where \p entropy_len is the entropy length + * described above. + * + * \return \c 0 if successful. + * \return #MBEDTLS_ERR_MD_BAD_INPUT_DATA if \p md_info is + * invalid. + * \return #MBEDTLS_ERR_MD_ALLOC_FAILED if there was not enough + * memory to allocate context data. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * if the call to \p f_entropy failed. */ int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx, const mbedtls_md_info_t * md_info, @@ -148,66 +186,80 @@ int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx, /** * \brief Initilisation of simpified HMAC_DRBG (never reseeds). - * (For use with deterministic ECDSA.) * - * \param ctx HMAC_DRBG context to be initialised - * \param md_info MD algorithm to use for HMAC_DRBG - * \param data Concatenation of entropy string and additional data - * \param data_len Length of data in bytes + * This function is meant for use in algorithms that need a pseudorandom + * input such as deterministic ECDSA. * - * \return 0 if successful, or - * MBEDTLS_ERR_MD_BAD_INPUT_DATA, or - * MBEDTLS_ERR_MD_ALLOC_FAILED. + * \param ctx HMAC_DRBG context to be initialised. + * \param md_info MD algorithm to use for HMAC_DRBG. + * \param data Concatenation of the initial entropy string and + * the additional data. + * \param data_len Length of \p data in bytes. + * + * \return \c 0 if successful. or + * \return #MBEDTLS_ERR_MD_BAD_INPUT_DATA if \p md_info is + * invalid. + * \return #MBEDTLS_ERR_MD_ALLOC_FAILED if there was not enough + * memory to allocate context data. */ int mbedtls_hmac_drbg_seed_buf( mbedtls_hmac_drbg_context *ctx, const mbedtls_md_info_t * md_info, const unsigned char *data, size_t data_len ); /** - * \brief Enable / disable prediction resistance (Default: Off) + * \brief This function turns prediction resistance on or off. + * The default value is off. * - * Note: If enabled, entropy is used for ctx->entropy_len before each call! - * Only use this if you have ample supply of good entropy! + * \note If enabled, entropy is gathered at the beginning of + * every call to mbedtls_hmac_drbg_random_with_add() + * or mbedtls_hmac_drbg_random(). + * Only use this if your entropy source has sufficient + * throughput. * - * \param ctx HMAC_DRBG context - * \param resistance MBEDTLS_HMAC_DRBG_PR_ON or MBEDTLS_HMAC_DRBG_PR_OFF + * \param ctx The HMAC_DRBG context. + * \param resistance #MBEDTLS_HMAC_DRBG_PR_ON or #MBEDTLS_HMAC_DRBG_PR_OFF. */ void mbedtls_hmac_drbg_set_prediction_resistance( mbedtls_hmac_drbg_context *ctx, int resistance ); /** - * \brief Set the amount of entropy grabbed on each reseed - * (Default: given by the security strength, which - * depends on the hash used, see \c mbedtls_hmac_drbg_init() ) + * \brief This function sets the amount of entropy grabbed on each + * seed or reseed. * - * \param ctx HMAC_DRBG context - * \param len Amount of entropy to grab, in bytes + * See the documentation of mbedtls_hmac_drbg_seed() for the default value. + * + * \param ctx The HMAC_DRBG context. + * \param len The amount of entropy to grab, in bytes. */ void mbedtls_hmac_drbg_set_entropy_len( mbedtls_hmac_drbg_context *ctx, size_t len ); /** - * \brief Set the reseed interval - * (Default: MBEDTLS_HMAC_DRBG_RESEED_INTERVAL) + * \brief Set the reseed interval. * - * \param ctx HMAC_DRBG context - * \param interval Reseed interval + * The reseed interval is the number of calls to mbedtls_hmac_drbg_random() + * or mbedtls_hmac_drbg_random_with_add() after which the entropy function + * is called again. + * + * The default value is #MBEDTLS_HMAC_DRBG_RESEED_INTERVAL. + * + * \param ctx The HMAC_DRBG context. + * \param interval The reseed interval. */ void mbedtls_hmac_drbg_set_reseed_interval( mbedtls_hmac_drbg_context *ctx, int interval ); /** - * \brief HMAC_DRBG update state + * \brief This function updates the state of the HMAC_DRBG context. * - * \param ctx HMAC_DRBG context - * \param additional Additional data to update state with, or NULL - * \param add_len Length of additional data, or 0 + * \param ctx The HMAC_DRBG context. + * \param additional The data to update the state with. + * If this is \c NULL, there is no additional data. + * \param add_len Length of \p additional in bytes. + * Unused if \p additional is \c NULL. * * \return \c 0 on success, or an error from the underlying * hash calculation. - * - * \note Additional data is optional, pass NULL and 0 as second - * third argument if no additional data is being used. */ int mbedtls_hmac_drbg_update_ret( mbedtls_hmac_drbg_context *ctx, const unsigned char *additional, size_t add_len ); @@ -230,33 +282,52 @@ void mbedtls_hmac_drbg_update( mbedtls_hmac_drbg_context *ctx, size_t add_len ); /** - * \brief HMAC_DRBG reseeding (extracts data from entropy source) - * - * \param ctx HMAC_DRBG context - * \param additional Additional data to add to state (Can be NULL) - * \param len Length of additional data - * - * \return 0 if successful, or - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * \brief This function reseeds the HMAC_DRBG context, that is + * extracts data from the entropy source. + * + * \param ctx The HMAC_DRBG context. + * \param additional Additional data to add to the state. + * If this is \c NULL, there is no additional data + * and \p len should be \c 0. + * \param len The length of the additional data. + * This must be at most #MBEDTLS_HMAC_DRBG_MAX_INPUT + * and also at most + * #MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT - \p entropy_len + * where \p entropy_len is the entropy length + * (see mbedtls_hmac_drbg_set_entropy_len()). + * + * \return \c 0 if successful. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * if a call to the entropy function failed. */ int mbedtls_hmac_drbg_reseed( mbedtls_hmac_drbg_context *ctx, const unsigned char *additional, size_t len ); /** - * \brief HMAC_DRBG generate random with additional update input - * - * Note: Automatically reseeds if reseed_counter is reached or PR is enabled. - * - * \param p_rng HMAC_DRBG context - * \param output Buffer to fill - * \param output_len Length of the buffer - * \param additional Additional data to update with (can be NULL) - * \param add_len Length of additional data (can be 0) - * - * \return 0 if successful, or - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or - * MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG, or - * MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG. + * \brief This function updates an HMAC_DRBG instance with additional + * data and uses it to generate random data. + * + * This function automatically reseeds if the reseed counter is exceeded + * or prediction resistance is enabled. + * + * \param p_rng The HMAC_DRBG context. This must be a pointer to a + * #mbedtls_hmac_drbg_context structure. + * \param output The buffer to fill. + * \param output_len The length of the buffer in bytes. + * This must be at most #MBEDTLS_HMAC_DRBG_MAX_REQUEST. + * \param additional Additional data to update with. + * If this is \c NULL, there is no additional data + * and \p add_len should be \c 0. + * \param add_len The length of the additional data. + * This must be at most #MBEDTLS_HMAC_DRBG_MAX_INPUT. + * + * \return \c 0 if successful. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * if a call to the entropy source failed. + * \return #MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG if + * \p output_len > #MBEDTLS_HMAC_DRBG_MAX_REQUEST. + * \return #MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG if + * \p add_len > #MBEDTLS_HMAC_DRBG_MAX_INPUT. */ int mbedtls_hmac_drbg_random_with_add( void *p_rng, unsigned char *output, size_t output_len, @@ -264,49 +335,59 @@ int mbedtls_hmac_drbg_random_with_add( void *p_rng, size_t add_len ); /** - * \brief HMAC_DRBG generate random - * - * Note: Automatically reseeds if reseed_counter is reached or PR is enabled. - * - * \param p_rng HMAC_DRBG context - * \param output Buffer to fill - * \param out_len Length of the buffer - * - * \return 0 if successful, or - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or - * MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG + * \brief This function uses HMAC_DRBG to generate random data. + * + * This function automatically reseeds if the reseed counter is exceeded + * or prediction resistance is enabled. + * + * \param p_rng The HMAC_DRBG context. This must be a pointer to a + * #mbedtls_hmac_drbg_context structure. + * \param output The buffer to fill. + * \param out_len The length of the buffer in bytes. + * This must be at most #MBEDTLS_HMAC_DRBG_MAX_REQUEST. + * + * \return \c 0 if successful. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * if a call to the entropy source failed. + * \return #MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG if + * \p out_len > #MBEDTLS_HMAC_DRBG_MAX_REQUEST. */ int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len ); /** * \brief Free an HMAC_DRBG context * - * \param ctx HMAC_DRBG context to free. + * \param ctx The HMAC_DRBG context to free. */ void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx ); #if defined(MBEDTLS_FS_IO) /** - * \brief Write a seed file + * \brief This function writes a seed file. * - * \param ctx HMAC_DRBG context - * \param path Name of the file + * \param ctx The HMAC_DRBG context. + * \param path The name of the file. * - * \return 0 if successful, 1 on file error, or - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED + * \return \c 0 on success. + * \return #MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR on file error. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED on reseed + * failure. */ int mbedtls_hmac_drbg_write_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path ); /** - * \brief Read and update a seed file. Seed is added to this - * instance - * - * \param ctx HMAC_DRBG context - * \param path Name of the file - * - * \return 0 if successful, 1 on file error, - * MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED or - * MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG + * \brief This function reads and updates a seed file. The seed + * is added to this instance. + * + * \param ctx The HMAC_DRBG context. + * \param path The name of the file. + * + * \return \c 0 on success. + * \return #MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR on file error. + * \return #MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED on + * reseed failure. + * \return #MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG if the existing + * seed file is too large. */ int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path ); #endif /* MBEDTLS_FS_IO */ @@ -314,9 +395,10 @@ int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const ch #if defined(MBEDTLS_SELF_TEST) /** - * \brief Checkup routine + * \brief The HMAC_DRBG Checkup routine. * - * \return 0 if successful, or 1 if the test failed + * \return \c 0 if successful. + * \return \c 1 if the test failed. */ int mbedtls_hmac_drbg_self_test( int verbose ); #endif

4 years, 10 months

[reactos] 01/01: [NtGDI] Use Vis Region for New Clip Region

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=290302219957caa44542b… commit 290302219957caa44542b0f20ea9f596ff1c60b4 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sun Feb 9 11:28:19 2020 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sun Feb 9 11:28:19 2020 -0600 [NtGDI] Use Vis Region for New Clip Region Interesting results while using VBOX-GA. Rolling back to Vis, wine throwback. See CORE-16680. --- win32ss/gdi/ntgdi/cliprgn.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/cliprgn.c b/win32ss/gdi/ntgdi/cliprgn.c index 163106ed1ce..0964f5559da 100644 --- a/win32ss/gdi/ntgdi/cliprgn.c +++ b/win32ss/gdi/ntgdi/cliprgn.c @@ -123,6 +123,7 @@ IntSelectClipRgn( { PREGION prgnClip; RECTL rcl; +#if 0 PSURFACE pSurface; // See IntSetDefaultRegion. @@ -145,12 +146,14 @@ IntSelectClipRgn( } } //EngReleaseSemaphore(pdc->ppdev->hsemDevLock); -#if 0 +//#if 0 rcl.left += dc->ptlDCOrig.x; rcl.top += dc->ptlDCOrig.y; rcl.right += dc->ptlDCOrig.x; rcl.bottom += dc->ptlDCOrig.y; #endif + REGION_GetRgnBox(dc->prgnVis, &rcl); + prgnClip = IntSysCreateRectpRgnIndirect(&rcl); Ret = IntGdiCombineRgn(prgnNClip, prgnClip, prgn, fnMode);

4 years, 10 months

[reactos] 02/02: [CRT] Import wine exception handling code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9efafd640f079d584dba8… commit 9efafd640f079d584dba899b191d095af46eeb3b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 13 13:41:24 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Feb 9 15:56:30 2020 +0100 [CRT] Import wine exception handling code The code is mostly unchanged. This includes the following changes: * Move all wine code to crt/wine to keep it separated from our own code * Add a minimal winternl.h * Remove the asm macros from wine/config.h * Include wine/asm.h where required * Fix the names of the exported functions (GCC uses thiscall now and no wrappers are used anymore) --- dll/win32/mshtml/ifacewrap.c | 1 + dll/win32/msi/custom.c | 1 + dll/win32/msvcrt/msvcrt.spec | 96 +- dll/win32/msvcrt40/msvcrt40.spec | 64 +- sdk/include/reactos/wine/asm.h | 4 + sdk/include/reactos/wine/config.h | 37 - sdk/include/reactos/wine/exception.h | 3 + sdk/lib/crt/crt.cmake | 23 +- sdk/lib/crt/except/amd64/ehandler.c | 12 +- sdk/lib/crt/except/amd64/seh.s | 6 - sdk/lib/crt/except/cpp.c | 1266 ----------------- sdk/lib/crt/except/cppexcept.c | 596 -------- sdk/lib/crt/except/except.c | 338 ----- sdk/lib/crt/except/i386/cpp.s | 148 +- sdk/lib/crt/except/i386/unwind.c | 39 - sdk/lib/crt/except/matherr.c | 16 - sdk/lib/crt/except/xcptfil.c | 98 -- sdk/lib/crt/include/internal/wine_msc.h | 148 +- sdk/lib/crt/wine/cpp.c | 2189 ++++++++++++++++++++++++++++++ sdk/lib/crt/{except => wine}/cppexcept.h | 48 +- sdk/lib/crt/wine/cxx.h | 267 ++++ sdk/lib/crt/wine/except.c | 545 ++++++++ sdk/lib/crt/wine/except_arm.c | 147 ++ sdk/lib/crt/wine/except_arm64.c | 148 ++ sdk/lib/crt/wine/except_i386.c | 1235 +++++++++++++++++ sdk/lib/crt/wine/except_x86_64.c | 758 +++++++++++ sdk/lib/crt/wine/msvcrt.h | 1494 ++++++++++++++++++++ sdk/lib/crt/wine/mtdll.h | 74 + sdk/lib/crt/wine/winternl.h | 313 +++++ 29 files changed, 7504 insertions(+), 2610 deletions(-) diff --git a/dll/win32/mshtml/ifacewrap.c b/dll/win32/mshtml/ifacewrap.c index cc22246a72b..e78464d88b0 100644 --- a/dll/win32/mshtml/ifacewrap.c +++ b/dll/win32/mshtml/ifacewrap.c @@ -17,6 +17,7 @@ */ #include "mshtml_private.h" +#include <wine/asm.h> /* * This object wraps any unrecognized interface overriding its IUnknown methods, allowing diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 310a1441738..8680b7214b3 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/asm.h" #define COBJMACROS diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 576b9800eb0..4e0c07aa950 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1,64 +1,64 @@ # msvcrt.dll - MS VC++ Run Time Library # **************** x86 C++ functions **************** -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *) -@ cdecl -i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *) -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &) -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *) -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &) -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) __thiscall_MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int) -@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &) -@ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void) -@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void) -@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void) -@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void) -@ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void) -@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void) +@ cdecl -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 -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 -i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *) +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &) +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *) +@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &) +@ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int) +@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &) +@ cdecl -i386 -norelay ??0exception@@QAE@XZ() MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void) +@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void) +@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void) +@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void) +@ cdecl -i386 -norelay ??1exception@@UAE@XZ() MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void) +@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void) @ cdecl -i386 ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int) ;@ cdecl -i386 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int) @ cdecl -i386 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *) -@ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &) -@ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &) -@ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &) -@ cdecl -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &) -@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const -@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const +@ cdecl -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 -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 -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 -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &) +@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const +@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const @ extern -i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' @ extern -i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' @ extern -i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' @ extern -i386 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' -@ cdecl -i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Fbad_cast@@QAEXXZ() __thiscall_MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void) -@ cdecl -i386 -norelay ??_Fbad_typeid@@QAEXXZ() __thiscall_MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void) -@ cdecl -i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int) +@ cdecl -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 -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Fbad_cast@@QAEXXZ() MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void) +@ cdecl -i386 -norelay ??_Fbad_typeid@@QAEXXZ() MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void) +@ cdecl -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 -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int) @ cdecl -i386 ??_U@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new[](unsigned int) ;@ cdecl -i386 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int) @ cdecl -i386 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void *) -@ cdecl -i386 -norelay __uncaught_exception(ptr) +@ cdecl -i386 -norelay __uncaught_exception(ptr) MSVCRT___uncaught_exception @ cdecl -i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) @ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void) @ cdecl -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 -i386 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) @ cdecl -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 -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const -@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const -@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const +@ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const +@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const +@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const @ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void) @ cdecl -i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) @ cdecl -i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) @ cdecl -i386 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) @ cdecl -i386 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) -@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception # public: virtual char const * __thiscall exception::what(void)const +@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() MSVCRT_what_exception # 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 @@ -94,7 +94,7 @@ @ 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 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void * __ptr64) -@ cdecl -arch=win64 __uncaught_exception(ptr) +@ 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) @@ -108,7 +108,7 @@ @ 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 -stub ?what@exception@@UEBAPEBDXZ() MSVCRT_what_exception # public: virtual char const * __ptr64 __cdecl exception::what(void)const __ptr64 +@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ() MSVCRT_what_exception # 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 &) @@ -204,14 +204,14 @@ # stub __CxxCallUnwindDtor # stub __CxxCallUnwindVecDtor @ cdecl __CxxDetectRethrow(ptr) -# stub __CxxExceptionFilter +@ cdecl __CxxExceptionFilter() @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl -i386 __CxxQueryExceptionSize() -# stub -i386 __CxxRegisterExceptionObject -# stub -i386 __CxxUnregisterExceptionObject +@ cdecl -i386 __CxxRegisterExceptionObject() +@ cdecl -i386 __CxxUnregisterExceptionObject() @ cdecl -version=0x600+ __DestructExceptionObject(ptr) @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @@ -329,7 +329,7 @@ @ cdecl _callnewh(long) @ cdecl _cexit() @ cdecl _cgets(str) -# stub _cgetws +@ cdecl -stub _cgetws(wstr) @ cdecl _chdir(str) @ cdecl _chdrive(long) @ cdecl _chgsign(double) @@ -347,14 +347,14 @@ @ cdecl -arch=x86_64,arm _copysignf(long long) @ varargs _cprintf(str) @ cdecl _cputs(str) -# stub _cputws +@ cdecl -stub _cputws(wstr) @ cdecl _creat(str long) @ varargs _cscanf(str) @ cdecl _ctime64(ptr) @ extern _ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) -# @ varargs _cwscanf(wstr) +@ varargs -stub _cwscanf(wstr) @ extern _daylight @ extern _dstbias @ cdecl _dup(long) @@ -431,8 +431,8 @@ @ cdecl _getpid() kernel32.GetCurrentProcessId @ cdecl _getsystime(ptr) @ cdecl _getw(ptr) -# stub _getwch -# stub _getwche +@ cdecl -stub _getwch() +@ cdecl -stub _getwche() @ cdecl _getws(ptr) @ cdecl -i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) diff --git a/dll/win32/msvcrt40/msvcrt40.spec b/dll/win32/msvcrt40/msvcrt40.spec index fab52fec803..d1efd557b46 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) __thiscall_MSVCRT___non_rtti_object_copy_ctor -@ cdecl -i386 ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor -@ cdecl -i386 ??0bad_cast@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor -@ cdecl -i386 ??0bad_cast@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_copy_ctor -@ cdecl -i386 ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor -@ cdecl -i386 ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor -@ cdecl -i386 ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor -@ cdecl -i386 ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor -@ cdecl -i386 ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor +@ 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 @ 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() __thiscall_MSVCRT___non_rtti_object_dtor -@ cdecl -i386 ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor -@ cdecl -i386 ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor -@ cdecl -i386 ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor +@ 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 @ 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() __thiscall_MSVCRT_type_info_dtor +@ 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 @ stub ??4Iostream_init@@QAEAAV0@ABV0@@Z -@ cdecl -i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals -@ cdecl -i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals -@ cdecl -i386 ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals -@ cdecl -i386 ??4exception@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_opequals +@ 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 @ stub ??4filebuf@@QAEAAV0@ABV0@@Z @ stub ??4fstream@@QAEAAV0@AAV0@@Z @ stub ??4ifstream@@QAEAAV0@ABV0@@Z @@ -165,8 +165,8 @@ @ stub ??6ostream@@QAEAAV0@PBE@Z @ stub ??6ostream@@QAEAAV0@PBX@Z @ stub ??7ios@@QBEHXZ -@ cdecl -i386 ??8type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opequals_equals -@ cdecl -i386 ??9type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opnot_equals +@ cdecl -i386 ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals +@ cdecl -i386 ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_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 @@ -219,10 +219,10 @@ @ stub ??_Dstdiostream@@QAEXXZ @ stub ??_Dstrstream@@QAEXXZ @ stub ??_EIostream_init@@QAEPAXI@Z -@ cdecl -i386 ??_E__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_vector_dtor -@ cdecl -i386 ??_Ebad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_vector_dtor -@ cdecl -i386 ??_Ebad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_vector_dtor -@ cdecl -i386 ??_Eexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_vector_dtor +@ 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 @ 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) __thiscall_MSVCRT___non_rtti_object_scalar_dtor -@ cdecl -i386 ??_Gbad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_scalar_dtor -@ cdecl -i386 ??_Gbad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_scalar_dtor -@ cdecl -i386 ??_Gexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_scalar_dtor +@ 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 @ stub ??_Gfilebuf@@UAEPAXI@Z @ stub ??_Gfstream@@UAEPAXI@Z @ stub ??_Gifstream@@UAEPAXI@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) __thiscall_MSVCRT_type_info_before +@ cdecl -i386 ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_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() __thiscall_MSVCRT_type_info_name +@ cdecl -i386 ?name@type_info@@QBEPBDXZ() MSVCRT_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() __thiscall_MSVCRT_type_info_raw_name +@ cdecl -i386 ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name @ stub ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ @ stub ?rdbuf@ios@@QBEPAVstreambuf@@XZ @@ -467,7 +467,7 @@ @ stub ?unlockbuf@ios@@QAAXXZ @ stub ?unlockc@ios@@KAXXZ @ stub ?unsetf@ios@@QAEJJ@Z -@ cdecl -i386 ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception +@ cdecl -i386 ?what@exception@@UBEPBDXZ() MSVCRT_what_exception @ stub ?width@ios@@QAEHH@Z @ stub ?width@ios@@QBEHXZ @ stub ?write@ostream@@QAEAAV1@PBCH@Z diff --git a/sdk/include/reactos/wine/asm.h b/sdk/include/reactos/wine/asm.h index 41a5de32026..14406b784eb 100644 --- a/sdk/include/reactos/wine/asm.h +++ b/sdk/include/reactos/wine/asm.h @@ -99,6 +99,10 @@ /* thiscall support */ +#ifdef _MSC_VER +#define __thiscall __stdcall +#endif + #if defined(__i386__) && !defined(__MINGW32__) # ifdef _MSC_VER diff --git a/sdk/include/reactos/wine/config.h b/sdk/include/reactos/wine/config.h index 670320898e4..7fd05d526e3 100644 --- a/sdk/include/reactos/wine/config.h +++ b/sdk/include/reactos/wine/config.h @@ -1316,43 +1316,6 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ -/* Define to a macro to output a .cfi assembly pseudo-op */ -#define __ASM_CFI(str) str - -/* Define to a macro to define an assembly function */ -#ifndef _MSC_VER -#ifndef NO_UNDERSCORE_PREFIX -#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); -#else -#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); -#endif -#else -#define __ASM_DEFINE_FUNC(name,suffix,code) -#endif - -/* Define to a macro to generate an assembly function directive */ -#define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" - -/* Define to a macro to generate an assembly function with C calling - convention */ -#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code) - -/* Define to a macro to generate an assembly name from a C symbol */ -#ifndef NO_UNDERSCORE_PREFIX -#define __ASM_NAME(name) "_" name -#else -#define __ASM_NAME(name) name -#endif - -/* Define to a macro to generate an stdcall suffix */ -#define __ASM_STDCALL(args) "@" #args - -/* Define to a macro to generate an assembly function with stdcall calling - convention */ -#ifndef _MSC_VER -#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) -#endif - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/sdk/include/reactos/wine/exception.h b/sdk/include/reactos/wine/exception.h index b16d502f826..9b29f2e470f 100644 --- a/sdk/include/reactos/wine/exception.h +++ b/sdk/include/reactos/wine/exception.h @@ -16,6 +16,8 @@ extern "C" { #define EH_EXIT_UNWIND 0x04 #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 +#define EH_TARGET_UNWIND 0x20 +#define EH_COLLIDED_UNWIND 0x40 #define EXCEPTION_WINE_STUB 0x80000100 #define EXCEPTION_WINE_ASSERTION 0x80000101 @@ -56,6 +58,7 @@ typedef struct _WINE_EXCEPTION_REGISTRATION_RECORD #define __TRY _SEH2_TRY #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation())) +#define __EXCEPT_CTX(func, ctx) _SEH2_EXCEPT((func)(GetExceptionInformation(), ctx)) #define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) #define __EXCEPT_ALL _SEH2_EXCEPT(_SEH_EXECUTE_HANDLER) #define __ENDTRY _SEH2_END diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 144a6000976..91f186013b6 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -20,12 +20,8 @@ list(APPEND CRT_SOURCE direct/wgetdcwd.c direct/wmkdir.c direct/wrmdir.c - except/cpp.c - except/cppexcept.c - except/except.c except/matherr.c except/stack.c - except/xcptfil.c float/chgsign.c float/copysign.c float/fpclass.c @@ -360,7 +356,11 @@ list(APPEND CRT_SOURCE wstring/wcsstr.c wstring/wcstok.c wstring/wcsupr.c - wstring/wcsxfrm.c + wstring/wcsxfrm.c) + +list(APPEND CRT_WINE_SOURCE + wine/cpp.c + wine/except.c wine/heap.c wine/undname.c) @@ -424,7 +424,6 @@ if(ARCH STREQUAL "i386") string/i386/wcsrchr_asm.s) list(APPEND CRT_SOURCE - except/i386/unwind.c float/i386/clearfp.c float/i386/cntrlfp.c float/i386/fpreset.c @@ -437,6 +436,8 @@ if(ARCH STREQUAL "i386") math/i386/cisin.c math/i386/cisqrt.c math/i386/ldexp.c) + list(APPEND CRT_WINE_SOURCE + wine/except_i386.c) if(MSVC) list(APPEND CRT_ASM_SOURCE except/i386/cpp.s) @@ -477,6 +478,8 @@ elseif(ARCH STREQUAL "amd64") except/amd64/ehandler.c float/i386/cntrlfp.c float/i386/statfp.c) + list(APPEND CRT_WINE_SOURCE + wine/except_x86_64.c) if(MSVC) list(APPEND CRT_ASM_SOURCE except/amd64/cpp.s) @@ -491,6 +494,9 @@ elseif(ARCH STREQUAL "arm") math/arm/__rt_udiv.c math/arm/__rt_udiv64_worker.c ) + list(APPEND CRT_WINE_SOURCE + wine/except_arm.c + ) list(APPEND CRT_ASM_SOURCE except/arm/_abnormal_termination.s except/arm/_except_handler2.s @@ -584,6 +590,9 @@ if(NOT ARCH STREQUAL "i386") string/wcsrchr.c) endif() +# includes for wine code +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + set_source_files_properties(${CRT_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "__MINGW_IMPORT=extern;USE_MSVCRT_PREFIX;_MSVCRT_LIB_;_MSVCRT_;_MT;CRTDLL") add_asm_files(crt_asm ${CRT_ASM_SOURCE}) @@ -593,7 +602,7 @@ if(USE_CLANG_CL) set_property(SOURCE stdlib/rot.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") endif() -add_library(crt ${CRT_SOURCE} ${crt_asm}) +add_library(crt ${CRT_SOURCE} ${CRT_WINE_SOURCE} ${crt_asm}) target_link_libraries(crt chkstk) add_target_compile_definitions(crt __MINGW_IMPORT=extern diff --git a/sdk/lib/crt/except/amd64/ehandler.c b/sdk/lib/crt/except/amd64/ehandler.c index 3705e4a7ed7..6e28e78e604 100644 --- a/sdk/lib/crt/except/amd64/ehandler.c +++ b/sdk/lib/crt/except/amd64/ehandler.c @@ -16,15 +16,7 @@ __C_specific_handler( return 0; } -DWORD -__CxxFrameHandler( - PEXCEPTION_RECORD rec, - EXCEPTION_REGISTRATION_RECORD* ExceptionRegistrationFrame, - PCONTEXT context, - EXCEPTION_REGISTRATION_RECORD** _ExceptionRecord) +void __cdecl _local_unwind(void* frame, void* target) { - UNIMPLEMENTED; - __debugbreak(); - return 0; + RtlUnwind(frame, target, NULL, 0); } - diff --git a/sdk/lib/crt/except/amd64/seh.s b/sdk/lib/crt/except/amd64/seh.s index 06bd671721d..77d0f368e4d 100644 --- a/sdk/lib/crt/except/amd64/seh.s +++ b/sdk/lib/crt/except/amd64/seh.s @@ -18,7 +18,6 @@ /* GLOBALS *******************************************************************/ PUBLIC _global_unwind2 -PUBLIC _local_unwind PUBLIC _local_unwind2 PUBLIC _abnormal_termination PUBLIC _except_handler2 @@ -42,11 +41,6 @@ FUNC _abnormal_termination ret ENDFUNC -FUNC _local_unwind - .endprolog - ret -ENDFUNC - FUNC _local_unwind2 .endprolog ret diff --git a/sdk/lib/crt/except/cpp.c b/sdk/lib/crt/except/cpp.c deleted file mode 100644 index 67fd29674d2..00000000000 --- a/sdk/lib/crt/except/cpp.c +++ /dev/null @@ -1,1266 +0,0 @@ -/* - * msvcrt.dll C++ objects - * - * Copyright 2000 Jon Griffiths - * Copyright 2003, 2004 Alexandre Julliard - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <precomp.h> - -#include <wine/exception.h> -#include <internal/wine/msvcrt.h> -#include <internal/wine/cppexcept.h> - -typedef exception bad_cast; -typedef exception bad_typeid; -typedef exception __non_rtti_object; - -typedef struct _rtti_base_descriptor -{ - const type_info *type_descriptor; - int num_base_classes; - this_ptr_offsets offsets; /* offsets for computing the this pointer */ - unsigned int attributes; -} rtti_base_descriptor; - -typedef struct _rtti_base_array -{ - const rtti_base_descriptor *bases[3]; /* First element is the class itself */ -} rtti_base_array; - -typedef struct _rtti_object_hierarchy -{ - unsigned int signature; - unsigned int attributes; - int array_len; /* Size of the array pointed to by 'base_classes' */ - const rtti_base_array *base_classes; -} rtti_object_hierarchy; - -typedef struct _rtti_object_locator -{ - unsigned int signature; - int base_class_offset; - unsigned int flags; - const type_info *type_descriptor; - const rtti_object_hierarchy *type_hierarchy; -} rtti_object_locator; - -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) - -#ifdef _MSC_VER -#include <internal/wine_msc.h> -#else -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#endif /* _MSC_VER */ - -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - -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; - -/* get the vtable pointer for a C++ object */ -static inline const vtable_ptr *get_vtable( void *obj ) -{ - return *(const vtable_ptr **)obj; -} - -static inline const rtti_object_locator *get_obj_locator( void *cppobj ) -{ - const vtable_ptr *vtable = get_vtable( cppobj ); - return (const rtti_object_locator *)vtable[-1]; -} - -static void dump_obj_locator( const rtti_object_locator *ptr ) -{ - int i; - const rtti_object_hierarchy *h = ptr->type_hierarchy; - - TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", - ptr, ptr->signature, ptr->base_class_offset, ptr->flags, - ptr->type_descriptor, dbgstr_type_info(ptr->type_descriptor), ptr->type_hierarchy ); - TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, h->base_classes ); - for (i = 0; i < h->array_len; i++) - { - TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - h->base_classes->bases[i], - h->base_classes->bases[i]->num_base_classes, - h->base_classes->bases[i]->offsets.this_offset, - h->base_classes->bases[i]->offsets.vbase_descr, - h->base_classes->bases[i]->offsets.vbase_offset, - h->base_classes->bases[i]->attributes, - h->base_classes->bases[i]->type_descriptor, - dbgstr_type_info(h->base_classes->bases[i]->type_descriptor) ); - } -} - -/* Internal common ctor for exception */ -static void EXCEPTION_ctor(exception *_this, const char** name) -{ - _this->vtable = &MSVCRT_exception_vtable; - if (*name) - { - size_t 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; - } -} - -/****************************************************************** - * ??0exception@@QAE@ABQBD@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor,8) -exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** name) -{ - TRACE("(%p,%s)\n", _this, *name); - EXCEPTION_ctor(_this, name); - return _this; -} - -/****************************************************************** - * ??0exception@@QAE@ABQBDH@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor_noalloc,12) -exception * __stdcall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc) -{ - TRACE("(%p,%s)\n", _this, *name); - _this->vtable = &MSVCRT_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 * __stdcall 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 * __stdcall 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 __stdcall MSVCRT_exception_dtor(exception * _this) -{ - TRACE("(%p)\n", _this); - _this->vtable = &MSVCRT_exception_vtable; - if (_this->do_free) MSVCRT_free(_this->name); -} - -/****************************************************************** - * ??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals,8) -exception * __stdcall MSVCRT_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); - } - TRACE("name = %s\n", _this->name); - return _this; -} - -/****************************************************************** - * ??_Eexception@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor,8) -void * __stdcall 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 i, *ptr = (int *)_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 * __stdcall MSVCRT_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); - return _this; -} - -/****************************************************************** - * ?what@exception@@UBEPBDXZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception,4) -const char * __stdcall 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 * __stdcall MSVCRT_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; -} - -/****************************************************************** - * ??0bad_typeid@@QAE@PBD@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor,8) -bad_typeid * __stdcall MSVCRT_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; -} - -/****************************************************************** - * ??_Fbad_typeid@@QAEXXZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_default_ctor,4) -bad_typeid * __stdcall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this) -{ - return MSVCRT_bad_typeid_ctor( _this, "bad typeid" ); -} - -/****************************************************************** - * ??1bad_typeid@@UAE@XZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor,4) -void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_exception_dtor(_this); -} - -/****************************************************************** - * ??4bad_typeid@@QAEAAV0@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals,8) -bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - MSVCRT_exception_opequals(_this, rhs); - return _this; -} - -/****************************************************************** - * ??_Ebad_typeid@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor,8) -void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _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 i, *ptr = (int *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_typeid_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCRT_bad_typeid_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -/****************************************************************** - * ??_Gbad_typeid@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor,8) -void * __stdcall MSVCRT_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); - return _this; -} - -/****************************************************************** - * ??0__non_rtti_object@@QAE@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor,8) -__non_rtti_object * __stdcall MSVCRT___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; -} - -/****************************************************************** - * ??0__non_rtti_object@@QAE@PBD@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor,8) -__non_rtti_object * __stdcall MSVCRT___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; -} - -/****************************************************************** - * ??1__non_rtti_object@@UAE@XZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor,4) -void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_bad_typeid_dtor(_this); -} - -/****************************************************************** - * ??4__non_rtti_object@@QAEAAV0@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals,8) -__non_rtti_object * __stdcall MSVCRT___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); - return _this; -} - -/****************************************************************** - * ??_E__non_rtti_object@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor,8) -void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _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 i, *ptr = (int *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCRT___non_rtti_object_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCRT___non_rtti_object_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -/****************************************************************** - * ??_G__non_rtti_object@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor,8) -void * __stdcall MSVCRT___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); - return _this; -} - -/****************************************************************** - * ??0bad_cast@@AAE@PBQBD@Z (MSVCRT.@) - * ??0bad_cast@@QAE@ABQBD@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor,8) -bad_cast * __stdcall MSVCRT_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; -} - -/****************************************************************** - * ??0bad_cast@@QAE@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor,8) -bad_cast * __stdcall MSVCRT_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; -} - -/****************************************************************** - * ??0bad_cast@@QAE@PBD@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor_charptr,8) -bad_cast * __stdcall MSVCRT_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; -} - -/****************************************************************** - * ??_Fbad_cast@@QAEXXZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_default_ctor,4) -bad_cast * __stdcall MSVCRT_bad_cast_default_ctor(bad_cast * _this) -{ - return MSVCRT_bad_cast_ctor_charptr( _this, "bad cast" ); -} - -/****************************************************************** - * ??1bad_cast@@UAE@XZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor,4) -void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_exception_dtor(_this); -} - -/****************************************************************** - * ??4bad_cast@@QAEAAV0@ABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals,8) -bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - MSVCRT_exception_opequals(_this, rhs); - return _this; -} - -/****************************************************************** - * ??_Ebad_cast@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor,8) -void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _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 i, *ptr = (int *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_cast_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCRT_bad_cast_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -/****************************************************************** - * ??_Gbad_cast@@UAEPAXI@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor,8) -void * __stdcall MSVCRT_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); - return _this; -} - -/****************************************************************** - * ??8type_info@@QBEHABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals,8) -int __stdcall MSVCRT_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); - return ret; -} - -/****************************************************************** - * ??9type_info@@QBEHABV0@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals,8) -int __stdcall MSVCRT_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); - return ret; -} - -/****************************************************************** - * ?before@type_info@@QBEHABV1@@Z (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before,8) -int __stdcall MSVCRT_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); - return ret; -} - -/****************************************************************** - * ??1type_info@@UAE@XZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) -void __stdcall MSVCRT_type_info_dtor(type_info * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_free(_this->name); -} - -/****************************************************************** - * ?name@type_info@@QBEPBDXZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name,4) -const char * __stdcall MSVCRT_type_info_name(type_info * _this) -{ - if (!_this->name) - { - /* Create and set the demangled name */ - /* Note: mangled name in type_info struct always starts with a '.', while - * it isn't valid for mangled name. - * 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); - if (name) - { - size_t len = strlen(name); - - /* It seems _unDName may leave blanks at the end of the demangled name */ - while (len && name[--len] == ' ') - name[len] = '\0'; - - if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL)) - { - /* Another thread set this member since we checked above - use it */ - MSVCRT_free(name); - } - } - } - TRACE("(%p) returning %s\n", _this, _this->name); - return _this->name; -} - -/****************************************************************** - * ?raw_name@type_info@@QBEPBDXZ (MSVCRT.@) - */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name,4) -const char * __stdcall MSVCRT_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 * __stdcall 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 i, *ptr = (int *)_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; -} - -/* vtables */ - -#ifdef __GNUC__ -#ifdef _WIN64 - -#define __ASM_VTABLE(name,funcs) \ - __asm__(".data\n" \ - "\t.align 8\n" \ - "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ - "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ - __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ - "\t.quad " THISCALL_NAME(MSVCRT_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); - -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCRT_what_exception) ) - -#else - -#define __ASM_VTABLE(name,funcs) \ - __asm__(".data\n" \ - "\t.align 4\n" \ - "\t.long " __ASM_NAME(#name "_rtti") "\n" \ - "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ - __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ - "\t.long " THISCALL_NAME(MSVCRT_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); - -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) - -#endif /* _WIN64 */ - -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif - -__ASM_VTABLE(type_info,"") -__ASM_EXCEPTION_VTABLE(exception) -__ASM_EXCEPTION_VTABLE(bad_typeid) -__ASM_EXCEPTION_VTABLE(bad_cast) -__ASM_EXCEPTION_VTABLE(__non_rtti_object) - -#ifndef __GNUC__ -} -#endif -#endif - -/* Static RTTI for exported objects */ - -static const type_info exception_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVexception@@" -}; - -static const rtti_base_descriptor exception_rtti_base_descriptor = -{ - &exception_type_info, - 0, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array exception_rtti_base_array = -{ - { - &exception_rtti_base_descriptor, - NULL, - NULL - } -}; - -static const rtti_object_hierarchy exception_type_hierarchy = -{ - 0, - 0, - 1, - &exception_rtti_base_array -}; - -const rtti_object_locator exception_rtti = -{ - 0, - 0, - 0, - &exception_type_info, - &exception_type_hierarchy -}; - -static const cxx_type_info exception_cxx_type_info = -{ - 0, - &exception_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_exception_copy_ctor) -}; - -static const type_info bad_typeid_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVbad_typeid@@" -}; - -static const rtti_base_descriptor bad_typeid_rtti_base_descriptor = -{ - &bad_typeid_type_info, - 1, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array bad_typeid_rtti_base_array = -{ - { - &bad_typeid_rtti_base_descriptor, - &exception_rtti_base_descriptor, - NULL - } -}; - -static const rtti_object_hierarchy bad_typeid_type_hierarchy = -{ - 0, - 0, - 2, - &bad_typeid_rtti_base_array -}; - -const rtti_object_locator bad_typeid_rtti = -{ - 0, - 0, - 0, - &bad_typeid_type_info, - &bad_typeid_type_hierarchy -}; - -static const cxx_type_info bad_typeid_cxx_type_info = -{ - 0, - &bad_typeid_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_typeid_copy_ctor) -}; - -static const type_info bad_cast_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVbad_cast@@" -}; - -static const rtti_base_descriptor bad_cast_rtti_base_descriptor = -{ - &bad_cast_type_info, - 1, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array bad_cast_rtti_base_array = -{ - { - &bad_cast_rtti_base_descriptor, - &exception_rtti_base_descriptor, - NULL - } -}; - -static const rtti_object_hierarchy bad_cast_type_hierarchy = -{ - 0, - 0, - 2, - &bad_cast_rtti_base_array -}; - -const rtti_object_locator bad_cast_rtti = -{ - 0, - 0, - 0, - &bad_cast_type_info, - &bad_cast_type_hierarchy -}; - -static const cxx_type_info bad_cast_cxx_type_info = -{ - 0, - &bad_cast_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_cast_copy_ctor) -}; - -static const type_info __non_rtti_object_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AV__non_rtti_object@@" -}; - -static const rtti_base_descriptor __non_rtti_object_rtti_base_descriptor = -{ - &__non_rtti_object_type_info, - 2, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array __non_rtti_object_rtti_base_array = -{ - { - &__non_rtti_object_rtti_base_descriptor, - &bad_typeid_rtti_base_descriptor, - &exception_rtti_base_descriptor - } -}; - -static const rtti_object_hierarchy __non_rtti_object_type_hierarchy = -{ - 0, - 0, - 3, - &__non_rtti_object_rtti_base_array -}; - -const rtti_object_locator __non_rtti_object_rtti = -{ - 0, - 0, - 0, - &__non_rtti_object_type_info, - &__non_rtti_object_type_hierarchy -}; - -static const cxx_type_info __non_rtti_object_cxx_type_info = -{ - 0, - &__non_rtti_object_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT___non_rtti_object_copy_ctor) -}; - -static const type_info type_info_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVtype_info@@" -}; - -static const rtti_base_descriptor type_info_rtti_base_descriptor = -{ - &type_info_type_info, - 0, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array type_info_rtti_base_array = -{ - { - &type_info_rtti_base_descriptor, - NULL, - NULL - } -}; - -static const rtti_object_hierarchy type_info_type_hierarchy = -{ - 0, - 0, - 1, - &type_info_rtti_base_array -}; - -const rtti_object_locator type_info_rtti = -{ - 0, - 0, - 0, - &type_info_type_info, - &type_info_type_hierarchy -}; - -/* - * Exception RTTI for cpp objects - */ -static const cxx_type_info_table bad_cast_type_info_table = -{ - 3, - { - &__non_rtti_object_cxx_type_info, - &bad_typeid_cxx_type_info, - &exception_cxx_type_info - } -}; - -static const cxx_exception_type bad_cast_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_cast_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_type_info_table bad_typeid_type_info_table = -{ - 2, - { - &bad_cast_cxx_type_info, - &exception_cxx_type_info, - NULL - } -}; - -static const cxx_exception_type bad_typeid_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_typeid_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_exception_type __non_rtti_object_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT___non_rtti_object_dtor), - NULL, - &bad_typeid_type_info_table -}; - - -/****************************************************************** - * ?set_terminate@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) - * - * Install a handler to be called when terminate() is called. - * - * PARAMS - * func [I] Handler function to install - * - * RETURNS - * The previously installed handler function, if any. - */ -terminate_function CDECL MSVCRT_set_terminate(terminate_function func) -{ - thread_data_t *data = msvcrt_get_thread_data(); - terminate_function previous = data->terminate_handler; - TRACE("(%p) returning %p\n",func,previous); - data->terminate_handler = func; - return previous; -} - -/****************************************************************** - * _get_terminate (MSVCRT.@) - */ -terminate_function CDECL _get_terminate(void) -{ - thread_data_t *data = msvcrt_get_thread_data(); - return data->terminate_handler; -} - -/****************************************************************** - * ?set_unexpected@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) - * - * Install a handler to be called when unexpected() is called. - * - * PARAMS - * func [I] Handler function to install - * - * RETURNS - * The previously installed handler function, if any. - */ -unexpected_function CDECL MSVCRT_set_unexpected(unexpected_function func) -{ - thread_data_t *data = msvcrt_get_thread_data(); - unexpected_function previous = data->unexpected_handler; - TRACE("(%p) returning %p\n",func,previous); - data->unexpected_handler = func; - return previous; -} - -/****************************************************************** - * _get_unexpected (MSVCRT.@) - */ -unexpected_function CDECL _get_unexpected(void) -{ - thread_data_t *data = msvcrt_get_thread_data(); - return data->unexpected_handler; -} - -/****************************************************************** - * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z (MSVCRT.@) - */ -_se_translator_function CDECL MSVCRT__set_se_translator(_se_translator_function func) -{ - thread_data_t *data = msvcrt_get_thread_data(); - _se_translator_function previous = data->se_translator; - TRACE("(%p) returning %p\n",func,previous); - data->se_translator = func; - return previous; -} - -/****************************************************************** - * ?terminate@@YAXXZ (MSVCRT.@) - * - * Default handler for an unhandled exception. - * - * PARAMS - * None. - * - * RETURNS - * This function does not return. Either control resumes from any - * handler installed by calling set_terminate(), or (by default) abort() - * is called. - */ -void CDECL MSVCRT_terminate(void) -{ - thread_data_t *data = msvcrt_get_thread_data(); - if (data->terminate_handler) data->terminate_handler(); - abort(); -} - -/****************************************************************** - * ?unexpected@@YAXXZ (MSVCRT.@) - */ -void CDECL MSVCRT_unexpected(void) -{ - thread_data_t *data = msvcrt_get_thread_data(); - if (data->unexpected_handler) data->unexpected_handler(); - MSVCRT_terminate(); -} - - -/****************************************************************** - * __RTtypeid (MSVCRT.@) - * - * Retrieve the Run Time Type Information (RTTI) for a C++ object. - * - * PARAMS - * cppobj [I] C++ object to get type information for. - * - * RETURNS - * Success: A type_info object describing cppobj. - * Failure: If the object to be cast has no RTTI, a __non_rtti_object - * exception is thrown. If cppobj is NULL, a bad_typeid exception - * is thrown. In either case, this function does not return. - * - * NOTES - * This function is usually called by compiler generated code as a result - * of using one of the C++ dynamic cast statements. - */ -const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) -{ - const type_info *ret; - - if (!cppobj) - { - bad_typeid e; - MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); - return NULL; - } - - __TRY - { - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - ret = obj_locator->type_descriptor; - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - return NULL; - } - __ENDTRY - return ret; -} - -/****************************************************************** - * __RTDynamicCast (MSVCRT.@) - * - * Dynamically cast a C++ object to one of its base classes. - * - * PARAMS - * cppobj [I] Any C++ object to cast - * unknown [I] Reserved, set to 0 - * src [I] type_info object describing cppobj - * dst [I] type_info object describing the base class to cast to - * do_throw [I] TRUE = throw an exception if the cast fails, FALSE = don't - * - * RETURNS - * Success: The address of cppobj, cast to the object described by dst. - * Failure: NULL, If the object to be cast has no RTTI, or dst is not a - * valid cast for cppobj. If do_throw is TRUE, a bad_cast exception - * is thrown and this function does not return. - * - * NOTES - * This function is usually called by compiler generated code as a result - * of using one of the C++ dynamic cast statements. - */ -void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, - type_info *src, type_info *dst, - int do_throw) -{ - void *ret; - - if (!cppobj) return NULL; - - TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", - cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - - /* To cast an object at runtime: - * 1.Find out the true type of the object from the typeinfo at vtable[-1] - * 2.Search for the destination type in the class hierarchy - * 3.If destination type is found, return base object address + dest offset - * Otherwise, fail the cast - * - * FIXME: the unknown parameter doesn't seem to be used for anything - */ - __TRY - { - int i; - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; - const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; - - if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); - - ret = NULL; - for (i = 0; i < obj_bases->array_len; i++) - { - const type_info *typ = base_desc[i]->type_descriptor; - - if (!strcmp(typ->mangled, dst->mangled)) - { - /* compute the correct this pointer for that base class */ - void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); - break; - } - } - /* VC++ sets do_throw to 1 when the result of a dynamic_cast is assigned - * to a reference, since references cannot be NULL. - */ - if (!ret && do_throw) - { - const char *msg = "Bad dynamic_cast!"; - bad_cast e; - MSVCRT_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!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - return NULL; - } - __ENDTRY - return ret; -} - - -/****************************************************************** - * __RTCastToVoid (MSVCRT.@) - * - * Dynamically cast a C++ object to a void*. - * - * PARAMS - * cppobj [I] The C++ object to cast - * - * RETURNS - * Success: The base address of the object as a void*. - * Failure: NULL, if cppobj is NULL or has no RTTI. - * - * NOTES - * 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 *ret; - - if (!cppobj) return NULL; - - __TRY - { - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - ret = (char *)cppobj - obj_locator->base_class_offset; - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - return NULL; - } - __ENDTRY - return ret; -} diff --git a/sdk/lib/crt/except/cppexcept.c b/sdk/lib/crt/except/cppexcept.c deleted file mode 100644 index e1352a608be..00000000000 --- a/sdk/lib/crt/except/cppexcept.c +++ /dev/null @@ -1,596 +0,0 @@ -/* - * msvcrt C++ exception handling - * - * Copyright 2002 Alexandre Julliard - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTES - * A good reference is the article "How a C++ compiler implements - * exception handling" by Vishal Kochhar, available on - * www.thecodeproject.com. - */ - -#define __WINE_DEBUG_CHANNEL__ -#include <precomp.h> -#include <stdarg.h> - -#include <wine/exception.h> -#include <internal/wine/msvcrt.h> -#include <internal/wine/cppexcept.h> - -#ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ - -WINE_DEFAULT_DEBUG_CHANNEL(seh); - -DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, - const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); - -/* call a function with a given ebp */ -#ifdef _MSC_VER -#pragma warning(disable:4731) // don't warn about modification of ebp -#endif -static inline void *call_ebp_func( void *func, void *_ebp ) -{ - void *result; -#ifdef _MSC_VER - __asm - { - mov eax, func - push ebx - push ebp - mov ebp, _ebp - call eax - pop ebp - pop ebx - mov result, eax - } -#else - int dummy; - __asm__ __volatile__ ("pushl %%ebx\n\t" - "pushl %%ebp\n\t" - "movl %4,%%ebp\n\t" - "call *%%eax\n\t" - "popl %%ebp\n\t" - "popl %%ebx" - : "=a" (result), "=S" (dummy), "=D" (dummy) - : "0" (func), "1" (_ebp) : "ecx", "edx", "memory" ); -#endif - return result; -} -#ifdef _MSC_VER -#pragma warning(default:4731) -#endif - -/* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); -#ifdef _MSC_VER - if (has_vbase) - { - __asm - { - mov ecx, this - push 1 - push src - call func - } - } - else - { - __asm - { - mov ecx, this - push src - call func - } - } -#else - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -#endif -} - -/* call the destructor of the exception object */ -static inline void call_dtor( void *func, void *object ) -{ -#ifdef _MSC_VER - __asm - { - mov ecx, object - call func - } -#else - __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); -#endif -} - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4731) -/* continue execution to the specified address after exception is caught */ -__forceinline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -{ - __asm - { - mov eax, addr - mov edx, frame - mov esp, [edx-4] - lea ebp, [edx+12] - jmp eax - } - for (;;) ; /* unreached */ -} -#pragma warning(pop) -#else -/* continue execution to the specified address after exception is caught */ -static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -{ - __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" - : : "r" (frame), "a" (addr) ); - for (;;) ; /* unreached */ -} -#endif - -static inline void dump_type( const cxx_type_info *type ) -{ - TRACE( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", - type->flags, type->type_info, dbgstr_type_info(type->type_info), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor ); -} - -static void dump_exception_type( const cxx_exception_type *type ) -{ - UINT i; - - TRACE( "flags %x destr %p handler %p type info %p\n", - type->flags, type->destructor, type->custom_handler, type->type_info_table ); - for (i = 0; i < type->type_info_table->count; i++) - { - TRACE( " %d: ", i ); - dump_type( type->type_info_table->info[i] ); - } -} - -static void dump_function_descr( const cxx_function_descr *descr ) -{ -#ifndef WINE_NO_TRACE_MSGS - UINT i; - int j; - - TRACE( "magic %x\n", descr->magic ); - TRACE( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count ); - for (i = 0; i < descr->unwind_count; i++) - { - TRACE( " %d: prev %d func %p\n", i, - descr->unwind_table[i].prev, descr->unwind_table[i].handler ); - } - TRACE( "try table: %p %d\n", descr->tryblock, descr->tryblock_count ); - for (i = 0; i < descr->tryblock_count; i++) - { - TRACE( " %d: start %d end %d catchlevel %d catch %p %d\n", i, - descr->tryblock[i].start_level, descr->tryblock[i].end_level, - descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, - descr->tryblock[i].catchblock_count ); - for (j = 0; j < descr->tryblock[i].catchblock_count; j++) - { - const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; - TRACE( " %d: flags %x offset %d handler %p type %p %s\n", - j, ptr->flags, ptr->offset, ptr->handler, - ptr->type_info, dbgstr_type_info( ptr->type_info ) ); - } - } -#endif - if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; - TRACE( "expect list: %p\n", descr->expect_list ); - if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; - TRACE( "flags: %08x\n", descr->flags ); -} - -/* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, - const catchblock_info *catchblock ) -{ - UINT i; - - for (i = 0; i < exc_type->type_info_table->count; i++) - { - const cxx_type_info *type = exc_type->type_info_table->info[i]; - - if (!catchblock->type_info) return type; /* catch(...) matches any type */ - if (catchblock->type_info != type->type_info) - { - if (strcmp( catchblock->type_info->mangled, type->type_info->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catchblock->flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catchblock->flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - - -/* copy the exception object where the catch block wants it */ -static void copy_exception( void *object, cxx_exception_frame *frame, - const catchblock_info *catchblock, const cxx_type_info *type ) -{ - void **dest_ptr; - - if (!catchblock->type_info || !catchblock->type_info->mangled[0]) return; - if (!catchblock->offset) return; - dest_ptr = (void **)((char *)&frame->ebp + catchblock->offset); - - if (catchblock->flags & TYPE_FLAG_REFERENCE) - { - *dest_ptr = get_this_pointer( &type->offsets, object ); - } - else if (type->flags & CLASS_IS_SIMPLE_TYPE) - { - memmove( dest_ptr, object, type->size ); - /* if it is a pointer, adjust it */ - if (type->size == sizeof(void *)) *dest_ptr = get_this_pointer( &type->offsets, *dest_ptr ); - } - else /* copy the object */ - { - if (type->copy_ctor) - call_copy_ctor( type->copy_ctor, dest_ptr, get_this_pointer(&type->offsets,object), - (type->flags & CLASS_HAS_VIRTUAL_BASE_CLASS) ); - else - memmove( dest_ptr, get_this_pointer(&type->offsets,object), type->size ); - } -} - -/* unwind the local function up to a given trylevel */ -static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) -{ - void (*handler)(void); - int trylevel = frame->trylevel; - - while (trylevel != last_level) - { - if (trylevel < 0 || (unsigned)trylevel >= descr->unwind_count) - { - ERR( "invalid trylevel %d\n", trylevel ); - MSVCRT_terminate(); - } - handler = descr->unwind_table[trylevel].handler; - if (handler) - { - TRACE( "calling unwind handler %p trylevel %d last %d ebp %p\n", - handler, trylevel, last_level, &frame->ebp ); - call_ebp_func( handler, &frame->ebp ); - } - trylevel = descr->unwind_table[trylevel].prev; - } - frame->trylevel = last_level; -} - -/* exception frame for nested exceptions in catch block */ -struct catch_func_nested_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ - EXCEPTION_RECORD *prev_rec; /* previous record to restore in thread data */ - cxx_exception_frame *cxx_frame; /* frame of parent exception */ - const cxx_function_descr *descr; /* descriptor of parent exception */ - int trylevel; /* current try level */ - EXCEPTION_RECORD *rec; /* rec associated with frame */ -}; - -/* handler for exceptions happening while calling a catch function */ -static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; - - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) - { - msvcrt_get_thread_data()->exc_record = nested_frame->prev_rec; - return ExceptionContinueSearch; - } - - TRACE( "got nested exception in catch function\n" ); - - if(rec->ExceptionCode == CXX_EXCEPTION) - { - PEXCEPTION_RECORD prev_rec = nested_frame->rec; - if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - /* exception was rethrown */ - rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; - rec->ExceptionInformation[2] = prev_rec->ExceptionInformation[2]; - TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - } - else { - /* new exception in exception handler, destroy old */ - void *object = (void*)prev_rec->ExceptionInformation[1]; - cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; - TRACE("detect threw new exception in catch block - destroy old(obj: %p type: %p)\n", - object, info); - if(info && info->destructor) - call_dtor( info->destructor, object ); - } - } - - return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); -} - -/* find and call the appropriate catch block for an exception */ -/* returns the address to continue execution to after the catch block was called */ -static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, - const cxx_function_descr *descr, int nested_trylevel, - cxx_exception_type *info ) -{ - UINT i; - int j; - void *addr, *object = (void *)rec->ExceptionInformation[1]; - struct catch_func_nested_frame nested_frame; - int trylevel = frame->trylevel; - thread_data_t *thread_data = msvcrt_get_thread_data(); - DWORD save_esp = ((DWORD*)frame)[-1]; - - for (i = 0; i < descr->tryblock_count; i++) - { - const tryblock_info *tryblock = &descr->tryblock[i]; - - if (trylevel < tryblock->start_level) continue; - if (trylevel > tryblock->end_level) continue; - - /* got a try block */ - for (j = 0; j < tryblock->catchblock_count; j++) - { - const catchblock_info *catchblock = &tryblock->catchblock[j]; - if(info) - { - const cxx_type_info *type = find_caught_type( info, catchblock ); - if (!type) continue; - - TRACE( "matched type %p in tryblock %d catchblock %d\n", type, i, j ); - - /* copy the exception to its destination on the stack */ - copy_exception( object, frame, catchblock, type ); - } - else - { - /* no CXX_EXCEPTION only proceed with a catch(...) block*/ - if(catchblock->type_info) - continue; - TRACE("found catch(...) block\n"); - } - - /* unwind the stack */ - RtlUnwind( frame, 0, rec, 0 ); - cxx_local_unwind( frame, descr, tryblock->start_level ); - frame->trylevel = tryblock->end_level + 1; - - /* call the catch block */ - TRACE( "calling catch block %p addr %p ebp %p\n", - catchblock, catchblock->handler, &frame->ebp ); - - /* setup an exception block for nested exceptions */ - - nested_frame.frame.Handler = (PEXCEPTION_ROUTINE)catch_function_nested_handler; - nested_frame.prev_rec = thread_data->exc_record; - nested_frame.cxx_frame = frame; - nested_frame.descr = descr; - nested_frame.trylevel = nested_trylevel + 1; - nested_frame.rec = rec; - - __wine_push_frame( &nested_frame.frame ); - thread_data->exc_record = rec; - addr = call_ebp_func( catchblock->handler, &frame->ebp ); - thread_data->exc_record = nested_frame.prev_rec; - __wine_pop_frame( &nested_frame.frame ); - - ((DWORD*)frame)[-1] = save_esp; - if (info && info->destructor) call_dtor( info->destructor, object ); - TRACE( "done, continuing at %p\n", addr ); - - continue_after_catch( frame, addr ); - } - } -} - - -/********************************************************************* - * cxx_frame_handler - * - * Implementation of __CxxFrameHandler. - */ -DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, - const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ) -{ - cxx_exception_type *exc_type; - - if (descr->magic < CXX_FRAME_MAGIC_VC6 || descr->magic > CXX_FRAME_MAGIC_VC8) - { - ERR( "invalid frame magic %x\n", descr->magic ); - return ExceptionContinueSearch; - } - if (descr->magic >= CXX_FRAME_MAGIC_VC8 && - (descr->flags & FUNC_DESCR_SYNCHRONOUS) && - (rec->ExceptionCode != CXX_EXCEPTION)) - return ExceptionContinueSearch; /* handle only c++ exceptions */ - - if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) - { - if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); - return ExceptionContinueSearch; - } - if (!descr->tryblock_count) return ExceptionContinueSearch; - - if(rec->ExceptionCode == CXX_EXCEPTION) - { - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - - if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && - exc_type->custom_handler) - { - return exc_type->custom_handler( rec, frame, context, dispatch, - descr, nested_trylevel, nested_frame, 0 ); - } - - if (TRACE_ON(seh)) - { - TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", - rec, frame, frame->trylevel, descr, nested_frame ); - dump_exception_type( exc_type ); - dump_function_descr( descr ); - } - } - else - { - exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", - rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); - } - - call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); - return ExceptionContinueSearch; -} - - -/********************************************************************* - * __CxxFrameHandler (MSVCRT.@) - */ -extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); -#ifdef _MSC_VER -DWORD _declspec(naked) __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ) -{ - __asm - { - push 0 - push 0 - push eax - push [esp + 28] - push [esp + 28] - push [esp + 28] - push [esp + 28] - call cxx_frame_handler - add esp, 28 - ret - } -} -#else -__ASM_GLOBAL_FUNC( __CxxFrameHandler, - "pushl $0\n\t" /* nested_trylevel */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl $0\n\t" /* nested_frame */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl %eax\n\t" /* descr */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* dispatch */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* context */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* frame */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* rec */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "call " __ASM_NAME("cxx_frame_handler") "\n\t" - "add $28,%esp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") - "ret" ) -#endif - -/********************************************************************* - * __CxxLongjmpUnwind (MSVCRT.@) - * - * Callback meant to be used as UnwindFunc for setjmp/longjmp. - */ -void __stdcall __CxxLongjmpUnwind( const struct __JUMP_BUFFER *buf ) -{ - cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration; - const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0]; - - TRACE( "unwinding frame %p descr %p trylevel %ld\n", frame, descr, buf->TryLevel ); - cxx_local_unwind( frame, descr, buf->TryLevel ); -} - -#endif /* __i386__ */ - - -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter( ex, ptr ); -} - -/********************************************************************* - * _CxxThrowException (MSVCRT.@) - */ -void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) -{ - ULONG_PTR args[3]; - - args[0] = CXX_FRAME_MAGIC_VC6; - args[1] = (ULONG_PTR)object; - args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); -} - -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} diff --git a/sdk/lib/crt/except/except.c b/sdk/lib/crt/except/except.c deleted file mode 100644 index a3ed19bf545..00000000000 --- a/sdk/lib/crt/except/except.c +++ /dev/null @@ -1,338 +0,0 @@ -/* - * msvcrt.dll exception handling - * - * Copyright 2000 Jon Griffiths - * Copyright 2005 Juan Lang - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - * - * FIXME: Incomplete support for nested exceptions/try block cleanup. - */ - -#include <precomp.h> -#include "excpt.h" -#include "cppexcept.h" -#include <wine/exception.h> - -void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame); - -typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *); -static MSVCRT_security_error_handler security_error_handler; - -/* VC++ extensions to Win32 SEH */ -typedef struct _SCOPETABLE -{ - int previousTryLevel; - int (*lpfnFilter)(PEXCEPTION_POINTERS); - int (*lpfnHandler)(void); -} SCOPETABLE, *PSCOPETABLE; - -typedef struct _MSVCRT_EXCEPTION_FRAME -{ - EXCEPTION_REGISTRATION_RECORD *prev; - void (*handler)(PEXCEPTION_RECORD, EXCEPTION_REGISTRATION_RECORD*, - PCONTEXT, PEXCEPTION_RECORD); - PSCOPETABLE scopetable; - int trylevel; - int _ebp; - PEXCEPTION_POINTERS xpointers; -} MSVCRT_EXCEPTION_FRAME; - -typedef struct -{ - int gs_cookie_offset; - ULONG gs_cookie_xor; - int eh_cookie_offset; - ULONG eh_cookie_xor; - SCOPETABLE entries[1]; -} SCOPETABLE_V4; - -#ifdef __i386__ - -static const SCOPETABLE_V4 *get_scopetable_v4( MSVCRT_EXCEPTION_FRAME *frame, ULONG_PTR cookie ) -{ - return (const SCOPETABLE_V4 *)((ULONG_PTR)frame->scopetable ^ cookie); -} - -#if defined(__GNUC__) -static inline void call_finally_block( void *code_block, void *base_ptr ) -{ - __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" - : : "a" (code_block), "g" (base_ptr)); -} - -static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp), "r" (arg) - : "ecx", "edx", "memory" ); - return ret; -} -static inline int call_unwind_func( int (*func)(void), void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl %%esi\n\t" - "pushl %%edi\n\t" - "movl %2,%%ebp\n\t" - "call *%0\n\t" - "popl %%edi\n\t" - "popl %%esi\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp) - : "ecx", "edx", "memory" ); - return ret; -} -#elif defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4731) // Don't complain about changing ebp -void __inline call_finally_block( void *code_block, void *base_ptr ) -{ - __asm - { - mov eax, code_block - mov ebp, base_ptr - call [eax] - } -} - -int __inline call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *_ebp ) -{ - int _ret; - __asm - { - push ebp - mov eax, arg - push eax - mov ebp, _ebp - mov eax, func - call [eax] - mov _ret, eax - pop ebp - pop ebp - } - return _ret; -} -int __inline call_unwind_func( int (*func)(void), void *_ebp ) -{ - int _ret; - - __asm - { - push ebp - push ebx - push esi - push edi - mov ebp, _ebp - call dword ptr [func] - mov _ret, eax - pop edi - pop esi - pop ebx - pop ebp - } - return _ret; -} -#pragma warning(pop) -#endif - -static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, - EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT context, - EXCEPTION_REGISTRATION_RECORD** dispatch) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - return ExceptionContinueSearch; - *dispatch = frame; - return ExceptionCollidedUnwind; -} - -void msvcrt_local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int trylevel, void *ebp ) -{ - EXCEPTION_REGISTRATION_RECORD reg; - const SCOPETABLE_V4 *scopetable = get_scopetable_v4( frame, *cookie ); - - TRACE("(%p,%d,%d)\n",frame, frame->trylevel, trylevel); - - /* Register a handler in case of a nested exception */ - reg.Handler = (PEXCEPTION_ROUTINE)MSVCRT_nested_handler; - reg.Prev = NtCurrentTeb()->NtTib.ExceptionList; - __wine_push_frame(&reg); - - while (frame->trylevel != -2 && frame->trylevel != trylevel) - { - int level = frame->trylevel; - frame->trylevel = scopetable->entries[level].previousTryLevel; - if (!scopetable->entries[level].lpfnFilter) - { - TRACE( "__try block cleanup level %d handler %p ebp %p\n", - level, scopetable->entries[level].lpfnHandler, ebp ); - call_unwind_func( scopetable->entries[level].lpfnHandler, ebp ); - } - } - __wine_pop_frame(&reg); - TRACE("unwound OK\n"); -} - -/********************************************************************* - * _except_handler4_common (MSVCRT.@) - */ -int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), - EXCEPTION_RECORD *rec, MSVCRT_EXCEPTION_FRAME *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - int retval, trylevel; - EXCEPTION_POINTERS exceptPtrs; - const SCOPETABLE_V4 *scope_table = get_scopetable_v4( frame, *cookie ); - - TRACE( "exception %x flags=%x at %p handler=%p %p %p cookie=%x scope table=%p cookies=%d/%x,%d/%x\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - frame->handler, context, dispatcher, *cookie, scope_table, - scope_table->gs_cookie_offset, scope_table->gs_cookie_xor, - scope_table->eh_cookie_offset, scope_table->eh_cookie_xor ); - - /* FIXME: no cookie validation yet */ - - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) - { - /* Unwinding the current frame */ - msvcrt_local_unwind4( cookie, frame, -2, &frame->_ebp ); - TRACE("unwound current frame, returning ExceptionContinueSearch\n"); - return ExceptionContinueSearch; - } - else - { - /* Hunting for handler */ - exceptPtrs.ExceptionRecord = rec; - exceptPtrs.ContextRecord = context; - *((DWORD *)frame-1) = (DWORD)&exceptPtrs; - trylevel = frame->trylevel; - - while (trylevel != -2) - { - TRACE( "level %d prev %d filter %p\n", trylevel, - scope_table->entries[trylevel].previousTryLevel, - scope_table->entries[trylevel].lpfnFilter ); - if (scope_table->entries[trylevel].lpfnFilter) - { - retval = call_filter( scope_table->entries[trylevel].lpfnFilter, &exceptPtrs, &frame->_ebp ); - - TRACE("filter returned %s\n", retval == EXCEPTION_CONTINUE_EXECUTION ? - "CONTINUE_EXECUTION" : retval == EXCEPTION_EXECUTE_HANDLER ? - "EXECUTE_HANDLER" : "CONTINUE_SEARCH"); - - if (retval == EXCEPTION_CONTINUE_EXECUTION) - return ExceptionContinueExecution; - - if (retval == EXCEPTION_EXECUTE_HANDLER) - { - /* Unwind all higher frames, this one will handle the exception */ - _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); - msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); - - /* Set our trylevel to the enclosing block, and call the __finally - * code, which won't return - */ - frame->trylevel = scope_table->entries[trylevel].previousTryLevel; - TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); - call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); - ERR("Returned from __finally block - expect crash!\n"); - } - } - trylevel = scope_table->entries[trylevel].previousTryLevel; - } - } - TRACE("reached -2, returning ExceptionContinueSearch\n"); - return ExceptionContinueSearch; -} - -/******************************************************************* - * _local_unwind4 (MSVCRT.@) - */ -void CDECL _local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int trylevel ) -{ - msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); -} - -/********************************************************************* - * _seh_longjmp_unwind4 (MSVCRT.@) - */ -void __stdcall _seh_longjmp_unwind4(struct __JUMP_BUFFER *jmp) -{ - msvcrt_local_unwind4( (void *)jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, - jmp->TryLevel, (void *)jmp->Ebp ); -} - -#endif - -/****************************************************************** - * __uncaught_exception - */ -BOOL CDECL __uncaught_exception(void) -{ - return FALSE; -} - -/* _set_security_error_handler - not exported in native msvcrt, added in msvcr70 */ -MSVCRT_security_error_handler CDECL _set_security_error_handler( - MSVCRT_security_error_handler handler ) -{ - MSVCRT_security_error_handler old = security_error_handler; - - TRACE("(%p)\n", handler); - - security_error_handler = handler; - return old; -} - -/********************************************************************* - * __DestructExceptionObject (MSVCRT.@) - */ -void CDECL __DestructExceptionObject(EXCEPTION_RECORD* rec) -{ - cxx_exception_type* info = (cxx_exception_type*)rec->ExceptionInformation[2]; - void* object = (void*)rec->ExceptionInformation[1]; - - TRACE("(%p)\n", rec); - - if (rec->ExceptionCode != CXX_EXCEPTION) return; -#ifndef __x86_64__ - if (rec->NumberParameters != 3) return; -#else - if (rec->NumberParameters != 4) return; -#endif - if (rec->ExceptionInformation[0] < CXX_FRAME_MAGIC_VC6 || - rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8) return; - - if (!info || !info->destructor) - return; - -#if defined(__i386__) - #ifdef _MSC_VER - ((void(__fastcall*)(void*))info->destructor)(object); - #else - __asm__ __volatile__("call *%0" : : "r" (info->destructor), "c" (object) : "eax", "edx", "memory"); - #endif -#elif defined(__x86_64__) - ((void(__cdecl*)(void*))(info->destructor + rec->ExceptionInformation[3]))(object); -#else - ((void(__cdecl*)(void*))info->destructor)(object); -#endif -} diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index a77d02aa93d..0eaa5bc64f7 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -5,53 +5,53 @@ .code .align 4 -MACRO(DEFINE_THISCALL_WRAPPER, cxxname, stdcallname) -EXTERN &stdcallname:PROC -PUBLIC &cxxname -&cxxname: - pop eax - push ecx - push eax - jmp &stdcallname +MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) +#ifdef _USE_ML + EXTERN ___thiscall&target:PROC + ALIAS <&cxxname> = <___thiscall&target> +#else + PUBLIC cxxname + .weakref &cxxname, &target +#endif ENDM -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBD@Z, _MSVCRT_exception_ctor@8 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBDH@Z, _MSVCRT_exception_ctor_noalloc@12 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABV0@@Z, _MSVCRT_exception_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@XZ, _MSVCRT_exception_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1exception@@UAE@XZ, _MSVCRT_exception_dtor@4 -DEFINE_THISCALL_WRAPPER ??4exception@@QAEAAV0@ABV0@@Z, _MSVCRT_exception_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Eexception@@UAEPAXI@Z, _MSVCRT_exception_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gexception@@UAEPAXI@Z, _MSVCRT_exception_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ?what@exception@@UBEPBDXZ, _MSVCRT_what_exception@4 -DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@ABV0@@Z, _MSVCRT_bad_typeid_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@PBD@Z, _MSVCRT_bad_typeid_ctor@8 -DEFINE_THISCALL_WRAPPER ??_Fbad_typeid@@QAEXXZ, _MSVCRT_bad_typeid_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1bad_typeid@@UAE@XZ, _MSVCRT_bad_typeid_dtor@4 -DEFINE_THISCALL_WRAPPER ??4bad_typeid@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_typeid_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Ebad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gbad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@ABV0@@Z, _MSVCRT___non_rtti_object_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@PBD@Z, _MSVCRT___non_rtti_object_ctor@8 -DEFINE_THISCALL_WRAPPER ??1__non_rtti_object@@UAE@XZ, _MSVCRT___non_rtti_object_dtor@4 -DEFINE_THISCALL_WRAPPER ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, _MSVCRT___non_rtti_object_opequals@8 -DEFINE_THISCALL_WRAPPER ??_E__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_G__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@AAE@PBQBD@Z, _MSVCRT_bad_cast_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABQBD@Z, _MSVCRT_bad_cast_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABV0@@Z, _MSVCRT_bad_cast_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@PBD@Z, _MSVCRT_bad_cast_ctor_charptr@8 -DEFINE_THISCALL_WRAPPER ??_Fbad_cast@@QAEXXZ, _MSVCRT_bad_cast_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1bad_cast@@UAE@XZ, _MSVCRT_bad_cast_dtor@4 -DEFINE_THISCALL_WRAPPER ??4bad_cast@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_cast_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Ebad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gbad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??8type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opequals_equals@8 -DEFINE_THISCALL_WRAPPER ??9type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opnot_equals@8 -DEFINE_THISCALL_WRAPPER ?before@type_info@@QBEHABV1@@Z, _MSVCRT_type_info_before@8 -DEFINE_THISCALL_WRAPPER ??1type_info@@UAE@XZ, _MSVCRT_type_info_dtor@4 -DEFINE_THISCALL_WRAPPER ?name@type_info@@QBEPBDXZ, _MSVCRT_type_info_name@4 -DEFINE_THISCALL_WRAPPER ?raw_name@type_info@@QBEPBDXZ, _MSVCRT_type_info_raw_name@4 +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 #undef _MSVCRT_ @@ -108,5 +108,63 @@ DEFINE_ALIAS ?terminate@@YAXXZ, _MSVCRT_terminate, PROC DEFINE_ALIAS ?unexpected@@YAXXZ, _MSVCRT_unexpected, PROC +// void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); +PUBLIC _call_copy_ctor +_call_copy_ctor: + push ebp + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET ebp, 0 + mov ebp, esp + CFI_DEF_CFA_REGISTER ebp + push 1 + mov ecx, [ebp + 12] + push dword ptr [ebp + 16] + call dword ptr [ebp + 8] + leave + CFI_DEF_CFA esp, 4 + CFI_SAME_VALUE ebp + ret + +// void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ); +PUBLIC _continue_after_catch +_continue_after_catch: + mov edx, [esp + 4] + mov eax, [esp + 8] + mov esp, [edx - 4] + lea ebp, [edx + 12] + jmp eax + +// void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr ); +PUBLIC _call_finally_block +_call_finally_block: + mov ebp, [esp +8] + jmp dword ptr [esp + 4] + +// int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ); +PUBLIC _call_filter +_call_filter: + push ebp + push [esp + 12] + mov ebp, [esp + 20] + call dword ptr [esp + 12] + pop ebp + pop ebp + ret + +// void *call_handler( void * (*func)(void), void *ebp ); +PUBLIC _call_handler +_call_handler: + push ebp + push ebx + push esi + push edi + mov ebp, [esp + 24] + call dword ptr [esp + 29] + pop edi + pop esi + pop ebx + pop ebp + ret + END diff --git a/sdk/lib/crt/except/i386/unwind.c b/sdk/lib/crt/except/i386/unwind.c deleted file mode 100644 index f2317bd826b..00000000000 --- a/sdk/lib/crt/except/i386/unwind.c +++ /dev/null @@ -1,39 +0,0 @@ -#define WIN32_NO_STATUS -#include <precomp.h> -#define NTOS_MODE_USER -#include <setjmp.h> -#include <ndk/umtypes.h> -#include <ndk/extypes.h> -#include <ndk/rtlfuncs.h> - -/* VC++ extensions to Win32 SEH */ -typedef struct _SCOPETABLE -{ - int previousTryLevel; - int (*lpfnFilter)(PEXCEPTION_POINTERS); - int (*lpfnHandler)(void); -} SCOPETABLE, *PSCOPETABLE; - -typedef struct _MSVCRT_EXCEPTION_FRAME -{ - PEXCEPTION_REGISTRATION_RECORD *prev; - void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_REGISTRATION_RECORD, - PCONTEXT, PEXCEPTION_RECORD); - PSCOPETABLE scopetable; - int trylevel; - int _ebp; - PEXCEPTION_POINTERS xpointers; -} MSVCRT_EXCEPTION_FRAME; - -void -_local_unwind2(MSVCRT_EXCEPTION_FRAME *RegistrationFrame, - LONG TryLevel); - -/* - * @implemented -*/ - -void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp) -{ - _local_unwind2((MSVCRT_EXCEPTION_FRAME*) jmp->Registration, jmp->TryLevel); -} diff --git a/sdk/lib/crt/except/matherr.c b/sdk/lib/crt/except/matherr.c index da94b71ffc4..d7e6c5bf35b 100644 --- a/sdk/lib/crt/except/matherr.c +++ b/sdk/lib/crt/except/matherr.c @@ -47,19 +47,3 @@ void CDECL __setusermatherr(MSVCRT_matherr_func func) MSVCRT_default_matherr_func = func; TRACE(":new matherr handler %p\n", func); } - - -#define _FPIEEE_RECORD void - -/* - * @unimplemented - */ -int _fpieee_flt( - unsigned long exception_code, - struct _EXCEPTION_POINTERS* ExceptionPointer, - int (*handler)(_FPIEEE_RECORD*) - ) -{ - FIXME("Unimplemented!\n"); - return 0; -} diff --git a/sdk/lib/crt/except/xcptfil.c b/sdk/lib/crt/except/xcptfil.c deleted file mode 100644 index c5b8d1d1e76..00000000000 --- a/sdk/lib/crt/except/xcptfil.c +++ /dev/null @@ -1,98 +0,0 @@ -#include <precomp.h> -#include "internal/wine/msvcrt.h" -#include "internal/wine/cppexcept.h" - -typedef void (*sighandler_t)(int); -static sighandler_t sighandlers[NSIG] = { SIG_DFL }; - -/* The exception codes are actually NTSTATUS values */ -static const struct -{ - NTSTATUS status; - int signal; -} float_exception_map[] = { - { 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 }, -}; - -/* - * @implemented - */ -int CDECL -_XcptFilter(NTSTATUS ExceptionCode, - struct _EXCEPTION_POINTERS * except) -{ - LONG ret = EXCEPTION_CONTINUE_SEARCH; - sighandler_t handler; - - if (!except || !except->ExceptionRecord) - return EXCEPTION_CONTINUE_SEARCH; - - switch (except->ExceptionRecord->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - if ((handler = sighandlers[SIGSEGV]) != SIG_DFL) - { - if (handler != SIG_IGN) - { - sighandlers[SIGSEGV] = SIG_DFL; - handler(SIGSEGV); - } - ret = EXCEPTION_CONTINUE_EXECUTION; - } - break; - /* According to msdn, - * the FPE signal handler takes as a second argument the type of - * floating point exception. - */ - case EXCEPTION_FLT_DENORMAL_OPERAND: - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - case EXCEPTION_FLT_INEXACT_RESULT: - case EXCEPTION_FLT_INVALID_OPERATION: - case EXCEPTION_FLT_OVERFLOW: - case EXCEPTION_FLT_STACK_CHECK: - case EXCEPTION_FLT_UNDERFLOW: - if ((handler = sighandlers[SIGFPE]) != SIG_DFL) - { - if (handler != SIG_IGN) - { - unsigned int i; - int float_signal = _FPE_INVALID; - - sighandlers[SIGFPE] = SIG_DFL; - for (i = 0; i < sizeof(float_exception_map) / - sizeof(float_exception_map[0]); i++) - { - if (float_exception_map[i].status == - except->ExceptionRecord->ExceptionCode) - { - float_signal = float_exception_map[i].signal; - break; - } - } - ((float_handler)handler)(SIGFPE, float_signal); - } - ret = EXCEPTION_CONTINUE_EXECUTION; - } - break; - case EXCEPTION_ILLEGAL_INSTRUCTION: - case EXCEPTION_PRIV_INSTRUCTION: - if ((handler = sighandlers[SIGILL]) != SIG_DFL) - { - if (handler != SIG_IGN) - { - sighandlers[SIGILL] = SIG_DFL; - handler(SIGILL); - } - ret = EXCEPTION_CONTINUE_EXECUTION; - } - break; - } - return ret; -} - diff --git a/sdk/lib/crt/include/internal/wine_msc.h b/sdk/lib/crt/include/internal/wine_msc.h index d7c799a09f2..ebe023b48d0 100644 --- a/sdk/lib/crt/include/internal/wine_msc.h +++ b/sdk/lib/crt/include/internal/wine_msc.h @@ -1,50 +1,100 @@ -#define DEFINE_THISCALL_WRAPPER(func, args) \ - void __declspec(naked) __thiscall_ ## func (void) \ - { \ - __asm { pop eax } \ - __asm { push ecx } \ - __asm { push eax } \ - __asm { jmp func } \ - } - -exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** name); -exception * __stdcall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc); -exception * __stdcall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs); -exception * __stdcall MSVCRT_exception_default_ctor(exception * _this); -void __stdcall MSVCRT_exception_dtor(exception * _this); -exception * __stdcall MSVCRT_exception_opequals(exception * _this, const exception * rhs); -void * __stdcall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags); -void * __stdcall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags); -const char * __stdcall MSVCRT_what_exception(exception * _this); -bad_typeid * __stdcall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs); -bad_typeid * __stdcall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name); -bad_typeid * __stdcall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this); -void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this); -bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs); -void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags); -void * __stdcall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags); -__non_rtti_object * __stdcall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this, const __non_rtti_object * rhs); -__non_rtti_object * __stdcall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this, const char * name); -void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this); -__non_rtti_object * __stdcall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this, const __non_rtti_object *rhs); -void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags); -void * __stdcall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags); -bad_cast * __stdcall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name); -bad_cast * __stdcall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs); -bad_cast * __stdcall MSVCRT_bad_cast_ctor_charptr(bad_cast * _this, const char * name); -bad_cast * __stdcall MSVCRT_bad_cast_default_ctor(bad_cast * _this); -void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this); -bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs); -void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags); -void * __stdcall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags); -int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs); -int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs); -int __stdcall MSVCRT_type_info_before(type_info * _this, const type_info * rhs); -void __stdcall MSVCRT_type_info_dtor(type_info * _this); -const char * __stdcall MSVCRT_type_info_name(type_info * _this); -const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this); -void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags); - -#define __ASM_VTABLE(name,funcs) -//void *MSVCRT_ ## name ##_vtable[] = +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); +#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); +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc* _this); +#endif /* _MSVCR_VER >= 80 */ +#if _MSVCR_VER >= 100 +scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor_name( + scheduler_resource_allocation_error* this, const char* name, HRESULT hr); +scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor( + scheduler_resource_allocation_error* this, HRESULT hr); +scheduler_resource_allocation_error* __thiscall MSVCRT_scheduler_resource_allocation_error_copy_ctor( + scheduler_resource_allocation_error* this, + const scheduler_resource_allocation_error* rhs); +HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( + const scheduler_resource_allocation_error* this); +void __thiscall MSVCRT_scheduler_resource_allocation_error_dtor( + scheduler_resource_allocation_error* this); +improper_lock* __thiscall improper_lock_ctor_str(improper_lock* this, const char* str); +improper_lock* __thiscall improper_lock_ctor(improper_lock* this); +improper_lock* __thiscall MSVCRT_improper_lock_copy_ctor(improper_lock* _this, const improper_lock* rhs); +void __thiscall MSVCRT_improper_lock_dtor(improper_lock* _this); +invalid_scheduler_policy_key* __thiscall invalid_scheduler_policy_key_ctor_str( + invalid_scheduler_policy_key* this, const char* str); +invalid_scheduler_policy_key* __thiscall invalid_scheduler_policy_key_ctor( + invalid_scheduler_policy_key* this); +invalid_scheduler_policy_key* __thiscall MSVCRT_invalid_scheduler_policy_key_copy_ctor( + invalid_scheduler_policy_key* _this, const invalid_scheduler_policy_key* rhs); +void __thiscall MSVCRT_invalid_scheduler_policy_key_dtor( + invalid_scheduler_policy_key* _this); +invalid_scheduler_policy_value* __thiscall invalid_scheduler_policy_value_ctor_str( + invalid_scheduler_policy_value* this, const char* str); +invalid_scheduler_policy_value* __thiscall invalid_scheduler_policy_value_ctor( + invalid_scheduler_policy_value* this); +invalid_scheduler_policy_value* __thiscall MSVCRT_invalid_scheduler_policy_value_copy_ctor( + invalid_scheduler_policy_value* _this, const invalid_scheduler_policy_value* rhs); +void __thiscall MSVCRT_invalid_scheduler_policy_value_dtor( + invalid_scheduler_policy_value* _this); +invalid_scheduler_policy_thread_specification* __thiscall invalid_scheduler_policy_thread_specification_ctor_str( + invalid_scheduler_policy_thread_specification* this, const char* str); +invalid_scheduler_policy_thread_specification* __thiscall invalid_scheduler_policy_thread_specification_ctor( + invalid_scheduler_policy_thread_specification* this); +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); +void __thiscall MSVCRT_invalid_scheduler_policy_thread_specification_dtor( + invalid_scheduler_policy_thread_specification* _this); +improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor_str( + improper_scheduler_attach* this, const char* str); +improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor( + improper_scheduler_attach* this); +improper_scheduler_attach* __thiscall MSVCRT_improper_scheduler_attach_copy_ctor( + improper_scheduler_attach* _this, const improper_scheduler_attach* rhs); +void __thiscall MSVCRT_improper_scheduler_attach_dtor( + improper_scheduler_attach* _this); +improper_scheduler_detach* __thiscall improper_scheduler_detach_ctor_str( + improper_scheduler_detach* this, const char* str); +improper_scheduler_detach* __thiscall improper_scheduler_detach_ctor( + improper_scheduler_detach* this); +improper_scheduler_detach* __thiscall MSVCRT_improper_scheduler_detach_copy_ctor( + improper_scheduler_detach* _this, const improper_scheduler_detach* rhs); +void __thiscall MSVCRT_improper_scheduler_detach_dtor( + improper_scheduler_detach* _this); +#endif diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c new file mode 100644 index 00000000000..4b12b2dfbe1 --- /dev/null +++ b/sdk/lib/crt/wine/cpp.c @@ -0,0 +1,2189 @@ +/* + * msvcrt.dll C++ objects + * + * Copyright 2000 Jon Griffiths + * Copyright 2003, 2004 Alexandre Julliard + * + * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.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); + +struct __type_info_node +{ + void *memPtr; + struct __type_info_node* next; +}; + +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; + +/* get the vtable pointer for a C++ object */ +static inline const vtable_ptr *get_vtable( void *obj ) +{ + return *(const vtable_ptr **)obj; +} + +static inline const rtti_object_locator *get_obj_locator( void *cppobj ) +{ + const vtable_ptr *vtable = get_vtable( cppobj ); + return (const rtti_object_locator *)vtable[-1]; +} + +#ifndef __x86_64__ +static void dump_obj_locator( const rtti_object_locator *ptr ) +{ + int i; + const rtti_object_hierarchy *h = ptr->type_hierarchy; + + TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", + ptr, ptr->signature, ptr->base_class_offset, ptr->flags, + ptr->type_descriptor, dbgstr_type_info(ptr->type_descriptor), ptr->type_hierarchy ); + TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", + h->signature, h->attributes, h->array_len, h->base_classes ); + for (i = 0; i < h->array_len; i++) + { + TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", + h->base_classes->bases[i], + h->base_classes->bases[i]->num_base_classes, + h->base_classes->bases[i]->offsets.this_offset, + h->base_classes->bases[i]->offsets.vbase_descr, + h->base_classes->bases[i]->offsets.vbase_offset, + h->base_classes->bases[i]->attributes, + h->base_classes->bases[i]->type_descriptor, + dbgstr_type_info(h->base_classes->bases[i]->type_descriptor) ); + } +} + +#else + +static void dump_obj_locator( const rtti_object_locator *ptr ) +{ + int i; + char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; + const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); + const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); + + TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", + ptr, ptr->signature, ptr->base_class_offset, ptr->flags, + type_descriptor, dbgstr_type_info(type_descriptor), h ); + TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", + h->signature, h->attributes, h->array_len, base + h->base_classes ); + for (i = 0; i < h->array_len; i++) + { + const rtti_base_descriptor *bases = (rtti_base_descriptor*)(base + + ((const rtti_base_array*)(base + h->base_classes))->bases[i]); + + TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", + bases, + bases->num_base_classes, + bases->offsets.this_offset, + bases->offsets.vbase_descr, + bases->offsets.vbase_offset, + bases->attributes, + base + bases->type_descriptor, + dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); + } +} +#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__ */ + +/****************************************************************** + * ??0exception@@QAE@ABQBD@Z (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor,8) +exception * __thiscall MSVCRT_exception_ctor(exception * _this, const char ** name) +{ + TRACE("(%p,%s)\n", _this, *name); + EXCEPTION_ctor(_this, name); + return _this; +} + +/****************************************************************** + * ??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) +{ + TRACE("(%p,%s)\n", _this, *name); + _this->vtable = &MSVCRT_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) +{ + TRACE("(%p)\n", _this); + _this->vtable = &MSVCRT_exception_vtable; + if (_this->do_free) MSVCRT_free(_this->name); +} + +/****************************************************************** + * ??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals,8) +exception * __thiscall MSVCRT_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); + } + 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) +{ + TRACE("(%p %x)\n", _this, flags); + MSVCRT_exception_dtor(_this); + if (flags & 1) MSVCRT_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) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_typeid_vtable; + return _this; +} + +/****************************************************************** + * ??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) +{ + TRACE("(%p %s)\n", _this, name); + EXCEPTION_ctor(_this, &name); + _this->vtable = &MSVCRT_bad_typeid_vtable; + return _this; +} + +/****************************************************************** + * ??_Fbad_typeid@@QAEXXZ (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_default_ctor,4) +bad_typeid * __thiscall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this) +{ + return MSVCRT_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) +{ + TRACE("(%p)\n", _this); + MSVCRT_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) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_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) +{ + 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_bad_typeid_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCRT_bad_typeid_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _this; +} + +/****************************************************************** + * ??_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) +{ + TRACE("(%p %x)\n", _this, flags); + MSVCRT_bad_typeid_dtor(_this); + if (flags & 1) MSVCRT_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, + 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; +} + +/****************************************************************** + * ??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, + const char * name) +{ + TRACE("(%p %s)\n", _this, name); + EXCEPTION_ctor(_this, &name); + _this->vtable = &MSVCRT___non_rtti_object_vtable; + return _this; +} + +/****************************************************************** + * ??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) +{ + TRACE("(%p)\n", _this); + MSVCRT_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, + const __non_rtti_object *rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_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) +{ + 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___non_rtti_object_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCRT___non_rtti_object_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _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) +{ + TRACE("(%p %x)\n", _this, flags); + MSVCRT___non_rtti_object_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + return _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) +{ + TRACE("(%p %s)\n", _this, *name); + EXCEPTION_ctor(_this, name); + _this->vtable = &MSVCRT_bad_cast_vtable; + return _this; +} + +/****************************************************************** + * ??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) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_cast_vtable; + return _this; +} + +/****************************************************************** + * ??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) +{ + TRACE("(%p %s)\n", _this, name); + EXCEPTION_ctor(_this, &name); + _this->vtable = &MSVCRT_bad_cast_vtable; + return _this; +} + +/****************************************************************** + * ??_Fbad_cast@@QAEXXZ (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_default_ctor,4) +bad_cast * __thiscall MSVCRT_bad_cast_default_ctor(bad_cast * _this) +{ + return MSVCRT_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) +{ + TRACE("(%p)\n", _this); + MSVCRT_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) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_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) +{ + 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_bad_cast_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCRT_bad_cast_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _this; +} + +/****************************************************************** + * ??_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) +{ + TRACE("(%p %x)\n", _this, flags); + MSVCRT_bad_cast_dtor(_this); + if (flags & 1) MSVCRT_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) +{ + int ret = !strcmp(_this->mangled + 1, rhs->mangled + 1); + TRACE("(%p %p) returning %d\n", _this, rhs, ret); + return ret; +} + +/****************************************************************** + * ??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) +{ + int ret = !!strcmp(_this->mangled + 1, rhs->mangled + 1); + TRACE("(%p %p) returning %d\n", _this, rhs, ret); + return ret; +} + +/****************************************************************** + * ?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) +{ + int ret = strcmp(_this->mangled + 1, rhs->mangled + 1) < 0; + TRACE("(%p %p) returning %d\n", _this, rhs, ret); + return ret; +} + +/****************************************************************** + * ??1type_info@@UAE@XZ (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) +void __thiscall MSVCRT_type_info_dtor(type_info * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_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) +{ + if (!_this->name) + { + /* Create and set the demangled name */ + /* Note: mangled name in type_info struct always starts with a '.', while + * it isn't valid for mangled name. + * 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); + if (name) + { + unsigned int len = strlen(name); + + /* It seems _unDName may leave blanks at the end of the demangled name */ + while (len && name[--len] == ' ') + name[len] = '\0'; + + if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL)) + { + /* Another thread set this member since we checked above - use it */ + MSVCRT_free(name); + } + } + } + TRACE("(%p) returning %s\n", _this, _this->name); + return _this->name; +} + +/****************************************************************** + * ?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) +{ + 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; +} + +/* 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) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_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); + + 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 _MSC_VER +#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)); +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#endif +__ASM_VTABLE(bad_typeid, + VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +__ASM_VTABLE(bad_cast, + VTABLE_ADD_FUNC(MSVCRT_bad_cast_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +__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 + +#ifndef __GNUC__ +} +#endif +#endif /* !_MSC_VER */ + +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 ) +#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) +#endif + +void msvcrt_init_exception(void *base) +{ +#ifdef __x86_64__ + init_type_info_rtti(base); + init_exception_rtti(base); +#if _MSVCR_VER >= 80 + init_exception_old_rtti(base); + init_bad_alloc_rtti(base); +#endif + 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); + init_bad_cast_cxx(base); + init___non_rtti_object_cxx(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) +{ + 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 + } +} +#endif + +/****************************************************************** + * ?set_terminate@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) + * + * Install a handler to be called when terminate() is called. + * + * PARAMS + * func [I] Handler function to install + * + * RETURNS + * The previously installed handler function, if any. + */ +MSVCRT_terminate_function CDECL MSVCRT_set_terminate(MSVCRT_terminate_function func) +{ + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_terminate_function previous = data->terminate_handler; + TRACE("(%p) returning %p\n",func,previous); + data->terminate_handler = func; + return previous; +} + +/****************************************************************** + * _get_terminate (MSVCRT.@) + */ +MSVCRT_terminate_function CDECL MSVCRT__get_terminate(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + TRACE("returning %p\n", data->terminate_handler); + return data->terminate_handler; +} + +/****************************************************************** + * ?set_unexpected@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) + * + * Install a handler to be called when unexpected() is called. + * + * PARAMS + * func [I] Handler function to install + * + * RETURNS + * The previously installed handler function, if any. + */ +MSVCRT_unexpected_function CDECL MSVCRT_set_unexpected(MSVCRT_unexpected_function func) +{ + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_unexpected_function previous = data->unexpected_handler; + TRACE("(%p) returning %p\n",func,previous); + data->unexpected_handler = func; + return previous; +} + +/****************************************************************** + * _get_unexpected (MSVCRT.@) + */ +MSVCRT_unexpected_function CDECL MSVCRT__get_unexpected(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + TRACE("returning %p\n", data->unexpected_handler); + return data->unexpected_handler; +} + +/****************************************************************** + * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z (MSVCRT.@) + */ +MSVCRT__se_translator_function CDECL MSVCRT__set_se_translator(MSVCRT__se_translator_function func) +{ + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT__se_translator_function previous = data->se_translator; + TRACE("(%p) returning %p\n",func,previous); + data->se_translator = func; + return previous; +} + +/****************************************************************** + * ?terminate@@YAXXZ (MSVCRT.@) + * + * Default handler for an unhandled exception. + * + * PARAMS + * None. + * + * RETURNS + * This function does not return. Either control resumes from any + * handler installed by calling set_terminate(), or (by default) abort() + * is called. + */ +void CDECL MSVCRT_terminate(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + if (data->terminate_handler) data->terminate_handler(); + MSVCRT_abort(); +} + +/****************************************************************** + * ?unexpected@@YAXXZ (MSVCRT.@) + */ +void CDECL MSVCRT_unexpected(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + if (data->unexpected_handler) data->unexpected_handler(); + MSVCRT_terminate(); +} + + +/****************************************************************** + * __RTtypeid (MSVCRT.@) + * + * Retrieve the Run Time Type Information (RTTI) for a C++ object. + * + * PARAMS + * cppobj [I] C++ object to get type information for. + * + * RETURNS + * Success: A type_info object describing cppobj. + * Failure: If the object to be cast has no RTTI, a __non_rtti_object + * exception is thrown. If cppobj is NULL, a bad_typeid exception + * is thrown. In either case, this function does not return. + * + * NOTES + * This function is usually called by compiler generated code as a result + * of using one of the C++ dynamic cast statements. + */ +#ifndef __x86_64__ +const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) +{ + const type_info *ret; + + if (!cppobj) + { + bad_typeid e; + MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); + _CxxThrowException( &e, &bad_typeid_exception_type ); + return NULL; + } + + __TRY + { + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + ret = obj_locator->type_descriptor; + } + __EXCEPT_PAGE_FAULT + { + __non_rtti_object e; + MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} + +#else + +const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) +{ + const type_info *ret; + + if (!cppobj) + { + bad_typeid e; + MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); + _CxxThrowException( &e, &bad_typeid_exception_type ); + return NULL; + } + + __TRY + { + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + char *base; + + if(obj_locator->signature == 0) + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); + else + base = (char*)obj_locator - obj_locator->object_locator; + + ret = (type_info*)(base + obj_locator->type_descriptor); + } + __EXCEPT_PAGE_FAULT + { + __non_rtti_object e; + MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} +#endif + +/****************************************************************** + * __RTDynamicCast (MSVCRT.@) + * + * Dynamically cast a C++ object to one of its base classes. + * + * PARAMS + * cppobj [I] Any C++ object to cast + * unknown [I] Reserved, set to 0 + * src [I] type_info object describing cppobj + * dst [I] type_info object describing the base class to cast to + * do_throw [I] TRUE = throw an exception if the cast fails, FALSE = don't + * + * RETURNS + * Success: The address of cppobj, cast to the object described by dst. + * Failure: NULL, If the object to be cast has no RTTI, or dst is not a + * valid cast for cppobj. If do_throw is TRUE, a bad_cast exception + * is thrown and this function does not return. + * + * NOTES + * This function is usually called by compiler generated code as a result + * of using one of the C++ dynamic cast statements. + */ +#ifndef __x86_64__ +void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, + type_info *src, type_info *dst, + int do_throw) +{ + void *ret; + + if (!cppobj) return NULL; + + TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", + cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); + + /* To cast an object at runtime: + * 1.Find out the true type of the object from the typeinfo at vtable[-1] + * 2.Search for the destination type in the class hierarchy + * 3.If destination type is found, return base object address + dest offset + * Otherwise, fail the cast + * + * FIXME: the unknown parameter doesn't seem to be used for anything + */ + __TRY + { + int i; + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; + const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; + + if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); + + ret = NULL; + for (i = 0; i < obj_bases->array_len; i++) + { + const type_info *typ = base_desc[i]->type_descriptor; + + if (!strcmp(typ->mangled, dst->mangled)) + { + /* compute the correct this pointer for that base class */ + void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; + ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); + break; + } + } + /* VC++ sets do_throw to 1 when the result of a dynamic_cast is assigned + * to a reference, since references cannot be NULL. + */ + if (!ret && do_throw) + { + const char *msg = "Bad dynamic_cast!"; + bad_cast e; + MSVCRT_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!" ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} + +#else + +void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, + type_info *src, type_info *dst, + int do_throw) +{ + void *ret; + + if (!cppobj) return NULL; + + TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", + cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); + + __TRY + { + int i; + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + const rtti_object_hierarchy *obj_bases; + const rtti_base_array *base_array; + char *base; + + if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); + + if(obj_locator->signature == 0) + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); + else + base = (char*)obj_locator - obj_locator->object_locator; + + obj_bases = (const rtti_object_hierarchy*)(base + obj_locator->type_hierarchy); + base_array = (const rtti_base_array*)(base + obj_bases->base_classes); + + ret = NULL; + for (i = 0; i < obj_bases->array_len; i++) + { + const rtti_base_descriptor *base_desc = (const rtti_base_descriptor*)(base + base_array->bases[i]); + const type_info *typ = (const type_info*)(base + base_desc->type_descriptor); + + if (!strcmp(typ->mangled, dst->mangled)) + { + void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; + ret = get_this_pointer( &base_desc->offsets, this_ptr ); + break; + } + } + if (!ret && do_throw) + { + const char *msg = "Bad dynamic_cast!"; + bad_cast e; + MSVCRT_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!" ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} +#endif + + +/****************************************************************** + * __RTCastToVoid (MSVCRT.@) + * + * Dynamically cast a C++ object to a void*. + * + * PARAMS + * cppobj [I] The C++ object to cast + * + * RETURNS + * Success: The base address of the object as a void*. + * Failure: NULL, if cppobj is NULL or has no RTTI. + * + * NOTES + * 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 *ret; + + if (!cppobj) return NULL; + + __TRY + { + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + ret = (char *)cppobj - obj_locator->base_class_offset; + } + __EXCEPT_PAGE_FAULT + { + __non_rtti_object e; + MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} + + +/********************************************************************* + * _CxxThrowException (MSVCRT.@) + */ +#ifndef __x86_64__ +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[3]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); +} +#else +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[4]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RtlPcToFileHeader( (void*)type, (void**)&args[3]); + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 4, args ); +} +#endif + +#if _MSVCR_VER >= 80 + +/********************************************************************* + * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z + * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z + */ +#ifndef __x86_64__ +int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) +{ + int ret = -1; + + TRACE("(%p %p)\n", ti, ep); + + __TRY + { + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + + if (rec->ExceptionCode==CXX_EXCEPTION && rec->NumberParameters==3 && + (rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC6 || + rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC7 || + rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC8)) + { + const cxx_type_info_table *tit = ((cxx_exception_type*)rec->ExceptionInformation[2])->type_info_table; + int i; + + for (i=0; i<tit->count; i++) { + if (ti==tit->info[i]->type_info || !strcmp(ti->mangled, tit->info[i]->type_info->mangled)) + { + ret = 1; + break; + } + } + + if (i == tit->count) + ret = 0; + } + } + __EXCEPT_PAGE_FAULT + __ENDTRY + + if(ret == -1) + MSVCRT_terminate(); + return ret; +} +#else +int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) +{ + int ret = -1; + + TRACE("(%p %p)\n", ti, ep); + + __TRY + { + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + + if (rec->ExceptionCode==CXX_EXCEPTION && rec->NumberParameters==4 && + (rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC6 || + rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC7 || + rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC8)) + { + const cxx_exception_type *et = (cxx_exception_type*)rec->ExceptionInformation[2]; + const cxx_type_info_table *tit = (const cxx_type_info_table*)(rec->ExceptionInformation[3]+et->type_info_table); + int i; + + for (i=0; i<tit->count; i++) { + const cxx_type_info *cti = (const cxx_type_info*)(rec->ExceptionInformation[3]+tit->info[i]); + const type_info *except_ti = (const type_info*)(rec->ExceptionInformation[3]+cti->type_info); + if (ti==except_ti || !strcmp(ti->mangled, except_ti->mangled)) + { + ret = 1; + break; + } + } + + if (i == tit->count) + ret = 0; + } + } + __EXCEPT_PAGE_FAULT + __ENDTRY ... 5675 lines suppressed ...

4 years, 10 months

[reactos] 01/02: [SDK] Improve x64 definition of DISPATCHER_CONTEXT

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a22ab61a87ce582c8c936… commit a22ab61a87ce582c8c936bdeaf8f066309b5f61f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 13 16:30:33 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Feb 9 15:56:30 2020 +0100 [SDK] Improve x64 definition of DISPATCHER_CONTEXT --- sdk/include/ndk/amd64/ketypes.h | 13 +++++++------ sdk/include/xdk/winnt_old.h | 8 ++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index db276ee8af1..d2c4da16cc8 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -1001,15 +1001,16 @@ typedef struct _UCALLOUT_FRAME typedef struct _DISPATCHER_CONTEXT { ULONG64 ControlPc; - PVOID ImageBase; - PVOID FunctionEntry; - PVOID EstablisherFrame; + ULONG64 ImageBase; + struct _RUNTIME_FUNCTION *FunctionEntry; + ULONG64 EstablisherFrame; ULONG64 TargetIp; - PVOID ContextRecord; - PVOID LanguageHandler; + PCONTEXT ContextRecord; + PEXCEPTION_ROUTINE LanguageHandler; PVOID HandlerData; - PVOID HistoryTable; + struct _UNWIND_HISTORY_TABLE *HistoryTable; ULONG ScopeIndex; + ULONG Fill0; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; typedef struct _KSTART_FRAME diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 1ea3d939739..500cea982d3 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -1488,11 +1488,11 @@ VOID typedef struct _DISPATCHER_CONTEXT { ULONG64 ControlPc; - PVOID ImageBase; - PVOID FunctionEntry; - PVOID EstablisherFrame; + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 EstablisherFrame; ULONG64 TargetIp; - PVOID ContextRecord; + struct _CONTEXT *ContextRecord; PEXCEPTION_ROUTINE LanguageHandler; PVOID HandlerData; PUNWIND_HISTORY_TABLE HistoryTable;

4 years, 10 months

[reactos] 01/01: [SHELL32_APITEST] SHLimitInputEdit: Fix C4509 warning (#2321)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed3c50f748050926f4de0… commit ed3c50f748050926f4de030026f8ddc9f05e1e11 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 9 23:49:44 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 9 23:49:44 2020 +0900 [SHELL32_APITEST] SHLimitInputEdit: Fix C4509 warning (#2321) CORE-11701 --- .../rostests/apitests/shell32/SHLimitInputEdit.cpp | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp index 9112b8f7f21..670ccb054ec 100644 --- a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -238,16 +238,10 @@ PropEnumProc( return TRUE; } -static INT_PTR CALLBACK -DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static void +DoNullFolderTest(HWND hEdt1) { - if (uMsg != WM_INITDIALOG) - return FALSE; - - HWND hEdt1 = GetDlgItem(hwnd, edt1); - INT n; HRESULT hr; - WCHAR szText[64]; _SEH2_TRY { @@ -258,7 +252,22 @@ DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hr = 0xDEAD; } _SEH2_END; + ok_int(hr, 0xDEAD); +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != WM_INITDIALOG) + return FALSE; + + HWND hEdt1 = GetDlgItem(hwnd, edt1); + INT n; + HRESULT hr; + WCHAR szText[64]; + + DoNullFolderTest(hEdt1); { CShellFolder sf(123, FALSE);

4 years, 10 months

[reactos] 01/01: [MSPORTS] Notify the installer of changes to the configuration of serial or parallel ports

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85a854f6b5bc98d652b43… commit 85a854f6b5bc98d652b438362c644efed240e120 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 9 14:19:13 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 9 14:19:13 2020 +0100 [MSPORTS] Notify the installer of changes to the configuration of serial or parallel ports --- dll/win32/msports/parallel.c | 48 ++++++++++++++++++++++++++++++++++---------- dll/win32/msports/serial.c | 16 +++++++++++++++ 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index b06fd9eef6e..abf2d7fa6ee 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -248,12 +248,14 @@ WritePortSettings( HWND hwnd, PPORT_DATA pPortData) { + SP_PROPCHANGE_PARAMS PropChangeParams; DWORD dwDisposition; DWORD dwFilterResourceMethod; DWORD dwLegacy; DWORD dwPortNumber; DWORD dwPortMap; HKEY hKey; + BOOL bChanged = FALSE; DWORD dwError; TRACE("WritePortSettings(%p)\n", pPortData); @@ -282,13 +284,12 @@ WritePortSettings( REG_DWORD, (PBYTE)&dwFilterResourceMethod, sizeof(dwFilterResourceMethod)); - if (dwError != ERROR_SUCCESS) + RegCloseKey(hKey); + if (dwError == ERROR_SUCCESS) { - ERR("RegSetValueExW failed (Error %lu)\n", dwError); + pPortData->dwFilterResourceMethod = dwFilterResourceMethod; + bChanged = TRUE; } - - RegCloseKey(hKey); - pPortData->dwFilterResourceMethod = dwFilterResourceMethod; } } @@ -319,9 +320,8 @@ WritePortSettings( if (dwError == ERROR_SUCCESS) { - FIXME("Notify the driver!\n"); - pPortData->dwLegacy = dwLegacy; + bChanged = TRUE; } } } @@ -337,13 +337,39 @@ WritePortSettings( if (dwPortMap & 1 << dwPortNumber) { ERR("Port LPT%lu is already in use!\n", dwPortNumber); - return; } - - ChangePortNumber(pPortData, - dwPortNumber); + else + { + ChangePortNumber(pPortData, + dwPortNumber); + bChanged = TRUE; + } } } + + if (bChanged) + { + /* Notify the system */ + PostMessageW(HWND_BROADCAST, + WM_WININICHANGE, + 0, + (LPARAM)pPortData->szPortName); + + /* Notify the installer (and device) */ + PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + PropChangeParams.Scope = DICS_FLAG_GLOBAL; + PropChangeParams.StateChange = DICS_PROPCHANGE; + + SetupDiSetClassInstallParams(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + (PSP_CLASSINSTALL_HEADER)&PropChangeParams, + sizeof(SP_PROPCHANGE_PARAMS)); + + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + pPortData->DeviceInfoSet, + pPortData->DeviceInfoData); + } } diff --git a/dll/win32/msports/serial.c b/dll/win32/msports/serial.c index 768fedf6046..515e7eace33 100644 --- a/dll/win32/msports/serial.c +++ b/dll/win32/msports/serial.c @@ -229,6 +229,7 @@ WritePortSettings( HWND hwnd, PPORT_DATA pPortData) { + SP_PROPCHANGE_PARAMS PropChangeParams; WCHAR szPortData[32]; HWND hwndControl; INT nBaudRateIndex; @@ -329,6 +330,21 @@ WritePortSettings( 0, (LPARAM)pPortData->szPortName); + /* Notify the installer (and device) */ + PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + PropChangeParams.Scope = DICS_FLAG_GLOBAL; + PropChangeParams.StateChange = DICS_PROPCHANGE; + + SetupDiSetClassInstallParams(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + (PSP_CLASSINSTALL_HEADER)&PropChangeParams, + sizeof(SP_PROPCHANGE_PARAMS)); + + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + pPortData->DeviceInfoSet, + pPortData->DeviceInfoData); + TRACE("Done!\n"); }

4 years, 10 months

[reactos] 02/02: [CONTROL] Show the 'computer name' page of the system control panel by running 'control ports'.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebfe9853aaa63ff27fac6… commit ebfe9853aaa63ff27fac6c3ce492763cdbc3236a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 9 13:10:00 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 9 13:10:00 2020 +0100 [CONTROL] Show the 'computer name' page of the system control panel by running 'control ports'. --- base/applications/control/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index f0ca50b444c..ba3ceb2f45b 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -97,7 +97,7 @@ wWinMain(HINSTANCE hInstance, else if (!_wcsicmp(lpCmdLine, L"mouse")) return RunControlPanel(L"main.cpl @0"); else if (!_wcsicmp(lpCmdLine, L"netconnections")) return OpenShellFolder(L"\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}"); else if (!_wcsicmp(lpCmdLine, L"netware")) return RunControlPanel(L"nwc.cpl"); - else if (!_wcsicmp(lpCmdLine, L"ports")) return RunControlPanel(L"sysdm.cpl"); /* TODO: Switch to the "Computer Name" tab */ + else if (!_wcsicmp(lpCmdLine, L"ports")) return RunControlPanel(L"sysdm.cpl,,1"); else if (!_wcsicmp(lpCmdLine, L"printers")) return OpenShellFolder(L"\\::{2227A280-3AEA-1069-A2DE-08002B30309D}"); else if (!_wcsicmp(lpCmdLine, L"scannercamera")) return OpenShellFolder(L"\\::{E211B736-43FD-11D1-9EFB-0000F8757FCD}"); else if (!_wcsicmp(lpCmdLine, L"schedtasks")) return OpenShellFolder(L"\\::{D6277990-4C6A-11CF-8D87-00AA0060F5BF}");

4 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020