Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSCTFIME][SDK][USER32] Add msctfime.ime (stub) (#6141)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17617221ce3b488d1c8ec… commit 17617221ce3b488d1c8ec2f24cfd5fc0eabcf627 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 22:37:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 22:37:25 2023 +0900 [MSCTFIME][SDK][USER32] Add msctfime.ime (stub) (#6141) ## Overview 1. msctfime.ime is an IME file interface for new-style IMEs a.k.a. "Text Input Processors" (TIPs). 2. msctfime.ime is loaded as old-style IME file at ImmLoadLayout in specific condition. 3. msctfime.ime communicates with the current TIP (This feature is not implemented yet). ## Proposed changes - Add msctfime module at dll/ime/msctfime. - The functions in this module are currently stub. - Move IME file interface declarations from <imm.h> to <ddk/immdev.h>. - Modify ImmNotifyIME, NotifyIME, and ImeProcessKey prototypes for x64 compliance. CORE-19360 --- dll/CMakeLists.txt | 1 + dll/ime/CMakeLists.txt | 2 + dll/ime/msctfime/CMakeLists.txt | 21 ++ dll/ime/msctfime/lang/en-US.rc | 23 +++ dll/ime/msctfime/msctfime.c | 350 +++++++++++++++++++++++++++++++++ dll/ime/msctfime/msctfime.h | 24 +++ dll/ime/msctfime/msctfime.rc | 32 +++ dll/ime/msctfime/msctfime.spec | 30 +++ dll/ime/msctfime/res/down.ico | Bin 0 -> 3438 bytes dll/ime/msctfime/res/unicode.ico | Bin 0 -> 326 bytes dll/ime/msctfime/resource.h | 16 ++ dll/win32/imm32/ime.c | 2 +- dll/win32/imm32/imm32.spec | 4 +- sdk/include/ddk/immdev.h | 109 ++++++++++ sdk/include/psdk/imm.h | 19 +- sdk/include/reactos/imetable.h | 4 +- win32ss/user/user32/include/immtable.h | 2 +- 17 files changed, 615 insertions(+), 24 deletions(-) diff --git a/dll/CMakeLists.txt b/dll/CMakeLists.txt index 08458544df7..7fd670b6b6d 100644 --- a/dll/CMakeLists.txt +++ b/dll/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(apisets) add_subdirectory(appcompat) add_subdirectory(cpl) add_subdirectory(directx) +add_subdirectory(ime) add_subdirectory(keyboard) add_subdirectory(nls) add_subdirectory(np) diff --git a/dll/ime/CMakeLists.txt b/dll/ime/CMakeLists.txt new file mode 100644 index 00000000000..1c5abaad63a --- /dev/null +++ b/dll/ime/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(msctfime) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt new file mode 100644 index 00000000000..3925158f4a3 --- /dev/null +++ b/dll/ime/msctfime/CMakeLists.txt @@ -0,0 +1,21 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/win32ss/include) + +spec2def(msctfime.ime msctfime.spec) + +list(APPEND SOURCE + msctfime.c) + +file(GLOB msctfime_rc_deps res/*.*) +add_rc_deps(msctfime.rc ${msctfime_rc_deps}) + +add_library(msctfime MODULE + ${SOURCE} + msctfime.rc + ${CMAKE_CURRENT_BINARY_DIR}/msctfime.def) +set_module_type(msctfime win32dll UNICODE) +set_target_properties(msctfime PROPERTIES SUFFIX ".ime") +target_link_libraries(msctfime wine uuid) +add_importlibs(msctfime user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/lang/en-US.rc b/dll/ime/msctfime/lang/en-US.rc new file mode 100644 index 00000000000..584b75546ee --- /dev/null +++ b/dll/ime/msctfime/lang/en-US.rc @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_OK "OK" + IDS_CANCEL "Cancel" + IDS_ABORT "&Abort" + IDS_RETRY "&Retry" + IDS_IGNORE "&Ignore" + IDS_YES "&Yes" + IDS_NO "&No" + + IDS_ENTER "Enter" + IDS_FINALIZE_STRING "Finalize the string" + IDS_CONVERSION "Conversion" +END diff --git a/dll/ime/msctfime/msctfime.c b/dll/ime/msctfime/msctfime.c new file mode 100644 index 00000000000..93865f49255 --- /dev/null +++ b/dll/ime/msctfime/msctfime.c @@ -0,0 +1,350 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting IME interface of Text Input Processors (TIPs) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +HINSTANCE g_hInst = NULL; /* The instance of this module */ + +BOOL WINAPI +ImeInquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags) +{ + FIXME("stub:(%p, %p, 0x%lX)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags); + return FALSE; +} + +DWORD WINAPI +ImeConversionList( + _In_ HIMC hIMC, + _In_ LPCWSTR lpSrc, + _Out_ LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag) +{ + FIXME("stub:(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag); + return 0; +} + +BOOL WINAPI +ImeRegisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString) +{ + FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + return FALSE; +} + +BOOL WINAPI +ImeUnregisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString) +{ + FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + return FALSE; +} + +UINT WINAPI +ImeGetRegisterWordStyle( + _In_ UINT nItem, + _Out_ LPSTYLEBUFW lpStyleBuf) +{ + FIXME("stub:(%u, %p)\n", nItem, lpStyleBuf); + return 0; +} + +UINT WINAPI +ImeEnumRegisterWord( + _In_ REGISTERWORDENUMPROCW lpfnEnumProc, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCWSTR lpszString, + _In_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading), + dwStyle, debugstr_w(lpszString), lpData); + return 0; +} + +BOOL WINAPI +ImeConfigure( + _In_ HKL hKL, + _In_ HWND hWnd, + _In_ DWORD dwMode, + _Inout_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData); + return FALSE; +} + +BOOL WINAPI +ImeDestroy( + _In_ UINT uReserved) +{ + FIXME("stub:(%u)\n", uReserved); + return FALSE; +} + +LRESULT WINAPI +ImeEscape( + _In_ HIMC hIMC, + _In_ UINT uEscape, + _Inout_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %u, %p)\n", hIMC, uEscape, lpData); + return 0; +} + +BOOL WINAPI +ImeProcessKey( + _In_ HIMC hIMC, + _In_ UINT uVirKey, + _In_ LPARAM lParam, + _In_ CONST LPBYTE lpbKeyState) +{ + FIXME("stub:(%p, %u, %p, lpbKeyState)\n", hIMC, uVirKey, lParam, lpbKeyState); + return FALSE; +} + +BOOL WINAPI +ImeSelect( + _In_ HIMC hIMC, + _In_ BOOL fSelect) +{ + FIXME("stub:(%p, %u)\n", hIMC, fSelect); + return FALSE; +} + +BOOL WINAPI +ImeSetActiveContext( + _In_ HIMC hIMC, + _In_ BOOL fFlag) +{ + FIXME("stub:(%p, %u)\n", hIMC, fFlag); + return FALSE; +} + +UINT WINAPI +ImeToAsciiEx( + _In_ UINT uVirKey, + _In_ UINT uScanCode, + _In_ CONST LPBYTE lpbKeyState, + _Out_ LPTRANSMSGLIST lpTransMsgList, + _In_ UINT fuState, + _In_ HIMC hIMC) +{ + FIXME("stub:(%u, %u, %p, %p, %u, %p)\n", uVirKey, uScanCode, lpbKeyState, lpTransMsgList, + fuState, hIMC); + return 0; +} + +BOOL WINAPI +NotifyIME( + _In_ HIMC hIMC, + _In_ DWORD dwAction, + _In_ DWORD dwIndex, + _In_ DWORD_PTR dwValue) +{ + FIXME("stub:(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue); + return FALSE; +} + +BOOL WINAPI +ImeSetCompositionString( + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _In_opt_ LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_opt_ LPCVOID lpRead, + _In_ DWORD dwReadLen) +{ + FIXME("stub:(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen, + lpRead, dwReadLen); + return FALSE; +} + +DWORD WINAPI +ImeGetImeMenuItems( + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize) +{ + FIXME("stub:(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", hIMC, dwFlags, dwType, lpImeParentMenu, + lpImeMenu, dwSize); + return 0; +} + +BOOL WINAPI +CtfImeInquireExW( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %p, 0x%lX, %p)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL); + return FALSE; +} + +BOOL WINAPI +CtfImeSelectEx( + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %d, %p)\n", hIMC, fSelect, hKL); + return FALSE; +} + +LRESULT WINAPI +CtfImeEscapeEx( + _In_ HIMC hIMC, + _In_ UINT uSubFunc, + _Inout_opt_ LPVOID lpData, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL); + return 0; +} + +HRESULT WINAPI +CtfImeGetGuidAtom( + _In_ HIMC hIMC, + _In_ DWORD dwUnknown, + _Out_opt_ LPDWORD pdwGuidAtom) +{ + FIXME("stub:(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); + return E_FAIL; +} + +BOOL WINAPI +CtfImeIsGuidMapEnable( + _In_ HIMC hIMC) +{ + FIXME("stub:(%p)\n", hIMC); + return FALSE; +} + +HRESULT WINAPI +CtfImeCreateThreadMgr(VOID) +{ + FIXME("stub:()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeDestroyThreadMgr(VOID) +{ + FIXME("stub:()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeCreateInputContext( + _In_ HIMC hIMC) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeDestroyInputContext( + _In_ HIMC hIMC) +{ + FIXME("stub:(%p)\n", hIMC); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeSetActiveContextAlways( + _In_ HIMC hIMC, + _In_ BOOL fActive, + _In_ HWND hWnd, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeProcessCicHotkey( + _In_ HIMC hIMC, + _In_ UINT vKey, + _In_ LPARAM lParam) +{ + FIXME("stub:(%p, %u, %p)\n", hIMC, vKey, lParam); + return E_NOTIMPL; +} + +LRESULT WINAPI +CtfImeDispatchDefImeMessage( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + FIXME("stub:(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + return 0; +} + +BOOL WINAPI +CtfImeIsIME( + _In_ HKL hKL) +{ + FIXME("stub:(%p)\n", hKL); + return FALSE; +} + +HRESULT WINAPI +CtfImeThreadDetach(VOID) +{ + ImeDestroy(0); + return S_OK; +} + +LRESULT CALLBACK +UIWndProc( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + if (uMsg == WM_CREATE) + { + FIXME("stub\n"); + return -1; + } + return 0; +} + +BOOL WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _Inout_opt_ LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + { + TRACE("(%p, %lu, %p)\n", hinstDLL, dwReason, lpvReserved); + g_hInst = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + return TRUE; +} diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h new file mode 100644 index 00000000000..bdabd0f2e31 --- /dev/null +++ b/dll/ime/msctfime/msctfime.h @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting IME interface of Text Input Processors (TIPs) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include <stdlib.h> + +#define WIN32_NO_STATUS +#define COBJMACROS + +#include <windows.h> +#include <imm.h> +#include <ddk/immdev.h> +#include <strsafe.h> + +#include <wine/debug.h> + +#include "resource.h" + +extern HINSTANCE g_hInst; diff --git a/dll/ime/msctfime/msctfime.rc b/dll/ime/msctfime/msctfime.rc new file mode 100644 index 00000000000..1f75b36dd37 --- /dev/null +++ b/dll/ime/msctfime/msctfime.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Resource of msctfime.ime + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <windef.h> +#include <winuser.rh> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS msctfime.ime" +#define REACTOS_STR_INTERNAL_NAME "msctfime" +#define REACTOS_STR_ORIGINAL_FILENAME "msctfime.ime" +#include <reactos/version.rc> + +#include <reactos/manifest_hosted.rc> + +/* Icons */ +IDI_UNICODE ICON "res/unicode.ico" +IDI_DOWN ICON "res/down.ico" + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/ime/msctfime/msctfime.spec b/dll/ime/msctfime/msctfime.spec new file mode 100644 index 00000000000..2e9b8708e09 --- /dev/null +++ b/dll/ime/msctfime/msctfime.spec @@ -0,0 +1,30 @@ +@ stdcall CtfImeDispatchDefImeMessage(ptr long ptr ptr) +@ stdcall CtfImeCreateInputContext(ptr) +@ stdcall CtfImeCreateThreadMgr() +@ stdcall CtfImeDestroyInputContext(ptr) +@ stdcall CtfImeDestroyThreadMgr() +@ stdcall CtfImeEscapeEx(ptr long ptr ptr) +@ stdcall CtfImeGetGuidAtom(ptr long ptr) +@ stdcall CtfImeInquireExW(ptr ptr long ptr) +@ stdcall CtfImeIsGuidMapEnable(ptr) +@ stdcall CtfImeIsIME(ptr) +@ stdcall CtfImeProcessCicHotkey(ptr long ptr) +@ stdcall CtfImeSelectEx(ptr long ptr) +@ stdcall CtfImeSetActiveContextAlways(ptr long ptr ptr) +@ stdcall CtfImeThreadDetach() +@ stdcall ImeConfigure(ptr ptr long ptr) +@ stdcall ImeConversionList(ptr wstr ptr long long) +@ stdcall ImeDestroy(long) +@ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr) +@ stdcall ImeEscape(ptr long ptr) +@ stdcall ImeGetRegisterWordStyle(long ptr) +@ stdcall ImeInquire(ptr ptr long) +@ stdcall ImeProcessKey(ptr long long ptr) +@ stdcall ImeRegisterWord(wstr long wstr) +@ stdcall ImeSelect(ptr long) +@ stdcall ImeSetActiveContext(ptr long) +@ stdcall ImeSetCompositionString(ptr long ptr long ptr long) +@ stdcall ImeToAsciiEx(long long ptr ptr long ptr) +@ stdcall ImeUnregisterWord(wstr long wstr) +@ stdcall NotifyIME(ptr long long long) +@ stdcall UIWndProc(ptr long ptr ptr) diff --git a/dll/ime/msctfime/res/down.ico b/dll/ime/msctfime/res/down.ico new file mode 100644 index 00000000000..5aa5db9b758 Binary files /dev/null and b/dll/ime/msctfime/res/down.ico differ diff --git a/dll/ime/msctfime/res/unicode.ico b/dll/ime/msctfime/res/unicode.ico new file mode 100644 index 00000000000..59a1ac7b59a Binary files /dev/null and b/dll/ime/msctfime/res/unicode.ico differ diff --git a/dll/ime/msctfime/resource.h b/dll/ime/msctfime/resource.h new file mode 100644 index 00000000000..dd8cc32caf0 --- /dev/null +++ b/dll/ime/msctfime/resource.h @@ -0,0 +1,16 @@ +#pragma once + +#define IDI_UNICODE 256 +#define IDI_DOWN 257 + +#define IDS_OK 100 +#define IDS_CANCEL 101 +#define IDS_ABORT 102 +#define IDS_RETRY 103 +#define IDS_IGNORE 104 +#define IDS_YES 105 +#define IDS_NO 106 + +#define IDS_ENTER 512 +#define IDS_FINALIZE_STRING 513 +#define IDS_CONVERSION 514 diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index a30b86af31b..f198f7112c1 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -904,7 +904,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) /*********************************************************************** * ImmNotifyIME (IMM32.@) */ -BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) +BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue) { HKL hKL; PIMEDPI pImeDpi; diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 3bd4c297f44..03ba666c074 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -93,8 +93,8 @@ @ stdcall ImmLockIMC(ptr) @ stdcall ImmLockIMCC(ptr) @ stdcall ImmLockImeDpi(ptr) -@ stdcall ImmNotifyIME(ptr long long long) -@ stdcall ImmProcessKey(ptr long long long long) +@ stdcall ImmNotifyIME(ptr long long ptr) +@ stdcall ImmProcessKey(ptr long long ptr long) @ stdcall ImmPutImeMenuItemsIntoMappedFile(ptr) @ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index e36ff688666..7dd67cdb013 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -341,6 +341,115 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34); #define CLIENTIMC_DISABLEIME 0x80 #define CLIENTIMC_UNKNOWN2 0x100 +/* IME file interface */ + +BOOL WINAPI +ImeInquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags); + +DWORD WINAPI +ImeConversionList( + _In_ HIMC hIMC, + _In_ LPCWSTR lpSrc, + _Out_ LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); + +BOOL WINAPI +ImeRegisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString); + +BOOL WINAPI +ImeUnregisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString); + +UINT WINAPI +ImeGetRegisterWordStyle( + _In_ UINT nItem, + _Out_ LPSTYLEBUFW lpStyleBuf); + +UINT WINAPI +ImeEnumRegisterWord( + _In_ REGISTERWORDENUMPROCW lpfnEnumProc, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCWSTR lpszString, + _In_opt_ LPVOID lpData); + +BOOL WINAPI +ImeConfigure( + _In_ HKL hKL, + _In_ HWND hWnd, + _In_ DWORD dwMode, + _Inout_opt_ LPVOID lpData); + +BOOL WINAPI +ImeDestroy( + _In_ UINT uReserved); + +LRESULT WINAPI +ImeEscape( + _In_ HIMC hIMC, + _In_ UINT uEscape, + _Inout_opt_ LPVOID lpData); + +BOOL WINAPI +ImeProcessKey( + _In_ HIMC hIMC, + _In_ UINT uVirKey, + _In_ LPARAM lParam, + _In_ CONST LPBYTE lpbKeyState); + +BOOL WINAPI +ImeSelect( + _In_ HIMC hIMC, + _In_ BOOL fSelect); + +BOOL WINAPI +ImeSetActiveContext( + _In_ HIMC hIMC, + _In_ BOOL fFlag); + +UINT WINAPI +ImeToAsciiEx( + _In_ UINT uVirKey, + _In_ UINT uScanCode, + _In_ CONST LPBYTE lpbKeyState, + _Out_ LPTRANSMSGLIST lpTransMsgList, + _In_ UINT fuState, + _In_ HIMC hIMC); + +BOOL WINAPI +NotifyIME( + _In_ HIMC hIMC, + _In_ DWORD dwAction, + _In_ DWORD dwIndex, + _In_ DWORD_PTR dwValue); + +BOOL WINAPI +ImeSetCompositionString( + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _In_opt_ LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_opt_ LPCVOID lpRead, + _In_ DWORD dwReadLen); + +DWORD WINAPI +ImeGetImeMenuItems( + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize); + #ifdef __cplusplus } // extern "C" #endif diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 9ec9e3cfb18..7d63409ad5f 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -270,23 +270,6 @@ BOOL WINAPI ImmDestroySoftKeyboard( _In_ HWND hwndSoftKBD); -BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); -BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); -DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); -BOOL WINAPI ImeDestroy(UINT); -LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); -BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, CONST LPBYTE); -BOOL WINAPI ImeSelect(HIMC, BOOL); -BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); -UINT WINAPI ImeToAsciiEx(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC); -BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); -BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); -BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR); -UINT WINAPI ImeGetRegisterWordStyle(UINT, LPSTYLEBUFW); -UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); -BOOL WINAPI ImeSetCompositionString(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); -DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); - /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008 @@ -870,7 +853,7 @@ BOOL WINAPI ImmIsUIMessageA(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); BOOL WINAPI ImmIsUIMessageW(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); #define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) -BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD); +BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD_PTR); DWORD WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); diff --git a/sdk/include/reactos/imetable.h b/sdk/include/reactos/imetable.h index d41c5af653d..88f1f59f485 100644 --- a/sdk/include/reactos/imetable.h +++ b/sdk/include/reactos/imetable.h @@ -8,11 +8,11 @@ DEFINE_IME_ENTRY(UINT, ImeEnumRegisterWord, (LPVOID lpfnEnumProc, LPCVOID lpszRe DEFINE_IME_ENTRY(BOOL, ImeConfigure, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), FALSE) DEFINE_IME_ENTRY(BOOL, ImeDestroy, (UINT uReserved), FALSE) DEFINE_IME_ENTRY(LRESULT, ImeEscape, (HIMC hIMC, UINT uEscape, LPVOID lpData), FALSE) -DEFINE_IME_ENTRY(BOOL, ImeProcessKey, (HIMC hIMC, UINT uVirKey, DWORD lParam, CONST LPBYTE lpbKeyState), FALSE) +DEFINE_IME_ENTRY(BOOL, ImeProcessKey, (HIMC hIMC, UINT uVirKey, LPARAM lParam, CONST LPBYTE lpbKeyState), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSelect, (HIMC hIMC, BOOL fSelect), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetActiveContext, (HIMC hIMC, BOOL fFlag), FALSE) DEFINE_IME_ENTRY(UINT, ImeToAsciiEx, (UINT uVirKey, UINT uScanCode, CONST LPBYTE lpbKeyState, LPTRANSMSGLIST lpTransMsgList, UINT fuState, HIMC hIMC), FALSE) -DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), FALSE) +DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), FALSE) DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), TRUE) DEFINE_IME_ENTRY(BOOL, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE) diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h index b9acde65ab7..ad178c8282d 100644 --- a/win32ss/user/user32/include/immtable.h +++ b/win32ss/user/user32/include/immtable.h @@ -25,7 +25,7 @@ DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, N DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) -DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue), 0, NONVOID) DEFINE_IMM_ENTRY(/*PINPUTCONTEXT*/ LPVOID, ImmLockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID)

1 0

[reactos] 01/01: [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04b1e8945b6fa1817f565… commit 04b1e8945b6fa1817f565682fbf46ed3327e8032 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 22:04:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 22:04:18 2023 +0900 [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152) Based on KRosUser's combo.patch. Enable Alt+F4 on ComboBox. Do default processing on WM_SYSKEYDOWN if necessary. CORE-18231 --- dll/win32/comctl32/combo.c | 7 +++++++ win32ss/user/user32/controls/combo.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dll/win32/comctl32/combo.c b/dll/win32/comctl32/combo.c index 9b694dcbf7b..62c2d4138a2 100644 --- a/dll/win32/comctl32/combo.c +++ b/dll/win32/comctl32/combo.c @@ -1890,8 +1890,15 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam case WM_SYSKEYDOWN: if ( KEYDATA_ALT & HIWORD(lParam) ) if( wParam == VK_UP || wParam == VK_DOWN ) +#ifdef __REACTOS__ + { +#endif COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; +#ifdef __REACTOS__ + } + break; +#endif case WM_KEYDOWN: if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 8e3d07dc216..b29d5a36efb 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -1989,8 +1989,15 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR if ( KEYDATA_ALT & HIWORD(lParam) ) #endif if( wParam == VK_UP || wParam == VK_DOWN ) +#ifdef __REACTOS__ + { +#endif COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; +#ifdef __REACTOS__ + } + break; +#endif case WM_KEYDOWN: if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&

1 0

[reactos] 01/01: [FONTS] Make Arial gender glyphs +66% larger (#6156)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea59e93e31351f17686f8… commit ea59e93e31351f17686f8fdeb85e7efa63622a36 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 20:53:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 20:53:45 2023 +0900 [FONTS] Make Arial gender glyphs +66% larger (#6156) Make U+2642 and U+2640 glyphs +66% larger in ReactOS "Arial" font. - Modify arial.ttf, ariali.ttf, arialbd.ttf, and arialbi.ttf font files by FontForge. - Modify media/fonts/doc/Arial/ChangeLog.txt. - Underline values are hacked to do workaround on FontForge's bug. Copyright text: Digitized data copyright (c) 2010 Google Corporation. Copyright (c) 2012 Red Hat, Inc. Copyright (c) 2019-2023 Katayama Hirofumi MZ. License: SIL Open Font License, Version 1.1 Font File Version: 2.00.1 CORE-19346 --- media/fonts/arial.ttf | Bin 180120 -> 180144 bytes media/fonts/arialbd.ttf | Bin 180000 -> 180028 bytes media/fonts/arialbi.ttf | Bin 187656 -> 187684 bytes media/fonts/ariali.ttf | Bin 188056 -> 188084 bytes media/fonts/doc/Arial/ChangeLog.txt | 17 ++++++++++------- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/media/fonts/arial.ttf b/media/fonts/arial.ttf index 9996deef116..a4b0c31fb23 100644 Binary files a/media/fonts/arial.ttf and b/media/fonts/arial.ttf differ diff --git a/media/fonts/arialbd.ttf b/media/fonts/arialbd.ttf index 1334d0526db..df38e73a289 100644 Binary files a/media/fonts/arialbd.ttf and b/media/fonts/arialbd.ttf differ diff --git a/media/fonts/arialbi.ttf b/media/fonts/arialbi.ttf index 643ddb8d52f..176dad8dace 100644 Binary files a/media/fonts/arialbi.ttf and b/media/fonts/arialbi.ttf differ diff --git a/media/fonts/ariali.ttf b/media/fonts/ariali.ttf index 0b499ce88a8..969c656d991 100644 Binary files a/media/fonts/ariali.ttf and b/media/fonts/ariali.ttf differ diff --git a/media/fonts/doc/Arial/ChangeLog.txt b/media/fonts/doc/Arial/ChangeLog.txt index a78b3a3eadd..f8921228b5f 100644 --- a/media/fonts/doc/Arial/ChangeLog.txt +++ b/media/fonts/doc/Arial/ChangeLog.txt @@ -1,3 +1,10 @@ +* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com> +- Initial version of Liberation fonts based on croscore fonts version 1.21.0 +- Converted TTF files into SFD files to be open source. +- Update Copyright and License file +- set fsType bit to 0, Installable Embedding is allowed. +- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. + * Thu Oct 04 2012 Pravin Satpute <psatpute AT redhat DOT com> - Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790 - Resolved #851791, #854601 and #851825 @@ -5,13 +12,6 @@ - Added support for Serbian glyphs for wikipedia #657849 - In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe -* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com> -- Initial version of Liberation fonts based on croscore fonts version 1.21.0 -- Converted TTF files into SFD files to be open source. -- Update Copyright and License file -- set fsType bit to 0, Installable Embedding is allowed. -- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. - * Fri Aug 02 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - Renamed filename "LiberationSans-Regular.ttf" as "arial.ttf". - Renamed filename "LiberationSans-Bold.ttf" as "arialbd.ttf". @@ -22,3 +22,6 @@ - Renamed display name "Liberation Sans Bold" as "Arial Bold". - Renamed display name "Liberation Sans Bold Italic" as "Arial Bold Italic". - Renamed display name "Liberation Sans Italic" as "Arial Italic". + +* Mon Dec 11 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> +- Made U+2642 and U+2640 (♂ and ♀) glyphs +66% larger.

1 0

[reactos] 01/01: [SETUP][BOOTDATA][INF] Add font substitute ('Segoe UI Symbol' to 'Arial') (#6155)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b1ee9a53d971a884b02… commit e2b1ee9a53d971a884b02ce59266f51f56e618c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 20:51:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 20:51:04 2023 +0900 [SETUP][BOOTDATA][INF] Add font substitute ('Segoe UI Symbol' to 'Arial') (#6155) Based on CORE-19346 "segoe-ui-symbo.patch". In order to display gender glyphs (U+2642 and U+2640; ♂ and ♀), we add a font substitute from "Segoe UI Symbol" to "Arial". ReactOS Arial has many symbol glyphs, so I think we can use it for "Segoe UI Symbol" font substitute. The glyph size problem will be fixed in #6156. CORE-19346 --- base/setup/lib/muifonts.h | 10 ++++++++++ boot/bootdata/livecd.inf | 1 + media/inf/font.inf | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 72afe0a5083..8a8ef990bdc 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -20,6 +20,7 @@ MUI_SUBFONT LatinFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -51,6 +52,7 @@ MUI_SUBFONT CyrillicFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -82,6 +84,7 @@ MUI_SUBFONT GreekFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -113,6 +116,7 @@ MUI_SUBFONT HebrewFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Courier New" }, { L"Times", L"Times New Roman" }, @@ -154,6 +158,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, { L"NSimSun", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"SimHei", L"Droid Sans Fallback" }, { L"SimSun", L"Droid Sans Fallback" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, @@ -208,6 +213,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Ming Light", L"Droid Sans Fallback" }, { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -258,6 +264,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -312,6 +319,7 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -349,6 +357,7 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helvetica", L"Arial" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Courier New" }, { L"Times", L"Times New Roman" }, @@ -382,6 +391,7 @@ MUI_SUBFONT HindiFonts[] = { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, { L"Palatino Linotype", L"FreeSans" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index a9202d068ce..41f2bd38d23 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -54,6 +54,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" diff --git a/media/inf/font.inf b/media/inf/font.inf index 749d673b01c..e6dc0cf8647 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -31,6 +31,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -43,6 +44,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -55,6 +57,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -67,6 +70,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -82,6 +86,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothic",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothic 2",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Source Sans Pro",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" @@ -93,6 +98,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet M HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"

1 0

[reactos] 01/01: [SHIMGVW] Destroy window to exit app in Preview_Edit
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a837138dfcbbcfb2b60c1… commit a837138dfcbbcfb2b60c12eca47f1f7c6d4e62db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 15:51:55 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 11 15:51:55 2023 +0900 [SHIMGVW] Destroy window to exit app in Preview_Edit CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index fc3bbdbf2ec..cf62ba202ee 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -905,6 +905,14 @@ Preview_Edit(HWND hwnd) if (!g_pCurrentFile) return; + /* Avoid file locking */ + /* FIXME: Our GdipLoadImageFromFile locks the image file */ + if (g_pImage) + { + GdipDisposeImage(g_pImage); + g_pImage = NULL; + } + GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL); szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ @@ -917,6 +925,9 @@ Preview_Edit(HWND hwnd) { DPRINT1("Preview_Edit: ShellExecuteExW() failed with code %ld\n", GetLastError()); } + + // Destroy the window to quit the application + DestroyWindow(hwnd); } static VOID

1 0

[reactos] 01/01: [SHIMGVW] Refactor Part 3 (#6148)
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2de6e7559ed24dd8d5a3f… commit 2de6e7559ed24dd8d5a3f3eba90efc096aad0740 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 07:52:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 07:52:18 2023 +0900 [SHIMGVW] Refactor Part 3 (#6148) Improve code flexibility. - Remove g_fnPrevProc, g_hDispWnd, g_hToolBar, and g_Anime global variables. - Declare PREVIEW_DATA structure and use it. - Encapsulate preview window by using user data. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 290 +++++++++++++++++++++++++++----------------- dll/win32/shimgvw/shimgvw.h | 4 - 2 files changed, 177 insertions(+), 117 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 82775a85d55..fc3bbdbf2ec 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -13,16 +13,14 @@ #include <shlobj.h> #include <shellapi.h> +/* Toolbar image size */ +#define TB_IMAGE_WIDTH 16 +#define TB_IMAGE_HEIGHT 16 + HINSTANCE g_hInstance; SHIMGVW_SETTINGS g_Settings; SHIMGVW_FILENODE *g_pCurrentFile; GpImage *g_pImage = NULL; -WNDPROC g_fnPrevProc = NULL; - -HWND g_hDispWnd = NULL; -HWND g_hToolBar = NULL; - -ANIME g_Anime; /* Animation */ /* zooming */ static UINT s_nZoomPercents = 100; @@ -92,31 +90,49 @@ static const TB_BUTTON_CONFIG s_ButtonConfig[] = DEFINE_BTN_CONFIG(HELP_TOC) }; -static VOID UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) +typedef struct tagPREVIEW_DATA +{ + HWND m_hwnd; + HWND m_hwndZoom; + HWND m_hwndToolBar; + INT m_nZoomPercents; + WNDPROC m_fnPrevProc; + ANIME m_Anime; /* Animation */ +} PREVIEW_DATA, *PPREVIEW_DATA; + +PPREVIEW_DATA Preview_GetData(HWND hwnd) +{ + return (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); +} + +static VOID +Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; + HWND hToolBar = pData->m_hwndToolBar; /* If zoom has not been changed, ignore it */ - if (s_nZoomPercents == NewZoom) + if (pData->m_nZoomPercents == NewZoom) return; - s_nZoomPercents = NewZoom; + pData->m_nZoomPercents = NewZoom; /* Check if a zoom button of the toolbar must be grayed */ bEnableZoomIn = (NewZoom < MAX_ZOOM); bEnableZoomOut = (NewZoom > MIN_ZOOM); /* Update toolbar buttons */ - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); /* Redraw the display window */ - InvalidateRect(g_hDispWnd, NULL, FALSE); + InvalidateRect(pData->m_hwndZoom, NULL, FALSE); } -static VOID ZoomInOrOut(BOOL bZoomIn) +static VOID +Preview_ZoomInOrOut(PPREVIEW_DATA pData, BOOL bZoomIn) { UINT i, NewZoom; @@ -146,10 +162,11 @@ static VOID ZoomInOrOut(BOOL bZoomIn) } /* Update toolbar and refresh screen */ - UpdateZoom(NewZoom, TRUE, TRUE); + Preview_UpdateZoom(pData, NewZoom, TRUE, TRUE); } -static VOID ResetZoom(VOID) +static VOID +Preview_ResetZoom(PPREVIEW_DATA pData) { RECT Rect; UINT ImageWidth, ImageHeight, NewZoom; @@ -158,7 +175,7 @@ static VOID ResetZoom(VOID) return; /* get disp window size and image size */ - GetClientRect(g_hDispWnd, &Rect); + GetClientRect(pData->m_hwndZoom, &Rect); GdipGetImageWidth(g_pImage, &ImageWidth); GdipGetImageHeight(g_pImage, &ImageHeight); @@ -191,12 +208,31 @@ static VOID ResetZoom(VOID) } } - UpdateZoom(NewZoom, FALSE, TRUE); + Preview_UpdateZoom(pData, NewZoom, FALSE, TRUE); +} + +static VOID +Preview_UpdateTitle(PPREVIEW_DATA pData, LPCWSTR FileName) +{ + WCHAR szText[MAX_PATH + 100]; + LPWSTR pchFileTitle; + + LoadStringW(g_hInstance, IDS_APPTITLE, szText, _countof(szText)); + + pchFileTitle = PathFindFileNameW(FileName); + if (pchFileTitle && *pchFileTitle) + { + StringCchCatW(szText, _countof(szText), L" - "); + StringCchCatW(szText, _countof(szText), pchFileTitle); + } + + SetWindowTextW(pData->m_hwnd, szText); } -static VOID pLoadImage(LPCWSTR szOpenFileName) +static VOID +Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) { - Anime_FreeInfo(&g_Anime); + Anime_FreeInfo(&pData->m_Anime); if (g_pImage) { @@ -208,6 +244,7 @@ static VOID pLoadImage(LPCWSTR szOpenFileName) if (!szOpenFileName || GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) { DPRINT1("File %s not found!\n", szOpenFileName); + Preview_UpdateTitle(pData, NULL); return; } @@ -216,19 +253,29 @@ static VOID pLoadImage(LPCWSTR szOpenFileName) if (!g_pImage) { DPRINT1("GdipLoadImageFromFile() failed\n"); + Preview_UpdateTitle(pData, NULL); return; } - Anime_LoadInfo(&g_Anime); + Anime_LoadInfo(&pData->m_Anime); if (szOpenFileName && szOpenFileName[0]) SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); /* Reset zoom and redraw display */ - ResetZoom(); + Preview_ResetZoom(pData); + + Preview_UpdateTitle(pData, szOpenFileName); } -static VOID pSaveImageAs(HWND hwnd) +static VOID +Preview_pLoadImageFromNode(PPREVIEW_DATA pData, SHIMGVW_FILENODE *pNode) +{ + Preview_pLoadImage(pData, (pNode ? pNode->FileName : NULL)); +} + +static VOID +Preview_pSaveImageAs(PPREVIEW_DATA pData) { OPENFILENAMEW sfn; ImageCodecInfo *codecInfo; @@ -238,6 +285,7 @@ static VOID pSaveImageAs(HWND hwnd) UINT num, size, j; size_t sizeRemain; WCHAR *c; + HWND hwnd = pData->m_hwnd; if (g_pImage == NULL) return; @@ -306,14 +354,14 @@ static VOID pSaveImageAs(HWND hwnd) if (GetSaveFileNameW(&sfn)) { - Anime_Pause(&g_Anime); + Anime_Pause(&pData->m_Anime); if (GdipSaveImageToFile(g_pImage, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) { DPRINT1("GdipSaveImageToFile() failed\n"); } - Anime_Start(&g_Anime, 0); + Anime_Start(&pData->m_Anime, 0); } QuickFree(szFilterMask); @@ -321,42 +369,18 @@ static VOID pSaveImageAs(HWND hwnd) } static VOID -pPrintImage(HWND hwnd) +Preview_pPrintImage(PPREVIEW_DATA pData) { /* FIXME */ } static VOID -Preview_UpdateUI(HWND hwnd) +Preview_UpdateUI(PPREVIEW_DATA pData) { BOOL bEnable = (g_pImage != NULL); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); - InvalidateRect(g_hDispWnd, NULL, FALSE); -} - -static BOOL -pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) -{ - WCHAR szText[MAX_PATH + 100]; - LPWSTR pchFileTitle; - - pLoadImage(node ? node->FileName : NULL); - - if (node == NULL) - return FALSE; - - LoadStringW(g_hInstance, IDS_APPTITLE, szText, _countof(szText)); - - pchFileTitle = PathFindFileNameW(node->FileName); - if (pchFileTitle && *pchFileTitle) - { - StringCchCatW(szText, _countof(szText), L" - "); - StringCchCatW(szText, _countof(szText), pchFileTitle); - } - SetWindowTextW(hwnd, szText); - - return g_pImage != NULL; + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + InvalidateRect(pData->m_hwndZoom, NULL, FALSE); } static SHIMGVW_FILENODE* @@ -670,43 +694,45 @@ ImageView_SaveSettings(VOID) } static BOOL -Preview_CreateToolBar(HWND hwnd) +Preview_CreateToolBar(PPREVIEW_DATA pData) { - g_hToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, - 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); - if (g_hToolBar != NULL) - { - HIMAGELIST hImageList; + HWND hwndToolBar; + HIMAGELIST hImageList, hOldImageList; + const DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS; - SendMessageW(g_hToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + hwndToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, + 0, 0, 0, 0, pData->m_hwnd, NULL, g_hInstance, NULL); + if (!hwndToolBar) + return FALSE; - SendMessageW(g_hToolBar, TB_BUTTONSTRUCTSIZE, sizeof(s_Buttons[0]), 0); + pData->m_hwndToolBar = hwndToolBar; - hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); - if (hImageList == NULL) - return FALSE; + SendMessageW(hwndToolBar, TB_BUTTONSTRUCTSIZE, sizeof(s_Buttons[0]), 0); + SendMessageW(hwndToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); - for (UINT n = 0; n < _countof(s_ButtonConfig); n++) - { - ImageList_AddMasked(hImageList, LoadImageW(g_hInstance, MAKEINTRESOURCEW(s_ButtonConfig[n].idb), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - } + hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); + if (hImageList == NULL) + return FALSE; - ImageList_Destroy((HIMAGELIST)SendMessageW(g_hToolBar, TB_SETIMAGELIST, - 0, (LPARAM)hImageList)); + for (UINT n = 0; n < _countof(s_ButtonConfig); n++) + { + HBITMAP hBitmap = LoadBitmapW(g_hInstance, MAKEINTRESOURCEW(s_ButtonConfig[n].idb)); + ImageList_AddMasked(hImageList, hBitmap, RGB(255, 255, 255)); + DeleteObject(hBitmap); + } - SendMessageW(g_hToolBar, TB_ADDBUTTONS, _countof(s_Buttons), (LPARAM)s_Buttons); + hOldImageList = (HIMAGELIST)SendMessageW(hwndToolBar, TB_SETIMAGELIST, 0, (LPARAM)hImageList); + ImageList_Destroy(hOldImageList); - return TRUE; - } + SendMessageW(hwndToolBar, TB_ADDBUTTONS, _countof(s_Buttons), (LPARAM)s_Buttons); - return FALSE; + return TRUE; } LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PPREVIEW_DATA pData = (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_PAINT: @@ -716,12 +742,14 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_TIMER: { - if (Anime_OnTimer(&g_Anime, wParam)) + if (Anime_OnTimer(&pData->m_Anime, wParam)) InvalidateRect(hwnd, NULL, FALSE); break; } default: - return CallWindowProcW(g_fnPrevProc, hwnd, uMsg, wParam, lParam); + { + return CallWindowProcW(pData->m_fnPrevProc, hwnd, uMsg, wParam, lParam); + } } return 0; } @@ -729,17 +757,35 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { + HWND hwndZoom; + PPREVIEW_DATA pData = QuickAlloc(sizeof(PREVIEW_DATA), TRUE); + pData->m_hwnd = hwnd; + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + DragAcceptFiles(hwnd, TRUE); - g_hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", - WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); + hwndZoom = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); + if (!hwndZoom) + { + QuickFree(pData); + return FALSE; + } + + pData->m_hwndZoom = hwndZoom; + SetWindowLongPtrW(hwndZoom, GWLP_USERDATA, (LONG_PTR)pData); - SetClassLongPtr(g_hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - g_fnPrevProc = (WNDPROC)SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)ZoomWndProc); + SetClassLongPtr(pData->m_hwndZoom, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); + pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtr(pData->m_hwndZoom, + GWLP_WNDPROC, (LPARAM)ZoomWndProc); - Preview_CreateToolBar(hwnd); - Anime_SetTimerWnd(&g_Anime, g_hDispWnd); + if (!Preview_CreateToolBar(pData)) + { + QuickFree(pData); + return FALSE; + } + + Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); if (pCS && pCS->lpCreateParams) { @@ -751,8 +797,8 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) PathUnquoteSpacesW(szFile); g_pCurrentFile = pBuildFileList(szFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } return TRUE; @@ -761,10 +807,11 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) static VOID Preview_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); if (zDelta != 0) { if (GetKeyState(VK_CONTROL) < 0) - ZoomInOrOut(zDelta > 0); + Preview_ZoomInOrOut(pData, zDelta > 0); } } @@ -792,23 +839,26 @@ static VOID Preview_OnSize(HWND hwnd, UINT state, INT cx, INT cy) { RECT rc; + PPREVIEW_DATA pData = Preview_GetData(hwnd); + HWND hToolBar = pData->m_hwndToolBar; - SendMessageW(g_hToolBar, TB_AUTOSIZE, 0, 0); + SendMessageW(hToolBar, TB_AUTOSIZE, 0, 0); - GetWindowRect(g_hToolBar, &rc); + GetWindowRect(hToolBar, &rc); - MoveWindow(g_hDispWnd, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); + MoveWindow(pData->m_hwndZoom, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); if (!IsIconic(hwnd)) /* Is it not minimized? */ - ResetZoom(); + Preview_ResetZoom(pData); Preview_OnMoveSize(hwnd); } static VOID -Preview_Delete(HWND hwnd) +Preview_Delete(PPREVIEW_DATA pData) { WCHAR szCurFile[MAX_PATH + 1], szNextFile[MAX_PATH]; + HWND hwnd = pData->m_hwnd; SHFILEOPSTRUCTW FileOp = { hwnd, FO_DELETE }; if (!g_pCurrentFile) @@ -836,14 +886,14 @@ Preview_Delete(HWND hwnd) { DPRINT("Preview_Delete: SHFileOperationW() failed or canceled\n"); - pLoadImage(szCurFile); + Preview_pLoadImage(pData, szCurFile); return; } /* Reload the file list and go next file */ pFreeFileList(g_pCurrentFile); g_pCurrentFile = pBuildFileList(szNextFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); } static VOID @@ -872,14 +922,16 @@ Preview_Edit(HWND hwnd) static VOID Preview_OnCommand(HWND hwnd, UINT nCommandID) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + switch (nCommandID) { case IDC_PREV_PIC: if (g_pCurrentFile) { g_pCurrentFile = g_pCurrentFile->Prev; - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } break; @@ -887,17 +939,17 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pCurrentFile) { g_pCurrentFile = g_pCurrentFile->Next; - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } break; case IDC_BEST_FIT: - ResetZoom(); + Preview_ResetZoom(pData); break; case IDC_REAL_SIZE: - UpdateZoom(100, TRUE, FALSE); + Preview_UpdateZoom(pData, 100, TRUE, FALSE); break; case IDC_SLIDE_SHOW: @@ -905,19 +957,19 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_ZOOM_IN: - ZoomInOrOut(TRUE); + Preview_ZoomInOrOut(pData, TRUE); break; case IDC_ZOOM_OUT: - ZoomInOrOut(FALSE); + Preview_ZoomInOrOut(pData, FALSE); break; case IDC_SAVEAS: - pSaveImageAs(hwnd); + Preview_pSaveImageAs(pData); break; case IDC_PRINT: - pPrintImage(hwnd); + Preview_pPrintImage(pData); break; case IDC_ROT_CLOCKW: @@ -937,13 +989,13 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_DELETE: - Preview_Delete(hwnd); - Preview_UpdateUI(hwnd); + Preview_Delete(pData); + Preview_UpdateUI(pData); break; case IDC_MODIFY: Preview_Edit(hwnd); - Preview_UpdateUI(hwnd); + Preview_UpdateUI(pData); break; } } @@ -967,6 +1019,8 @@ Preview_OnNotify(HWND hwnd, LPNMHDR pnmhdr) static VOID Preview_OnDestroy(HWND hwnd) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + pFreeFileList(g_pCurrentFile); g_pCurrentFile = NULL; @@ -976,9 +1030,18 @@ Preview_OnDestroy(HWND hwnd) g_pImage = NULL; } - Anime_FreeInfo(&g_Anime); + Anime_FreeInfo(&pData->m_Anime); + + SetWindowLongPtr(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); + SetWindowLongPtr(pData->m_hwndZoom, GWLP_USERDATA, 0); + DestroyWindow(pData->m_hwndZoom); + pData->m_hwndZoom = NULL; + + DestroyWindow(pData->m_hwndToolBar); + pData->m_hwndToolBar = NULL; + + QuickFree(pData); - SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)g_fnPrevProc); PostQuitMessage(0); } @@ -986,12 +1049,13 @@ static VOID Preview_OnDropFiles(HWND hwnd, HDROP hDrop) { WCHAR szFile[MAX_PATH]; + PPREVIEW_DATA pData = Preview_GetData(hwnd); DragQueryFileW(hDrop, 0, szFile, _countof(szFile)); pFreeFileList(g_pCurrentFile); g_pCurrentFile = pBuildFileList(szFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); DragFinish(hDrop); } diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index a9a7b7b8daa..cebbaea06b3 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -29,11 +29,7 @@ #include "resource.h" -#define TB_IMAGE_WIDTH 16 -#define TB_IMAGE_HEIGHT 16 - extern HINSTANCE g_hInstance; -extern HWND g_hDispWnd; extern GpImage *g_pImage; typedef struct

1 0

[reactos] 01/01: [SDK][UUID] Strengthen <ctfutb.h> (#6135)
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=045e9dee58dda42769ea9… commit 045e9dee58dda42769ea94c3c3e9239eebefa5f8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 07:51:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 07:51:17 2023 +0900 [SDK][UUID] Strengthen <ctfutb.h> (#6135) For supporting Text Input Processors (TIPs). Add many TSF interfaces and definitions into "ctfutb.idl". CORE-19268 --- sdk/include/psdk/ctfutb.idl | 282 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 276 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/ctfutb.idl b/sdk/include/psdk/ctfutb.idl index d32894f820b..274dda28e04 100644 --- a/sdk/include/psdk/ctfutb.idl +++ b/sdk/include/psdk/ctfutb.idl @@ -1,5 +1,6 @@ /* * Copyright 2010 Justin Chevrier + * Copyright 2023 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,12 +24,85 @@ import "msctf.idl"; #endif #endif +cpp_quote("#define TF_FLOATINGLANGBAR_WNDTITLEW L\"TF_FloatingLangBar_WndTitle\"") +cpp_quote("#define TF_FLOATINGLANGBAR_WNDTITLEA \"TF_FloatingLangBar_WndTitle\"") +cpp_quote("#ifdef UNICODE") +cpp_quote("#define TF_FLOATINGLANGBAR_WNDTITLE TF_FLOATINGLANGBAR_WNDTITLEW") +cpp_quote("#else") +cpp_quote("#define TF_FLOATINGLANGBAR_WNDTITLE TF_FLOATINGLANGBAR_WNDTITLEA") +cpp_quote("#endif") + +/* Flags for ITfLangBarItemSink::OnUpdate */ +cpp_quote("#define TF_LBI_ICON 0x00000001") +cpp_quote("#define TF_LBI_TEXT 0x00000002") +cpp_quote("#define TF_LBI_TOOLTIP 0x00000004") +cpp_quote("#define TF_LBI_BITMAP 0x00000008") +cpp_quote("#define TF_LBI_BALLOON 0x00000010") +cpp_quote("#define TF_LBI_CUSTOMUI 0x00000020") +cpp_quote("#define TF_LBI_BTNALL (TF_LBI_TEXT | TF_LBI_ICON | TF_LBI_TOOLTIP)") +cpp_quote("#define TF_LBI_BMPBTNALL (TF_LBI_TEXT | TF_LBI_BITMAP | TF_LBI_TOOLTIP)") +cpp_quote("#define TF_LBI_BMPALL (TF_LBI_BITMAP | TF_LBI_TOOLTIP)") +cpp_quote("#define TF_LBI_STATUS 0x00010000") + +/* Flags for ITfLangBarItem::GetInfo */ +cpp_quote("#define TF_LBI_STYLE_HIDDENSTATUSCONTROL 0x00000001") +cpp_quote("#define TF_LBI_STYLE_SHOWNINTRAY 0x00000002") +cpp_quote("#define TF_LBI_STYLE_HIDEONNOOTHERITEMS 0x00000004") +cpp_quote("#define TF_LBI_STYLE_SHOWNINTRAYONLY 0x00000008") +cpp_quote("#define TF_LBI_STYLE_HIDDENBYDEFAULT 0x00000010") +cpp_quote("#define TF_LBI_STYLE_TEXTCOLORICON 0x00000020") +cpp_quote("#define TF_LBI_STYLE_BTN_BUTTON 0x00010000") +cpp_quote("#define TF_LBI_STYLE_BTN_MENU 0x00020000") +cpp_quote("#define TF_LBI_STYLE_BTN_TOGGLE 0x00040000") + +/* Flags for ITfLangBarItem::GetStatus */ +cpp_quote("#define TF_LBI_STATUS_HIDDEN 0x00000001") +cpp_quote("#define TF_LBI_STATUS_DISABLED 0x00000002") +cpp_quote("#define TF_LBI_STATUS_BTN_TOGGLED 0x00010000") + +cpp_quote("#define TF_LBI_BMPF_VERTICAL 0x00000001") + +/* Flags for ShowFloating */ +cpp_quote("#define TF_SFT_SHOWNORMAL 0x00000001") +cpp_quote("#define TF_SFT_DOCK 0x00000002") +cpp_quote("#define TF_SFT_MINIMIZED 0x00000004") +cpp_quote("#define TF_SFT_HIDDEN 0x00000008") +cpp_quote("#define TF_SFT_NOTRANSPARENCY 0x00000010") +cpp_quote("#define TF_SFT_LOWTRANSPARENCY 0x00000020") +cpp_quote("#define TF_SFT_HIGHTRANSPARENCY 0x00000040") +cpp_quote("#define TF_SFT_LABELS 0x00000080") +cpp_quote("#define TF_SFT_NOLABELS 0x00000100") +cpp_quote("#define TF_SFT_EXTRAICONSONMINIMIZED 0x00000200") +cpp_quote("#define TF_SFT_NOEXTRAICONSONMINIMIZED 0x00000400") +cpp_quote("#define TF_SFT_DESKBAND 0x00000800") + +/* OnMenuSelect flags */ +cpp_quote("#define TF_INVALIDMENUITEM (UINT)(-1)") + +/* SystemDeviceTypeLangbarItem flag */ +cpp_quote("#define TF_DTLBI_USEPROFILEICON 0x00000001") + +typedef enum +{ + TF_LBI_CLK_RIGHT = 1, + TF_LBI_CLK_LEFT = 2 +} TfLBIClick; + interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; interface IEnumTfLangBarItems; interface ITfLangBarItem; interface ITfLangBarItemSink; +interface ITfLangBarItemBalloon; +interface ITfLangBarItemBitmap; +interface ITfLangBarItemBitmapButton; +interface ITfLangBarItemButton; +interface ITfMenu; +interface ITfSystemDeviceTypeLangBarItem; +interface ITfSystemLangBarItem; +interface ITfSystemLangBarItemSink; +interface ITfSystemLangBarItemText; [ object, @@ -76,7 +150,7 @@ interface ITfLangBarMgr: IUnknown HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); -}; +} [ object, @@ -123,7 +197,7 @@ typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO [ object, uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), - pointer_default(unique), + pointer_default(unique) ] interface ITfLangBarItemMgr : IUnknown { @@ -177,12 +251,12 @@ interface ITfLangBarItemMgr : IUnknown HRESULT UnadviseItemsSink( [in] ULONG ulCount, [in, size_is(ulCount)] DWORD *pdwCookie); -}; +} [ object, uuid(583f34d0-de25-11d2-afdd-00105a2799b5), - pointer_default(unique), + pointer_default(unique) ] interface IEnumTfLangBarItems : IUnknown { @@ -203,7 +277,7 @@ interface IEnumTfLangBarItems : IUnknown [ object, uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), - pointer_default(unique), + pointer_default(unique) ] interface ITfLangBarItem : IUnknown { @@ -223,10 +297,206 @@ interface ITfLangBarItem : IUnknown [ object, uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), - pointer_default(unique), + pointer_default(unique) ] interface ITfLangBarItemSink : IUnknown { HRESULT OnUpdate( [in] DWORD dwFlags); } + +[ + object, + uuid(01c2d285-d3c7-4b7b-b5b5-d97411d0c283), + pointer_default(unique) +] +interface ITfLangBarItemBalloon : IUnknown +{ + HRESULT OnClick( + [in] TfLBIClick click, + [in] POINT pt, + [in] const RECT *prcArea); + + HRESULT GetPreferredSize( + [in] const SIZE *pszDefault, + [out] SIZE *psz); + + typedef enum + { + TF_LB_BALLOON_RECO = 0, + TF_LB_BALLOON_SHOW = 1, + TF_LB_BALLOON_MISS = 2 + } TfLBBalloonStyle; + + typedef struct TF_LBBALLOONINFO + { + TfLBBalloonStyle style; + BSTR bstrText; + } TF_LBBALLOONINFO; + + HRESULT GetBalloonInfo( + [out] TF_LBBALLOONINFO *pInfo); +} + +[ + object, + uuid(73830352-d722-4179-ada5-f045c98df355), + pointer_default(unique) +] +interface ITfLangBarItemBitmap : IUnknown +{ + HRESULT OnClick( + [in] TfLBIClick click, + [in] POINT pt, + [in] const RECT *prcArea); + + HRESULT GetPreferredSize( + [in] const SIZE *pszDefault, + [out] SIZE *psz); + + HRESULT DrawBitmap( + [in] LONG bmWidth, + [in] LONG bmHeight, + [in] DWORD dwFlags, + [out] HBITMAP *phbmp, + [out] HBITMAP *phbmpMask); +} + +[ + object, + uuid(a26a0525-3fae-4fa0-89ee-88a964f9f1b5), + pointer_default(unique) +] +interface ITfLangBarItemBitmapButton : IUnknown +{ + HRESULT OnClick( + [in] TfLBIClick click, + [in] POINT pt, + [in] const RECT *prcArea); + + HRESULT InitMenu( + [in] ITfMenu *pMenu); + + HRESULT OnMenuSelect( + [in] UINT wID); + + HRESULT GetPreferredSize( + [in] const SIZE *pszDefault, + [out] SIZE *psz); + + HRESULT DrawBitmap( + [in] LONG bmWidth, + [in] LONG bmHeight, + [in] DWORD dwFlags, + [out] HBITMAP *phbmp, + [out] HBITMAP *phbmpMask); + + HRESULT GetText( + [out] BSTR *pbstrText); +} + +[ + object, + uuid(28c7f1d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarItemButton : IUnknown +{ + HRESULT OnClick( + [in] TfLBIClick click, + [in] POINT pt, + [in] const RECT *prcArea); + + HRESULT InitMenu( + [in] ITfMenu *pMenu); + + HRESULT OnMenuSelect( + [in] UINT wID); + + HRESULT GetIcon( + [out] HICON *phIcon); + + HRESULT GetText( + [out] BSTR *pbstrText); +} + +[ + object, + uuid(6f8a98e4-aaa0-4f15-8c5b-07e0df0a3dd8), + pointer_default(unique) +] +interface ITfMenu : IUnknown +{ + const DWORD TF_LBMENUF_CHECKED = 0x00000001; + const DWORD TF_LBMENUF_SUBMENU = 0x00000002; + const DWORD TF_LBMENUF_SEPARATOR = 0x00000004; + const DWORD TF_LBMENUF_RADIOCHECKED = 0x00000008; + const DWORD TF_LBMENUF_GRAYED = 0x00000010; + + HRESULT AddMenuItem( + [in] UINT uId, + [in] DWORD dwFlags, + [in] HBITMAP hbmp, + [in] HBITMAP hbmpMask, + [in] const WCHAR *pch, + [in] ULONG cch, + ITfMenu **ppMenu); +} + +[ + object, + uuid(45672eb9-9059-46a2-838d-4530355f6a77), + pointer_default(unique) +] +interface ITfSystemDeviceTypeLangBarItem : IUnknown +{ + HRESULT SetIconMode( + [in] DWORD dwFlags); + + HRESULT GetIconMode( + [out] DWORD *pdwFlags); +} + +[ + object, + uuid(1e13e9ec-6b33-4d4a-b5eb-8a92f029f356), + pointer_default(unique) +] +interface ITfSystemLangBarItem : IUnknown +{ + HRESULT SetIcon( + [in] HICON hIcon); + + HRESULT SetTooltipString( + [in] WCHAR *pchToolTip, + [in] ULONG cch); +} + +[ + object, + uuid(1449d9ab-13cf-4687-aa3e-8d8b18574396), + pointer_default(unique) +] +interface ITfSystemLangBarItemSink : IUnknown +{ + HRESULT InitMenu( + [in] ITfMenu *pMenu); + + HRESULT OnMenuSelect( + [in] UINT wID); +} + +[ + object, + uuid(5c4ce0e5-ba49-4b52-ac6b-3b397b4f701f), + pointer_default(unique) +] +interface ITfSystemLangBarItemText : IUnknown +{ + HRESULT SetItemText( + [in] const WCHAR *pch, + [in] ULONG cch); + + HRESULT GetItemText( + [out] BSTR *pbstrText); +}

1 0

[reactos] 01/01: [SHIMGVW] Use HeapAlloc/HeapFree instead of malloc/calloc/free
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc2d2232f45956cf496b8… commit dc2d2232f45956cf496b8f80ecb9a4c19d77f7f2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 18:09:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 10 18:09:59 2023 +0900 [SHIMGVW] Use HeapAlloc/HeapFree instead of malloc/calloc/free malloc/free are slow. CORE-19358 --- dll/win32/shimgvw/anime.c | 12 ++++++------ dll/win32/shimgvw/shimgvw.c | 36 ++++++++++++++++++------------------ dll/win32/shimgvw/shimgvw.h | 10 ++++++++++ 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dll/win32/shimgvw/anime.c b/dll/win32/shimgvw/anime.c index 6348c43b903..3b247cfac24 100644 --- a/dll/win32/shimgvw/anime.c +++ b/dll/win32/shimgvw/anime.c @@ -13,7 +13,7 @@ void Anime_FreeInfo(PANIME pAnime) { if (pAnime->m_pDelayItem) { - free(pAnime->m_pDelayItem); + QuickFree(pAnime->m_pDelayItem); pAnime->m_pDelayItem = NULL; } pAnime->m_nFrameIndex = 0; @@ -101,13 +101,13 @@ BOOL Anime_LoadInfo(PANIME pAnime) GdipImageGetFrameDimensionsCount(g_pImage, &nDimCount); if (nDimCount) { - GUID *dims = (GUID *)calloc(nDimCount, sizeof(GUID)); + GUID *dims = (GUID *)QuickAlloc(nDimCount * sizeof(GUID), TRUE); if (dims) { GdipImageGetFrameDimensionsList(g_pImage, dims, nDimCount); GdipImageGetFrameCount(g_pImage, dims, &result); pAnime->m_nFrameCount = result; - free(dims); + QuickFree(dims); } } @@ -116,7 +116,7 @@ BOOL Anime_LoadInfo(PANIME pAnime) cbItem = result; if (cbItem) { - pAnime->m_pDelayItem = (PropertyItem *)malloc(cbItem); + pAnime->m_pDelayItem = (PropertyItem *)QuickAlloc(cbItem, FALSE); GdipGetPropertyItem(g_pImage, PropertyTagFrameDelay, cbItem, pAnime->m_pDelayItem); } @@ -125,14 +125,14 @@ BOOL Anime_LoadInfo(PANIME pAnime) cbItem = result; if (cbItem) { - PropertyItem *pItem = (PropertyItem *)malloc(cbItem); + PropertyItem *pItem = (PropertyItem *)QuickAlloc(cbItem, FALSE); if (pItem) { if (GdipGetPropertyItem(g_pImage, PropertyTagLoopCount, cbItem, pItem) == Ok) { pAnime->m_nLoopCount = *(WORD *)pItem->value; } - free(pItem); + QuickFree(pItem); } } diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 32f944c55a5..82775a85d55 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -243,10 +243,10 @@ static VOID pSaveImageAs(HWND hwnd) return; GdipGetImageEncodersSize(&num, &size); - codecInfo = malloc(size); + codecInfo = QuickAlloc(size, FALSE); if (!codecInfo) { - DPRINT1("malloc() failed in pSaveImageAs()\n"); + DPRINT1("QuickAlloc() failed in pSaveImageAs()\n"); return; } @@ -263,11 +263,11 @@ static VOID pSaveImageAs(HWND hwnd) /* Add two more chars for the last terminator */ sizeRemain += (sizeof(WCHAR) * 2); - szFilterMask = malloc(sizeRemain); + szFilterMask = QuickAlloc(sizeRemain, FALSE); if (!szFilterMask) { DPRINT1("cannot allocate memory for filter mask in pSaveImageAs()"); - free(codecInfo); + QuickFree(codecInfo); return; } @@ -316,8 +316,8 @@ static VOID pSaveImageAs(HWND hwnd) Anime_Start(&g_Anime, 0); } - free(szFilterMask); - free(codecInfo); + QuickFree(szFilterMask); + QuickFree(codecInfo); } static VOID @@ -380,20 +380,20 @@ pBuildFileList(LPCWSTR szFirstFile) PathRemoveFileSpecW(szSearchPath); GdipGetImageDecodersSize(&num, &size); - codecInfo = malloc(size); + codecInfo = QuickAlloc(size, FALSE); if (!codecInfo) { - DPRINT1("malloc() failed in pLoadFileList()\n"); + DPRINT1("QuickAlloc() failed in pLoadFileList()\n"); return NULL; } GdipGetImageDecoders(num, size, codecInfo); - root = malloc(sizeof(SHIMGVW_FILENODE)); + root = QuickAlloc(sizeof(SHIMGVW_FILENODE), FALSE); if (!root) { - DPRINT1("malloc() failed in pLoadFileList()\n"); - free(codecInfo); + DPRINT1("QuickAlloc() failed in pLoadFileList()\n"); + QuickFree(codecInfo); return NULL; } @@ -422,18 +422,18 @@ pBuildFileList(LPCWSTR szFirstFile) currentNode = conductor; } - conductor->Next = malloc(sizeof(SHIMGVW_FILENODE)); + conductor->Next = QuickAlloc(sizeof(SHIMGVW_FILENODE), FALSE); - // if malloc fails, make circular what we have and return it + // if QuickAlloc fails, make circular what we have and return it if (!conductor->Next) { - DPRINT1("malloc() failed in pLoadFileList()\n"); + DPRINT1("QuickAlloc() failed in pLoadFileList()\n"); conductor->Next = root; root->Prev = conductor; FindClose(hFindHandle); - free(codecInfo); + QuickFree(codecInfo); return conductor; } @@ -459,7 +459,7 @@ pBuildFileList(LPCWSTR szFirstFile) else { conductor = conductor->Prev; - free(conductor->Next); + QuickFree(conductor->Next); } // link the last node with the first one to make the list circular @@ -467,7 +467,7 @@ pBuildFileList(LPCWSTR szFirstFile) root->Prev = conductor; conductor = currentNode; - free(codecInfo); + QuickFree(codecInfo); return conductor; } @@ -487,7 +487,7 @@ pFreeFileList(SHIMGVW_FILENODE *root) { conductor = root; root = conductor->Next; - free(conductor); + QuickFree(conductor); } } diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 99a159a4cd1..a9a7b7b8daa 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -72,3 +72,13 @@ void Anime_SetFrameIndex(PANIME pAnime, UINT nFrameIndex); void Anime_Start(PANIME pAnime, DWORD dwDelay); void Anime_Pause(PANIME pAnime); BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam); + +static inline LPVOID QuickAlloc(SIZE_T cbSize, BOOL bZero) +{ + return HeapAlloc(GetProcessHeap(), (bZero ? HEAP_ZERO_MEMORY : 0), cbSize); +} + +static inline VOID QuickFree(LPVOID ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +}

1 0

[reactos] 01/01: [SHIMGVW] Support Drag & Drop
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=468a5492a9849f38faeaa… commit 468a5492a9849f38faeaa3f2c4973e9b12849af5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 16:55:34 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 10 16:55:34 2023 +0900 [SHIMGVW] Support Drag & Drop - Use DragAcceptFiles and WM_DROPFILES. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 00b3a90ac3c..32f944c55a5 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -729,6 +729,8 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { + DragAcceptFiles(hwnd, TRUE); + g_hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); @@ -980,6 +982,20 @@ Preview_OnDestroy(HWND hwnd) PostQuitMessage(0); } +static VOID +Preview_OnDropFiles(HWND hwnd, HDROP hDrop) +{ + WCHAR szFile[MAX_PATH]; + + DragQueryFileW(hDrop, 0, szFile, _countof(szFile)); + + pFreeFileList(g_pCurrentFile); + g_pCurrentFile = pBuildFileList(szFile); + pLoadImageFromNode(g_pCurrentFile, hwnd); + + DragFinish(hDrop); +} + LRESULT CALLBACK PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1023,6 +1039,11 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); break; } + case WM_DROPFILES: + { + Preview_OnDropFiles(hwnd, (HDROP)wParam); + break; + } case WM_DESTROY: { Preview_OnDestroy(hwnd);

1 0

[reactos] 01/01: [SHIMGVW] Refactoring Part 2 (#6147)
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b1d6d6b2006cd756eb10… commit 0b1d6d6b2006cd756eb1036d5c252e5a3b0d5337 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 16:42:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 10 16:42:22 2023 +0900 [SHIMGVW] Refactoring Part 2 (#6147) - Move Anime_GetFrameDelay and Anime_Step. - Remove one parameter from ImageView_SaveSettings. - Rename some preview-window functions as "Preview_...". - Rename ImageView_CreateWindow as ImageView_Main. - Use lParam of WM_CREATE. CORE-19358 --- dll/win32/shimgvw/anime.c | 70 +++---- dll/win32/shimgvw/shimgvw.c | 451 ++++++++++++++++++++++++-------------------- dll/win32/shimgvw/shimgvw.h | 5 +- 3 files changed, 280 insertions(+), 246 deletions(-) diff --git a/dll/win32/shimgvw/anime.c b/dll/win32/shimgvw/anime.c index 485b509675b..6348c43b903 100644 --- a/dll/win32/shimgvw/anime.c +++ b/dll/win32/shimgvw/anime.c @@ -38,6 +38,41 @@ void Anime_Start(PANIME pAnime, DWORD dwDelay) SetTimer(pAnime->m_hwndTimer, ANIME_TIMER_ID, dwDelay, NULL); } +DWORD Anime_GetFrameDelay(PANIME pAnime, UINT nFrameIndex) +{ + if (nFrameIndex < pAnime->m_nFrameCount && pAnime->m_pDelayItem) + { + return ((DWORD *)pAnime->m_pDelayItem->value)[pAnime->m_nFrameIndex] * 10; + } + return 0; +} + +BOOL Anime_Step(PANIME pAnime, DWORD *pdwDelay) +{ + *pdwDelay = INFINITE; + if (pAnime->m_nLoopCount == (UINT)-1) + return FALSE; + + if (pAnime->m_nFrameIndex + 1 < pAnime->m_nFrameCount) + { + *pdwDelay = Anime_GetFrameDelay(pAnime, pAnime->m_nFrameIndex); + Anime_SetFrameIndex(pAnime, pAnime->m_nFrameIndex); + ++pAnime->m_nFrameIndex; + return TRUE; + } + + if (pAnime->m_nLoopCount == 0 || pAnime->m_nLoopIndex < pAnime->m_nLoopCount) + { + *pdwDelay = Anime_GetFrameDelay(pAnime, pAnime->m_nFrameIndex); + Anime_SetFrameIndex(pAnime, pAnime->m_nFrameIndex); + pAnime->m_nFrameIndex = 0; + ++pAnime->m_nLoopIndex; + return TRUE; + } + + return FALSE; +} + BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam) { DWORD dwDelay; @@ -119,38 +154,3 @@ void Anime_SetFrameIndex(PANIME pAnime, UINT nFrameIndex) } pAnime->m_nFrameIndex = nFrameIndex; } - -DWORD Anime_GetFrameDelay(PANIME pAnime, UINT nFrameIndex) -{ - if (nFrameIndex < pAnime->m_nFrameCount && pAnime->m_pDelayItem) - { - return ((DWORD *)pAnime->m_pDelayItem->value)[pAnime->m_nFrameIndex] * 10; - } - return 0; -} - -BOOL Anime_Step(PANIME pAnime, DWORD *pdwDelay) -{ - *pdwDelay = INFINITE; - if (pAnime->m_nLoopCount == (UINT)-1) - return FALSE; - - if (pAnime->m_nFrameIndex + 1 < pAnime->m_nFrameCount) - { - *pdwDelay = Anime_GetFrameDelay(pAnime, pAnime->m_nFrameIndex); - Anime_SetFrameIndex(pAnime, pAnime->m_nFrameIndex); - ++pAnime->m_nFrameIndex; - return TRUE; - } - - if (pAnime->m_nLoopCount == 0 || pAnime->m_nLoopIndex < pAnime->m_nLoopCount) - { - *pdwDelay = Anime_GetFrameDelay(pAnime, pAnime->m_nFrameIndex); - Anime_SetFrameIndex(pAnime, pAnime->m_nFrameIndex); - pAnime->m_nFrameIndex = 0; - ++pAnime->m_nLoopIndex; - return TRUE; - } - - return FALSE; -} diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index f8915000893..00b3a90ac3c 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -11,7 +11,6 @@ #include <commctrl.h> #include <commdlg.h> #include <shlobj.h> -#include <shlwapi.h> #include <shellapi.h> HINSTANCE g_hInstance; @@ -93,7 +92,7 @@ static const TB_BUTTON_CONFIG s_ButtonConfig[] = DEFINE_BTN_CONFIG(HELP_TOC) }; -static void UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) +static VOID UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; @@ -117,7 +116,7 @@ static void UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) InvalidateRect(g_hDispWnd, NULL, FALSE); } -static void ZoomInOrOut(BOOL bZoomIn) +static VOID ZoomInOrOut(BOOL bZoomIn) { UINT i, NewZoom; @@ -150,7 +149,7 @@ static void ZoomInOrOut(BOOL bZoomIn) UpdateZoom(NewZoom, TRUE, TRUE); } -static void ResetZoom(void) +static VOID ResetZoom(VOID) { RECT Rect; UINT ImageWidth, ImageHeight, NewZoom; @@ -195,10 +194,18 @@ static void ResetZoom(void) UpdateZoom(NewZoom, FALSE, TRUE); } -static void pLoadImage(LPCWSTR szOpenFileName) +static VOID pLoadImage(LPCWSTR szOpenFileName) { + Anime_FreeInfo(&g_Anime); + + if (g_pImage) + { + GdipDisposeImage(g_pImage); + g_pImage = NULL; + } + /* check file presence */ - if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + if (!szOpenFileName || GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) { DPRINT1("File %s not found!\n", szOpenFileName); return; @@ -221,17 +228,15 @@ static void pLoadImage(LPCWSTR szOpenFileName) ResetZoom(); } -static void pSaveImageAs(HWND hwnd) +static VOID pSaveImageAs(HWND hwnd) { OPENFILENAMEW sfn; ImageCodecInfo *codecInfo; WCHAR szSaveFileName[MAX_PATH]; WCHAR *szFilterMask; GUID rawFormat; - UINT num; - UINT size; + UINT num, size, j; size_t sizeRemain; - UINT j; WCHAR *c; if (g_pImage == NULL) @@ -249,7 +254,6 @@ static void pSaveImageAs(HWND hwnd) GdipGetImageRawFormat(g_pImage, &rawFormat); sizeRemain = 0; - for (j = 0; j < num; ++j) { // Every pair needs space for the Description, twice the Extensions, 1 char for the space, 2 for the braces and 2 for the NULL terminators. @@ -257,7 +261,7 @@ static void pSaveImageAs(HWND hwnd) } /* Add two more chars for the last terminator */ - sizeRemain = sizeRemain + (sizeof(WCHAR) * 2); + sizeRemain += (sizeof(WCHAR) * 2); szFilterMask = malloc(sizeRemain); if (!szFilterMask) @@ -272,7 +276,6 @@ static void pSaveImageAs(HWND hwnd) ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); sfn.hwndOwner = hwnd; - sfn.hInstance = g_hInstance; sfn.lpstrFile = szSaveFileName; sfn.lpstrFilter = szFilterMask; sfn.nMaxFile = _countof(szSaveFileName); @@ -324,54 +327,40 @@ pPrintImage(HWND hwnd) } static VOID -EnableToolBarButtons(BOOL bEnable) +Preview_UpdateUI(HWND hwnd) { + BOOL bEnable = (g_pImage != NULL); SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + InvalidateRect(g_hDispWnd, NULL, FALSE); } -static VOID +static BOOL pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) { - WCHAR szTitleBuf[800]; - WCHAR szResStr[512]; + WCHAR szText[MAX_PATH + 100]; LPWSTR pchFileTitle; - if (g_pImage) - { - GdipDisposeImage(g_pImage); - g_pImage = NULL; - } + pLoadImage(node ? node->FileName : NULL); if (node == NULL) - { - EnableToolBarButtons(FALSE); - return; - } - - pLoadImage(node->FileName); + return FALSE; - LoadStringW(g_hInstance, IDS_APPTITLE, szResStr, _countof(szResStr)); + LoadStringW(g_hInstance, IDS_APPTITLE, szText, _countof(szText)); pchFileTitle = PathFindFileNameW(node->FileName); - if (pchFileTitle && *pchFileTitle) - { - StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls - %ls", szResStr, pchFileTitle); - SetWindowTextW(hwnd, szTitleBuf); - } - else + if (pchFileTitle && *pchFileTitle) { - SetWindowTextW(hwnd, szResStr); + StringCchCatW(szText, _countof(szText), L" - "); + StringCchCatW(szText, _countof(szText), pchFileTitle); } + SetWindowTextW(hwnd, szText); - EnableToolBarButtons(g_pImage != NULL); - - /* Redraw the display window */ - InvalidateRect(hwnd, NULL, FALSE); + return g_pImage != NULL; } static SHIMGVW_FILENODE* -pBuildFileList(LPWSTR szFirstFile) +pBuildFileList(LPCWSTR szFirstFile) { HANDLE hFindHandle; WCHAR *extension; @@ -523,7 +512,7 @@ static HBRUSH CreateCheckerBoardBrush(HDC hdc) } static VOID -ImageView_DrawImage(HWND hwnd) +ZoomWnd_OnPaint(HWND hwnd) { GpGraphics *graphics; UINT ImageWidth, ImageHeight; @@ -656,42 +645,21 @@ ImageView_LoadSettings(VOID) nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey); if (nError != ERROR_SUCCESS) - { - ImageView_ResetSettings(); return FALSE; - } dwSize = sizeof(g_Settings); nError = RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&g_Settings, &dwSize); RegCloseKey(hKey); - if (nError != ERROR_SUCCESS || dwSize != sizeof(g_Settings)) - { - ImageView_ResetSettings(); - return FALSE; - } - - return TRUE; + return ((nError == ERROR_SUCCESS) && (dwSize == sizeof(g_Settings))); } static VOID -ImageView_SaveSettings(HWND hwnd) +ImageView_SaveSettings(VOID) { - WINDOWPLACEMENT wp; HKEY hKey; - RECT *prc; LSTATUS nError; - wp.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(hwnd, &wp); - - prc = &wp.rcNormalPosition; - g_Settings.X = prc->left; - g_Settings.Y = prc->top; - g_Settings.Width = prc->right - prc->left; - g_Settings.Height = prc->bottom - prc->top; - g_Settings.Maximized = IsZoomed(hwnd); - nError = RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL); if (nError != ERROR_SUCCESS) @@ -702,12 +670,11 @@ ImageView_SaveSettings(HWND hwnd) } static BOOL -ImageView_CreateToolBar(HWND hwnd) +Preview_CreateToolBar(HWND hwnd) { - g_hToolBar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, - 0, 0, 0, 0, hwnd, - 0, g_hInstance, NULL); + g_hToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); if (g_hToolBar != NULL) { HIMAGELIST hImageList; @@ -738,14 +705,14 @@ ImageView_CreateToolBar(HWND hwnd) } LRESULT CALLBACK -ImageView_DispWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_PAINT: { - ImageView_DrawImage(hwnd); - return 0L; + ZoomWnd_OnPaint(hwnd); + break; } case WM_TIMER: { @@ -753,26 +720,44 @@ ImageView_DispWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) InvalidateRect(hwnd, NULL, FALSE); break; } + default: + return CallWindowProcW(g_fnPrevProc, hwnd, uMsg, wParam, lParam); } - return CallWindowProcW(g_fnPrevProc, hwnd, uMsg, wParam, lParam); + return 0; } -static VOID -ImageView_InitControls(HWND hwnd) +static BOOL +Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { g_hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); SetClassLongPtr(g_hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - g_fnPrevProc = (WNDPROC) SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM) ImageView_DispWndProc); + g_fnPrevProc = (WNDPROC)SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)ZoomWndProc); - ImageView_CreateToolBar(hwnd); + Preview_CreateToolBar(hwnd); Anime_SetTimerWnd(&g_Anime, g_hDispWnd); + + if (pCS && pCS->lpCreateParams) + { + LPCWSTR pszFileName = (LPCWSTR)pCS->lpCreateParams; + WCHAR szFile[MAX_PATH]; + + /* Make sure the path has no quotes on it */ + StringCchCopyW(szFile, _countof(szFile), pszFileName); + PathUnquoteSpacesW(szFile); + + g_pCurrentFile = pBuildFileList(szFile); + pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_UpdateUI(hwnd); + } + + return TRUE; } static VOID -ImageView_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) +Preview_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) { if (zDelta != 0) { @@ -782,7 +767,27 @@ ImageView_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) } static VOID -ImageView_OnSize(HWND hwnd, UINT state, INT cx, INT cy) +Preview_OnMoveSize(HWND hwnd) +{ + WINDOWPLACEMENT wp; + RECT *prc; + + if (IsIconic(hwnd)) + return; + + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hwnd, &wp); + + prc = &wp.rcNormalPosition; + g_Settings.X = prc->left; + g_Settings.Y = prc->top; + g_Settings.Width = prc->right - prc->left; + g_Settings.Height = prc->bottom - prc->top; + g_Settings.Maximized = IsZoomed(hwnd); +} + +static VOID +Preview_OnSize(HWND hwnd, UINT state, INT cx, INT cy) { RECT rc; @@ -794,14 +799,19 @@ ImageView_OnSize(HWND hwnd, UINT state, INT cx, INT cy) if (!IsIconic(hwnd)) /* Is it not minimized? */ ResetZoom(); + + Preview_OnMoveSize(hwnd); } static VOID -ImageView_Delete(HWND hwnd) +Preview_Delete(HWND hwnd) { WCHAR szCurFile[MAX_PATH + 1], szNextFile[MAX_PATH]; SHFILEOPSTRUCTW FileOp = { hwnd, FO_DELETE }; + if (!g_pCurrentFile) + return; + /* FileOp.pFrom must be double-null-terminated */ GetFullPathNameW(g_pCurrentFile->FileName, _countof(szCurFile) - 1, szCurFile, NULL); szCurFile[_countof(szCurFile) - 2] = UNICODE_NULL; /* Avoid buffer overrun */ @@ -822,7 +832,7 @@ ImageView_Delete(HWND hwnd) FileOp.fFlags = FOF_ALLOWUNDO; if (SHFileOperationW(&FileOp) != 0) { - DPRINT("ImageView_Delete: SHFileOperationW() failed or canceled\n"); + DPRINT("Preview_Delete: SHFileOperationW() failed or canceled\n"); pLoadImage(szCurFile); return; @@ -835,11 +845,14 @@ ImageView_Delete(HWND hwnd) } static VOID -ImageView_Modify(HWND hwnd) +Preview_Edit(HWND hwnd) { WCHAR szPathName[MAX_PATH]; SHELLEXECUTEINFOW sei; + if (!g_pCurrentFile) + return; + GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL); szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ @@ -850,110 +863,148 @@ ImageView_Modify(HWND hwnd) sei.nShow = SW_SHOWNORMAL; if (!ShellExecuteExW(&sei)) { - DPRINT1("ImageView_Modify: ShellExecuteExW() failed with code %ld\n", GetLastError()); + DPRINT1("Preview_Edit: ShellExecuteExW() failed with code %ld\n", GetLastError()); } } -LRESULT CALLBACK -ImageView_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static VOID +Preview_OnCommand(HWND hwnd, UINT nCommandID) { - switch (uMsg) + switch (nCommandID) { - case WM_CREATE: - { - ImageView_InitControls(hwnd); + case IDC_PREV_PIC: + if (g_pCurrentFile) + { + g_pCurrentFile = g_pCurrentFile->Prev; + pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_UpdateUI(hwnd); + } break; - } - case WM_COMMAND: - { - switch (LOWORD(wParam)) + case IDC_NEXT_PIC: + if (g_pCurrentFile) { - case IDC_PREV_PIC: - g_pCurrentFile = g_pCurrentFile->Prev; - pLoadImageFromNode(g_pCurrentFile, hwnd); - break; - - case IDC_NEXT_PIC: - g_pCurrentFile = g_pCurrentFile->Next; - pLoadImageFromNode(g_pCurrentFile, hwnd); - break; - - case IDC_BEST_FIT: - ResetZoom(); - break; - - case IDC_REAL_SIZE: - UpdateZoom(100, TRUE, FALSE); - break; - - case IDC_SLIDE_SHOW: - DPRINT1("IDC_SLIDE_SHOW unimplemented\n"); - break; - - case IDC_ZOOM_IN: - ZoomInOrOut(TRUE); - break; - - case IDC_ZOOM_OUT: - ZoomInOrOut(FALSE); - break; - - case IDC_SAVEAS: - pSaveImageAs(hwnd); - break; - - case IDC_PRINT: - pPrintImage(hwnd); - break; - - case IDC_ROT_CLOCKW: - if (g_pImage) - { - GdipImageRotateFlip(g_pImage, Rotate270FlipNone); - InvalidateRect(hwnd, NULL, FALSE); - } - break; + g_pCurrentFile = g_pCurrentFile->Next; + pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_UpdateUI(hwnd); + } + break; - case IDC_ROT_COUNCW: - if (g_pImage) - { - GdipImageRotateFlip(g_pImage, Rotate90FlipNone); - InvalidateRect(hwnd, NULL, FALSE); - } - break; + case IDC_BEST_FIT: + ResetZoom(); + break; - case IDC_DELETE: - ImageView_Delete(hwnd); - break; + case IDC_REAL_SIZE: + UpdateZoom(100, TRUE, FALSE); + break; - case IDC_MODIFY: - ImageView_Modify(hwnd); - break; - } - } - break; + case IDC_SLIDE_SHOW: + DPRINT1("IDC_SLIDE_SHOW unimplemented\n"); + break; - case WM_MOUSEWHEEL: - ImageView_OnMouseWheel(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); + case IDC_ZOOM_IN: + ZoomInOrOut(TRUE); break; - case WM_NOTIFY: - { - LPNMHDR pnmhdr = (LPNMHDR)lParam; + case IDC_ZOOM_OUT: + ZoomInOrOut(FALSE); + break; + + case IDC_SAVEAS: + pSaveImageAs(hwnd); + break; + + case IDC_PRINT: + pPrintImage(hwnd); + break; - switch (pnmhdr->code) + case IDC_ROT_CLOCKW: + if (g_pImage) { - case TTN_GETDISPINFOW: - { - LPTOOLTIPTEXTW lpttt = (LPTOOLTIPTEXTW)lParam; - lpttt->hinst = g_hInstance; - lpttt->lpszText = MAKEINTRESOURCEW(s_ButtonConfig[lpttt->hdr.idFrom - IDC_TOOL_BASE].ids); - break; - } + GdipImageRotateFlip(g_pImage, Rotate270FlipNone); + InvalidateRect(hwnd, NULL, FALSE); } break; + + case IDC_ROT_COUNCW: + if (g_pImage) + { + GdipImageRotateFlip(g_pImage, Rotate90FlipNone); + InvalidateRect(hwnd, NULL, FALSE); + } + break; + + case IDC_DELETE: + Preview_Delete(hwnd); + Preview_UpdateUI(hwnd); + break; + + case IDC_MODIFY: + Preview_Edit(hwnd); + Preview_UpdateUI(hwnd); + break; + } +} + +static LRESULT +Preview_OnNotify(HWND hwnd, LPNMHDR pnmhdr) +{ + switch (pnmhdr->code) + { + case TTN_GETDISPINFOW: + { + LPTOOLTIPTEXTW lpttt = (LPTOOLTIPTEXTW)pnmhdr; + lpttt->hinst = g_hInstance; + lpttt->lpszText = MAKEINTRESOURCEW(s_ButtonConfig[lpttt->hdr.idFrom - IDC_TOOL_BASE].ids); + break; + } + } + return 0; +} + +static VOID +Preview_OnDestroy(HWND hwnd) +{ + pFreeFileList(g_pCurrentFile); + g_pCurrentFile = NULL; + + if (g_pImage) + { + GdipDisposeImage(g_pImage); + g_pImage = NULL; + } + + Anime_FreeInfo(&g_Anime); + + SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)g_fnPrevProc); + PostQuitMessage(0); +} + +LRESULT CALLBACK +PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + { + if (!Preview_OnCreate(hwnd, (LPCREATESTRUCT)lParam)) + return -1; + break; + } + case WM_COMMAND: + { + Preview_OnCommand(hwnd, LOWORD(wParam)); + break; + } + case WM_MOUSEWHEEL: + { + Preview_OnMouseWheel(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), + (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); + break; + } + case WM_NOTIFY: + { + return Preview_OnNotify(hwnd, (LPNMHDR)lParam); } case WM_GETMINMAXINFO: { @@ -962,16 +1013,19 @@ ImageView_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) pMMI->ptMinTrackSize.y = 290; break; } + case WM_MOVE: + { + Preview_OnMoveSize(hwnd); + break; + } case WM_SIZE: { - ImageView_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + Preview_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); break; } case WM_DESTROY: { - ImageView_SaveSettings(hwnd); - SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)g_fnPrevProc); - PostQuitMessage(0); + Preview_OnDestroy(hwnd); break; } default: @@ -983,14 +1037,13 @@ ImageView_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } -LONG WINAPI -ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) +LONG +ImageView_Main(HWND hwnd, LPCWSTR szFileName) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; - WNDCLASSW WndClass = {0}; - WCHAR szBuf[256]; - WCHAR szInitialFile[MAX_PATH]; + WNDCLASSW WndClass; + WCHAR szTitle[256]; HWND hMainWnd; MSG msg; HACCEL hAccel; @@ -1004,17 +1057,18 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) if (FAILED(hrCoInit)) DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hrCoInit); - ImageView_LoadSettings(); + if (!ImageView_LoadSettings()) + ImageView_ResetSettings(); /* Initialize GDI+ */ ZeroMemory(&gdiplusStartupInput, sizeof(gdiplusStartupInput)); gdiplusStartupInput.GdiplusVersion = 1; GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - pLoadImage(szFileName); /* Register window classes */ - WndClass.lpszClassName = WC_SHIMGVW; - WndClass.lpfnWndProc = ImageView_WndProc; + ZeroMemory(&WndClass, sizeof(WndClass)); + WndClass.lpszClassName = WC_PREVIEW; + WndClass.lpfnWndProc = PreviewWndProc; WndClass.hInstance = g_hInstance; WndClass.style = CS_HREDRAW | CS_VREDRAW; WndClass.hIcon = LoadIconW(g_hInstance, MAKEINTRESOURCEW(IDI_APP_ICON)); @@ -1024,21 +1078,11 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) return -1; /* Create the main window */ - LoadStringW(g_hInstance, IDS_APPTITLE, szBuf, _countof(szBuf)); - hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf, + LoadStringW(g_hInstance, IDS_APPTITLE, szTitle, _countof(szTitle)); + hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_PREVIEW, szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, g_Settings.X, g_Settings.Y, g_Settings.Width, g_Settings.Height, - NULL, NULL, g_hInstance, NULL); - - // make sure the path has no quotes on it - StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName); - PathUnquoteSpacesW(szInitialFile); - - g_pCurrentFile = pBuildFileList(szInitialFile); - if (g_pCurrentFile) - { - pLoadImageFromNode(g_pCurrentFile, hMainWnd); - } + NULL, NULL, g_hInstance, (LPVOID)szFileName); /* Create accelerator table for keystrokes */ hAccel = LoadAcceleratorsW(g_hInstance, MAKEINTRESOURCEW(IDR_ACCELERATOR)); @@ -1064,15 +1108,7 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) /* Destroy accelerator table */ DestroyAcceleratorTable(hAccel); - pFreeFileList(g_pCurrentFile); - - if (g_pImage) - { - GdipDisposeImage(g_pImage); - g_pImage = NULL; - } - - Anime_FreeInfo(&g_Anime); + ImageView_SaveSettings(); GdiplusShutdown(gdiplusToken); @@ -1086,13 +1122,13 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) VOID WINAPI ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { - ImageView_CreateWindow(hwnd, path); + ImageView_Main(hwnd, path); } VOID WINAPI ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { - ImageView_CreateWindow(hwnd, path); + ImageView_Main(hwnd, path); } VOID WINAPI @@ -1102,7 +1138,7 @@ ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) if (MultiByteToWideChar(CP_ACP, 0, path, -1, szFile, _countof(szFile))) { - ImageView_CreateWindow(hwnd, szFile); + ImageView_Main(hwnd, szFile); } } @@ -1132,7 +1168,6 @@ DllMain(IN HINSTANCE hinstDLL, switch (dwReason) { case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: g_hInstance = hinstDLL; break; } diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index f66118acd7c..99a159a4cd1 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -21,6 +21,7 @@ #include <wincon.h> #include <objbase.h> #include <gdiplus.h> +#include <shlwapi.h> #include <strsafe.h> #define NDEBUG @@ -51,7 +52,7 @@ typedef struct tagSHIMGVW_FILENODE struct tagSHIMGVW_FILENODE *Next; } SHIMGVW_FILENODE; -#define WC_SHIMGVW L"ShImgVw:CPreviewWnd" +#define WC_PREVIEW L"ShImgVw:CPreviewWnd" /* Animation */ typedef struct tagANIME @@ -68,8 +69,6 @@ void Anime_FreeInfo(PANIME pAnime); BOOL Anime_LoadInfo(PANIME pAnime); void Anime_SetTimerWnd(PANIME pAnime, HWND hwndTimer); void Anime_SetFrameIndex(PANIME pAnime, UINT nFrameIndex); -DWORD Anime_GetFrameDelay(PANIME pAnime, UINT nFrameIndex); void Anime_Start(PANIME pAnime, DWORD dwDelay); void Anime_Pause(PANIME pAnime); -BOOL Anime_Step(PANIME pAnime, DWORD *pdwDelay); BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs