Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 discussions

[reactos] 01/01: [SHELL32][SHELL32_APITESTS] SHDefExtractIcon zero icon size as sysmetric (#7768)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5461abeeba643d6ba1cce… commit 5461abeeba643d6ba1cce3f0610b023f71afc1e9 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Mar 9 15:41:53 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 9 15:41:53 2025 +0100 [SHELL32][SHELL32_APITESTS] SHDefExtractIcon zero icon size as sysmetric (#7768) --- dll/win32/shell32/iconcache.cpp | 3 + .../rostests/apitests/shell32/ExtractIconEx.cpp | 85 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 90 insertions(+) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 392d5fa75ea..e0d8b179ecb 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -1019,6 +1019,9 @@ HRESULT WINAPI SHDefExtractIconW(LPCWSTR pszIconFile, int iIndex, UINT uFlags, HICON hIcons[2]; WARN("%s %d 0x%08x %p %p %d, semi-stub\n", debugstr_w(pszIconFile), iIndex, uFlags, phiconLarge, phiconSmall, nIconSize); + if (!nIconSize) + nIconSize = MAKELONG(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CXSMICON)); + ret = PrivateExtractIconsW(pszIconFile, iIndex, nIconSize, nIconSize, hIcons, NULL, 2, LR_DEFAULTCOLOR); /* FIXME: deal with uFlags parameter which contains GIL_ flags */ if (ret == 0xFFFFFFFF) diff --git a/modules/rostests/apitests/shell32/ExtractIconEx.cpp b/modules/rostests/apitests/shell32/ExtractIconEx.cpp index 244081199f3..d8e9fd4b564 100644 --- a/modules/rostests/apitests/shell32/ExtractIconEx.cpp +++ b/modules/rostests/apitests/shell32/ExtractIconEx.cpp @@ -9,6 +9,28 @@ #include "shelltest.h" #include <stdio.h> +EXTERN_C BOOL WINAPI SHAreIconsEqual(HICON hIcon1, HICON hIcon2); + +static void SafeDestroyIcon(HICON hIco) +{ + if (hIco) + DestroyIcon(hIco); +} + +static UINT GetIcoSize(HICON hIco) +{ + ICONINFO info; + if (!GetIconInfo(hIco, &info)) + return 0; + + BITMAP bm; + if (!GetObject(info.hbmColor ? info.hbmColor : info.hbmMask, sizeof(bm), &bm)) + bm.bmWidth = 0; + DeleteObject(info.hbmMask); + DeleteObject(info.hbmColor); + return bm.bmWidth; +} + typedef struct { PCWSTR pszFilePath; @@ -122,3 +144,66 @@ START_TEST(ExtractIconEx) DeleteFileA(FileName[0]); DeleteFileA(FileName[1]); } + +static HRESULT SHDEI(LPCWSTR pszIconFile, int Index = 0, UINT GIL = 0, UINT Size = 0) +{ + HICON hIco = NULL; + HRESULT hr = SHDefExtractIcon(pszIconFile, Index, GIL, &hIco, NULL, Size); + if (hr == S_OK) + { + hr = GetIcoSize(hIco); + SafeDestroyIcon(hIco); + } + return hr; +} + +START_TEST(SHDefExtractIcon) +{ + HRESULT hr; + int SysBigIconSize = GetSystemMetrics(SM_CXICON); + + // Modern Windows requires the system image list to be initialized for GIL_SIMULATEDOC to work! + SHFILEINFOW shfi; + SHGetFileInfoW(L"x", 0, &shfi, sizeof(shfi), SHGFI_SYSICONINDEX | SHGFI_USEFILEATTRIBUTES); + + WCHAR path[MAX_PATH]; + GetSystemDirectoryW(path, _countof(path)); + PathAppendW(path, L"user32.dll"); + int index = 1; + + ok(SHDEI(path, index, 0, 0) == SysBigIconSize, "0 size must match GetSystemMetrics\n"); + ok(SHDEI(path, index, 0, SysBigIconSize * 2) == SysBigIconSize * 2, "Resize failed\n"); + + HICON hIcoLarge, hIcoSmall; + if (SHDefExtractIcon(path, index, 0, &hIcoLarge, &hIcoSmall, 0) != S_OK) + hIcoLarge = hIcoSmall = NULL; + ok(hIcoLarge && hIcoSmall && !SHAreIconsEqual(hIcoLarge, hIcoSmall), "Large+Small failed\n"); + SafeDestroyIcon(hIcoLarge); + SafeDestroyIcon(hIcoSmall); + + static const int sizes[] = { 0, SysBigIconSize * 2 }; + for (UINT i = 0; i < _countof(sizes); ++i) + { + HICON hIcoNormal, hIcoSimDoc; + if (FAILED(hr = SHDefExtractIcon(path, index, 0, &hIcoNormal, NULL, sizes[i]))) + hIcoNormal = NULL; + if (FAILED(hr = SHDefExtractIcon(path, index, GIL_SIMULATEDOC, &hIcoSimDoc, NULL, sizes[i]))) + hIcoSimDoc = NULL; + ok(hIcoNormal && hIcoSimDoc && !SHAreIconsEqual(hIcoNormal, hIcoSimDoc), "GIL_SIMULATEDOC failed\n"); + SafeDestroyIcon(hIcoNormal); + SafeDestroyIcon(hIcoSimDoc); + } + + GetTempPathW(_countof(path), path); + GetTempFileNameW(path, L"TEST", 0, path); + ok(SHDEI(path) == S_FALSE, "Empty file should return S_FALSE\n"); + HANDLE hFile = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + DWORD io; + WriteFile(hFile, "!", 1, &io, NULL); + CloseHandle(hFile); + ok(SHDEI(path) == S_FALSE, "File without icons should return S_FALSE\n"); + } + DeleteFile(path); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 1c964c36be4..cc5398ddb68 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -34,6 +34,7 @@ extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); +extern void func_SHDefExtractIcon(void); extern void func_SHEnumerateUnreadMailAccountsW(void); extern void func_She(void); extern void func_ShellExec_RunDLL(void); @@ -89,6 +90,7 @@ const struct test winetest_testlist[] = { "SHCreateDataObject", func_SHCreateDataObject }, { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, + { "SHDefExtractIcon", func_SHDefExtractIcon }, { "SHEnumerateUnreadMailAccountsW", func_SHEnumerateUnreadMailAccountsW }, { "She", func_She }, { "ShellExec_RunDLL", func_ShellExec_RunDLL },

3 weeks, 2 days

[reactos] 01/01: [PSAPI][KERNEL32] Convert the PSAPI exports to a static library (#7708)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdda5b93d714adbe828fe… commit bdda5b93d714adbe828fe18c5cb785ed76f8861f Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Sun Mar 9 04:09:59 2025 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 9 04:09:59 2025 -0700 [PSAPI][KERNEL32] Convert the PSAPI exports to a static library (#7708) This behavior is straight out of win7 where this logic was moved to KernelBase and friends. Required for thousands of apps. But also just preps for the KernelBase sync from Wine-10 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/kernel32/kernel32.spec | 27 ++++++++++++++ dll/win32/psapi/CMakeLists.txt | 8 +++-- dll/win32/psapi/main.c | 74 +++++++++++++++++++++++++++++++++++++++ dll/win32/psapi/psapi.c | 61 -------------------------------- 5 files changed, 108 insertions(+), 64 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 4661ef9b0cb..b037e697800 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -130,7 +130,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) set_subsystem(kernel32 console) ################# END HACK ################# -target_link_libraries(kernel32 kernel32_vista_static kernel32_shared wine chkstk ${PSEH_LIB}) +target_link_libraries(kernel32 psapi_static kernel32_vista_static kernel32_shared wine chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 831681d1aaa..149a4f8f7ba 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -760,6 +760,33 @@ @ stdcall IsValidLocale(long long) @ stdcall -version=0x501-0x502 IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) +@ stdcall -version=0x601+ K32EmptyWorkingSet(long) EmptyWorkingSet +@ stdcall -version=0x601+ K32EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers +@ stdcall -version=0x601+ K32EnumPageFilesA(ptr ptr) EnumPageFilesA +@ stdcall -version=0x601+ K32EnumPageFilesW(ptr ptr) EnumPageFilesW +@ stdcall -version=0x601+ K32EnumProcessModules(long ptr long ptr) EnumProcessModules +@ stdcall -stub -version=0x601+ K32EnumProcessModulesEx(long ptr long ptr long); EnumProcessModulesEx +@ stdcall -version=0x601+ K32EnumProcesses(ptr long ptr) EnumProcesses +@ stdcall -version=0x601+ K32GetDeviceDriverBaseNameA(ptr ptr long) GetDeviceDriverBaseNameA +@ stdcall -version=0x601+ K32GetDeviceDriverBaseNameW(ptr ptr long) GetDeviceDriverBaseNameW +@ stdcall -version=0x601+ K32GetDeviceDriverFileNameA(ptr ptr long) GetDeviceDriverFileNameA +@ stdcall -version=0x601+ K32GetDeviceDriverFileNameW(ptr ptr long) GetDeviceDriverFileNameW +@ stdcall -version=0x601+ K32GetMappedFileNameA(long ptr ptr long) GetMappedFileNameA +@ stdcall -version=0x601+ K32GetMappedFileNameW(long ptr ptr long) GetMappedFileNameW +@ stdcall -version=0x601+ K32GetModuleBaseNameA(long long ptr long) GetModuleBaseNameA +@ stdcall -version=0x601+ K32GetModuleBaseNameW(long long ptr long) GetModuleBaseNameW +@ stdcall -version=0x601+ K32GetModuleFileNameExA(long long ptr long) GetModuleFileNameExA +@ stdcall -version=0x601+ K32GetModuleFileNameExW(long long ptr long) GetModuleFileNameExW +@ stdcall -version=0x601+ K32GetModuleInformation(long long ptr long) GetModuleInformation +@ stdcall -version=0x601+ K32GetPerformanceInfo(ptr long) GetPerformanceInfo +@ stdcall -version=0x601+ K32GetProcessImageFileNameA(long ptr long) GetProcessImageFileNameA +@ stdcall -version=0x601+ K32GetProcessImageFileNameW(long ptr long) GetProcessImageFileNameW +@ stdcall -version=0x601+ K32GetProcessMemoryInfo(long ptr long) GetProcessMemoryInfo +@ stdcall -version=0x601+ K32GetWsChanges(long ptr long) GetWsChanges +@ stdcall -stub -version=0x601+ K32GetWsChangesEx(long ptr ptr); GetWsChangesEx +@ stdcall -version=0x601+ K32InitializeProcessForWsWatch(long) InitializeProcessForWsWatch +@ stdcall -version=0x601+ K32QueryWorkingSet(long ptr long) QueryWorkingSet +@ stdcall -version=0x601+ K32QueryWorkingSetEx(long ptr long) QueryWorkingSetEx @ stdcall -version=0x600+ LCIDToLocaleName(long wstr long long) @ stdcall LCMapStringA(long long str long ptr long) @ stdcall -version=0x600+ LCMapStringEx(long long wstr long ptr long ptr ptr long) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index 60c1398b70e..8a45c7b5d2e 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -1,13 +1,17 @@ spec2def(psapi.dll psapi.spec ADD_IMPORTLIB) +list(APPEND PSAPI_STATIC_SOURCE psapi.c) +add_library(psapi_static ${PSAPI_STATIC_SOURCE}) +add_dependencies(psapi_static psdk) + list(APPEND SOURCE - psapi.c + main.c psapi.rc ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi MODULE ${SOURCE}) set_module_type(psapi win32dll ENTRYPOINT DllMain 12) -target_link_libraries(psapi ${PSEH_LIB}) +target_link_libraries(psapi psapi_static ${PSEH_LIB}) add_importlibs(psapi kernel32 ntdll) add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/psapi/main.c b/dll/win32/psapi/main.c new file mode 100644 index 00000000000..f93f2ca9c93 --- /dev/null +++ b/dll/win32/psapi/main.c @@ -0,0 +1,74 @@ +/* + * PROJECT: ReactOS Process Status Helper Library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: PSAPI Win2k3 style entrypoint + * COPYRIGHT: Copyright 2013 Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#define NTOS_MODE_USER +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> + +#include <psapi.h> + +#define NDEBUG +#include <debug.h> + +static +VOID +NTAPI +PsParseCommandLine(VOID) +{ + UNIMPLEMENTED; +} + +static +VOID +NTAPI +PsInitializeAndStartProfile(VOID) +{ + UNIMPLEMENTED; +} + +static +VOID +NTAPI +PsStopAndAnalyzeProfile(VOID) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +BOOLEAN +WINAPI +DllMain(HINSTANCE hDllHandle, + DWORD nReason, + LPVOID Reserved) +{ + switch(nReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hDllHandle); + if (NtCurrentPeb()->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_PROFILE_USER) + { + PsParseCommandLine(); + PsInitializeAndStartProfile(); + } + break; + + case DLL_PROCESS_DETACH: + if (NtCurrentPeb()->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_PROFILE_USER) + { + PsStopAndAnalyzeProfile(); + } + break; + } + return TRUE; +} diff --git a/dll/win32/psapi/psapi.c b/dll/win32/psapi/psapi.c index c73f3176d3b..bf47f8e2ceb 100644 --- a/dll/win32/psapi/psapi.c +++ b/dll/win32/psapi/psapi.c @@ -244,67 +244,6 @@ CallBackConvertToAscii(LPVOID pContext, return Ret; } -/* - * @unimplemented - */ -static VOID NTAPI -PsParseCommandLine(VOID) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -static VOID NTAPI -PsInitializeAndStartProfile(VOID) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -static VOID NTAPI -PsStopAndAnalyzeProfile(VOID) -{ - UNIMPLEMENTED; -} - -/* PUBLIC *********************************************************************/ - -/* - * @implemented - */ -BOOLEAN -WINAPI -DllMain(HINSTANCE hDllHandle, - DWORD nReason, - LPVOID Reserved) -{ - switch(nReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hDllHandle); - if (NtCurrentPeb()->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_PROFILE_USER) - { - PsParseCommandLine(); - PsInitializeAndStartProfile(); - } - break; - - case DLL_PROCESS_DETACH: - if (NtCurrentPeb()->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_PROFILE_USER) - { - PsStopAndAnalyzeProfile(); - } - break; - } - - return TRUE; -} - - /* * @implemented */

3 weeks, 2 days

[reactos] 02/02: [USER32_VISTA][USER32] Sync some parts with WINE-10.0

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dccccc2a3004be81bd6e… commit 6dccccc2a3004be81bd6e6d2d257c4863c0f5f67 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Tue Jan 28 03:47:40 2025 -0800 Commit: Justin Miller <justinmiller100(a)gmail.com> CommitDate: Sun Mar 9 04:07:55 2025 -0700 [USER32_VISTA][USER32] Sync some parts with WINE-10.0 --- media/doc/WINESYNC.txt | 3 + win32ss/user/user32/CMakeLists.txt | 2 +- win32ss/user/user32/user32.spec | 50 +++++ win32ss/user/user32_vista/CMakeLists.txt | 20 +- win32ss/user/user32_vista/dpi.c | 93 ++++++++- win32ss/user/user32_vista/wine/input.c | 133 ++++++++++++- win32ss/user/user32_vista/wine/misc.c | 147 ++++++++++++++- win32ss/user/user32_vista/wine/sysparams.c | 291 +++++++++++++++++++++++++++++ win32ss/user/user32_vista/wine/win.c | 14 +- 9 files changed, 747 insertions(+), 6 deletions(-) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 4b82a0cb2c4..3ca038f04d0 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -361,6 +361,9 @@ user32 - win32ss/user/user32/windows/text.c # Forked (lstr.c) win32ss/user/user32/windows/winpos.c # Forked + win32ss/user/user32_vista/input.c # Synced to Wine-10.0 + win32ss/user/user32_vista/misc.c # Synced to Wine-10.0 + win32ss/user/user32_vista/win.c # Synced to Wine-10.0 schannel.c dll/win32/schannel/schannel_wine.c # synced to wine-1.7.17 (secur32/schannel.c) dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index ca2f2a143e2..2e7ac16ac0b 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -81,7 +81,7 @@ add_library(user32 MODULE ${CMAKE_CURRENT_BINARY_DIR}/user32.def) set_module_type(user32 win32dll UNICODE ENTRYPOINT DllMain 12) -target_link_libraries(user32 user32_vista_static user32_wsprintf wine win32ksys ${PSEH_LIB}) +target_link_libraries(user32 user32_vista_static user32_optional_vista user32_wsprintf wine win32ksys ${PSEH_LIB}) add_dependencies(user32 asm) if(MSVC AND (ARCH STREQUAL "i386")) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index 7fe69be95a4..5b52db15f55 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -1,5 +1,6 @@ ; Functions exported by Win 2K3 SP2 @ stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout +@ stdcall -version=0x600+ AddClipboardFormatListener(ptr) @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) @ stdcall AlignRects(ptr long long long) @@ -37,6 +38,8 @@ @ stdcall ChangeDisplaySettingsW(ptr long) @ stdcall ChangeMenuA(long long ptr long long) @ stdcall ChangeMenuW(long long ptr long long) +@ stdcall -version=0x600+ ChangeWindowMessageFilter(ptr long) +@ stdcall -version=0x601+ ChangeWindowMessageFilterEx(ptr long long ptr) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) @@ -67,6 +70,8 @@ @ stdcall ClipCursor(ptr) NtUserClipCursor @ stdcall CloseClipboard() NtUserCloseClipboard @ stdcall CloseDesktop(long) NtUserCloseDesktop +@ stdcall -version=0x601+ CloseGestureInfoHandle(ptr) +@ stdcall -version=0x601+ CloseTouchInputHandle(ptr) @ stdcall CloseWindow(long) @ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @@ -95,6 +100,7 @@ @ stdcall CreateMenu() @ stdcall CreatePopupMenu() @ stdcall CreateSystemThreads(long) +@ stdcall -version=0xA00+ CreateSyntheticPointerDevice(long long long) @ stdcall CreateWindowExA(long str str long long long long long long long long ptr) @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) @ stdcall CreateWindowStationA(str long long ptr) @@ -164,6 +170,8 @@ @ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) +@ stdcall -version=0x600+ DisplayConfigGetDeviceInfo(ptr) +@ stdcall -version=0x600+ DisplayConfigSetDeviceInfo(ptr) @ stdcall DisplayExitWindowsWarnings(long) @ stdcall DlgDirListA(long str long long long) @ stdcall DlgDirListComboBoxA(long ptr long long long) @@ -225,6 +233,7 @@ @ stdcall EnumWindowStationsW(ptr long) @ stdcall EnumWindows(ptr long) @ stdcall EqualRect(ptr ptr) +@ stdcall -version=0x602+ EvaluateProximityToRect(ptr ptr ptr) @ stdcall ExcludeUpdateRgn(long long) NtUserExcludeUpdateRgn @ stdcall ExitWindowsEx(long long) @ stdcall FillRect(long ptr long) @@ -276,17 +285,23 @@ # GetDbgTagFlags @ stdcall GetDesktopWindow() @ stdcall GetDialogBaseUnits() +@ stdcall -version=0x602+ GetDisplayAutoRotationPreferences(ptr) +@ stdcall -version=0x600+ GetDisplayConfigBufferSizes(long ptr ptr) @ stdcall GetDlgCtrlID(long) @ stdcall GetDlgItem(long long) @ stdcall GetDlgItemInt(long long ptr long) @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() NtUserGetDoubleClickTime +@ stdcall -version=0x601+ GetDpiForMonitorInternal(long long ptr ptr) @ stdcall -version=0xA00+ GetDpiForSystem() @ stdcall -version=0xA00+ GetDpiForWindow(ptr) @ stdcall GetFocus() @ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo +@ stdcall -version=0x601+ GetGestureConfig(long long long ptr ptr long) +@ stdcall -version=0x601+ GetGestureExtraArgs(long long ptr) +@ stdcall -version=0x601+ GetGestureInfo(long ptr) @ stdcall GetGuiResources(long long) NtUserGetGuiResources @ stdcall GetIconInfo(long ptr) @ stdcall GetInputDesktop() @@ -332,8 +347,14 @@ @ stdcall GetNextDlgTabItem(long long long) @ stdcall GetOpenClipboardWindow() NtUserGetOpenClipboardWindow @ stdcall GetParent(long) +@ stdcall -version=0x602+ GetPointerInfo(long ptr) +@ stdcall -version=0x602+ GetPointerTouchInfo(long ptr) +@ stdcall -version=0x602+ GetPointerTouchInfoHistory(long ptr ptr) +@ stdcall -version=0x601+ GetPointerDevices(ptr ptr) +@ stdcall -version=0x602+ GetPointerType(long ptr) @ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat @ stdcall GetProcessDefaultLayout(ptr) +@ stdcall -version=0xA00+ GetProcessDpiAwarenessInternal(long ptr) @ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation @ stdcall GetProgmanWindow () @ stdcall GetPropA(long str) @@ -363,6 +384,7 @@ @ stdcall GetThreadDesktop(long) @ stdcall GetTitleBarInfo(long ptr) NtUserGetTitleBarInfo @ stdcall GetTopWindow(long) +@ stdcall -version=0x601+ GetTouchInputInfo(long long ptr long) @ stdcall GetUpdateRect(long ptr long) @ stdcall GetUpdateRgn(long long long) @ stdcall GetUserObjectInformationA(long long ptr long ptr) @@ -372,6 +394,7 @@ @ stdcall GetWindow(long long) @ stdcall GetWindowContextHelpId(long) @ stdcall GetWindowDC(long) NtUserGetWindowDC +@ stdcall -version=0x601+ GetWindowDisplayAffinity(long ptr) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) @ stdcall -arch=x86_64,arm64 GetWindowLongPtrA(ptr long) @@ -410,6 +433,7 @@ @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) +@ stdcall -stub -version=0x600+ InternalGetWindowIcon(ptr long) @ stdcall InternalGetWindowText(long long long) @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) NtUserInvalidateRect @@ -434,13 +458,17 @@ @ stdcall IsIconic(long) @ stdcall IsMenu(long) @ stdcall -stub IsProcess16Bit() +@ stdcall -version=0x600+ IsProcessDPIAware() @ stdcall IsRectEmpty(ptr) @ stdcall IsSETEnabled() @ stdcall IsServerSideWindow(long) +@ stdcall -version=0x601+ IsTouchWindow(long ptr) +@ stdcall -stub -version=0xA00+ IsValidDpiAwarenessContext(long) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) @ stdcall IsWindowInDestroy(long) +@ stdcall -version=0x600+ IsWindowRedirectedForPrint(long) @ stdcall IsWindowUnicode(long) @ stdcall IsWindowVisible(long) @ stdcall -stub IsWow64Message() @@ -474,6 +502,8 @@ @ stdcall LockWindowStation(long) NtUserLockWindowStation @ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate @ stdcall LockWorkStation() NtUserLockWorkStation +@ stdcall -version=0x600+ LogicalToPhysicalPoint(long ptr) +@ stdcall -stub -version=0x602+ LogicalToPhysicalPointForPerMonitorDPI(long ptr) @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stdcall MBToWCSEx(long str long wstr long long) @@ -519,6 +549,7 @@ @ stdcall OpenWindowStationA(str long long) @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) +@ stdcall -version=0x602+ PackTouchHitTestingProximityEvaluation(ptr ptr) @ stdcall PaintDesktop(long) NtUserPaintDesktop @ stdcall PaintMenuBar(long long long long long long) NtUserPaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @@ -536,6 +567,7 @@ # PrivateSetDbgTag # PrivateSetRipFlags @ stdcall PtInRect(ptr double) +@ stdcall -version=0x600+ QueryDisplayConfig(long ptr ptr ptr ptr ptr) @ stdcall QuerySendMessage(ptr) NtUserQuerySendMessage @ stdcall RealChildWindowFromPoint(long double) ; Direct call NtUserRealChildWindowFromPoint @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @@ -556,16 +588,21 @@ @ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey @ stdcall RegisterLogonProcess(long long) @ stdcall RegisterMessagePumpHook(ptr) +@ stdcall -version=0x602+ RegisterPointerDeviceNotifications(long long) +@ stdcall -version=0x600+ RegisterPowerSettingNotification(long ptr long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow(long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist(long) NtUserRegisterTasklist +@ stdcall -version=0x602+ RegisterTouchHitTestingWindow(long long) +@ stdcall -version=0x601+ RegisterTouchWindow(long long) @ stdcall RegisterUserApiHook(ptr) @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @ stdcall ReleaseDC(long long) +@ stdcall -version=0x600+ RemoveClipboardFormatListener(long) @ stdcall RemoveMenu(long long long) NtUserRemoveMenu @ stdcall RemovePropA(long str) @ stdcall RemovePropW(long wstr) @@ -608,12 +645,15 @@ # SetDbgTag @ stdcall SetDebugErrorLevel(long) @ stdcall SetDeskWallpaper(ptr) +@ stdcall -version=0x602+ SetDisplayAutoRotationPreferences(long) +@ stdcall -version=0x600+ SetDisplayConfig(long ptr long ptr long) @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr) @ stdcall SetDoubleClickTime(long) @ stdcall SetFocus(long) NtUserSetFocus @ stdcall SetForegroundWindow(long) +@ stdcall -version=0x601+ SetGestureConfig(ptr long long ptr long) @ stdcall SetInternalWindowPos(long long ptr ptr) NtUserSetInternalWindowPos @ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState @ stdcall SetLastErrorEx(long long) @@ -629,7 +669,10 @@ @ stdcall SetMessageExtraInfo(long) @ stdcall SetMessageQueue(long) @ stdcall SetParent(long long) NtUserSetParent +@ stdcall -version=0x600+ SetProcessDPIAware() @ stdcall SetProcessDefaultLayout(long) +@ stdcall -version=0xA00+ SetProcessDpiAwarenessContext(long) +@ stdcall -version=0xA00+ SetProcessDpiAwarenessInternal(long) @ stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation @ stdcall SetProgmanWindow (long) @ stdcall SetPropA(long str long) @@ -654,7 +697,9 @@ @ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) +@ stdcall -version=0x601+ SetWindowCompositionAttribute(ptr ptr) @ stdcall SetWindowContextHelpId(long long) +@ stdcall -version=0x601+ SetWindowDisplayAffinity(long long) @ stdcall SetWindowLongA(long long long) @ stdcall -arch=x86_64,arm64 SetWindowLongPtrA(ptr long ptr) @ stdcall -arch=x86_64,arm64 SetWindowLongPtrW(ptr long ptr) @@ -677,6 +722,8 @@ @ stdcall ShowStartGlass(long) @ stdcall ShowWindow(long long) NtUserShowWindow @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync +@ stdcall -version=0x600+ ShutdownBlockReasonCreate(long wstr) +@ stdcall -version=0x600+ ShutdownBlockReasonDestroy(long) @ stdcall SoftModalMessageBox(ptr) @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) @@ -713,6 +760,9 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey @ stdcall UnregisterMessagePumpHook() +@ stdcall -version=0x601+ UnregisterTouchWindow(ptr) +@ stdcall -version=0x600+ UnregisterPowerSettingNotification(ptr) +@ stdcall -version=0x602+ UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) diff --git a/win32ss/user/user32_vista/CMakeLists.txt b/win32ss/user/user32_vista/CMakeLists.txt index 4b05f471946..3ca127b29ef 100644 --- a/win32ss/user/user32_vista/CMakeLists.txt +++ b/win32ss/user/user32_vista/CMakeLists.txt @@ -5,11 +5,29 @@ include_directories( include ${REACTOS_SOURCE_DIR}/win32ss/include) +list(APPEND VISTA_SOURCE + wine/input.c + wine/misc.c + wine/sysparams.c + wine/win.c) + + list(APPEND SOURCE dpi.c) +# These are just for Vista+ support +add_library(user32_optional_vista + ${VISTA_SOURCE}) +target_link_libraries(user32_optional_vista wine win32ksys) +add_dependencies(user32_optional_vista wine psdk) +if(MSVC) + # Disable warning C4312: 'type cast': conversion from 'unsigned int' to 'HANDLE' of greater size + target_compile_options(user32_optional_vista PRIVATE /wd4312) +endif() + +# These are required for WINE imports add_library(user32_vista_static - ${SOURCE}) + ${SOURCE}) target_link_libraries(user32_vista_static win32ksys) add_dependencies(user32_vista_static psdk) diff --git a/win32ss/user/user32_vista/dpi.c b/win32ss/user/user32_vista/dpi.c index 08d73e4e4e5..5b5bd737ecf 100644 --- a/win32ss/user/user32_vista/dpi.c +++ b/win32ss/user/user32_vista/dpi.c @@ -12,6 +12,9 @@ #include <wingdi.h> #include <winuser.h> +HDC APIENTRY +NtUserGetDC(HWND hWnd); + #define NDEBUG #include <debug.h> @@ -24,7 +27,7 @@ GetDpiForSystem(VOID) { HDC hDC; UINT Dpi; - hDC = GetDC(NULL); + hDC = NtUserGetDC(NULL); Dpi = GetDeviceCaps(hDC, LOGPIXELSY); ReleaseDC(NULL, hDC); return Dpi; @@ -42,3 +45,91 @@ GetDpiForWindow( UNREFERENCED_PARAMETER(hWnd); return GetDpiForSystem(); } + +/* + * @stub + */ +BOOL +WINAPI +IsProcessDPIAware(VOID) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +SetProcessDPIAware(VOID) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +SetProcessDpiAwarenessContext( + _In_ DPI_AWARENESS_CONTEXT context) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +GetProcessDpiAwarenessInternal( + _In_ HANDLE process, + _Out_ DPI_AWARENESS *awareness) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +SetProcessDpiAwarenessInternal( + _In_ DPI_AWARENESS awareness) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +GetDpiForMonitorInternal( + _In_ HMONITOR monitor, + _In_ UINT type, + _Out_ UINT *x, + _Out_ UINT *y) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @stub + */ +BOOL +WINAPI +LogicalToPhysicalPoint( + _In_ HWND hwnd, + _Inout_ POINT *point ) +{ + UNIMPLEMENTED; + return TRUE; +} + diff --git a/win32ss/user/user32_vista/wine/input.c b/win32ss/user/user32_vista/wine/input.c index 38c44d7d831..2d95c41ad1a 100644 --- a/win32ss/user/user32_vista/wine/input.c +++ b/win32ss/user/user32_vista/wine/input.c @@ -24,12 +24,141 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wingdi.h> +#include <winuser.h> +#include <winbase.h> +DECLARE_HANDLE(HSYNTHETICPOINTERDEVICE); +typedef enum +{ + POINTER_FEEDBACK_DEFAULT = 1, + POINTER_FEEDBACK_INDIRECT = 2, + POINTER_FEEDBACK_NONE = 3, +} POINTER_FEEDBACK_MODE; + +typedef enum ORIENTATION_PREFERENCE { + ORIENTATION_PREFERENCE_NONE = 0x0, + ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, + ORIENTATION_PREFERENCE_PORTRAIT = 0x2, + ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED = 0x4, + ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 +} ORIENTATION_PREFERENCE; + +/* Touch input definitions */ +DECLARE_HANDLE(HTOUCHINPUT); + + +typedef struct tagTOUCHINPUT { + LONG x; + LONG y; + HANDLE hSource; + DWORD dwID; + DWORD dwFlags; + DWORD dwMask; + DWORD dwTime; + ULONG_PTR dwExtraInfo; + DWORD cxContact; + DWORD cyContact; +} TOUCHINPUT, *PTOUCHINPUT; +typedef TOUCHINPUT const * PCTOUCHINPUT; + +DECLARE_HANDLE(HGESTUREINFO); + +#define GF_BEGIN 0x00000001 +#define GF_INERTIA 0x00000002 +#define GF_END 0x00000004 + +typedef struct tagGESTURECONFIG { + DWORD dwID; + DWORD dwWant; + DWORD dwBlock; +} GESTURECONFIG, *PGESTURECONFIG; + +typedef struct tagGESTUREINFO { + UINT cbSize; + DWORD dwFlags; + DWORD dwID; + HWND hwndTarget; + POINTS ptsLocation; + DWORD dwInstanceID; + DWORD dwSequenceID; + ULONGLONG ullArguments; + UINT cbExtraArgs; +} GESTUREINFO, *PGESTUREINFO; +typedef GESTUREINFO const * PCGESTUREINFO; + +typedef enum tagPOINTER_BUTTON_CHANGE_TYPE +{ + POINTER_CHANGE_NONE, + POINTER_CHANGE_FIRSTBUTTON_DOWN, + POINTER_CHANGE_FIRSTBUTTON_UP, + POINTER_CHANGE_SECONDBUTTON_DOWN, + POINTER_CHANGE_SECONDBUTTON_UP, + POINTER_CHANGE_THIRDBUTTON_DOWN, + POINTER_CHANGE_THIRDBUTTON_UP, + POINTER_CHANGE_FOURTHBUTTON_DOWN, + POINTER_CHANGE_FOURTHBUTTON_UP, + POINTER_CHANGE_FIFTHBUTTON_DOWN, + POINTER_CHANGE_FIFTHBUTTON_UP, +} POINTER_BUTTON_CHANGE_TYPE; +typedef PVOID HPOWERNOTIFY, *PHPOWERNOTIFY; +typedef UINT32 POINTER_FLAGS; +typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagPOINTER_INFO +{ + POINTER_INPUT_TYPE pointerType; + UINT32 pointerId; + UINT32 frameId; + POINTER_FLAGS pointerFlags; + HANDLE sourceDevice; + HWND hwndTarget; + POINT ptPixelLocation; + POINT ptHimetricLocation; + POINT ptPixelLocationRaw; + POINT ptHimetricLocationRaw; + DWORD dwTime; + UINT32 historyCount; + INT32 InputData; + DWORD dwKeyStates; + UINT64 PerformanceCount; + POINTER_BUTTON_CHANGE_TYPE ButtonChangeType; +} POINTER_INFO; + +typedef UINT32 TOUCH_FLAGS; +#define TOUCH_FLAG_NONE 0x00000000 + +typedef UINT32 TOUCH_MASK; +#define TOUCH_MASK_NONE 0x00000000 +#define TOUCH_MASK_CONTACTAREA 0x00000001 +#define TOUCH_MASK_ORIENTATION 0x00000002 +#define TOUCH_MASK_PRESSURE 0x00000004 + +typedef struct tagPOINTER_TOUCH_INFO +{ + POINTER_INFO pointerInfo; + TOUCH_FLAGS touchFlags; + TOUCH_MASK touchMask; + RECT rcContact; + RECT rcContactRaw; + UINT32 orientation; + UINT32 pressure; +} POINTER_TOUCH_INFO; + +#else #include "user_private.h" #include "dbt.h" +#endif #include "wine/debug.h" +#ifndef __REACTOS__ #include "wine/plugplay.h" +#endif WINE_DEFAULT_DEBUG_CHANNEL(win); +#ifndef __REACTOS__ WINE_DECLARE_DEBUG_CHANNEL(keyboard); /*********************************************************************** @@ -681,6 +810,7 @@ LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_siz return header_size == sizeof(RAWINPUTHEADER) ? 0 : -1; } +#endif /***************************************************************************** * CloseTouchInputHandle (USER32.@) @@ -797,7 +927,7 @@ BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_ return FALSE; } - +#ifndef __REACTOS__ /******************************************************************* * SetForegroundWindow (USER32.@) */ @@ -880,6 +1010,7 @@ HWND WINAPI GetTaskmanWindow(void) { return NtUserGetTaskmanWindow(); } +#endif HSYNTHETICPOINTERDEVICE WINAPI CreateSyntheticPointerDevice(POINTER_INPUT_TYPE type, ULONG max_count, POINTER_FEEDBACK_MODE mode) { diff --git a/win32ss/user/user32_vista/wine/misc.c b/win32ss/user/user32_vista/wine/misc.c index 6333fcb48b4..0500682133f 100644 --- a/win32ss/user/user32_vista/wine/misc.c +++ b/win32ss/user/user32_vista/wine/misc.c @@ -23,6 +23,98 @@ #include <stdarg.h> +#ifdef __REACTOS__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wingdi.h> +#include <winuser.h> +#include <winbase.h> + +#define POINTER_DEVICE_PRODUCT_STRING_MAX 520 + +enum tagPOINTER_INPUT_TYPE { + PT_POINTER = 1, + PT_TOUCH, + PT_PEN, + PT_MOUSE, + PT_TOUCHPAD +}; + +typedef PVOID HPOWERNOTIFY, *PHPOWERNOTIFY; +typedef UINT32 POINTER_FLAGS; +typedef DWORD POINTER_INPUT_TYPE; + +typedef struct tagTOUCH_HIT_TESTING_PROXIMITY_EVALUATION +{ + UINT16 score; + POINT adjustedPoint; +} TOUCH_HIT_TESTING_PROXIMITY_EVALUATION, *PTOUCH_HIT_TESTING_PROXIMITY_EVALUATION; + +typedef struct tagTOUCH_HIT_TESTING_INPUT +{ + UINT32 pointerId; + POINT point; + RECT boundingBox; + RECT nonOccludedBoundingBox; + UINT32 orientation; +} TOUCH_HIT_TESTING_INPUT, *PTOUCH_HIT_TESTING_INPUT; + +typedef enum tagPOINTER_DEVICE_TYPE { + POINTER_DEVICE_TYPE_INTEGRATED_PEN = 0x00000001, + POINTER_DEVICE_TYPE_EXTERNAL_PEN = 0x00000002, + POINTER_DEVICE_TYPE_TOUCH = 0x00000003, + POINTER_DEVICE_TYPE_TOUCH_PAD = 0x00000004, + POINTER_DEVICE_TYPE_MAX = 0xFFFFFFFF +} POINTER_DEVICE_TYPE; + +typedef struct tagPOINTER_DEVICE_INFO { + DWORD displayOrientation; + HANDLE device; + POINTER_DEVICE_TYPE pointerDeviceType; + HMONITOR monitor; + ULONG startingCursorId; + USHORT maxActiveContacts; + WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX]; +} POINTER_DEVICE_INFO; + + +typedef enum tagPOINTER_BUTTON_CHANGE_TYPE { + POINTER_CHANGE_NONE, + POINTER_CHANGE_FIRSTBUTTON_DOWN, + POINTER_CHANGE_FIRSTBUTTON_UP, + POINTER_CHANGE_SECONDBUTTON_DOWN, + POINTER_CHANGE_SECONDBUTTON_UP, + POINTER_CHANGE_THIRDBUTTON_DOWN, + POINTER_CHANGE_THIRDBUTTON_UP, + POINTER_CHANGE_FOURTHBUTTON_DOWN, + POINTER_CHANGE_FOURTHBUTTON_UP, + POINTER_CHANGE_FIFTHBUTTON_DOWN, + POINTER_CHANGE_FIFTHBUTTON_UP, +} POINTER_BUTTON_CHANGE_TYPE; + +typedef struct tagPOINTER_INFO { + POINTER_INPUT_TYPE pointerType; + UINT32 pointerId; + UINT32 frameId; + POINTER_FLAGS pointerFlags; + HANDLE sourceDevice; + HWND hwndTarget; + POINT ptPixelLocation; + POINT ptHimetricLocation; + POINT ptPixelLocationRaw; + POINT ptHimetricLocationRaw; + DWORD dwTime; + UINT32 historyCount; + INT32 InputData; + DWORD dwKeyStates; + UINT64 PerformanceCount; + POINTER_BUTTON_CHANGE_TYPE ButtonChangeType; +} POINTER_INFO; + + +#else #include "windef.h" #include "wine/windef16.h" #include "winbase.h" @@ -30,11 +122,13 @@ #include "controls.h" #include "imm.h" #include "user_private.h" - +#endif #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); +#ifndef __REACTOS__ + BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); #define IMM_INIT_MAGIC 0x19650412 @@ -403,6 +497,7 @@ BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) FIXME("(%p,%p,%d): stub\n", handle, job, grant); return TRUE; } +#endif /********************************************************************** * RegisterPowerSettingNotification [USER32.@] @@ -532,6 +627,7 @@ BOOL WINAPI GetPointerInfo(UINT32 id, POINTER_INFO *info) return FALSE; } +#ifndef __REACTOS__ LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { if (!imm_ime_wnd_proc) return DefWindowProcA(hwnd, msg, wParam, lParam); @@ -543,3 +639,52 @@ LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) if (!imm_ime_wnd_proc) return DefWindowProcW(hwnd, msg, wParam, lParam); return imm_ime_wnd_proc( hwnd, msg, wParam, lParam, FALSE ); } +#endif + +#ifdef __REACTOS__ +//wine/message.c stubs +typedef struct tagCHANGEFILTERSTRUCT { + DWORD cbSize; + DWORD ExtStatus; +} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; + +/****************************************************************** + * ChangeWindowMessageFilter (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) +{ + FIXME( "%x %08lx\n", message, flag ); + return TRUE; +} + +/****************************************************************** + * ChangeWindowMessageFilterEx (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) +{ + FIXME( "%p %x %ld %p\n", hwnd, message, action, changefilter ); + return TRUE; +} + +//wine/user_main.c +/*********************************************************************** + * ShutdownBlockReasonDestroy (USER32.@) + */ + +BOOL WINAPI ShutdownBlockReasonDestroy(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** + * ShutdownBlockReasonCreate (USER32.@) + */ +BOOL WINAPI ShutdownBlockReasonCreate(HWND hwnd, LPCWSTR reason) +{ + FIXME("(%p, %s): stub\n", hwnd, debugstr_w(reason)); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} +#endif diff --git a/win32ss/user/user32_vista/wine/sysparams.c b/win32ss/user/user32_vista/wine/sysparams.c new file mode 100644 index 00000000000..20c34f6d5e1 --- /dev/null +++ b/win32ss/user/user32_vista/wine/sysparams.c @@ -0,0 +1,291 @@ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wingdi.h> +#include <winuser.h> +#include <winbase.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); + +typedef enum DISPLAYCONFIG_TOPOLOGY_ID +{ + DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001, + DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002, + DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004, + DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008, + DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_TOPOLOGY_ID; + +typedef enum +{ + DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 1, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 2, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = 3, + DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = 4, + DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = 5, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, + DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, + DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, + DISPLAYCONFIG_DEVICE_INFO_GET_MONITOR_SPECIALIZATION = 12, + DISPLAYCONFIG_DEVICE_INFO_SET_MONITOR_SPECIALIZATION = 13, + DISPLAYCONFIG_DEVICE_INFO_SET_RESERVED1 = 14, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO_2 = 15, + DISPLAYCONFIG_DEVICE_INFO_SET_HDR_STATE = 16, + DISPLAYCONFIG_DEVICE_INFO_SET_WCG_STATE = 17, + DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_DEVICE_INFO_TYPE; + +typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER +{ + DISPLAYCONFIG_DEVICE_INFO_TYPE type; + UINT32 size; + LUID adapterId; + UINT32 id; +} DISPLAYCONFIG_DEVICE_INFO_HEADER; + +typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { + POINTL PathSourceSize; + RECTL DesktopImageRegion; + RECTL DesktopImageClip; +} DISPLAYCONFIG_DESKTOP_IMAGE_INFO; + +typedef enum { + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INDIRECT_WIRED = 16, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INDIRECT_VIRTUAL = 17, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_USB_TUNNEL, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; + +typedef enum { + DISPLAYCONFIG_ROTATION_IDENTITY = 1, + DISPLAYCONFIG_ROTATION_ROTATE90 = 2, + DISPLAYCONFIG_ROTATION_ROTATE180 = 3, + DISPLAYCONFIG_ROTATION_ROTATE270 = 4, + DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_ROTATION; + +typedef enum { + DISPLAYCONFIG_SCALING_IDENTITY = 1, + DISPLAYCONFIG_SCALING_CENTERED = 2, + DISPLAYCONFIG_SCALING_STRETCHED = 3, + DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4, + DISPLAYCONFIG_SCALING_CUSTOM = 5, + DISPLAYCONFIG_SCALING_PREFERRED = 128, + DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_SCALING; + +typedef struct DISPLAYCONFIG_RATIONAL { + UINT32 Numerator; + UINT32 Denominator; +} DISPLAYCONFIG_RATIONAL; + +typedef enum { + DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0, + DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3, + DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_SCANLINE_ORDERING; + +typedef struct DISPLAYCONFIG_PATH_TARGET_INFO { + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 desktopModeInfoIdx : 16; + UINT32 targetModeInfoIdx : 16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + DISPLAYCONFIG_ROTATION rotation; + DISPLAYCONFIG_SCALING scaling; + DISPLAYCONFIG_RATIONAL refreshRate; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; + BOOL targetAvailable; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_TARGET_INFO; + +typedef struct DISPLAYCONFIG_PATH_SOURCE_INFO { + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 cloneGroupId : 16; + UINT32 sourceModeInfoIdx : 16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_SOURCE_INFO; + +typedef struct DISPLAYCONFIG_PATH_INFO { + DISPLAYCONFIG_PATH_SOURCE_INFO sourceInfo; + DISPLAYCONFIG_PATH_TARGET_INFO targetInfo; + UINT32 flags; +} DISPLAYCONFIG_PATH_INFO; + +typedef enum { + DISPLAYCONFIG_PIXELFORMAT_8BPP = 1, + DISPLAYCONFIG_PIXELFORMAT_16BPP = 2, + DISPLAYCONFIG_PIXELFORMAT_24BPP = 3, + DISPLAYCONFIG_PIXELFORMAT_32BPP = 4, + DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5, + DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_PIXELFORMAT; + +typedef struct DISPLAYCONFIG_SOURCE_MODE +{ + UINT32 width; + UINT32 height; + DISPLAYCONFIG_PIXELFORMAT pixelFormat; + POINTL position; +} DISPLAYCONFIG_SOURCE_MODE; +typedef struct DISPLAYCONFIG_2DREGION { + UINT32 cx; + UINT32 cy; +} DISPLAYCONFIG_2DREGION; + +typedef struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO { + UINT64 pixelRate; + DISPLAYCONFIG_RATIONAL hSyncFreq; + DISPLAYCONFIG_RATIONAL vSyncFreq; + DISPLAYCONFIG_2DREGION activeSize; + DISPLAYCONFIG_2DREGION totalSize; + union { + struct { + UINT32 videoStandard : 16; + UINT32 vSyncFreqDivider : 6; + UINT32 reserved : 10; + } AdditionalSignalInfo; + UINT32 videoStandard; + } DUMMYUNIONNAME; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; +} DISPLAYCONFIG_VIDEO_SIGNAL_INFO; +typedef struct DISPLAYCONFIG_TARGET_MODE +{ + DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo; +} DISPLAYCONFIG_TARGET_MODE; +typedef enum { + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1, + DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2, + DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE = 3, + DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xFFFFFFFF +} DISPLAYCONFIG_MODE_INFO_TYPE; +typedef struct DISPLAYCONFIG_MODE_INFO { + DISPLAYCONFIG_MODE_INFO_TYPE infoType; + UINT32 id; + LUID adapterId; + union { + DISPLAYCONFIG_TARGET_MODE targetMode; + DISPLAYCONFIG_SOURCE_MODE sourceMode; + DISPLAYCONFIG_DESKTOP_IMAGE_INFO desktopImageInfo; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_MODE_INFO; + + +LONG +WINAPI +GetDisplayConfigBufferSizes( + UINT32 flags, + UINT32 *numPathArrayElements, + UINT32 *numModeInfoArrayElements) +{ + *numPathArrayElements = 0; + *numModeInfoArrayElements = 0; + return 0; +} + +LONG +WINAPI +QueryDisplayConfig( + UINT32 flags, + UINT32 *numPathArrayElements, + DISPLAYCONFIG_PATH_INFO *pathArray, + UINT32 *numModeInfoArrayElements, + DISPLAYCONFIG_MODE_INFO *modeInfoArray, + DISPLAYCONFIG_TOPOLOGY_ID *currentTopologyId) +{ + return ERROR_ACCESS_DENIED; +} + +typedef enum ORIENTATION_PREFERENCE { + ORIENTATION_PREFERENCE_NONE = 0x0, + ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, + ORIENTATION_PREFERENCE_PORTRAIT = 0x2, + ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED = 0x4, + ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 +} ORIENTATION_PREFERENCE; + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME( "DisplayConfigGetDeviceInfo: stub!\n" ); + return 1; +} + +/*********************************************************************** + * DisplayConfigSetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigSetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEADER *packet ) +{ + FIXME( "DisplayConfigSetDeviceInfo: stub!\n" ); + return 1; +} + +/********************************************************************** + * GetDisplayAutoRotationPreferences (USER32.@) + */ +BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientation ) +{ + FIXME("(%p): stub\n", orientation); + *orientation = ORIENTATION_PREFERENCE_NONE; + return TRUE; +} + +/*********************************************************************** + * SetDisplayConfig (USER32.@) + */ +LONG WINAPI SetDisplayConfig(UINT32 path_info_count, DISPLAYCONFIG_PATH_INFO *path_info, UINT32 mode_info_count, + DISPLAYCONFIG_MODE_INFO *mode_info, UINT32 flags) +{ + FIXME("path_info_count %u, path_info %p, mode_info_count %u, mode_info %p, flags %#x stub.\n", + path_info_count, path_info, mode_info_count, mode_info, flags); + + return ERROR_SUCCESS; +} + +/********************************************************************** + * SetDisplayAutoRotationPreferences (USER32.@) + */ +BOOL WINAPI SetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE orientation ) +{ + FIXME("(%d): stub\n", orientation); + return TRUE; +} diff --git a/win32ss/user/user32_vista/wine/win.c b/win32ss/user/user32_vista/wine/win.c index 99f681a3f9c..1ce81abec91 100644 --- a/win32ss/user/user32_vista/wine/win.c +++ b/win32ss/user/user32_vista/wine/win.c @@ -18,18 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wingdi.h> +#include <winuser.h> +#include <winbase.h> +#else #include "ntstatus.h" #define WIN32_NO_STATUS #include "user_private.h" #include "controls.h" #include "winver.h" #include "wine/asm.h" +#endif #include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); - +#ifndef __REACTOS__ #ifdef __i386__ /* Some apps pass a non-stdcall proc to EnumChildWindows, * so we need a small assembly wrapper to call the proc. @@ -1686,6 +1696,8 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) #endif /* _WIN64 */ +#endif + /***************************************************************************** * GetWindowDisplayAffinity (USER32.@) */

3 weeks, 2 days

[reactos] 01/02: [USER32_VISTA] Import input.c misc.c win.c from wine-10.0

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=245513e7eceb3cb445c51… commit 245513e7eceb3cb445c51a989769c967260d4882 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Wed Jan 29 02:08:11 2025 -0800 Commit: Justin Miller <justinmiller100(a)gmail.com> CommitDate: Sun Mar 9 04:07:55 2025 -0700 [USER32_VISTA] Import input.c misc.c win.c from wine-10.0 --- win32ss/user/user32_vista/wine/input.c | 889 ++++++++++++++++ win32ss/user/user32_vista/wine/misc.c | 545 ++++++++++ win32ss/user/user32_vista/wine/win.c | 1731 ++++++++++++++++++++++++++++++++ 3 files changed, 3165 insertions(+) diff --git a/win32ss/user/user32_vista/wine/input.c b/win32ss/user/user32_vista/wine/input.c new file mode 100644 index 00000000000..38c44d7d831 --- /dev/null +++ b/win32ss/user/user32_vista/wine/input.c @@ -0,0 +1,889 @@ +/* + * USER Input processing + * + * Copyright 1993 Bob Amstadt + * Copyright 1996 Albrecht Kleine + * Copyright 1997 David Faure + * Copyright 1998 Morten Welinder + * Copyright 1998 Ulrich Weigand + * Copyright 2012 Henri Verbeet + * Copyright 2018 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "user_private.h" +#include "dbt.h" +#include "wine/debug.h" +#include "wine/plugplay.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); +WINE_DECLARE_DEBUG_CHANNEL(keyboard); + +/*********************************************************************** + * get_locale_kbd_layout + */ +static HKL get_locale_kbd_layout(void) +{ + ULONG_PTR layout; + + /* FIXME: + * + * layout = main_key_tab[kbd_layout].lcid; + * + * Winword uses return value of GetKeyboardLayout as a codepage + * to translate ANSI keyboard messages to unicode. But we have + * a problem with it: for instance Polish keyboard layout is + * identical to the US one, and therefore instead of the Polish + * locale id we return the US one. + */ + + layout = GetUserDefaultLCID(); + layout = MAKELONG( layout, layout ); + return (HKL)layout; +} + + +/*********************************************************************** + * keybd_event (USER32.@) + */ +void WINAPI keybd_event( BYTE bVk, BYTE bScan, + DWORD dwFlags, ULONG_PTR dwExtraInfo ) +{ + INPUT input; + + input.type = INPUT_KEYBOARD; + input.ki.wVk = bVk; + input.ki.wScan = bScan; + input.ki.dwFlags = dwFlags; + input.ki.time = 0; + input.ki.dwExtraInfo = dwExtraInfo; + NtUserSendInput( 1, &input, sizeof(input) ); +} + + +/*********************************************************************** + * mouse_event (USER32.@) + */ +void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, + DWORD dwData, ULONG_PTR dwExtraInfo ) +{ + INPUT input; + + input.type = INPUT_MOUSE; + input.mi.dx = dx; + input.mi.dy = dy; + input.mi.mouseData = dwData; + input.mi.dwFlags = dwFlags; + input.mi.time = 0; + input.mi.dwExtraInfo = dwExtraInfo; + NtUserSendInput( 1, &input, sizeof(input) ); +} + + +/*********************************************************************** + * GetCursorPos (USER32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) +{ + return NtUserGetCursorPos( pt ); +} + + +/********************************************************************** + * ReleaseCapture (USER32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) +{ + return NtUserReleaseCapture(); +} + + +/********************************************************************** + * GetCapture (USER32.@) + */ +HWND WINAPI GetCapture(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndCapture : 0; +} + + +/***************************************************************** + * DestroyCaret (USER32.@) + */ +BOOL WINAPI DestroyCaret(void) +{ + return NtUserDestroyCaret(); +} + + +/***************************************************************** + * SetCaretPos (USER32.@) + */ +BOOL WINAPI SetCaretPos( int x, int y ) +{ + return NtUserSetCaretPos( x, y ); +} + + +/***************************************************************** + * SetCaretBlinkTime (USER32.@) + */ +BOOL WINAPI SetCaretBlinkTime( unsigned int time ) +{ + return NtUserSetCaretBlinkTime( time ); +} + + +/*********************************************************************** + * GetInputState (USER32.@) + */ +BOOL WINAPI GetInputState(void) +{ + return NtUserGetInputState(); +} + + +/****************************************************************** + * GetLastInputInfo (USER32.@) + */ +BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) +{ + TRACE("%p\n", plii); + + if (plii->cbSize != sizeof (*plii) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + plii->dwTime = NtUserGetLastInputTime(); + return TRUE; +} + + +/********************************************************************** + * VkKeyScanA (USER32.@) + * + * VkKeyScan translates an ANSI character to a virtual-key and shift code + * for the current keyboard. + * high-order byte yields : + * 0 Unshifted + * 1 Shift + * 2 Ctrl + * 3-5 Shift-key combinations that are not used for characters + * 6 Ctrl-Alt + * 7 Ctrl-Alt-Shift + * I.e. : Shift = 1, Ctrl = 2, Alt = 4. + * FIXME : works ok except for dead chars : + * VkKeyScan '^'(0x5e, 94) ... got keycode 00 ... returning 00 + * VkKeyScan '`'(0x60, 96) ... got keycode 00 ... returning 00 + */ +SHORT WINAPI VkKeyScanA(CHAR cChar) +{ + WCHAR wChar; + + if (IsDBCSLeadByte(cChar)) return -1; + + MultiByteToWideChar(CP_ACP, 0, &cChar, 1, &wChar, 1); + return VkKeyScanW(wChar); +} + +/****************************************************************************** + * VkKeyScanW (USER32.@) + */ +SHORT WINAPI VkKeyScanW(WCHAR cChar) +{ + return NtUserVkKeyScanEx( cChar, NtUserGetKeyboardLayout(0) ); +} + +/********************************************************************** + * VkKeyScanExA (USER32.@) + */ +WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) +{ + WCHAR wChar; + + if (IsDBCSLeadByte(cChar)) return -1; + + MultiByteToWideChar(CP_ACP, 0, &cChar, 1, &wChar, 1); + return NtUserVkKeyScanEx( wChar, dwhkl ); +} + +/********************************************************************** + * OemKeyScan (USER32.@) + */ +DWORD WINAPI OemKeyScan( WORD oem ) +{ + WCHAR wchr; + DWORD vkey, scan; + char oem_char = LOBYTE( oem ); + + if (!OemToCharBuffW( &oem_char, &wchr, 1 )) + return -1; + + vkey = VkKeyScanW( wchr ); + scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC ); + if (!scan) return -1; + + vkey &= 0xff00; + vkey <<= 8; + return vkey | scan; +} + +/****************************************************************************** + * GetKeyboardType (USER32.@) + */ +INT WINAPI GetKeyboardType(INT nTypeFlag) +{ + TRACE_(keyboard)("(%d)\n", nTypeFlag); + if (LOWORD(NtUserGetKeyboardLayout(0)) == MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN)) + { + /* scan code for `_', the key left of r-shift, in Japanese 106 keyboard */ + const UINT JP106_VSC_USCORE = 0x73; + + switch(nTypeFlag) + { + case 0: /* Keyboard type */ + return 7; /* Japanese keyboard */ + case 1: /* Keyboard Subtype */ + /* Test keyboard mappings to detect Japanese keyboard */ + if (MapVirtualKeyW(VK_OEM_102, MAPVK_VK_TO_VSC) == JP106_VSC_USCORE + && MapVirtualKeyW(JP106_VSC_USCORE, MAPVK_VSC_TO_VK) == VK_OEM_102) + return 2; /* Japanese 106 */ + else + return 0; /* AT-101 */ + case 2: /* Number of F-keys */ + return 12; /* It has 12 F-keys */ + } + } + else + { + switch(nTypeFlag) + { + case 0: /* Keyboard type */ + return 4; /* AT-101 */ + case 1: /* Keyboard Subtype */ + return 0; /* There are no defined subtypes */ + case 2: /* Number of F-keys */ + return 12; /* We're doing an 101 for now, so return 12 F-keys */ + } + } + WARN_(keyboard)("Unknown type\n"); + return 0; /* The book says 0 here, so 0 */ +} + +/****************************************************************************** + * MapVirtualKeyA (USER32.@) + */ +UINT WINAPI MapVirtualKeyA(UINT code, UINT maptype) +{ + return MapVirtualKeyExA( code, maptype, NtUserGetKeyboardLayout(0) ); +} + +/****************************************************************************** + * MapVirtualKeyW (USER32.@) + */ +UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype) +{ + return NtUserMapVirtualKeyEx( code, maptype, NtUserGetKeyboardLayout(0) ); +} + +/****************************************************************************** + * MapVirtualKeyExA (USER32.@) + */ +UINT WINAPI MapVirtualKeyExA(UINT code, UINT maptype, HKL hkl) +{ + UINT ret; + + ret = NtUserMapVirtualKeyEx( code, maptype, hkl ); + if (maptype == MAPVK_VK_TO_CHAR) + { + BYTE ch = 0; + WCHAR wch = ret; + + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL ); + ret = ch; + } + return ret; +} + +/**************************************************************************** + * GetKBCodePage (USER32.@) + */ +UINT WINAPI GetKBCodePage(void) +{ + return GetOEMCP(); +} + +/**************************************************************************** + * GetKeyboardLayoutNameA (USER32.@) + */ +BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) +{ + WCHAR buf[KL_NAMELENGTH]; + + if (NtUserGetKeyboardLayoutName( buf )) + return WideCharToMultiByte( CP_ACP, 0, buf, -1, pszKLID, KL_NAMELENGTH, NULL, NULL ) != 0; + return FALSE; +} + +/**************************************************************************** + * GetKeyNameTextA (USER32.@) + */ +INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) +{ + WCHAR buf[256]; + INT ret; + + if (!nSize || !NtUserGetKeyNameText( lParam, buf, ARRAYSIZE(buf) )) + { + lpBuffer[0] = 0; + return 0; + } + ret = WideCharToMultiByte(CP_ACP, 0, buf, -1, lpBuffer, nSize, NULL, NULL); + if (!ret && nSize) + { + ret = nSize - 1; + lpBuffer[ret] = 0; + } + else ret--; + + return ret; +} + +/**************************************************************************** + * ToUnicode (USER32.@) + */ +INT WINAPI ToUnicode( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags ) +{ + return NtUserToUnicodeEx( virt, scan, state, str, size, flags, NtUserGetKeyboardLayout(0) ); +} + +/**************************************************************************** + * ToAscii (USER32.@) + */ +INT WINAPI ToAscii( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, + LPWORD lpChar, UINT flags ) +{ + return ToAsciiEx( virtKey, scanCode, lpKeyState, lpChar, flags, + NtUserGetKeyboardLayout(0) ); +} + +/**************************************************************************** + * ToAsciiEx (USER32.@) + */ +INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, + LPWORD lpChar, UINT flags, HKL dwhkl ) +{ + WCHAR uni_chars[2]; + INT ret, n_ret; + + ret = NtUserToUnicodeEx( virtKey, scanCode, lpKeyState, uni_chars, 2, flags, dwhkl ); + if (ret < 0) n_ret = 1; /* FIXME: make ToUnicode return 2 for dead chars */ + else n_ret = ret; + WideCharToMultiByte(CP_ACP, 0, uni_chars, n_ret, (LPSTR)lpChar, 2, NULL, NULL); + return ret; +} + +/********************************************************************** + * BlockInput (USER32.@) + */ +BOOL WINAPI BlockInput(BOOL fBlockIt) +{ + FIXME_(keyboard)("(%d): stub\n", fBlockIt); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} + + +/*********************************************************************** + * LoadKeyboardLayoutW (USER32.@) + */ +HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) +{ + WCHAR layout_path[MAX_PATH], value[5]; + LCID locale = GetUserDefaultLCID(); + DWORD id, value_size, tmp; + HKEY hkey; + HKL layout; + + FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags ); + + tmp = wcstoul( name, NULL, 16 ); + if (HIWORD( tmp )) layout = UlongToHandle( tmp ); + else layout = UlongToHandle( MAKELONG( LOWORD( tmp ), LOWORD( tmp ) ) ); + + if (!((UINT_PTR)layout >> 28)) id = LOWORD( tmp ); + else id = HIWORD( layout ); /* IME or aliased layout */ + + wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" ); + wcscat( layout_path, name ); + + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, layout_path, &hkey )) + { + value_size = sizeof(value); + if (!RegGetValueW( hkey, NULL, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) + id = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff); + + RegCloseKey( hkey ); + } + + layout = UlongToHandle( MAKELONG( locale, id ) ); + if ((flags & KLF_ACTIVATE) && NtUserActivateKeyboardLayout( layout, 0 )) return layout; + + /* FIXME: semi-stub: returning default layout */ + return get_locale_kbd_layout(); +} + +/*********************************************************************** + * LoadKeyboardLayoutA (USER32.@) + */ +HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) +{ + HKL ret; + UNICODE_STRING pwszKLIDW; + + if (pwszKLID) RtlCreateUnicodeStringFromAsciiz(&pwszKLIDW, pwszKLID); + else pwszKLIDW.Buffer = NULL; + + ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); + RtlFreeUnicodeString(&pwszKLIDW); + return ret; +} + + +/*********************************************************************** + * LoadKeyboardLayoutEx (USER32.@) + */ +HKL WINAPI LoadKeyboardLayoutEx( HKL layout, const WCHAR *name, UINT flags ) +{ + FIXME_(keyboard)( "layout %p, name %s, flags %x, semi-stub!\n", layout, debugstr_w( name ), flags ); + + if (!layout) return NULL; + return LoadKeyboardLayoutW( name, flags ); +} + +/*********************************************************************** + * UnloadKeyboardLayout (USER32.@) + */ +BOOL WINAPI UnloadKeyboardLayout( HKL layout ) +{ + FIXME_(keyboard)( "layout %p, stub!\n", layout ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + +static DWORD CALLBACK devnotify_window_callbackW(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); + return 0; +} + +static DWORD CALLBACK devnotify_window_callbackA(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + if (flags & 0x8000) + { + switch (header->dbch_devicetype) + { + case DBT_DEVTYP_DEVICEINTERFACE: + { + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const DEV_BROADCAST_DEVICEINTERFACE_W *)header; + size_t lenW = wcslen( ifaceW->dbcc_name ); + DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA; + DWORD lenA; + + if (!(ifaceA = malloc( offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[lenW * 3 + 1]) ))) + return 0; + lenA = WideCharToMultiByte( CP_ACP, 0, ifaceW->dbcc_name, lenW + 1, + ifaceA->dbcc_name, lenW * 3 + 1, NULL, NULL ); + + ifaceA->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[lenA + 1]); + ifaceA->dbcc_devicetype = ifaceW->dbcc_devicetype; + ifaceA->dbcc_reserved = ifaceW->dbcc_reserved; + ifaceA->dbcc_classguid = ifaceW->dbcc_classguid; + SendMessageTimeoutA( handle, WM_DEVICECHANGE, flags, (LPARAM)ifaceA, SMTO_ABORTIFHUNG, 2000, NULL ); + free( ifaceA ); + return 0; + } + + case DBT_DEVTYP_HANDLE: + { + const DEV_BROADCAST_HANDLE *handleW = (const DEV_BROADCAST_HANDLE *)header; + UINT sizeW = handleW->dbch_size - offsetof(DEV_BROADCAST_HANDLE, dbch_data[0]), len, offset; + DEV_BROADCAST_HANDLE *handleA; + + if (!(handleA = malloc( offsetof(DEV_BROADCAST_HANDLE, dbch_data[sizeW * 3 + 1]) ))) return 0; + memcpy( handleA, handleW, offsetof(DEV_BROADCAST_HANDLE, dbch_data[0]) ); + offset = min( sizeW, handleW->dbch_nameoffset ); + + memcpy( handleA->dbch_data, handleW->dbch_data, offset ); + len = WideCharToMultiByte( CP_ACP, 0, (WCHAR *)(handleW->dbch_data + offset), (sizeW - offset) / sizeof(WCHAR), + (char *)handleA->dbch_data + offset, sizeW * 3 + 1 - offset, NULL, NULL ); + handleA->dbch_size = offsetof(DEV_BROADCAST_HANDLE, dbch_data[offset + len + 1]); + + SendMessageTimeoutA( handle, WM_DEVICECHANGE, flags, (LPARAM)handleA, SMTO_ABORTIFHUNG, 2000, NULL ); + free( handleA ); + return 0; + } + + case DBT_DEVTYP_OEM: + break; + default: + FIXME( "unimplemented W to A mapping for %#lx\n", header->dbch_devicetype ); + } + } + + SendMessageTimeoutA( handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL ); + return 0; +} + +static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + FIXME("Support for service handles is not yet implemented!\n"); + return 0; +} + +/*********************************************************************** + * RegisterDeviceNotificationA (USER32.@) + * + * See RegisterDeviceNotificationW. + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationA( HANDLE handle, void *filter, DWORD flags ) +{ + return RegisterDeviceNotificationW( handle, filter, flags ); +} + +/*********************************************************************** + * RegisterDeviceNotificationW (USER32.@) + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) +{ + DEV_BROADCAST_HDR *header = filter; + device_notify_callback callback; + + TRACE("handle %p, filter %p, flags %#lx\n", handle, filter, flags); + + if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (!(flags & DEVICE_NOTIFY_SERVICE_HANDLE) && !IsWindow( handle )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) + callback = devnotify_service_callback; + else if (IsWindowUnicode( handle )) + callback = devnotify_window_callbackW; + else + callback = devnotify_window_callbackA; + + if (!header) + { + DEV_BROADCAST_HDR dummy = {0}; + return I_ScRegisterDeviceNotification( handle, &dummy, callback ); + } + if (header->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE) + { + DEV_BROADCAST_DEVICEINTERFACE_W iface = *(DEV_BROADCAST_DEVICEINTERFACE_W *)header; + + if (flags & DEVICE_NOTIFY_ALL_INTERFACE_CLASSES) + iface.dbcc_size = offsetof( DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_classguid ); + else + iface.dbcc_size = offsetof( DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name ); + + return I_ScRegisterDeviceNotification( handle, (DEV_BROADCAST_HDR *)&iface, callback ); + } + if (header->dbch_devicetype == DBT_DEVTYP_HANDLE) + { + FIXME( "DBT_DEVTYP_HANDLE not implemented\n" ); + return I_ScRegisterDeviceNotification( handle, header, callback ); + } + + FIXME( "type %#lx not implemented\n", header->dbch_devicetype ); + SetLastError( ERROR_INVALID_DATA ); + return NULL; +} + +/*********************************************************************** + * UnregisterDeviceNotification (USER32.@) + */ +BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + TRACE("%p\n", handle); + + return I_ScUnregisterDeviceNotification( handle ); +} + +/*********************************************************************** + * GetRawInputDeviceInfoA (USER32.@) + */ +UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UINT *size ) +{ + TRACE( "device %p, command %#x, data %p, size %p.\n", device, command, data, size ); + + /* RIDI_DEVICENAME size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, sizeW; + + if (!size) return ~0U; + + sizeW = *size; + + if (data && sizeW > 0) + nameW = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * sizeW ); + else + nameW = NULL; + + ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &sizeW ); + + if (ret && ret != ~0U) + WideCharToMultiByte( CP_ACP, 0, nameW, -1, data, *size, NULL, NULL ); + + *size = sizeW; + + HeapFree( GetProcessHeap(), 0, nameW ); + + return ret; + } + + return NtUserGetRawInputDeviceInfo( device, command, data, size ); +} + +/*********************************************************************** + * DefRawInputProc (USER32.@) + */ +LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size ) +{ + TRACE( "data %p, data_count %d, header_size %u.\n", data, data_count, header_size ); + + return header_size == sizeof(RAWINPUTHEADER) ? 0 : -1; +} + +/***************************************************************************** + * CloseTouchInputHandle (USER32.@) + */ +BOOL WINAPI CloseTouchInputHandle( HTOUCHINPUT handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetTouchInputInfo (USER32.@) + */ +BOOL WINAPI GetTouchInputInfo( HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size ) +{ + FIXME( "handle %p, count %u, ptr %p, size %u stub!\n", handle, count, ptr, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * IsTouchWindow (USER32.@) + */ +BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags ) +{ + FIXME( "hwnd %p, flags %p stub!\n", hwnd, flags ); + return FALSE; +} + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) +{ + FIXME( "hwnd %p, flags %#lx stub!\n", hwnd, flags ); + return TRUE; +} + +/***************************************************************************** + * UnregisterTouchWindow (USER32.@) + */ +BOOL WINAPI UnregisterTouchWindow( HWND hwnd ) +{ + FIXME( "hwnd %p stub!\n", hwnd ); + return TRUE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI CloseGestureInfoHandle( HGESTUREINFO handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureExtraArgs( HGESTUREINFO handle, UINT count, BYTE *args ) +{ + FIXME( "handle %p, count %u, args %p stub!\n", handle, count, args ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureInfo( HGESTUREINFO handle, GESTUREINFO *ptr ) +{ + FIXME( "handle %p, ptr %p stub!\n", handle, ptr ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureConfig (USER32.@) + */ +BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, flags %#lx, count %p, config %p, size %u stub!\n", + hwnd, reserved, flags, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * SetGestureConfig (USER32.@) + */ +BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, count %u, config %p, size %u stub!\n", + hwnd, reserved, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +BOOL WINAPI GetPointerTouchInfo( UINT32 id, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, info %p stub!\n", id, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, count %p, info %p stub!\n", id, count, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + +/******************************************************************* + * SetForegroundWindow (USER32.@) + */ +BOOL WINAPI SetForegroundWindow( HWND hwnd ) +{ + return NtUserSetForegroundWindow( hwnd ); +} + + +/******************************************************************* + * GetActiveWindow (USER32.@) + */ +HWND WINAPI GetActiveWindow(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; +} + + +/***************************************************************** + * GetFocus (USER32.@) + */ +HWND WINAPI GetFocus(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; +} + + +/******************************************************************* + * SetShellWindow (USER32.@) + */ +BOOL WINAPI SetShellWindow( HWND hwnd ) +{ + return NtUserSetShellWindowEx( hwnd, hwnd ); +} + + +/******************************************************************* + * GetShellWindow (USER32.@) + */ +HWND WINAPI GetShellWindow(void) +{ + return NtUserGetShellWindow(); +} + + +/*********************************************************************** + * SetProgmanWindow (USER32.@) + */ +HWND WINAPI SetProgmanWindow( HWND hwnd ) +{ + return NtUserSetProgmanWindow( hwnd ); +} + + +/*********************************************************************** + * GetProgmanWindow (USER32.@) + */ +HWND WINAPI GetProgmanWindow(void) +{ + return NtUserGetProgmanWindow(); +} + + +/*********************************************************************** + * SetTaskmanWindow (USER32.@) + */ +HWND WINAPI SetTaskmanWindow( HWND hwnd ) +{ + return NtUserSetTaskmanWindow( hwnd ); +} + +/*********************************************************************** + * GetTaskmanWindow (USER32.@) + */ +HWND WINAPI GetTaskmanWindow(void) +{ + return NtUserGetTaskmanWindow(); +} + +HSYNTHETICPOINTERDEVICE WINAPI CreateSyntheticPointerDevice(POINTER_INPUT_TYPE type, ULONG max_count, POINTER_FEEDBACK_MODE mode) +{ + FIXME( "type %ld, max_count %ld, mode %d stub!\n", type, max_count, mode); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return NULL; +} diff --git a/win32ss/user/user32_vista/wine/misc.c b/win32ss/user/user32_vista/wine/misc.c new file mode 100644 index 00000000000..6333fcb48b4 --- /dev/null +++ b/win32ss/user/user32_vista/wine/misc.c @@ -0,0 +1,545 @@ +/* + * Misc USER functions + * + * Copyright 1995 Thomas Sandford + * Copyright 1997 Marcus Meissner + * Copyright 1998 Turchanov Sergey + * Copyright 2019 Micah N Gorrell for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "wine/windef16.h" +#include "winbase.h" +#include "wingdi.h" +#include "controls.h" +#include "imm.h" +#include "user_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); + +BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); + +#define IMM_INIT_MAGIC 0x19650412 +static LRESULT (WINAPI *imm_ime_wnd_proc)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi); + +/* USER signal proc flags and codes */ +/* See UserSignalProc for comments */ +#define USIG_FLAGS_WIN32 0x0001 +#define USIG_FLAGS_GUI 0x0002 +#define USIG_FLAGS_FEEDBACK 0x0004 +#define USIG_FLAGS_FAULT 0x0008 + +#define USIG_DLL_UNLOAD_WIN16 0x0001 +#define USIG_DLL_UNLOAD_WIN32 0x0002 +#define USIG_FAULT_DIALOG_PUSH 0x0003 +#define USIG_FAULT_DIALOG_POP 0x0004 +#define USIG_DLL_UNLOAD_ORPHANS 0x0005 +#define USIG_THREAD_INIT 0x0010 +#define USIG_THREAD_EXIT 0x0020 +#define USIG_PROCESS_CREATE 0x0100 +#define USIG_PROCESS_INIT 0x0200 +#define USIG_PROCESS_EXIT 0x0300 +#define USIG_PROCESS_DESTROY 0x0400 +#define USIG_PROCESS_RUNNING 0x0500 +#define USIG_PROCESS_LOADED 0x0600 + +/*********************************************************************** + * SignalProc32 (USER.391) + * UserSignalProc (USER32.@) + * + * The exact meaning of the USER signals is undocumented, but this + * should cover the basic idea: + * + * USIG_DLL_UNLOAD_WIN16 + * This is sent when a 16-bit module is unloaded. + * + * USIG_DLL_UNLOAD_WIN32 + * This is sent when a 32-bit module is unloaded. + * + * USIG_DLL_UNLOAD_ORPHANS + * This is sent after the last Win3.1 module is unloaded, + * to allow removal of orphaned menus. + * + * USIG_FAULT_DIALOG_PUSH + * USIG_FAULT_DIALOG_POP + * These are called to allow USER to prepare for displaying a + * fault dialog, even though the fault might have happened while + * inside a USER critical section. + * + * USIG_THREAD_INIT + * This is called from the context of a new thread, as soon as it + * has started to run. + * + * USIG_THREAD_EXIT + * This is called, still in its context, just before a thread is + * about to terminate. + * + * USIG_PROCESS_CREATE + * This is called, in the parent process context, after a new process + * has been created. + * + * USIG_PROCESS_INIT + * This is called in the new process context, just after the main thread + * has started execution (after the main thread's USIG_THREAD_INIT has + * been sent). + * + * USIG_PROCESS_LOADED + * This is called after the executable file has been loaded into the + * new process context. + * + * USIG_PROCESS_RUNNING + * This is called immediately before the main entry point is called. + * + * USIG_PROCESS_EXIT + * This is called in the context of a process that is about to + * terminate (but before the last thread's USIG_THREAD_EXIT has + * been sent). + * + * USIG_PROCESS_DESTROY + * This is called after a process has terminated. + * + * + * The meaning of the dwFlags bits is as follows: + * + * USIG_FLAGS_WIN32 + * Current process is 32-bit. + * + * USIG_FLAGS_GUI + * Current process is a (Win32) GUI process. + * + * USIG_FLAGS_FEEDBACK + * Current process needs 'feedback' (determined from the STARTUPINFO + * flags STARTF_FORCEONFEEDBACK / STARTF_FORCEOFFFEEDBACK). + * + * USIG_FLAGS_FAULT + * The signal is being sent due to a fault. + */ +WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID, + DWORD dwFlags, HMODULE16 hModule ) +{ + FIXME("(%04x, %08lx, %04lx, %04x)\n", + uCode, dwThreadOrProcessID, dwFlags, hModule ); + /* FIXME: Should chain to GdiSignalProc now. */ + return 0; +} + + +/********************************************************************** + * SetLastErrorEx [USER32.@] + * + * Sets the last-error code. + * + * RETURNS + * None. + */ +void WINAPI SetLastErrorEx( + DWORD error, /* [in] Per-thread error code */ + DWORD type) /* [in] Error type */ +{ + TRACE("(0x%08lx, 0x%08lx)\n", error,type); + switch(type) { + case 0: + break; + case SLE_ERROR: + case SLE_MINORERROR: + case SLE_WARNING: + /* Fall through for now */ + default: + FIXME("(error=%08lx, type=%08lx): Unhandled type\n", error,type); + break; + } + SetLastError( error ); +} + +/****************************************************************************** + * GetAltTabInfoA [USER32.@] + */ +BOOL WINAPI GetAltTabInfoA(HWND hwnd, int iItem, PALTTABINFO pati, LPSTR pszItemText, UINT cchItemText) +{ + FIXME("(%p, 0x%08x, %p, %p, 0x%08x)\n", hwnd, iItem, pati, pszItemText, cchItemText); + return FALSE; +} + +/****************************************************************************** + * GetAltTabInfoW [USER32.@] + */ +BOOL WINAPI GetAltTabInfoW(HWND hwnd, int iItem, PALTTABINFO pati, LPWSTR pszItemText, UINT cchItemText) +{ + FIXME("(%p, 0x%08x, %p, %p, 0x%08x)\n", hwnd, iItem, pati, pszItemText, cchItemText); + return FALSE; +} + +/****************************************************************************** + * SetDebugErrorLevel [USER32.@] + * Sets the minimum error level for generating debugging events + * + * PARAMS + * dwLevel [I] Debugging error level + * + * RETURNS + * Nothing. + */ +VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) +{ + FIXME("(%ld): stub\n", dwLevel); +} + + +/*********************************************************************** + * SetWindowStationUser (USER32.@) + */ +DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) +{ + FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2); + return 1; +} + +/*********************************************************************** + * RegisterLogonProcess (USER32.@) + */ +DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) +{ + FIXME("(%p,%d),stub!\n",hprocess,x); + return 1; +} + +/*********************************************************************** + * SetLogonNotifyWindow (USER32.@) + */ +DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) +{ + FIXME("(%p,%p),stub!\n",hwinsta,hwnd); + return 1; +} + +/*********************************************************************** + * RegisterSystemThread (USER32.@) + */ +void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) +{ + FIXME("(%08lx, %08lx)\n", flags, reserved); +} + +/*********************************************************************** + * RegisterShellHookWindow [USER32.@] + */ +BOOL WINAPI RegisterShellHookWindow(HWND hWnd) +{ + FIXME("(%p): stub\n", hWnd); + return FALSE; +} + + +/*********************************************************************** + * DeregisterShellHookWindow [USER32.@] + */ +BOOL WINAPI DeregisterShellHookWindow(HWND hWnd) +{ + FIXME("(%p): stub\n", hWnd); + return FALSE; +} + + +/*********************************************************************** + * RegisterTasklist [USER32.@] + */ +DWORD WINAPI RegisterTasklist (DWORD x) +{ + FIXME("0x%08lx\n",x); + return TRUE; +} + +/*********************************************************************** + * GetAppCompatFlags (USER32.@) + */ +DWORD WINAPI GetAppCompatFlags( HTASK hTask ) +{ + FIXME("(%p) stub\n", hTask); + return 0; +} + +/*********************************************************************** + * GetAppCompatFlags2 (USER32.@) + */ +DWORD WINAPI GetAppCompatFlags2( HTASK hTask ) +{ + FIXME("(%p) stub\n", hTask); + return 0; +} + + +/*********************************************************************** + * AlignRects (USER32.@) + */ +BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) +{ + FIXME("(%p, %ld, %ld, %ld): stub\n", rect, b, c, d); + if (rect) + FIXME("rect: %s\n", wine_dbgstr_rect(rect)); + /* Calls OffsetRect */ + return FALSE; +} + + +/*********************************************************************** + * LoadLocalFonts (USER32.@) + */ +VOID WINAPI LoadLocalFonts(VOID) +{ + /* are loaded. */ + return; +} + + +/*********************************************************************** + * User32InitializeImmEntryTable + */ +BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) +{ + HMODULE imm32 = GetModuleHandleW(L"imm32.dll"); + + TRACE("(%lx)\n", magic); + + if (!imm32 || magic != IMM_INIT_MAGIC) + return FALSE; + + if (imm_ime_wnd_proc) + return TRUE; + + /* this part is not compatible with native imm32.dll */ + imm_ime_wnd_proc = (void*)GetProcAddress(imm32, "__wine_ime_wnd_proc"); + if (!imm_ime_wnd_proc) + FIXME("native imm32.dll not supported\n"); + return TRUE; +} + +/********************************************************************** + * WINNLSGetIMEHotkey [USER32.@] + * + */ +UINT WINAPI WINNLSGetIMEHotkey(HWND hwnd) +{ + FIXME("hwnd %p: stub!\n", hwnd); + return 0; /* unknown */ +} + +/********************************************************************** + * WINNLSEnableIME [USER32.@] + * + */ +BOOL WINAPI WINNLSEnableIME(HWND hwnd, BOOL enable) +{ + FIXME("hwnd %p enable %d: stub!\n", hwnd, enable); + return TRUE; /* success (?) */ +} + +/********************************************************************** + * WINNLSGetEnableStatus [USER32.@] + * + */ +BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) +{ + FIXME("hwnd %p: stub!\n", hwnd); + return TRUE; /* success (?) */ +} + +/********************************************************************** + * SendIMEMessageExA [USER32.@] + * + */ +LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) +{ + FIXME("(%p,%Ix): stub\n", hwnd, lparam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/********************************************************************** + * SendIMEMessageExW [USER32.@] + * + */ +LRESULT WINAPI SendIMEMessageExW(HWND hwnd, LPARAM lparam) +{ + FIXME("(%p,%Ix): stub\n", hwnd, lparam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/********************************************************************** + * DisableProcessWindowsGhosting [USER32.@] + * + */ +VOID WINAPI DisableProcessWindowsGhosting(VOID) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return; +} + +/********************************************************************** + * UserHandleGrantAccess [USER32.@] + * + */ +BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) +{ + FIXME("(%p,%p,%d): stub\n", handle, job, grant); + return TRUE; +} + +/********************************************************************** + * RegisterPowerSettingNotification [USER32.@] + */ +HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUID *guid, DWORD flags) +{ + FIXME("(%p,%s,%lx): stub\n", recipient, debugstr_guid(guid), flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterPowerSettingNotification [USER32.@] + */ +BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p): stub\n", handle); + return TRUE; +} + +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#lx: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification (USER32.@) + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("%p: stub.\n", handle); + return TRUE; +} + +/********************************************************************** + * IsWindowRedirectedForPrint [USER32.@] + */ +BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) +{ + FIXME("(%p): stub\n", hwnd); + return FALSE; +} + +/********************************************************************** + * RegisterPointerDeviceNotifications [USER32.@] + */ +BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) +{ + FIXME("(%p %d): stub\n", hwnd, notifyrange); + return TRUE; +} + +/********************************************************************** + * GetPointerDevices [USER32.@] + */ +BOOL WINAPI GetPointerDevices(UINT32 *device_count, POINTER_DEVICE_INFO *devices) +{ + FIXME("(%p %p): partial stub\n", device_count, devices); + + if (!device_count) + return FALSE; + + if (devices) + return FALSE; + + *device_count = 0; + return TRUE; +} + +/********************************************************************** + * RegisterTouchHitTestingWindow [USER32.@] + */ +BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) +{ + FIXME("(%p %ld): stub\n", hwnd, value); + return TRUE; +} + +/********************************************************************** + * EvaluateProximityToRect [USER32.@] + */ +BOOL WINAPI EvaluateProximityToRect(const RECT *box, + const TOUCH_HIT_TESTING_INPUT *input, + TOUCH_HIT_TESTING_PROXIMITY_EVALUATION *proximity) +{ + FIXME("(%p,%p,%p): stub\n", box, input, proximity); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** + * PackTouchHitTestingProximityEvaluation [USER32.@] + */ +LRESULT WINAPI PackTouchHitTestingProximityEvaluation(const TOUCH_HIT_TESTING_INPUT *input, + const TOUCH_HIT_TESTING_PROXIMITY_EVALUATION *proximity) +{ + FIXME("(%p,%p): stub\n", input, proximity); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/********************************************************************** + * GetPointerType [USER32.@] + */ +BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type) +{ + FIXME("(%d %p): stub\n", id, type); + + if(!id || !type) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *type = PT_MOUSE; + return TRUE; +} + +BOOL WINAPI GetPointerInfo(UINT32 id, POINTER_INFO *info) +{ + FIXME("(%d %p): stub\n", id, info); + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + if (!imm_ime_wnd_proc) return DefWindowProcA(hwnd, msg, wParam, lParam); + return imm_ime_wnd_proc( hwnd, msg, wParam, lParam, TRUE ); +} + +LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + if (!imm_ime_wnd_proc) return DefWindowProcW(hwnd, msg, wParam, lParam); + return imm_ime_wnd_proc( hwnd, msg, wParam, lParam, FALSE ); +} diff --git a/win32ss/user/user32_vista/wine/win.c b/win32ss/user/user32_vista/wine/win.c new file mode 100644 index 00000000000..99f681a3f9c --- /dev/null +++ b/win32ss/user/user32_vista/wine/win.c @@ -0,0 +1,1731 @@ +/* + * Window related functions + * + * Copyright 1993, 1994 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "user_private.h" +#include "controls.h" +#include "winver.h" +#include "wine/asm.h" +#include "wine/exception.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); + + +#ifdef __i386__ +/* Some apps pass a non-stdcall proc to EnumChildWindows, + * so we need a small assembly wrapper to call the proc. + */ +extern LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ) +{ + return proc( hwnd, lparam ); +} +#endif /* __i386__ */ + +/******************************************************************* + * enum_windows + */ +static BOOL enum_windows( HDESK desktop, HWND hwnd, DWORD tid, BOOL children, + WNDENUMPROC proc, LPARAM param ) +{ + HWND *list; + ULONG i, size = 128; + BOOL ret = !children; /* EnumChildWindows returns FALSE on empty list, the others TRUE */ + NTSTATUS status; + + for (;;) + { + if (!(list = HeapAlloc( GetProcessHeap(), 0, size * sizeof(HWND) ))) return FALSE; + status = NtUserBuildHwndList( desktop, hwnd, children, TRUE, tid, size, list, &size ); + if (!status) break; + HeapFree( GetProcessHeap(), 0, list ); + if (status != STATUS_BUFFER_TOO_SMALL) return FALSE; + } + for (i = 0; i < size && list[i] != HWND_BOTTOM; i++) + { + if (!IsWindow( list[i] )) continue; + if (!(ret = enum_callback_wrapper( proc, list[i], param ))) break; + } + HeapFree( GetProcessHeap(), 0, list ); + return ret; +} + + +/******************************************************************* + * is_desktop_window + * + * Check if window is the desktop or the HWND_MESSAGE top parent. + */ +BOOL is_desktop_window( HWND hwnd ) +{ + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); + + if (!hwnd) return FALSE; + if (hwnd == UlongToHandle( thread_info->top_window )) return TRUE; + if (hwnd == UlongToHandle( thread_info->msg_window )) return TRUE; + + if (!HIWORD(hwnd) || HIWORD(hwnd) == 0xffff) + { + if (LOWORD(thread_info->top_window) == LOWORD(hwnd)) return TRUE; + if (LOWORD(thread_info->msg_window) == LOWORD(hwnd)) return TRUE; + } + return FALSE; +} + + +/* check if hwnd is a broadcast magic handle */ +static inline BOOL is_broadcast( HWND hwnd ) +{ + return hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST; +} + + +/*********************************************************************** + * WIN_IsCurrentProcess + * + * Check whether a given window belongs to the current process (and return the full handle). + */ +HWND WIN_IsCurrentProcess( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrentProcessWindow )); +} + + +/*********************************************************************** + * WIN_IsCurrentThread + * + * Check whether a given window belongs to the current thread (and return the full handle). + */ +HWND WIN_IsCurrentThread( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrentThreadWindow )); +} + + +/*********************************************************************** + * WIN_GetFullHandle + * + * Convert a possibly truncated window handle to a full 32-bit handle. + */ +HWND WIN_GetFullHandle( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetFullWindowHandle )); +} + + +/*********************************************************************** + * WIN_SetStyle + * + * Change the style of a window. + */ +ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) +{ + /* FIXME: Use SetWindowLong or move callers to win32u instead. + * We use STYLESTRUCT to pass params, but meaning of its field does not match our usage. */ + STYLESTRUCT style = { .styleNew = set_bits, .styleOld = clear_bits }; + return NtUserCallHwndParam( hwnd, (UINT_PTR)&style, NtUserSetWindowStyle ); +} + + +/*********************************************************************** + * dump_window_styles + */ +static void dump_window_styles( DWORD style, DWORD exstyle ) +{ + TRACE( "style:" ); + if(style & WS_POPUP) TRACE(" WS_POPUP"); + if(style & WS_CHILD) TRACE(" WS_CHILD"); + if(style & WS_MINIMIZE) TRACE(" WS_MINIMIZE"); + if(style & WS_VISIBLE) TRACE(" WS_VISIBLE"); + if(style & WS_DISABLED) TRACE(" WS_DISABLED"); + if(style & WS_CLIPSIBLINGS) TRACE(" WS_CLIPSIBLINGS"); + if(style & WS_CLIPCHILDREN) TRACE(" WS_CLIPCHILDREN"); + if(style & WS_MAXIMIZE) TRACE(" WS_MAXIMIZE"); + if((style & WS_CAPTION) == WS_CAPTION) TRACE(" WS_CAPTION"); + else + { + if(style & WS_BORDER) TRACE(" WS_BORDER"); + if(style & WS_DLGFRAME) TRACE(" WS_DLGFRAME"); + } + if(style & WS_VSCROLL) TRACE(" WS_VSCROLL"); + if(style & WS_HSCROLL) TRACE(" WS_HSCROLL"); + if(style & WS_SYSMENU) TRACE(" WS_SYSMENU"); + if(style & WS_THICKFRAME) TRACE(" WS_THICKFRAME"); + if (style & WS_CHILD) + { + if(style & WS_GROUP) TRACE(" WS_GROUP"); + if(style & WS_TABSTOP) TRACE(" WS_TABSTOP"); + } + else + { + if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX"); + if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX"); + } + + /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */ +#define DUMPED_STYLES \ + ((DWORD)(WS_POPUP | \ + WS_CHILD | \ + WS_MINIMIZE | \ + WS_VISIBLE | \ + WS_DISABLED | \ + WS_CLIPSIBLINGS | \ + WS_CLIPCHILDREN | \ + WS_MAXIMIZE | \ + WS_BORDER | \ + WS_DLGFRAME | \ + WS_VSCROLL | \ + WS_HSCROLL | \ + WS_SYSMENU | \ + WS_THICKFRAME | \ + WS_GROUP | \ + WS_TABSTOP | \ + WS_MINIMIZEBOX | \ + WS_MAXIMIZEBOX)) + + if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); + TRACE("\n"); +#undef DUMPED_STYLES + + TRACE( "exstyle:" ); + if(exstyle & WS_EX_DLGMODALFRAME) TRACE(" WS_EX_DLGMODALFRAME"); + if(exstyle & WS_EX_DRAGDETECT) TRACE(" WS_EX_DRAGDETECT"); + if(exstyle & WS_EX_NOPARENTNOTIFY) TRACE(" WS_EX_NOPARENTNOTIFY"); + if(exstyle & WS_EX_TOPMOST) TRACE(" WS_EX_TOPMOST"); + if(exstyle & WS_EX_ACCEPTFILES) TRACE(" WS_EX_ACCEPTFILES"); + if(exstyle & WS_EX_TRANSPARENT) TRACE(" WS_EX_TRANSPARENT"); + if(exstyle & WS_EX_MDICHILD) TRACE(" WS_EX_MDICHILD"); + if(exstyle & WS_EX_TOOLWINDOW) TRACE(" WS_EX_TOOLWINDOW"); + if(exstyle & WS_EX_WINDOWEDGE) TRACE(" WS_EX_WINDOWEDGE"); + if(exstyle & WS_EX_CLIENTEDGE) TRACE(" WS_EX_CLIENTEDGE"); + if(exstyle & WS_EX_CONTEXTHELP) TRACE(" WS_EX_CONTEXTHELP"); + if(exstyle & WS_EX_RIGHT) TRACE(" WS_EX_RIGHT"); + if(exstyle & WS_EX_RTLREADING) TRACE(" WS_EX_RTLREADING"); + if(exstyle & WS_EX_LEFTSCROLLBAR) TRACE(" WS_EX_LEFTSCROLLBAR"); + if(exstyle & WS_EX_CONTROLPARENT) TRACE(" WS_EX_CONTROLPARENT"); + if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE"); + if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW"); + if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED"); + if(exstyle & WS_EX_NOINHERITLAYOUT) TRACE(" WS_EX_NOINHERITLAYOUT"); + if(exstyle & WS_EX_LAYOUTRTL) TRACE(" WS_EX_LAYOUTRTL"); + if(exstyle & WS_EX_COMPOSITED) TRACE(" WS_EX_COMPOSITED"); + if(exstyle & WS_EX_NOACTIVATE) TRACE(" WS_EX_NOACTIVATE"); + +#define DUMPED_EX_STYLES \ + ((DWORD)(WS_EX_DLGMODALFRAME | \ + WS_EX_DRAGDETECT | \ + WS_EX_NOPARENTNOTIFY | \ + WS_EX_TOPMOST | \ + WS_EX_ACCEPTFILES | \ + WS_EX_TRANSPARENT | \ + WS_EX_MDICHILD | \ + WS_EX_TOOLWINDOW | \ + WS_EX_WINDOWEDGE | \ + WS_EX_CLIENTEDGE | \ + WS_EX_CONTEXTHELP | \ + WS_EX_RIGHT | \ + WS_EX_RTLREADING | \ + WS_EX_LEFTSCROLLBAR | \ + WS_EX_CONTROLPARENT | \ + WS_EX_STATICEDGE | \ + WS_EX_APPWINDOW | \ + WS_EX_LAYERED | \ + WS_EX_NOINHERITLAYOUT | \ + WS_EX_LAYOUTRTL | \ + WS_EX_COMPOSITED |\ + WS_EX_NOACTIVATE)) + + if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); + TRACE("\n"); +#undef DUMPED_EX_STYLES +} + +static BOOL is_default_coord( int x ) +{ + return x == CW_USEDEFAULT || x == 0x8000; +} + +/*********************************************************************** + * WIN_CreateWindowEx + * + * Implementation of CreateWindowEx(). + */ +HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) +{ + UNICODE_STRING class, window_name = {0}; + HWND hwnd, top_child = 0; + MDICREATESTRUCTW mdi_cs; + WNDCLASSEXW info; + WCHAR name_buf[8]; + HMENU menu; + + if (!get_class_info( module, className, &info, &class, FALSE )) return FALSE; + + TRACE("%s %s%s%s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), + debugstr_w(className), class.Buffer != className ? "->" : "", + class.Buffer != className ? debugstr_wn(class.Buffer, class.Length / sizeof(WCHAR)) : "", + cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, + cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams ); + if(TRACE_ON(win)) dump_window_styles( cs->style, cs->dwExStyle ); + + /* Fix the styles for MDI children */ + if (cs->dwExStyle & WS_EX_MDICHILD) + { + POINT pos[2]; + UINT id = 0; + + if (!NtUserGetMDIClientInfo( cs->hwndParent )) + { + WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", cs->hwndParent); + return 0; + } + + /* cs->lpCreateParams of WM_[NC]CREATE is different for MDI children. + * MDICREATESTRUCT members have the originally passed values. + * + * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW + * have the same layout. + */ + mdi_cs.szClass = cs->lpszClass; + mdi_cs.szTitle = cs->lpszName; + mdi_cs.hOwner = cs->hInstance; + mdi_cs.x = cs->x; + mdi_cs.y = cs->y; + mdi_cs.cx = cs->cx; + mdi_cs.cy = cs->cy; + mdi_cs.style = cs->style; + mdi_cs.lParam = (LPARAM)cs->lpCreateParams; + + cs->lpCreateParams = &mdi_cs; + + if (GetWindowLongW(cs->hwndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + { + if (cs->style & WS_POPUP) + { + TRACE("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); + return 0; + } + cs->style |= WS_CHILD | WS_CLIPSIBLINGS; + } + else + { + cs->style &= ~WS_POPUP; + cs->style |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX; + } + + top_child = GetWindow(cs->hwndParent, GW_CHILD); + + if (top_child) + { + /* Restore current maximized child */ + if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) + { + TRACE("Restoring current maximized child %p\n", top_child); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + NtUserShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else NtUserShowWindow( top_child, SW_SHOWNORMAL ); + } + } + + MDI_CalcDefaultChildPos( cs->hwndParent, -1, pos, 0, &id ); + if (!(cs->style & WS_POPUP)) cs->hMenu = ULongToHandle(id); + + TRACE( "MDI child id %04x\n", id ); + + if (cs->style & (WS_CHILD | WS_POPUP)) + { + if (is_default_coord( cs->x )) + { + cs->x = pos[0].x; + cs->y = pos[0].y; + } + if (is_default_coord( cs->cx ) || !cs->cx) cs->cx = pos[1].x; + if (is_default_coord( cs->cy ) || !cs->cy) cs->cy = pos[1].y; + } + } + + if (!unicode && cs->lpszName) + { + const char *nameA = (const char *)cs->lpszName; + /* resource ID string is a special case */ + if (nameA[0] == '\xff') + { + name_buf[0] = 0xffff; + name_buf[1] = MAKEWORD( nameA[1], nameA[2] ); + name_buf[2] = 0; + RtlInitUnicodeString( &window_name, name_buf ); + } + else if (!RtlCreateUnicodeStringFromAsciiz( &window_name, (const char *)cs->lpszName )) + return 0; + } + else RtlInitUnicodeString( &window_name, cs->lpszName ); + + menu = cs->hMenu; + if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); + + hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, + cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, + cs->lpCreateParams, 0, cs->hInstance, 0, !unicode ); + if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); + if (!unicode && window_name.Buffer != name_buf) RtlFreeUnicodeString( &window_name ); + return hwnd; +} + + +/*********************************************************************** + * CreateWindowExA (USER32.@) + */ +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExA( DWORD exStyle, LPCSTR className, + LPCSTR windowName, DWORD style, INT x, + INT y, INT width, INT height, + HWND parent, HMENU menu, + HINSTANCE instance, LPVOID data ) +{ + CREATESTRUCTA cs; + + cs.lpCreateParams = data; + cs.hInstance = instance; + cs.hMenu = menu; + cs.hwndParent = parent; + cs.x = x; + cs.y = y; + cs.cx = width; + cs.cy = height; + cs.style = style; + cs.lpszName = windowName; + cs.lpszClass = className; + cs.dwExStyle = exStyle; + + if (!IS_INTRESOURCE(className)) + { + WCHAR bufferW[256]; + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, ARRAY_SIZE( bufferW ))) + return 0; + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, FALSE ); + } + /* Note: we rely on the fact that CREATESTRUCTA and */ + /* CREATESTRUCTW have the same layout. */ + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, FALSE ); +} + + +/*********************************************************************** + * CreateWindowExW (USER32.@) + */ +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className, + LPCWSTR windowName, DWORD style, INT x, + INT y, INT width, INT height, + HWND parent, HMENU menu, + HINSTANCE instance, LPVOID data ) +{ + CREATESTRUCTW cs; + + cs.lpCreateParams = data; + cs.hInstance = instance; + cs.hMenu = menu; + cs.hwndParent = parent; + cs.x = x; + cs.y = y; + cs.cx = width; + cs.cy = height; + cs.style = style; + cs.lpszName = windowName; + cs.lpszClass = className; + cs.dwExStyle = exStyle; + + return wow_handlers.create_window( &cs, className, instance, TRUE ); +} + + +/*********************************************************************** + * CloseWindow (USER32.@) + */ +BOOL WINAPI CloseWindow( HWND hwnd ) +{ + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) return FALSE; + NtUserShowWindow( hwnd, SW_MINIMIZE ); + return TRUE; +} + + +/*********************************************************************** + * OpenIcon (USER32.@) + */ +BOOL WINAPI OpenIcon( HWND hwnd ) +{ + if (!IsIconic( hwnd )) return FALSE; + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); + return TRUE; +} + + +/*********************************************************************** + * FindWindowExW (USER32.@) + */ +HWND WINAPI FindWindowExW( HWND parent, HWND child, const WCHAR *class, const WCHAR *title ) +{ + UNICODE_STRING class_str, title_str; + + if (title) RtlInitUnicodeString( &title_str, title ); + + if (class) + { + if (IS_INTRESOURCE(class)) + { + class_str.Buffer = (WCHAR *)class; + class_str.Length = class_str.MaximumLength = 0; + } + else RtlInitUnicodeString( &class_str, class ); + } + + return NtUserFindWindowEx( parent, child, class ? &class_str : NULL, + title ? &title_str : NULL, 0 ); +} + + + +/*********************************************************************** + * FindWindowA (USER32.@) + */ +HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title ) +{ + HWND ret = FindWindowExA( 0, 0, className, title ); + if (!ret) SetLastError (ERROR_CANNOT_FIND_WND_CLASS); + return ret; +} + + +/*********************************************************************** + * FindWindowExA (USER32.@) + */ +HWND WINAPI FindWindowExA( HWND parent, HWND child, LPCSTR className, LPCSTR title ) +{ + LPWSTR titleW = NULL; + HWND hwnd = 0; + + if (title) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, title, -1, NULL, 0 ); + if (!(titleW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return 0; + MultiByteToWideChar( CP_ACP, 0, title, -1, titleW, len ); + } + + if (!IS_INTRESOURCE(className)) + { + WCHAR classW[256]; + if (MultiByteToWideChar( CP_ACP, 0, className, -1, classW, ARRAY_SIZE( classW ))) + hwnd = FindWindowExW( parent, child, classW, titleW ); + } + else + { + hwnd = FindWindowExW( parent, child, (LPCWSTR)className, titleW ); + } + + HeapFree( GetProcessHeap(), 0, titleW ); + return hwnd; +} + + +/*********************************************************************** + * FindWindowW (USER32.@) + */ +HWND WINAPI FindWindowW( LPCWSTR className, LPCWSTR title ) +{ + return FindWindowExW( 0, 0, className, title ); +} + + +/********************************************************************** + * GetDesktopWindow (USER32.@) + */ +HWND WINAPI GetDesktopWindow(void) +{ + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); + + if (thread_info->top_window) return UlongToHandle( thread_info->top_window ); + return NtUserGetDesktopWindow(); +} + + +/******************************************************************* + * EnableWindow (USER32.@) + */ +BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) +{ + return NtUserEnableWindow( hwnd, enable ); +} + + +/*********************************************************************** + * IsWindowEnabled (USER32.@) + */ +BOOL WINAPI IsWindowEnabled( HWND hwnd ) +{ + return NtUserIsWindowEnabled( hwnd ); +} + +/*********************************************************************** + * IsWindowUnicode (USER32.@) + */ +BOOL WINAPI IsWindowUnicode( HWND hwnd ) +{ + return NtUserIsWindowUnicode( hwnd ); +} + + +/*********************************************************************** + * GetWindowDpiAwarenessContext (USER32.@) + */ +DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) +{ + return LongToHandle( NtUserGetWindowDpiAwarenessContext( hwnd ) ); +} + +/*********************************************************************** + * GetDpiAwarenessContextForProcess (USER32.@) + */ +DPI_AWARENESS_CONTEXT WINAPI GetDpiAwarenessContextForProcess(HANDLE process) +{ + return LongToHandle( NtUserGetProcessDpiAwarenessContext( process ) ); +} + +/*********************************************************************** + * GetWindowDpiHostingBehavior (USER32.@) + */ +DPI_HOSTING_BEHAVIOR WINAPI GetWindowDpiHostingBehavior( HWND hwnd ) +{ + FIXME("(%p): stub\n", hwnd); + return DPI_HOSTING_BEHAVIOR_DEFAULT; +} + + +static LONG_PTR get_window_long_ptr( HWND hwnd, int offset, LONG_PTR ret, BOOL ansi ) +{ + if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) + { + DLGPROC proc = NtUserGetDialogProc( (DLGPROC)ret, ansi ); + if (proc && proc != WINPROC_PROC16) return (LONG_PTR)proc; + } + return ret; +} + + +static LONG_PTR set_dialog_proc( HWND hwnd, LONG_PTR newval, BOOL ansi ) +{ + DLGPROC proc; + LONG_PTR ret; + newval = NtUserCallTwoParam( newval, ansi, NtUserAllocWinProc ); + ret = NtUserSetWindowLongPtr( hwnd, DWLP_DLGPROC, newval, ansi ); + proc = NtUserGetDialogProc( (DLGPROC)ret, ansi ); + if (proc) ret = (UINT_PTR)proc; + return ret; +} + + +/*********************************************************************** + * GetDpiForWindow (USER32.@) + */ +UINT WINAPI GetDpiForWindow( HWND hwnd ) +{ + return NtUserGetDpiForWindow( hwnd ); +} + + +/*********************************************************************** + * SwitchToThisWindow (USER32.@) + */ +void WINAPI SwitchToThisWindow( HWND hwnd, BOOL alt_tab ) +{ + if (IsIconic( hwnd )) NtUserShowWindow( hwnd, SW_RESTORE ); + else BringWindowToTop( hwnd ); +} + + +/*********************************************************************** + * GetWindowRect (USER32.@) + */ +BOOL WINAPI GetWindowRect( HWND hwnd, RECT *rect ) +{ + UINT dpi = NTUSER_DPI_CONTEXT_GET_DPI( (UINT_PTR)GetThreadDpiAwarenessContext() ); + BOOL ret = NtUserGetWindowRect( hwnd, rect, dpi ); + if (ret) TRACE( "hwnd %p %s\n", hwnd, wine_dbgstr_rect(rect) ); + return ret; +} + + +/*********************************************************************** + * GetWindowRgn (USER32.@) + */ +int WINAPI GetWindowRgn( HWND hwnd, HRGN hrgn ) +{ + return NtUserGetWindowRgnEx( hwnd, hrgn, 0 ); +} + + +/*********************************************************************** + * GetWindowRgnBox (USER32.@) + */ +int WINAPI GetWindowRgnBox( HWND hwnd, RECT *rect ) +{ + int ret = ERROR; + HRGN hrgn; + + if (!rect) + return ERROR; + + if ((hrgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + if ((ret = GetWindowRgn( hwnd, hrgn )) != ERROR ) + ret = GetRgnBox( hrgn, rect ); + DeleteObject( hrgn ); + } + + return ret; +} + + +/*********************************************************************** + * GetClientRect (USER32.@) + */ +BOOL WINAPI GetClientRect( HWND hwnd, RECT *rect ) +{ + UINT dpi = NTUSER_DPI_CONTEXT_GET_DPI( (UINT_PTR)GetThreadDpiAwarenessContext() ); + return NtUserGetClientRect( hwnd, rect, dpi ); +} + + +/******************************************************************* + * WindowFromPoint (USER32.@) + */ +HWND WINAPI WindowFromPoint( POINT pt ) +{ + return NtUserWindowFromPoint( pt.x, pt.y ); +} + + +/******************************************************************* + * ChildWindowFromPoint (USER32.@) + */ +HWND WINAPI ChildWindowFromPoint( HWND parent, POINT pt ) +{ + return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, CWP_ALL ); +} + +/******************************************************************* + * RealChildWindowFromPoint (USER32.@) + */ +HWND WINAPI RealChildWindowFromPoint( HWND parent, POINT pt ) +{ + return NtUserRealChildWindowFromPoint( parent, pt.x, pt.y ); +} + +/******************************************************************* + * ChildWindowFromPointEx (USER32.@) + */ +HWND WINAPI ChildWindowFromPointEx( HWND parent, POINT pt, UINT flags ) +{ + return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, flags ); +} + + +/******************************************************************* + * MapWindowPoints (USER32.@) + */ +INT WINAPI MapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) +{ + UINT dpi = NTUSER_DPI_CONTEXT_GET_DPI( (UINT_PTR)GetThreadDpiAwarenessContext() ); + return NtUserMapWindowPoints( hwnd_from, hwnd_to, points, count, dpi ); +} + + +/******************************************************************* + * ClientToScreen (USER32.@) + */ +BOOL WINAPI ClientToScreen( HWND hwnd, POINT *pt ) +{ + return NtUserClientToScreen( hwnd, pt ); +} + + +/******************************************************************* + * ScreenToClient (USER32.@) + */ +BOOL WINAPI ScreenToClient( HWND hwnd, POINT *pt ) +{ + return NtUserScreenToClient( hwnd, pt ); +} + + +/*********************************************************************** + * IsIconic (USER32.@) + */ +BOOL WINAPI IsIconic( HWND hwnd ) +{ + return (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) != 0; +} + + +/*********************************************************************** + * IsZoomed (USER32.@) + */ +BOOL WINAPI IsZoomed( HWND hwnd ) +{ + return (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MAXIMIZE) != 0; +} + + +/******************************************************************* + * AllowSetForegroundWindow (USER32.@) + */ +BOOL WINAPI AllowSetForegroundWindow( DWORD procid ) +{ + /* FIXME: If Win98/2000 style SetForegroundWindow behavior is + * implemented, then fix this function. */ + return TRUE; +} + + +/******************************************************************* + * LockSetForegroundWindow (USER32.@) + */ +BOOL WINAPI LockSetForegroundWindow( UINT lockcode ) +{ + /* FIXME: If Win98/2000 style SetForegroundWindow behavior is + * implemented, then fix this function. */ + return TRUE; +} + + +/*********************************************************************** + * BringWindowToTop (USER32.@) + */ +BOOL WINAPI BringWindowToTop( HWND hwnd ) +{ + return NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); +} + + +/*********************************************************************** + * AnimateWindow (USER32.@) + */ +BOOL WINAPI AnimateWindow( HWND hwnd, DWORD time, DWORD flags ) +{ + FIXME( "partial stub\n" ); + + /* If trying to show/hide and it's already shown/hidden or invalid window, + * fail with invalid parameter. */ + if (!IsWindow( hwnd ) || (!(flags & AW_HIDE)) == IsWindowVisible( hwnd )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + NtUserShowWindow( hwnd, (flags & AW_HIDE) ? SW_HIDE : ((flags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA) ); + return TRUE; +} + + +/*********************************************************************** + * BeginDeferWindowPos (USER32.@) + */ +HDWP WINAPI BeginDeferWindowPos( INT count ) +{ + return NtUserBeginDeferWindowPos( count ); +} + + +/*********************************************************************** + * DeferWindowPos (USER32.@) + */ +HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, + INT cx, INT cy, UINT flags ) +{ + return NtUserDeferWindowPosAndBand( hdwp, hwnd, after, x, y, cx, cy, flags, 0, 0 ); +} + + +/*********************************************************************** + * EndDeferWindowPos (USER32.@) + */ +BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) +{ + return NtUserEndDeferWindowPosEx( hdwp, FALSE ); +} + + +/*********************************************************************** + * ArrangeIconicWindows (USER32.@) + */ +UINT WINAPI ArrangeIconicWindows( HWND parent ) +{ + return NtUserArrangeIconicWindows( parent ); +} + + +/********************************************************************** + * GetWindowWord (USER32.@) + */ +WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) +{ + return NtUserGetWindowWord( hwnd, offset ); +} + + +/********************************************************************** + * GetWindowLongA (USER32.@) + */ + +#ifdef __i386__ + +/* This wrapper is here to workaround a ntlea quirk. First of all, ntlea + * checks whether GetWindowLongA starts with the Win32 hotpatchable prologue, + * if it can find that, it will use a hooking strategy more difficult for us + * to deal with. Secondly, it assumes what follows the prologue is a `pushl $-2`, + * and will try to skip over this instruction when calling `GetWindowLongA`, + * (i.e. it tries to jump to `GetWindowLongA + 7`, 5 bytes for the prologue, 2 + * bytes for the `pushl`.). We have to anticipate that and make sure the result + * of doing this won't be a messed up stack, or a desynced PC. + */ +__ASM_STDCALL_FUNC( GetWindowLongA, 8, + ".byte 0x8b, 0xff, 0x55, 0x8b, 0xec\n" /* Win32 hotpatchable prologue. */ + "pushl $-2\n" + "addl $4, %esp\n" + "popl %ebp\n" + "jmp " __ASM_STDCALL("get_window_longA", 8) ) +LONG WINAPI get_window_longA( HWND hwnd, INT offset ) +#else +LONG WINAPI DECLSPEC_HOTPATCH GetWindowLongA( HWND hwnd, INT offset ) +#endif +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + if (sizeof(void *) == sizeof(LONG)) + { + LONG_PTR ret = NtUserGetWindowLongA( hwnd, offset ); + return get_window_long_ptr( hwnd, offset, ret, TRUE ); + } + return NtUserGetWindowLongA( hwnd, offset ); + } +} + + +/********************************************************************** + * GetWindowLongW (USER32.@) + */ +LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + if (sizeof(void *) == sizeof(LONG)) + { + LONG_PTR ret = NtUserGetWindowLongW( hwnd, offset ); + return get_window_long_ptr( hwnd, offset, ret, FALSE ); + } + return NtUserGetWindowLongW( hwnd, offset ); + } +} + + +/********************************************************************** + * SetWindowLongA (USER32.@) + * + * See SetWindowLongW. + */ +LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval ) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#else + case DWLP_DLGPROC: + if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, TRUE ); + /* fall through */ +#endif + default: + return NtUserSetWindowLong( hwnd, offset, newval, TRUE ); + } +} + + +/********************************************************************** + * SetWindowLongW (USER32.@) Set window attribute + * + * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long) + * value in a window's extra memory. + * + * The _hwnd_ parameter specifies the handle to a window that + * has extra memory. The _newval_ parameter contains the new + * attribute or extra memory value. If positive, the _offset_ + * parameter is the byte-addressed location in the window's extra + * memory to set. If negative, _offset_ specifies the window + * attribute to set, and should be one of the following values: + * + * GWL_EXSTYLE The window's extended window style + * + * GWL_STYLE The window's window style. + * + * GWLP_WNDPROC Pointer to the window's window procedure. + * + * GWLP_HINSTANCE The window's application instance handle. + * + * GWLP_ID The window's identifier. + * + * GWLP_USERDATA The window's user-specified data. + * + * If the window is a dialog box, the _offset_ parameter can be one of + * the following values: + * + * DWLP_DLGPROC The address of the window's dialog box procedure. + * + * DWLP_MSGRESULT The return value of a message + * that the dialog box procedure processed. + * + * DWLP_USER Application specific information. + * + * RETURNS + * + * If successful, returns the previous value located at _offset_. Otherwise, + * returns 0. + * + * NOTES + * + * Extra memory for a window class is specified by a nonzero cbWndExtra + * parameter of the WNDCLASS structure passed to RegisterClass() at the + * time of class creation. + * + * Using GWL_WNDPROC to set a new window procedure effectively creates + * a window subclass. Use CallWindowProc() in the new windows procedure + * to pass messages to the superclass's window procedure. + * + * The user data is reserved for use by the application which created + * the window. + * + * Do not use GWL_STYLE to change the window's WS_DISABLED style; + * instead, call the EnableWindow() function to change the window's + * disabled state. + * + * Do not use GWL_HWNDPARENT to reset the window's parent, use + * SetParent() instead. + * + * Win95: + * When offset is GWL_STYLE and the calling app's ver is 4.0, + * it sends WM_STYLECHANGING before changing the settings + * and WM_STYLECHANGED afterwards. + * App ver 4.0 can't use SetWindowLong to change WS_EX_TOPMOST. + */ +LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( + HWND hwnd, /* [in] window to alter */ + INT offset, /* [in] offset, in bytes, of location to alter */ + LONG newval /* [in] new value of location */ +) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN("Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#else + case DWLP_DLGPROC: + if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, FALSE ); + /* fall through */ +#endif + default: + return NtUserSetWindowLong( hwnd, offset, newval, FALSE ); + } +} + + +/******************************************************************* + * GetWindowTextA (USER32.@) + */ +INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) +{ + WCHAR *buffer; + int ret = 0; + + if (!lpString || nMaxCount <= 0) return 0; + + __TRY + { + lpString[0] = 0; + + if (WIN_IsCurrentProcess( hwnd )) + { + ret = (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) + { + /* when window belongs to other process, don't send a message */ + NtUserInternalGetWindowText( hwnd, buffer, nMaxCount ); + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) + lpString[nMaxCount-1] = 0; + HeapFree( GetProcessHeap(), 0, buffer ); + ret = strlen(lpString); + } + } + __EXCEPT_PAGE_FAULT + { + ret = 0; + } + __ENDTRY + + return ret; +} + + +/******************************************************************* + * GetWindowTextW (USER32.@) + */ +INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) +{ + int ret; + + if (!lpString || nMaxCount <= 0) return 0; + + __TRY + { + lpString[0] = 0; + + if (WIN_IsCurrentProcess( hwnd )) + { + ret = (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else + { + /* when window belongs to other process, don't send a message */ + ret = NtUserInternalGetWindowText( hwnd, lpString, nMaxCount ); + } + } + __EXCEPT_PAGE_FAULT + { + ret = 0; + } + __ENDTRY + + return ret; +} + + +/******************************************************************* + * SetWindowTextA (USER32.@) + * SetWindowText (USER32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextA( HWND hwnd, LPCSTR lpString ) +{ + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!WIN_IsCurrentProcess( hwnd )) + WARN( "setting text %s of other process window %p should not use SendMessage\n", + debugstr_a(lpString), hwnd ); + return (BOOL)SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); +} + + +/******************************************************************* + * SetWindowTextW (USER32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString ) +{ + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!WIN_IsCurrentProcess( hwnd )) + WARN( "setting text %s of other process window %p should not use SendMessage\n", + debugstr_w(lpString), hwnd ); + return (BOOL)SendMessageW( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); +} + + +/******************************************************************* + * GetWindowTextLengthA (USER32.@) + */ +INT WINAPI GetWindowTextLengthA( HWND hwnd ) +{ + CPINFO info; + + if (WIN_IsCurrentProcess( hwnd )) return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + GetCPInfo( CP_ACP, &info ); + return NtUserGetWindowTextLength( hwnd ) * info.MaxCharSize; +} + +/******************************************************************* + * GetWindowTextLengthW (USER32.@) + */ +INT WINAPI GetWindowTextLengthW( HWND hwnd ) +{ + if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + return NtUserGetWindowTextLength( hwnd ); +} + + +/******************************************************************* + * IsWindow (USER32.@) + */ +BOOL WINAPI IsWindow( HWND hwnd ) +{ + return NtUserIsWindow( hwnd ); +} + + +/*********************************************************************** + * GetWindowThreadProcessId (USER32.@) + */ +DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) +{ + return NtUserGetWindowThread( hwnd, process ); +} + + +/***************************************************************** + * GetParent (USER32.@) + */ +HWND WINAPI GetParent( HWND hwnd ) +{ + return NtUserGetParent( hwnd ); +} + + +/******************************************************************* + * IsChild (USER32.@) + */ +BOOL WINAPI IsChild( HWND parent, HWND child ) +{ + return NtUserIsChild( parent, child ); +} + + +/*********************************************************************** + * IsWindowVisible (USER32.@) + */ +BOOL WINAPI IsWindowVisible( HWND hwnd ) +{ + return NtUserIsWindowVisible( hwnd ); +} + + +/******************************************************************* + * GetTopWindow (USER32.@) + */ +HWND WINAPI GetTopWindow( HWND hwnd ) +{ + if (!hwnd) hwnd = GetDesktopWindow(); + return GetWindow( hwnd, GW_CHILD ); +} + + +/******************************************************************* + * GetWindow (USER32.@) + */ +HWND WINAPI GetWindow( HWND hwnd, UINT rel ) +{ + return NtUserGetWindowRelative( hwnd, rel ); +} + + +/******************************************************************* + * ShowOwnedPopups (USER32.@) + */ +BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL show ) +{ + return NtUserShowOwnedPopups( owner, show ); +} + + +/******************************************************************* + * GetLastActivePopup (USER32.@) + */ +HWND WINAPI GetLastActivePopup( HWND hwnd ) +{ + return NtUserGetLastActivePopup( hwnd ); +} + + +/******************************************************************* + * WIN_ListChildren + * + * Build an array of the children of a given window. The array must be + * freed with HeapFree. Returns NULL when no windows are found. + */ +HWND *WIN_ListChildren( HWND hwnd ) +{ + HWND *list; + ULONG size = 128; + NTSTATUS status; + + if (!(hwnd = GetWindow( hwnd, GW_CHILD ))) return NULL; + + for (;;) + { + if (!(list = HeapAlloc( GetProcessHeap(), 0, size * sizeof(HWND) ))) return NULL; + status = NtUserBuildHwndList( 0, hwnd, FALSE, TRUE, 0, size, list, &size ); + if (!status && size > 1) break; + HeapFree( GetProcessHeap(), 0, list ); + if (status != STATUS_BUFFER_TOO_SMALL) return NULL; + } + list[size - 1] = 0; + return list; +} + + +/******************************************************************* + * EnumWindows (USER32.@) + */ +BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam ) +{ + return enum_windows( 0, 0, 0, FALSE, lpEnumFunc, lParam ); +} + + +/********************************************************************** + * EnumThreadWindows (USER32.@) + */ +BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) +{ + return enum_windows( 0, 0, id, FALSE, func, lParam ); +} + + +/*********************************************************************** + * EnumDesktopWindows (USER32.@) + */ +BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) +{ + return enum_windows( desktop, 0, 0, FALSE, func, lparam ); +} + + +/********************************************************************** + * EnumChildWindows (USER32.@) + */ +BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func, LPARAM lParam ) +{ + return enum_windows( 0, parent, 0, TRUE, func, lParam ); +} + + +/******************************************************************* + * AnyPopup (USER32.@) + */ +BOOL WINAPI AnyPopup(void) +{ + int i; + BOOL retvalue; + HWND *list = WIN_ListChildren( GetDesktopWindow() ); + + if (!list) return FALSE; + for (i = 0; list[i]; i++) + { + if (IsWindowVisible( list[i] ) && GetWindow( list[i], GW_OWNER )) break; + } + retvalue = (list[i] != 0); + HeapFree( GetProcessHeap(), 0, list ); + return retvalue; +} + + +/******************************************************************* + * FlashWindow (USER32.@) + */ +BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) +{ + FLASHWINFO finfo; + + finfo.cbSize = sizeof(FLASHWINFO); + finfo.dwFlags = bInvert ? FLASHW_ALL : FLASHW_STOP; + finfo.uCount = 1; + finfo.dwTimeout = 0; + finfo.hwnd = hWnd; + return NtUserFlashWindowEx( &finfo ); +} + + +/******************************************************************* + * GetWindowContextHelpId (USER32.@) + */ +DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) +{ + return NtUserGetWindowContextHelpId( hwnd ); +} + + +/******************************************************************* + * SetWindowContextHelpId (USER32.@) + */ +BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) +{ + return NtUserSetWindowContextHelpId( hwnd, id ); +} + + +/******************************************************************* + * DragDetect (USER32.@) + */ +BOOL WINAPI DragDetect( HWND hwnd, POINT pt ) +{ + return NtUserDragDetect( hwnd, pt.x, pt.y ); +} + +/****************************************************************************** + * GetWindowModuleFileNameA (USER32.@) + */ +UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) +{ + HINSTANCE hinst; + + TRACE( "%p, %p, %u\n", hwnd, module, size ); + + if (!WIN_IsCurrentProcess( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + + hinst = (HINSTANCE)GetWindowLongPtrA( hwnd, GWLP_HINSTANCE ); + return GetModuleFileNameA( hinst, module, size ); +} + +/****************************************************************************** + * GetWindowModuleFileNameW (USER32.@) + */ +UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) +{ + HINSTANCE hinst; + + TRACE( "%p, %p, %u\n", hwnd, module, size ); + + if (!WIN_IsCurrentProcess( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + + hinst = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + return GetModuleFileNameW( hinst, module, size ); +} + +/****************************************************************************** + * GetWindowInfo (USER32.@) + * + * Note: tests show that Windows doesn't check cbSize of the structure. + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, WINDOWINFO *info ) +{ + return NtUserGetWindowInfo( hwnd, info ); +} + +/***************************************************************************** + * UpdateLayeredWindowIndirect (USER32.@) + */ +BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info ) +{ + if (!info || info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + return NtUserUpdateLayeredWindow( hwnd, info->hdcDst, info->pptDst, info->psize, + info->hdcSrc, info->pptSrc, info->crKey, + info->pblend, info->dwFlags, info->prcDirty ); +} + + +/***************************************************************************** + * UpdateLayeredWindow (USER32.@) + */ +BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psize, + HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, + DWORD flags) +{ + UPDATELAYEREDWINDOWINFO info; + + if (flags & ULW_EX_NORESIZE) /* only valid for UpdateLayeredWindowIndirect */ + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + info.cbSize = sizeof(info); + info.hdcDst = hdcDst; + info.pptDst = pptDst; + info.psize = psize; + info.hdcSrc = hdcSrc; + info.pptSrc = pptSrc; + info.crKey = crKey; + info.pblend = pblend; + info.dwFlags = flags; + info.prcDirty = NULL; + return UpdateLayeredWindowIndirect( hwnd, &info ); +} + + +/****************************************************************************** + * GetProcessDefaultLayout [USER32.@] + * + * Gets the default layout for parentless windows. + */ +BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) +{ + if (!layout) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + *layout = NtUserGetProcessDefaultLayout(); + if (*layout == ~0u) + { + WCHAR *str, buffer[MAX_PATH]; + DWORD i, version_layout = 0; + UINT len; + DWORD user_lang = GetUserDefaultLangID(); + DWORD *languages; + void *data = NULL; + + GetModuleFileNameW( 0, buffer, MAX_PATH ); + if (!(len = GetFileVersionInfoSizeW( buffer, NULL ))) goto done; + if (!(data = HeapAlloc( GetProcessHeap(), 0, len ))) goto done; + if (!GetFileVersionInfoW( buffer, 0, len, data )) goto done; + if (!VerQueryValueW( data, L"\\VarFileInfo\\Translation", (void **)&languages, &len ) || !len) goto done; + + len /= sizeof(DWORD); + for (i = 0; i < len; i++) if (LOWORD(languages[i]) == user_lang) break; + if (i == len) /* try neutral language */ + for (i = 0; i < len; i++) + if (LOWORD(languages[i]) == MAKELANGID( PRIMARYLANGID(user_lang), SUBLANG_NEUTRAL )) break; + if (i == len) i = 0; /* default to the first one */ + + swprintf( buffer, ARRAY_SIZE(buffer), L"\\StringFileInfo\\%04x%04x\\FileDescription", + LOWORD(languages[i]), HIWORD(languages[i]) ); + if (!VerQueryValueW( data, buffer, (void **)&str, &len )) goto done; + TRACE( "found description %s\n", debugstr_w( str )); + if (str[0] == 0x200e && str[1] == 0x200e) version_layout = LAYOUT_RTL; + + done: + HeapFree( GetProcessHeap(), 0, data ); + NtUserSetProcessDefaultLayout( *layout = version_layout ); + } + return TRUE; +} + + +/****************************************************************************** + * SetProcessDefaultLayout [USER32.@] + * + * Sets the default layout for parentless windows. + */ +BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) +{ + return NtUserSetProcessDefaultLayout( layout ); +} + + +/*********************************************************************** + * UpdateWindow (USER32.@) + */ +BOOL WINAPI UpdateWindow( HWND hwnd ) +{ + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + return NtUserRedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); +} + + +/*********************************************************************** + * ValidateRgn (USER32.@) + */ +BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) +{ + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + return NtUserRedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE ); +} + + +/************************************************************************* + * ScrollWindow (USER32.@) + */ +BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clip_rect ) +{ + UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE; + return NtUserScrollWindowEx( hwnd, dx, dy, rect, clip_rect, 0, NULL, flags ); +} + +#ifdef _WIN64 + +/* 64bit versions */ + +#undef GetWindowLongPtrW +#undef GetWindowLongPtrA +#undef SetWindowLongPtrW +#undef SetWindowLongPtrA + +/***************************************************************************** + * GetWindowLongPtrW (USER32.@) + */ +LONG_PTR WINAPI GetWindowLongPtrW( HWND hwnd, INT offset ) +{ + LONG_PTR ret = NtUserGetWindowLongPtrW( hwnd, offset ); + return get_window_long_ptr( hwnd, offset, ret, FALSE ); +} + +/***************************************************************************** + * GetWindowLongPtrA (USER32.@) + */ +LONG_PTR WINAPI GetWindowLongPtrA( HWND hwnd, INT offset ) +{ + LONG_PTR ret = NtUserGetWindowLongPtrA( hwnd, offset ); + return get_window_long_ptr( hwnd, offset, ret, TRUE ); +} + +/***************************************************************************** + * SetWindowLongPtrW (USER32.@) + */ +LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval ) +{ + if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) + return set_dialog_proc( hwnd, newval, FALSE ); + + return NtUserSetWindowLongPtr( hwnd, offset, newval, FALSE ); +} + +/***************************************************************************** + * SetWindowLongPtrA (USER32.@) + */ +LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) +{ + if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) + return set_dialog_proc( hwnd, newval, TRUE ); + + return NtUserSetWindowLongPtr( hwnd, offset, newval, TRUE ); +} + +#endif /* _WIN64 */ + +/***************************************************************************** + * GetWindowDisplayAffinity (USER32.@) + */ +BOOL WINAPI GetWindowDisplayAffinity(HWND hwnd, DWORD *affinity) +{ + FIXME("(%p, %p): stub\n", hwnd, affinity); + + if (!hwnd || !affinity) + { + SetLastError(hwnd ? ERROR_NOACCESS : ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + *affinity = WDA_NONE; + return TRUE; +} + +/***************************************************************************** + * SetWindowDisplayAffinity (USER32.@) + */ +BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) +{ + FIXME("(%p, %lu): stub\n", hwnd, affinity); + + if (!hwnd) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; +} + +/********************************************************************** + * SetWindowCompositionAttribute (USER32.@) + */ +BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) +{ + FIXME("(%p, %p): stub\n", hwnd, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

3 weeks, 2 days

[reactos] 01/01: [EVENTVWR] Localize and check item count (#7757)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1786a68256e71b827ca49… commit 1786a68256e71b827ca49e93352e79301a50efbf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 9 06:55:05 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 9 06:55:05 2025 +0900 [EVENTVWR] Localize and check item count (#7757) Don’t display garbage to the users. JIRA issue: CORE-19786 - Localize message text by using newly added IDS_CONTFROMBEGINNING and IDS_CONTFROMEND resource strings. - Check item count before showing next/previous item. - Add EnableEventDetailsButtons function. --- base/applications/mscutils/eventvwr/eventvwr.c | 6 ++- base/applications/mscutils/eventvwr/evtdetctl.c | 46 +++++++++++++---------- base/applications/mscutils/eventvwr/evtdetctl.h | 5 +-- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 2 + base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 2 + base/applications/mscutils/eventvwr/lang/de-DE.rc | 2 + base/applications/mscutils/eventvwr/lang/el-GR.rc | 2 + base/applications/mscutils/eventvwr/lang/en-US.rc | 2 + base/applications/mscutils/eventvwr/lang/es-ES.rc | 2 + base/applications/mscutils/eventvwr/lang/fr-FR.rc | 2 + base/applications/mscutils/eventvwr/lang/he-IL.rc | 2 + base/applications/mscutils/eventvwr/lang/it-IT.rc | 2 + base/applications/mscutils/eventvwr/lang/ja-JP.rc | 2 + base/applications/mscutils/eventvwr/lang/ko-KR.rc | 2 + base/applications/mscutils/eventvwr/lang/no-NO.rc | 2 + base/applications/mscutils/eventvwr/lang/pl-PL.rc | 2 + base/applications/mscutils/eventvwr/lang/pt-BR.rc | 2 + base/applications/mscutils/eventvwr/lang/pt-PT.rc | 2 + base/applications/mscutils/eventvwr/lang/ro-RO.rc | 2 + base/applications/mscutils/eventvwr/lang/ru-RU.rc | 2 + base/applications/mscutils/eventvwr/lang/sk-SK.rc | 2 + base/applications/mscutils/eventvwr/lang/sq-AL.rc | 2 + base/applications/mscutils/eventvwr/lang/sv-SE.rc | 2 + base/applications/mscutils/eventvwr/lang/tr-TR.rc | 2 + base/applications/mscutils/eventvwr/lang/uk-UA.rc | 2 + base/applications/mscutils/eventvwr/lang/zh-CN.rc | 2 + base/applications/mscutils/eventvwr/lang/zh-HK.rc | 2 + base/applications/mscutils/eventvwr/lang/zh-TW.rc | 2 + base/applications/mscutils/eventvwr/resource.h | 2 + 29 files changed, 86 insertions(+), 23 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 3a7a5107eab..87be9a337b3 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -1978,6 +1978,7 @@ EnumEventsThread(IN LPVOID lpParameter) BOOL bResult = TRUE; /* Read succeeded */ HANDLE hProcessHeap = GetProcessHeap(); PSID pLastSid = NULL; + INT nItems; UINT uStep = 0, uStepAt = 0, uPos = 0; @@ -1997,11 +1998,12 @@ EnumEventsThread(IN LPVOID lpParameter) SYSTEMTIME time; LVITEMW lviEventItem; + EnableEventDetailsButtons(hwndEventDetails, FALSE); + /* Save the current event log filter globally */ EventLogFilter_AddRef(EventLogFilter); ActiveFilter = EventLogFilter; - /** HACK!! **/ EventLog = EventLogFilter->EventLogs[0]; @@ -2263,6 +2265,8 @@ Quit: /* All events loaded */ Cleanup: + nItems = ListView_GetItemCount(hwndListView); + EnableEventDetailsButtons(hwndEventDetails, (nItems > 0)); ShowWindow(hwndStatusProgress, SW_HIDE); SendMessageW(hwndListView, LVM_PROGRESS, 0, FALSE); diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index 3a8d07eb221..1583440a0e8 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -792,6 +792,11 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pData->EventLogFilter = DetailInfo->EventLogFilter; pData->iEventItem = DetailInfo->iEventItem; } + else + { + pData->iEventItem = -1; + } + pData->bDisplayWords = FALSE; pData->hMonospaceFont = CreateMonospaceFont(); @@ -838,31 +843,26 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_NEXT: { BOOL bPrev = (LOWORD(wParam) == IDC_PREVIOUS); - INT iItem, iSel; + INT iItem, iSel, nItems = ListView_GetItemCount(hwndListView); + WCHAR szText[200]; + + if (nItems <= 0) /* No items? */ + break; /* Select the previous/next item from our current one */ - iItem = ListView_GetNextItem(hwndListView, - pData->iEventItem, - bPrev ? LVNI_ABOVE : LVNI_BELOW); - if (iItem == -1) + iItem = ListView_GetNextItem(hwndListView, -1, LVNI_ALL | LVNI_SELECTED); + iItem = ListView_GetNextItem(hwndListView, iItem, + (bPrev ? LVNI_ABOVE : LVNI_BELOW)); + if (iItem < 0 || iItem >= nItems) { - // TODO: Localization. - if (MessageBoxW(hDlg, - bPrev - ? L"You have reached the beginning of the event log. Do you want to continue from the end?" - : L"You have reached the end of the event log. Do you want to continue from the beginning?", - szTitle, - MB_YESNO | MB_ICONQUESTION) - == IDNO) - { + LoadStringW(hInst, + (bPrev ? IDS_CONTFROMEND : IDS_CONTFROMBEGINNING), + szText, _countof(szText)); + if (MessageBoxW(hDlg, szText, szTitle, MB_YESNO | MB_ICONQUESTION) == IDNO) break; - } /* Determine from where to restart */ - if (bPrev) - iItem = ListView_GetItemCount(hwndListView) - 1; - else - iItem = 0; + iItem = (bPrev ? (nItems - 1) : 0); } /* @@ -959,3 +959,11 @@ CreateEventDetailsCtrl(HINSTANCE hInstance, MAKEINTRESOURCEW(IDD_EVENTDETAILS_CTRL), hParentWnd, EventDetailsCtrl, lParam); } + +VOID +EnableEventDetailsButtons(HWND hWnd, BOOL bEnable) +{ + EnableDlgItem(hWnd, IDC_PREVIOUS, bEnable); + EnableDlgItem(hWnd, IDC_NEXT, bEnable); + EnableDlgItem(hWnd, IDC_COPY, bEnable); +} diff --git a/base/applications/mscutils/eventvwr/evtdetctl.h b/base/applications/mscutils/eventvwr/evtdetctl.h index a123232bf86..cb22cfa0d0a 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.h +++ b/base/applications/mscutils/eventvwr/evtdetctl.h @@ -7,8 +7,7 @@ * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ -#ifndef _EVTDETCTL_H_ -#define _EVTDETCTL_H_ +#pragma once /* Optional structure passed by pointer * as LPARAM to CreateEventDetailsCtrl() */ @@ -26,4 +25,4 @@ CreateEventDetailsCtrl(HINSTANCE hInstance, HWND hParentWnd, LPARAM lParam); -#endif /* _EVTDETCTL_H_ */ +VOID EnableEventDetailsButtons(HWND hWnd, BOOL bEnable); diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 26b7c2e4040..f1054ac80d2 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Не е намерено описанието на събитие ( %lu ) в източник ( %s ). Възможно е местият компютър да няма нужните сведения в регистъра или DLL файловет, нужни за показване на съобщения от отдалечен компютър.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index 11e3a926d96..76dfbae4283 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Chcete tento protokol před odstraněním uložit?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Popis ID události ( %lu ) zdroj ( %s ) nebyl nalezen. Místní počítač neobsahuje potřebné informace v registru nebo chybí DLL soubory pro zobrazení zpráv ze vzdáleného počítače.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index acb061a9078..26ffe324508 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Möchten Sie dieses Protokoll vor dem Löschen speichern?" IDS_RESTOREDEFAULTS "Möchten Sie alle Einstellungen für dieses Protokoll wieder auf die Standardwerte zurücksetzen?" IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten entfernter Computer anzuzeigen, nicht besitzt.\n\nDas Ereignis enthält folgende Informationen:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index 542531f3b8f..47806b2fc03 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index 917c26a60b0..045e76e3fe1 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -169,6 +169,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index 494632a8589..86eb305e342 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -170,6 +170,8 @@ BEGIN IDS_CLEAREVENTS_MSG "¿Desea guardar este registro de eventos antes de borrarlo?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripción para el evento con ID ( %lu ) y origen ( %s ). El equipo local puede no tener la información necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nLa siguiente información es parte del evento:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 18a0cf12254..99e5fbedf16 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Voulez-vous enregistrer ce journal d'événements avant de l'effacer ?" IDS_RESTOREDEFAULTS "Voulez-vous vraiment réinitialiser tous les paramètres pour ce journal aux valeurs par défaut ?" IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant.\n\nLes informations suivantes font partie de l'événement :\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index ac4b5e6a82e..f6ba603938a 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index e2c6d3605fc..387f675df2f 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non può essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index b2ce3e869eb..3a0f9c540fa 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "このイベントをクリアする前に保存したいですか？" IDS_RESTOREDEFAULTS "すべての設定をデフォルトに戻しますか？" IDS_EVENTSTRINGIDNOTFOUND "イベント ID (%lu) (ソース %s 内) に関する説明が見つかりませんでした。リモートコンピュータからメッセージを表示するために必要なレジストリ情報またはメッセージ DLL ファイルがローカルコンピュータにない可能性があります。\n\n次の情報はイベントの一部です:\n\n" + IDS_CONTFROMBEGINNING "イベントログの最後に到達しました。最初から続けますか？" + IDS_CONTFROMEND "イベントログの先頭に到達しました。最後から続けますか？" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 867322cf33e..e9150036115 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "( %s ) 의 이벤트ID ( %lu ) 에 대한 설명을 찾을 수 없습니다. 로컬 컴퓨터가 원격 컴퓨터의 메세지를 표시하는데 필요한 레지스트리나 DLL 파일을 가지지 않고 있을수 있습니다.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index e74b7300f55..16a5fd167c1 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 7d3dd9d957a..b7a42625686 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -170,6 +170,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Czy chcesz zapisać dziennik zdarzeń przed czyszczeniem?" IDS_RESTOREDEFAULTS "Czy chcesz przywrócić wszystkie ustawienia tego dziennika do wartości domyślnych?" IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID ( %lu ) nie został odnaleziony w źródle ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze, albo bibliotek DLL, aby wyświetlić wiadomości z komputera zdalnego.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index 9302e01e9f4..0d6f9296cc9 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "A descrição para Event ID ( %lu ) em Fonte ( %s ) não foi encontrado. O computador local talvez não possua a informação de registro necessária ou mensagem de arquivos DLL para exibir mensagens de um computador remoto.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/pt-PT.rc b/base/applications/mscutils/eventvwr/lang/pt-PT.rc index fd0791aa3e0..1ea4d73a521 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-PT.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Deseja guardar este registo de eventos antes de limpar?" IDS_RESTOREDEFAULTS "Tem a certeza de que pretende repor todas definições deste registo para os valores predefinidos?" IDS_EVENTSTRINGIDNOTFOUND "A descrição do ID de Evento ( %lu ) na Origem ( %s ) não foi encontrado. O computador local talvez não possua a informação de registo necessária ou os ficheiros DLL necessárias para apresentar mensagens de um computador remoto.\n\nA informação seguinte é parte do evento:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index b888fd857a8..c95bcd52d04 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -169,6 +169,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Doriți să salvați acest jurnal de evenimente înainte de a-l închide?" IDS_RESTOREDEFAULTS "Doriți să restabiliți toate setările pentru acest jurnal la valorile lor implicite?" IDS_EVENTSTRINGIDNOTFOUND "Imposibil de găsit descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ). Este posibil ca computerul local să nu aibă informațiile de registru necesare sau fișierele DLL de mesaje pentru a afișa mesaje de la un computer la distanță.\n\nUrmătoarele informații fac parte din eveniment:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index 9d3423bfd66..0bb9b7f61f7 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -171,6 +171,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Вы хотите сохранить журнал событий перед очисткой?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Не найдено описание для события с кодом ( %lu ) в источнике ( %s ). Возможно, на локальном компьютере нет нужных данных в реестре или файлов DLL сообщений для отображения сообщений удаленного компьютера.\n\nСледующая информация часть события:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index 3f6a3fe5bb0..16cd7cdb414 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosť ID ( %lu ) zo zdroja ( %s ) nebol nájdený. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 2a3b1a556b0..95f7e50fad9 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Përshkrimi për ngjarjet ID ( %lu ) në burim ( %s ) nuk gjindet. Kompjuter vendas mund të mos ketë informacionin e regjistrit te nevojshem ose mesazhin për dokumentat DLL për të shfaqur nga një kompjuter në distancë.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index d4205142932..723a2ef1936 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -167,6 +167,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av Händelse ID ( %lu ) i källan ( %s ) kan inte hittas. Lokal dator har inte nödvendig registerinformation eller meddelander DLL filer for å vise meddelander från en fjärr dator.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index e9710e2c39a..b951b08dd5f 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Silmeden önce bu olay kaydını kaydetmek ister misiniz?" IDS_RESTOREDEFAULTS "Bu günlük için tüm ayarları varsayılan değerlerine geri yüklemek istiyor musunuz?" IDS_EVENTSTRINGIDNOTFOUND "( %s ) kaynağındaki ( %lu ) olay kimliği için açıklama bulunamıyor. Yerel bilgisayarda, uzak bilgisayardan iletileri görüntülemesi için gerekli Kayıt Defteri bilgisi veya ileti DLL dosyaları olmayabilir.\n\nAşağıdaki bilgi olayın parçasıdır:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index c50f93892e2..644267f9edc 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -169,6 +169,8 @@ BEGIN IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" IDS_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події ( %lu ) за джерелом ( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера.\n\nThe following information is part of the event:\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index 3a94b912034..42c84460560 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -169,6 +169,8 @@ BEGIN IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日志吗？" IDS_RESTOREDEFAULTS "你想要将这个日志的所有设置恢复为默认值吗？" IDS_EVENTSTRINGIDNOTFOUND "无法找到来源（%s）中的事件 ID（%lu）的描述。本地计算机可能没有显示来自远程计算机的消息所必需的注册表信息或消息 DLL 文件。\n\n下面的信息是事件的一部分：\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-HK.rc b/base/applications/mscutils/eventvwr/lang/zh-HK.rc index 98097e61549..08a3105b454 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-HK.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-HK.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "您想在清除之前儲存這個事件記錄嗎？" IDS_RESTOREDEFAULTS "您要將這個記錄的所有設定還原至預設值嗎？" IDS_EVENTSTRINGIDNOTFOUND "找不到來源（%s）中的事件 ID（%lu）的描述。本地電腦可能沒有顯示來自遠端電腦訊息所需的註冊表資訊或訊息 DLL 檔。\n\n下列資訊是部分事件：\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index 43fafc0e500..f48152455f8 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -168,6 +168,8 @@ BEGIN IDS_CLEAREVENTS_MSG "您要在清除之前儲存此事件記錄嗎？" IDS_RESTOREDEFAULTS "您要這個記錄的所有設定還原至預設值嗎？" IDS_EVENTSTRINGIDNOTFOUND "找不到來源（%s）中的事件 ID（%lu）的描述。本地電腦可能沒有顯示來自遠端電腦消息所必需的註冊表資訊或消息 DLL 檔。\n\n下列資訊是部分事件︰\n\n" + IDS_CONTFROMBEGINNING "You have reached the end of the event log. Do you want to continue from the beginning?" + IDS_CONTFROMEND "You have reached the beginning of the event log. Do you want to continue from the end?" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index 27c61bc2cb0..141d4945d6c 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -105,6 +105,8 @@ #define IDS_CLEAREVENTS_MSG 110 #define IDS_EVENTSTRINGIDNOTFOUND 111 #define IDS_RESTOREDEFAULTS 112 +#define IDS_CONTFROMBEGINNING 113 +#define IDS_CONTFROMEND 114 #define IDS_USAGE 120 #define IDS_EVENTLOGFILE 121

3 weeks, 3 days

[reactos] 01/01: [CURSOR] Add Cursor AI project settings (#7752)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0898bd371d82bbfb328cb… commit 0898bd371d82bbfb328cbcd39a64a37e4c57cd41 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 8 22:35:40 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 8 22:35:40 2025 +0900 [CURSOR] Add Cursor AI project settings (#7752) AI-friendly development for the future. JIRA issue: CORE-20011 - Reduce time and cost on using Cursor AI. - Improve interoperability with Cursor AI. - Add .cursor folder and some files. - Modify .gitignore. --- .cursor/coding-style.json | 19 +++++++++++++++++ .cursor/editor.json | 52 +++++++++++++++++++++++++++++++++++++++++++++++ .cursor/settings.json | 46 +++++++++++++++++++++++++++++++++++++++++ .gitignore | 2 ++ 4 files changed, 119 insertions(+) diff --git a/.cursor/coding-style.json b/.cursor/coding-style.json new file mode 100644 index 00000000000..12f095f32e9 --- /dev/null +++ b/.cursor/coding-style.json @@ -0,0 +1,19 @@ +{ + "indentation": { + "type": "spaces", + "size": 4 + }, + "lineLength": 100, + "braceStyle": "allman", + "namingConventions": { + "functions": { + "public": "PascalCase", + "private": "_PascalCase" + }, + "variables": { + "local": "camelCase", + "global": "PascalCase", + "constants": "UPPER_CASE" + } + } +} diff --git a/.cursor/editor.json b/.cursor/editor.json new file mode 100644 index 00000000000..76cfa5d0ccb --- /dev/null +++ b/.cursor/editor.json @@ -0,0 +1,52 @@ +{ + "editor": { + "defaultFormatter": null + }, + "[c,cpp]": { + "editor": { + "tabSize": 4, + "insertSpaces": true, + "detectIndentation": false, + "trimAutoWhitespace": true, + "formatOnSave": false, + "formatOnType": true, + "defaultFormatter": "clang-format", + "rulers": [100], + "wordWrap": "off" + } + }, + "files": { + "associations": { + "*.c": "c", + "*.h": "c", + "*.cpp": "cpp", + "*.hpp": "cpp" + }, + "encoding": "utf8", + "trimTrailingWhitespace": true, + "insertFinalNewline": true, + "exclude": { + "**/.git": true, + "compile_commands.json": true, + "output-*": true, + "modules/optional": true, + "modules/3rdparty": true, + "modules/bootcd_extras": true, + "modules/livecd_extras": true, + "modules/hybridcd_extras": true, + "modules/[Aa][Hh][Kk]_[Tt]ests": true, + ".cache": true, + ".cproject": true, + ".DS_Store": true, + ".project": true, + ".settings": true, + ".vscode": true, + "sdk/tools/winesync/winesync.cfg": true, + "**/build": true, + "**/obj": true, + "**/bin": true, + "**/*.o": true, + "**/*.obj": true + } + } +} diff --git a/.cursor/settings.json b/.cursor/settings.json new file mode 100644 index 00000000000..c8ffae7a0c1 --- /dev/null +++ b/.cursor/settings.json @@ -0,0 +1,46 @@ +{ + "projectType": "reactos", + "language": { + "c": { + "standard": "c99", + "warnings": ["all", "error", "pedantic", "unused"], + "formatter": "clang-format", + "linter": "clang-tidy" + }, + "cpp": { + "standard": "c++11", + "warnings": ["all", "error", "pedantic", "unused"], + "formatter": "clang-format", + "linter": "clang-tidy" + } + }, + "codingStyle": "reactos", + "formatOnSave": false, + "lintOnSave": false, + "paths": { + "source": [ + "base", + "boot", + "dll", + "drivers", + "hal", + "ntoskrnl", + "subsystems", + "win32ss" + ], + "include": [ + "sdk/include" + ], + "docs": [ + "**/*.md", + "media/doc/*.md", + "media/doc/*.txt" + ], + "tests": [ + "modules/rostests" + ], + "build": [ + "output-*" + ] + } +} diff --git a/.gitignore b/.gitignore index f14e4ccbe72..dbed57aa81d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ modules/[Aa][Hh][Kk]_[Tt]ests .settings .vscode sdk/tools/winesync/winesync.cfg +.cursor/cache/ +.cursor/logs/

3 weeks, 3 days

[reactos] 01/01: [BROWSEUI][SHELL32] Fix FindFolder icons (#7756)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f844296b0a7f481fb2f4c… commit f844296b0a7f481fb2f4cc9e85180ce3659c60a2 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Mar 8 14:30:04 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 8 14:30:04 2025 +0100 [BROWSEUI][SHELL32] Fix FindFolder icons (#7756) - Shortcut icons require the correct IShellFolder because it needs the full path. - Items in a drive root needs the final backslash to be part of the path. CORE-18692 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 254 ++++++++++++++++++++------- dll/win32/browseui/shellfind/CFindFolder.h | 7 +- dll/win32/shell32/CDefView.cpp | 16 +- dll/win32/shell32/CShellLink.cpp | 4 +- 4 files changed, 215 insertions(+), 66 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 4a08b8a0852..2937663b087 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -84,7 +84,7 @@ struct FolderViewColumns int cxChar; }; -static FolderViewColumns g_ColumnDefs[] = +static const FolderViewColumns g_ColumnDefs[] = { {IDS_COL_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, {IDS_COL_LOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, @@ -92,6 +92,7 @@ static FolderViewColumns g_ColumnDefs[] = }; CFindFolder::CFindFolder() : + m_pidl(NULL), m_hStopEvent(NULL) { } @@ -106,26 +107,32 @@ static LPITEMIDLIST _ILCreate(LPCWSTR lpszPath) } LPITEMIDLIST lpLastFSPidl = ILFindLastID(lpFSPidl); - int pathLen = (PathFindFileNameW(lpszPath) - lpszPath) * sizeof(WCHAR); - int cbData = sizeof(WORD) + pathLen + lpLastFSPidl->mkid.cb; + SIZE_T cbPath = (PathFindFileNameW(lpszPath) - lpszPath + 1) * sizeof(WCHAR); + SIZE_T cbData = sizeof(WORD) + cbPath + lpLastFSPidl->mkid.cb; + if (cbData > 0xffff) + return NULL; LPITEMIDLIST pidl = (LPITEMIDLIST) SHAlloc(cbData + sizeof(WORD)); if (!pidl) return NULL; LPBYTE p = (LPBYTE) pidl; - *((WORD *) p) = cbData; - p += sizeof(WORD); + p += sizeof(WORD); // mkid.cb - memcpy(p, lpszPath, pathLen); - p += pathLen - sizeof(WCHAR); - *((WCHAR *) p) = '\0'; - p += sizeof(WCHAR); + PWSTR path = (PWSTR)p; + memcpy(p, lpszPath, cbPath); + p += cbPath; + ((PWSTR)p)[-1] = UNICODE_NULL; // "C:\" not "C:" (required by ILCreateFromPathW and matches Windows) + if (!PathIsRootW(path)) + { + p -= sizeof(WCHAR); + ((PWSTR)p)[-1] = UNICODE_NULL; // "C:\folder" + } memcpy(p, lpLastFSPidl, lpLastFSPidl->mkid.cb); p += lpLastFSPidl->mkid.cb; - *((WORD *) p) = 0; - + pidl->mkid.cb = p - (LPBYTE)pidl; + ((LPITEMIDLIST)p)->mkid.cb = 0; // Terminator return pidl; } @@ -144,6 +151,74 @@ static LPCITEMIDLIST _ILGetFSPidl(LPCITEMIDLIST pidl) + ((wcslen((LPCWSTR) pidl->mkid.abID) + 1) * sizeof(WCHAR))); } +static PIDLIST_ABSOLUTE _ILCreateAbsolute(LPCITEMIDLIST pidlChild) +{ + PIDLIST_ABSOLUTE pidl = NULL; + if (PIDLIST_ABSOLUTE pidlFolder = SHSimpleIDListFromPath(_ILGetPath(pidl))) // FIXME: SHELL32_CreateSimpleIDListFromPath(, DIRECTORY) + { + pidl = ILCombine(pidlFolder, _ILGetFSPidl(pidl)); + ILFree(pidlFolder); + } + return pidl; +} + +HRESULT CFindFolder::GetFSFolderAndChild(LPCITEMIDLIST pidl, IShellFolder **ppSF, PCUITEMID_CHILD *ppidlLast) +{ + ATLASSERT(m_pSfDesktop); + PCWSTR path = _ILGetPath(pidl); + if (!path || !path[0]) + return E_INVALIDARG; + PIDLIST_ABSOLUTE pidlFolder = ILCreateFromPathW(path); // FIXME: SHELL32_CreateSimpleIDListFromPath(, DIRECTORY); + if (!pidlFolder) + return E_FAIL; + HRESULT hr = m_pSfDesktop->BindToObject(pidlFolder, NULL, IID_PPV_ARG(IShellFolder, ppSF)); + ILFree(pidlFolder); + if (ppidlLast) + *ppidlLast = _ILGetFSPidl(pidl); + return hr; +} + +HRESULT CFindFolder::GetFSFolder2AndChild(LPCITEMIDLIST pidl, IShellFolder2 **ppSF, PCUITEMID_CHILD *ppidlLast) +{ + CComPtr<IShellFolder> pSF1; + HRESULT hr = GetFSFolderAndChild(pidl, &pSF1, ppidlLast); + if (SUCCEEDED(hr)) + hr = pSF1->QueryInterface(IID_PPV_ARG(IShellFolder2, ppSF)); + return hr; +} + +static int CALLBACK ILFreeHelper(void *pItem, void *pCaller) +{ + ILFree((LPITEMIDLIST)pItem); + return TRUE; +} + +void CFindFolder::FreePidlArray(HDPA hDpa) +{ + DPA_DestroyCallback(hDpa, ILFreeHelper, NULL); +} + +HDPA CFindFolder::CreateAbsolutePidlArray(UINT cidl, PCUITEMID_CHILD_ARRAY apidl) +{ + HDPA hDpa = DPA_Create(cidl / 2); + if (hDpa) + { + for (UINT i = 0; i < cidl; ++i) + { + PIDLIST_ABSOLUTE pidl = _ILCreateAbsolute(apidl[i]); + if (pidl) + { + if (DPA_InsertPtr(hDpa, i, pidl) >= 0) + continue; + ILFree(pidl); + } + FreePidlArray(hDpa); + return NULL; + } + } + return hDpa; +} + struct _SearchData { HWND hwnd; @@ -666,9 +741,9 @@ STDMETHODIMP CFindFolder::EnumSearches(IEnumExtraSearch **ppenum) STDMETHODIMP CFindFolder::GetDefaultColumn(DWORD, ULONG *pSort, ULONG *pDisplay) { if (pSort) - *pSort = 0; + *pSort = COL_NAME_INDEX; if (pDisplay) - *pDisplay = 0; + *pDisplay = COL_NAME_INDEX; return S_OK; } @@ -684,17 +759,31 @@ STDMETHODIMP CFindFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) STDMETHODIMP CFindFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { - return m_pisfInner->GetDetailsEx(pidl, pscid, pv); + // FIXME: Handle COL_LOCATION_INDEX and COL_RELEVANCE_INDEX + CComPtr<IShellFolder2> pFolder; + PCUITEMID_CHILD pChild; + if (SUCCEEDED(GetFSFolder2AndChild(pidl, &pFolder, &pChild))) + return pFolder->GetDetailsEx(pChild, pscid, pv); + return E_FAIL; } STDMETHODIMP CFindFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *pDetails) { if (iColumn >= _countof(g_ColumnDefs)) - return m_pisfInner->GetDetailsOf(_ILGetFSPidl(pidl), iColumn - _countof(g_ColumnDefs) + 1, pDetails); + { + UINT FSColumn = iColumn - _countof(g_ColumnDefs) + 1; + if (pidl) + { + CComPtr<IShellFolder2> pFolder; + PCUITEMID_CHILD pChild; + if (SUCCEEDED(GetFSFolder2AndChild(pidl, &pFolder, &pChild))) + return pFolder->GetDetailsOf(pChild, FSColumn, pDetails); + } + return m_pisfInner->GetDetailsOf(pidl, FSColumn, pDetails); // Column header info + } pDetails->cxChar = g_ColumnDefs[iColumn].cxChar; pDetails->fmt = g_ColumnDefs[iColumn].fmt; - if (!pidl) return SHSetStrRet(&pDetails->str, _AtlBaseModule.GetResourceInstance(), g_ColumnDefs[iColumn].iResource); @@ -709,7 +798,8 @@ STDMETHODIMP CFindFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELL return SHSetStrRet(&pDetails->str, ""); } - return GetDisplayNameOf(pidl, SHGDN_NORMAL, &pDetails->str); + ATLASSERT(iColumn == COL_NAME_INDEX); + return GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &pDetails->str); } STDMETHODIMP CFindFolder::MapColumnToSCID(UINT iColumn, SHCOLUMNID *pscid) @@ -734,8 +824,12 @@ STDMETHODIMP CFindFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIS STDMETHODIMP CFindFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { - UNIMPLEMENTED; - return E_NOTIMPL; + HRESULT hr; + CComPtr<IShellFolder> pInnerFolder; + PCUITEMID_CHILD pidlChild; + if (FAILED_UNEXPECTEDLY(hr = GetFSFolderAndChild(pidl, &pInnerFolder, &pidlChild))) + return hr; + return pInnerFolder->BindToObject(pidlChild, pbcReserved, riid, ppvOut); } STDMETHODIMP CFindFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -759,6 +853,7 @@ STDMETHODIMP CFindFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PC wColumn -= _countof(g_ColumnDefs) - 1; break; } + // FIXME: DefView does not like the way we sort return m_pisfInner->CompareIDs(HIWORD(lParam) | wColumn, _ILGetFSPidl(pidl1), _ILGetFSPidl(pidl2)); } @@ -783,14 +878,24 @@ STDMETHODIMP CFindFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID * STDMETHODIMP CFindFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { - CComHeapPtr<PCITEMID_CHILD> aFSPidl; - aFSPidl.Allocate(cidl); - for (UINT i = 0; i < cidl; i++) + if (!cidl) { - aFSPidl[i] = _ILGetFSPidl(apidl[i]); + *rgfInOut &= SFGAO_BROWSABLE; // TODO: SFGAO_CANRENAME? + return S_OK; } - return m_pisfInner->GetAttributesOf(cidl, aFSPidl, rgfInOut); + HRESULT hr = E_INVALIDARG; + for (UINT i = 0; i < cidl; ++i) + { + CComPtr<IShellFolder> pFolder; + PCUITEMID_CHILD pidlChild; + if (FAILED_UNEXPECTEDLY(hr = GetFSFolderAndChild(apidl[i], &pFolder, &pidlChild))) + break; + if (FAILED(hr = pFolder->GetAttributesOf(1, &pidlChild, rgfInOut))) + break; + } + *rgfInOut &= ~SFGAO_CANRENAME; // FIXME: Handle SetNameOf + return hr; } class CFindFolderContextMenu : @@ -805,7 +910,7 @@ class CFindFolderContextMenu : //// *** IContextMenu methods *** STDMETHODIMP QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - m_firstCmdId = indexMenu; + m_firstCmdId = idCmdFirst; _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst++, MFT_STRING, MAKEINTRESOURCEW(IDS_SEARCH_OPEN_FOLDER), MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst++, MFT_SEPARATOR, NULL, 0); return m_pInner->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -818,7 +923,7 @@ class CFindFolderContextMenu : return m_pInner->InvokeCommand(lpcmi); } - if (LOWORD(lpcmi->lpVerb) < m_firstCmdId + ADDITIONAL_MENU_ITEMS) + if (LOWORD(lpcmi->lpVerb) >= m_firstCmdId && LOWORD(lpcmi->lpVerb) < m_firstCmdId + ADDITIONAL_MENU_ITEMS) { PCUITEMID_CHILD *apidl; UINT cidl; @@ -838,9 +943,11 @@ class CFindFolderContextMenu : return S_OK; } + // FIXME: We can't block FCIDM_SHVIEW_REFRESH here, add items on SFVM_LISTREFRESHED instead CMINVOKECOMMANDINFOEX actualCmdInfo; memcpy(&actualCmdInfo, lpcmi, lpcmi->cbSize); - actualCmdInfo.lpVerb -= ADDITIONAL_MENU_ITEMS; + if (LOWORD(lpcmi->lpVerb) < FCIDM_SHVIEW_ARRANGE) // HACKFIX for DefView using direct FCIDM_SHVIEW ids + actualCmdInfo.lpVerb -= ADDITIONAL_MENU_ITEMS; return m_pInner->InvokeCommand((CMINVOKECOMMANDINFO *)&actualCmdInfo); } @@ -866,16 +973,39 @@ public: END_COM_MAP() }; +int CALLBACK CFindFolder::SortItemsForDataObject(void *p1, void *p2, LPARAM lparam) +{ + // For Delete/Move operations, a subfolder/file needs to come before the parent folder + return ::ILGetSize((LPCITEMIDLIST)p1) - ::ILGetSize((LPCITEMIDLIST)p2); +} + STDMETHODIMP CFindFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *prgfInOut, LPVOID *ppvOut) { + HRESULT hr; if (cidl <= 0) + return E_INVALIDARG; + + CComHeapPtr<PCITEMID_CHILD> aFSPidlAlloc; + PCITEMID_CHILD pidlSingleBuffer, *aFSPidl = &pidlSingleBuffer; // Optimize for single item callers + if (cidl != 1) { - return m_pisfInner->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, ppvOut); - } + if (riid == IID_IDataObject) + { + if (HDPA hDpa = CreateAbsolutePidlArray(cidl, apidl)) + { + DPA_Sort(hDpa, SortItemsForDataObject, NULL); + ITEMIDLIST pidlRoot = {}; + hr = SHCreateFileDataObject(&pidlRoot, cidl, (PCUITEMID_CHILD_ARRAY)DPA_GetPtrPtr(hDpa), + NULL, (IDataObject**)ppvOut); + FreePidlArray(hDpa); + return hr; + } + } - CComHeapPtr<PCITEMID_CHILD> aFSPidl; - aFSPidl.Allocate(cidl); + aFSPidlAlloc.Allocate(cidl); + aFSPidl = aFSPidlAlloc; + } for (UINT i = 0; i < cidl; i++) { aFSPidl[i] = _ILGetFSPidl(apidl[i]); @@ -883,30 +1013,38 @@ STDMETHODIMP CFindFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHI if (riid == IID_IContextMenu) { + // FIXME: Use CDefFolderMenu_Create2(..., AddFSClassKeysToArray()) CComHeapPtr<ITEMIDLIST> folderPidl(ILCreateFromPathW(_ILGetPath(apidl[0]))); if (!folderPidl) return E_OUTOFMEMORY; CComPtr<IShellFolder> pDesktopFolder; - HRESULT hResult = SHGetDesktopFolder(&pDesktopFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + if (FAILED_UNEXPECTEDLY(hr = SHGetDesktopFolder(&pDesktopFolder))) + return hr; CComPtr<IShellFolder> pShellFolder; - hResult = pDesktopFolder->BindToObject(folderPidl, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + hr = pDesktopFolder->BindToObject(folderPidl, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CComPtr<IContextMenu> pContextMenu; - hResult = pShellFolder->GetUIObjectOf(hwndOwner, cidl, aFSPidl, riid, prgfInOut, (LPVOID *)&pContextMenu); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + hr = pShellFolder->GetUIObjectOf(hwndOwner, cidl, aFSPidl, riid, prgfInOut, (void**)&pContextMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; return CFindFolderContextMenu::Create(m_shellFolderView, pContextMenu, (IContextMenu **)ppvOut); } - return m_pisfInner->GetUIObjectOf(hwndOwner, cidl, aFSPidl, riid, prgfInOut, ppvOut); + CComPtr<IShellFolder> pFolder; + if (FAILED_UNEXPECTEDLY(hr = GetFSFolderAndChild(apidl[0], &pFolder))) + return hr; + return pFolder->GetUIObjectOf(hwndOwner, cidl, aFSPidl, riid, prgfInOut, ppvOut); } STDMETHODIMP CFindFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET pName) { - return m_pisfInner->GetDisplayNameOf(_ILGetFSPidl(pidl), dwFlags, pName); + HRESULT hr; + CComPtr<IShellFolder> pFolder; + PCUITEMID_CHILD pidlChild; + if (FAILED_UNEXPECTEDLY(hr = GetFSFolderAndChild(pidl, &pFolder, &pidlChild))) + return hr; + return pFolder->GetDisplayNameOf(pidlChild, dwFlags, pName); } STDMETHODIMP CFindFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, @@ -933,11 +1071,7 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) SubclassWindow((HWND) wParam); // Get shell browser for updating status bar text - CComPtr<IServiceProvider> pServiceProvider; - HRESULT hr = m_shellFolderView->QueryInterface(IID_PPV_ARG(IServiceProvider, &pServiceProvider)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - hr = pServiceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &m_shellBrowser)); + HRESULT hr = IUnknown_QueryService(m_shellFolderView, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &m_shellBrowser)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -946,9 +1080,9 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) hr = m_shellBrowser->QueryInterface(IID_PPV_ARG(IWebBrowser2, &pWebBrowser2)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - WCHAR pwszGuid[MAX_PATH]; - StringFromGUID2(CLSID_FileSearchBand, pwszGuid, _countof(pwszGuid)); - CComVariant searchBar(pwszGuid); + WCHAR wszGuid[39]; + StringFromGUID2(CLSID_FileSearchBand, wszGuid, _countof(wszGuid)); + CComVariant searchBar(wszGuid); return pWebBrowser2->ShowBrowserBar(&searchBar, NULL, NULL); } case SFVM_WINDOWCLOSING: @@ -973,6 +1107,7 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) } return hr; } + // TODO: SFVM_GETCOLUMNSTREAM } return E_NOTIMPL; } @@ -980,21 +1115,20 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) //// *** IPersistFolder2 methods *** STDMETHODIMP CFindFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { - *pidl = ILClone(m_pidl); - return S_OK; + return SHILClone(m_pidl, pidl); } // *** IPersistFolder methods *** STDMETHODIMP CFindFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { - m_pidl = ILClone(pidl); - if (!m_pidl) - return E_OUTOFMEMORY; - - return SHELL32_CoCreateInitSF(m_pidl, - NULL, - NULL, - &CLSID_ShellFSFolder, + if (m_pidl) + return E_UNEXPECTED; + HRESULT hr; + if (FAILED(hr = SHGetDesktopFolder((IShellFolder**)&m_pSfDesktop))) + return hr; + if (FAILED(hr = SHILClone(pidl, &m_pidl))) + return hr; + return SHELL32_CoCreateInitSF(m_pidl, NULL, NULL, &CLSID_ShellFSFolder, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); } diff --git a/dll/win32/browseui/shellfind/CFindFolder.h b/dll/win32/browseui/shellfind/CFindFolder.h index a19651bde49..142a3e6265c 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.h +++ b/dll/win32/browseui/shellfind/CFindFolder.h @@ -64,11 +64,16 @@ class CFindFolder : private: LPITEMIDLIST m_pidl; - CComPtr<IShellFolder2> m_pisfInner; + CComPtr<IShellFolder2> m_pisfInner, m_pSfDesktop; CComPtr<IShellFolderView> m_shellFolderView; CComPtr<IShellBrowser> m_shellBrowser; HANDLE m_hStopEvent; + HRESULT GetFSFolderAndChild(LPCITEMIDLIST pidl, IShellFolder **ppSF, PCUITEMID_CHILD *ppidlLast = NULL); + HRESULT GetFSFolder2AndChild(LPCITEMIDLIST pidl, IShellFolder2 **ppSF, PCUITEMID_CHILD *ppidlLast = NULL); + void FreePidlArray(HDPA hDpa); + HDPA CreateAbsolutePidlArray(UINT cidl, PCUITEMID_CHILD_ARRAY apidl); + static int CALLBACK SortItemsForDataObject(void *p1, void *p2, LPARAM lparam); void NotifyConnections(DISPID id); static DWORD WINAPI SearchThreadProc(LPVOID lpParameter); diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index d78feeb7f86..46322dfec26 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -336,6 +336,7 @@ public: HRESULT CheckViewMode(HMENU hmenuView); LRESULT DoColumnContextMenu(LRESULT lParam); UINT GetSelections(); + SFGAOF GetSelectionAttributes(SFGAOF Query); HRESULT OpenSelectedItems(); void OnDeactivate(); void DoActivate(UINT uState); @@ -1841,7 +1842,7 @@ HRESULT CDefView::FillFileMenu() HMENU hmenu = CreatePopupMenu(); - UINT cmf = GetContextMenuFlags(m_pShellBrowser, SFGAO_CANRENAME); + UINT cmf = GetContextMenuFlags(m_pShellBrowser, GetSelectionAttributes(SFGAO_CANRENAME)); hr = m_pFileMenu->QueryContextMenu(hmenu, 0, DVIDM_CONTEXTMENU_FIRST, DVIDM_CONTEXTMENU_LAST, cmf); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -2101,6 +2102,14 @@ UINT CDefView::GetSelections() return m_cidl; } +SFGAOF CDefView::GetSelectionAttributes(SFGAOF Query) +{ + if (!GetSelections()) + return 0; + SFGAOF Attr = Query; + return SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &Attr)) ? (Attr & Query) : 0; +} + HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu>& pCM, LPCSTR lpVerb, POINT* pt) { CMINVOKECOMMANDINFOEX cmi; @@ -2232,7 +2241,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (FAILED_UNEXPECTEDLY(hResult)) return 0; - UINT cmf = GetContextMenuFlags(m_pShellBrowser, SFGAO_CANRENAME); + UINT cmf = GetContextMenuFlags(m_pShellBrowser, GetSelectionAttributes(SFGAO_CANRENAME)); // Use 1 as the first id we want. 0 means that user canceled the menu hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, CONTEXT_MENU_BASE_ID, DVIDM_CONTEXTMENU_LAST, cmf); if (FAILED_UNEXPECTEDLY(hResult)) @@ -3350,7 +3359,7 @@ HRESULT CDefView::SaveViewState(IStream *pStream) cols.Signature = PERSISTCOLUMNS::SIG; cols.Count = 0; LVCOLUMN lvc; - lvc.mask = LVCF_WIDTH | LVCF_SUBITEM; + lvc.mask = LVCF_WIDTH; for (UINT i = 0, j = 0; i < PERSISTCOLUMNS::MAXCOUNT && ListView_GetColumn(m_ListView, j, &lvc); ++j) { HRESULT hr = MapListColumnToFolderColumn(j); @@ -3405,6 +3414,7 @@ HRESULT CDefView::SaveViewState(IStream *pStream) if (SUCCEEDED(hr)) hr = pStream->Write(&cols, cbColumns, &written); } + // TODO: else if (SUCCEEDED(_DoFolderViewCB(SFVM_GETCOLUMNSTREAM))) if (pStream) pStream->Release(); return hr; diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index b60987d40a3..162d91c64d8 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -1790,6 +1790,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon } else { + // TODO: If GetIconLocation succeeded, why are we setting GIL_NOTFILENAME? And are we not PERINSTANCE? *pwFlags = GIL_NOTFILENAME | GIL_PERCLASS; } @@ -2575,13 +2576,12 @@ HRESULT STDMETHODCALLTYPE CShellLink::QueryContextMenu(HMENU hMenu, UINT indexMe if (!InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii)) return E_FAIL; - UNREFERENCED_PARAMETER(indexMenu); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); } HRESULT CShellLink::DoOpenFileLocation() { + // TODO: SHOpenFolderAndSelectItems WCHAR szParams[MAX_PATH + 64]; StringCbPrintfW(szParams, sizeof(szParams), L"/select,%s", m_sPath);

3 weeks, 3 days

[reactos] 01/01: [USER32] PrivateExtractIcons must return 0 for empty files (#7767)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acbadb9fbad343cca189b… commit acbadb9fbad343cca189b550e198f77ec7da0dc7 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Mar 8 13:34:23 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 8 13:34:23 2025 +0100 [USER32] PrivateExtractIcons must return 0 for empty files (#7767) This bug breaks the documented S_FALSE return value for SHDefExtractIconW when the icon is not found. --- win32ss/user/user32/misc/exticon.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index fec6103b2bb..04d129ea0b0 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -347,6 +347,14 @@ static UINT ICO_ExtractIconExW( hFile = CreateFileW(szExePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (hFile == INVALID_HANDLE_VALUE) return ret; fsizel = GetFileSize(hFile,&fsizeh); +#ifdef __REACTOS__ + if (!(fsizel | fsizeh)) + { + /* Cannot map empty file */ + CloseHandle(hFile); + return 0; /* No icons */ + } +#endif /* Map the file */ fmapping = CreateFileMappingW(hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL);

3 weeks, 3 days

[reactos] 01/01: [REACTOS] Add CODING_STYLE.md (#7753)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1d300b44bee98c8ab11a… commit d1d300b44bee98c8ab11a68994710377e1a7f775 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 8 18:57:17 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 8 18:57:17 2025 +0900 [REACTOS] Add CODING_STYLE.md (#7753) JIRA issue: CORE-20011 - Add CODING_STYLE.md at the root directory. - This CODING_STYLE.md is generated from HTML text of https://reactos.org/wiki/Coding_Style --- CODING_STYLE.md | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) diff --git a/CODING_STYLE.md b/CODING_STYLE.md new file mode 100644 index 00000000000..4aefe31fe9d --- /dev/null +++ b/CODING_STYLE.md @@ -0,0 +1,356 @@ +# Coding Style + +This article describes general coding style guidelines, which should be used for new ReactOS code. These guidelines apply exclusively to C and C++ source files. The Members of ReactOS agreed on this document in the October 2013 meeting. + +As much existing ReactOS code as possible should be converted to this style unless there are reasons against doing this (like if the code is going to be rewritten from scratch in the near future). See [Notes on reformatting existing code](#notes-on-reformatting-existing-code) for more details. + +Code synchronized with other sources (like Wine) must not be rewritten. [3rd Party Files.txt](https://github.com/reactos/reactos/blob/master/media/doc/3rd%20P… and [WINESYNC.txt](https://github.com/reactos/reactos/blob/master/media/doc/WINE… files can be used for tracking synchronized files. + +## File Structure + +1. Every ReactOS source code file should include a file header like this: + +``` +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Does cool things like Memory Management + * COPYRIGHT: Copyright 2017 Arno Nymous <abc(a)mailaddress.com> + * Copyright 2017 Mike Blablabla <mike(a)blabla.com> + */ +``` + +Please use SPDX license identifiers available at https://spdx.org/licenses. +This makes our source file parseable by licensing tools! + +You should add yourself to the `COPYRIGHT` section of a file if you did a major contribution to it and could take responsibility for the whole file or a part of it. Not more than 3 people shall be in that list for each file. + +`FILE` line of the old header should be removed. + +2. [Doxygen](https://doxygen.reactos.org/) documentation generator is used for ReactOS codebase, so use a proper header for functions, see [API Documentation](https://reactos.org/wiki/Documentation_Guidelines#API_Docume… for details. + +## Indentation and line width + +1. Line width must be at most **100 characters**. +2. Do not add a space or tab at the end of any line. +3. Indent with **4 spaces**, don't use tabs! +4. Indent both a case label and the case statement of a switch statement. + +**Right:** +```c +switch (Condition) +{ + case 1: + DoSomething(); + break; + + case 2: + { + DoMany(); + ManyMore(); + OtherThings(); + break; + } +} +``` + +**Wrong:** +```c +switch(Condition) +{ +case 1: + DoSomething(); + break; +case 2: + DoMany(); + ManyMore(); + OtherThings(); + break; +} +``` + +5. When a function call does not fit onto a line, align arguments like this: +```c +FunctionCall(arg1, + arg2, + arg3); +``` + +6. Function headers should have this format (preserving the order as in the example): +```c +static // scope identifier +CODE_SEG("PAGE") // section placement +// other attributes +BOOLEAN // return type +FASTCALL // calling convention +IsOdd( + _In_ UINT32 Number); +``` + +## Spacing + +1. Do not use spaces around unary operators. +**Right:** `i++;` +**Wrong:** `i ++;` + +2. Place spaces around binary and ternary operators. +**Right:** `a = b + c;` +**Wrong:** `a=b+c;` + +3. Do not place spaces before comma and semicolon. + +**Right:** +```c +for (int i = 0; i < 5; i++) + DoSomething(); + +func1(a, b); +``` + +**Wrong:** +```c +for (int i = 0; i < 5 ; i++) + DoSomething(); + +func1(a , b) ; +``` + +4. Place spaces between control statements and their parentheses. + +**Right:** +```c +if (Condition) + DoSomething(); +``` + +**Wrong:** +```c +if(Condition) + DoSomething(); +``` + +5. Do not place spaces between a function and its parentheses, or between a parenthesis and its content. + +**Right:** +```c +func(a, b); +``` + +**Wrong:** +```c +func (a, b); +func( a, b ); +``` + +## Line breaking + +1. Each statement should get its own line. + +**Right:** +```c +x++; +y++; + +if (Condition) + DoSomething(); +``` + +**Wrong:** +```c +x++; y++; + +if (Condition) DoSomething(); +``` + +## Braces + +1. Always put braces (`{` and `}`) on their own lines. +2. One-line control clauses may use braces, but this is not a requirement. An exception are one-line control clauses including additional comments. + +**Right:** +```c +if (Condition) + DoSomething(); + +if (Condition) +{ + DoSomething(); +} + +if (Condition) +{ + // This is a comment + DoSomething(); +} + +if (A_Very || (Very && Long || Condition) && + On_Many && Lines) +{ + DoSomething(); +} + +if (Condition) + DoSomething(); +else + DoSomethingElse(); + +if (Condition) +{ + DoSomething(); +} +else +{ + DoSomethingElse(); + YetAnother(); +} +``` + +**Wrong:** +```c +if (Condition) { + DoSomething(); +} + +if (Condition) + // This is a comment + DoSomething(); + +if (A_Very || (Very && Long || Condition) && + On_Many && Lines) + DoSomething(); + +if (Condition) + DoSomething(); +else { + DoSomethingElse(); + YetAnother(); +} +``` + +## Control structures + +1. Don't use inverse logic in control clauses. +**Right:** `if (i == 1)` +**Wrong:** `if (1 == i)` + +2. Avoid too many levels of cascaded control structures. Prefer a "linear style" over a "tree style". Use `goto` when it helps to make the code cleaner (e.g. for cleanup paths). + +**Right:** +```c +if (!func1()) + return; + +i = func2(); +if (i == 0) + return; + +j = func3(); +if (j == 1) + return; +... +``` + +**Wrong:** +```c +if (func1()) +{ + i = func2(); + if (func2()) + { + j = func3(); + if (func3()) + { + ... + } + } +} +``` + +## Naming + +1. Capitalize names of variables and functions. Hungarian Notation may be used when developing for Win32, but it is not required. If you don't use it, the first letter of a name must be a capital too (no lowerCamelCase). Do not use underscores as separators either. + +**Right:** +```c +PLIST_ENTRY FirstEntry; +VOID NTAPI IopDeleteIoCompletion(PVOID ObjectBody); +PWSTR pwszTest; +``` + +**Wrong:** +```c +PLIST_ENTRY first_entry; +VOID NTAPI iop_delete_io_completion(PVOID objectBody); +PWSTR pwsztest; +``` + +2. Avoid abbreviating function and variable names, use descriptive verbs where possible. + +3. Precede boolean values with meaningful verbs like "is" and "did" if possible and if it fits the usage. + +**Right:** +```c +BOOLEAN IsValid; +BOOLEAN DidSendData; +``` + +**Wrong:** +```c +BOOLEAN Valid; +BOOLEAN SentData; +``` + +## Commenting + +1. Avoid line-wasting comments, which could fit into a single line. + +**Right:** +```c +// This is a one-line comment + +/* This is a C-style comment */ + +// This is a comment over multiple lines. +// We don't define any strict rules for it. +``` + +**Wrong:** +```c +// +// This comment wastes two lines +// +``` + +## Null, false and 0 + +1. The null pointer should be written as `NULL`. In the rare case that your environment recommends a different null pointer (e.g. C++11 `nullptr`), you may use this one of course. Just don't use the value `0`. + +2. Win32/NT Boolean values should be written as `TRUE` and `FALSE`. In the rare case that you use C/C++ `bool` variables, you should write them as `true` and `false`. + +3. When you need to terminate ANSI or OEM string, or check for its terminator, use `ANSI_NULL`. If the string is Unicode or Wide string, use `UNICODE_NULL`. + +## Notes on reformatting existing code + +- Never totally reformat a file and put a code change into it. Do this in separate commits. +- If a commit only consists of formatting changes, say this clearly in the commit message by preceding it with *[FORMATTING]*. + +## Other points + +- Do not use `LARGE_INTEGER`/`ULARGE_INTEGER` unless needed for using APIs. Use `INT64`/`UINT64` instead +- Use `#pragma once` instead of guard defines in headers +- Don't specify a calling convention for a function unless required (usually for APIs or exported symbols) + +## Using an automatic code style tool + +TO BE ADDED BY User:Zefklop + +## Points deliberately left out + +Additional ideas were suggested during the discussion of this document, but a consensus couldn't be reached on them. Therefore we refrain from enforcing any rules on these points: + +- TO BE ADDED BY User:Hbelusca + +## See also + +- [Kernel Coding Style](https://reactos.org/wiki/Kernel_Coding_Style) +- [GNU Indent](https://reactos.org/wiki/GNU_Indent)

3 weeks, 3 days

[reactos] 01/01: [EVENTVWR] Reduce lines (#7758)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=115cf65ebff4c3064967f… commit 115cf65ebff4c3064967f18c138340bf0b770197 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 7 07:06:38 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 7 07:06:38 2025 +0900 [EVENTVWR] Reduce lines (#7758) JIRA issue: N/A - Reduce lines in InitInstance function. --- base/applications/mscutils/eventvwr/eventvwr.c | 84 +++++++------------------- 1 file changed, 22 insertions(+), 62 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 4c674f7a7fa..3a7a5107eab 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3037,6 +3037,22 @@ InitInstance(HINSTANCE hInstance) HIMAGELIST hSmall; LVCOLUMNW lvc = {0}; WCHAR szTemp[256]; + INT iColumn; + static const struct + { + WORD width; + WORD uID; + } columnItems[] = + { + { 90, IDS_COLUMNTYPE }, + { 70, IDS_COLUMNDATE }, + { 70, IDS_COLUMNTIME }, + { 150, IDS_COLUMNSOURCE }, + { 100, IDS_COLUMNCATEGORY }, + { 60, IDS_COLUMNEVENT }, + { 120, IDS_COLUMNUSER }, + { 100, IDS_COLUMNCOMPUTER }, + }; /* Create the main window */ rs = Settings.wpPos.rcNormalPosition; @@ -3180,69 +3196,13 @@ InitInstance(HINSTANCE hInstance) /* Now set up the listview with its columns */ lvc.mask = LVCF_TEXT | LVCF_WIDTH; - lvc.cx = 90; - LoadStringW(hInstance, - IDS_COLUMNTYPE, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 0, &lvc); - - lvc.cx = 70; - LoadStringW(hInstance, - IDS_COLUMNDATE, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 1, &lvc); - - lvc.cx = 70; - LoadStringW(hInstance, - IDS_COLUMNTIME, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 2, &lvc); - - lvc.cx = 150; - LoadStringW(hInstance, - IDS_COLUMNSOURCE, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 3, &lvc); - - lvc.cx = 100; - LoadStringW(hInstance, - IDS_COLUMNCATEGORY, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 4, &lvc); - - lvc.cx = 60; - LoadStringW(hInstance, - IDS_COLUMNEVENT, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 5, &lvc); - - lvc.cx = 120; - LoadStringW(hInstance, - IDS_COLUMNUSER, - szTemp, - ARRAYSIZE(szTemp)); lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 6, &lvc); - - lvc.cx = 100; - LoadStringW(hInstance, - IDS_COLUMNCOMPUTER, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - ListView_InsertColumn(hwndListView, 7, &lvc); + for (iColumn = 0; iColumn < ARRAYSIZE(columnItems); ++iColumn) + { + lvc.cx = columnItems[iColumn].width; + LoadStringW(hInstance, columnItems[iColumn].uID, szTemp, ARRAYSIZE(szTemp)); + ListView_InsertColumn(hwndListView, iColumn, &lvc); + } /* Initialize the save Dialog */ ZeroMemory(&sfn, sizeof(sfn));

3 weeks, 5 days

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025