Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[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

[reactos] 01/01: [SHIMGVW] Split animation code to anime.c (#6144)
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fe0b40ee18be504821f2… commit 0fe0b40ee18be504821f29624987b7df154cb49d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 14:07:46 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 10 14:07:46 2023 +0900 [SHIMGVW] Split animation code to anime.c (#6144) Improve code flexibility. Add anime.c and move animation code to anime.c. CORE-19358 --- dll/win32/shimgvw/CMakeLists.txt | 1 + dll/win32/shimgvw/anime.c | 156 +++++++++++++++++++++++++++++ dll/win32/shimgvw/shimgvw.c | 210 ++++----------------------------------- dll/win32/shimgvw/shimgvw.h | 59 ++++++++++- 4 files changed, 231 insertions(+), 195 deletions(-) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 11df2db4098..3c2f5a1f3c3 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -2,6 +2,7 @@ spec2def(shimgvw.dll shimgvw.spec) list(APPEND SOURCE + anime.c shimgvw.c comsup.c shimgvw.rc diff --git a/dll/win32/shimgvw/anime.c b/dll/win32/shimgvw/anime.c new file mode 100644 index 00000000000..485b509675b --- /dev/null +++ b/dll/win32/shimgvw/anime.c @@ -0,0 +1,156 @@ +/* + * PROJECT: ReactOS Picture and Fax Viewer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Animation of shimgvw.dll + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shimgvw.h" + +#define ANIME_TIMER_ID 9999 + +void Anime_FreeInfo(PANIME pAnime) +{ + if (pAnime->m_pDelayItem) + { + free(pAnime->m_pDelayItem); + pAnime->m_pDelayItem = NULL; + } + pAnime->m_nFrameIndex = 0; + pAnime->m_nFrameCount = 0; + pAnime->m_nLoopIndex = 0; + pAnime->m_nLoopCount = (UINT)-1; +} + +void Anime_SetTimerWnd(PANIME pAnime, HWND hwndTimer) +{ + pAnime->m_hwndTimer = hwndTimer; +} + +void Anime_Pause(PANIME pAnime) +{ + KillTimer(pAnime->m_hwndTimer, ANIME_TIMER_ID); +} + +void Anime_Start(PANIME pAnime, DWORD dwDelay) +{ + if (pAnime->m_pDelayItem) + SetTimer(pAnime->m_hwndTimer, ANIME_TIMER_ID, dwDelay, NULL); +} + +BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam) +{ + DWORD dwDelay; + + if (wParam != ANIME_TIMER_ID) + return FALSE; + + Anime_Pause(pAnime); + if (Anime_Step(pAnime, &dwDelay)) + Anime_Start(pAnime, dwDelay); + return TRUE; +} + +BOOL Anime_LoadInfo(PANIME pAnime) +{ + UINT nDimCount = 0; + UINT cbItem; + UINT result; + + Anime_Pause(pAnime); + Anime_FreeInfo(pAnime); + + if (!g_pImage) + return FALSE; + + GdipImageGetFrameDimensionsCount(g_pImage, &nDimCount); + if (nDimCount) + { + GUID *dims = (GUID *)calloc(nDimCount, sizeof(GUID)); + if (dims) + { + GdipImageGetFrameDimensionsList(g_pImage, dims, nDimCount); + GdipImageGetFrameCount(g_pImage, dims, &result); + pAnime->m_nFrameCount = result; + free(dims); + } + } + + result = 0; + GdipGetPropertyItemSize(g_pImage, PropertyTagFrameDelay, &result); + cbItem = result; + if (cbItem) + { + pAnime->m_pDelayItem = (PropertyItem *)malloc(cbItem); + GdipGetPropertyItem(g_pImage, PropertyTagFrameDelay, cbItem, pAnime->m_pDelayItem); + } + + result = 0; + GdipGetPropertyItemSize(g_pImage, PropertyTagLoopCount, &result); + cbItem = result; + if (cbItem) + { + PropertyItem *pItem = (PropertyItem *)malloc(cbItem); + if (pItem) + { + if (GdipGetPropertyItem(g_pImage, PropertyTagLoopCount, cbItem, pItem) == Ok) + { + pAnime->m_nLoopCount = *(WORD *)pItem->value; + } + free(pItem); + } + } + + Anime_Start(pAnime, 0); + + return pAnime->m_pDelayItem != NULL; +} + +void Anime_SetFrameIndex(PANIME pAnime, UINT nFrameIndex) +{ + if (nFrameIndex < pAnime->m_nFrameCount) + { + GUID guid = FrameDimensionTime; + if (Ok != GdipImageSelectActiveFrame(g_pImage, &guid, nFrameIndex)) + { + guid = FrameDimensionPage; + GdipImageSelectActiveFrame(g_pImage, &guid, 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 7a73eeaccb3..f8915000893 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -1,37 +1,19 @@ /* - * PROJECT: ReactOS Picture and Fax Viewer - * FILE: dll/win32/shimgvw/shimgvw.c - * PURPOSE: shimgvw.dll - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * PROJECT: ReactOS Picture and Fax Viewer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Image file browsing and manipulation + * COPYRIGHT: Copyright Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2018-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define INITGUID - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winreg.h> -#include <wingdi.h> -#include <wincon.h> +#include "shimgvw.h" #include <windowsx.h> -#include <objbase.h> #include <commctrl.h> #include <commdlg.h> -#include <gdiplus.h> #include <shlobj.h> -#include <strsafe.h> #include <shlwapi.h> #include <shellapi.h> -#define NDEBUG -#include <debug.h> - -#include "shimgvw.h" - HINSTANCE g_hInstance; SHIMGVW_SETTINGS g_Settings; SHIMGVW_FILENODE *g_pCurrentFile; @@ -41,6 +23,8 @@ WNDPROC g_fnPrevProc = NULL; HWND g_hDispWnd = NULL; HWND g_hToolBar = NULL; +ANIME g_Anime; /* Animation */ + /* zooming */ static UINT s_nZoomPercents = 100; @@ -109,135 +93,6 @@ static const TB_BUTTON_CONFIG s_ButtonConfig[] = DEFINE_BTN_CONFIG(HELP_TOC) }; -/* animation */ -UINT m_nFrameIndex = 0; -UINT m_nFrameCount = 0; -UINT m_nLoopIndex = 0; -UINT m_nLoopCount = (UINT)-1; -PropertyItem *m_pDelayItem = NULL; - -#define ANIME_TIMER_ID 9999 - -static void Anime_FreeInfo(void) -{ - if (m_pDelayItem) - { - free(m_pDelayItem); - m_pDelayItem = NULL; - } - m_nFrameIndex = 0; - m_nFrameCount = 0; - m_nLoopIndex = 0; - m_nLoopCount = (UINT)-1; -} - -static BOOL Anime_LoadInfo(void) -{ - UINT nDimCount = 0; - UINT cbItem; - UINT result; - - Anime_FreeInfo(); - KillTimer(g_hDispWnd, ANIME_TIMER_ID); - - if (!g_pImage) - return FALSE; - - GdipImageGetFrameDimensionsCount(g_pImage, &nDimCount); - if (nDimCount) - { - GUID *dims = (GUID *)calloc(nDimCount, sizeof(GUID)); - if (dims) - { - GdipImageGetFrameDimensionsList(g_pImage, dims, nDimCount); - GdipImageGetFrameCount(g_pImage, dims, &result); - m_nFrameCount = result; - free(dims); - } - } - - result = 0; - GdipGetPropertyItemSize(g_pImage, PropertyTagFrameDelay, &result); - cbItem = result; - if (cbItem) - { - m_pDelayItem = (PropertyItem *)malloc(cbItem); - GdipGetPropertyItem(g_pImage, PropertyTagFrameDelay, cbItem, m_pDelayItem); - } - - result = 0; - GdipGetPropertyItemSize(g_pImage, PropertyTagLoopCount, &result); - cbItem = result; - if (cbItem) - { - PropertyItem *pItem = (PropertyItem *)malloc(cbItem); - if (pItem) - { - if (GdipGetPropertyItem(g_pImage, PropertyTagLoopCount, cbItem, pItem) == Ok) - { - m_nLoopCount = *(WORD *)pItem->value; - } - free(pItem); - } - } - - if (m_pDelayItem) - { - SetTimer(g_hDispWnd, ANIME_TIMER_ID, 0, NULL); - } - - return m_pDelayItem != NULL; -} - -static void Anime_SetFrameIndex(UINT nFrameIndex) -{ - if (nFrameIndex < m_nFrameCount) - { - GUID guid = FrameDimensionTime; - if (Ok != GdipImageSelectActiveFrame(g_pImage, &guid, nFrameIndex)) - { - guid = FrameDimensionPage; - GdipImageSelectActiveFrame(g_pImage, &guid, nFrameIndex); - } - } - m_nFrameIndex = nFrameIndex; -} - -DWORD Anime_GetFrameDelay(UINT nFrameIndex) -{ - if (nFrameIndex < m_nFrameCount && m_pDelayItem) - { - return ((DWORD *)m_pDelayItem->value)[m_nFrameIndex] * 10; - } - return 0; -} - -BOOL Anime_Step(DWORD *pdwDelay) -{ - *pdwDelay = INFINITE; - if (m_nLoopCount == (UINT)-1) - return FALSE; - - if (m_nFrameIndex + 1 < m_nFrameCount) - { - *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); - Anime_SetFrameIndex(m_nFrameIndex); - ++m_nFrameIndex; - return TRUE; - } - - if (m_nLoopCount == 0 || m_nLoopIndex < m_nLoopCount) - { - *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); - Anime_SetFrameIndex(m_nFrameIndex); - m_nFrameIndex = 0; - ++m_nLoopIndex; - return TRUE; - } - - return FALSE; -} - static void UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; @@ -356,7 +211,8 @@ static void pLoadImage(LPCWSTR szOpenFileName) DPRINT1("GdipLoadImageFromFile() failed\n"); return; } - Anime_LoadInfo(); + + Anime_LoadInfo(&g_Anime); if (szOpenFileName && szOpenFileName[0]) SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); @@ -447,27 +303,14 @@ static void pSaveImageAs(HWND hwnd) if (GetSaveFileNameW(&sfn)) { - if (m_pDelayItem) - { - /* save animation */ - KillTimer(g_hDispWnd, ANIME_TIMER_ID); - - DPRINT1("FIXME: save animation\n"); - if (GdipSaveImageToFile(g_pImage, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) - { - DPRINT1("GdipSaveImageToFile() failed\n"); - } + Anime_Pause(&g_Anime); - SetTimer(g_hDispWnd, ANIME_TIMER_ID, 0, NULL); - } - else + if (GdipSaveImageToFile(g_pImage, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) { - /* save non-animation */ - if (GdipSaveImageToFile(g_pImage, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) - { - DPRINT1("GdipSaveImageToFile() failed\n"); - } + DPRINT1("GdipSaveImageToFile() failed\n"); } + + Anime_Start(&g_Anime, 0); } free(szFilterMask); @@ -894,19 +737,6 @@ ImageView_CreateToolBar(HWND hwnd) return FALSE; } -static void ImageView_OnTimer(HWND hwnd) -{ - DWORD dwDelay; - - KillTimer(hwnd, ANIME_TIMER_ID); - InvalidateRect(hwnd, NULL, FALSE); - - if (Anime_Step(&dwDelay)) - { - SetTimer(hwnd, ANIME_TIMER_ID, dwDelay, NULL); - } -} - LRESULT CALLBACK ImageView_DispWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -919,11 +749,8 @@ ImageView_DispWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_TIMER: { - if (wParam == ANIME_TIMER_ID) - { - ImageView_OnTimer(hwnd); - return 0; - } + if (Anime_OnTimer(&g_Anime, wParam)) + InvalidateRect(hwnd, NULL, FALSE); break; } } @@ -941,6 +768,7 @@ ImageView_InitControls(HWND hwnd) g_fnPrevProc = (WNDPROC) SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM) ImageView_DispWndProc); ImageView_CreateToolBar(hwnd); + Anime_SetTimerWnd(&g_Anime, g_hDispWnd); } static VOID @@ -1244,7 +1072,7 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) g_pImage = NULL; } - Anime_FreeInfo(); + Anime_FreeInfo(&g_Anime); GdiplusShutdown(gdiplusToken); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 76aa255856f..f66118acd7c 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -1,9 +1,39 @@ +/* + * PROJECT: ReactOS Picture and Fax Viewer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Image file browsing and manipulation + * COPYRIGHT: Copyright Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2018-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define INITGUID + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <winreg.h> +#include <wingdi.h> +#include <wincon.h> +#include <objbase.h> +#include <gdiplus.h> +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + #include "resource.h" #define TB_IMAGE_WIDTH 16 #define TB_IMAGE_HEIGHT 16 -extern HINSTANCE hInstance; +extern HINSTANCE g_hInstance; +extern HWND g_hDispWnd; +extern GpImage *g_pImage; typedef struct { @@ -14,11 +44,32 @@ typedef struct INT Height; } SHIMGVW_SETTINGS; -typedef struct SHIMGVW_FILENODE_INTERNAL +typedef struct tagSHIMGVW_FILENODE { WCHAR FileName[MAX_PATH]; - struct SHIMGVW_FILENODE_INTERNAL *Prev; - struct SHIMGVW_FILENODE_INTERNAL *Next; + struct tagSHIMGVW_FILENODE *Prev; + struct tagSHIMGVW_FILENODE *Next; } SHIMGVW_FILENODE; #define WC_SHIMGVW L"ShImgVw:CPreviewWnd" + +/* Animation */ +typedef struct tagANIME +{ + UINT m_nFrameIndex; + UINT m_nFrameCount; + UINT m_nLoopIndex; + UINT m_nLoopCount; + PropertyItem *m_pDelayItem; + HWND m_hwndTimer; +} ANIME, *PANIME; + +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

[reactos] 01/01: [SHIMGVW] Some minor refactoring (#6139)
by Katayama Hirofumi MZ 09 Dec '23

09 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a2c451696b0fdefe4b63… commit 5a2c451696b0fdefe4b6381f4941b9347ae4199c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 08:20:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 10 08:20:17 2023 +0900 [SHIMGVW] Some minor refactoring (#6139) Improve human readability. Reduce code amount. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 296 +++++++++++++++++++------------------------- 1 file changed, 128 insertions(+), 168 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 86dec69785b..7a73eeaccb3 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -11,8 +11,6 @@ #define COM_NO_WINDOWS_H #define INITGUID -#include <stdarg.h> - #include <windef.h> #include <winbase.h> #include <winnls.h> @@ -24,7 +22,6 @@ #include <commctrl.h> #include <commdlg.h> #include <gdiplus.h> -#include <tchar.h> #include <shlobj.h> #include <strsafe.h> #include <shlwapi.h> @@ -66,7 +63,7 @@ typedef struct { { TBICON_##_name, IDC_##_name, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } #define DEFINE_BTN_SEPARATOR \ - { 15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 } + { -1, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 } /* ToolBar Buttons */ static const TBBUTTON s_Buttons[] = @@ -136,11 +133,9 @@ static void Anime_FreeInfo(void) static BOOL Anime_LoadInfo(void) { - GUID *dims; UINT nDimCount = 0; UINT cbItem; UINT result; - PropertyItem *pItem; Anime_FreeInfo(); KillTimer(g_hDispWnd, ANIME_TIMER_ID); @@ -151,7 +146,7 @@ static BOOL Anime_LoadInfo(void) GdipImageGetFrameDimensionsCount(g_pImage, &nDimCount); if (nDimCount) { - dims = (GUID *)calloc(nDimCount, sizeof(GUID)); + GUID *dims = (GUID *)calloc(nDimCount, sizeof(GUID)); if (dims) { GdipImageGetFrameDimensionsList(g_pImage, dims, nDimCount); @@ -175,7 +170,7 @@ static BOOL Anime_LoadInfo(void) cbItem = result; if (cbItem) { - pItem = (PropertyItem *)malloc(cbItem); + PropertyItem *pItem = (PropertyItem *)malloc(cbItem); if (pItem) { if (GdipGetPropertyItem(g_pImage, PropertyTagLoopCount, cbItem, pItem) == Ok) @@ -254,27 +249,17 @@ static void UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) s_nZoomPercents = NewZoom; /* Check if a zoom button of the toolbar must be grayed */ - bEnableZoomIn = bEnableZoomOut = TRUE; + bEnableZoomIn = (NewZoom < MAX_ZOOM); + bEnableZoomOut = (NewZoom > MIN_ZOOM); - if (NewZoom >= MAX_ZOOM) - { - bEnableZoomIn = FALSE; - } - else if (NewZoom <= MIN_ZOOM) - { - bEnableZoomOut = FALSE; - } - - /* Update the state of the zoom buttons */ + /* 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); /* Redraw the display window */ InvalidateRect(g_hDispWnd, NULL, FALSE); - - /* Update toolbar buttons */ - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); } static void ZoomInOrOut(BOOL bZoomIn) @@ -292,10 +277,7 @@ static void ZoomInOrOut(BOOL bZoomIn) if (s_nZoomPercents < s_ZoomSteps[i]) break; } - if (i == _countof(s_ZoomSteps)) - NewZoom = MAX_ZOOM; - else - NewZoom = s_ZoomSteps[i]; + NewZoom = ((i >= _countof(s_ZoomSteps)) ? MAX_ZOOM : s_ZoomSteps[i]); } else /* zoom out */ { @@ -306,10 +288,7 @@ static void ZoomInOrOut(BOOL bZoomIn) if (s_ZoomSteps[i] < s_nZoomPercents) break; } - if (i < 0) - NewZoom = MIN_ZOOM; - else - NewZoom = s_ZoomSteps[i]; + NewZoom = ((i < 0) ? MIN_ZOOM : s_ZoomSteps[i]); } /* Update toolbar and refresh screen */ @@ -534,8 +513,7 @@ pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) pchFileTitle = PathFindFileNameW(node->FileName); if (pchFileTitle && *pchFileTitle) { - StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), - L"%ls%ls%ls", szResStr, L" - ", pchFileTitle); + StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls - %ls", szResStr, pchFileTitle); SetWindowTextW(hwnd, szTitleBuf); } else @@ -607,7 +585,7 @@ pBuildFileList(LPWSTR szFirstFile) // compare the name of the requested file with the one currently found. // if the name matches, the current node is returned by the function. - if (wcscmp(szFirstFile, conductor->FileName) == 0) + if (_wcsicmp(szFirstFile, conductor->FileName) == 0) { currentNode = conductor; } @@ -681,13 +659,6 @@ pFreeFileList(SHIMGVW_FILENODE *root) } } -static VOID -ImageView_UpdateWindow(HWND hwnd) -{ - InvalidateRect(hwnd, NULL, FALSE); - UpdateWindow(hwnd); -} - static HBRUSH CreateCheckerBoardBrush(HDC hdc) { static const CHAR pattern[] = @@ -823,28 +794,41 @@ ImageView_DrawImage(HWND hwnd) EndPaint(hwnd, &ps); } -static BOOL -ImageView_LoadSettings(VOID) +static VOID +ImageView_ResetSettings(VOID) { - HKEY hKey; - DWORD dwSize; - LONG nError; - g_Settings.Maximized = FALSE; g_Settings.X = CW_USEDEFAULT; g_Settings.Y = CW_USEDEFAULT; g_Settings.Width = 520; g_Settings.Height = 400; +} + +static BOOL +ImageView_LoadSettings(VOID) +{ + HKEY hKey; + DWORD dwSize; + LSTATUS nError; nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey); - if (nError) + 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); - return !nError; + if (nError != ERROR_SUCCESS || dwSize != sizeof(g_Settings)) + { + ImageView_ResetSettings(); + return FALSE; + } + + return TRUE; } static VOID @@ -853,6 +837,7 @@ ImageView_SaveSettings(HWND hwnd) WINDOWPLACEMENT wp; HKEY hKey; RECT *prc; + LSTATUS nError; wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wp); @@ -864,12 +849,13 @@ ImageView_SaveSettings(HWND hwnd) g_Settings.Height = prc->bottom - prc->top; g_Settings.Maximized = IsZoomed(hwnd); - if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) - { - RegSetValueEx(hKey, _T("Settings"), 0, REG_BINARY, (LPBYTE)&g_Settings, sizeof(SHIMGVW_SETTINGS)); - RegCloseKey(hKey); - } + nError = RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", + 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL); + if (nError != ERROR_SUCCESS) + return; + + RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&g_Settings, sizeof(g_Settings)); + RegCloseKey(hKey); } static BOOL @@ -883,14 +869,13 @@ ImageView_CreateToolBar(HWND hwnd) { HIMAGELIST hImageList; - SendMessageW(g_hToolBar, TB_SETEXTENDEDSTYLE, - 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + SendMessageW(g_hToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); - SendMessageW(g_hToolBar, TB_BUTTONSTRUCTSIZE, - sizeof(s_Buttons[0]), 0); + SendMessageW(g_hToolBar, TB_BUTTONSTRUCTSIZE, sizeof(s_Buttons[0]), 0); hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); - if (hImageList == NULL) return FALSE; + if (hImageList == NULL) + return FALSE; for (UINT n = 0; n < _countof(s_ButtonConfig); n++) { @@ -923,9 +908,9 @@ static void ImageView_OnTimer(HWND hwnd) } LRESULT CALLBACK -ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +ImageView_DispWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch (Message) + switch (uMsg) { case WM_PAINT: { @@ -942,7 +927,7 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) break; } } - return CallWindowProcW(g_fnPrevProc, hwnd, Message, wParam, lParam); + return CallWindowProcW(g_fnPrevProc, hwnd, uMsg, wParam, lParam); } static VOID @@ -979,25 +964,15 @@ ImageView_OnSize(HWND hwnd, UINT state, INT cx, INT cy) MoveWindow(g_hDispWnd, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); - /* is it maximized or restored? */ - if (state == SIZE_MAXIMIZED || state == SIZE_RESTORED) - { - /* reset zoom */ + if (!IsIconic(hwnd)) /* Is it not minimized? */ ResetZoom(); - } } -static LRESULT +static VOID ImageView_Delete(HWND hwnd) { WCHAR szCurFile[MAX_PATH + 1], szNextFile[MAX_PATH]; - SHFILEOPSTRUCT FileOp = { hwnd, FO_DELETE }; - - if (g_pImage) - { - GdipDisposeImage(g_pImage); - g_pImage = NULL; - } + SHFILEOPSTRUCTW FileOp = { hwnd, FO_DELETE }; /* FileOp.pFrom must be double-null-terminated */ GetFullPathNameW(g_pCurrentFile->FileName, _countof(szCurFile) - 1, szCurFile, NULL); @@ -1007,71 +982,59 @@ ImageView_Delete(HWND hwnd) GetFullPathNameW(g_pCurrentFile->Next->FileName, _countof(szNextFile), szNextFile, NULL); szNextFile[_countof(szNextFile) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + /* FIXME: Our GdipLoadImageFromFile locks the image file */ + if (g_pImage) + { + GdipDisposeImage(g_pImage); + g_pImage = NULL; + } + + /* Confirm file deletion and delete if allowed */ FileOp.pFrom = szCurFile; FileOp.fFlags = FOF_ALLOWUNDO; - if (SHFileOperation(&FileOp) != 0) - return 0; + if (SHFileOperationW(&FileOp) != 0) + { + DPRINT("ImageView_Delete: SHFileOperationW() failed or canceled\n"); - pFreeFileList(g_pCurrentFile); - g_pCurrentFile = NULL; + pLoadImage(szCurFile); + return; + } + /* Reload the file list and go next file */ + pFreeFileList(g_pCurrentFile); g_pCurrentFile = pBuildFileList(szNextFile); pLoadImageFromNode(g_pCurrentFile, hwnd); - - return 1; } -static LRESULT +static VOID ImageView_Modify(HWND hwnd) { - int nChars = GetFullPathNameW(g_pCurrentFile->FileName, 0, NULL, NULL); - LPWSTR pszPathName; + WCHAR szPathName[MAX_PATH]; SHELLEXECUTEINFOW sei; - if (!nChars) - { - DPRINT1("ImageView_Modify: failed to get full path name.\n"); - return 1; - } - - pszPathName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, nChars * sizeof(WCHAR)); - if (pszPathName == NULL) - { - DPRINT1("HeapAlloc() failed in ImageView_Modify()\n"); - return 1; - } - - GetFullPathNameW(g_pCurrentFile->FileName, nChars, pszPathName, NULL); + GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL); + szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.fMask = 0; - sei.hwnd = NULL; sei.lpVerb = L"edit"; - sei.lpFile = pszPathName; - sei.lpParameters = NULL; - sei.lpDirectory = NULL; + sei.lpFile = szPathName; sei.nShow = SW_SHOWNORMAL; - sei.hInstApp = NULL; - if (!ShellExecuteExW(&sei)) { - DPRINT1("ImageView_Modify: ShellExecuteExW() failed with code %08X\n", (int)GetLastError()); + DPRINT1("ImageView_Modify: ShellExecuteExW() failed with code %ld\n", GetLastError()); } - - HeapFree(GetProcessHeap(), 0, pszPathName); - - return 0; } LRESULT CALLBACK -ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +ImageView_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch (Message) + switch (uMsg) { case WM_CREATE: { ImageView_InitControls(hwnd); - return 0L; + break; } case WM_COMMAND: @@ -1094,7 +1057,7 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case IDC_REAL_SIZE: UpdateZoom(100, TRUE, FALSE); - return 0; + break; case IDC_SLIDE_SHOW: DPRINT1("IDC_SLIDE_SHOW unimplemented\n"); @@ -1120,7 +1083,7 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate270FlipNone); - ImageView_UpdateWindow(hwnd); + InvalidateRect(hwnd, NULL, FALSE); } break; @@ -1128,23 +1091,24 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate90FlipNone); - ImageView_UpdateWindow(hwnd); + InvalidateRect(hwnd, NULL, FALSE); } break; case IDC_DELETE: - return ImageView_Delete(hwnd); + ImageView_Delete(hwnd); + break; case IDC_MODIFY: - return ImageView_Modify(hwnd); + ImageView_Modify(hwnd); + break; } } break; case WM_MOUSEWHEEL: - ImageView_OnMouseWheel(hwnd, - GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); + ImageView_OnMouseWheel(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), + (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); break; case WM_NOTIFY: @@ -1153,15 +1117,12 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) switch (pnmhdr->code) { - case TTN_GETDISPINFO: + case TTN_GETDISPINFOW: { - LPTOOLTIPTEXTW lpttt; - - lpttt = (LPTOOLTIPTEXTW)lParam; + LPTOOLTIPTEXTW lpttt = (LPTOOLTIPTEXTW)lParam; lpttt->hinst = g_hInstance; - lpttt->lpszText = MAKEINTRESOURCEW(s_ButtonConfig[lpttt->hdr.idFrom - IDC_TOOL_BASE].ids); - return 0; + break; } } break; @@ -1171,12 +1132,12 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) MINMAXINFO *pMMI = (MINMAXINFO*)lParam; pMMI->ptMinTrackSize.x = 350; pMMI->ptMinTrackSize.y = 290; - return 0; + break; } case WM_SIZE: { ImageView_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); - return 0; + break; } case WM_DESTROY: { @@ -1185,9 +1146,13 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) PostQuitMessage(0); break; } + default: + { + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } } - return DefWindowProcW(hwnd, Message, wParam, lParam); + return 0; } LONG WINAPI @@ -1196,34 +1161,30 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; WNDCLASSW WndClass = {0}; - WCHAR szBuf[512]; + WCHAR szBuf[256]; WCHAR szInitialFile[MAX_PATH]; HWND hMainWnd; MSG msg; - HACCEL hKbdAccel; - HRESULT hComRes; + HACCEL hAccel; + HRESULT hrCoInit; INITCOMMONCONTROLSEX Icc = { .dwSize = sizeof(Icc), .dwICC = ICC_WIN95_CLASSES }; InitCommonControlsEx(&Icc); - hComRes = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); - if (hComRes != S_OK && hComRes != S_FALSE) - { - DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hComRes); - } + /* Initialize COM */ + hrCoInit = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + if (FAILED(hrCoInit)) + DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hrCoInit); ImageView_LoadSettings(); - // Initialize GDI+ - gdiplusStartupInput.GdiplusVersion = 1; - gdiplusStartupInput.DebugEventCallback = NULL; - gdiplusStartupInput.SuppressBackgroundThread = FALSE; - gdiplusStartupInput.SuppressExternalCodecs = FALSE; - + /* Initialize GDI+ */ + ZeroMemory(&gdiplusStartupInput, sizeof(gdiplusStartupInput)); + gdiplusStartupInput.GdiplusVersion = 1; GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); pLoadImage(szFileName); - // Create the window + /* Register window classes */ WndClass.lpszClassName = WC_SHIMGVW; WndClass.lpfnWndProc = ImageView_WndProc; WndClass.hInstance = g_hInstance; @@ -1231,17 +1192,15 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) WndClass.hIcon = LoadIconW(g_hInstance, MAKEINTRESOURCEW(IDI_APP_ICON)); WndClass.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); WndClass.hbrBackground = NULL; /* less flicker */ + if (!RegisterClassW(&WndClass)) + return -1; - if (!RegisterClassW(&WndClass)) return -1; - + /* Create the main window */ LoadStringW(g_hInstance, IDS_APPTITLE, szBuf, _countof(szBuf)); hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf, - WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS, - g_Settings.X, g_Settings.Y, - g_Settings.Width, g_Settings.Height, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, + g_Settings.X, g_Settings.Y, g_Settings.Width, g_Settings.Height, NULL, NULL, g_hInstance, NULL); - if (g_Settings.Maximized) - ShowWindow(hMainWnd, SW_MAXIMIZE); // make sure the path has no quotes on it StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName); @@ -1254,27 +1213,28 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) } /* Create accelerator table for keystrokes */ - hKbdAccel = LoadAcceleratorsW(g_hInstance, MAKEINTRESOURCEW(IDR_ACCELERATOR)); + hAccel = LoadAcceleratorsW(g_hInstance, MAKEINTRESOURCEW(IDR_ACCELERATOR)); + + /* Show the main window now */ + if (g_Settings.Maximized) + ShowWindow(hMainWnd, SW_SHOWMAXIMIZED); + else + ShowWindow(hMainWnd, SW_SHOWNORMAL); - // Show it - ShowWindow(hMainWnd, SW_SHOW); UpdateWindow(hMainWnd); - // Message Loop - for (;;) + /* Message Loop */ + while (GetMessageW(&msg, NULL, 0, 0) > 0) { - if (GetMessageW(&msg, NULL, 0, 0) <= 0) - break; + if (TranslateAcceleratorW(hMainWnd, hAccel, &msg)) + continue; - if (!TranslateAcceleratorW(hMainWnd, hKbdAccel, &msg)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } + TranslateMessage(&msg); + DispatchMessageW(&msg); } /* Destroy accelerator table */ - DestroyAcceleratorTable(hKbdAccel); + DestroyAcceleratorTable(hAccel); pFreeFileList(g_pCurrentFile); @@ -1289,10 +1249,10 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) GdiplusShutdown(gdiplusToken); /* Release COM resources */ - if (SUCCEEDED(hComRes)) + if (SUCCEEDED(hrCoInit)) CoUninitialize(); - return -1; + return 0; } VOID WINAPI

1 0

[reactos] 01/01: [ICCVID][MSRLE32][MSVIDC32] Add VfW codecs version info (#6118)
by Katayama Hirofumi MZ 09 Dec '23

09 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8be912147bbb9a2f9b876… commit 8be912147bbb9a2f9b8763b7fdaffcd4aabfaa96 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 10 06:50:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 10 06:50:58 2023 +0900 [ICCVID][MSRLE32][MSVIDC32] Add VfW codecs version info (#6118) Based on KRosUser's vfw.patch. CORE-15382 --- dll/win32/iccvid/rsrc.rc | 8 ++++++++ dll/win32/msrle32/rsrc.rc | 7 +++++++ dll/win32/msvidc32/msvideo1.c | 4 ++++ dll/win32/msvidc32/rsrc.rc | 8 ++++++++ 4 files changed, 27 insertions(+) diff --git a/dll/win32/iccvid/rsrc.rc b/dll/win32/iccvid/rsrc.rc index 16fe66f4362..f35f90314b8 100644 --- a/dll/win32/iccvid/rsrc.rc +++ b/dll/win32/iccvid/rsrc.rc @@ -20,6 +20,14 @@ #include "iccvid_private.h" +#ifdef __REACTOS__ + #define REACTOS_VERSION_DLL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Cinepak Compressor" + #define REACTOS_STR_INTERNAL_NAME "iccvid" + #define REACTOS_STR_ORIGINAL_FILENAME "iccvid.dll" + #include <reactos/version.rc> +#endif + /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msrle32/rsrc.rc b/dll/win32/msrle32/rsrc.rc index ffe58176206..3cbbd561ae8 100644 --- a/dll/win32/msrle32/rsrc.rc +++ b/dll/win32/msrle32/rsrc.rc @@ -20,6 +20,13 @@ #include "msrle_private.h" +#ifdef __REACTOS__ + #define REACTOS_VERSION_DLL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS RLE Compressor" + #define REACTOS_STR_INTERNAL_NAME "msrle32" + #define REACTOS_STR_ORIGINAL_FILENAME "msrle32.dll" + #include <reactos/version.rc> +#endif /* * Everything specific to any language goes diff --git a/dll/win32/msvidc32/msvideo1.c b/dll/win32/msvidc32/msvideo1.c index 7b866d04caf..578630a39b0 100644 --- a/dll/win32/msvidc32/msvideo1.c +++ b/dll/win32/msvidc32/msvideo1.c @@ -583,7 +583,11 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, if( info ) { memset( info, 0, sizeof *info ); +#ifdef __REACTOS__ + info->dwMagic = MSVC_MAGIC; +#else info->dwMagic = CRAM_MAGIC; +#endif } r = (LRESULT) info; break; diff --git a/dll/win32/msvidc32/rsrc.rc b/dll/win32/msvidc32/rsrc.rc index e07a7715861..2c82db75450 100644 --- a/dll/win32/msvidc32/rsrc.rc +++ b/dll/win32/msvidc32/rsrc.rc @@ -18,6 +18,14 @@ #include "msvidc32_private.h" +#ifdef __REACTOS__ + #define REACTOS_VERSION_DLL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Video 1 Compressor" + #define REACTOS_STR_INTERNAL_NAME "msvidc32" + #define REACTOS_STR_ORIGINAL_FILENAME "msvidc32.dll" + #include <reactos/version.rc> +#endif + /* UTF-8 */ #pragma code_page(65001)

1 0

[reactos] 01/01: [MAIN] Update Romanian (ro-RO) translation (#6013)
by Andrei Miloiu 09 Dec '23

09 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=623e857a43aa9e9404b87… commit 623e857a43aa9e9404b879e6e766167a42272f88 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Dec 9 21:24:42 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 9 20:24:42 2023 +0100 [MAIN] Update Romanian (ro-RO) translation (#6013) --- dll/cpl/main/lang/ro-RO.rc | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc index 6d53e33f3f5..da250d778de 100644 --- a/dll/cpl/main/lang/ro-RO.rc +++ b/dll/cpl/main/lang/ro-RO.rc @@ -1,6 +1,10 @@ /* - * Translators: Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Main Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -59,17 +63,17 @@ BEGIN GROUPBOX "Configurație butoane", -1, 5, 5, 236, 70 CHECKBOX "&Comută funcția butoanelor primar și secundar", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 159, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE - LTEXT "Bifați pentru interschimbarea funcției butoanelor principale ale șoricelului. Astfel butonul drept va fi cel folosit pentru selectare sau agățare și trasare.", -1, 10, 32, 156, 36 + LTEXT "Bifați pentru interschimbarea funcției butoanelor principale ale mouse-ului. Astfel butonul drept va fi cel folosit pentru selectare sau agățare și trasare.", -1, 10, 32, 156, 36 GROUPBOX "Viteza pentru dublu-clic", -1, 5, 78, 236, 70 - LTEXT "Executați dublu-clic pe dosarul mostră pentru a testa. Dacă dosarul nu reacționează, ajustați viteza pentru o execuție mai lentă.", -1, 10, 90, 156, 28 + LTEXT "Dați dublu clic pe dosar pentru a vă testa setările. Dacă dosarul nu se deschide sau nu se închide, încercați să folosiți o setare mai lentă.", -1, 10, 90, 156, 28 LTEXT "&Viteză: Mică", -1, 10, 123, 50, 10 LTEXT "Mare", -1, 136, 123, 24, 10 CONTROL "", IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE - GROUPBOX "ImobilizareClic", -1, 5, 150, 236, 70 - CHECKBOX "Doresc folosirea de I&mobilizareClic", IDC_CHECK_CLICK_LOCK, 10, 160, 150, 20 - PUSHBUTTON "&Parametri…", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14 - LTEXT "Această funcționalitate vă permite activarea sau trasarea elementelor fără a ține apăsat încontinuu butonul de șoricel. Pentru a activa/dezactiva, mențineți un pic apăsat butonul de șoricel.", -1, 10, 180, 224, 30 + GROUPBOX "Blocatorul de clicuri", -1, 5, 150, 236, 70 + CHECKBOX "Pornește blocatorul de clicuri", IDC_CHECK_CLICK_LOCK, 10, 160, 150, 20 + PUSHBUTTON "&Setări…", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14 + LTEXT "Această funcționalitate vă permite activarea sau trasarea elementelor fără a ține apăsat încontinuu butonul de mouse. Pentru a o activa/dezactiva, mențineți un pic apăsat butonul de mouse.", -1, 10, 180, 224, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -79,7 +83,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Colecție", -1, 5, 5, 181, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 12, 15, 167, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Păstrare…", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14 + PUSHBUTTON "&Salvează ca…", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14 PUSHBUTTON "Șt&erge", IDC_BUTTON_DELETE_SCHEME, 128, 31, 50, 14 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Pa&rticularizare", -1, 5, 57, 70, 10 @@ -91,10 +95,10 @@ END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU -CAPTION "Păstrare colecție" +CAPTION "Salvează schema" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Păstrează această colecție de indicatoare sub numele:", -1, 5, 5, 181, 10 + LTEXT "Salvează această schemă de indicatoare sub numele:", -1, 5, 5, 181, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "Con&firmă", IDOK, 63, 35, 60, 14 PUSHBUTTON "A&nulează", IDCANCEL, 126, 35, 60, 14 @@ -145,10 +149,10 @@ END STRINGTABLE BEGIN - IDS_CPLNAME_1 "Șoricel" - IDS_CPLDESCRIPTION_1 "Ajustarea opțiunilor pentru șoricel" + IDS_CPLNAME_1 "Mouse" + IDS_CPLDESCRIPTION_1 "Schimbarea setărilor mouse-ului" IDS_CPLNAME_2 "Tastatură" - IDS_CPLDESCRIPTION_2 "Ajustarea opțiunilor pentru tastatură" + IDS_CPLDESCRIPTION_2 "Schimbarea setărilor tastaturii" IDS_ARROW "Selectare normală" IDS_HELP "Selectare pentru informații" IDS_APPSTARTING "Lucru în fundal" @@ -167,7 +171,7 @@ BEGIN IDS_NONE "(nespecificată)" IDS_SYSTEM_SCHEME "(de sistem)" IDS_BROWSE_FILTER "Indicatoare (*.ani, *.cur)\0*.ani;*.cur\0Indicatoare animate (*.ani)\0*.ani\0Indicatoare statice (*.cur)\0*.cur\0Orice fișier (*.*)\0*.*\0\0" - IDS_BROWSE_TITLE "Căutare indicatoare de șoricel" + IDS_BROWSE_TITLE "Căutare indicatoare de mouse" IDS_REMOVE_TITLE "Confirmare eliminare colecție" IDS_REMOVE_TEXT "Sigur doriți eliminarea colecției „%s”?" IDS_OVERWRITE_TITLE "Confirmare suprascre colecție"

1 0

[reactos] 01/01: [MYEVENTPROVIDER_DLL][MC] Update Romanian (ro-RO) translation to message table (#6075)
by Andrei Miloiu 09 Dec '23

09 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63276e634399945f9df19… commit 63276e634399945f9df190fbaa0e3e816595e168 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Dec 9 21:23:30 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 9 20:23:30 2023 +0100 [MYEVENTPROVIDER_DLL][MC] Update Romanian (ro-RO) translation to message table (#6075) --- sdk/include/reactos/mc/neteventmsg.mc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/mc/neteventmsg.mc b/sdk/include/reactos/mc/neteventmsg.mc index fadab344935..a7cfd5d508f 100644 --- a/sdk/include/reactos/mc/neteventmsg.mc +++ b/sdk/include/reactos/mc/neteventmsg.mc @@ -133,7 +133,7 @@ Language=Polish Pakiet sterownika otrzymany z podsystemu wejścia/wyjścia jest niepoprawny. Przedstawione dane to otrzymany pakiet. . Language=Romanian -Un pachet al modulului pilot primit de la subsistemul de In/Ex a fost nevalid. Datele sunt pachetul însuși. +Un pachet al driverului primit de la subsistemul de In/Ex a fost nevalid. Datele sunt pachetul însuși. . MessageId=6005 @@ -327,7 +327,7 @@ Language=Polish Próbowano załadować sterownik jednoprocesorowy na komputerze wieloprocesorowym. Nie można załadować sterownika. . Language=Romanian -Un modul pilot specific unui uniprocesor a fost încărcat într-un sistem de tip multiprocesor. Modulul pilot nu a putut fi încărcat. +Un driver specific unui uniprocesor a fost încărcat într-un sistem de tip multiprocesor. Driverul nu a putut fi încărcat. . @@ -632,7 +632,7 @@ Language=Polish Sterowniki startu rozruchowego oraz systemowego (%1) nie mogą zależeć od usługi. . Language=Romanian -Modulul pilot de pornire a inițializării sau al sistemului (%1) nu trebuie să depindă de un serviciu. +Driverul de pornire a inițializării sau al sistemului (%1) nu trebuie să depindă de un serviciu. . MessageId=7016 @@ -832,7 +832,7 @@ Language=Polish Przynajmniej jedna usługa lub jeden sterownik nie dały się uruchomić podczas uruchamiania systemu. Użyj Podglądu zdarzeń, aby znaleźć szczegółowe informacje w dzienniku zdarzeń. . Language=Romanian -Cel puțin un serviciu sau un modul pilot a eșuat, în timpul pornirii sistemului. Folosiți Vizualizatorul de evenimente pentru a examina jurnalul pentru detalii. +Cel puțin un serviciu sau un driver a eșuat, în timpul pornirii sistemului. Folosiți Vizualizatorul de evenimente pentru a examina jurnalul pentru detalii. . MessageId=7026 @@ -852,7 +852,7 @@ Language=Polish Nie można załadować następujących sterowników startu rozruchowego lub systemowego: %1 . Language=Romanian -Următorul(oarele) modul(e) pilot de pornire sau de pornire a sistemului nu a(u)putut fi încărcat(e): %1 +Următorul(oarele) driver(e) de pornire pentru inițializare sau de pornire a sistemului nu a(u) putut fi încărcat(e): %1 . MessageId=7027

1 0

[reactos] 01/01: [LSASRV] Update Romanian (ro-RO) translation (#6078)
by Andrei Miloiu 09 Dec '23

09 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c2e1c182efd6a8c74b93… commit 3c2e1c182efd6a8c74b93b35fec3d8cdcf2cda65 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Dec 9 21:23:03 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 9 20:23:03 2023 +0100 [LSASRV] Update Romanian (ro-RO) translation (#6078) --- dll/win32/lsasrv/lang/ro-RO.rc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dll/win32/lsasrv/lang/ro-RO.rc b/dll/win32/lsasrv/lang/ro-RO.rc index 18cbe40abfb..1945ad8bd22 100644 --- a/dll/win32/lsasrv/lang/ro-RO.rc +++ b/dll/win32/lsasrv/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -55,7 +61,7 @@ BEGIN IDS_TCB_PRIVILEGE "Figurează ca parte a sistemului de operare" IDS_SECURITY_PRIVILEGE "Gestionează audit și jurnal de securitate" IDS_TAKE_OWNERSHIP_PRIVILEGE "Preia posesia de fișiere sau de alte obiecte" - IDS_LOAD_DRIVER_PRIVILEGE "Încarcă sau descarcă modulele-pilot pentru dispozitive" + IDS_LOAD_DRIVER_PRIVILEGE "Încarcă sau descarcă driverele pentru dispozitive" IDS_SYSTEM_PROFILE_PRIVILEGE "Profilează performanța sistemului" IDS_SYSTEMTIME_PRIVILEGE "Modifică timpul de sistem" IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profilează un singur proces"

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023