Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NDIS] Fix parameter order when calling ResetHandler. CORE-14624
by Thomas Faber 14 May '18

14 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccaf7b24c3f0847e9c772… commit ccaf7b24c3f0847e9c772074533d1647390c5c68 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon May 14 18:16:02 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon May 14 18:17:52 2018 +0200 [NDIS] Fix parameter order when calling ResetHandler. CORE-14624 --- drivers/network/ndis/ndis/miniport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/network/ndis/ndis/miniport.c b/drivers/network/ndis/ndis/miniport.c index 904158d2c3..3301682b97 100644 --- a/drivers/network/ndis/ndis/miniport.c +++ b/drivers/network/ndis/ndis/miniport.c @@ -921,8 +921,8 @@ MiniReset( KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, - &AddressingReset); + &AddressingReset, + Adapter->NdisMiniportBlock.MiniportAdapterContext); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.ResetStatus = Status; @@ -1326,8 +1326,8 @@ MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, - &AddressingReset); + &AddressingReset, + Adapter->NdisMiniportBlock.MiniportAdapterContext); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.ResetStatus = NdisStatus;

1 0

01/01: [CLIPBRD] Improvements for the Clipboard Viewer.
by Hermès Bélusca-Maïto 13 May '18

13 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebe3d5273e47f382f4465… commit ebe3d5273e47f382f44657ebf29c7632b23bbe5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 13 22:15:41 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 13 22:25:55 2018 +0200 [CLIPBRD] Improvements for the Clipboard Viewer. - Improve the scrolling support for bitmaps, DIBs and text formats. This completes the work started in CORE-10679 by Ricardo Hanke. Includes scrolling with the keyboard and the mouse wheel. - Add support for the CF_DSP* clipboard formats, as well as CF_TEXT and CF_OEMTEXT. - Add support for owner-display clipboard format CF_OWNERDISPLAY. - Realize any palette found in the clipboard (CF_PALETTE) before displaying the clipboard data format we want. - Remove dead code. - Update the file headers. --- base/applications/clipbrd/clipbrd.c | 332 +++++++++++++++++++--------- base/applications/clipbrd/clipbrd.rc | 13 +- base/applications/clipbrd/cliputils.c | 254 ++++++++++++++++++++-- base/applications/clipbrd/cliputils.h | 31 ++- base/applications/clipbrd/fileutils.c | 17 +- base/applications/clipbrd/fileutils.h | 15 +- base/applications/clipbrd/precomp.h | 19 +- base/applications/clipbrd/resources.h | 7 + base/applications/clipbrd/scrollutils.c | 371 +++++++++++++++----------------- base/applications/clipbrd/scrollutils.h | 39 ++-- base/applications/clipbrd/winutils.c | 222 ++++++++++++------- base/applications/clipbrd/winutils.h | 22 +- 12 files changed, 898 insertions(+), 444 deletions(-) diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index f46daeb6e4..280cc6f78e 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/clipbrd.c - * PURPOSE: Provides a view of the contents of the ReactOS clipboard. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Provides a view of the contents of the ReactOS clipboard. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -13,26 +13,12 @@ static const WCHAR szClassName[] = L"ClipBookWClass"; CLIPBOARD_GLOBALS Globals; SCROLLSTATE Scrollstate; -static void UpdateLinesToScroll(void) -{ - UINT uLinesToScroll; - - if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &uLinesToScroll, 0)) - { - Globals.uLinesToScroll = 3; - } - else - { - Globals.uLinesToScroll = uLinesToScroll; - } -} - static void SaveClipboardToFile(void) { OPENFILENAMEW sfn; + LPWSTR c; WCHAR szFileName[MAX_PATH]; WCHAR szFilterMask[MAX_STRING_LEN + 10]; - LPWSTR c; ZeroMemory(&szFilterMask, sizeof(szFilterMask)); c = szFilterMask + LoadStringW(Globals.hInstance, STRING_FORMAT_NT, szFilterMask, MAX_STRING_LEN) + 1; @@ -87,9 +73,9 @@ static void LoadClipboardDataFromFile(LPWSTR lpszFileName) static void LoadClipboardFromFile(void) { OPENFILENAMEW ofn; + LPWSTR c; WCHAR szFileName[MAX_PATH]; WCHAR szFilterMask[MAX_STRING_LEN + 10]; - LPWSTR c; ZeroMemory(&szFilterMask, sizeof(szFilterMask)); c = szFilterMask + LoadStringW(Globals.hInstance, STRING_FORMAT_GEN, szFilterMask, MAX_STRING_LEN) + 1; @@ -123,6 +109,8 @@ static void LoadClipboardFromDrop(HDROP hDrop) static void SetDisplayFormat(UINT uFormat) { + RECT rc; + CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_UNCHECKED); Globals.uCheckedItem = uFormat + CMD_AUTOMATIC; CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_CHECKED); @@ -136,13 +124,10 @@ static void SetDisplayFormat(UINT uFormat) Globals.uDisplayFormat = uFormat; } - if (Globals.hDspBmp) - { - DeleteObject(Globals.hDspBmp); - } - - ZeroMemory(&Scrollstate, sizeof(Scrollstate)); - UpdateWindowScrollState(Globals.hMainWnd, Globals.hDspBmp, &Scrollstate); + GetClipboardDataDimensions(Globals.uDisplayFormat, &rc); + Scrollstate.CurrentX = Scrollstate.CurrentY = 0; + Scrollstate.iWheelCarryoverX = Scrollstate.iWheelCarryoverY = 0; + UpdateWindowScrollState(Globals.hMainWnd, rc.right, rc.bottom, &Scrollstate); InvalidateRect(Globals.hMainWnd, NULL, TRUE); } @@ -169,8 +154,8 @@ static void InitMenuPopup(HMENU hMenu, LPARAM index) static void UpdateDisplayMenu(void) { UINT uFormat; - WCHAR szFormatName[MAX_FMT_NAME_LEN + 1]; HMENU hMenu; + WCHAR szFormatName[MAX_FMT_NAME_LEN + 1]; hMenu = GetSubMenu(Globals.hMenu, DISPLAY_MENU_POS); @@ -187,27 +172,34 @@ static void UpdateDisplayMenu(void) AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); - uFormat = EnumClipboardFormats(0); - while (uFormat) + /* Display the supported clipboard formats first */ + for (uFormat = EnumClipboardFormats(0); uFormat; + uFormat = EnumClipboardFormats(uFormat)) { - RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, szFormatName, ARRAYSIZE(szFormatName)); + if (IsClipboardFormatSupported(uFormat)) + { + RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, + szFormatName, ARRAYSIZE(szFormatName)); + AppendMenuW(hMenu, MF_STRING, CMD_AUTOMATIC + uFormat, szFormatName); + } + } + /* Now display the unsupported clipboard formats */ + for (uFormat = EnumClipboardFormats(0); uFormat; + uFormat = EnumClipboardFormats(uFormat)) + { if (!IsClipboardFormatSupported(uFormat)) { + RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, + szFormatName, ARRAYSIZE(szFormatName)); AppendMenuW(hMenu, MF_STRING | MF_GRAYED, 0, szFormatName); } - else - { - AppendMenuW(hMenu, MF_STRING, CMD_AUTOMATIC + uFormat, szFormatName); - } - - uFormat = EnumClipboardFormats(uFormat); } CloseClipboard(); } -static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (LOWORD(wParam)) { @@ -274,68 +266,113 @@ static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l return 0; } -static void ClipboardPaintHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static void OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam) { HDC hdc; PAINTSTRUCT ps; + COLORREF crOldBkColor, crOldTextColor; RECT rc; if (!OpenClipboard(Globals.hMainWnd)) return; hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rc); + + /* Erase the background if needed */ + if (ps.fErase) + FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)(COLOR_WINDOW + 1)); + + /* Set the correct background and text colors */ + crOldBkColor = SetBkColor(ps.hdc, GetSysColor(COLOR_WINDOW)); + crOldTextColor = SetTextColor(ps.hdc, GetSysColor(COLOR_WINDOWTEXT)); + + /* Realize the clipboard palette if there is one */ + RealizeClipboardPalette(ps.hdc); switch (Globals.uDisplayFormat) { case CF_NONE: { + /* The clipboard is empty */ break; } + case CF_DSPTEXT: + case CF_TEXT: + case CF_OEMTEXT: case CF_UNICODETEXT: { - DrawTextFromClipboard(hdc, &rc, DT_LEFT | DT_NOPREFIX); + DrawTextFromClipboard(Globals.uDisplayFormat, ps, Scrollstate); break; } + case CF_DSPBITMAP: case CF_BITMAP: { - BitBltFromClipboard(hdc, rc.left, rc.top, rc.right, rc.bottom, 0, 0, SRCCOPY); + BitBltFromClipboard(ps, Scrollstate, SRCCOPY); break; } case CF_DIB: - { - SetDIBitsToDeviceFromClipboard(CF_DIB, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); - break; - } - case CF_DIBV5: { - SetDIBitsToDeviceFromClipboard(CF_DIBV5, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); + SetDIBitsToDeviceFromClipboard(Globals.uDisplayFormat, ps, Scrollstate, DIB_RGB_COLORS); break; } + case CF_DSPMETAFILEPICT: case CF_METAFILEPICT: { + GetClientRect(hWnd, &rc); PlayMetaFileFromClipboard(hdc, &rc); break; } + case CF_DSPENHMETAFILE: case CF_ENHMETAFILE: { + GetClientRect(hWnd, &rc); PlayEnhMetaFileFromClipboard(hdc, &rc); break; } + // case CF_PALETTE: + // TODO: Draw a palette with squares filled with colors. + // break; + + case CF_OWNERDISPLAY: + { + HGLOBAL hglb; + PPAINTSTRUCT pps; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(ps)); + if (hglb) + { + pps = GlobalLock(hglb); + CopyMemory(pps, &ps, sizeof(ps)); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_PAINTCLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + break; + } + default: { - DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); + GetClientRect(hWnd, &rc); + DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, + hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); break; } } + /* Restore the original colors */ + SetTextColor(ps.hdc, crOldTextColor); + SetBkColor(ps.hdc, crOldBkColor); + EndPaint(hWnd, &ps); CloseClipboard(); @@ -347,12 +384,29 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { case WM_CREATE: { + TEXTMETRICW tm; + HDC hDC = GetDC(hWnd); + + /* + * Note that the method with GetObjectW just returns + * the original parameters with which the font was created. + */ + if (GetTextMetricsW(hDC, &tm)) + { + Globals.CharWidth = tm.tmMaxCharWidth; // tm.tmAveCharWidth; + Globals.CharHeight = tm.tmHeight + tm.tmExternalLeading; + } + ReleaseDC(hWnd, hDC); + + Globals.hMenu = GetMenu(hWnd); Globals.hWndNext = SetClipboardViewer(hWnd); - + // For now, the Help dialog item is disabled because of lacking of HTML support EnableMenuItem(Globals.hMenu, CMD_HELP, MF_BYCOMMAND | MF_GRAYED); - + + UpdateLinesToScroll(&Scrollstate); + UpdateDisplayMenu(); SetDisplayFormat(0); break; @@ -367,61 +421,114 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP case WM_DESTROY: { ChangeClipboardChain(hWnd, Globals.hWndNext); + + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) + { + HGLOBAL hglb; + PRECT prc; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(*prc)); + if (hglb) + { + prc = GlobalLock(hglb); + SetRectEmpty(prc); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_SIZECLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + } + PostQuitMessage(0); break; } case WM_PAINT: { - ClipboardPaintHandler(hWnd, uMsg, wParam, lParam); + OnPaint(hWnd, wParam, lParam); break; } case WM_KEYDOWN: { - HandleKeyboardScrollEvents(hWnd, uMsg, wParam, lParam); + OnKeyScroll(hWnd, wParam, lParam, &Scrollstate); break; } case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: { - HandleMouseScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + OnMouseScroll(hWnd, uMsg, wParam, lParam, &Scrollstate); break; } case WM_HSCROLL: { - HandleHorizontalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + // NOTE: Windows uses an offset of 16 pixels + OnScroll(hWnd, SB_HORZ, wParam, 5, &Scrollstate); break; } case WM_VSCROLL: { - HandleVerticalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + // NOTE: Windows uses an offset of 16 pixels + OnScroll(hWnd, SB_VERT, wParam, 5, &Scrollstate); break; } case WM_SIZE: { - UpdateWindowScrollState(hWnd, Globals.hDspBmp, &Scrollstate); + RECT rc; - if ((Globals.uDisplayFormat == CF_METAFILEPICT) || - (Globals.uDisplayFormat == CF_ENHMETAFILE) || - (Globals.uDisplayFormat == CF_DSPENHMETAFILE) || - (Globals.uDisplayFormat == CF_DSPMETAFILEPICT)) + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) { - InvalidateRect(Globals.hMainWnd, NULL, FALSE); + HGLOBAL hglb; + PRECT prc; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(*prc)); + if (hglb) + { + prc = GlobalLock(hglb); + if (wParam == SIZE_MINIMIZED) + SetRectEmpty(prc); + else + GetClientRect(hWnd, prc); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_SIZECLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + break; } - else if (!IsClipboardFormatSupported(Globals.uDisplayFormat)) + + GetClipboardDataDimensions(Globals.uDisplayFormat, &rc); + UpdateWindowScrollState(hWnd, rc.right, rc.bottom, &Scrollstate); + + // NOTE: There still are little problems drawing + // the background when displaying clipboard text. + if (!IsClipboardFormatSupported(Globals.uDisplayFormat) || + Globals.uDisplayFormat == CF_DSPTEXT || + Globals.uDisplayFormat == CF_TEXT || + Globals.uDisplayFormat == CF_OEMTEXT || + Globals.uDisplayFormat == CF_UNICODETEXT) { InvalidateRect(Globals.hMainWnd, NULL, TRUE); } + else + { + InvalidateRect(Globals.hMainWnd, NULL, FALSE); + } break; } case WM_CHANGECBCHAIN: { + /* Transmit through the clipboard viewer chain */ if ((HWND)wParam == Globals.hWndNext) { Globals.hWndNext = (HWND)lParam; @@ -434,11 +541,32 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP break; } + case WM_DESTROYCLIPBOARD: + break; + + case WM_RENDERALLFORMATS: + { + /* + * When the user has cleared the clipboard via the DELETE command, + * we (clipboard viewer) become the clipboard owner. When we are + * subsequently closed, this message is then sent to us so that + * we get a chance to render everything we can. Since we don't have + * anything to render, just empty the clipboard. + */ + DeleteClipboardContent(); + break; + } + + case WM_RENDERFORMAT: + // TODO! + break; + case WM_DRAWCLIPBOARD: { UpdateDisplayMenu(); SetDisplayFormat(0); + /* Pass the message to the next window in clipboard viewer chain */ SendMessageW(Globals.hWndNext, uMsg, wParam, lParam); break; } @@ -451,7 +579,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } else { - ClipboardCommandHandler(hWnd, uMsg, wParam, lParam); + OnCommand(hWnd, uMsg, wParam, lParam); } break; } @@ -468,9 +596,36 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP break; } + case WM_PALETTECHANGED: + { + /* Ignore if this comes from ourselves */ + if ((HWND)wParam == hWnd) + break; + + /* Fall back to WM_QUERYNEWPALETTE */ + } + case WM_QUERYNEWPALETTE: { - if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + BOOL Success; + HDC hDC; + + if (!OpenClipboard(Globals.hMainWnd)) + return FALSE; + + hDC = GetDC(hWnd); + if (!hDC) + { + CloseClipboard(); + return FALSE; + } + + Success = RealizeClipboardPalette(hDC); + + ReleaseDC(hWnd, hDC); + CloseClipboard(); + + if (Success) { InvalidateRect(hWnd, NULL, TRUE); UpdateWindow(hWnd); @@ -479,19 +634,6 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return FALSE; } - case WM_PALETTECHANGED: - { - if ((HWND)wParam != hWnd) - { - if (RealizeClipboardPalette(hWnd) != GDI_ERROR) - { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); - } - } - break; - } - case WM_SYSCOLORCHANGE: { SetDisplayFormat(Globals.uDisplayFormat); @@ -502,7 +644,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { if (wParam == SPI_SETWHEELSCROLLLINES) { - UpdateLinesToScroll(); + UpdateLinesToScroll(&Scrollstate); } break; } @@ -512,6 +654,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return DefWindowProc(hWnd, uMsg, wParam, lParam); } } + return 0; } @@ -530,6 +673,16 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi return 0; } + switch (GetUserDefaultUILanguage()) + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } + ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; @@ -542,16 +695,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); wndclass.lpszClassName = szClassName; - - switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; - } if (!RegisterClassExW(&wndclass)) { @@ -559,6 +702,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi return 0; } + ZeroMemory(&Scrollstate, sizeof(Scrollstate)); + LoadStringW(hInstance, STRING_CLIPBOARD, szBuffer, ARRAYSIZE(szBuffer)); Globals.hMainWnd = CreateWindowExW(WS_EX_CLIENTEDGE | WS_EX_ACCEPTFILES, szClassName, @@ -591,8 +736,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi if (lpCmdLine != NULL && *lpCmdLine) LoadClipboardDataFromFile(lpCmdLine); - UpdateLinesToScroll(); - while (GetMessageW(&msg, 0, 0, 0)) { if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) @@ -602,10 +745,5 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } } - if (Globals.hDspBmp) - { - DeleteObject(Globals.hDspBmp); - } - return (int)msg.wParam; } diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc index 5f3e293bc4..178c6ce697 100644 --- a/base/applications/clipbrd/clipbrd.rc +++ b/base/applications/clipbrd/clipbrd.rc @@ -1,11 +1,18 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resources file. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #include <windef.h> #include <winuser.h> #include "resources.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clipboard Viewer" -#define REACTOS_STR_INTERNAL_NAME "clipbrd" -#define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clipboard Viewer" +#define REACTOS_STR_INTERNAL_NAME "clipbrd" +#define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" #include <reactos/version.rc> CLIPBRD_ICON ICON "res/clipbrd.ico" diff --git a/base/applications/clipbrd/cliputils.c b/base/applications/clipbrd/cliputils.c index e13348a9eb..daee8439a8 100644 --- a/base/applications/clipbrd/cliputils.c +++ b/base/applications/clipbrd/cliputils.c @@ -1,13 +1,32 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/cliputils.c - * PURPOSE: Clipboard helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" +LRESULT +SendClipboardOwnerMessage( + IN BOOL bUnicode, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + HWND hwndOwner; + + hwndOwner = GetClipboardOwner(); + if (!hwndOwner) + return GetLastError(); + + if (bUnicode) + return SendMessageW(hwndOwner, uMsg, wParam, lParam); + else + return SendMessageA(hwndOwner, uMsg, wParam, lParam); +} + static int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, @@ -79,18 +98,36 @@ RetrieveClipboardFormatName(HINSTANCE hInstance, PVOID lpszFormat, UINT cch) { - if (!GetPredefinedClipboardFormatName(hInstance, uFormat, Unicode, lpszFormat, cch)) + ZeroMemory(lpszFormat, cch * (Unicode ? sizeof(WCHAR) : sizeof(CHAR))); + + /* Check for predefined clipboard format */ + if (GetPredefinedClipboardFormatName(hInstance, uFormat, Unicode, lpszFormat, cch) != 0) + return; + + /* Check for owner-display format */ + if (uFormat == CF_OWNERDISPLAY) { - if (Unicode) + if (SendClipboardOwnerMessage(Unicode, WM_ASKCBFORMATNAME, + (WPARAM)cch, (LPARAM)lpszFormat) != 0) { - if (!GetClipboardFormatNameW(uFormat, (LPWSTR)lpszFormat, cch)) + if (Unicode) LoadStringW(hInstance, STRING_CF_UNKNOWN, (LPWSTR)lpszFormat, cch); - } - else - { - if (!GetClipboardFormatNameA(uFormat, (LPSTR)lpszFormat, cch)) + else LoadStringA(hInstance, STRING_CF_UNKNOWN, (LPSTR)lpszFormat, cch); } + return; + } + + /* Fallback to registered clipboard format */ + if (Unicode) + { + if (!GetClipboardFormatNameW(uFormat, (LPWSTR)lpszFormat, cch)) + LoadStringW(hInstance, STRING_CF_UNKNOWN, (LPWSTR)lpszFormat, cch); + } + else + { + if (!GetClipboardFormatNameA(uFormat, (LPSTR)lpszFormat, cch)) + LoadStringA(hInstance, STRING_CF_UNKNOWN, (LPSTR)lpszFormat, cch); } } @@ -112,13 +149,22 @@ void DeleteClipboardContent(void) UINT GetAutomaticClipboardFormat(void) { - static UINT uFormatList[] = { + static UINT uFormatList[] = + { + CF_OWNERDISPLAY, CF_UNICODETEXT, + CF_TEXT, + CF_OEMTEXT, CF_ENHMETAFILE, CF_METAFILEPICT, CF_DIBV5, CF_DIB, - CF_BITMAP + CF_BITMAP, + CF_DSPTEXT, + CF_DSPBITMAP, + CF_DSPMETAFILEPICT, + CF_DSPENHMETAFILE, + CF_PALETTE }; return GetPriorityClipboardFormat(uFormatList, ARRAYSIZE(uFormatList)); @@ -128,12 +174,16 @@ BOOL IsClipboardFormatSupported(UINT uFormat) { switch (uFormat) { + case CF_OWNERDISPLAY: case CF_UNICODETEXT: + case CF_TEXT: + case CF_OEMTEXT: case CF_BITMAP: case CF_ENHMETAFILE: case CF_METAFILEPICT: case CF_DIB: case CF_DIBV5: + case CF_HDROP: { return TRUE; } @@ -144,3 +194,179 @@ BOOL IsClipboardFormatSupported(UINT uFormat) } } } + +SIZE_T +GetLineExtentW( + IN LPCWSTR lpText, + OUT LPCWSTR* lpNextLine) +{ + LPCWSTR ptr; + + /* Find the next line of text (lpText is NULL-terminated) */ + /* For newlines, focus only on '\n', not on '\r' */ + ptr = wcschr(lpText, L'\n'); // Find the end of this line. + if (ptr) + { + /* We have the end of this line, go to the next line (ignore the endline in the count) */ + *lpNextLine = ptr + 1; + } + else + { + /* This line was the last one, go pointing to the terminating NULL */ + ptr = lpText + wcslen(lpText); + *lpNextLine = ptr; + } + + return (ptr - lpText); +} + +SIZE_T +GetLineExtentA( + IN LPCSTR lpText, + OUT LPCSTR* lpNextLine) +{ + LPCSTR ptr; + + /* Find the next line of text (lpText is NULL-terminated) */ + /* For newlines, focus only on '\n', not on '\r' */ + ptr = strchr(lpText, '\n'); // Find the end of this line. + if (ptr) + { + /* We have the end of this line, go to the next line (ignore the endline in the count) */ + *lpNextLine = ptr + 1; + } + else + { + /* This line was the last one, go pointing to the terminating NULL */ + ptr = lpText + strlen(lpText); + *lpNextLine = ptr; + } + + return (ptr - lpText); +} + +BOOL GetClipboardDataDimensions(UINT uFormat, PRECT pRc) +{ + SetRectEmpty(pRc); + + if (!OpenClipboard(Globals.hMainWnd)) + { + return FALSE; + } + + switch (uFormat) + { + case CF_DSPBITMAP: + case CF_BITMAP: + { + HBITMAP hBitmap; + BITMAP bmp; + + hBitmap = (HBITMAP)GetClipboardData(CF_BITMAP); + GetObjectW(hBitmap, sizeof(bmp), &bmp); + SetRect(pRc, 0, 0, bmp.bmWidth, bmp.bmHeight); + break; + } + + case CF_DIB: + case CF_DIBV5: + { + HGLOBAL hGlobal; + LPBITMAPINFOHEADER lpInfoHeader; + + hGlobal = GetClipboardData(uFormat); + if (!hGlobal) + break; + + lpInfoHeader = GlobalLock(hGlobal); + if (!lpInfoHeader) + break; + + if (lpInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) + { + LPBITMAPCOREHEADER lpCoreHeader = (LPBITMAPCOREHEADER)lpInfoHeader; + SetRect(pRc, 0, 0, + lpCoreHeader->bcWidth, + lpCoreHeader->bcHeight); + } + else if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV4HEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV5HEADER))) + { + SetRect(pRc, 0, 0, + lpInfoHeader->biWidth, + /* NOTE: biHeight < 0 for bottom-up DIBs, or > 0 for top-down DIBs */ + (lpInfoHeader->biHeight > 0) ? lpInfoHeader->biHeight + : -lpInfoHeader->biHeight); + } + else + { + /* Invalid format */ + } + + GlobalUnlock(hGlobal); + break; + } + + case CF_DSPTEXT: + case CF_TEXT: + case CF_OEMTEXT: + case CF_UNICODETEXT: + { + HDC hDC; + HGLOBAL hGlobal; + PVOID lpText, ptr; + DWORD dwSize; + SIZE txtSize = {0, 0}; + SIZE_T lineSize; + + hGlobal = GetClipboardData(uFormat); + if (!hGlobal) + break; + + lpText = GlobalLock(hGlobal); + if (!lpText) + break; + + hDC = GetDC(Globals.hMainWnd); + + /* Find the size of the rectangle enclosing the text */ + for (;;) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + lineSize = GetLineExtentW(lpText, (LPCWSTR*)&ptr); + dwSize = GetTabbedTextExtentW(hDC, lpText, lineSize, 0, NULL); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + lineSize = GetLineExtentA(lpText, (LPCSTR*)&ptr); + dwSize = GetTabbedTextExtentA(hDC, lpText, lineSize, 0, NULL); + } + txtSize.cx = max(txtSize.cx, LOWORD(dwSize)); + txtSize.cy += HIWORD(dwSize); + lpText = ptr; + } + + ReleaseDC(Globals.hMainWnd, hDC); + + GlobalUnlock(hGlobal); + + SetRect(pRc, 0, 0, txtSize.cx, txtSize.cy); + break; + } + + default: + { + break; + } + } + + CloseClipboard(); + + return TRUE; +} diff --git a/base/applications/clipbrd/cliputils.h b/base/applications/clipbrd/cliputils.h index 28d64b8b3e..f126108649 100644 --- a/base/applications/clipbrd/cliputils.h +++ b/base/applications/clipbrd/cliputils.h @@ -1,11 +1,20 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/cliputils.h - * PURPOSE: Clipboard helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + +LRESULT +SendClipboardOwnerMessage( + IN BOOL bUnicode, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, @@ -16,3 +25,15 @@ RetrieveClipboardFormatName(HINSTANCE hInstance, void DeleteClipboardContent(void); UINT GetAutomaticClipboardFormat(void); BOOL IsClipboardFormatSupported(UINT uFormat); + +SIZE_T +GetLineExtentW( + IN LPCWSTR lpText, + OUT LPCWSTR* lpNextLine); + +SIZE_T +GetLineExtentA( + IN LPCSTR lpText, + OUT LPCSTR* lpNextLine); + +BOOL GetClipboardDataDimensions(UINT uFormat, PRECT pRc); diff --git a/base/applications/clipbrd/fileutils.c b/base/applications/clipbrd/fileutils.c index 3be9acb275..d4b3ba72f0 100644 --- a/base/applications/clipbrd/fileutils.c +++ b/base/applications/clipbrd/fileutils.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.c - * PURPOSE: Clipboard file format helper functions. - * PROGRAMMERS: Ricardo Hanke - * Hermes Belusca-Maito + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard file format helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -399,22 +398,22 @@ void ReadClipboardFile(LPCWSTR lpFileName) break; } - case CF_BITMAP: case CF_DSPBITMAP: + case CF_BITMAP: { bResult = ClipboardReadBitmap(hFile, dwOffData, dwLenData); break; } - case CF_METAFILEPICT: case CF_DSPMETAFILEPICT: + case CF_METAFILEPICT: { bResult = ClipboardReadMetafile(hFile, dwOffData, dwLenData); break; } - case CF_ENHMETAFILE: case CF_DSPENHMETAFILE: + case CF_ENHMETAFILE: { bResult = ClipboardReadEnhMetafile(hFile, dwOffData, dwLenData); break; diff --git a/base/applications/clipbrd/fileutils.h b/base/applications/clipbrd/fileutils.h index e103d8ee84..b17c45066a 100644 --- a/base/applications/clipbrd/fileutils.h +++ b/base/applications/clipbrd/fileutils.h @@ -1,15 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.h - * PURPOSE: Clipboard file format helper functions. - * PROGRAMMERS: Ricardo Hanke - * Hermes Belusca-Maito + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard file format helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + +/* Clipboard file format signatures */ #define CLIP_FMT_31 0xC350 #define CLIP_FMT_NT 0xC351 #define CLIP_FMT_BK 0xC352 + #define MAX_FMT_NAME_LEN 79 /* diff --git a/base/applications/clipbrd/precomp.h b/base/applications/clipbrd/precomp.h index 5159ec2e5d..7a04b962c4 100644 --- a/base/applications/clipbrd/precomp.h +++ b/base/applications/clipbrd/precomp.h @@ -1,8 +1,18 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Precompiled header. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #ifndef _CLIPBRD_PCH_ #define _CLIPBRD_PCH_ // #pragma once +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x600 + #include <limits.h> #include <assert.h> @@ -19,11 +29,12 @@ #include "resources.h" #include "cliputils.h" #include "fileutils.h" -#include "winutils.h" #include "scrollutils.h" +#include "winutils.h" #define MAX_STRING_LEN 255 #define DISPLAY_MENU_POS 2 + #define CF_NONE 0 typedef struct _CLIPBOARD_GLOBALS @@ -34,8 +45,10 @@ typedef struct _CLIPBOARD_GLOBALS HMENU hMenu; UINT uDisplayFormat; UINT uCheckedItem; - UINT uLinesToScroll; - HBITMAP hDspBmp; + + /* Metrics of the current font */ + LONG CharWidth; + LONG CharHeight; } CLIPBOARD_GLOBALS; extern CLIPBOARD_GLOBALS Globals; diff --git a/base/applications/clipbrd/resources.h b/base/applications/clipbrd/resources.h index ac958ef625..afc9ae8fd9 100644 --- a/base/applications/clipbrd/resources.h +++ b/base/applications/clipbrd/resources.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resources header. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #pragma once #define CLIPBRD_ICON 100 diff --git a/base/applications/clipbrd/scrollutils.c b/base/applications/clipbrd/scrollutils.c index 424921f321..87c6ce8334 100644 --- a/base/applications/clipbrd/scrollutils.c +++ b/base/applications/clipbrd/scrollutils.c @@ -1,202 +1,166 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/scrollutils.c - * PURPOSE: Scrolling related helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Scrolling related helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" -static int InternalSetScrollInfo(HWND hWnd, int nMin, int nMax, UINT nPage, int nPos, int fnBar) -{ - SCROLLINFO si; - - ZeroMemory(&si, sizeof(si)); - si.cbSize = sizeof(si); - si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; - si.nMin = nMin; - si.nMax = nMax; - si.nPage = nPage; - si.nPos = nPos; - - return SetScrollInfo(hWnd, fnBar, &si, TRUE); -} - -void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +void OnKeyScroll(HWND hWnd, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { + // NOTE: Windows uses an offset of 16 pixels switch (wParam) { case VK_UP: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEUP, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_LINEUP, 0), 5, state); break; - } case VK_DOWN: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_LINEDOWN, 0), 5, state); break; - } case VK_LEFT: - { - SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEUP, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LINELEFT, 0), 5, state); break; - } case VK_RIGHT: - { - SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LINERIGHT, 0), 5, state); break; - } case VK_PRIOR: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEUP, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_PAGEUP, 0), state->nPageY, state); break; - } case VK_NEXT: + OnScroll(hWnd, SB_VERT, MAKELONG(SB_PAGEDOWN, 0), state->nPageY, state); + break; + + case VK_HOME: { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEDOWN, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LEFT, 0), 0, state); + if (GetKeyState(VK_CONTROL) & 0x8000) + OnScroll(hWnd, SB_VERT, MAKELONG(SB_TOP, 0), 0, state); break; } - default: + case VK_END: { + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_RIGHT, 0), 0, state); + if (GetKeyState(VK_CONTROL) & 0x8000) + OnScroll(hWnd, SB_VERT, MAKELONG(SB_BOTTOM, 0), 0, state); break; } + + default: + break; } } -void HandleMouseScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +void OnMouseScroll(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { - SCROLLINFO si; - int Delta; - int NewPos; + INT nBar; + INT nPage; + INT iDelta; + UINT uLinesToScroll = state->uLinesToScroll; + INT zDelta = GET_WHEEL_DELTA_WPARAM(wParam); + WORD sbCode; - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE; - GetScrollInfo(hWnd, SB_VERT, &si); + assert(uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL); - if (Globals.uLinesToScroll == WHEEL_PAGESCROLL) + if (uMsg == WM_MOUSEWHEEL) { - NewPos = si.nPage; + nBar = SB_VERT; + nPage = state->nPageY; + + /* Accumulate wheel rotation ticks */ + zDelta += state->iWheelCarryoverY; + state->iWheelCarryoverY = zDelta % WHEEL_DELTA; } - else + else // if (uMsg == WM_MOUSEHWHEEL) { - NewPos = Globals.uLinesToScroll * 5; + nBar = SB_HORZ; + nPage = state->nPageX; + + /* Accumulate wheel rotation ticks */ + zDelta += state->iWheelCarryoverX; + state->iWheelCarryoverX = zDelta % WHEEL_DELTA; } - if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) + /* + * If the user specified scrolling by pages, do so. + * Due to a bug on Windows where, if the window height is + * less than the scroll lines delta default value (== 3), + * several lines would be skipped when scrolling if we + * used the WHEEL_PAGESCROLL value. Instead of this, use + * the number of lines per page as the limiting value. + * See https://www.strchr.com/corrections_to_raymond_chen_s_wheel_scrolling_code + * for more details. + */ + if (uLinesToScroll > nPage) // (uLinesToScroll == WHEEL_PAGESCROLL) + uLinesToScroll = nPage; + /* If the user specified no wheel scrolling, don't do anything */ + else if (uLinesToScroll == 0) + return; + + /* Compute the scroll direction and the absolute delta value */ + if (zDelta > 0) { - NewPos = state->CurrentY - NewPos; + sbCode = SB_LINEUP; } else { - NewPos = state->CurrentY + NewPos; - } - - NewPos = min(state->MaxY, max(0, NewPos)); - - if (NewPos == state->CurrentY) - { - return; + sbCode = SB_LINEDOWN; + zDelta = -zDelta; } - Delta = NewPos - state->CurrentY; - - state->CurrentY = NewPos; + /* Compute how many lines we should scroll (in absolute value) */ + iDelta = (INT)uLinesToScroll * zDelta / WHEEL_DELTA; - ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); - - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentY; - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + OnScroll(hWnd, nBar, MAKELONG(sbCode, 0), iDelta, state); } -void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +void OnScroll(HWND hWnd, INT nBar, WPARAM wParam, INT iDelta, LPSCROLLSTATE state) { SCROLLINFO si; - int Delta; - int NewPos; + PINT pCurrent; + INT Maximum; + INT NewPos; + INT OldX, OldY; - ZeroMemory(&si, sizeof(si)); - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_TRACKPOS; - GetScrollInfo(hWnd, SB_HORZ, &si); + assert(nBar == SB_HORZ || nBar == SB_VERT); - switch (LOWORD(wParam)) + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) { - case SB_THUMBPOSITION: - case SB_THUMBTRACK: + if (nBar == SB_HORZ) { - NewPos = si.nTrackPos; - break; + SendClipboardOwnerMessage(TRUE, WM_HSCROLLCLIPBOARD, + (WPARAM)hWnd, (LPARAM)wParam); } - - case SB_LINELEFT: + else // if (nBar == SB_VERT) { - NewPos = state->CurrentX - 5; - break; - } - - case SB_LINERIGHT: - { - NewPos = state->CurrentX + 5; - break; - } - - case SB_PAGELEFT: - { - NewPos = state->CurrentX - si.nPage; - break; - } - - case SB_PAGERIGHT: - { - NewPos = state->CurrentX + si.nPage; - break; - } - - default: - { - NewPos = state->CurrentX; - break; + SendClipboardOwnerMessage(TRUE, WM_VSCROLLCLIPBOARD, + (WPARAM)hWnd, (LPARAM)wParam); } + return; } - NewPos = min(state->MaxX, max(0, NewPos)); - - if (NewPos == state->CurrentX) - { - return; - } - - Delta = NewPos - state->CurrentX; - - state->CurrentX = NewPos; - - ScrollWindowEx(hWnd, -Delta, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); - - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentX; - SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); -} - -void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) -{ - SCROLLINFO si; - int Delta; - int NewPos; + if (nBar == SB_HORZ) + { + pCurrent = &state->CurrentX; + Maximum = state->MaxX; + } + else // if (nBar == SB_VERT) + { + pCurrent = &state->CurrentY; + Maximum = state->MaxY; + } ZeroMemory(&si, sizeof(si)); si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_TRACKPOS; - GetScrollInfo(hWnd, SB_VERT, &si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + GetScrollInfo(hWnd, nBar, &si); switch (LOWORD(wParam)) { @@ -207,108 +171,117 @@ void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar break; } - case SB_LINEUP: + case SB_LINEUP: // SB_LINELEFT: { - NewPos = state->CurrentY - 5; + NewPos = si.nPos - iDelta; break; } - case SB_LINEDOWN: + case SB_LINEDOWN: // SB_LINERIGHT: { - NewPos = state->CurrentY + 5; + NewPos = si.nPos + iDelta; break; } - case SB_PAGEUP: + case SB_PAGEUP: // SB_PAGELEFT: { - NewPos = state->CurrentY - si.nPage; + NewPos = si.nPos - si.nPage; break; } - case SB_PAGEDOWN: + case SB_PAGEDOWN: // SB_PAGERIGHT: { - NewPos = state->CurrentY + si.nPage; + NewPos = si.nPos + si.nPage; break; } - default: + case SB_TOP: // SB_LEFT: { - NewPos = state->CurrentY; + NewPos = si.nMin; break; } - } - NewPos = min(state->MaxY, max(0, NewPos)); + case SB_BOTTOM: // SB_RIGHT: + { + NewPos = si.nMax; + break; + } - if (NewPos == state->CurrentY) - { - return; - } + default: + { + NewPos = si.nPos; + break; + } + } + + NewPos = min(max(NewPos, 0), Maximum); - Delta = NewPos - state->CurrentY; + if (si.nPos == NewPos) + return; - state->CurrentY = NewPos; + OldX = state->CurrentX; + OldY = state->CurrentY; + *pCurrent = NewPos; - ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hWnd, + OldX - state->CurrentX, + OldY - state->CurrentY, + NULL, + NULL, + NULL, + NULL, + SW_ERASE | SW_INVALIDATE); + UpdateWindow(hWnd); - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentY; - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + si.fMask = SIF_POS; + si.nPos = NewPos; + SetScrollInfo(hWnd, nBar, &si, TRUE); } -void UpdateWindowScrollState(HWND hWnd, HBITMAP hBitmap, LPSCROLLSTATE lpState) +void UpdateLinesToScroll(LPSCROLLSTATE state) { - BITMAP bmp; - RECT rc; + UINT uLinesToScroll; - if (!GetObject(hBitmap, sizeof(BITMAP), &bmp)) + if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &uLinesToScroll, 0)) { - bmp.bmWidth = 0; - bmp.bmHeight = 0; + /* Default value on Windows */ + state->uLinesToScroll = 3; } - - if (!GetClientRect(hWnd, &rc)) + else { - SetRectEmpty(&rc); + state->uLinesToScroll = uLinesToScroll; } - - lpState->MaxX = max(bmp.bmWidth - rc.right, 0); - lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); - InternalSetScrollInfo(hWnd, 0, bmp.bmWidth, rc.right, lpState->CurrentX, SB_HORZ); - - lpState->MaxY = max(bmp.bmHeight - rc.bottom, 0); - lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); - InternalSetScrollInfo(hWnd, 0, bmp.bmHeight, rc.bottom, lpState->CurrentY, SB_VERT); } -BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state) +void UpdateWindowScrollState(HWND hWnd, INT nMaxWidth, INT nMaxHeight, LPSCROLLSTATE lpState) { - RECT rect; - BOOL ret; - HDC hdc; - int xpos; - int ypos; - - rect.left = ps.rcPaint.left; - rect.top = ps.rcPaint.top; - rect.right = (ps.rcPaint.right - ps.rcPaint.left); - rect.bottom = (ps.rcPaint.bottom - ps.rcPaint.top); - - xpos = ps.rcPaint.left + state.CurrentX; - ypos = ps.rcPaint.top + state.CurrentY; + RECT rc; + SCROLLINFO si; - ret = FALSE; + if (!GetClientRect(hWnd, &rc)) + SetRectEmpty(&rc); - hdc = CreateCompatibleDC(ps.hdc); - if (hdc) - { - if (SelectObject(hdc, hBmp)) - { - ret = BitBlt(ps.hdc, rect.left, rect.top, rect.right, rect.bottom, hdc, xpos, ypos, SRCCOPY); - } - DeleteDC(hdc); - } + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; - return ret; + lpState->nMaxWidth = nMaxWidth; + lpState->MaxX = max(nMaxWidth - rc.right, 0); + lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); + lpState->nPageX = rc.right; + si.nMin = 0; + si.nMax = nMaxWidth; + si.nPage = lpState->nPageX; + si.nPos = lpState->CurrentX; + SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); + + lpState->nMaxHeight = nMaxHeight; + lpState->MaxY = max(nMaxHeight - rc.bottom, 0); + lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); + lpState->nPageY = rc.bottom; + si.nMin = 0; + si.nMax = nMaxHeight; + si.nPage = lpState->nPageY; + si.nPos = lpState->CurrentY; + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); } diff --git a/base/applications/clipbrd/scrollutils.h b/base/applications/clipbrd/scrollutils.h index 221bf50ce0..4645a24441 100644 --- a/base/applications/clipbrd/scrollutils.h +++ b/base/applications/clipbrd/scrollutils.h @@ -1,22 +1,31 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/scrollutils.h - * PURPOSE: Scrolling related helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Scrolling related helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + typedef struct _SCROLLSTATE { - int CurrentX; - int CurrentY; - int MaxX; - int MaxY; + UINT uLinesToScroll; /* Number of lines to scroll on one wheel rotation movement (== one "click" == WHEEL_DELTA ticks) */ + INT iWheelCarryoverX; /* Unused wheel ticks (< WHEEL_DELTA) */ + INT iWheelCarryoverY; + INT nPageX; /* Number of lines per page */ + INT nPageY; + INT CurrentX; /* Current scrollbar position */ + INT CurrentY; + INT MaxX; /* Maximum scrollbar position */ + INT MaxY; + INT nMaxWidth; /* Maximum span of displayed data */ + INT nMaxHeight; } SCROLLSTATE, *LPSCROLLSTATE; -void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -void HandleMouseScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void UpdateWindowScrollState(HWND hWnd, HBITMAP hBmp, LPSCROLLSTATE lpState); -BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state); +void OnKeyScroll(HWND hWnd, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void OnMouseScroll(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void OnScroll(HWND hWnd, INT nBar, WPARAM wParam, INT iDelta, LPSCROLLSTATE state); + +void UpdateLinesToScroll(LPSCROLLSTATE state); +void UpdateWindowScrollState(HWND hWnd, INT nMaxWidth, INT nMaxHeight, LPSCROLLSTATE lpState); diff --git a/base/applications/clipbrd/winutils.c b/base/applications/clipbrd/winutils.c index 43697d53e9..eb1cf03c2d 100644 --- a/base/applications/clipbrd/winutils.c +++ b/base/applications/clipbrd/winutils.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.c - * PURPOSE: Miscellaneous helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Display helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -46,22 +46,6 @@ void BringWindowToFront(HWND hWnd) } } -int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat) -{ - LPWSTR lpBuffer; - int nCount; - - nCount = LoadStringW(hInstance, uID, (LPWSTR)&lpBuffer, 0); - if (nCount) - { - return DrawTextW(hDC, lpBuffer, nCount, lpRect, uFormat); - } - else - { - return 0; - } -} - int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType) { MSGBOXPARAMSW mb; @@ -78,45 +62,135 @@ int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UIN return MessageBoxIndirectW(&mb); } -void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat) +void DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat) { + LPWSTR lpBuffer; + int nCount; + + nCount = LoadStringW(hInstance, uID, (LPWSTR)&lpBuffer, 0); + if (nCount) + DrawTextW(hDC, lpBuffer, nCount, lpRect, uFormat); +} + +void DrawTextFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state) +{ + POINT ptOrg; HGLOBAL hGlobal; - LPWSTR lpchText; + PVOID lpText, ptr; + SIZE_T lineSize; + INT FirstLine, LastLine; - hGlobal = GetClipboardData(CF_UNICODETEXT); + hGlobal = GetClipboardData(uFormat); if (!hGlobal) return; - lpchText = GlobalLock(hGlobal); - if (!lpchText) + lpText = GlobalLock(hGlobal); + if (!lpText) return; - DrawTextW(hDC, lpchText, -1, lpRect, uFormat); + /* Find the first and last line indices to display (Note that CurrentX/Y are in pixels!) */ + FirstLine = max(0, (state.CurrentY + ps.rcPaint.top) / Globals.CharHeight); + // LastLine = min(LINES - 1, (state.CurrentY + ps.rcPaint.bottom) / Globals.CharHeight); + // NOTE: Can be less or greater than the actual number of lines in the text. + LastLine = (state.CurrentY + ps.rcPaint.bottom) / Globals.CharHeight; + + /* Find the first text line to display */ + while (FirstLine > 0) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + GetLineExtentW(lpText, (LPCWSTR*)&ptr); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + GetLineExtentA(lpText, (LPCSTR*)&ptr); + } + + --FirstLine; + --LastLine; + + lpText = ptr; + } + + ptOrg.x = ps.rcPaint.left; + ptOrg.y = /* FirstLine */ max(0, (state.CurrentY + ps.rcPaint.top) / Globals.CharHeight) + * Globals.CharHeight - state.CurrentY; + + /* Display each line from the current one up to the last one */ + ++LastLine; + while (LastLine >= 0) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + lineSize = GetLineExtentW(lpText, (LPCWSTR*)&ptr); + TabbedTextOutW(ps.hdc, /*ptOrg.x*/0 - state.CurrentX, ptOrg.y, + lpText, lineSize, 0, NULL, + /*ptOrg.x*/0 - state.CurrentX); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + lineSize = GetLineExtentA(lpText, (LPCSTR*)&ptr); + TabbedTextOutA(ps.hdc, /*ptOrg.x*/0 - state.CurrentX, ptOrg.y, + lpText, lineSize, 0, NULL, + /*ptOrg.x*/0 - state.CurrentX); + } + + --LastLine; + + ptOrg.y += Globals.CharHeight; + lpText = ptr; + } + GlobalUnlock(hGlobal); } -void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop) +void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop) { HDC hdcMem; - HBITMAP hbm; + HBITMAP hBitmap; + BITMAP bmp; + LONG bmWidth, bmHeight; - hdcMem = CreateCompatibleDC(hdcDest); - if (hdcMem) - { - hbm = (HBITMAP)GetClipboardData(CF_BITMAP); - SelectObject(hdcMem, hbm); - BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcMem, nXSrc, nYSrc, dwRop); - DeleteDC(hdcMem); - } + hdcMem = CreateCompatibleDC(ps.hdc); + if (!hdcMem) + return; + + hBitmap = (HBITMAP)GetClipboardData(CF_BITMAP); + GetObjectW(hBitmap, sizeof(bmp), &bmp); + + SelectObject(hdcMem, hBitmap); + + bmWidth = min(ps.rcPaint.right - ps.rcPaint.left, bmp.bmWidth - ps.rcPaint.left - state.CurrentX); + bmHeight = min(ps.rcPaint.bottom - ps.rcPaint.top , bmp.bmHeight - ps.rcPaint.top - state.CurrentY); + + BitBlt(ps.hdc, + ps.rcPaint.left, + ps.rcPaint.top, + bmWidth, + bmHeight, + hdcMem, + ps.rcPaint.left + state.CurrentX, + ps.rcPaint.top + state.CurrentY, + dwRop); + + DeleteDC(hdcMem); } -void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse) +void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse) { + HGLOBAL hGlobal; LPBITMAPINFOHEADER lpInfoHeader; LPBYTE lpBits; LONG bmWidth, bmHeight; DWORD dwPalSize = 0; - HGLOBAL hGlobal; hGlobal = GetClipboardData(uFormat); if (!hGlobal) @@ -183,9 +257,9 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, * * FIXME: investigate!! * ANSWER: this is a Windows bug; part of the answer is there: - * http://go4answers.webhost4life.com/Help/bug-clipboard-format-conversions-28… + * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609… * May be related: - * http://blog.talosintel.com/2015/10/dangerous-clipboard.html + * https://blog.talosintelligence.com/2015/10/dangerous-clipboard.html */ #if 0 if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) && @@ -196,6 +270,7 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, #endif bmWidth = lpInfoHeader->biWidth; + /* NOTE: biHeight < 0 for bottom-up DIBs, or > 0 for top-down DIBs */ bmHeight = lpInfoHeader->biHeight; } else @@ -207,11 +282,19 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, lpBits = (LPBYTE)lpInfoHeader + lpInfoHeader->biSize + dwPalSize; - SetDIBitsToDevice(hdc, - XDest, YDest, - bmWidth, bmHeight, - XSrc, YSrc, - uStartScan, + /* + * The seventh parameter (YSrc) of SetDIBitsToDevice always designates + * the Y-coordinate of the "lower-left corner" of the image, be the DIB + * in bottom-up or top-down mode. + */ + SetDIBitsToDevice(ps.hdc, + -state.CurrentX, // ps.rcPaint.left, + -state.CurrentY, // ps.rcPaint.top, + bmWidth, + bmHeight, + 0, // ps.rcPaint.left + state.CurrentX, + 0, // -(ps.rcPaint.top + state.CurrentY), + 0, // uStartScan, bmHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, @@ -248,52 +331,25 @@ void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) PlayEnhMetaFile(hdc, hEmf, lpRect); } -UINT RealizeClipboardPalette(HWND hWnd) +BOOL RealizeClipboardPalette(HDC hdc) { - HPALETTE hPalette; - HPALETTE hOldPalette; - UINT uResult; - HDC hDevContext; - - if (!OpenClipboard(Globals.hMainWnd)) - { - return GDI_ERROR; - } + BOOL Success; + HPALETTE hPalette, hOldPalette; if (!IsClipboardFormatAvailable(CF_PALETTE)) - { - CloseClipboard(); - return GDI_ERROR; - } + return FALSE; hPalette = GetClipboardData(CF_PALETTE); if (!hPalette) - { - CloseClipboard(); - return GDI_ERROR; - } - - hDevContext = GetDC(hWnd); - if (!hDevContext) - { - CloseClipboard(); - return GDI_ERROR; - } + return FALSE; - hOldPalette = SelectPalette(hDevContext, hPalette, FALSE); + hOldPalette = SelectPalette(hdc, hPalette, FALSE); if (!hOldPalette) - { - ReleaseDC(hWnd, hDevContext); - CloseClipboard(); - return GDI_ERROR; - } - - uResult = RealizePalette(hDevContext); + return FALSE; - SelectPalette(hDevContext, hOldPalette, FALSE); - ReleaseDC(hWnd, hDevContext); + Success = (RealizePalette(hdc) != GDI_ERROR); - CloseClipboard(); + SelectPalette(hdc, hOldPalette, FALSE); - return uResult; + return Success; } diff --git a/base/applications/clipbrd/winutils.h b/base/applications/clipbrd/winutils.h index 12dde908d8..e29ec927bc 100644 --- a/base/applications/clipbrd/winutils.h +++ b/base/applications/clipbrd/winutils.h @@ -1,18 +1,20 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.h - * PURPOSE: Miscellaneous helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Display helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + void ShowLastWin32Error(HWND hwndParent); void BringWindowToFront(HWND hWnd); -int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat); int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType); -void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat); -void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop); -void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse); +void DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat); +void DrawTextFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state); +void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop); +void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse); void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); -UINT RealizeClipboardPalette(HWND hWnd); +BOOL RealizeClipboardPalette(HDC hdc);

1 0

01/01: Add virtio drivers to reactos.dff.in
by Andrew Cook 13 May '18

13 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a00192870ec1c1d21a3e… commit 5a00192870ec1c1d21a3e26243e5f75ca6dcad9d Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Sun May 13 14:56:44 2018 +1000 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun May 13 22:24:41 2018 +0200 Add virtio drivers to reactos.dff.in qxl has some visual glitches, viostor loads but it seems reactos doesn't support scsi disks yet --- boot/bootdata/packages/reactos.dff.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 96ace64430..2689f50483 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -89,9 +89,16 @@ Signature = "$ReactOS$" ; Optional/proprietary files "modules/optional/DroidSansFallback.ttf" 3 optional "modules/optional/NOTICE_for_Droid_Font.txt" 4 optional -"modules/optional/netkvm2k.inf" 6 optional -"modules/optional/netkvm2k.cat" 6 optional +"modules/optional/netkvm.inf" 6 optional +"modules/optional/netkvm.cat" 6 optional "modules/optional/netkvm.sys" 2 optional +"modules/optional/viostor.inf" 6 optional +"modules/optional/viostor.cat" 6 optional +"modules/optional/viostor.sys" 2 optional +"modules/optional/qxl.inf" 6 optional +"modules/optional/qxl.cat" 6 optional +"modules/optional/qxl.sys" 2 optional +"modules/optional/qxldd.dll" 1 optional "modules/optional/b57win32.inf" 6 optional "modules/optional/b57win32.cat" 6 optional "modules/optional/b57xp32.sys" 2 optional

1 0

01/01: [SHELL32] In #543, I forgot sq-AL.rc and sv-SE.rc
by Katayama Hirofumi MZ 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e96d851339d24a30247d… commit 2e96d851339d24a30247d08ed0a9716c22208539 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 12 23:33:01 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 17:09:59 2018 +0200 [SHELL32] In #543, I forgot sq-AL.rc and sv-SE.rc --- dll/win32/shell32/lang/sq-AL.rc | 14 +++++++------- dll/win32/shell32/lang/sv-SE.rc | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index bf4e9030cd..fced8feca2 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -457,15 +457,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detaje për '%s' zgjerim", 14003, 7, 130, 249, 70 + PUSHBUTTON "E're", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Fshi", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detaje për '%s' zgjerim", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Hap me:", -1, 12, 140, 40, 10 //ICON - LTEXT "Emriapp", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Ndrysho...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Avancuar", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Emriapp", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Ndrysho...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Avancuar", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index c0ab9760cb..9484e95687 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -453,15 +453,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrerade fil&typer:", -1, 7, 10, 70, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Ta bort", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detaljer för filändelsen '%s'", 14003, 7, 130, 249, 70 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Ta bort", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detaljer för filändelsen '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Öppnas med:", -1, 12, 140, 50, 10 //ICON - LTEXT "Programnamn", 14005, 100, 140, 46, 10 - PUSHBUTTON "&Ändra...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vancerat", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Programnamn", IDC_FILETYPES_APPNAME, 100, 140, 46, 10 + PUSHBUTTON "&Ändra...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vancerat", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143

1 0

01/01: [shell32] add some control IDs for IDD_FOLDER_OPTIONS_FILETYPES
by Katayama Hirofumi MZ 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b0238a48aa2ea38125c5… commit 2b0238a48aa2ea38125c53df3316f57f409220e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 12 21:06:13 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:47:09 2018 +0200 [shell32] add some control IDs for IDD_FOLDER_OPTIONS_FILETYPES --- dll/win32/shell32/lang/bg-BG.rc | 16 ++++++++-------- dll/win32/shell32/lang/ca-ES.rc | 16 ++++++++-------- dll/win32/shell32/lang/cs-CZ.rc | 16 ++++++++-------- dll/win32/shell32/lang/da-DK.rc | 16 ++++++++-------- dll/win32/shell32/lang/de-DE.rc | 16 ++++++++-------- dll/win32/shell32/lang/el-GR.rc | 16 ++++++++-------- dll/win32/shell32/lang/en-GB.rc | 16 ++++++++-------- dll/win32/shell32/lang/en-US.rc | 16 ++++++++-------- dll/win32/shell32/lang/es-ES.rc | 16 ++++++++-------- dll/win32/shell32/lang/et-EE.rc | 16 ++++++++-------- dll/win32/shell32/lang/fi-FI.rc | 16 ++++++++-------- dll/win32/shell32/lang/fr-FR.rc | 16 ++++++++-------- dll/win32/shell32/lang/he-IL.rc | 16 ++++++++-------- dll/win32/shell32/lang/hu-HU.rc | 16 ++++++++-------- dll/win32/shell32/lang/it-IT.rc | 16 ++++++++-------- dll/win32/shell32/lang/ja-JP.rc | 16 ++++++++-------- dll/win32/shell32/lang/ko-KR.rc | 16 ++++++++-------- dll/win32/shell32/lang/nl-NL.rc | 16 ++++++++-------- dll/win32/shell32/lang/no-NO.rc | 16 ++++++++-------- dll/win32/shell32/lang/pl-PL.rc | 16 ++++++++-------- dll/win32/shell32/lang/pt-BR.rc | 16 ++++++++-------- dll/win32/shell32/lang/pt-PT.rc | 16 ++++++++-------- dll/win32/shell32/lang/ro-RO.rc | 16 ++++++++-------- dll/win32/shell32/lang/ru-RU.rc | 16 ++++++++-------- dll/win32/shell32/lang/sk-SK.rc | 16 ++++++++-------- dll/win32/shell32/lang/sl-SI.rc | 16 ++++++++-------- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 16 ++++++++-------- dll/win32/shell32/lang/uk-UA.rc | 16 ++++++++-------- dll/win32/shell32/lang/zh-CN.rc | 16 ++++++++-------- dll/win32/shell32/lang/zh-TW.rc | 16 ++++++++-------- dll/win32/shell32/shresdef.h | 10 ++++++++++ 33 files changed, 252 insertions(+), 242 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 2cad795f64..7db93e7883 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -452,16 +452,16 @@ CAPTION "Видове файлове" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вписани &видове файлове:", -1, 7, 10, 170, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Нов", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Из&триване", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Подробности за разширение '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Нов", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Из&триване", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Подробности за разширение '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Отваряне с:", -1, 12, 140, 40, 10 //ICON - LTEXT "Име на приложение", 14005, 100, 140, 40, 10 - PUSHBUTTON "Про&мяна...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 32 - PUSHBUTTON "Раз&ширени", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Име на приложение", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Про&мяна...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 32 + PUSHBUTTON "Раз&ширени", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index c2cebd14f1..691928568e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 333e126917..9928ef0947 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -458,16 +458,16 @@ CAPTION "Typy souborů" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrované &typy souborů:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nový", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "O&dstranit", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Podrobnosti pro typ souborů '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "O&dstranit", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Podrobnosti pro typ souborů '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Otevírat v:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Změnit...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Pokročilé", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Změnit...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Pokročilé", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 1a662274bc..b243df2bf8 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -458,16 +458,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1690c9ea3e..962b0b99b9 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -452,16 +452,16 @@ CAPTION "Dateitypen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Registrierte Dateitypen:", -1, 7, 10, 80, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 - PUSHBUTTON "&Neu", 14001, 140, 140, 55, 14, WS_TABSTOP - PUSHBUTTON "&Löschen", 14002, 200, 140, 55, 14, WS_TABSTOP - GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 170, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 + PUSHBUTTON "&Neu", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP + PUSHBUTTON "&Löschen", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP + GROUPBOX "Details zum Dateityp '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70 LTEXT "Öffnen mit:", -1, 12, 180, 40, 10 //ICON - LTEXT "Name", 14005, 100, 180, 40, 10 - PUSHBUTTON "Än&dern...", 14006, 200, 180, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 195, 160, 30 - PUSHBUTTON "&Erweitert", 14008, 200, 215, 50, 14, WS_TABSTOP + LTEXT "Name", IDC_FILETYPES_APPNAME, 100, 180, 40, 10 + PUSHBUTTON "Än&dern...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 30 + PUSHBUTTON "&Erweitert", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 269d0d69af..c3de8be186 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 33066d710a..097e62f4f2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index f09a32b2d6..02be7b92eb 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -453,16 +453,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index a655661522..33f2a498b0 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -454,16 +454,16 @@ CAPTION "Tipos de Archivo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 - PUSHBUTTON "&Nueva", 14001, 170, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Eli&minar", 14002, 230, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalles para el tipo de archivo «%s»", 14003, 7, 130, 279, 100 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 + PUSHBUTTON "&Nueva", IDC_FILETYPES_NEW, 170, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Eli&minar", IDC_FILETYPES_DELETE, 230, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 279, 100 LTEXT "Se abre con:", -1, 12, 140, 50, 10 //ICON - LTEXT "Aplicación", 14005, 100, 140, 40, 10 - PUSHBUTTON "Cam&biar...", 14006, 230, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 165, 220, 30 - PUSHBUTTON "Opciones avanza&das", 14008, 190, 213, 90, 14, WS_TABSTOP + LTEXT "Aplicación", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Cam&biar...", IDC_FILETYPES_CHANGE, 230, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 165, 220, 30 + PUSHBUTTON "Opciones avanza&das", IDC_FILETYPES_ADVANCED, 190, 213, 90, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 5dcac20d55..9f8150ae25 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -460,16 +460,16 @@ CAPTION "Failitüübid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registreeritud faili&tüübid:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Uus", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Kustuta", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Failitüübi '%s' üksikasjad", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Uus", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Kustuta", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Failitüübi '%s' üksikasjad", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Avamisprogramm:", -1, 12, 140, 60, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Muuda...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Täpsemalt", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Muuda...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Täpsemalt", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index bef4798082..438b40d125 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index ed0cbbdd6a..6ca34ecaa0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -452,16 +452,16 @@ CAPTION "Types de fichiers" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Types de fichiers enregistrés :", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Détails concernant l'extension '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nouveau", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Supprimer", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Détails concernant l'extension '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Ouvrir avec :", -1, 12, 140, 40, 10 //ICON - LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Modifier...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Nom de l'application", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Modifier...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vancé", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 8472eaddee..925493cd51 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 629b97485b..7f4caf3157 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a2697d681a..3ab099b0be 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -452,16 +452,16 @@ CAPTION "Tipi dei File" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipi di file Registrati:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nuovo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Cancella", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Dettagli per l'estensione '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nuovo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Cancella", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Dettagli per l'estensione '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Apri con:", -1, 12, 140, 40, 10 //ICON - LTEXT "Nome", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Cambia...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vanzate", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Nome", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Cambia...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vanzate", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 0a1bce3e2a..3c585185a4 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -452,16 +452,16 @@ CAPTION "ファイルの種類" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "登録済みのファイルの種類(&T):", -1, 7, 10, 180, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "新規(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "削除(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "拡張子 '%s' の詳細", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "新規(&N)", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "削除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "拡張子 '%s' の詳細", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "開くプログラム:", -1, 12, 140, 80, 10 //ICON - LTEXT "アプリ名", 14005, 100, 140, 80, 10 - PUSHBUTTON "変更(&C)...", 14006, 180, 140, 75, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 165, 40 - PUSHBUTTON "詳細設定(&V)", 14008, 180, 175, 75, 14, WS_TABSTOP + LTEXT "アプリ名", IDC_FILETYPES_APPNAME, 100, 140, 80, 10 + PUSHBUTTON "変更(&C)...", IDC_FILETYPES_CHANGE, 180, 140, 75, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 165, 40 + PUSHBUTTON "詳細設定(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 75, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 37d7afd13b..5a9674803c 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 9, "굴림", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 75a82a21af..97e947a882 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 564809b3ee..be60be5f1d 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -452,16 +452,16 @@ CAPTION "Filtyper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registerert fil&typer:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Slett", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detailjer for '%s' utvidelser", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Slett", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detailjer for '%s' utvidelser", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Åpne med:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Endre...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Av&ansert", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Endre...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Av&ansert", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index a218dc33dc..fb62f92282 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -457,16 +457,16 @@ CAPTION "Typy plików" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Zarejestrowane &typy plików:", -1, 7, 10, 196, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nowy", 14001, 120, 110, 60, 14, WS_TABSTOP - PUSHBUTTON "&Usuń", 14002, 195, 110, 60, 14, WS_TABSTOP - GROUPBOX "Szczegóły dla rozszerzenia '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 120, 110, 60, 14, WS_TABSTOP + PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 195, 110, 60, 14, WS_TABSTOP + GROUPBOX "Szczegóły dla rozszerzenia '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Otwiera z:", -1, 12, 140, 40, 10 //ICON - LTEXT "Nazwa Aplikacji", 14005, 50, 140, 80, 10 - PUSHBUTTON "Z&mień", 14006, 190, 140, 60, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Zaawa&nsowane", 14008, 190, 175, 60, 14, WS_TABSTOP + LTEXT "Nazwa Aplikacji", IDC_FILETYPES_APPNAME, 50, 140, 80, 10 + PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 190, 140, 60, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 190, 175, 60, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 1592819a3f..abbdc292f6 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -452,16 +452,16 @@ CAPTION "Tipos de Arquivo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de arquivo registrado:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalhes para extensão '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalhes para extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Abrir com:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "Alt&erar...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Alt&erar...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 243b4caf71..978dc1b95c 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -452,16 +452,16 @@ CAPTION "Tipos de Ficheiros" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalhes para '%s' extensão", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalhes para '%s' extensão", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Abre com:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appnome", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Mudar...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appnome", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Mudar...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 4732b10d39..3880417de2 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -454,16 +454,16 @@ CAPTION "Tipuri de fișier" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tipurile de fișier înregistrate:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "N&ou…", 14001, 140, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Elimină", 14002, 200, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalii pentru extensia „%s”", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "N&ou…", IDC_FILETYPES_NEW, 140, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Elimină", IDC_FILETYPES_DELETE, 200, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalii pentru extensia „%s”", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Va fi deschis cu:", -1, 22, 140, 50, 10 //ICON - LTEXT "Nume aplicație", 14005, 100, 140, 75, 10 - PUSHBUTTON "Spe&cificare…", 14006, 190, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 22, 155, 160, 35 - PUSHBUTTON "A&vansate…", 14008, 190, 175, 50, 14, WS_TABSTOP + LTEXT "Nume aplicație", IDC_FILETYPES_APPNAME, 100, 140, 75, 10 + PUSHBUTTON "Spe&cificare…", IDC_FILETYPES_CHANGE, 190, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 22, 155, 160, 35 + PUSHBUTTON "A&vansate…", IDC_FILETYPES_ADVANCED, 190, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 6a6cefc297..9fe7bb3a3a 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -454,16 +454,16 @@ CAPTION "Типы файлов" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Зарегистрированные типы файлов:", -1, 7, 10, 125, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Создать", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Удалить", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Описание расширения '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Создать", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Удалить", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Описание расширения '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Открывать с:", -1, 12, 140, 40, 10 //ICON - LTEXT "Приложение", 14005, 100, 140, 45, 10 - PUSHBUTTON "&Изменить...", 14006, 180, 140, 65, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "До&полнительно", 14008, 180, 175, 65, 14, WS_TABSTOP + LTEXT "Приложение", IDC_FILETYPES_APPNAME, 100, 140, 45, 10 + PUSHBUTTON "&Изменить...", IDC_FILETYPES_CHANGE, 180, 140, 65, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "До&полнительно", IDC_FILETYPES_ADVANCED, 180, 175, 65, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 55e3200648..c4dbe9172e 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -452,16 +452,16 @@ CAPTION "Typy súborov" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrované &typy súborov:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nový", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "O&dstrániť", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "O&dstrániť", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Zmeniť...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Zmeniť...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index b51330b7b8..9520ab1ec1 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 2b886ebc4f..bf4e9030cd 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -456,7 +456,7 @@ CAPTION "Tipe Dokumenti" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detaje për '%s' zgjerim", 14003, 7, 130, 249, 70 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e10e28aa4f..c0ab9760cb 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -452,7 +452,7 @@ CAPTION "Filtyper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrerade fil&typer:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Ta bort", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detaljer för filändelsen '%s'", 14003, 7, 130, 249, 70 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index e4edafe2d1..eceecef021 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -454,16 +454,16 @@ CAPTION "Kütük Türleri" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Kayıtlı Kütük Türleri:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Yeni", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Sil", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX """%s"" Uzantısı İçin Ayrıntılar", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Yeni", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Sil", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX """%s"" Uzantısı İçin Ayrıntılar", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Birlikte Açılır:", -1, 12, 140, 40, 10 //ICON - LTEXT "Uygulama Adı", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Değiştir...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Gelişmiş", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Uygulama Adı", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Değiştir...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Gelişmiş", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 142e75f235..01763d8758 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -452,16 +452,16 @@ CAPTION "Типи файлів" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Зареєстровані &типи файлів:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Створити", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "В&идалити", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Подробиці для розширення '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Створити", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "В&идалити", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Подробиці для розширення '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Відкривати у:", -1, 12, 140, 48, 10 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Додаток", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Змінити...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 40 - PUSHBUTTON "&Додатково", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Додаток", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Змінити...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 40 + PUSHBUTTON "&Додатково", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index e298c62759..7671975ae5 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -462,16 +462,16 @@ CAPTION "文件类型" FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "已注册的文件类型(&T):", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "新建(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "删除(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "'%S' 扩展的详细信息", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "新建(&N)", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "删除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "'%S' 扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "打开方式:", -1, 12, 140, 40, 10 //ICON - LTEXT "应用程序名称", 14005, 100, 140, 40, 10 - PUSHBUTTON "更改...(&C)", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "高级(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "应用程序名称", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "更改...(&C)", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "高级(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index db828af75c..b0ee067e9d 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -460,16 +460,16 @@ CAPTION "File Types" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 8d5cf11293..7bbd3b262f 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -338,6 +338,16 @@ #define IDC_BROWSE_FOR_FOLDER_TITLE 0x3742 #define IDC_BROWSE_FOR_FOLDER_TREEVIEW 0x3741 +/* Control IDs for IDD_FOLDER_OPTIONS_FILETYPES dialog */ +#define IDC_FILETYPES_LISTVIEW 14000 +#define IDC_FILETYPES_NEW 14001 +#define IDC_FILETYPES_DELETE 14002 +#define IDC_FILETYPES_DETAILS_GROUPBOX 14003 +#define IDC_FILETYPES_APPNAME 14005 +#define IDC_FILETYPES_CHANGE 14006 +#define IDC_FILETYPES_DESCRIPTION 14007 +#define IDC_FILETYPES_ADVANCED 14008 + /* Other dialogs */ #define IDD_RUN_AS 23 #define IDD_OPEN_WITH 24

1 0

04/04: [LDR] Initial verifier implementation
by Mark Jansen 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60a1006d0f8a0bb658c78… commit 60a1006d0f8a0bb658c7881e48fc5ee8165a2c0c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 27 22:43:45 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:35:10 2018 +0200 [LDR] Initial verifier implementation --- dll/ntdll/CMakeLists.txt | 1 + dll/ntdll/include/ntdllp.h | 21 ++ dll/ntdll/ldr/ldrapi.c | 2 +- dll/ntdll/ldr/ldrinit.c | 34 +-- dll/ntdll/ldr/ldrpe.c | 16 +- dll/ntdll/ldr/verifier.c | 685 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 719 insertions(+), 40 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index aefdaf5c40..e94db5c77a 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -19,6 +19,7 @@ list(APPEND SOURCE ldr/ldrinit.c ldr/ldrpe.c ldr/ldrutils.c + ldr/verifier.c rtl/libsupp.c rtl/uilist.c rtl/version.c diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 4d6086730e..29ade67b45 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -46,6 +46,7 @@ extern ULONG LdrpActiveUnloadCount; extern BOOLEAN LdrpShutdownInProgress; extern UNICODE_STRING LdrpKnownDllPath; extern PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache, LdrpLoadedDllHandleCache; +extern BOOLEAN RtlpPageHeapEnabled; extern ULONG RtlpDphGlobalFlags; extern BOOLEAN g_ShimsEnabled; extern PVOID g_pShimEngineModule; @@ -158,6 +159,26 @@ LdrpLoadShimEngine(IN PWSTR ImageName, VOID NTAPI LdrpUnloadShimEngine(VOID); +/* verifier.c */ + +NTSTATUS NTAPI +LdrpInitializeApplicationVerifierPackage(IN HANDLE KeyHandle, + IN PPEB Peb, + IN BOOLEAN SystemWide, + IN BOOLEAN ReadAdvancedOptions); + +NTSTATUS NTAPI +AVrfInitializeVerifier(VOID); + +VOID NTAPI +AVrfDllLoadNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry); + +VOID NTAPI +AVrfDllUnloadNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry); + +VOID NTAPI +AVrfPageHeapDllNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry); + /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index c33b21eff1..2f8cc68340 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1503,7 +1503,7 @@ LdrUnloadDll(IN PVOID BaseAddress) /* Notify Application Verifier */ if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAIL_CHECK) { - DPRINT1("We don't support Application Verifier yet\n"); + AVrfDllUnloadNotification(LdrEntry); } /* Show message */ diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index a5655eca41..902a797d15 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -82,7 +82,6 @@ ULONG LdrpActiveUnloadCount; VOID NTAPI RtlpInitializeVectoredExceptionHandling(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID); VOID NTAPI RtlInitializeHeapManager(VOID); -extern BOOLEAN RtlpPageHeapEnabled; ULONG RtlpDisableHeapLookaside; // TODO: Move to heap.c ULONG RtlpShutdownProcessFlags; // TODO: Use it @@ -1311,26 +1310,6 @@ LdrpFreeTls(VOID) TlsVector); } -NTSTATUS -NTAPI -LdrpInitializeApplicationVerifierPackage(PUNICODE_STRING ImagePathName, PPEB Peb, BOOLEAN SystemWide, BOOLEAN ReadAdvancedOptions) -{ - /* If global flags request DPH, perform some additional actions */ - if (Peb->NtGlobalFlag & FLG_HEAP_PAGE_ALLOCS) - { - // TODO: Read advanced DPH flags from the registry if requested - if (ReadAdvancedOptions) - { - UNIMPLEMENTED; - } - - /* Enable page heap */ - RtlpPageHeapEnabled = TRUE; - } - - return STATUS_SUCCESS; -} - NTSTATUS NTAPI LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE OptionsKey) @@ -1426,7 +1405,7 @@ LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE /* Call AVRF if necessary */ if (Peb->NtGlobalFlag & (FLG_APPLICATION_VERIFIER | FLG_HEAP_PAGE_ALLOCS)) { - Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, TRUE, FALSE); + Status = LdrpInitializeApplicationVerifierPackage(KeyHandle, Peb, TRUE, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("AVRF: LdrpInitializeApplicationVerifierPackage failed with %08X\n", Status); @@ -1439,7 +1418,7 @@ LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE if (Peb->NtGlobalFlag & (FLG_APPLICATION_VERIFIER | FLG_HEAP_PAGE_ALLOCS)) { /* Initialize app verifier package */ - Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, TRUE, FALSE); + Status = LdrpInitializeApplicationVerifierPackage(KeyHandle, Peb, TRUE, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("AVRF: LdrpInitializeApplicationVerifierPackage failed with %08X\n", Status); @@ -2057,8 +2036,13 @@ LdrpInitializeProcess(IN PCONTEXT Context, /* Check if the Application Verifier was enabled */ if (Peb->NtGlobalFlag & FLG_APPLICATION_VERIFIER) { - /* FIXME */ - DPRINT1("We don't support Application Verifier yet\n"); + Status = AVrfInitializeVerifier(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: AVrfInitializeVerifier failed (ntstatus 0x%x)\n", Status); + return Status; + } + } if (IsDotNetImage) diff --git a/dll/ntdll/ldr/ldrpe.c b/dll/ntdll/ldr/ldrpe.c index fb217ed686..598e3e5477 100644 --- a/dll/ntdll/ldr/ldrpe.c +++ b/dll/ntdll/ldr/ldrpe.c @@ -20,17 +20,6 @@ ULONG LdrpNormalSnap; /* FUNCTIONS *****************************************************************/ -VOID -NTAPI -AVrfPageHeapDllNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry) -{ - /* Check if page heap dll notification is turned on */ - if (!(RtlpDphGlobalFlags & DPH_FLAG_DLL_NOTIFY)) - return; - - /* We don't support this flag currently */ - UNIMPLEMENTED; -} NTSTATUS NTAPI @@ -795,10 +784,9 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, } /* Check if Application Verifier was enabled */ - if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAIL_CHECK) + if (Peb->NtGlobalFlag & FLG_APPLICATION_VERIFIER) { - /* FIXME */ - DPRINT1("We don't support Application Verifier yet!\n"); + AVrfDllLoadNotification(LdrEntry); } /* Just to be safe */ diff --git a/dll/ntdll/ldr/verifier.c b/dll/ntdll/ldr/verifier.c new file mode 100644 index 0000000000..6a44572a19 --- /dev/null +++ b/dll/ntdll/ldr/verifier.c @@ -0,0 +1,685 @@ +/* + * PROJECT: ReactOS NT User Mode Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Verifier support routines + * COPYRIGHT: Copyright 2011 Aleksey Bragin (aleksey(a)reactos.org) + * Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + + +#include <ntdll.h> +#include <reactos/verifier.h> + +#define NDEBUG +#include <debug.h> + +extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry; +ULONG AVrfpVerifierFlags = 0; +WCHAR AVrfpVerifierDllsString[256] = { 0 }; +ULONG AVrfpDebug = 0; +BOOL AVrfpInitialized = FALSE; +RTL_CRITICAL_SECTION AVrfpVerifierLock; +LIST_ENTRY AVrfpVerifierProvidersList; + +#define VERIFIER_DLL_FLAGS_RESOLVED 1 + + +typedef struct _VERIFIER_PROVIDER +{ + LIST_ENTRY ListEntry; + UNICODE_STRING DllName; + PVOID BaseAddress; + PVOID EntryPoint; + + // Provider data + PRTL_VERIFIER_DLL_DESCRIPTOR ProviderDlls; + RTL_VERIFIER_DLL_LOAD_CALLBACK ProviderDllLoadCallback; + RTL_VERIFIER_DLL_UNLOAD_CALLBACK ProviderDllUnloadCallback; + RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK ProviderNtdllHeapFreeCallback; +} VERIFIER_PROVIDER, *PVERIFIER_PROVIDER; + + + + +VOID +NTAPI +AVrfReadIFEO(HANDLE KeyHandle) +{ + NTSTATUS Status; + + Status = LdrQueryImageFileKeyOption(KeyHandle, + L"VerifierDlls", + REG_SZ, + AVrfpVerifierDllsString, + sizeof(AVrfpVerifierDllsString) - sizeof(WCHAR), + NULL); + + if (!NT_SUCCESS(Status)) + AVrfpVerifierDllsString[0] = UNICODE_NULL; + + Status = LdrQueryImageFileKeyOption(KeyHandle, + L"VerifierFlags", + REG_DWORD, + &AVrfpVerifierFlags, + sizeof(AVrfpVerifierFlags), + NULL); + if (!NT_SUCCESS(Status)) + AVrfpVerifierFlags = RTL_VRF_FLG_HANDLE_CHECKS | RTL_VRF_FLG_FAST_FILL_HEAP | RTL_VRF_FLG_LOCK_CHECKS; + + Status = LdrQueryImageFileKeyOption(KeyHandle, + L"VerifierDebug", + REG_DWORD, + &AVrfpDebug, + sizeof(AVrfpDebug), + NULL); + if (!NT_SUCCESS(Status)) + AVrfpDebug = 0; +} + + +NTSTATUS +NTAPI +LdrpInitializeApplicationVerifierPackage(HANDLE KeyHandle, PPEB Peb, BOOLEAN SystemWide, BOOLEAN ReadAdvancedOptions) +{ + /* If global flags request DPH, perform some additional actions */ + if (Peb->NtGlobalFlag & FLG_HEAP_PAGE_ALLOCS) + { + // TODO: Read advanced DPH flags from the registry if requested + if (ReadAdvancedOptions) + { + UNIMPLEMENTED; + } + + /* Enable page heap */ + RtlpPageHeapEnabled = TRUE; + } + + AVrfReadIFEO(KeyHandle); + + return STATUS_SUCCESS; +} + +BOOLEAN +AVrfpIsVerifierProviderDll(PVOID BaseAddress) +{ + PLIST_ENTRY Entry; + PVERIFIER_PROVIDER Provider; + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + if (BaseAddress == Provider->BaseAddress) + return TRUE; + } + + return FALSE; +} + +SIZE_T +AVrfpCountThunks(PIMAGE_THUNK_DATA Thunk) +{ + SIZE_T Count = 0; + while (Thunk[Count].u1.Function) + Count++; + return Count; +} + +VOID +AVrfpSnapDllImports(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + ULONG Size; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; + PBYTE DllBase = LdrEntry->DllBase; + + ImportDescriptor = RtlImageDirectoryEntryToData(DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); + if (!ImportDescriptor) + { + //SHIMENG_INFO("Skipping module 0x%p \"%wZ\" due to no iat found\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + return; + } + + for (; ImportDescriptor->Name && ImportDescriptor->OriginalFirstThunk; ImportDescriptor++) + { + PIMAGE_THUNK_DATA FirstThunk; + PVOID UnprotectedPtr = NULL; + SIZE_T UnprotectedSize = 0; + ULONG OldProtection = 0; + FirstThunk = (PIMAGE_THUNK_DATA)(DllBase + ImportDescriptor->FirstThunk); + + /* Walk all imports */ + for (;FirstThunk->u1.Function; FirstThunk++) + { + PLIST_ENTRY Entry; + PVERIFIER_PROVIDER Provider; + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + PRTL_VERIFIER_DLL_DESCRIPTOR DllDescriptor; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + for (DllDescriptor = Provider->ProviderDlls; DllDescriptor && DllDescriptor->DllName; ++DllDescriptor) + { + PRTL_VERIFIER_THUNK_DESCRIPTOR ThunkDescriptor; + + for (ThunkDescriptor = DllDescriptor->DllThunks; ThunkDescriptor && ThunkDescriptor->ThunkName; ++ThunkDescriptor) + { + /* Just compare function addresses, the loader will have handled forwarders and ordinals for us */ + if ((PVOID)FirstThunk->u1.Function != ThunkDescriptor->ThunkOldAddress) + continue; + + if (!UnprotectedPtr) + { + PVOID Ptr = &FirstThunk->u1.Function; + SIZE_T Size = sizeof(FirstThunk->u1.Function) * AVrfpCountThunks(FirstThunk); + NTSTATUS Status; + + UnprotectedPtr = Ptr; + UnprotectedSize = Size; + + Status = NtProtectVirtualMemory(NtCurrentProcess(), + &Ptr, + &Size, + PAGE_EXECUTE_READWRITE, + &OldProtection); + + if (!NT_SUCCESS(Status)) + { + DbgPrint("AVRF: Unable to unprotect IAT to modify thunks (status %08X).\n", Status); + UnprotectedPtr = NULL; + continue; + } + } + + if (ThunkDescriptor->ThunkNewAddress == NULL) + { + DbgPrint("AVRF: internal error: New thunk for %s is null.\n", ThunkDescriptor->ThunkName); + continue; + } + FirstThunk->u1.Function = (SIZE_T)ThunkDescriptor->ThunkNewAddress; + if (AVrfpDebug & RTL_VRF_DBG_SHOWSNAPS) + DbgPrint("AVRF: Snapped (%wZ: %s) with (%wZ: %p).\n", + &LdrEntry->BaseDllName, + ThunkDescriptor->ThunkName, + &Provider->DllName, + ThunkDescriptor->ThunkNewAddress); + } + } + } + } + + if (UnprotectedPtr) + { + PVOID Ptr = UnprotectedPtr; + SIZE_T Size = UnprotectedSize; + NTSTATUS Status; + + UnprotectedPtr = Ptr; + UnprotectedSize = Size; + + Status = NtProtectVirtualMemory(NtCurrentProcess(), + &Ptr, + &Size, + OldProtection, + &OldProtection); + if (!NT_SUCCESS(Status)) + { + DbgPrint("AVRF: Unable to reprotect IAT to modify thunks (status %08X).\n", Status); + } + } + } +} + + +VOID +AvrfpResolveThunks(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PLIST_ENTRY Entry; + PVERIFIER_PROVIDER Provider; + + if (!AVrfpInitialized) + return; + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + PRTL_VERIFIER_DLL_DESCRIPTOR DllDescriptor; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + for (DllDescriptor = Provider->ProviderDlls; DllDescriptor && DllDescriptor->DllName; ++DllDescriptor) + { + PRTL_VERIFIER_THUNK_DESCRIPTOR ThunkDescriptor; + + if ((DllDescriptor->DllFlags & VERIFIER_DLL_FLAGS_RESOLVED) || + _wcsicmp(DllDescriptor->DllName, LdrEntry->BaseDllName.Buffer)) + continue; + + if (AVrfpDebug & RTL_VRF_DBG_SHOWVERIFIEDEXPORTS) + DbgPrint("AVRF: pid 0x%X: found dll descriptor for `%wZ' with verified exports\n", + NtCurrentTeb()->ClientId.UniqueProcess, + &LdrEntry->BaseDllName); + + for (ThunkDescriptor = DllDescriptor->DllThunks; ThunkDescriptor && ThunkDescriptor->ThunkName; ++ThunkDescriptor) + { + if (!ThunkDescriptor->ThunkOldAddress) + { + ANSI_STRING ThunkName; + + RtlInitAnsiString(&ThunkName, ThunkDescriptor->ThunkName); + /* We cannot call the public api, because that would run init routines! */ + if (NT_SUCCESS(LdrpGetProcedureAddress(LdrEntry->DllBase, &ThunkName, 0, &ThunkDescriptor->ThunkOldAddress, FALSE))) + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWFOUNDEXPORTS) + DbgPrint("AVRF: (%wZ) %Z export found.\n", &LdrEntry->BaseDllName, &ThunkName); + } + else + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWFOUNDEXPORTS) + DbgPrint("AVRF: warning: did not find `%Z' export in %wZ.\n", &ThunkName, &LdrEntry->BaseDllName); + } + } + } + + DllDescriptor->DllFlags |= VERIFIER_DLL_FLAGS_RESOLVED; + } + } + + AVrfpSnapDllImports(LdrEntry); +} + + + +VOID +NTAPI +AVrfDllLoadNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PLIST_ENTRY Entry; + + if (!(NtCurrentPeb()->NtGlobalFlag & FLG_APPLICATION_VERIFIER)) + return; + + RtlEnterCriticalSection(&AVrfpVerifierLock); + if (!AVrfpIsVerifierProviderDll(LdrEntry->DllBase)) + { + AvrfpResolveThunks(LdrEntry); + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + PVERIFIER_PROVIDER Provider; + RTL_VERIFIER_DLL_LOAD_CALLBACK ProviderDllLoadCallback; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + ProviderDllLoadCallback = Provider->ProviderDllLoadCallback; + if (ProviderDllLoadCallback) + { + ProviderDllLoadCallback(LdrEntry->BaseDllName.Buffer, + LdrEntry->DllBase, + LdrEntry->SizeOfImage, + LdrEntry); + } + } + } + RtlLeaveCriticalSection(&AVrfpVerifierLock); +} + +VOID +NTAPI +AVrfDllUnloadNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PLIST_ENTRY Entry; + + if (!(NtCurrentPeb()->NtGlobalFlag & FLG_APPLICATION_VERIFIER)) + return; + + RtlEnterCriticalSection(&AVrfpVerifierLock); + if (!AVrfpIsVerifierProviderDll(LdrEntry->DllBase)) + { + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + PVERIFIER_PROVIDER Provider; + RTL_VERIFIER_DLL_UNLOAD_CALLBACK ProviderDllUnloadCallback; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + ProviderDllUnloadCallback = Provider->ProviderDllUnloadCallback; + if (ProviderDllUnloadCallback) + { + ProviderDllUnloadCallback(LdrEntry->BaseDllName.Buffer, + LdrEntry->DllBase, + LdrEntry->SizeOfImage, + LdrEntry); + } + } + } + RtlLeaveCriticalSection(&AVrfpVerifierLock); +} + + +VOID +NTAPI +AVrfPageHeapDllNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + /* Check if page heap dll notification is turned on */ + if (!(RtlpDphGlobalFlags & DPH_FLAG_DLL_NOTIFY)) + return; + + /* We don't support this flag currently */ + UNIMPLEMENTED; +} + + +VOID +NTAPI +AVrfpResnapInitialModules(VOID) +{ + PLIST_ENTRY ListHead, ListEntry; + + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + for (ListEntry = ListHead->Flink; ListHead != ListEntry; ListEntry = ListEntry->Flink) + { + PLDR_DATA_TABLE_ENTRY LdrEntry; + + LdrEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + if (AVrfpIsVerifierProviderDll(LdrEntry->DllBase)) + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWSNAPS) + DbgPrint("AVRF: skipped resnapping provider %wZ ...\n", &LdrEntry->BaseDllName); + } + else + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWSNAPS) + DbgPrint("AVRF: resnapping %wZ ...\n", &LdrEntry->BaseDllName); + + AvrfpResolveThunks(LdrEntry); + } + } +} + +PVOID +NTAPI +AvrfpFindDuplicateThunk(PLIST_ENTRY EndEntry, PWCHAR DllName, PCHAR ThunkName) +{ + PLIST_ENTRY Entry; + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != EndEntry; Entry = Entry->Flink) + { + PVERIFIER_PROVIDER Provider; + PRTL_VERIFIER_DLL_DESCRIPTOR DllDescriptor; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING_DEBUG) + DbgPrint("AVRF: chain: searching in %wZ\n", &Provider->DllName); + + for (DllDescriptor = Provider->ProviderDlls; DllDescriptor && DllDescriptor->DllName; ++DllDescriptor) + { + PRTL_VERIFIER_THUNK_DESCRIPTOR ThunkDescriptor; + + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING_DEBUG) + DbgPrint("AVRF: chain: dll: %ws\n", DllDescriptor->DllName); + + if (_wcsicmp(DllDescriptor->DllName, DllName)) + continue; + + for (ThunkDescriptor = DllDescriptor->DllThunks; ThunkDescriptor && ThunkDescriptor->ThunkName; ++ThunkDescriptor) + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING_DEBUG) + DbgPrint("AVRF: chain: thunk: %s == %s ?\n", ThunkDescriptor->ThunkName, ThunkName); + + if (!_stricmp(ThunkDescriptor->ThunkName, ThunkName)) + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING_DEBUG) + DbgPrint("AVRF: Found duplicate for (%ws: %s) in %wZ\n", + DllDescriptor->DllName, ThunkDescriptor->ThunkName, &Provider->DllName); + + return ThunkDescriptor->ThunkNewAddress; + } + } + } + } + return NULL; +} + + +VOID +NTAPI +AVrfpChainDuplicateThunks(VOID) +{ + PLIST_ENTRY Entry; + PVERIFIER_PROVIDER Provider; + + for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink) + { + PRTL_VERIFIER_DLL_DESCRIPTOR DllDescriptor; + PRTL_VERIFIER_THUNK_DESCRIPTOR ThunkDescriptor; + + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + + for (DllDescriptor = Provider->ProviderDlls; DllDescriptor && DllDescriptor->DllName; ++DllDescriptor) + { + for (ThunkDescriptor = DllDescriptor->DllThunks; ThunkDescriptor && ThunkDescriptor->ThunkName; ++ThunkDescriptor) + { + PVOID Ptr; + + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING_DEBUG) + DbgPrint("AVRF: Checking %wZ for duplicate (%ws: %s)\n", + &Provider->DllName, DllDescriptor->DllName, ThunkDescriptor->ThunkName); + + Ptr = AvrfpFindDuplicateThunk(Entry, DllDescriptor->DllName, ThunkDescriptor->ThunkName); + if (Ptr) + { + if (AVrfpDebug & RTL_VRF_DBG_SHOWCHAINING) + DbgPrint("AVRF: Chaining (%ws: %s) to %wZ\n", DllDescriptor->DllName, ThunkDescriptor->ThunkName, &Provider->DllName); + + ThunkDescriptor->ThunkOldAddress = Ptr; + } + } + } + } +} + +NTSTATUS +NTAPI +AVrfpLoadAndInitializeProvider(PVERIFIER_PROVIDER Provider) +{ + WCHAR StringBuffer[MAX_PATH + 11]; + UNICODE_STRING DllPath; + PRTL_VERIFIER_PROVIDER_DESCRIPTOR Descriptor; + PIMAGE_NT_HEADERS ImageNtHeader; + NTSTATUS Status; + + RtlInitEmptyUnicodeString(&DllPath, StringBuffer, sizeof(StringBuffer)); + RtlAppendUnicodeToString(&DllPath, SharedUserData->NtSystemRoot); + RtlAppendUnicodeToString(&DllPath, L"\\System32\\"); + + if (AVrfpDebug & RTL_VRF_DBG_SHOWSNAPS) + DbgPrint("AVRF: verifier dll `%wZ'\n", &Provider->DllName); + + Status = LdrLoadDll(DllPath.Buffer, NULL, &Provider->DllName, &Provider->BaseAddress); + if (!NT_SUCCESS(Status)) + { + DbgPrint("AVRF: %wZ: failed to load provider `%wZ' (status %08X) from %wZ\n", + &LdrpImageEntry->BaseDllName, + &Provider->DllName, + Status, + &DllPath); + return Status; + } + + /* Prevent someone funny from specifying his own application as provider */ + ImageNtHeader = RtlImageNtHeader(Provider->BaseAddress); + if (!ImageNtHeader || + !(ImageNtHeader->FileHeader.Characteristics & IMAGE_FILE_DLL)) + { + DbgPrint("AVRF: provider %wZ is not a DLL image\n", &Provider->DllName); + return STATUS_DLL_INIT_FAILED; + } + + Provider->EntryPoint = LdrpFetchAddressOfEntryPoint(Provider->BaseAddress); + if (!Provider->EntryPoint) + { + DbgPrint("AVRF: cannot find an entry point for provider %wZ\n", &Provider->DllName); + return STATUS_PROCEDURE_NOT_FOUND; + } + + _SEH2_TRY + { + if (LdrpCallInitRoutine(Provider->EntryPoint, + Provider->BaseAddress, + DLL_PROCESS_VERIFIER, + &Descriptor)) + { + if (Descriptor && Descriptor->Length == sizeof(RTL_VERIFIER_PROVIDER_DESCRIPTOR)) + { + /* Copy the data */ + Provider->ProviderDlls = Descriptor->ProviderDlls; + Provider->ProviderDllLoadCallback = Descriptor->ProviderDllLoadCallback; + Provider->ProviderDllUnloadCallback = Descriptor->ProviderDllUnloadCallback; + Provider->ProviderNtdllHeapFreeCallback = Descriptor->ProviderNtdllHeapFreeCallback; + + /* Update some info for the provider */ + Descriptor->VerifierImage = LdrpImageEntry->BaseDllName.Buffer; + Descriptor->VerifierFlags = AVrfpVerifierFlags; + Descriptor->VerifierDebug = AVrfpDebug; + + /* We don't have these yet */ + DPRINT1("AVRF: RtlpGetStackTraceAddress MISSING\n"); + DPRINT1("AVRF: RtlpDebugPageHeapCreate MISSING\n"); + DPRINT1("AVRF: RtlpDebugPageHeapDestroy MISSING\n"); + Descriptor->RtlpGetStackTraceAddress = NULL; + Descriptor->RtlpDebugPageHeapCreate = NULL; + Descriptor->RtlpDebugPageHeapDestroy = NULL; + Status = STATUS_SUCCESS; + } + else + { + DbgPrint("AVRF: provider %wZ passed an invalid descriptor @ %p\n", &Provider->DllName, Descriptor); + Status = STATUS_INVALID_PARAMETER_4; + } + } + else + { + DbgPrint("AVRF: provider %wZ did not initialize correctly\n", &Provider->DllName); + Status = STATUS_DLL_INIT_FAILED; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + return Status; + + + if (AVrfpDebug & RTL_VRF_DBG_LISTPROVIDERS) + DbgPrint("AVRF: initialized provider %wZ (descriptor @ %p)\n", &Provider->DllName, Descriptor); + + /* Done loading providers, allow dll notifications */ + AVrfpInitialized = TRUE; + + AVrfpChainDuplicateThunks(); + AVrfpResnapInitialModules(); + + /* Manually call with DLL_PROCESS_ATTACH, since the process is not done initializing */ + _SEH2_TRY + { + if (!LdrpCallInitRoutine(Provider->EntryPoint, + Provider->BaseAddress, + DLL_PROCESS_ATTACH, + NULL)) + { + DbgPrint("AVRF: provider %wZ did not initialize correctly\n", &Provider->DllName); + Status = STATUS_DLL_INIT_FAILED; + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; +} + + +NTSTATUS +NTAPI +AVrfInitializeVerifier(VOID) +{ + NTSTATUS Status; + PVERIFIER_PROVIDER Provider; + PLIST_ENTRY Entry; + WCHAR* Ptr, *Next; + + Status = RtlInitializeCriticalSection(&AVrfpVerifierLock); + InitializeListHead(&AVrfpVerifierProvidersList); + + if (!NT_SUCCESS(Status)) + return Status; + + DbgPrint("AVRF: %wZ: pid 0x%X: flags 0x%X: application verifier enabled\n", + &LdrpImageEntry->BaseDllName, NtCurrentTeb()->ClientId.UniqueProcess, AVrfpVerifierFlags); + + Provider = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VERIFIER_PROVIDER)); + if (!Provider) + return STATUS_NO_MEMORY; + + RtlInitUnicodeString(&Provider->DllName, L"verifier.dll"); + InsertTailList(&AVrfpVerifierProvidersList, &Provider->ListEntry); + + Next = AVrfpVerifierDllsString; + + do + { + while (*Next == L' ' || *Next == L'\t') + Next++; + + Ptr = Next; + + while (*Next != ' ' && *Next != '\t' && *Next) + Next++; + + if (*Next) + *(Next++) = '\0'; + else + Next = NULL; + + if (*Ptr) + { + Provider = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VERIFIER_PROVIDER)); + if (!Provider) + return STATUS_NO_MEMORY; + RtlInitUnicodeString(&Provider->DllName, Ptr); + InsertTailList(&AVrfpVerifierProvidersList, &Provider->ListEntry); + } + } while (Next); + + Entry = AVrfpVerifierProvidersList.Flink; + while (Entry != &AVrfpVerifierProvidersList) + { + Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry); + Entry = Entry->Flink; + + Status = AVrfpLoadAndInitializeProvider(Provider); + if (!NT_SUCCESS(Status)) + { + RemoveEntryList(&Provider->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, Provider); + } + } + + if (!NT_SUCCESS(Status)) + { + DbgPrint("AVRF: %wZ: pid 0x%X: application verifier will be disabled due to an initialization error.\n", + &LdrpImageEntry->BaseDllName, NtCurrentTeb()->ClientId.UniqueProcess); + NtCurrentPeb()->NtGlobalFlag &= ~FLG_APPLICATION_VERIFIER; + } + + return Status; +} +

1 0

03/04: [VERIFIER] Add skeleton provider.
by Mark Jansen 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad8a2edd850c507338e9f… commit ad8a2edd850c507338e9fe9ef186a83a81d14a44 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 27 00:05:21 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:35:09 2018 +0200 [VERIFIER] Add skeleton provider. --- dll/win32/CMakeLists.txt | 1 + dll/win32/verifier/CMakeLists.txt | 12 +++ dll/win32/verifier/verifier.c | 165 ++++++++++++++++++++++++++++++ dll/win32/verifier/verifier.spec | 19 ++++ dll/win32/verifier/verifier_customstubs.c | 143 ++++++++++++++++++++++++++ 5 files changed, 340 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index e4639acf65..9906d76c9c 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -222,6 +222,7 @@ add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) add_subdirectory(vbscript) +add_subdirectory(verifier) add_subdirectory(version) add_subdirectory(vssapi) add_subdirectory(wbemdisp) diff --git a/dll/win32/verifier/CMakeLists.txt b/dll/win32/verifier/CMakeLists.txt new file mode 100644 index 0000000000..d41a850cdb --- /dev/null +++ b/dll/win32/verifier/CMakeLists.txt @@ -0,0 +1,12 @@ + +spec2def(verifier.dll verifier.spec) + +list(APPEND SOURCE + verifier.c + verifier_customstubs.c + ${CMAKE_CURRENT_BINARY_DIR}/verifier.def) + +add_library(verifier SHARED ${SOURCE}) +set_module_type(verifier win32dll UNICODE ENTRYPOINT DllMain 12) +add_importlibs(verifier ntdll) +add_cd_file(TARGET verifier DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/verifier/verifier.c b/dll/win32/verifier/verifier.c new file mode 100644 index 0000000000..5c24bd5104 --- /dev/null +++ b/dll/win32/verifier/verifier.c @@ -0,0 +1,165 @@ +/* + * PROJECT: Application verifier + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main entrypoint + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <ndk/rtlfuncs.h> +#include <reactos/verifier.h> + +#if 0 +#define PROVIDER_PREFIX "AVRF" +#else +#define PROVIDER_PREFIX "RVRF" +#endif + + +VOID NTAPI AVrfpDllLoadCallback(PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved); +VOID NTAPI AVrfpDllUnloadCallback(PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved); +VOID NTAPI AVrfpNtdllHeapFreeCallback(PVOID AllocationBase, SIZE_T AllocationSize); + +// DPFLTR_VERIFIER_ID + + +NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress); + +static RTL_VERIFIER_THUNK_DESCRIPTOR AVrfpNtdllThunks[] = +{ + { "LdrGetProcedureAddress", NULL, AVrfpLdrGetProcedureAddress }, + { NULL } +}; + +FARPROC WINAPI AVrfpGetProcAddress(IN HMODULE hModule, IN LPCSTR lpProcName); + +static RTL_VERIFIER_THUNK_DESCRIPTOR AVrfpKernel32Thunks[] = +{ + { "GetProcAddress", NULL, AVrfpGetProcAddress }, + { NULL } +}; + +static RTL_VERIFIER_DLL_DESCRIPTOR AVrfpDllDescriptors[] = +{ + { L"ntdll.dll", 0, NULL, AVrfpNtdllThunks }, + { L"kernel32.dll", 0, NULL, AVrfpKernel32Thunks }, + { NULL } +}; + +RTL_VERIFIER_PROVIDER_DESCRIPTOR AVrfpProvider = +{ + /*.Length =*/ sizeof(AVrfpProvider), + /*.ProviderDlls =*/ AVrfpDllDescriptors, + /*.ProviderDllLoadCallback =*/ AVrfpDllLoadCallback, + /*.ProviderDllUnloadCallback =*/ AVrfpDllUnloadCallback, + /*.VerifierImage =*/ NULL, + /*.VerifierFlags =*/ 0, + /*.VerifierDebug =*/ 0, + /*.RtlpGetStackTraceAddress =*/ NULL, + /*.RtlpDebugPageHeapCreate =*/ NULL, + /*.RtlpDebugPageHeapDestroy =*/ NULL, + /*.ProviderNtdllHeapFreeCallback =*/ AVrfpNtdllHeapFreeCallback +}; + + + +BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_PROCESS_DETACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + break; + case DLL_PROCESS_VERIFIER: + *(PRTL_VERIFIER_PROVIDER_DESCRIPTOR*)lpReserved = &AVrfpProvider; + break; + } + return TRUE; +} + +VOID NTAPI AVrfpDllLoadCallback(PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry = (PLDR_DATA_TABLE_ENTRY)Reserved; + DbgPrint(PROVIDER_PREFIX ": %ws @ %p: ep: %p\n", DllName, DllBase, LdrEntry->EntryPoint); + /* TODO: Hook entrypoint */ +} + + +VOID NTAPI AVrfpDllUnloadCallback(PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved) +{ + DbgPrint(PROVIDER_PREFIX ": unloading %ws\n", DllName); +} + +VOID NTAPI AVrfpNtdllHeapFreeCallback(PVOID AllocationBase, SIZE_T AllocationSize) +{ + DbgPrint(PROVIDER_PREFIX ": Heap free 0x%x @ %p\n", AllocationSize, AllocationBase); + /* TODO: Sanity checks */ +} + +PVOID AVrfpFindReplacementThunk(PVOID Proc) +{ + PRTL_VERIFIER_DLL_DESCRIPTOR DllDescriptor; + PRTL_VERIFIER_THUNK_DESCRIPTOR ThunkDescriptor; + + for (DllDescriptor = AVrfpDllDescriptors; DllDescriptor->DllName; ++DllDescriptor) + { + for (ThunkDescriptor = DllDescriptor->DllThunks; ThunkDescriptor->ThunkName; ++ThunkDescriptor) + { + if (ThunkDescriptor->ThunkOldAddress == Proc) + { + return ThunkDescriptor->ThunkNewAddress; + } + } + } + return Proc; +} + + +NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress) +{ + NTSTATUS (NTAPI *oLdrGetProcedureAddress)(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress); + NTSTATUS Status; + PVOID Replacement; + + oLdrGetProcedureAddress = AVrfpNtdllThunks[0].ThunkOldAddress; + + Status = oLdrGetProcedureAddress(BaseAddress, Name, Ordinal, ProcedureAddress); + if (!NT_SUCCESS(Status)) + return Status; + + Replacement = AVrfpFindReplacementThunk(*ProcedureAddress); + if (Replacement != *ProcedureAddress) + { + *ProcedureAddress = Replacement; + if (AVrfpProvider.VerifierDebug & RTL_VRF_DBG_VERIFIER_SHOWDYNTHUNKS) + DbgPrint(PROVIDER_PREFIX ": AVrfpLdrGetProcedureAddress (%p, %Z) -> thunk address %p\n", BaseAddress, Name, *ProcedureAddress); + } + + return Status; +} + +FARPROC WINAPI AVrfpGetProcAddress(IN HMODULE hModule, IN LPCSTR lpProcName) +{ + FARPROC (WINAPI* oGetProcAddress)(IN HMODULE hModule, IN LPCSTR lpProcName); + FARPROC Proc, Replacement; + + if (AVrfpProvider.VerifierDebug & RTL_VRF_DBG_VERIFIER_LOGCALLS) + DbgPrint(PROVIDER_PREFIX ": AVrfpGetProcAddress (%p, %s)\n", hModule, lpProcName); + + oGetProcAddress = AVrfpKernel32Thunks[0].ThunkOldAddress; + Proc = oGetProcAddress(hModule, lpProcName); + if (!Proc) + return Proc; + + Replacement = AVrfpFindReplacementThunk(Proc); + if (Replacement != Proc) + { + Proc = Replacement; + if (AVrfpProvider.VerifierDebug & RTL_VRF_DBG_VERIFIER_SHOWDYNTHUNKS) + DbgPrint(PROVIDER_PREFIX ": AVrfpGetProcAddress (%p, %s) -> thunk address %p\n", hModule, lpProcName, Proc); + } + + return Proc; +} + diff --git a/dll/win32/verifier/verifier.spec b/dll/win32/verifier/verifier.spec new file mode 100644 index 0000000000..03d81b8b69 --- /dev/null +++ b/dll/win32/verifier/verifier.spec @@ -0,0 +1,19 @@ +# Do not add stubs here! + +@ stdcall VerifierAddFreeMemoryCallback(ptr) # stub +@ stdcall VerifierCreateRpcPageHeap(ptr ptr ptr ptr ptr ptr) # stub +@ stdcall VerifierDeleteFreeMemoryCallback(ptr) # stub +@ stdcall VerifierDestroyRpcPageHeap(ptr) # stub +@ stdcall VerifierDisableFaultInjectionExclusionRange(ptr) # stub +@ stdcall VerifierDisableFaultInjectionTargetRange(ptr) # stub +@ stdcall VerifierEnableFaultInjectionExclusionRange(ptr ptr) # stub +@ stdcall VerifierEnableFaultInjectionTargetRange(ptr ptr) # stub +@ stdcall VerifierEnumerateResource(ptr ptr ptr ptr ptr) # stub +@ stdcall VerifierIsCurrentThreadHoldingLocks() # stub +@ stdcall VerifierIsDllEntryActive(ptr) # stub +@ cdecl VerifierLogMessage() # stub +@ stdcall VerifierQueryRuntimeFlags(ptr ptr) # stub +@ stdcall VerifierSetFaultInjectionProbability(ptr ptr) # stub +@ stdcall VerifierSetFlags(ptr ptr ptr) # stub +@ stdcall VerifierSetRuntimeFlags(ptr) # stub +@ stdcall VerifierStopMessage(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) # stub diff --git a/dll/win32/verifier/verifier_customstubs.c b/dll/win32/verifier/verifier_customstubs.c new file mode 100644 index 0000000000..20302b3549 --- /dev/null +++ b/dll/win32/verifier/verifier_customstubs.c @@ -0,0 +1,143 @@ +/* + * PROJECT: Application verifier + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Custom stubs, using only ntdll functions + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> + +#define EXCEPTION_WINE_STUB 0x80000100 + +#define __wine_spec_unimplemented_stub(module, function) \ +{ \ + EXCEPTION_RECORD ExceptionRecord = {0}; \ + ExceptionRecord.ExceptionRecord = NULL; \ + ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \ + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \ + ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \ + ExceptionRecord.ExceptionInformation[1] = (ULONG_PTR)function; \ + ExceptionRecord.NumberParameters = 2; \ + RtlRaiseException(&ExceptionRecord); \ +} + +int NTAPI VerifierAddFreeMemoryCallback(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierAddFreeMemoryCallback(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierCreateRpcPageHeap(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5) +{ + DbgPrint("WARNING: calling stub VerifierCreateRpcPageHeap(%p, %p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4, arg5); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierDeleteFreeMemoryCallback(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierDeleteFreeMemoryCallback(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierDestroyRpcPageHeap(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierDestroyRpcPageHeap(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierDisableFaultInjectionExclusionRange(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierDisableFaultInjectionExclusionRange(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierDisableFaultInjectionTargetRange(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierDisableFaultInjectionTargetRange(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierEnableFaultInjectionExclusionRange(PVOID arg0, PVOID arg1) +{ + DbgPrint("WARNING: calling stub VerifierEnableFaultInjectionExclusionRange(%p, %p)\n", arg0, arg1); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierEnableFaultInjectionTargetRange(PVOID arg0, PVOID arg1) +{ + DbgPrint("WARNING: calling stub VerifierEnableFaultInjectionTargetRange(%p, %p)\n", arg0, arg1); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierEnumerateResource(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4) +{ + DbgPrint("WARNING: calling stub VerifierEnumerateResource(%p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierIsCurrentThreadHoldingLocks() +{ + DbgPrint("WARNING: calling stub VerifierIsCurrentThreadHoldingLocks()\n"); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierIsDllEntryActive(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierIsDllEntryActive(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int __cdecl VerifierLogMessage() +{ + DbgPrint("WARNING: calling stub VerifierLogMessage()\n"); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierQueryRuntimeFlags(PVOID arg0, PVOID arg1) +{ + DbgPrint("WARNING: calling stub VerifierQueryRuntimeFlags(%p, %p)\n", arg0, arg1); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierSetFaultInjectionProbability(PVOID arg0, PVOID arg1) +{ + DbgPrint("WARNING: calling stub VerifierSetFaultInjectionProbability(%p, %p)\n", arg0, arg1); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierSetFlags(PVOID arg0, PVOID arg1, PVOID arg2) +{ + DbgPrint("WARNING: calling stub VerifierSetFlags(%p, %p, %p)\n", arg0, arg1, arg2); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierSetRuntimeFlags(PVOID arg0) +{ + DbgPrint("WARNING: calling stub VerifierSetRuntimeFlags(%p)\n", arg0); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} + +int NTAPI VerifierStopMessage(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5, PVOID arg6, PVOID arg7, PVOID arg8, PVOID arg9) +{ + DbgPrint("WARNING: calling stub VerifierStopMessage(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); + return 0; +} +

1 0

02/04: [SDK] Add initial verifier header.
by Mark Jansen 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84d7db2c574382b5d6385… commit 84d7db2c574382b5d63859a9670cd0c5633f241a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 27 00:05:06 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:34:36 2018 +0200 [SDK] Add initial verifier header. --- sdk/include/reactos/verifier.h | 86 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/sdk/include/reactos/verifier.h b/sdk/include/reactos/verifier.h new file mode 100644 index 0000000000..b0e8413d15 --- /dev/null +++ b/sdk/include/reactos/verifier.h @@ -0,0 +1,86 @@ +#ifndef REACTOS_VERIFIER_H +#define REACTOS_VERIFIER_H + +#define DLL_PROCESS_VERIFIER 4 + +typedef VOID (NTAPI* RTL_VERIFIER_DLL_LOAD_CALLBACK) (PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved); +typedef VOID (NTAPI* RTL_VERIFIER_DLL_UNLOAD_CALLBACK) (PWSTR DllName, PVOID DllBase, SIZE_T DllSize, PVOID Reserved); +typedef VOID (NTAPI* RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK) (PVOID AllocationBase, SIZE_T AllocationSize); + +typedef struct _RTL_VERIFIER_THUNK_DESCRIPTOR { + PCHAR ThunkName; + PVOID ThunkOldAddress; + PVOID ThunkNewAddress; +} RTL_VERIFIER_THUNK_DESCRIPTOR, *PRTL_VERIFIER_THUNK_DESCRIPTOR; + +typedef struct _RTL_VERIFIER_DLL_DESCRIPTOR { + PWCHAR DllName; + DWORD DllFlags; + PVOID DllAddress; + PRTL_VERIFIER_THUNK_DESCRIPTOR DllThunks; +} RTL_VERIFIER_DLL_DESCRIPTOR, *PRTL_VERIFIER_DLL_DESCRIPTOR; + +typedef struct _RTL_VERIFIER_PROVIDER_DESCRIPTOR { + // Provider fields + DWORD Length; + PRTL_VERIFIER_DLL_DESCRIPTOR ProviderDlls; + RTL_VERIFIER_DLL_LOAD_CALLBACK ProviderDllLoadCallback; + RTL_VERIFIER_DLL_UNLOAD_CALLBACK ProviderDllUnloadCallback; + + // Verifier fields + PWSTR VerifierImage; + DWORD VerifierFlags; + DWORD VerifierDebug; + PVOID RtlpGetStackTraceAddress; + PVOID RtlpDebugPageHeapCreate; + PVOID RtlpDebugPageHeapDestroy; + + // Provider field + RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK ProviderNtdllHeapFreeCallback; +} RTL_VERIFIER_PROVIDER_DESCRIPTOR, *PRTL_VERIFIER_PROVIDER_DESCRIPTOR; + + +// VerifierFlags + +#define RTL_VRF_FLG_FULL_PAGE_HEAP 0x00000001 +#define RTL_VRF_FLG_RESERVED_DONOTUSE 0x00000002 +#define RTL_VRF_FLG_HANDLE_CHECKS 0x00000004 +#define RTL_VRF_FLG_STACK_CHECKS 0x00000008 +#define RTL_VRF_FLG_APPCOMPAT_CHECKS 0x00000010 +#define RTL_VRF_FLG_TLS_CHECKS 0x00000020 +#define RTL_VRF_FLG_DIRTY_STACKS 0x00000040 +#define RTL_VRF_FLG_RPC_CHECKS 0x00000080 +#define RTL_VRF_FLG_COM_CHECKS 0x00000100 +#define RTL_VRF_FLG_DANGEROUS_APIS 0x00000200 +#define RTL_VRF_FLG_RACE_CHECKS 0x00000400 +#define RTL_VRF_FLG_DEADLOCK_CHECKS 0x00000800 +#define RTL_VRF_FLG_FIRST_CHANCE_EXCEPTION_CHECKS 0x00001000 +#define RTL_VRF_FLG_VIRTUAL_MEM_CHECKS 0x00002000 +#define RTL_VRF_FLG_ENABLE_LOGGING 0x00004000 +#define RTL_VRF_FLG_FAST_FILL_HEAP 0x00008000 +#define RTL_VRF_FLG_VIRTUAL_SPACE_TRACKING 0x00010000 +#define RTL_VRF_FLG_ENABLED_SYSTEM_WIDE 0x00020000 +#define RTL_VRF_FLG_MISCELLANEOUS_CHECKS 0x00020000 +#define RTL_VRF_FLG_LOCK_CHECKS 0x00040000 + + +// VerifierDebug + +#define RTL_VRF_DBG_SHOWSNAPS 0x00001 +#define RTL_VRF_DBG_SHOWFOUNDEXPORTS 0x00002 +#define RTL_VRF_DBG_SHOWVERIFIEDEXPORTS 0x00004 +#define RTL_VRF_DBG_LISTPROVIDERS 0x00008 +#define RTL_VRF_DBG_SHOWCHAINING 0x00010 +#define RTL_VRF_DBG_SHOWCHAINING_DEBUG 0x00020 + +#define RTL_VRF_DBG_CS_SPLAYTREE 0x00200 +#define RTL_VRF_DBG_CS_DUMP_SPLAYTREE 0x00400 +#define RTL_VRF_DBG_CS_CREATE_DELETE 0x00800 + +#define RTL_VRF_DBG_VERIFIER_LOGCALLS 0x04000 +#define RTL_VRF_DBG_VERIFIER_SHOWDYNTHUNKS 0x08000 + +#define RTL_VRF_DBG_ENTRYPOINT_HOOKS 0x10000 +#define RTL_VRF_DBG_ENTRYPOINT_CALLS 0x20000 + +#endif // REACTOS_VERIFIER_H

1 0

01/04: [SDK] Correct NtGlobalFlag names.
by Mark Jansen 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a68fbeb43bd9c5ddbff3… commit 5a68fbeb43bd9c5ddbff3b83b82815f842b03e02 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 26 22:54:23 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:34:24 2018 +0200 [SDK] Correct NtGlobalFlag names. --- dll/ntdll/ldr/ldrinit.c | 6 +++--- sdk/include/ndk/pstypes.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 5162f1afed..a5655eca41 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1424,7 +1424,7 @@ LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE GlobalFlag = 0; /* Call AVRF if necessary */ - if (Peb->NtGlobalFlag & (FLG_POOL_ENABLE_TAIL_CHECK | FLG_HEAP_PAGE_ALLOCS)) + if (Peb->NtGlobalFlag & (FLG_APPLICATION_VERIFIER | FLG_HEAP_PAGE_ALLOCS)) { Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, TRUE, FALSE); if (!NT_SUCCESS(Status)) @@ -1436,7 +1436,7 @@ LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE else { /* There are no image-specific options, so perform global initialization */ - if (Peb->NtGlobalFlag & (FLG_POOL_ENABLE_TAIL_CHECK | FLG_HEAP_PAGE_ALLOCS)) + if (Peb->NtGlobalFlag & (FLG_APPLICATION_VERIFIER | FLG_HEAP_PAGE_ALLOCS)) { /* Initialize app verifier package */ Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, TRUE, FALSE); @@ -2055,7 +2055,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, } /* Check if the Application Verifier was enabled */ - if (Peb->NtGlobalFlag & FLG_POOL_ENABLE_TAIL_CHECK) + if (Peb->NtGlobalFlag & FLG_APPLICATION_VERIFIER) { /* FIXME */ DPRINT1("We don't support Application Verifier yet\n"); diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 0b6e160922..01468b2eb9 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -61,8 +61,7 @@ extern POBJECT_TYPE NTSYSAPI PsJobType; #define FLG_HEAP_ENABLE_FREE_CHECK 0x00000020 #define FLG_HEAP_VALIDATE_PARAMETERS 0x00000040 #define FLG_HEAP_VALIDATE_ALL 0x00000080 -#define FLG_POOL_ENABLE_TAIL_CHECK 0x00000100 -#define FLG_POOL_ENABLE_FREE_CHECK 0x00000200 +#define FLG_APPLICATION_VERIFIER 0x00000100 #define FLG_POOL_ENABLE_TAGGING 0x00000400 #define FLG_HEAP_ENABLE_TAGGING 0x00000800 #define FLG_USER_STACK_TRACE_DB 0x00001000

1 0

02/02: [SETUPAPI] SetupDiCallClassInstaller: Use the class GUID enclosed in curly brackets as a sub key name to retrieve the class co-installer.
by Eric Kohl 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35bd6571bd423d2ac4b86… commit 35bd6571bd423d2ac4b86e2db797bddcd98d05c5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 12 12:42:56 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 12 12:42:56 2018 +0200 [SETUPAPI] SetupDiCallClassInstaller: Use the class GUID enclosed in curly brackets as a sub key name to retrieve the class co-installer. --- dll/win32/setupapi/devinst.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 1d83664bf2..2aaa4962e2 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -4288,16 +4288,16 @@ BOOL WINAPI SetupDiCallClassInstaller( &hKey); if (rc == ERROR_SUCCESS) { - LPWSTR lpGuidString; - if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) == RPC_S_OK) + WCHAR szGuidString[40]; + if (pSetupStringFromGuid(&DeviceInfoData->ClassGuid, szGuidString, ARRAYSIZE(szGuidString)) == ERROR_SUCCESS) { - rc = RegQueryValueExW(hKey, lpGuidString, NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, szGuidString, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_SUCCESS && dwRegType == REG_MULTI_SZ) { LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); if (KeyBuffer != NULL) { - rc = RegQueryValueExW(hKey, lpGuidString, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + rc = RegQueryValueExW(hKey, szGuidString, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { LPWSTR ptr; @@ -4319,7 +4319,6 @@ BOOL WINAPI SetupDiCallClassInstaller( HeapFree(GetProcessHeap(), 0, KeyBuffer); } } - RpcStringFreeW(&lpGuidString); } RegCloseKey(hKey); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs