Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IERNONCE] [RUNONCEEX] Add RunOnceEx functionality for ReactOS (#3926)
by He Yang 29 Sep '21

29 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d0cc20681dff4b15e7b1… commit 4d0cc20681dff4b15e7b1c950a35952af67346d9 Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Sep 29 17:30:32 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 29 11:30:32 2021 +0200 [IERNONCE] [RUNONCEEX] Add RunOnceEx functionality for ReactOS (#3926) * [IERNONCE] Implement the registry management code. * [EXPLORER] handle RunOnceEx by invoking RunOnceEx in iernonce.dll * [IERNONCE] Display a dialog to show progress, and execute entries. * [IERNONCE] Add `InitCallback` function --- base/shell/explorer/startup.cpp | 71 ++++++- dll/win32/iernonce/CMakeLists.txt | 16 +- dll/win32/iernonce/dialog.cpp | 237 ++++++++++++++++++++++ dll/win32/iernonce/dialog.h | 46 +++++ dll/win32/iernonce/iernonce.c | 40 ---- dll/win32/iernonce/iernonce.cpp | 61 ++++++ dll/win32/iernonce/iernonce.h | 24 +++ dll/win32/iernonce/iernonce.spec | 3 +- dll/win32/iernonce/include/registry.h | 107 ++++++++++ dll/win32/iernonce/registry.cpp | 360 ++++++++++++++++++++++++++++++++++ sdk/include/reactos/iernonce_undoc.h | 30 +++ 11 files changed, 949 insertions(+), 46 deletions(-) diff --git a/base/shell/explorer/startup.cpp b/base/shell/explorer/startup.cpp index 9e6f60705c6..e76a9cd6e35 100644 --- a/base/shell/explorer/startup.cpp +++ b/base/shell/explorer/startup.cpp @@ -3,6 +3,7 @@ * Copyright (C) 2002 Shachar Shemesh * Copyright (C) 2013 Edijs Kolesnikovics * Copyright (C) 2018 Katayama Hirofumi MZ + * Copyright (C) 2021 He Yang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ * The operations performed are (by order of execution): * * After log in - * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunOnceEx (synch, no imp) + * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunOnceEx (synch) * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunOnce (synch) * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run (asynch) * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run (asynch) @@ -36,7 +37,7 @@ * - Current user Startup folder "%USERPROFILE%\Start Menu\Programs\Startup" (asynch, no imp) * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce (asynch) * - * None is processed in Safe Mode // FIXME: Check RunOnceEx in Safe Mode + * None is processed in Safe Mode */ #include "precomp.h" @@ -317,6 +318,68 @@ end: return res == ERROR_SUCCESS ? TRUE : FALSE; } +/** + * Process "RunOnceEx" type registry key. + * rundll32.exe will be invoked if the corresponding key has items inside, and wait for it. + * hkRoot is the HKEY from which + * "Software\Microsoft\Windows\CurrentVersion\RunOnceEx" + * is opened. + */ +static BOOL ProcessRunOnceEx(HKEY hkRoot) +{ + HKEY hkRunOnceEx = NULL; + LONG res = ERROR_SUCCESS; + WCHAR cmdLine[] = L"rundll32 iernonce.dll RunOnceExProcess"; + DWORD dwSubKeyCnt; + + res = RegOpenKeyExW(hkRoot, + L"Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx", + 0, + KEY_READ, + &hkRunOnceEx); + if (res != ERROR_SUCCESS) + { + TRACE("RegOpenKeyW failed on Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx (%ld)\n", res); + goto end; + } + + res = RegQueryInfoKeyW(hkRunOnceEx, + NULL, + NULL, + NULL, + &dwSubKeyCnt, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + + if (res != ERROR_SUCCESS) + { + TRACE("RegQueryInfoKeyW failed on Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx (%ld)\n", res); + goto end; + } + + if (dwSubKeyCnt != 0) + { + if (runCmd(cmdLine, NULL, TRUE, TRUE) == INVALID_RUNCMD_RETURN) + { + TRACE("runCmd failed (%ld)\n", res = GetLastError()); + goto end; + } + } + +end: + if (hkRunOnceEx != NULL) + RegCloseKey(hkRunOnceEx); + + TRACE("done\n"); + + return res == ERROR_SUCCESS ? TRUE : FALSE; +} + static BOOL AutoStartupApplications(INT nCSIDL_Folder) { @@ -414,7 +477,9 @@ INT ProcessStartupItems(VOID) * stopping if one fails, skipping if necessary. */ res = TRUE; - /* TODO: RunOnceEx */ + + if (res && bNormalBoot) + ProcessRunOnceEx(HKEY_LOCAL_MACHINE); if (res && (SHRestricted(REST_NOLOCALMACHINERUNONCE) == 0)) res = ProcessRunKeys(HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE); diff --git a/dll/win32/iernonce/CMakeLists.txt b/dll/win32/iernonce/CMakeLists.txt index 85b73cdf6e8..78d7143c049 100644 --- a/dll/win32/iernonce/CMakeLists.txt +++ b/dll/win32/iernonce/CMakeLists.txt @@ -1,11 +1,23 @@ +project(iernonce) + +include_directories(include) spec2def(iernonce.dll iernonce.spec) +list(APPEND SOURCE + dialog.cpp + iernonce.cpp + registry.cpp + iernonce.h) + add_library(iernonce MODULE - iernonce.c + ${SOURCE} iernonce.rc ${CMAKE_CURRENT_BINARY_DIR}/iernonce.def) set_module_type(iernonce win32dll UNICODE) -add_importlibs(iernonce msvcrt kernel32 ntdll) +target_link_libraries(iernonce cppstl atl_classes) +set_target_cpp_properties(iernonce WITH_EXCEPTIONS) +add_importlibs(iernonce advapi32 msvcrt gdi32 ole32 shell32 shlwapi kernel32 user32 ntdll) +add_pch(iernonce iernonce.h SOURCE) add_cd_file(TARGET iernonce DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/iernonce/dialog.cpp b/dll/win32/iernonce/dialog.cpp new file mode 100644 index 00000000000..1f3756a2745 --- /dev/null +++ b/dll/win32/iernonce/dialog.cpp @@ -0,0 +1,237 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Classes for displaying progress dialog. + * COPYRIGHT: Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#include "iernonce.h" +#include <process.h> + +#define ITEM_VPADDING 3 +#define ITEM_LEFTPADDING 22 + +HFONT CreateBoldFont(_In_ HFONT hOrigFont) +{ + LOGFONTW fontAttributes = { 0 }; + GetObjectW(hOrigFont, sizeof(fontAttributes), &fontAttributes); + fontAttributes.lfWeight = FW_BOLD; + + return CreateFontIndirectW(&fontAttributes); +} + +ProgressDlg::ProgressDlg(_In_ RunOnceExInstance &RunOnceExInst) : + m_hListBox(NULL), + m_hBoldFont(NULL), + m_PointedItem(0), + m_RunOnceExInst(RunOnceExInst) +{ ; } + +BOOL ProgressDlg::RunDialogBox() +{ + // Show the dialog and run the items only when the list is not empty. + if (m_RunOnceExInst.m_SectionList.GetSize() != 0) + { + return (DoModal() == 1); + } + return TRUE; +} + +void ProgressDlg::CalcTextRect( + _In_ LPCWSTR lpText, + _Inout_ PRECT pRect) +{ + HDC hdc = ::GetDC(m_hListBox); + ::GetClientRect(m_hListBox, pRect); + + pRect->bottom = pRect->top; + pRect->left += ITEM_LEFTPADDING; + + HFONT OldFont = SelectFont(hdc, GetFont()); + DrawTextW(hdc, lpText, -1, pRect, DT_CALCRECT | DT_WORDBREAK); + SelectFont(hdc, OldFont); + ::ReleaseDC(m_hListBox, hdc); + + pRect->bottom -= pRect->top; + pRect->bottom += ITEM_VPADDING * 2; + pRect->top = 0; + pRect->right -= pRect->left; + pRect->left = 0; +} + +void ProgressDlg::ResizeListBoxAndDialog(_In_ int NewHeight) +{ + RECT ListBoxRect; + RECT DlgRect; + ::GetWindowRect(m_hListBox, &ListBoxRect); + GetWindowRect(&DlgRect); + + int HeightDiff = NewHeight - (ListBoxRect.bottom - ListBoxRect.top); + + ::SetWindowPos(m_hListBox, NULL, 0, 0, + ListBoxRect.right - ListBoxRect.left, NewHeight, + SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW); + + SetWindowPos(HWND_TOP, 0, 0, + DlgRect.right - DlgRect.left, + DlgRect.bottom - DlgRect.top + HeightDiff, + SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW); +} + +unsigned int __stdcall +RunOnceExExecThread(_In_ void *Param) +{ + ProgressDlg *pProgressDlg = (ProgressDlg *)Param; + + pProgressDlg->m_RunOnceExInst.Exec(pProgressDlg->m_hWnd); + return 0; +} + +BOOL +ProgressDlg::ProcessWindowMessage( + _In_ HWND hwnd, + _In_ UINT message, + _In_ WPARAM wParam, + _In_ LPARAM lParam, + _Out_ LRESULT& lResult, + _In_ DWORD dwMsgMapID) +{ + lResult = 0; + switch (message) + { + case WM_INITDIALOG: + { + if (!m_RunOnceExInst.m_Title.IsEmpty()) + { + SetWindowTextW(m_RunOnceExInst.m_Title); + } + + m_hListBox = GetDlgItem(IDC_LB_ITEMS); + + m_hBoldFont = CreateBoldFont(GetFont()); + + m_hArrowBmp = LoadBitmapW(NULL, MAKEINTRESOURCE(OBM_MNARROW)); + GetObjectW(m_hArrowBmp, sizeof(BITMAP), &m_ArrowBmp); + + // Add all sections with non-empty title into listbox + int TotalHeight = 0; + for (int i = 0; i < m_RunOnceExInst.m_SectionList.GetSize(); i++) + { + RunOnceExSection &Section = m_RunOnceExInst.m_SectionList[i]; + + if (!Section.m_SectionTitle.IsEmpty()) + { + INT Index = ListBox_AddString(m_hListBox, Section.m_SectionTitle); + TotalHeight += ListBox_GetItemHeight(m_hListBox, Index); + ListBox_SetItemData(m_hListBox, Index, i); + } + } + + // Remove the sunken-edged border from the listbox. + ::SetWindowLongPtr(m_hListBox, GWL_EXSTYLE, ::GetWindowLongPtr(m_hListBox, GWL_EXSTYLE) & ~WS_EX_CLIENTEDGE); + + ResizeListBoxAndDialog(TotalHeight); + + // Launch a thread to execute tasks. + HANDLE hThread = (HANDLE)_beginthreadex(NULL, 0, RunOnceExExecThread, (void *)this, 0, NULL); + if (hThread == INVALID_HANDLE_VALUE) + { + EndDialog(0); + return TRUE; + } + CloseHandle(hThread); + + lResult = TRUE; // set keyboard focus to the dialog box control. + break; + } + + case WM_MEASUREITEM: + { + PMEASUREITEMSTRUCT pMeasureItem = (PMEASUREITEMSTRUCT)lParam; + RECT TextRect = { 0 }; + + CStringW ItemText; + ListBox_GetText(m_hListBox, pMeasureItem->itemID, + ItemText.GetBuffer(ListBox_GetTextLen(m_hListBox, + pMeasureItem->itemID) + 1)); + + CalcTextRect(ItemText, &TextRect); + + ItemText.ReleaseBuffer(); + + pMeasureItem->itemHeight = TextRect.bottom - TextRect.top; + pMeasureItem->itemWidth = TextRect.right - TextRect.left; + + break; + } + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT pDrawItem = (PDRAWITEMSTRUCT)lParam; + CStringW ItemText; + + ListBox_GetText(m_hListBox, pDrawItem->itemID, + ItemText.GetBuffer(ListBox_GetTextLen(m_hListBox, + pDrawItem->itemID) + 1)); + + SetBkMode(pDrawItem->hDC, TRANSPARENT); + + HFONT hOldFont = NULL; + if (m_PointedItem == (INT)pDrawItem->itemData) + { + HDC hCompDC = CreateCompatibleDC(pDrawItem->hDC); + + SelectBitmap(hCompDC, m_hArrowBmp); + + int IconLeftPadding = (ITEM_LEFTPADDING - m_ArrowBmp.bmWidth) / 2; + int IconTopPadding = (pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - m_ArrowBmp.bmHeight) / 2; + + BitBlt(pDrawItem->hDC, IconLeftPadding, pDrawItem->rcItem.top + IconTopPadding, + m_ArrowBmp.bmWidth, m_ArrowBmp.bmHeight, hCompDC, 0, 0, SRCAND); + + DeleteDC(hCompDC); + + hOldFont = SelectFont(pDrawItem->hDC, m_hBoldFont); + } + + pDrawItem->rcItem.left += ITEM_LEFTPADDING; + pDrawItem->rcItem.top += ITEM_VPADDING; + DrawTextW(pDrawItem->hDC, ItemText, -1, + &(pDrawItem->rcItem), DT_WORDBREAK); + + if (hOldFont) + { + SelectFont(pDrawItem->hDC, hOldFont); + } + ItemText.ReleaseBuffer(); + + break; + } + + case WM_SETINDEX: + { + if ((int)wParam == m_RunOnceExInst.m_SectionList.GetSize()) + { + // All sections are handled, lParam is bSuccess. + EndDialog(lParam); + } + m_PointedItem = wParam; + InvalidateRect(NULL); + break; + } + + case WM_CTLCOLORLISTBOX: + { + lResult = (LRESULT)GetStockBrush(NULL_BRUSH); + break; + } + + case WM_DESTROY: + { + DeleteObject(m_hArrowBmp); + DeleteFont(m_hBoldFont); + break; + } + } + return TRUE; +} diff --git a/dll/win32/iernonce/dialog.h b/dll/win32/iernonce/dialog.h new file mode 100644 index 00000000000..e459c9b09bd --- /dev/null +++ b/dll/win32/iernonce/dialog.h @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Classes for displaying progress dialog. + * COPYRIGHT: Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#pragma once + +#include <atlbase.h> +#include <atlwin.h> + +#include "resource.h" +#include "registry.h" + +// When wParam < item count ==> wParam is item index (0 based) +// wParam = item count ==> all finished, lParam = bSuccess +#define WM_SETINDEX (WM_USER + 1) + +class ProgressDlg : public CDialogImpl<ProgressDlg> +{ +private: + INT_PTR m_DialogID; + HWND m_hListBox; + HFONT m_hBoldFont; + HBITMAP m_hArrowBmp; + BITMAP m_ArrowBmp; + INT m_PointedItem; + +public: + enum { IDD = IDD_DIALOG }; + + RunOnceExInstance &m_RunOnceExInst; + + ProgressDlg(_In_ RunOnceExInstance &RunOnceExInst); + + BOOL RunDialogBox(); + + void CalcTextRect(_In_ LPCWSTR lpText, _Inout_ RECT *pRect); + + void ResizeListBoxAndDialog(_In_ int NewHeight); + + BOOL ProcessWindowMessage(_In_ HWND hwnd, _In_ UINT message, _In_ WPARAM wParam, + _In_ LPARAM lParam, _Out_ LRESULT& lResult, + _In_ DWORD dwMsgMapID); +}; diff --git a/dll/win32/iernonce/iernonce.c b/dll/win32/iernonce/iernonce.c deleted file mode 100644 index c5314c3f7c7..00000000000 --- a/dll/win32/iernonce/iernonce.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * PROJECT: ReactOS system libraries - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\iernonce\iernonce.c - * PURPOSE: ReactOS Extended RunOnce processing with UI - * PROGRAMMERS: Copyright 2013-2016 Robert Naumann - */ - - -#define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> - -#define NDEBUG -#include <debug.h> - -HINSTANCE hInstance; - -BOOL -WINAPI -DllMain(HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID reserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - break; - case DLL_PROCESS_DETACH: - hInstance = hinstDLL; - break; - } - - return TRUE; -} - -VOID WINAPI RunOnceExProcess(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) -{ - DPRINT1("RunOnceExProcess() not implemented\n"); -} diff --git a/dll/win32/iernonce/iernonce.cpp b/dll/win32/iernonce/iernonce.cpp new file mode 100644 index 00000000000..2569c9e164c --- /dev/null +++ b/dll/win32/iernonce/iernonce.cpp @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ReactOS Extended RunOnce processing with UI. + * COPYRIGHT: Copyright 2013-2016 Robert Naumann + * Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#include "iernonce.h" + +RUNONCEEX_CALLBACK g_Callback = NULL; +BOOL g_bSilence = FALSE; + +BOOL +WINAPI +DllMain(_In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _In_ LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +extern "C" VOID WINAPI +RunOnceExProcess(_In_ HWND hwnd, + _In_ HINSTANCE hInst, + _In_ LPCSTR pszCmdLine, + _In_ int nCmdShow) +{ + // iernonce may use shell32 API. + HRESULT Result = CoInitialize(NULL); + if (Result != S_OK && Result != S_FALSE) + { + return; + } + + HKEY RootKeys[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; + for (UINT i = 0; i < _countof(RootKeys); ++i) + { + RunOnceExInstance Instance(RootKeys[i]); + Instance.Run(g_bSilence); + } + + CoUninitialize(); +} + +extern "C" VOID WINAPI +InitCallback(_In_ RUNONCEEX_CALLBACK Callback, + _In_ BOOL bSilence) +{ + g_Callback = Callback; + g_bSilence = bSilence; +} diff --git a/dll/win32/iernonce/iernonce.h b/dll/win32/iernonce/iernonce.h new file mode 100644 index 00000000000..5c46ed85cc5 --- /dev/null +++ b/dll/win32/iernonce/iernonce.h @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ReactOS Extended RunOnce processing with UI. + * COPYRIGHT: Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#pragma once + +#include <cassert> +#include <cstdlib> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <windowsx.h> +#include <shlwapi.h> +#include <iernonce_undoc.h> + +#include <atlbase.h> +#include <atlwin.h> + +#include "registry.h" +#include "dialog.h" diff --git a/dll/win32/iernonce/iernonce.spec b/dll/win32/iernonce/iernonce.spec index 808989a74af..23898e470b1 100644 --- a/dll/win32/iernonce/iernonce.spec +++ b/dll/win32/iernonce/iernonce.spec @@ -1 +1,2 @@ -@ stdcall RunOnceExProcess(ptr ptr str long) \ No newline at end of file +@ stdcall RunOnceExProcess(ptr ptr str long) +@ stdcall InitCallback(ptr long) diff --git a/dll/win32/iernonce/include/registry.h b/dll/win32/iernonce/include/registry.h new file mode 100644 index 00000000000..39cdeeb77f7 --- /dev/null +++ b/dll/win32/iernonce/include/registry.h @@ -0,0 +1,107 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Functions to read RunOnceEx registry. + * COPYRIGHT: Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#pragma once + +#include <windows.h> +#include <atlbase.h> +#include <atlstr.h> +#include <atlcoll.h> +#include <atlsimpcoll.h> + +#define FLAGS_NO_STAT_DIALOG 0x00000080 + +#ifndef UNICODE +#error This project must be compiled with UNICODE! +#endif + +class CRegKeyEx : public CRegKey +{ +public: + LONG EnumValueName( + _In_ DWORD iIndex, + _Out_ LPTSTR pszName, + _Inout_ LPDWORD pnNameLength); +}; + +class RunOnceExEntry +{ +private: + ATL::CStringW m_Value; + ATL::CStringW m_Name; + +public: + + RunOnceExEntry( + _In_ const ATL::CStringW &Name, + _In_ const ATL::CStringW &Value); + + BOOL Delete(_In_ CRegKeyEx &hParentKey); + BOOL Exec() const; + + friend int RunOnceExEntryCmp( + _In_ const void *a, + _In_ const void *b); +}; + +class RunOnceExSection +{ +private: + ATL::CStringW m_SectionName; + CRegKeyEx m_RegKey; + + BOOL HandleValue( + _In_ CRegKeyEx &hKey, + _In_ const CStringW &ValueName); + +public: + BOOL m_bSuccess; + ATL::CStringW m_SectionTitle; + CSimpleArray<RunOnceExEntry> m_EntryList; + + RunOnceExSection( + _In_ CRegKeyEx &hParentKey, + _In_ const CStringW &lpSubKeyName); + + RunOnceExSection(_In_ const RunOnceExSection &Section); + + BOOL CloseAndDelete(_In_ CRegKeyEx &hParentKey); + + UINT GetEntryCnt() const; + + BOOL Exec( + _Inout_ UINT& iCompleteCnt, + _In_ const UINT iTotalCnt); + + friend int RunOnceExSectionCmp( + _In_ const void *a, + _In_ const void *b); + + friend class RunOnceExInstance; +}; + +class RunOnceExInstance +{ +private: + CRegKeyEx m_RegKey; + + BOOL HandleSubKey( + _In_ CRegKeyEx &hKey, + _In_ const CStringW &SubKeyName); + +public: + BOOL m_bSuccess; + CSimpleArray<RunOnceExSection> m_SectionList; + CStringW m_Title; + DWORD m_dwFlags; + BOOL m_bShowDialog; + + RunOnceExInstance(_In_ HKEY BaseKey); + + BOOL Exec(_In_opt_ HWND hwnd); + BOOL Run(_In_ BOOL bSilence); +}; diff --git a/dll/win32/iernonce/registry.cpp b/dll/win32/iernonce/registry.cpp new file mode 100644 index 00000000000..a5c764b6c58 --- /dev/null +++ b/dll/win32/iernonce/registry.cpp @@ -0,0 +1,360 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Functions to read RunOnceEx registry. + * COPYRIGHT: Copyright 2021 He Yang <1160386205(a)qq.com> + */ + +#include "iernonce.h" + +extern RUNONCEEX_CALLBACK g_Callback; + +LONG CRegKeyEx::EnumValueName( + _In_ DWORD iIndex, + _Out_ LPTSTR pszName, + _Inout_ LPDWORD pnNameLength) +{ + return RegEnumValueW(m_hKey, iIndex, pszName, pnNameLength, + NULL, NULL, NULL, NULL); +} + +RunOnceExEntry::RunOnceExEntry( + _In_ const ATL::CStringW &Name, + _In_ const ATL::CStringW &Value) : + m_Value(Value), m_Name(Name) +{ ; } + +BOOL RunOnceExEntry::Delete( + _In_ CRegKeyEx &hParentKey) +{ + return hParentKey.DeleteValue(m_Name) == ERROR_SUCCESS; +} + +BOOL RunOnceExEntry::Exec() const +{ + CStringW CommandLine; + if (wcsncmp(m_Value, L"||", 2) == 0) + { + // Remove the prefix. + CommandLine = (LPCWSTR)m_Value + 2; + } + else + { + CommandLine = m_Value; + } + + // FIXME: SHEvaluateSystemCommandTemplate is not implemented + // using PathGetArgsW, PathRemoveArgsW as a workaround. + LPWSTR szCommandLine = CommandLine.GetBuffer(); + LPCWSTR szParam = PathGetArgsW(szCommandLine); + PathRemoveArgsW(szCommandLine); + + SHELLEXECUTEINFOW Info = { 0 }; + Info.cbSize = sizeof(Info); + Info.fMask = SEE_MASK_NOCLOSEPROCESS; + Info.lpFile = szCommandLine; + Info.lpParameters = szParam; + Info.nShow = SW_SHOWNORMAL; + + BOOL bSuccess = ShellExecuteExW(&Info); + + CommandLine.ReleaseBuffer(); + + if (!bSuccess) + { + return FALSE; + } + + if (Info.hProcess) + { + WaitForSingleObject(Info.hProcess, INFINITE); + CloseHandle(Info.hProcess); + } + + return TRUE; +} + +int RunOnceExEntryCmp( + _In_ const void *a, + _In_ const void *b) +{ + return lstrcmpW(((RunOnceExEntry *)a)->m_Name, + ((RunOnceExEntry *)b)->m_Name); +} + +BOOL RunOnceExSection::HandleValue( + _In_ CRegKeyEx &hKey, + _In_ const CStringW &ValueName) +{ + DWORD dwType; + DWORD cbData; + + // Query data size + if (hKey.QueryValue(ValueName, &dwType, NULL, &cbData) != ERROR_SUCCESS) + return FALSE; + + // Validate its format and size. + if (dwType != REG_SZ) + return TRUE; + + if (cbData % sizeof(WCHAR) != 0) + return FALSE; + + CStringW Buffer; + LPWSTR szBuffer = Buffer.GetBuffer((cbData / sizeof(WCHAR)) + 1); + + if (hKey.QueryValue(ValueName, &dwType, szBuffer, &cbData) != ERROR_SUCCESS) + { + Buffer.ReleaseBuffer(); + return FALSE; + } + szBuffer[cbData / sizeof(WCHAR)] = L'\0'; + Buffer.ReleaseBuffer(); + + CStringW ExpandStr; + DWORD dwcchExpand = ExpandEnvironmentStringsW(Buffer, NULL, 0); + ExpandEnvironmentStringsW(Buffer, ExpandStr.GetBuffer(dwcchExpand + 1), dwcchExpand); + ExpandStr.ReleaseBuffer(); + + if (ValueName.IsEmpty()) + { + // The default value specifies the section title. + m_SectionTitle = Buffer; + } + else + { + m_EntryList.Add(RunOnceExEntry(ValueName, ExpandStr)); + } + + return TRUE; +} + +RunOnceExSection::RunOnceExSection( + _In_ CRegKeyEx &hParentKey, + _In_ const CStringW &lpSubKeyName) : + m_SectionName(lpSubKeyName) +{ + m_bSuccess = FALSE; + DWORD dwValueNum; + DWORD dwMaxValueNameLen; + LSTATUS Error; + CStringW ValueName; + + if (m_RegKey.Open(hParentKey, lpSubKeyName) != ERROR_SUCCESS) + return; + + Error = RegQueryInfoKeyW(m_RegKey, NULL, 0, NULL, NULL, NULL, NULL, + &dwValueNum, &dwMaxValueNameLen, + NULL, NULL, NULL); + if (Error != ERROR_SUCCESS) + return; + + for (DWORD i = 0; i < dwValueNum; i++) + { + LPWSTR szValueName; + DWORD dwcchName = dwMaxValueNameLen + 1; + + szValueName = ValueName.GetBuffer(dwMaxValueNameLen + 1); + Error = m_RegKey.EnumValueName(i, szValueName, &dwcchName); + ValueName.ReleaseBuffer(); + + if (Error != ERROR_SUCCESS) + { + // TODO: error handling + return; + } + + if (!HandleValue(m_RegKey, ValueName)) + return; + } + + // Sort entries by name in string order. + qsort(m_EntryList.GetData(), m_EntryList.GetSize(), + sizeof(RunOnceExEntry), RunOnceExEntryCmp); + + m_bSuccess = TRUE; + return; +} + +// Copy constructor, CSimpleArray needs it. +RunOnceExSection::RunOnceExSection(_In_ const RunOnceExSection& Section) : + m_SectionName(Section.m_SectionName), + m_bSuccess(Section.m_bSuccess), + m_SectionTitle(Section.m_SectionTitle), + m_EntryList(Section.m_EntryList) +{ + m_RegKey.Attach(Section.m_RegKey); +} + +BOOL RunOnceExSection::CloseAndDelete( + _In_ CRegKeyEx &hParentKey) +{ + m_RegKey.Close(); + return hParentKey.RecurseDeleteKey(m_SectionName) == ERROR_SUCCESS; +} + +UINT RunOnceExSection::GetEntryCnt() const +{ + return m_EntryList.GetSize(); +} + +BOOL RunOnceExSection::Exec( + _Inout_ UINT& iCompleteCnt, + _In_ const UINT iTotalCnt) +{ + BOOL bSuccess = TRUE; + + for (int i = 0; i < m_EntryList.GetSize(); i++) + { + m_EntryList[i].Delete(m_RegKey); + bSuccess &= m_EntryList[i].Exec(); + iCompleteCnt++; + // TODO: the meaning of the third param is still unknown, seems it's always 0. + if (g_Callback) + g_Callback(iCompleteCnt, iTotalCnt, NULL); + } + return bSuccess; +} + +int RunOnceExSectionCmp( + _In_ const void *a, + _In_ const void *b) +{ + return lstrcmpW(((RunOnceExSection *)a)->m_SectionName, + ((RunOnceExSection *)b)->m_SectionName); +} + +RunOnceExInstance::RunOnceExInstance(_In_ HKEY BaseKey) +{ + m_bSuccess = FALSE; + DWORD dwSubKeyNum; + DWORD dwMaxSubKeyNameLen; + LSTATUS Error; + CStringW SubKeyName; + + Error = m_RegKey.Open(BaseKey, + L"Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx\\"); + if (Error != ERROR_SUCCESS) + { + return; + } + + ULONG cchTitle; + Error = m_RegKey.QueryStringValue(L"Title", NULL, &cchTitle); + if (Error == ERROR_SUCCESS) + { + Error = m_RegKey.QueryStringValue(L"Title", m_Title.GetBuffer(cchTitle + 1), &cchTitle); + m_Title.ReleaseBuffer(); + if (Error != ERROR_SUCCESS) + return; + } + + Error = m_RegKey.QueryDWORDValue(L"Flags", m_dwFlags); + if (Error != ERROR_SUCCESS) + { + m_dwFlags = 0; + } + + Error = RegQueryInfoKeyW(m_RegKey, NULL, 0, NULL, + &dwSubKeyNum, &dwMaxSubKeyNameLen, + NULL, NULL, NULL, NULL, NULL, NULL); + if (Error != ERROR_SUCCESS) + return; + + m_bShowDialog = FALSE; + + for (DWORD i = 0; i < dwSubKeyNum; i++) + { + LPWSTR szSubKeyName; + DWORD dwcchName = dwMaxSubKeyNameLen + 1; + + szSubKeyName = SubKeyName.GetBuffer(dwMaxSubKeyNameLen + 1); + Error = m_RegKey.EnumKey(i, szSubKeyName, &dwcchName); + SubKeyName.ReleaseBuffer(); + + if (Error != ERROR_SUCCESS) + { + // TODO: error handling + return; + } + + if (!HandleSubKey(m_RegKey, SubKeyName)) + return; + } + + // Sort sections by name in string order. + qsort(m_SectionList.GetData(), m_SectionList.GetSize(), + sizeof(RunOnceExSection), RunOnceExSectionCmp); + + m_bSuccess = TRUE; + return; +} + +BOOL RunOnceExInstance::Exec(_In_opt_ HWND hwnd) +{ + BOOL bSuccess = TRUE; + + UINT TotalCnt = 0; + UINT CompleteCnt = 0; + for (int i = 0; i < m_SectionList.GetSize(); i++) + { + TotalCnt += m_SectionList[i].GetEntryCnt(); + } + + // Execute items from registry one by one, and remove them. + for (int i = 0; i < m_SectionList.GetSize(); i++) + { + if (hwnd) + SendMessageW(hwnd, WM_SETINDEX, i, 0); + + bSuccess &= m_SectionList[i].Exec(CompleteCnt, TotalCnt); + m_SectionList[i].CloseAndDelete(m_RegKey); + } + + m_RegKey.DeleteValue(L"Title"); + m_RegKey.DeleteValue(L"Flags"); + + // Notify the dialog all sections are handled. + if (hwnd) + SendMessageW(hwnd, WM_SETINDEX, m_SectionList.GetSize(), bSuccess); + return bSuccess; +} + +BOOL RunOnceExInstance::Run(_In_ BOOL bSilence) +{ + if (bSilence || + (m_dwFlags & FLAGS_NO_STAT_DIALOG) || + !m_bShowDialog) + { + return Exec(NULL); + } + else + { + // The dialog is responsible to create a thread and execute. + ProgressDlg dlg(*this); + return dlg.RunDialogBox(); + } +} + +BOOL RunOnceExInstance::HandleSubKey( + _In_ CRegKeyEx &hKey, + _In_ const CStringW& SubKeyName) +{ + RunOnceExSection Section(hKey, SubKeyName); + if (!Section.m_bSuccess) + { + return FALSE; + } + + if (!Section.m_SectionTitle.IsEmpty()) + { + m_bShowDialog = TRUE; + } + m_SectionList.Add(Section); + + // The copy constructor of RunOnceExSection didn't detach + // the m_RegKey while it's attached to the one in the array. + // So we have to detach it manually. + Section.m_RegKey.Detach(); + return TRUE; +} diff --git a/sdk/include/reactos/iernonce_undoc.h b/sdk/include/reactos/iernonce_undoc.h new file mode 100644 index 00000000000..530f10f0dd0 --- /dev/null +++ b/sdk/include/reactos/iernonce_undoc.h @@ -0,0 +1,30 @@ +#ifndef _IERNONCE_UNDOC_H_ +#define _IERNONCE_UNDOC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef VOID +(CALLBACK *RUNONCEEX_CALLBACK)( + _In_ UINT CompleteCnt, + _In_ UINT TotalCnt, + _In_ DWORD_PTR dwReserved); + +VOID WINAPI +InitCallback( + _In_ RUNONCEEX_CALLBACK Callback, + _In_ BOOL bSilence); + +VOID WINAPI +RunOnceExProcess( + _In_ HWND hwnd, + _In_ HINSTANCE hInst, + _In_ LPCSTR pszCmdLine, + _In_ int nCmdShow); + +#ifdef __cplusplus +} +#endif + +#endif /* _IERNONCE_UNDOC_H_ */

1 0

[reactos] 01/01: [NtGDI] Fix brush attribute transfer.
by James Tabor 29 Sep '21

29 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5fae844de5877d2c9c95… commit b5fae844de5877d2c9c955d6e04222580a03581c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 28 19:08:45 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 28 19:08:45 2021 -0500 [NtGDI] Fix brush attribute transfer. --- win32ss/gdi/ntgdi/brush.cpp | 32 ++++++++++++++++++++++++++++++++ win32ss/gdi/ntgdi/brush.hpp | 2 ++ 2 files changed, 34 insertions(+) diff --git a/win32ss/gdi/ntgdi/brush.cpp b/win32ss/gdi/ntgdi/brush.cpp index 2c18e25b307..f98b233234e 100644 --- a/win32ss/gdi/ntgdi/brush.cpp +++ b/win32ss/gdi/ntgdi/brush.cpp @@ -76,6 +76,17 @@ BRUSH::~BRUSH( } } +VOID +BRUSH::vReleaseAttribute(VOID) +{ + if (this->pBrushAttr != &this->BrushAttr) + { + this->BrushAttr = *this->pBrushAttr; + GdiPoolFree(GetBrushAttrPool(), this->pBrushAttr); + this->pBrushAttr = &this->BrushAttr; + } +} + VOID BRUSH::vDeleteObject( _In_ PVOID pvObject) @@ -543,10 +554,19 @@ NtGdiSetBrushAttributes( _In_ HBRUSH hbr, _In_ DWORD dwFlags) { + PBRUSH pbr; if ( dwFlags & SC_BB_STOCKOBJ ) { if (GDIOBJ_ConvertToStockObj((HGDIOBJ*)&hbr)) { + pbr = BRUSH::LockAny(hbr); + if (pbr == NULL) + { + ERR("Failed to lock brush %p\n", hbr); + return NULL; + } + pbr->vReleaseAttribute(); + pbr->vUnlock(); return hbr; } } @@ -560,10 +580,22 @@ NtGdiClearBrushAttributes( _In_ HBRUSH hbr, _In_ DWORD dwFlags) { + PBRUSH pbr; if ( dwFlags & SC_BB_STOCKOBJ ) { if (GDIOBJ_ConvertFromStockObj((HGDIOBJ*)&hbr)) { + pbr = BRUSH::LockAny(hbr); + if (pbr == NULL) + { + ERR("Failed to lock brush %p\n", hbr); + return NULL; + } + if (!pbr->bAllocateBrushAttr()) + { + ERR("Failed to allocate brush attribute\n"); + } + pbr->vUnlock(); return hbr; } } diff --git a/win32ss/gdi/ntgdi/brush.hpp b/win32ss/gdi/ntgdi/brush.hpp index 4fea65ea3c2..027db2490d0 100644 --- a/win32ss/gdi/ntgdi/brush.hpp +++ b/win32ss/gdi/ntgdi/brush.hpp @@ -113,6 +113,8 @@ public: VOID vSetSolidColor( _In_ COLORREF crColor); + + VOID vReleaseAttribute(VOID); }; /* HACK! */

1 0

[reactos] 01/01: [IMM32] Rewrite ImmAssociateContext (#3979)
by Katayama Hirofumi MZ 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef003fa47d2d7bdb70ce2… commit ef003fa47d2d7bdb70ce26dd2b08160f0143125e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 28 22:03:25 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 28 22:03:25 2021 +0900 [IMM32] Rewrite ImmAssociateContext (#3979) CORE-11700 --- dll/win32/imm32/imm.c | 87 ++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 64 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 135b7afc6ee..ab97e052c9a 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -169,87 +169,46 @@ static InputContextData* get_imc_data(HIMC hIMC) return data; } -static HIMC get_default_context( HWND hwnd ) -{ - FIXME("Don't use this function\n"); - return FALSE; -} - -static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) -{ - InputContextData *data; - - if (hWnd) - { - DWORD thread = GetWindowThreadProcessId(hWnd, NULL); - if (thread != GetCurrentThreadId()) return TRUE; - } - data = get_imc_data(hIMC); - if (data && data->threadID != GetCurrentThreadId()) - return TRUE; - - return FALSE; -} - /*********************************************************************** * ImmAssociateContext (IMM32.@) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - HIMC old = NULL; - InputContextData *data = get_imc_data(hIMC); + PWND pWnd; + HWND hwndFocus; + DWORD dwValue; + HIMC hOldIMC; - TRACE("(%p, %p):\n", hWnd, hIMC); + TRACE("(%p, %p)\n", hWnd, hIMC); - if(hIMC && !data) + if (!Imm32IsImmMode()) return NULL; - /* - * If already associated just return - */ - if (hIMC && data->IMC.hWnd == hWnd) - return hIMC; - - if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd) return NULL; - if (hWnd) - { - HIMC defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd,szwWineIMCProperty); - - if (old == NULL) - old = defaultContext; - else if (old == (HIMC)-1) - old = NULL; - - if (hIMC != defaultContext) - { - if (hIMC == NULL) /* Meaning disable imm for that window*/ - SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); - else - SetPropW(hWnd,szwWineIMCProperty,hIMC); - } + if (hIMC && Imm32IsCrossThreadAccess(hIMC)) + return NULL; - if (old) - { - InputContextData *old_data = (InputContextData *)old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } - } + hOldIMC = pWnd->hImc; + if (hOldIMC == hIMC) + return hIMC; - if (!hIMC) - return old; + dwValue = NtUserAssociateInputContext(hWnd, hIMC, 0); + if (dwValue == 0) + return hOldIMC; + if (dwValue != 1) + return NULL; - if(GetActiveWindow() == data->IMC.hWnd) + hwndFocus = (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_FOCUS); + if (hwndFocus == hWnd) { - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - data->IMC.hWnd = hWnd; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); + ImmSetActiveContext(hWnd, hOldIMC, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); } - return old; + return hOldIMC; } /***********************************************************************

1 0

[reactos] 01/01: [IMM32] Implement ImmFreeLayout (#3978)
by Katayama Hirofumi MZ 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3c841f8e29b507455e4f… commit a3c841f8e29b507455e4f432338ce0ffe04e94b0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 28 22:02:30 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 28 22:02:30 2021 +0900 [IMM32] Implement ImmFreeLayout (#3978) - Implement ImmFreeLayout function. - Add Imm32ReleaseIME helper function. CORE-11700 --- dll/win32/imm32/ime.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ dll/win32/imm32/imm32.spec | 2 +- 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 99c675dbfce..3eeb7169b22 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -283,6 +283,53 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) return 0; } +BOOL APIENTRY Imm32ReleaseIME(HKL hKL) +{ + BOOL ret = TRUE; + PIMEDPI pImeDpi0, pImeDpi1; + + RtlEnterCriticalSection(&g_csImeDpi); + + for (pImeDpi0 = g_pImeDpiList; pImeDpi0; pImeDpi0 = pImeDpi0->pNext) + { + if (pImeDpi0->hKL == hKL) + break; + } + + if (!pImeDpi0) + goto Quit; + + if (pImeDpi0->cLockObj) + { + pImeDpi0->dwFlags |= IMEDPI_FLAG_UNKNOWN; + ret = FALSE; + goto Quit; + } + + if (g_pImeDpiList == pImeDpi0) + { + g_pImeDpiList = pImeDpi0->pNext; + } + else if (g_pImeDpiList) + { + for (pImeDpi1 = g_pImeDpiList; pImeDpi1; pImeDpi1 = pImeDpi1->pNext) + { + if (pImeDpi1->pNext == pImeDpi0) + { + pImeDpi1->pNext = pImeDpi0->pNext; + break; + } + } + } + + Imm32FreeImeDpi(pImeDpi0, TRUE); + Imm32HeapFree(pImeDpi0); + +Quit: + RtlLeaveCriticalSection(&g_csImeDpi); + return ret; +} + /*********************************************************************** * ImmIsIME (IMM32.@) */ @@ -1456,3 +1503,70 @@ Quit: ImmUnlockImeDpi(pImeDpi); return ret; } + +/*********************************************************************** + * ImmFreeLayout (IMM32.@) + */ +BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) +{ + WCHAR szKBD[9]; + UINT iKL, cKLs; + HKL hOldKL, hNewKL, *pList; + PIMEDPI pImeDpi; + LANGID LangID; + + TRACE("(0x%lX)\n", dwUnknown); + + hOldKL = GetKeyboardLayout(0); + + if (dwUnknown == 1) + { + if (!IS_IME_HKL(hOldKL)) + return TRUE; + + LangID = LANGIDFROMLCID(GetSystemDefaultLCID()); + + cKLs = GetKeyboardLayoutList(0, NULL); + if (cKLs) + { + pList = Imm32HeapAlloc(0, cKLs * sizeof(HKL)); + if (pList == NULL) + return FALSE; + + cKLs = GetKeyboardLayoutList(cKLs, pList); + for (iKL = 0; iKL < cKLs; ++iKL) + { + if (!IS_IME_HKL(pList[iKL])) + { + LangID = LOWORD(pList[iKL]); + break; + } + } + + Imm32HeapFree(pList); + } + + StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); + if (!LoadKeyboardLayoutW(szKBD, KLF_ACTIVATE)) + LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | 0x200); + } + else if (dwUnknown == 2) + { + RtlEnterCriticalSection(&g_csImeDpi); +Retry: + for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) + { + if (Imm32ReleaseIME(pImeDpi->hKL)) + goto Retry; + } + RtlLeaveCriticalSection(&g_csImeDpi); + } + else + { + hNewKL = (HKL)(DWORD_PTR)dwUnknown; + if (IS_IME_HKL(hNewKL) && hNewKL != hOldKL) + Imm32ReleaseIME(hNewKL); + } + + return TRUE; +} diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index ba038cbcfb2..221c8a85e80 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -24,7 +24,7 @@ @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) @ stdcall ImmEscapeA(long ptr long ptr) @ stdcall ImmEscapeW(long ptr long ptr) -@ stdcall -stub ImmFreeLayout(long) +@ stdcall ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr)

1 0

[reactos] 01/01: [ApiTests|GDI] Add test for attribute changes to Bitmaps.
by James Tabor 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6d1646c9d6fc5787b4fa… commit c6d1646c9d6fc5787b4fa72a29a144f26197e14b Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Sep 27 23:52:00 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Sep 27 23:52:00 2021 -0500 [ApiTests|GDI] Add test for attribute changes to Bitmaps. Only opporpate place to add this test. --- modules/rostests/apitests/gdi32/CreateBitmap.c | 67 +++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/gdi32/CreateBitmap.c b/modules/rostests/apitests/gdi32/CreateBitmap.c index 3711b7b202e..e39d5ccd469 100644 --- a/modules/rostests/apitests/gdi32/CreateBitmap.c +++ b/modules/rostests/apitests/gdi32/CreateBitmap.c @@ -7,6 +7,10 @@ #include "precomp.h" +DWORD WINAPI GetBitmapAttributes(HBITMAP hbm); +HBITMAP WINAPI SetBitmapAttributes(HBITMAP hbm, DWORD dwFlags); +HBITMAP WINAPI ClearBitmapAttributes(HBITMAP hbm, DWORD dwFlags); + void Test_CreateBitmap_Params() { HBITMAP hbmp; @@ -179,9 +183,70 @@ void Test_CreateBitmap() ok(hbmp == 0, "Expected failure for 33 bpp\n"); } +void Test_BitmapAttributes() +{ + static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + HBITMAP hbmp,hbmpso,hbmpsoc; + INT ret; + BITMAP bm; + + hbmp = CreateBitmap(0, 0, 0, 0, NULL); + ok(hbmp != 0, "should get a 1x1 bitmap\n"); + ok(hbmp == GetStockObject(DEFAULT_BITMAP), "\n"); + ok(GetBitmapAttributes(hbmp) == 1,"\n"); + + ok(SetBitmapAttributes(hbmp, 0x00000002) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000004) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000008) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000010) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000020) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000040) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000080) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000100) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000200) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000400) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0x00000800) == 0,"\n"); + ok(SetBitmapAttributes(hbmp, 0xFFFFFFFF) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000002) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000004) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000008) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000010) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000020) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000040) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000080) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000100) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000200) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000400) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0x00000800) == 0,"\n"); + ok(ClearBitmapAttributes(hbmp, 0xFFFFFFFF) == 0,"\n"); + DeleteObject(hbmp); + + hbmp = CreateBitmap( 16, 8, 1, 1, pattern_bits ); + ok(hbmp != 0, "should get a pattern bitmap\n"); + ok(GetBitmapAttributes(hbmp) == 0,"\n"); + + hbmpso = SetBitmapAttributes(hbmp, 1); + ok(hbmpso != 0, "should get stock pattern bitmap\n"); + ok(GetBitmapAttributes(hbmpso) == 1,"\n"); + ok(hbmpso != hbmp,"\n"); + + DeleteObject(hbmpso); + ret = GetObjectW(hbmpso, sizeof(bm), &bm); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); + + hbmpsoc = ClearBitmapAttributes(hbmpso, 1); + ok(hbmpsoc != 0, "should get pattern bitmap\n"); + ok(GetBitmapAttributes(hbmp) == 0,"\n"); + ok(hbmpsoc == hbmp,"\n"); + + DeleteObject(hbmp); + ret = GetObjectW(hbmp, sizeof(bm), &bm); + ok(ret == 0, "GetObject returned %d\n", ret); +} + START_TEST(CreateBitmap) { Test_CreateBitmap_Params(); Test_CreateBitmap(); - + Test_BitmapAttributes(); }

1 0

[reactos] 01/01: [NtGDI] Set owner after changing object type.
by James Tabor 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72f115d6edda81a5f97a4… commit 72f115d6edda81a5f97a4da085f3f5b215542df1 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Sep 27 23:49:35 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Sep 27 23:49:35 2021 -0500 [NtGDI] Set owner after changing object type. --- win32ss/gdi/ntgdi/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index 7bd97e3fa6d..07c16e0bcae 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -1501,7 +1501,7 @@ GDIOBJ_ConvertFromStockObj(HGDIOBJ *phObj) /* Update the entry */ pentry->FullUnique &= ~GDI_ENTRY_STOCK_MASK; - pentry->ObjectOwner.ulObj = 0; + pentry->ObjectOwner.ulObj = PtrToUlong(PsGetCurrentProcessId()); /* Get the pointer to the BASEOBJECT */ pobj = pentry->einfo.pobj;

1 0

[reactos] 01/01: [NtGDI] Fix leaking of bitmaps while testing INFO DC's.
by James Tabor 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9f8b8b0338a49449ae60… commit d9f8b8b0338a49449ae608bf45f8943c2a8cfc84 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Sep 27 23:11:33 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Sep 27 23:11:33 2021 -0500 [NtGDI] Fix leaking of bitmaps while testing INFO DC's. Soon to be commit test for metafiles. ret = MaskBlt(hdc, 0, 0, 3, 4, dib_hdc, 0, 0, mask_bitmap, 0, 0, SRCCOPY); --- win32ss/gdi/ntgdi/bitblt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index 1fca961e471..17172732a8c 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -385,6 +385,7 @@ NtGdiMaskBlt( if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiMaskBlt\n", hdcDest, hdcSrc); + if(psurfMask) SURFACE_ShareUnlockSurface(psurfMask); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -396,6 +397,7 @@ NtGdiMaskBlt( { if(DCSrc) DC_UnlockDc(DCSrc); WARN("Invalid destination dc handle (0x%p) passed to NtGdiMaskBlt\n", hdcDest); + if(psurfMask) SURFACE_ShareUnlockSurface(psurfMask); return FALSE; } @@ -404,6 +406,7 @@ NtGdiMaskBlt( if(DCSrc) DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ + if(psurfMask) SURFACE_ShareUnlockSurface(psurfMask); return TRUE; } @@ -415,6 +418,7 @@ NtGdiMaskBlt( DC_UnlockDc(DCDest); DC_UnlockDc(DCSrc); /* Yes, Windows really returns TRUE in this case */ + if(psurfMask) SURFACE_ShareUnlockSurface(psurfMask); return TRUE; } }

1 0

[reactos] 01/01: [GDI32] Fix IV msvc build.
by James Tabor 28 Sep '21

28 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8767aada7563962a1e301… commit 8767aada7563962a1e3015a4dcbab22770c59850 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Sep 27 19:08:43 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Sep 27 19:08:43 2021 -0500 [GDI32] Fix IV msvc build. --- win32ss/gdi/gdi32/objects/dc.c | 22 ++++++++++++++++++++-- win32ss/gdi/gdi32/wine/emfdc.c | 14 +++++++------- win32ss/gdi/gdi32/wine/metadc.c | 4 ++-- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/dc.c b/win32ss/gdi/gdi32/objects/dc.c index f929dfdd011..3f20b9f6392 100644 --- a/win32ss/gdi/gdi32/objects/dc.c +++ b/win32ss/gdi/gdi32/objects/dc.c @@ -1314,8 +1314,26 @@ SelectPalette( HPALETTE hpal, BOOL bForceBackground) { - HANDLE_METADC(HPALETTE, SelectPalette, NULL, hdc, hpal); - + if (GDI_HANDLE_GET_TYPE(hdc) != GDILoObjType_LO_DC_TYPE) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_METADC16_TYPE) + { + return (HPALETTE)((ULONG_PTR)METADC_SelectPalette(hdc, hpal)); + } + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + if ( pLDC->iType == LDC_EMFLDC && !(EMFDC_SelectPalette(pLDC, hpal)) ) + { + return NULL; + } + } + } return NtUserSelectPalette(hdc, hpal, bForceBackground); } diff --git a/win32ss/gdi/gdi32/wine/emfdc.c b/win32ss/gdi/gdi32/wine/emfdc.c index 75abcf94837..c396f3df3a3 100644 --- a/win32ss/gdi/gdi32/wine/emfdc.c +++ b/win32ss/gdi/gdi32/wine/emfdc.c @@ -184,7 +184,7 @@ static UINT get_bitmap_info( HDC *hdc, HBITMAP *bitmap, BITMAPINFO *info ) bpp = info->bmiHeader.biBitCount; if (bpp <= 8) - return sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + return sizeof(BITMAPINFOHEADER) + (1L << bpp) * sizeof(RGBQUAD); else if (bpp == 16 || bpp == 32) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); @@ -853,7 +853,7 @@ static BOOL emfdc_polylinegon( WINEDC *dc_attr, const POINT *points, INT count, DWORD size; BOOL ret, use_small_emr = can_use_short_points( points, count ); - size = use_small_emr ? offsetof( EMRPOLYLINE16, apts[count] ) : offsetof( EMRPOLYLINE, aptl[count] ); + size = use_small_emr ? (DWORD)offsetof( EMRPOLYLINE16, apts[count] ) : (DWORD)offsetof( EMRPOLYLINE, aptl[count] ); emr = HeapAlloc( GetProcessHeap(), 0, size ); emr->emr.iType = use_small_emr ? type + EMR_POLYLINE16 - EMR_POLYLINE : type; @@ -970,8 +970,8 @@ BOOL EMFDC_PolyDraw( WINEDC *dc_attr, const POINT *pts, const BYTE *types, DWORD BOOL use_small_emr = can_use_short_points( pts, count ); DWORD size; - size = use_small_emr ? offsetof( EMRPOLYDRAW16, apts[count] ) - : offsetof( EMRPOLYDRAW, aptl[count] ); + size = use_small_emr ? (DWORD)offsetof( EMRPOLYDRAW16, apts[count] ) + : (DWORD)offsetof( EMRPOLYDRAW, aptl[count] ); size += (count + 3) & ~3; if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; @@ -2273,7 +2273,7 @@ BOOL EMFDC_WriteNamedEscape( WINEDC *dc_attr, PWCHAR pDriver, INT nEscape, INT c rounded_size = (cbInput+3) & ~3; total = offsetof(EMRNAMEDESCAPE,Data) + rounded_size; - total += sizestr = (wcslen(pDriver) + 1 ) * sizeof(WCHAR); + total += sizestr = (UINT)((wcslen(pDriver) + 1 ) * sizeof(WCHAR)); pemr = RtlAllocateHeap( GetProcessHeap(), 0, total ); if ( !pemr ) @@ -2369,8 +2369,8 @@ HDC WINAPI CreateEnhMetaFileA( HDC hdc, const char *filename, const RECT *rect, if(description) { - len1 = strlen(description); - len2 = strlen(description + len1 + 1); + len1 = (DWORD)strlen(description); + len2 = (DWORD)strlen(description + len1 + 1); total = MultiByteToWideChar( CP_ACP, 0, description, len1 + len2 + 3, NULL, 0 ); descriptionW = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, description, len1 + len2 + 3, descriptionW, total ); diff --git a/win32ss/gdi/gdi32/wine/metadc.c b/win32ss/gdi/gdi32/wine/metadc.c index 38ba8e6f641..c159880c93b 100644 --- a/win32ss/gdi/gdi32/wine/metadc.c +++ b/win32ss/gdi/gdi32/wine/metadc.c @@ -667,7 +667,7 @@ static INT16 metadc_create_region( struct metadc *metadc, HRGN hrgn ) mr->rdParm[1] = 6; mr->rdParm[2] = 0x2f6; mr->rdParm[3] = 0; - mr->rdParm[4] = (param - &mr->rdFunction) * sizeof(WORD); + mr->rdParm[4] = (WORD)((param - &mr->rdFunction) * sizeof(WORD)); mr->rdParm[5] = bands; mr->rdParm[6] = max_bounds; mr->rdParm[7] = rgndata->rdh.rcBound.left; @@ -757,7 +757,7 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT bpp = src_info.bmiHeader.biBitCount; if (bpp <= 8) - bmi_size = sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + bmi_size = sizeof(BITMAPINFOHEADER) + (1L << bpp) * sizeof(RGBQUAD); else if (bpp == 16 || bpp == 32) bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); else

1 0

[reactos] 01/01: [GDI32] Fix III msvc build.
by James Tabor 27 Sep '21

27 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be4540821accfd8ae668a… commit be4540821accfd8ae668ab13957be40ca6464bce Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Sep 27 18:19:49 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Sep 27 18:19:49 2021 -0500 [GDI32] Fix III msvc build. --- win32ss/gdi/gdi32/include/gdi32p.h | 18 +++++++++--------- win32ss/gdi/gdi32/wine/emfdc.c | 19 ++++++++----------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index b5f29b7c5e6..b2dab4ef879 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -602,7 +602,7 @@ METADC_ExtTextOutW( SetLastError(ERROR_INVALID_HANDLE); \ return (_RetType)_Ret; \ } \ - if ( pLDC->iType == LDC_EMFLDC && !(_Ret = (_RetType)EMFDC_##_Func(pLDC, __VA_ARGS__)) ) \ + if ( pLDC->iType == LDC_EMFLDC && !(EMFDC_##_Func(pLDC, __VA_ARGS__)) ) \ { \ return (_RetType)_Ret; \ } \ @@ -634,7 +634,7 @@ METADC_ExtTextOutW( SetLastError(ERROR_INVALID_HANDLE); \ return (_RetType)_Ret; \ } \ - if ( pLDC->iType == LDC_EMFLDC && !(_Ret = (_RetType)EMFDC_##_Func(pLDC)) ) \ + if ( pLDC->iType == LDC_EMFLDC && !(EMFDC_##_Func(pLDC)) ) \ { \ return (_RetType)_Ret; \ } \ @@ -656,7 +656,7 @@ METADC_ExtTextOutW( SetLastError(ERROR_INVALID_HANDLE); \ return (_RetType)_Ret; \ } \ - if ( pLDC->iType == LDC_EMFLDC && !(_Ret = EMFDC_##_Func(pLDC, __VA_ARGS__)) ) \ + if ( pLDC->iType == LDC_EMFLDC && !(EMFDC_##_Func(pLDC, __VA_ARGS__)) ) \ { \ return (_RetType)_Ret; \ } \ @@ -679,7 +679,7 @@ METADC_ExtTextOutW( SetLastError(ERROR_INVALID_HANDLE); \ return (_RetType)_Ret; \ } \ - if ( pLDC->iType == LDC_EMFLDC && !(_Ret = (_RetType)EMFDC_##_Func(pLDC)) ) \ + if ( pLDC->iType == LDC_EMFLDC && !(EMFDC_##_Func(pLDC)) ) \ { \ return (_RetType)_Ret; \ } \ @@ -767,7 +767,7 @@ extern BOOL METADC_SetWindowOrgEx( HDC, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_StretchBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, DWORD rop ); -extern INT METADC_StretchDIBits( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, +extern BOOL METADC_StretchDIBits( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; @@ -785,7 +785,7 @@ extern BOOL EMFDC_BeginPath( LDC *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_BitBlt( LDC *dc_attr, INT x_dst, INT y_dst, INT width, INT height, HDC hdc_src, INT x_src, INT y_src, DWORD rop ); extern BOOL EMFDC_CloseFigure( LDC *dc_attr ) DECLSPEC_HIDDEN; -extern void EMFDC_DeleteDC( LDC *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_DeleteDC( LDC *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( LDC *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_EndPath( LDC *dc_attr ) DECLSPEC_HIDDEN; @@ -842,7 +842,7 @@ extern BOOL EMFDC_SetBkColor( LDC *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( LDC *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetDCBrushColor( LDC *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetDCPenColor( LDC *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; -extern INT EMFDC_SetDIBitsToDevice( LDC *dc_attr, INT x_dest, INT y_dest, DWORD width, +extern BOOL EMFDC_SetDIBitsToDevice( LDC *dc_attr, INT x_dest, INT y_dest, DWORD width, DWORD height, INT x_src, INT y_src, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; @@ -878,8 +878,8 @@ BOOL EMFDC_PlgBlt( LDC *dc_attr, const POINT * ppt, HDC hdcSrc, INT xSrc, INT yS BOOL EMFDC_TransparentBlt( LDC *dc_attr, INT xDst, INT yDst, INT cxDst, INT cyDst, HDC hdcSrc, INT xSrc, INT ySrc, INT cxSrc, INT cySrc, UINT crTransparent); BOOL EMFDC_SetBrushOrg( LDC *dc_attr, INT x, INT y); BOOL EMFDC_SetMetaRgn( LDC *dc_attr ); -INT EMFDC_WriteNamedEscape( LDC *dc_attr, PWCHAR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData); -INT EMFDC_WriteEscape( LDC *dc_attr, INT nEscape, INT cbInput, LPSTR lpszInData, DWORD emrType); +BOOL EMFDC_WriteNamedEscape( LDC *dc_attr, PWCHAR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData); +BOOL EMFDC_WriteEscape( LDC *dc_attr, INT nEscape, INT cbInput, LPSTR lpszInData, DWORD emrType); FORCEINLINE BOOL EMFDC_Arc( PLDC dc_attr, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) diff --git a/win32ss/gdi/gdi32/wine/emfdc.c b/win32ss/gdi/gdi32/wine/emfdc.c index 7a1f68c2311..75abcf94837 100644 --- a/win32ss/gdi/gdi32/wine/emfdc.c +++ b/win32ss/gdi/gdi32/wine/emfdc.c @@ -1944,7 +1944,7 @@ BOOL EMFDC_SetArcDirection( WINEDC *dc_attr, INT dir ) return emfdc_record( dc_attr->emf, &emr.emr ); } -INT EMFDC_ExcludeClipRect( WINEDC *dc_attr, INT left, INT top, INT right, INT bottom ) +BOOL EMFDC_ExcludeClipRect( WINEDC *dc_attr, INT left, INT top, INT right, INT bottom ) { EMREXCLUDECLIPRECT emr; @@ -2215,7 +2215,7 @@ BOOL EMFDC_WidenPath( WINEDC *dc_attr ) return emfdc_record( dc_attr->emf, &emr.emr ); } -void EMFDC_DeleteDC( WINEDC *dc_attr ) +BOOL EMFDC_DeleteDC( WINEDC *dc_attr ) { struct emf *emf = dc_attr->emf; UINT index; @@ -2225,6 +2225,7 @@ void EMFDC_DeleteDC( WINEDC *dc_attr ) if (emf->handles[index]) GDI_hdc_not_using_object( emf->handles[index], emf->dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); + return TRUE; } // @@ -2235,12 +2236,11 @@ void EMFDC_DeleteDC( WINEDC *dc_attr ) // // ReactOS Print Support // -INT -EMFDC_WriteEscape( WINEDC *dc_attr, INT nEscape, INT cbInput, LPSTR lpszInData, DWORD emrType) +BOOL EMFDC_WriteEscape( WINEDC *dc_attr, INT nEscape, INT cbInput, LPSTR lpszInData, DWORD emrType) { PEMRESCAPE pemr; UINT total, rounded_size; - INT ret; + BOOL ret; rounded_size = (cbInput+3) & ~3; total = offsetof(EMRESCAPE,Data) + rounded_size; @@ -2264,8 +2264,7 @@ EMFDC_WriteEscape( WINEDC *dc_attr, INT nEscape, INT cbInput, LPSTR lpszInData, return ret; } -INT -EMFDC_WriteNamedEscape( WINEDC *dc_attr, PWCHAR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData) +BOOL EMFDC_WriteNamedEscape( WINEDC *dc_attr, PWCHAR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData) { PEMRNAMEDESCAPE pemr; UINT sizestr, total, rounded_size; @@ -2299,8 +2298,7 @@ EMFDC_WriteNamedEscape( WINEDC *dc_attr, PWCHAR pDriver, INT nEscape, INT cbInpu return ret; } -BOOL -EMFDC_SetMetaRgn( WINEDC *dc_attr ) +BOOL EMFDC_SetMetaRgn( WINEDC *dc_attr ) { EMRSETMETARGN emr; @@ -2310,8 +2308,7 @@ EMFDC_SetMetaRgn( WINEDC *dc_attr ) return emfdc_record( dc_attr->emf, &emr.emr ); } -BOOL -EMFDC_SetBrushOrg( WINEDC *dc_attr, INT x, INT y) +BOOL EMFDC_SetBrushOrg( WINEDC *dc_attr, INT x, INT y) { EMRSETBRUSHORGEX emr;

1 0

[reactos] 01/01: [GDI32] Fix build errors~~
by Hermès Bélusca-Maïto 27 Sep '21

27 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6306db0c34ebc8699732… commit e6306db0c34ebc8699732d484738a3c9ee34fb57 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 28 00:45:46 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 28 00:48:24 2021 +0200 [GDI32] Fix build errors~~ --- win32ss/gdi/gdi32/wine/emfdc.c | 18 +++++++++--------- win32ss/gdi/gdi32/wine/gdi_private.h | 33 +++++++++++++++++++++++---------- win32ss/gdi/gdi32/wine/metadc.c | 32 ++++++++++++++++---------------- 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/win32ss/gdi/gdi32/wine/emfdc.c b/win32ss/gdi/gdi32/wine/emfdc.c index a067b4b7c64..7a1f68c2311 100644 --- a/win32ss/gdi/gdi32/wine/emfdc.c +++ b/win32ss/gdi/gdi32/wine/emfdc.c @@ -133,8 +133,8 @@ static UINT get_bitmap_info( HDC *hdc, HBITMAP *bitmap, BITMAPINFO *info ) } else { - //unsigned char dib_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - unsigned char dib_info_buffer[sizeof(BITMAPINFO) + 255 * sizeof(RGBQUAD)]; + unsigned char dib_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + + 256*RTL_FIELD_SIZE(BITMAPINFO, bmiColors)]; BITMAPINFO *dib_info = (BITMAPINFO *)dib_info_buffer; BITMAP bmp = dib.dsBm; HPALETTE palette; @@ -275,10 +275,10 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) case BS_PATTERN: case BS_DIBPATTERN: { - EMRCREATEDIBPATTERNBRUSHPT *emr; - //char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char buffer[sizeof(BITMAPINFO) + 255 * sizeof(RGBQUAD)]; + unsigned char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + + 256*RTL_FIELD_SIZE(BITMAPINFO, bmiColors)]; BITMAPINFO *info = (BITMAPINFO *)buffer; + EMRCREATEDIBPATTERNBRUSHPT *emr; DWORD info_size; UINT usage; @@ -1478,8 +1478,8 @@ BOOL EMFDC_MaskBlt( WINEDC *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT he HDC hdc_src, INT x_src, INT y_src, HBITMAP mask, INT x_mask, INT y_mask, DWORD rop ) { - //unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - unsigned char mask_info_buffer[sizeof(BITMAPINFO) + 255 * sizeof(RGBQUAD)]; + unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + + 256*RTL_FIELD_SIZE(BITMAPINFO, bmiColors)]; BITMAPINFO *mask_bits_info = (BITMAPINFO *)mask_info_buffer; struct emf *emf = dc_attr->emf; BITMAPINFO mask_info = {{ sizeof( mask_info.bmiHeader ) }}; @@ -1584,8 +1584,8 @@ err: BOOL EMFDC_PlgBlt( WINEDC *dc_attr, const POINT *points, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) { - //unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - unsigned char mask_info_buffer[sizeof(BITMAPINFO) + 255 * sizeof(RGBQUAD)]; + unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + + 256*RTL_FIELD_SIZE(BITMAPINFO, bmiColors)]; BITMAPINFO *mask_bits_info = (BITMAPINFO *)mask_info_buffer; struct emf *emf = dc_attr->emf; BITMAPINFO mask_info = {{ sizeof( mask_info.bmiHeader ) }}; diff --git a/win32ss/gdi/gdi32/wine/gdi_private.h b/win32ss/gdi/gdi32/wine/gdi_private.h index de49fae2a47..2c8e2fc2ac4 100644 --- a/win32ss/gdi/gdi32/wine/gdi_private.h +++ b/win32ss/gdi/gdi32/wine/gdi_private.h @@ -27,15 +27,28 @@ #include "winbase.h" #include "wingdi.h" -#define GDILoObjType_LO_DC_TYPE 0x10000 -#define GDILoObjType_LO_FONT_TYPE 0xa0000 -#define GDILoObjType_LO_BRUSH_TYPE 0x100000 -#define GDILoObjType_LO_ALTDC_TYPE 0x210000 -#define GDILoObjType_LO_PEN_TYPE 0x300000 -#define GDILoObjType_LO_EXTPEN_TYPE 0x500000 -#define GDILoObjType_LO_METAFILE16_TYPE 0x260000 -#define GDILoObjType_LO_METAFILE_TYPE 0x460000 -#define GDILoObjType_LO_METADC16_TYPE 0x660000 +#ifndef _NTGDITYP_ +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_UMPD_TYPE = 0x110000, + GDILoObjType_LO_META_TYPE = 0x150000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; +#endif #define GDI_HANDLE_TYPE_MASK 0x007f0000 #define GDI_HANDLE_GET_TYPE(h) \ @@ -50,7 +63,7 @@ BOOL APIENTRY NtGdiGetTransform(_In_ HDC hdc,_In_ DWORD iXform, _Out_ LPXFORM px BOOL WINAPI GetBoundsRectAlt(HDC hdc,LPRECT prc,UINT flags); BOOL WINAPI SetBoundsRectAlt(HDC hdc,LPRECT prc,UINT flags); -HGDIOBJ WINAPI GdiCreateClientObj(_In_ PVOID pvObject,_In_ UINT eObjType); +HGDIOBJ WINAPI GdiCreateClientObj(_In_ PVOID pvObject, _In_ GDILOOBJTYPE eObjType); PVOID WINAPI GdiGetClientObjLink(_In_ HGDIOBJ hobj); PVOID WINAPI GdiDeleteClientObj(_In_ HGDIOBJ hobj); diff --git a/win32ss/gdi/gdi32/wine/metadc.c b/win32ss/gdi/gdi32/wine/metadc.c index 48c66f02ab3..38ba8e6f641 100644 --- a/win32ss/gdi/gdi32/wine/metadc.c +++ b/win32ss/gdi/gdi32/wine/metadc.c @@ -114,8 +114,8 @@ static BOOL metadc_param1( HDC hdc, short func, short param ) static BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[2])]; - char buffer[10]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + 2*RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD); @@ -128,8 +128,8 @@ static BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) static BOOL metadc_param4( HDC hdc, short func, short param1, short param2, short param3, short param4 ) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[4])]; - char buffer[14]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + 4*RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD); @@ -144,8 +144,8 @@ static BOOL metadc_param4( HDC hdc, short func, short param1, short param2, static BOOL metadc_param5( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5 ) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[5])]; - char buffer[16]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + 5*RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD); @@ -162,8 +162,8 @@ static BOOL metadc_param6( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6 ) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[6])]; - char buffer[18]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + 6*RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD); @@ -181,8 +181,8 @@ static BOOL metadc_param8( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6, short param7, short param8) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[8])]; - char buffer[22]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + 8*RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD); @@ -559,8 +559,8 @@ static INT16 metadc_create_brush( struct metadc *metadc, HBRUSH brush ) case BS_PATTERN: case BS_DIBPATTERN: { - //char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char buffer[sizeof(BITMAPINFO) + 255 * sizeof(RGBQUAD)]; + unsigned char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + + 256*RTL_FIELD_SIZE(BITMAPINFO, bmiColors)]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; DWORD info_size; UINT usage; @@ -1067,12 +1067,12 @@ static HBRUSH METADC_SelectBrush( HDC hdc, HBRUSH hbrush ) static UINT16 metadc_create_font( struct metadc *metadc, HFONT font, LOGFONTW *logfont ) { - char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + sizeof(LOGFONT16)]; METARECORD *mr = (METARECORD *)&buffer; LOGFONT16 *font16; INT written; - mr->rdSize = (sizeof(METARECORD) + sizeof(LOGFONT16) - 2) / 2; + mr->rdSize = sizeof(buffer) / sizeof(WORD); mr->rdFunction = META_CREATEFONTINDIRECT; font16 = (LOGFONT16 *)&mr->rdParm; @@ -1124,8 +1124,8 @@ static HFONT METADC_SelectFont( HDC hdc, HFONT hfont ) static UINT16 metadc_create_pen( struct metadc *metadc, HPEN pen, LOGPEN16 *logpen ) { - //char buffer[FIELD_OFFSET(METARECORD, rdParm[sizeof(*logpen) / sizeof(WORD)])]; - char buffer[sizeof(METARECORD) - 2 + sizeof(*logpen)]; + unsigned char buffer[FIELD_OFFSET(METARECORD, rdParm) + + (sizeof(*logpen) / sizeof(WORD)) * RTL_FIELD_SIZE(METARECORD, rdParm)]; METARECORD *mr = (METARECORD *)&buffer; mr->rdSize = sizeof(buffer) / sizeof(WORD);

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