Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32][SHELL32_APITEST] Implement SHCreateFileDataObject
by Mark Jansen 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d59f5ae2a5d0b6fc33e58… commit d59f5ae2a5d0b6fc33e58963023eab42d20e6fe7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Nov 15 20:37:09 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 31 21:27:30 2021 +0100 [SHELL32][SHELL32_APITEST] Implement SHCreateFileDataObject --- dll/win32/shell32/CIDLDataObj.cpp | 12 ++++++++ dll/win32/shell32/shell32.spec | 2 +- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../apitests/shell32/SHCreateDataObject.cpp | 2 +- ...teDataObject.cpp => SHCreateFileDataObject.cpp} | 32 ++++++++++++---------- modules/rostests/apitests/shell32/testlist.c | 2 ++ sdk/include/reactos/shlobj_undoc.h | 1 + 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/CIDLDataObj.cpp b/dll/win32/shell32/CIDLDataObj.cpp index 0559402cc6d..bbbd959528e 100644 --- a/dll/win32/shell32/CIDLDataObj.cpp +++ b/dll/win32/shell32/CIDLDataObj.cpp @@ -400,3 +400,15 @@ HRESULT WINAPI SHCreateDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIT } return E_FAIL; } + +/************************************************************************* + * SHCreateFileDataObject [SHELL32.740] + * + */ + +HRESULT WINAPI SHCreateFileDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject* pDataInner, IDataObject** ppDataObj) +{ + if (pDataInner) + UNIMPLEMENTED; + return IDataObject_Constructor(NULL, pidlFolder, apidl, cidl, TRUE, ppDataObj); +} diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 7457ec4eb37..c050a87a122 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -450,7 +450,7 @@ 731 stdcall -noname -stub SHRegisterDarwinLink(long long long) 732 stdcall -noname SHReValidateDarwinCache() 733 stdcall -noname CheckDiskSpace() -740 stub -noname SHCreateFileDataObject +740 stdcall -noname SHCreateFileDataObject(ptr long ptr ptr ptr) 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) 744 stub -noname Create_IEnumUICommand 745 stub -noname Create_IUIElement diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 9ebf9404a2d..3f5c4b33ad5 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND SOURCE SHAppBarMessage.cpp SHChangeNotify.cpp SHCreateDataObject.cpp + SHCreateFileDataObject.cpp SHCreateFileExtractIconW.cpp SHParseDisplayName.cpp ShellExecCmdLine.cpp diff --git a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp index 00f4ec11077..847986171b2 100644 --- a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp +++ b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS api tests * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Test for SHCreateDataObject - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019 Mark Jansen <mark.jansen(a)reactos.org> */ #include "shelltest.h" diff --git a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp b/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp similarity index 91% copy from modules/rostests/apitests/shell32/SHCreateDataObject.cpp copy to modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp index 00f4ec11077..697650d51d2 100644 --- a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp +++ b/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp @@ -1,8 +1,10 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Test for SHCreateDataObject - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * PURPOSE: Test for SHCreateFileDataObject + * COPYRIGHT: Copyright 2019-2021 Mark Jansen <mark.jansen(a)reactos.org> + * + * This is 99% the same as the test for SHCreateDataObject, except that this always has 4 data types (TestDefaultFormat) */ #include "shelltest.h" @@ -13,14 +15,14 @@ static DWORD g_WinVersion; -typedef HRESULT (WINAPI *tSHCreateDataObject)(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject *pdtInner, REFIID riid, void **ppv); -static tSHCreateDataObject pSHCreateDataObject; +typedef HRESULT(WINAPI* tSHCreateFileDataObject)(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject* pDataInner, IDataObject** ppDataObj); +static tSHCreateFileDataObject pSHCreateFileDataObject; static void TestAdviseAndCanonical(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST_RELATIVE_ARRAY apidl) { CComPtr<IDataObject> spDataObj; - HRESULT hr = pSHCreateDataObject(pidlFolder, cidl, apidl, NULL, IID_PPV_ARG(IDataObject, &spDataObj)); + HRESULT hr = pSHCreateFileDataObject(pidlFolder, cidl, apidl, NULL, &spDataObj); ok_hex(hr, S_OK); if (!SUCCEEDED(hr)) @@ -144,7 +146,7 @@ static void TestFilenameW(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR static void TestDefaultFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST_RELATIVE_ARRAY apidl) { CComPtr<IDataObject> spDataObj; - HRESULT hr = pSHCreateDataObject(pidlFolder, cidl, apidl, NULL, IID_PPV_ARG(IDataObject, &spDataObj)); + HRESULT hr = pSHCreateFileDataObject(pidlFolder, cidl, apidl, NULL, &spDataObj); ok_hex(hr, S_OK); if (!SUCCEEDED(hr)) @@ -186,7 +188,7 @@ static void TestDefaultFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST Count++; } trace("Got %u formats\n", Count); - ULONG ExpectedCount = (g_WinVersion < _WIN32_WINNT_WIN8) ? 1 : 4; + ULONG ExpectedCount = 4; ok_int(Count, (int)ExpectedCount); ok_hex(hr, S_FALSE); @@ -242,10 +244,10 @@ static void TestDefaultFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST } else { - if (g_WinVersion < _WIN32_WINNT_VISTA) + //if (g_WinVersion < _WIN32_WINNT_VISTA) ok(hr == E_INVALIDARG, "0x%x (0x%x(%s))\n", (unsigned int)hr, Expected[Count], szExpected); - else - ok(hr == DV_E_FORMATETC, "0x%x (0x%x(%s))\n", (unsigned int)hr, Expected[Count], szExpected); + //else + // ok(hr == DV_E_FORMATETC, "0x%x (0x%x(%s))\n", (unsigned int)hr, Expected[Count], szExpected); } if (SUCCEEDED(hr)) @@ -267,7 +269,7 @@ static void TestDefaultFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST static void TestSetAndGetExtraFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUIDLIST_RELATIVE_ARRAY apidl) { CComPtr<IDataObject> spDataObj; - HRESULT hr = pSHCreateDataObject(pidlFolder, cidl, apidl, NULL, IID_PPV_ARG(IDataObject, &spDataObj)); + HRESULT hr = pSHCreateFileDataObject(pidlFolder, cidl, apidl, NULL, &spDataObj); ok_hex(hr, S_OK); if (!SUCCEEDED(hr)) @@ -398,14 +400,14 @@ static void TestSetAndGetExtraFormat(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PC ok_size_t(size, 0); } -START_TEST(SHCreateDataObject) +START_TEST(SHCreateFileDataObject) { HRESULT hr; - pSHCreateDataObject = (tSHCreateDataObject)GetProcAddress(GetModuleHandleA("shell32.dll"), "SHCreateDataObject"); - if (!pSHCreateDataObject) + pSHCreateFileDataObject = (tSHCreateFileDataObject)GetProcAddress(GetModuleHandleA("shell32.dll"), MAKEINTRESOURCEA(740)); + if (!pSHCreateFileDataObject) { - skip("shell32!SHCreateDataObject not exported\n"); + skip("shell32!SHCreateFileDataObject not exported\n"); return; } diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 7c306faa1a7..ac5dd174e40 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -22,6 +22,7 @@ extern void func_PathResolve(void); extern void func_SHAppBarMessage(void); extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); +extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); @@ -53,6 +54,7 @@ const struct test winetest_testlist[] = { "SHAppBarMessage", func_SHAppBarMessage }, { "SHChangeNotify", func_SHChangeNotify }, { "SHCreateDataObject", func_SHCreateDataObject }, + { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index 56e7d7c21a3..a4cf836d7a2 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -711,6 +711,7 @@ DECLARE_INTERFACE_(ITrayPriv, IUnknown) HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE); +HRESULT WINAPI SHCreateFileDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject* pDataInner, IDataObject** ppDataObj); #ifdef __cplusplus } /* extern "C" */

1 0

[reactos] 01/01: [SYSSETUP] Register type libraries before signaling we are done
by Mark Jansen 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6568af2d34fbd9e90ab0… commit e6568af2d34fbd9e90ab029a442a18075c0dcc85 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Nov 15 19:53:21 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 31 21:26:18 2021 +0100 [SYSSETUP] Register type libraries before signaling we are done This prevents a race condition, where hSysSetupInf could be closed before all type libraries are registered --- dll/win32/syssetup/wizard.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index efddcfd6b1d..77db90686f2 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2170,6 +2170,12 @@ RegistrationProc(LPVOID Parameter) RegistrationNotify.Progress = RegistrationData->DllCount; RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS; RegistrationNotify.CurrentItem = NULL; + + RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries"); + + // FIXME: Move this call to a separate cleanup page! + RtlCreateBootStatusDataFile(); + SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY, 1, (LPARAM) &RegistrationNotify); if (NULL != RegistrationNotify.ErrorMessage && @@ -2181,11 +2187,6 @@ RegistrationProc(LPVOID Parameter) SetupTermDefaultQueueCallback(RegistrationData->DefaultContext); HeapFree(GetProcessHeap(), 0, RegistrationData); - RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries"); - - // FIXME: Move this call to a separate cleanup page! - RtlCreateBootStatusDataFile(); - return 0; }

1 0

[reactos] 01/01: [ROSAPPS] Remove unmaintained / half-implemented imagesoft
by Mark Jansen 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51b2197c12d310b29d0bc… commit 51b2197c12d310b29d0bcbd9c091dc22d6137777 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 26 10:31:12 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 31 21:25:38 2021 +0100 [ROSAPPS] Remove unmaintained / half-implemented imagesoft --- modules/rosapps/applications/CMakeLists.txt | 1 - .../rosapps/applications/imagesoft/CMakeLists.txt | 23 - modules/rosapps/applications/imagesoft/about.c | 54 - modules/rosapps/applications/imagesoft/adjust.c | 525 ------- .../rosapps/applications/imagesoft/brightness.c | 379 ----- modules/rosapps/applications/imagesoft/contrast.c | 380 ----- modules/rosapps/applications/imagesoft/custcombo.c | 213 --- .../rosapps/applications/imagesoft/floatwindow.c | 626 --------- modules/rosapps/applications/imagesoft/font.c | 179 --- modules/rosapps/applications/imagesoft/imageprop.h | 49 - modules/rosapps/applications/imagesoft/imagesoft.c | 101 -- .../rosapps/applications/imagesoft/imagesoft.rc | 72 - modules/rosapps/applications/imagesoft/imgedwnd.c | 542 -------- modules/rosapps/applications/imagesoft/imgedwnd.h | 94 -- .../rosapps/applications/imagesoft/lang/bg-BG.rc | 237 ---- .../rosapps/applications/imagesoft/lang/en-GB.rc | 232 ---- .../rosapps/applications/imagesoft/lang/en-US.rc | 232 ---- .../rosapps/applications/imagesoft/lang/es-ES.rc | 232 ---- .../rosapps/applications/imagesoft/lang/fr-FR.rc | 232 ---- .../rosapps/applications/imagesoft/lang/id-ID.rc | 232 ---- .../rosapps/applications/imagesoft/lang/it-IT.rc | 232 ---- .../rosapps/applications/imagesoft/lang/no-NO.rc | 231 ---- .../rosapps/applications/imagesoft/lang/pl-PL.rc | 239 ---- .../rosapps/applications/imagesoft/lang/ro-RO.rc | 240 ---- .../rosapps/applications/imagesoft/lang/ru-RU.rc | 234 ---- .../rosapps/applications/imagesoft/lang/sk-SK.rc | 239 ---- .../rosapps/applications/imagesoft/lang/th-TH.rc | 232 ---- .../rosapps/applications/imagesoft/lang/uk-UA.rc | 240 ---- .../rosapps/applications/imagesoft/lang/zh-CN.rc | 234 ---- modules/rosapps/applications/imagesoft/mainwnd.c | 1456 -------------------- modules/rosapps/applications/imagesoft/mainwnd.h | 41 - modules/rosapps/applications/imagesoft/misc.c | 434 ------ modules/rosapps/applications/imagesoft/misc.h | 44 - modules/rosapps/applications/imagesoft/opensave.c | 87 -- modules/rosapps/applications/imagesoft/precomp.h | 70 - .../imagesoft/res/cursors/PaintBrushToolCursor.cur | Bin 326 -> 0 bytes .../res/cursors/PaintBrushToolCursorMouseDown.cur | Bin 326 -> 0 bytes .../imagesoft/res/icons/color/ColorLess.bmp | Bin 670 -> 0 bytes .../imagesoft/res/icons/color/ColorMore.bmp | Bin 450 -> 0 bytes .../imagesoft/res/icons/hist/HistBack.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/hist/HistDelete.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/hist/HistForward.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/hist/HistRedo.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/hist/HistUndo.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainCopyIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainCutIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainNewIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainOpenIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainPasteIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainPrintIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainPrintPreIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainRedoIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainSaveIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/std/MainUndoIcon.bmp | Bin 824 -> 0 bytes .../res/icons/text/TextAlignCenterIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/text/TextAlignLeftIcon.bmp | Bin 822 -> 0 bytes .../res/icons/text/TextAlignRightIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/text/TextBoldIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/text/TextItalicIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/text/TextUnderlineIcon.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsCloneStamp.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsColorPicker.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsEllipse.bmp | Bin 824 -> 0 bytes .../res/icons/tools/ToolsEllipseSelect.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsEraser.bmp | Bin 824 -> 0 bytes .../res/icons/tools/ToolsFreeformShape.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsLassoSelect.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsLine.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsMagicWand.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsMove.bmp | Bin 824 -> 0 bytes .../res/icons/tools/ToolsMoveSelection.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsPaintBrush.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsPaintBucket.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsPencil.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsRecoloring.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsRectangle.bmp | Bin 824 -> 0 bytes .../res/icons/tools/ToolsRectangleSelect.bmp | Bin 824 -> 0 bytes .../res/icons/tools/ToolsRoundedRectangle.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsText.bmp | Bin 824 -> 0 bytes .../imagesoft/res/icons/tools/ToolsZoom.bmp | Bin 824 -> 0 bytes .../applications/imagesoft/res/imagesoft.ico | Bin 29926 -> 0 bytes modules/rosapps/applications/imagesoft/resource.h | 303 ---- modules/rosapps/applications/imagesoft/rsrc.rc | 53 - modules/rosapps/applications/imagesoft/tooldock.c | 1138 --------------- modules/rosapps/applications/imagesoft/tooldock.h | 115 -- 85 files changed, 10497 deletions(-) diff --git a/modules/rosapps/applications/CMakeLists.txt b/modules/rosapps/applications/CMakeLists.txt index fd2658b0114..d041a69847b 100644 --- a/modules/rosapps/applications/CMakeLists.txt +++ b/modules/rosapps/applications/CMakeLists.txt @@ -4,7 +4,6 @@ if(ARCH STREQUAL "i386") add_subdirectory(explorer-old) add_subdirectory(fraginator) endif() -add_subdirectory(imagesoft) add_subdirectory(net) add_subdirectory(notevil) add_subdirectory(rosinternals) diff --git a/modules/rosapps/applications/imagesoft/CMakeLists.txt b/modules/rosapps/applications/imagesoft/CMakeLists.txt deleted file mode 100644 index e673619d3c3..00000000000 --- a/modules/rosapps/applications/imagesoft/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - -list(APPEND SOURCE - about.c - adjust.c - brightness.c - contrast.c - custcombo.c - floatwindow.c - font.c - imagesoft.c - imgedwnd.c - mainwnd.c - misc.c - opensave.c - tooldock.c - precomp.h - ) - -add_executable(imagesoft ${SOURCE} imagesoft.rc) -add_pch(imagesoft precomp.h SOURCE) -set_module_type(imagesoft win32gui UNICODE) -add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) -add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/imagesoft/about.c b/modules/rosapps/applications/imagesoft/about.c deleted file mode 100644 index 32ba6a8a6de..00000000000 --- a/modules/rosapps/applications/imagesoft/about.c +++ /dev/null @@ -1,54 +0,0 @@ -#include <precomp.h> - -INT_PTR CALLBACK -AboutDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - HWND hLicenseEditWnd; - HICON hIcon = NULL; - TCHAR strLicense[700]; - - switch (message) - { - case WM_INITDIALOG: - - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_IMAGESOFTICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); - - hLicenseEditWnd = GetDlgItem(hDlg, - IDC_LICENSE_EDIT); - - LoadString(hInstance, - IDS_LICENSE, - strLicense, - ARRAYSIZE(strLicense)); - - SetWindowText(hLicenseEditWnd, - strLicense); - return TRUE; - - case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - DestroyIcon(hIcon); - EndDialog(hDlg, - LOWORD(wParam)); - return TRUE; - } - - break; - } - - return FALSE; -} diff --git a/modules/rosapps/applications/imagesoft/adjust.c b/modules/rosapps/applications/imagesoft/adjust.c deleted file mode 100644 index f3ba1986e82..00000000000 --- a/modules/rosapps/applications/imagesoft/adjust.c +++ /dev/null @@ -1,525 +0,0 @@ -#include <precomp.h> - - -BOOL -DisplayBlackAndWhite(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits; - RECT rc; - - GetObject(hBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits) - return FALSE; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - DWORD Val = 0; - INT b, g, r; - - CopyMemory(&Val, - &pBits[Count], - 4); - - /* Get pixels in reverse order */ - b = GetRValue(Val); - g = GetGValue(Val); - r = GetBValue(Val); - - /* get the average color value */ - Val = (r + g + b) / 3; - - /* assign to RGB color */ - Val = RGB(Val, Val, Val); - CopyMemory(&pBits[Count], - &Val, - 4); - - Count+=4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hBitmap, - 0, - bRes, - pBits, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); - - return TRUE; -} - - -BOOL -DisplayInvertedColors(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits; - RECT rc; - - GetObject(hBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits) - return FALSE; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - DWORD Val = 0; - INT b, g, r; - - CopyMemory(&Val, - &pBits[Count], - 4); - - b = 255 - GetRValue(Val); - g = 255 - GetGValue(Val); - r = 255 - GetBValue(Val); - - Val = RGB(b, g, r); - - CopyMemory(&pBits[Count], - &Val, - 4); - - Count+=4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hBitmap, - 0, - bRes, - pBits, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); - - return TRUE; -} - - - -BOOL -DisplayBlur(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits, pBitsTemp; - RECT rc; - - GetObject(hBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - pBitsTemp = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits || !pBitsTemp) - return FALSE; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - LONG Val = 0; - INT b, g, r; - INT c1, c2, c3, c4, c5; - - CopyMemory(&Val, - &pBits[Count], - 4); - - b = GetRValue(Val); - g = GetGValue(Val); - r = GetBValue(Val); - - c1 = r; - /* Red */ - if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[Count - (bitmap.bmWidth * 4)], 4); - c2 = GetBValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetBValue(Val); - - CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4))], 4); - c4 = GetBValue(Val); - - CopyMemory(&Val, &pBits[Count - 4], 4); - c5 = GetBValue(Val); - - r = (c1 + c2 + c3 + c4 + c5) / 5; - } - - /* Green */ - c1 = g; - if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4lu))], 4); - c2 = GetGValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetGValue(Val); - - CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4lu))], 4); - c4 = GetGValue(Val); - - CopyMemory(&Val, &pBits[Count-4], 4); - c5 = GetGValue(Val); - - g = (c1 + c2 + c3 + c4 + c5) / 5; - } - - /* Blue */ - c1 = b; - if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); - c2 = GetRValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetRValue(Val); - - CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); - c4 = GetRValue(Val); - - CopyMemory(&Val, &pBits[Count-4], 4); - c5 = GetRValue(Val); - - b = (c1 + c2 + c3 + c4 + c5) / 5; - } - - Val = RGB(b, g, r); - - CopyMemory(&pBitsTemp[Count], - &Val, - 4); - - Count+=4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hBitmap, - 0, - bRes, - pBitsTemp, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - HeapFree(ProcessHeap, - 0, - pBitsTemp); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); - - return TRUE; -} - - - -BOOL -DisplaySharpness(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits, pBitsTemp; - RECT rc; - - GetObject(hBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - pBitsTemp = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits || !pBitsTemp) - return FALSE; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - LONG Val = 0; - INT b, g, r; - INT c1, c2, c3, c4, c5; - - CopyMemory(&Val, - &pBits[Count], - 4); - - b = GetRValue(Val); - g = GetGValue(Val); - r = GetBValue(Val); - - c1 = r; - /* Red */ - if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[Count - (bitmap.bmWidth * 4l)], 4); - c2 = GetBValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetBValue(Val); - - CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); - c4 = GetBValue(Val); - - CopyMemory(&Val, &pBits[Count - 4], 4); - c5 = GetBValue(Val); - - r = (c1 * 5) - (c2 + c3 + c4 + c5); - } - - /* Green */ - c1 = g; - if ((Count < ((bitmap.bmHeight - 1)* bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); - c2 = GetGValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetGValue(Val); - - CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); - c4 = GetGValue(Val); - - CopyMemory(&Val, &pBits[Count - 4], 4); - c5 = GetGValue(Val); - - g = (c1 * 5) - (c2 + c3 + c4 + c5); - } - - /* Blue */ - c1 = b; - if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && - (Count > (bitmap.bmWidth * 4lu))) - { - CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); - c2 = GetRValue(Val); - - CopyMemory(&Val, &pBits[Count + 4], 4); - c3 = GetRValue(Val); - - CopyMemory(&Val, &pBits[(Count+(bitmap.bmWidth * 4l))], 4); - c4 = GetRValue(Val); - - CopyMemory(&Val, &pBits[Count - 4], 4); - c5 = GetRValue(Val); - - b = (c1 * 5) - (c2 + c3 + c4 + c5); - } - - /* Red */ - if (r > 255) r = 255; - if (r < 0) r = 0; - - /* Green */ - if (g > 255) g = 255; - if (g < 0)g = 0; - - /* Blue */ - if (b > 255) b = 255; - if (b < 0) b = 0; - - Val = RGB(b, g, r); - - CopyMemory(&pBitsTemp[Count], - &Val, - 4); - - Count+=4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hBitmap, - 0, - bRes, - pBitsTemp, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - HeapFree(ProcessHeap, - 0, - pBitsTemp); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); - - return TRUE; -} diff --git a/modules/rosapps/applications/imagesoft/brightness.c b/modules/rosapps/applications/imagesoft/brightness.c deleted file mode 100644 index d596e291189..00000000000 --- a/modules/rosapps/applications/imagesoft/brightness.c +++ /dev/null @@ -1,379 +0,0 @@ -#include "precomp.h" - -#define BASECOLOUR 100 - - -VOID -AdjustBrightness(HBITMAP hOrigBitmap, - HBITMAP hNewBitmap, - HWND hwnd, - HDC hdcMem, - INT RedVal, - INT GreenVal, - INT BlueVal) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits; - RECT rc; - - GetObject(hNewBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits) - return; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hOrigBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - DWORD Val = 0; - INT b, g, r; - - CopyMemory(&Val, - &pBits[Count], - 4); - - /* Get pixels in reverse order */ - b = GetRValue(Val); - g = GetGValue(Val); - r = GetBValue(Val); - - /* Red */ - r += RedVal; - if (r > 255) r = 255; - else if (r < 0) r = 0; - - /* Green */ - g += GreenVal; - if (g > 255) g = 255; - else if (g < 0) g = 0; - - /* Blue */ - b += BlueVal; - if (b > 255) b = 255; - else if (b < 0) b = 0; - - /* Store in reverse order */ - Val = RGB(b, g, r); - CopyMemory(&pBits[Count], - &Val, - 4); - - /* RGB color take 4 bytes.The high-order byte must be zero */ - Count += 4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hNewBitmap, - 0, - bRes, - pBits, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); -} - - -static PIMAGEADJUST -Bri_OnInitDialog(PIMAGEADJUST pImgAdj, - HWND hDlg, - LPARAM lParam) -{ - pImgAdj = (IMAGEADJUST*) HeapAlloc(ProcessHeap, - 0, - sizeof(IMAGEADJUST)); - if (!pImgAdj) - return NULL; - - - pImgAdj->Info = (PMAIN_WND_INFO)lParam; - if (!pImgAdj->Info->ImageEditors) - goto fail; - - - pImgAdj->hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); - GetClientRect(pImgAdj->hPicPrev, - &pImgAdj->ImageRect); - - /* Make a static copy of the main image */ - pImgAdj->hBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, - IMAGE_BITMAP, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - LR_CREATEDIBSECTION); - if (!pImgAdj->hBitmap) - goto fail; - - /* Make a copy which will be updated */ - pImgAdj->hPreviewBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, - IMAGE_BITMAP, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - LR_CREATEDIBSECTION); - if (!pImgAdj->hPreviewBitmap) - goto fail; - - - pImgAdj->RedVal = pImgAdj->BlueVal = pImgAdj->GreenVal = 0; - - /* setup dialog */ - SendDlgItemMessage(hDlg, - IDC_BRI_FULL, - BM_SETCHECK, - BST_CHECKED, - 0); - SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_SETRANGE, - TRUE, - (LPARAM)MAKELONG(0, 200)); - SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_SETPOS, - TRUE, - (LPARAM)BASECOLOUR); - SetDlgItemText(hDlg, - IDC_BRI_EDIT, - _T("100")); - - return pImgAdj; - -fail: - HeapFree(ProcessHeap, - 0, - pImgAdj); - return NULL; -} - - -static VOID -Bri_OnDrawItem(PIMAGEADJUST pImgAdj, - LPARAM lParam) -{ - LPDRAWITEMSTRUCT lpDrawItem; - HDC hdcMem; - - lpDrawItem = (LPDRAWITEMSTRUCT)lParam; - - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - - if(lpDrawItem->CtlID == IDC_PICPREVIEW) - { - SelectObject(hdcMem, - pImgAdj->hPreviewBitmap); - - BitBlt(lpDrawItem->hDC, - pImgAdj->ImageRect.left, - pImgAdj->ImageRect.top, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - hdcMem, - 0, - 0, - SRCCOPY); - - DeleteDC(hdcMem); - } -} - - -static VOID -Bri_OnTrackBar(PIMAGEADJUST pImgAdj, - HWND hDlg) -{ - HDC hdcMem; - DWORD TrackPos; - - TrackPos = (DWORD)SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_GETPOS, - 0, - 0); - - SetDlgItemInt(hDlg, - IDC_BRI_EDIT, - TrackPos, - FALSE); - - if (IsDlgButtonChecked(hDlg, IDC_BRI_FULL) == BST_CHECKED) - { - pImgAdj->RedVal = pImgAdj->GreenVal = pImgAdj->BlueVal = TrackPos - BASECOLOUR; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_RED) == BST_CHECKED) - { - pImgAdj->RedVal = TrackPos - BASECOLOUR; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_GREEN) == BST_CHECKED) - { - pImgAdj->GreenVal = TrackPos - BASECOLOUR; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_BLUE) == BST_CHECKED) - { - pImgAdj->BlueVal = TrackPos - BASECOLOUR; - } - - hdcMem = GetDC(pImgAdj->hPicPrev); - - AdjustBrightness(pImgAdj->hBitmap, - pImgAdj->hPreviewBitmap, - pImgAdj->hPicPrev, - hdcMem, - pImgAdj->RedVal, - pImgAdj->GreenVal, - pImgAdj->BlueVal); - - ReleaseDC(pImgAdj->hPicPrev, hdcMem); -} - - -static BOOL -Bri_OnCommand(PIMAGEADJUST pImgAdj, - HWND hDlg, - UINT uID) -{ - switch (uID) - { - case IDOK: - { - HDC hdcMem; - - hdcMem = GetDC(pImgAdj->Info->ImageEditors->hSelf); - - AdjustBrightness(pImgAdj->Info->ImageEditors->hBitmap, - pImgAdj->Info->ImageEditors->hBitmap, - pImgAdj->Info->ImageEditors->hSelf, - hdcMem, - pImgAdj->RedVal, - pImgAdj->GreenVal, - pImgAdj->BlueVal); - - ReleaseDC(pImgAdj->Info->ImageEditors->hSelf, - hdcMem); - - EndDialog(hDlg, - uID); - - return TRUE; - } - - case IDCANCEL: - { - EndDialog(hDlg, - uID); - return TRUE; - } - } - - return FALSE; -} - - -INT_PTR CALLBACK -BrightnessProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - static PIMAGEADJUST pImgAdj = NULL; - - switch (message) - { - case WM_INITDIALOG: - { - pImgAdj = Bri_OnInitDialog(pImgAdj, - hDlg, - lParam); - if (!pImgAdj) - { - EndDialog(hDlg, -1); - return FALSE; - } - - return TRUE; - } - - case WM_DRAWITEM: - { - Bri_OnDrawItem(pImgAdj, - lParam); - return TRUE; - } - - case WM_HSCROLL: - { - if (LOWORD(wParam) == TB_THUMBTRACK || - LOWORD(wParam) == TB_ENDTRACK) - { - Bri_OnTrackBar(pImgAdj, - hDlg); - } - - return TRUE; - } - - case WM_COMMAND: - { - return Bri_OnCommand(pImgAdj, - hDlg, - LOWORD(wParam)); - } - - case WM_DESTROY: - { - if (pImgAdj) - { - if (pImgAdj->hBitmap) - DeleteObject(pImgAdj->hBitmap); - if (pImgAdj->hPreviewBitmap) - DeleteObject(pImgAdj->hPreviewBitmap); - - HeapFree(ProcessHeap, - 0, - pImgAdj); - } - } - } - - return FALSE; -} diff --git a/modules/rosapps/applications/imagesoft/contrast.c b/modules/rosapps/applications/imagesoft/contrast.c deleted file mode 100644 index defb31a68fa..00000000000 --- a/modules/rosapps/applications/imagesoft/contrast.c +++ /dev/null @@ -1,380 +0,0 @@ -#include "precomp.h" - -#define BASECOLOUR 100 - - -VOID -AdjustContrast(HBITMAP hOrigBitmap, - HBITMAP hNewBitmap, - HWND hwnd, - HDC hdcMem, - INT RedVal, - INT GreenVal, - INT BlueVal) -{ - BITMAPINFO bi; - BITMAP bitmap; - BOOL bRes; - DWORD Count = 0; - INT i, j; - PBYTE pBits; - RECT rc; - - GetObject(hNewBitmap, - sizeof(bitmap), - &bitmap); - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = bitmap.bmWidth; - bi.bmiHeader.biHeight = bitmap.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - /* Buffer */ - pBits = (PBYTE)HeapAlloc(ProcessHeap, - 0, - bitmap.bmWidth * bitmap.bmHeight * 4); - if (!pBits) - return; - - /* get the bits from the original bitmap */ - bRes = GetDIBits(hdcMem, - hOrigBitmap, - 0, - bitmap.bmHeight, - pBits, - &bi, - DIB_RGB_COLORS); - - for (i = 0; i < bitmap.bmHeight; i++) - { - for (j = 0; j < bitmap.bmWidth; j++) - { - DWORD Val = 0; - INT b, g, r; - - CopyMemory(&Val, - &pBits[Count], - 4); - - /* Get pixels in reverse order */ - b = GetRValue(Val); - g = GetGValue(Val); - r = GetBValue(Val); - - r = ((r - 128) * RedVal) / 100 + 128; - g = ((g - 128) * GreenVal) / 100 + 128; - b = ((b - 128) * BlueVal) / 100 + 128; - - /* Red */ - if (r > 255) r = 255; - else if (r < 0) r = 0; - - /* Green */ - if (g > 255) g = 255; - else if (g < 0) g = 0; - - /* Blue */ - if (b > 255) b = 255; - else if (b < 0) b = 0; - - /* Store in reverse order */ - Val = RGB(b, g, r); - CopyMemory(&pBits[Count], - &Val, - 4); - - /* RGB color take 4 bytes.The high-order byte must be zero */ - Count += 4; - } - } - - /* Set the new pixel bits */ - SetDIBits(hdcMem, - hNewBitmap, - 0, - bRes, - pBits, - &bi, - DIB_RGB_COLORS); - - HeapFree(ProcessHeap, - 0, - pBits); - - GetClientRect(hwnd, - &rc); - - InvalidateRect(hwnd, - &rc, - FALSE); -} - - -static PIMAGEADJUST -Cont_OnInitDialog(PIMAGEADJUST pImgAdj, - HWND hDlg, - LPARAM lParam) -{ - pImgAdj = (IMAGEADJUST*) HeapAlloc(ProcessHeap, - 0, - sizeof(IMAGEADJUST)); - if (!pImgAdj) - return NULL; - - - pImgAdj->Info = (PMAIN_WND_INFO)lParam; - if (!pImgAdj->Info->ImageEditors) - goto fail; - - - pImgAdj->hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); - GetClientRect(pImgAdj->hPicPrev, - &pImgAdj->ImageRect); - - /* Make a static copy of the main image */ - pImgAdj->hBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, - IMAGE_BITMAP, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - LR_CREATEDIBSECTION); - if (!pImgAdj->hBitmap) - goto fail; - - /* Make a copy which will be updated */ - pImgAdj->hPreviewBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, - IMAGE_BITMAP, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - LR_CREATEDIBSECTION); - if (!pImgAdj->hPreviewBitmap) - goto fail; - - - pImgAdj->RedVal = pImgAdj->BlueVal = pImgAdj->GreenVal = 100; - - /* setup dialog */ - SendDlgItemMessage(hDlg, - IDC_BRI_FULL, - BM_SETCHECK, - BST_CHECKED, - 0); - SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_SETRANGE, - TRUE, - (LPARAM)MAKELONG(0, 200)); - SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_SETPOS, - TRUE, - (LPARAM)BASECOLOUR); - SetDlgItemText(hDlg, - IDC_BRI_EDIT, - _T("100")); - - return pImgAdj; - -fail: - HeapFree(ProcessHeap, - 0, - pImgAdj); - return NULL; -} - - -static VOID -Cont_OnDrawItem(PIMAGEADJUST pImgAdj, - LPARAM lParam) -{ - LPDRAWITEMSTRUCT lpDrawItem; - HDC hdcMem; - - lpDrawItem = (LPDRAWITEMSTRUCT)lParam; - - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - - if(lpDrawItem->CtlID == IDC_PICPREVIEW) - { - SelectObject(hdcMem, - pImgAdj->hPreviewBitmap); - - BitBlt(lpDrawItem->hDC, - pImgAdj->ImageRect.left, - pImgAdj->ImageRect.top, - pImgAdj->ImageRect.right, - pImgAdj->ImageRect.bottom, - hdcMem, - 0, - 0, - SRCCOPY); - - DeleteDC(hdcMem); - } -} - - -static VOID -Cont_OnTrackBar(PIMAGEADJUST pImgAdj, - HWND hDlg) -{ - HDC hdcMem; - DWORD TrackPos; - - TrackPos = (DWORD)SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_GETPOS, - 0, - 0); - - SetDlgItemInt(hDlg, - IDC_BRI_EDIT, - TrackPos, - FALSE); - - if (IsDlgButtonChecked(hDlg, IDC_BRI_FULL) == BST_CHECKED) - { - pImgAdj->RedVal = pImgAdj->GreenVal = pImgAdj->BlueVal = TrackPos - BASECOLOUR + 100; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_RED) == BST_CHECKED) - { - pImgAdj->RedVal = TrackPos - BASECOLOUR + 100; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_GREEN) == BST_CHECKED) - { - pImgAdj->GreenVal = TrackPos - BASECOLOUR + 100; - } - else if (IsDlgButtonChecked(hDlg, IDC_BRI_BLUE) == BST_CHECKED) - { - pImgAdj->BlueVal = TrackPos - BASECOLOUR + 100; - } - - hdcMem = GetDC(pImgAdj->hPicPrev); - - AdjustContrast(pImgAdj->hBitmap, - pImgAdj->hPreviewBitmap, - pImgAdj->hPicPrev, - hdcMem, - pImgAdj->RedVal, - pImgAdj->GreenVal, - pImgAdj->BlueVal); - - ReleaseDC(pImgAdj->hPicPrev, hdcMem); -} - - -static BOOL -Cont_OnCommand(PIMAGEADJUST pImgAdj, - HWND hDlg, - UINT uID) -{ - switch (uID) - { - case IDOK: - { - HDC hdcMem; - - hdcMem = GetDC(pImgAdj->Info->ImageEditors->hSelf); - - AdjustContrast(pImgAdj->Info->ImageEditors->hBitmap, - pImgAdj->Info->ImageEditors->hBitmap, - pImgAdj->Info->ImageEditors->hSelf, - hdcMem, - pImgAdj->RedVal, - pImgAdj->GreenVal, - pImgAdj->BlueVal); - - ReleaseDC(pImgAdj->Info->ImageEditors->hSelf, - hdcMem); - - EndDialog(hDlg, - uID); - - return TRUE; - } - - case IDCANCEL: - { - EndDialog(hDlg, - uID); - return TRUE; - } - } - - return FALSE; -} - - -INT_PTR CALLBACK -ContrastProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - static PIMAGEADJUST pImgAdj = NULL; - - switch (message) - { - case WM_INITDIALOG: - { - pImgAdj = Cont_OnInitDialog(pImgAdj, - hDlg, - lParam); - if (!pImgAdj) - { - EndDialog(hDlg, -1); - return FALSE; - } - - return TRUE; - } - - case WM_DRAWITEM: - { - Cont_OnDrawItem(pImgAdj, - lParam); - return TRUE; - } - - case WM_HSCROLL: - { - if (LOWORD(wParam) == TB_THUMBTRACK || - LOWORD(wParam) == TB_ENDTRACK) - { - Cont_OnTrackBar(pImgAdj, - hDlg); - } - - return TRUE; - } - - case WM_COMMAND: - { - return Cont_OnCommand(pImgAdj, - hDlg, - LOWORD(wParam)); - } - - case WM_DESTROY: - { - if (pImgAdj) - { - if (pImgAdj->hBitmap) - DeleteObject(pImgAdj->hBitmap); - if (pImgAdj->hPreviewBitmap) - DeleteObject(pImgAdj->hPreviewBitmap); - - HeapFree(ProcessHeap, - 0, - pImgAdj); - } - } - } - - return FALSE; -} diff --git a/modules/rosapps/applications/imagesoft/custcombo.c b/modules/rosapps/applications/imagesoft/custcombo.c deleted file mode 100644 index 6ae88e3d0cf..00000000000 --- a/modules/rosapps/applications/imagesoft/custcombo.c +++ /dev/null @@ -1,213 +0,0 @@ -#include <precomp.h> - - -LRESULT WINAPI -FlatComboProc(HWND hwnd, - UINT msg, - WPARAM wParam, - LPARAM lParam) -{ - HDC hdc; - PAINTSTRUCT ps; - RECT rect, rect2; - POINT pt; - - WNDPROC OldComboProc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA); - - static BOOL fMouseDown = FALSE; - static BOOL fButtonDown = FALSE; - - switch(msg) - { - case WM_PAINT: - { - if(wParam == 0) hdc = BeginPaint(hwnd, &ps); - else hdc = (HDC)wParam; - - /* mask off the borders and draw ComboBox normally */ - GetClientRect(hwnd, &rect); - - InflateRect(&rect, - -GetSystemMetrics(SM_CXEDGE)*2, - -GetSystemMetrics(SM_CYEDGE)*2); - - rect.right -= GetSystemMetrics(SM_CXVSCROLL); - - IntersectClipRect(hdc, - rect.left, - rect.top, - rect.right, - rect.bottom); - - /* Draw the ComboBox */ - CallWindowProc(OldComboProc, - hwnd, - msg, - (WPARAM)hdc, - lParam); - - /* Now mask off inside and draw the borders */ - SelectClipRgn(hdc, - NULL); - rect.right += GetSystemMetrics(SM_CXVSCROLL); - - ExcludeClipRect(hdc, - rect.left, - rect.top, - rect.right, - rect.bottom); - - /* draw borders */ - GetClientRect(hwnd, - &rect2); - FillRect(hdc, - &rect2, - //CreateSolidBrush(RGB(0,0,0))); - GetSysColorBrush(COLOR_3DFACE)); - - /* now draw the button */ - SelectClipRgn(hdc, - NULL); - rect.left = rect.right - GetSystemMetrics(SM_CXVSCROLL); - - if(fButtonDown) - { - HBRUSH oldBrush; - HPEN oldPen; - POINT pt[3]; - - FillRect(hdc, &rect, CreateSolidBrush(RGB(182,189,210))); - rect.top -= 1; - rect.bottom += 1; - FrameRect(hdc, &rect, GetStockBrush(WHITE_BRUSH)); - - pt[0].x = rect.right - ((GetSystemMetrics(SM_CXVSCROLL) / 2) + 2); - pt[0].y = rect.bottom / 2; - pt[1].x = pt[0].x + 4; - pt[1].y = pt[0].y; - pt[2].x = pt[1].x - 2; - pt[2].y = pt[1].y + 2; - - oldPen = (HPEN) SelectObject(hdc, GetStockPen(WHITE_PEN)); - oldBrush = (HBRUSH) SelectObject(hdc, GetStockBrush(WHITE_BRUSH)); - Polygon(hdc, pt, 3); - - SelectObject(hdc, oldPen); - SelectObject(hdc, oldBrush); - } - else - { - HBRUSH oldBrush; - POINT pt[3]; - - FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); - rect.top -= 1; - rect.bottom += 1; - FrameRect(hdc, &rect, GetStockBrush(WHITE_BRUSH)); - - pt[0].x = rect.right - ((GetSystemMetrics(SM_CXVSCROLL) / 2) + 2); - pt[0].y = rect.bottom / 2; - pt[1].x = pt[0].x + 4; - pt[1].y = pt[0].y; - pt[2].x = pt[1].x - 2; - pt[2].y = pt[1].y + 2; - - oldBrush = (HBRUSH) SelectObject(hdc, GetStockBrush(BLACK_BRUSH)); - Polygon(hdc, pt, 3); - - SelectObject(hdc, oldBrush); - } - - - if(wParam == 0) - EndPaint(hwnd, &ps); - - return 0; - } - - /* check if mouse is within drop-arrow area, toggle - * a flag to say if the mouse is up/down. Then invalidate - * the window so it redraws to show the changes. */ - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - { - - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - GetClientRect(hwnd, &rect); - - InflateRect(&rect, - -GetSystemMetrics(SM_CXEDGE), - -GetSystemMetrics(SM_CYEDGE)); - rect.left = rect.right - GetSystemMetrics(SM_CXVSCROLL); - - if(PtInRect(&rect, pt)) - { - /* we *should* call SetCapture, but the ComboBox does it for us */ - fMouseDown = TRUE; - fButtonDown = TRUE; - InvalidateRect(hwnd, 0, 0); - } - } - break; - - /* mouse has moved. Check to see if it is in/out of the drop-arrow */ - case WM_MOUSEMOVE: - { - - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - if(fMouseDown && (wParam & MK_LBUTTON)) - { - GetClientRect(hwnd, &rect); - - InflateRect(&rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); - rect.left = rect.right - GetSystemMetrics(SM_CXVSCROLL); - - if(fButtonDown != PtInRect(&rect, pt)) - { - fButtonDown = PtInRect(&rect, pt); - InvalidateRect(hwnd, 0, 0); - } - } - } - break; - - case WM_LBUTTONUP: - { - - if(fMouseDown) - { - /* No need to call ReleaseCapture, the ComboBox does it for us */ - fMouseDown = FALSE; - fButtonDown = FALSE; - InvalidateRect(hwnd, 0, 0); - } - } - break; - } - - return CallWindowProc(OldComboProc, - hwnd, - msg, - wParam, - lParam); -} - -VOID MakeFlatCombo(HWND hwndCombo) -{ - LONG_PTR OldComboProc; - - /* Remember old window procedure */ - OldComboProc = GetWindowLongPtr(hwndCombo, GWLP_WNDPROC); - SetWindowLongPtr(hwndCombo, - GWLP_USERDATA, - OldComboProc); - - /* Perform the subclass */ - SetWindowLongPtr(hwndCombo, - GWLP_WNDPROC, - (LONG_PTR)FlatComboProc); -} diff --git a/modules/rosapps/applications/imagesoft/floatwindow.c b/modules/rosapps/applications/imagesoft/floatwindow.c deleted file mode 100644 index 71eceb6c7f5..00000000000 --- a/modules/rosapps/applications/imagesoft/floatwindow.c +++ /dev/null @@ -1,626 +0,0 @@ -#include "precomp.h" - -static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); - -#define ID_TIMER1 1 -#define ID_TIMER2 2 -#define ID_TIMER3 3 - -TBBUTTON ToolsButtons[] = { -/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* rectangle select */ - {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* move selected pixels */ - {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* lasso select */ - {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* move selection */ - {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* elipse select */ - {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* zoom */ - {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* magic wand */ - {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* text */ - {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* paintbrush */ - {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* eraser */ - {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* pencil */ - {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* color picker */ - {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* clone stamp */ - {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* recolor */ - {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* paint bucket */ - {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* line */ - {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* rectangle */ - {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* round rectangle */ - {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* elipse */ - {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* free form */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, -}; - -TBBUTTON HistoryButtons[] = { - {TBICON_BACKSM, ID_BACK, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* back */ - {TBICON_UNDOSM, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ - {TBICON_REDOSM, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ - {TBICON_FORWARDSM, ID_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* forward */ - {TBICON_DELETESM, ID_DELETE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* delete */ -}; - - -BOOL -ShowHideWindow(HWND hwnd) -{ - if (IsWindowVisible(hwnd)) - return ShowWindow(hwnd, SW_HIDE); - else - return ShowWindow(hwnd, SW_SHOW); -} - - -BOOL -FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) -{ - HWND hTb; - HIMAGELIST hImageList; - UINT NumButtons; - - NumButtons = ARRAYSIZE(ToolsButtons); - hTb = CreateWindowEx(0, - TOOLBARCLASSNAME, - NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | CCS_NODIVIDER, - 0, 0, 32, 200, - Info->fltTools->hSelf, - NULL, - hInstance, - NULL); - if (hTb != NULL) - { - SendMessage(hTb, - TB_SETEXTENDEDSTYLE, - 0, - TBSTYLE_EX_HIDECLIPPEDBUTTONS); - - SendMessage(hTb, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hTb, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(16, 16)); - - hImageList = InitImageList(IDB_TOOLSRECTSEL, NumButtons - 1); // -1 because of the last separator. - - ImageList_Destroy((HIMAGELIST)SendMessage(hTb, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hTb, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)ToolsButtons); - - SendMessage(hTb, - TB_AUTOSIZE, - 0, - 0); - - return TRUE; - } - - return FALSE; -} - - -VOID -FloatWindowPaintColorPicker(HWND hColorPicker) -{ - HDC hdc; - RECT rect; - - InvalidateRect(hColorPicker, - NULL, - TRUE); - UpdateWindow(hColorPicker); - - hdc = GetDC(hColorPicker); - - GetClientRect(hColorPicker, - &rect); - - Ellipse(hdc, - rect.left, - rect.top, - rect.right, - rect.bottom); - - ReleaseDC(hColorPicker, - hdc); - -} - -VOID -FloatWindowPaintHueSlider(HWND hHueSlider) -{ - HDC hdc; - RECT rect; - - InvalidateRect(hHueSlider, - NULL, - TRUE); - UpdateWindow(hHueSlider); - - hdc = GetDC(hHueSlider); - - GetClientRect(hHueSlider, - &rect); - - Rectangle(hdc, - rect.left, - rect.top, - rect.right, - rect.bottom); - - ReleaseDC(hHueSlider, - hdc); - -} - - -BOOL -FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info) -{ - HWND hColorPicker; - HWND hHueSlider; - HWND hMouseButton; - HWND hMore; - RECT rect; - HBITMAP hMoreBitmap; - - GetClientRect(Info->fltColors->hSelf, - &rect); - - hColorPicker = CreateWindowEx(0, - WC_STATIC, - NULL, - WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, - 2, - 2, - (int) (rect.right * 0.65), - rect.bottom - 2, - Info->fltColors->hSelf, - NULL, - hInstance, - NULL); - if (hColorPicker == NULL) - return FALSE; - - hHueSlider = CreateWindowEx(0, - WC_STATIC, - NULL, - WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, - 145, - 35, - 25, - 135, - Info->fltColors->hSelf, - NULL, - hInstance, - NULL); - if (hHueSlider == NULL) - return FALSE; - - hMouseButton = CreateWindowEx(0, - WC_COMBOBOX, - NULL, - WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, - 118, 5, 75, 25, - Info->fltColors->hSelf, - NULL, - hInstance, - NULL); - if (hMouseButton == NULL) - return FALSE; - - MakeFlatCombo(hMouseButton); - - /* temp, just testing */ - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); - SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); - - - hMore = CreateWindowEx(WS_EX_STATICEDGE, - WC_BUTTON, - NULL, - WS_CHILD | WS_VISIBLE | BS_BITMAP, - rect.right - 15, - rect.bottom - 15, - 15, 15, - Info->fltColors->hSelf, - NULL, - hInstance, - NULL); - if (hMore == NULL) - return FALSE; - - hMoreBitmap = (HBITMAP)LoadImage(hInstance, - MAKEINTRESOURCE(IDB_COLORSMORE), - IMAGE_BITMAP, - 12, - 11, - LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS); - if (hMoreBitmap != NULL) - { - SendMessage(hMore, - BM_SETIMAGE, - IMAGE_BITMAP, - (LPARAM)hMoreBitmap); - } - - - /* temp functions for playing about with possible layouts */ - FloatWindowPaintHueSlider(hHueSlider); - FloatWindowPaintColorPicker(hColorPicker); - - if (hColorPicker != NULL) - { - HDC hDc = GetDC(hColorPicker); - TextOut(hDc, 8, 75, _T("Possible layout?"), 16); - ReleaseDC(hColorPicker, hDc); - } - - return TRUE; - -} - - -BOOL -FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) -{ - HWND hList; - HWND hButtons; - HIMAGELIST hImageList; - UINT NumButtons; - - hList = CreateWindowEx(0, - WC_LISTBOX, - NULL, - WS_CHILD | WS_VISIBLE | LBS_EXTENDEDSEL, - 0, 0, 143, 100, - Info->fltHistory->hSelf, - NULL, - hInstance, - NULL); - if (hList == NULL) - return FALSE; - - NumButtons = ARRAYSIZE(HistoryButtons); - hButtons = CreateWindowEx(0, - TOOLBARCLASSNAME, - NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | CCS_NODIVIDER, - 0, 0, 0, 0, - Info->fltHistory->hSelf, - NULL, - hInstance, - NULL); - if (hButtons != NULL) - { - SendMessage(hButtons, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hButtons, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(10, 10)); - - hImageList = InitImageList(IDB_HISTBACK, NumButtons); - - ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hButtons, - TB_SETBUTTONSIZE, - 0, - MAKELONG(18, 16)); - - SendMessage(hButtons, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)HistoryButtons); - - return TRUE; - } - - return FALSE; -} - - -static VOID -DoTimer(PFLT_WND FltInfo, - UINT_PTR idTimer) -{ - switch (idTimer) - { - /* timer to check if cursor is in toolbar coords */ - case ID_TIMER1: - { - POINT pt; - - /* kill timer if toobar is not opaque */ - if (FltInfo->bOpaque != TRUE) - { - KillTimer(FltInfo->hSelf, - ID_TIMER1); - break; - } - - if (GetCursorPos(&pt)) - { - RECT rect; - - if (GetWindowRect(FltInfo->hSelf, - &rect)) - { - if (!PtInRect(&rect, - pt)) - { - KillTimer(FltInfo->hSelf, - ID_TIMER1); - KillTimer(FltInfo->hSelf, - ID_TIMER2); - - /* timer to fade out toolbar */ - SetTimer(FltInfo->hSelf, - ID_TIMER3, - 50, - NULL); - } - } - } - } - break; - - /* timer to fade in toolbar */ - case ID_TIMER2: - { - SetLayeredWindowAttributes(FltInfo->hSelf, - 0, - (255 * FltInfo->Transparancy) / 100, - LWA_ALPHA); - - /* increment transparancy until it is opaque (100) */ - FltInfo->Transparancy += 5; - - if (FltInfo->Transparancy == 100) - { - SetWindowLongPtr(FltInfo->hSelf, - GWL_EXSTYLE, - GetWindowLongPtr(FltInfo->hSelf, - GWL_EXSTYLE) & ~WS_EX_LAYERED); - - FltInfo->bOpaque = TRUE; - - KillTimer(FltInfo->hSelf, - ID_TIMER2); - } - } - break; - - case ID_TIMER3: - { - LONG_PTR Style; - - Style = GetWindowLongPtr(FltInfo->hSelf, - GWL_EXSTYLE); - - if (Style & ~WS_EX_LAYERED) - { - SetWindowLongPtr(FltInfo->hSelf, - GWL_EXSTYLE, - Style | WS_EX_LAYERED); - } - - FltInfo->Transparancy -= 5; - - if (FltInfo->Transparancy >= 60) - { - /* set the tranclucency to 60% */ - SetLayeredWindowAttributes(FltInfo->hSelf, - 0, - (255 * FltInfo->Transparancy) / 100, - LWA_ALPHA); - - if (FltInfo->Transparancy == 60) - { - FltInfo->bOpaque = FALSE; - - KillTimer(FltInfo->hSelf, - ID_TIMER3); - } - - } - } - break; - } -} - -LRESULT CALLBACK -FloatToolbarWndProc(HWND hwnd, - UINT Message, - WPARAM wParam, - LPARAM lParam) -{ - PFLT_WND FltInfo; - - /* Get the window context */ - FltInfo = (PFLT_WND)GetWindowLongPtr(hwnd, - GWLP_USERDATA); - if (FltInfo == NULL && Message != WM_CREATE) - { - goto HandleDefaultMessage; - } - - switch(Message) - { - case WM_CREATE: - { - FltInfo = (PFLT_WND)(((LPCREATESTRUCT)lParam)->lpCreateParams); - - /*FIXME: read this from registry */ -// FltInfo->bShow = TRUE; - - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)FltInfo); - - FltInfo->bOpaque = FALSE; - - SetWindowLongPtr(hwnd, - GWL_EXSTYLE, - GetWindowLongPtr(hwnd, - GWL_EXSTYLE) | WS_EX_LAYERED); - - /* set the tranclucency to 60% */ - FltInfo->Transparancy = 60; - SetLayeredWindowAttributes(hwnd, - 0, - (255 * FltInfo->Transparancy) / 100, - LWA_ALPHA); - } - break; - - case WM_TIMER: - { - DoTimer(FltInfo, - wParam); - } - break; - - case WM_NCMOUSEMOVE: - case WM_MOUSEMOVE: - { - if (FltInfo->bOpaque == FALSE) - { - - RedrawWindow(hwnd, - NULL, - NULL, - RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); - - FltInfo->bOpaque = TRUE; - //MessageBox(NULL, _T("in"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); - - /* timer to check if cursor is in toolbar coords */ - SetTimer(hwnd, - ID_TIMER1, - 200, - NULL); - - /* timer to fade in the toolbars */ - SetTimer(hwnd, - ID_TIMER2, - 50, - NULL); - } - } - break; - - case WM_CLOSE: - ShowHideWindow(FltInfo->hSelf); - break; - - case WM_COMMAND: - { - if (LOWORD(wParam) == IDCANCEL) - ShowHideWindow(FltInfo->hSelf); - - switch(LOWORD(wParam)) - { - case ID_NEW: - MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); - break; - - case ID_CLONESTAMP: - case ID_COLORPICKER: - case ID_ECLIPSE: - case ID_ECLIPSESEL: - case ID_ERASER: - case ID_FREEFORM: - case ID_LASOO: - case ID_LINE: - case ID_MAGICWAND: - case ID_MOVE: - case ID_MOVESEL: - case ID_PAINTBRUSH: - case ID_PAINTBUCKET: - case ID_PENCIL: - case ID_RECOLORING: - case ID_RECTANGLE: - case ID_ROUNDRECT: - case ID_TEXT: - case ID_ZOOM: - /*SendMessage(Info->hSelf, - LOWORD(wParam), - wParam, - lParam);*/ - break; - } - } - break; - - case WM_NCACTIVATE: - /* FIXME: needs fully implementing */ - return DefWindowProc(hwnd, - Message, - TRUE, - lParam); - break; - - case WM_DESTROY: - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - 0); - break; - - default: -HandleDefaultMessage: - return DefWindowProc(hwnd, - Message, - wParam, - lParam); - } - - return 0; -} - - -BOOL -InitFloatWndClass(VOID) -{ - WNDCLASSEX wc = {0}; - - wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = FloatToolbarWndProc; - wc.hInstance = hInstance; - wc.hIcon = NULL; - wc.hCursor = LoadCursor(NULL, - IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wc.lpszClassName = szFloatWndClass; - wc.hIconSm = NULL; - - return RegisterClassEx(&wc) != (ATOM)0; -} - -VOID -UninitFloatWndImpl(VOID) -{ - UnregisterClass(szFloatWndClass, - hInstance); -} - - diff --git a/modules/rosapps/applications/imagesoft/font.c b/modules/rosapps/applications/imagesoft/font.c deleted file mode 100644 index 62d07e6879e..00000000000 --- a/modules/rosapps/applications/imagesoft/font.c +++ /dev/null @@ -1,179 +0,0 @@ -#include <precomp.h> - -int CALLBACK -EnumFontSizes(ENUMLOGFONTEX *lpelfe, - NEWTEXTMETRICEX *lpntme, - DWORD FontType, - LPARAM lParam) -{ - static int ttsizes[] = { 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72 }; - TCHAR ach[100]; - - BOOL fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; - - HWND hwndCombo = (HWND)lParam; - INT i, idx; - - if (fTrueType) - { - for (i = 0; i < ARRAYSIZE(ttsizes); i++) - { - wsprintf(ach, _T("%d"), ttsizes[i]); - - idx = (INT)SendMessage(hwndCombo, - CB_ADDSTRING, - 0, - (LPARAM)ach); - - SendMessage(hwndCombo, - CB_SETITEMDATA, - idx, - ttsizes[i]); - } - - return 0; - } - - return 1; -} - - -/* Font-enumeration callback */ -int CALLBACK -EnumFontNames(ENUMLOGFONTEX *lpelfe, - NEWTEXTMETRICEX *lpntme, - DWORD FontType, - LPARAM lParam) -{ - HWND hwndCombo = (HWND)lParam; - TCHAR *pszName = lpelfe->elfLogFont.lfFaceName; - - /* make sure font doesn't already exist in our list */ - if(SendMessage(hwndCombo, - CB_FINDSTRINGEXACT, - 0, - (LPARAM)pszName) == CB_ERR) - { - INT idx; - BOOL fFixed; - BOOL fTrueType; - - /* add the font */ - idx = (INT)SendMessage(hwndCombo, - CB_ADDSTRING, - 0, - (LPARAM)pszName); - - /* record the font's attributes (Fixedwidth and Truetype) */ - fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE; - fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; - - /* store this information in the list-item's userdata area */ - SendMessage(hwndCombo, - CB_SETITEMDATA, - idx, - MAKEWPARAM(fFixed, fTrueType)); - } - - return 1; -} - - -VOID -FillFontSizeComboList(HWND hwndCombo) -{ - LOGFONT lf = { 0 }; - HDC hdc = GetDC(hwndCombo); - - /* default size */ - INT cursize = 12; - INT i, count, nearest = 0; - - HFONT hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); - - SendMessage(hwndCombo, - WM_SETFONT, - (WPARAM)hFont, - 0); - - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - - /* empty the list */ - SendMessage(hwndCombo, - CB_RESETCONTENT, - 0, - 0); - - /* enumerate font sizes */ - EnumFontFamiliesEx(hdc, - &lf, - (FONTENUMPROC)EnumFontSizes, - (LPARAM)hwndCombo, - 0); - - /* set selection to first item */ - count = (INT)SendMessage(hwndCombo, - CB_GETCOUNT, - 0, - 0); - - for(i = 0; i < count; i++) - { - INT n = (INT)SendMessage(hwndCombo, - CB_GETITEMDATA, - i, - 0); - - if (n <= cursize) - nearest = i; - } - - SendMessage(hwndCombo, - CB_SETCURSEL, - nearest, - 0); - - ReleaseDC(hwndCombo, - hdc); -} - - -/* Initialize the font-list by enumeration all system fonts */ -VOID -FillFontStyleComboList(HWND hwndCombo) -{ - HDC hdc = GetDC(hwndCombo); - LOGFONT lf; - - /* FIXME: draw each font in its own style */ - HFONT hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); - SendMessage(hwndCombo, - WM_SETFONT, - (WPARAM)hFont, - 0); - - /* FIXME: set this in relation to the widest string */ - SendMessage(hwndCombo, CB_SETDROPPEDWIDTH, 150, 0); - - lf.lfCharSet = ANSI_CHARSET; // DEFAULT_CHARSET; - lf.lfFaceName[0] = _T('\0'); // all fonts - lf.lfPitchAndFamily = 0; - - /* store the list of fonts in the combo */ - EnumFontFamiliesEx(hdc, - &lf, - (FONTENUMPROC)EnumFontNames, - (LPARAM)hwndCombo, 0); - - ReleaseDC(hwndCombo, - hdc); - - /* set default to Arial */ - SendMessage(hwndCombo, - CB_SELECTSTRING, - -1, - (LPARAM)_T("Arial")); - - -} diff --git a/modules/rosapps/applications/imagesoft/imageprop.h b/modules/rosapps/applications/imagesoft/imageprop.h deleted file mode 100644 index ac0246479a0..00000000000 --- a/modules/rosapps/applications/imagesoft/imageprop.h +++ /dev/null @@ -1,49 +0,0 @@ - -typedef struct _IMAGEADJUST -{ - PMAIN_WND_INFO Info; - HWND hPicPrev; - HBITMAP hBitmap; - HBITMAP hPreviewBitmap; - RECT ImageRect; - INT RedVal; - INT GreenVal; - INT BlueVal; -} IMAGEADJUST, *PIMAGEADJUST; - - -INT_PTR CALLBACK ImagePropDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); - -INT_PTR CALLBACK BrightnessProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); - -INT_PTR CALLBACK ContrastProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); - -VOID AdjustBrightness(HBITMAP hOrigBitmap, - HBITMAP hNewBitmap, - HWND hwnd, - HDC hdcMem, - INT RedVal, - INT GreenVal, - INT BlueVal); - -BOOL DisplayBlackAndWhite(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap); -BOOL DisplayInvertedColors(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap); -BOOL DisplayBlur(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap); -BOOL DisplaySharpness(HWND hwnd, - HDC hdcMem, - HBITMAP hBitmap); diff --git a/modules/rosapps/applications/imagesoft/imagesoft.c b/modules/rosapps/applications/imagesoft/imagesoft.c deleted file mode 100644 index c54300763e7..00000000000 --- a/modules/rosapps/applications/imagesoft/imagesoft.c +++ /dev/null @@ -1,101 +0,0 @@ -#include <precomp.h> - -HINSTANCE hInstance; -HANDLE ProcessHeap; - -int WINAPI -_tWinMain(HINSTANCE hThisInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - LPTSTR lpAppName, lpVersion, lpTitle; - HWND hMainWnd; - MSG Msg; - BOOL bRet; - int Ret = 1; - size_t len; - INITCOMMONCONTROLSEX icex; - - hInstance = hThisInstance; - ProcessHeap = GetProcessHeap(); - - icex.dwSize = sizeof(icex); - icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; - InitCommonControlsEx(&icex); - - if ( !AllocAndLoadString(&lpAppName, hInstance, IDS_APPNAME) || - !AllocAndLoadString(&lpVersion, hInstance, IDS_VERSION) ) - { - return Ret; - } - - len = _tcslen(lpAppName) + _tcslen(lpVersion); - lpTitle = HeapAlloc(ProcessHeap, - 0, - (len + 2) * sizeof(TCHAR)); - if (lpTitle == NULL) - { - LocalFree((HLOCAL)lpAppName); - LocalFree((HLOCAL)lpVersion); - return Ret; - } - - wsprintf(lpTitle, - _T("%s %s"), - lpAppName, - lpVersion); - - LocalFree((HLOCAL)lpAppName); - LocalFree((HLOCAL)lpVersion); - - if (TbdInitImpl()) - { - if (InitMainWindowImpl()) - { - if (InitImageEditWindowImpl()) - { - if (InitFloatWndClass()) - { - hMainWnd = CreateMainWindow(lpTitle, - nCmdShow); - if (hMainWnd != NULL) - { - /* pump the message queue */ - while ((bRet = GetMessage(&Msg, - NULL, - 0, - 0) != 0)) - { - if (bRet != (BOOL)-1) - { - if (!MainWndTranslateMDISysAccel(hMainWnd, - &Msg)) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - } - - Ret = 0; - } - - UninitImageEditWindowImpl(); - } - - UninitFloatWndImpl(); - } - - UninitMainWindowImpl(); - } - - TbdUninitImpl(); - } - - HeapFree(GetProcessHeap(), - 0, - lpTitle); - - return Ret; -} diff --git a/modules/rosapps/applications/imagesoft/imagesoft.rc b/modules/rosapps/applications/imagesoft/imagesoft.rc deleted file mode 100644 index 24a1fd72da5..00000000000 --- a/modules/rosapps/applications/imagesoft/imagesoft.rc +++ /dev/null @@ -1,72 +0,0 @@ -#include <windows.h> -#include <commctrl.h> -#include "resource.h" - -/* define language neutral resources */ -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Image Editor" -#define REACTOS_STR_INTERNAL_NAME "imagesoft" -#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe" -#include <reactos/version.rc> - -IDI_IMAGESOFTICON ICON "res/imagesoft.ico" - -/* main toolbar icons */ -IDB_MAINNEW BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" -IDB_MAINOPEN BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" -IDB_MAINSAVE BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" -IDB_MAINPRINT BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" -IDB_MAINPRINTPRE BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" -IDB_MAINCUT BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" -IDB_MAINCOPY BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" -IDB_MAINPASTE BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" -IDB_MAINUNDO BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" -IDB_MAINREDO BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" - -/* text toolbar icons */ -IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" -IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" -IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/text/TextUnderlineIcon.bmp" -IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/text/TextAlignLeftIcon.bmp" -IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/text/TextAlignCenterIcon.bmp" -IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/text/TextAlignRightIcon.bmp" - -/* tools window icons */ -IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" -IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" -IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" -IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" -IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" -IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" -IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" -IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" -IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" -IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" -IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" -IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" -IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" -IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" -IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" -IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" -IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" -IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" -IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" -IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" - -/* history window icons */ -IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" -IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" -IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" -IDB_HISTFORWARD BITMAP DISCARDABLE "res/icons/hist/HistForward.bmp" -IDB_HISTDELETE BITMAP DISCARDABLE "res/icons/hist/HistDelete.bmp" - -/* colors window icons */ -IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" -IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" - -/* cursors */ -IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" -IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" - -#include "rsrc.rc" diff --git a/modules/rosapps/applications/imagesoft/imgedwnd.c b/modules/rosapps/applications/imagesoft/imgedwnd.c deleted file mode 100644 index 846e50f294e..00000000000 --- a/modules/rosapps/applications/imagesoft/imgedwnd.c +++ /dev/null @@ -1,542 +0,0 @@ -#include "precomp.h" - -static const TCHAR szImageEditWndClass[] = TEXT("ImageSoftEditWndClass"); - -#define IMAGE_FRAME_SIZE 1 - -static VOID -EditWndUpdateScrollInfo(PEDIT_WND_INFO Info) -{ - SCROLLINFO si; - RECT rcClient; - - GetClientRect(Info->hSelf, - &rcClient); - - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_RANGE; - si.nPage = rcClient.right - (2 * IMAGE_FRAME_SIZE); - si.nMin = 0; - si.nMax = Info->Width; - - SetScrollInfo(Info->hSelf, - SB_HORZ, - &si, - TRUE); - - si.nPage = rcClient.bottom - (2 * IMAGE_FRAME_SIZE); - si.nMax = Info->Height; - SetScrollInfo(Info->hSelf, - SB_VERT, - &si, - TRUE); -} - - -static BOOL -LoadBlankCanvas(PEDIT_WND_INFO Info) -{ - /* FIXME: convert this to a DIB Section */ - /* set bitmap dimensions */ - Info->Width = Info->OpenInfo->New.Width; - Info->Height = Info->OpenInfo->New.Height; - - return TRUE; -} - -static BOOL -LoadDIBImage(PEDIT_WND_INFO Info) -{ - BITMAPFILEHEADER bmfh; - HANDLE hFile; - BITMAP bitmap; - DWORD BytesRead; - BOOL bSuccess, bRet = FALSE; - - hFile = CreateFile(Info->OpenInfo->Open.lpImagePath, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - if (hFile == INVALID_HANDLE_VALUE) - return bRet; - - bSuccess = ReadFile(hFile, - &bmfh, - sizeof(bmfh), - &BytesRead, - NULL); - - if (bSuccess && (BytesRead == sizeof(bmfh)) - && (bmfh.bfType == *(WORD *)"BM")) - { - DWORD InfoSize = bmfh.bfOffBits - sizeof(bmfh); - - Info->pbmi = HeapAlloc(ProcessHeap, - 0, - InfoSize); - if (Info->pbmi) - { - bSuccess = ReadFile(hFile, - Info->pbmi, - InfoSize, - &BytesRead, - NULL); - - if (bSuccess && (BytesRead == InfoSize)) - { - Info->hBitmap = CreateDIBSection(NULL, - Info->pbmi, - DIB_RGB_COLORS, - (VOID *)&Info->pBits, - NULL, - 0); - if (Info->hBitmap != NULL) - { - ReadFile(hFile, - Info->pBits, - bmfh.bfSize - bmfh.bfOffBits, - &BytesRead, - NULL); - - GetObject(Info->hBitmap, - sizeof(bitmap), - &bitmap); - - Info->Width = bitmap.bmWidth; - Info->Height = bitmap.bmHeight; - - bRet = TRUE; - } - } - } - } - else if (!bSuccess) - { - GetError(0); - } - - CloseHandle(hFile); - - return bRet; -} - - -static BOOL -InitEditWnd(PEDIT_WND_INFO Info) -{ - //BOOL bRet = FALSE; - - Info->Zoom = 100; - - if (Info->OpenInfo != NULL) - { - HDC hDC; - - if (Info->hDCMem) - { - DeleteObject(Info->hDCMem); - Info->hDCMem = NULL; - } - - hDC = GetDC(Info->hSelf); - Info->hDCMem = CreateCompatibleDC(hDC); - ReleaseDC(Info->hSelf, hDC); - - if (Info->OpenInfo->CreateNew) - { - LoadBlankCanvas(Info); - } - else - { - LoadDIBImage(Info); - } - - Info->OpenInfo = NULL; - } - - EditWndUpdateScrollInfo(Info); - - /* Add image editor to the list */ - Info->Next = Info->MainWnd->ImageEditors; - Info->MainWnd->ImageEditors = Info; - - InvalidateRect(Info->hSelf, - NULL, - TRUE); - - /* FIXME - if returning FALSE, remove the image editor from the list! */ - return TRUE; -} - -static VOID -DestroyEditWnd(PEDIT_WND_INFO Info) -{ - PEDIT_WND_INFO *PrevEditor; - PEDIT_WND_INFO Editor; - - DeleteDC(Info->hDCMem); - - /* FIXME - free resources and run down editor */ - HeapFree(ProcessHeap, - 0, - Info->pbmi); - HeapFree(ProcessHeap, - 0, - Info->pBits); - - /* Remove the image editor from the list */ - PrevEditor = &Info->MainWnd->ImageEditors; - Editor = Info->MainWnd->ImageEditors; - do - { - if (Editor == Info) - { - *PrevEditor = Info->Next; - break; - } - PrevEditor = &Editor->Next; - Editor = Editor->Next; - } while (Editor != NULL); -} - -static VOID -ImageEditWndRepaint(PEDIT_WND_INFO Info, - HDC hDC, - LPPAINTSTRUCT lpps) -{ - HBITMAP hOldBitmap; - - if (Info->hBitmap) - { - hOldBitmap = (HBITMAP) SelectObject(Info->hDCMem, - Info->hBitmap); - - BitBlt(hDC, - lpps->rcPaint.left, - lpps->rcPaint.top, - lpps->rcPaint.right - lpps->rcPaint.left, - lpps->rcPaint.bottom - lpps->rcPaint.top, - Info->hDCMem, - lpps->rcPaint.left, - lpps->rcPaint.top, - SRCCOPY); - - Info->hBitmap = SelectObject(Info->hDCMem, hOldBitmap); - } -} - -static LRESULT CALLBACK -ImageEditWndProc(HWND hwnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PEDIT_WND_INFO Info; - LRESULT Ret = 0; - HDC hDC; - static INT xMouse, yMouse; - static BOOL bLeftButtonDown, bRightButtonDown; - - /* Get the window context */ - Info = (PEDIT_WND_INFO)GetWindowLongPtr(hwnd, - GWLP_USERDATA); - if (Info == NULL && uMsg != WM_CREATE) - { - goto HandleDefaultMessage; - } - - switch (uMsg) - { - case WM_CREATE: - { - Info = (PEDIT_WND_INFO)(((LPMDICREATESTRUCT)((LPCREATESTRUCT)lParam)->lpCreateParams)->lParam); - Info->hSelf = hwnd; - - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)Info); - - if (!InitEditWnd(Info)) - { - Ret = (LRESULT)-1; - break; - } - break; - } -/* - case WM_ERASEBKGND: - if (Info->Width != 0 && Info->Height != 0) - { - Ret = TRUE; - } - break; -*/ - case WM_LBUTTONDOWN: - if (! bRightButtonDown) - SetCapture(Info->hSelf); - - bLeftButtonDown = TRUE; - xMouse = LOWORD(lParam); - yMouse = HIWORD(lParam); - - SetCursor(LoadCursor(hInstance, - MAKEINTRESOURCE(IDC_PAINTBRUSHCURSORMOUSEDOWN))); - break; - - case WM_LBUTTONUP: - if (bLeftButtonDown) - SetCapture(NULL); - - bLeftButtonDown = FALSE; - - break; - - case WM_RBUTTONDOWN: - if (! bLeftButtonDown) - SetCapture(Info->hSelf); - - bRightButtonDown = TRUE; - xMouse = LOWORD(lParam); - yMouse = HIWORD(lParam); - - SetCursor(LoadCursor(hInstance, - MAKEINTRESOURCE(IDC_PAINTBRUSHCURSORMOUSEDOWN))); - break; - - case WM_RBUTTONUP: - if (bRightButtonDown) - SetCapture(NULL); - - bRightButtonDown = FALSE; - - break; - - case WM_MOUSEMOVE: - { - HPEN hPen, hPenOld; - - if (!bLeftButtonDown && !bRightButtonDown) - break; - - hDC = GetDC(Info->hSelf); - - SelectObject(Info->hDCMem, - Info->hBitmap); - - if (bLeftButtonDown) - hPen = CreatePen(PS_SOLID, - 3, - RGB(0, 0, 0)); - else - hPen = CreatePen(PS_SOLID, - 3, - RGB(255, 255, 255)); - - hPenOld = SelectObject(hDC, - hPen); - SelectObject(Info->hDCMem, - hPen); - - MoveToEx(hDC, - xMouse, - yMouse, - NULL); - - MoveToEx(Info->hDCMem, - xMouse, - yMouse, - NULL); - - xMouse = LOWORD(lParam); - yMouse = HIWORD(lParam); - - LineTo(hDC, - xMouse, - yMouse); - - LineTo(Info->hDCMem, - xMouse, - yMouse); - - SelectObject(hDC, - hPenOld); - DeleteObject(SelectObject(Info->hDCMem, - hPenOld)); - - ReleaseDC(Info->hSelf, - hDC); - } - break; - - case WM_PAINT: - { - if (Info->Width != 0 && Info->Height != 0) - { - PAINTSTRUCT ps; - HDC hDC; - - hDC = BeginPaint(hwnd, - &ps); - if (hDC != NULL) - { - ImageEditWndRepaint(Info, - hDC, - &ps); - - EndPaint(hwnd, - &ps); - } - } - break; - } - - case WM_SIZE: - { - EditWndUpdateScrollInfo(Info); - goto HandleDefaultMessage; - } - - case WM_MENUSELECT: - case WM_ENTERMENULOOP: - case WM_EXITMENULOOP: - /* forward these messages to the main window procedure */ - Ret = SendMessage(Info->MainWnd->hSelf, - uMsg, - wParam, - lParam); - break; - - case WM_MDIACTIVATE: - /* Switch the main window context if neccessary */ - MainWndSwitchEditorContext(Info->MainWnd, - (HWND)wParam, - (HWND)lParam); - break; - - case WM_DESTROY: - { - DestroyEditWnd(Info); - - HeapFree(ProcessHeap, - 0, - Info); - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - 0); - break; - } - - default: -HandleDefaultMessage: - Ret = DefMDIChildProc(hwnd, - uMsg, - wParam, - lParam); - break; - } - - return Ret; -} - -VOID -SetImageEditorEnvironment(PEDIT_WND_INFO Info, - BOOL Setup) -{ - if (Setup) - { - /* FIXME - setup editor environment (e.g. show toolbars, enable menus etc) */ - } - else - { - /* FIXME - cleanup editor environment (e.g. hide toolbars, disable menus etc) */ - } -} - -BOOL -CreateImageEditWindow(PMAIN_WND_INFO MainWnd, - POPEN_IMAGE_EDIT_INFO OpenInfo) -{ - PEDIT_WND_INFO Info; - HWND hWndEditor; - LONG Width, Height; - - Info = HeapAlloc(ProcessHeap, - 0, - sizeof(EDIT_WND_INFO)); - if (Info != NULL) - { - ZeroMemory(Info, - sizeof(EDIT_WND_INFO)); - Info->MainWnd = MainWnd; - Info->MdiEditorType = metImageEditor; - Info->OpenInfo = OpenInfo; - - if (OpenInfo->CreateNew) - { - Width = OpenInfo->New.Width; - Height = OpenInfo->New.Height; - } - else - { - Width = CW_USEDEFAULT; - Height = CW_USEDEFAULT; - } - - hWndEditor = CreateMDIWindow(szImageEditWndClass, - OpenInfo->lpImageName, - WS_HSCROLL | WS_VSCROLL | WS_MAXIMIZE, - 200, - 200, - Width, - Height, - MainWnd->hMdiClient, - hInstance, - (LPARAM)Info); - - if (hWndEditor != NULL) - { - return TRUE; - } - - HeapFree(ProcessHeap, - 0, - Info); - } - - return FALSE; -} - -BOOL -InitImageEditWindowImpl(VOID) -{ - WNDCLASSEX wc = {0}; - - wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = ImageEditWndProc; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, - MAKEINTRESOURCE(IDI_IMAGESOFTICON)); - wc.hCursor = LoadCursor(hInstance, - MAKEINTRESOURCE(IDC_PAINTBRUSHCURSOR)); - wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); - wc.lpszClassName = szImageEditWndClass; - wc.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_IMAGESOFTICON), - IMAGE_ICON, - 16, - 16, - LR_SHARED); - - return RegisterClassEx(&wc) != (ATOM)0; -} - -VOID -UninitImageEditWindowImpl(VOID) -{ - UnregisterClass(szImageEditWndClass, - hInstance); -} diff --git a/modules/rosapps/applications/imagesoft/imgedwnd.h b/modules/rosapps/applications/imagesoft/imgedwnd.h deleted file mode 100644 index 55b203fef4f..00000000000 --- a/modules/rosapps/applications/imagesoft/imgedwnd.h +++ /dev/null @@ -1,94 +0,0 @@ -#define MONOCHROMEBITS 1 -#define GREYSCALEBITS 8 -#define PALLETEBITS 8 -#define TRUECOLORBITS 24 - -#define PIXELS 0 -#define CENTIMETERS 1 -#define INCHES 2 - - -/* generic definitions and forward declarations */ -struct _MAIN_WND_INFO; -struct _EDIT_WND_INFO; - - -typedef enum _MDI_EDITOR_TYPE { - metUnknown = 0, - metImageEditor, -} MDI_EDITOR_TYPE, *PMDI_EDITOR_TYPE; - -typedef enum -{ - tSelect = 0, - tMove, - tLasso, - tZoom, - tMagicWand, - tBrush, - tEraser, - tPencil, - tColorPick, - tStamp, - tFill, - tLine, - tPolyline, - tRectangle, - tRoundRectangle, - tPolygon, - tElipse, -} TOOL; - -typedef struct _OPEN_IMAGE_EDIT_INFO -{ - BOOL CreateNew; - union - { - struct - { - LONG Width; - LONG Height; - } New; - struct - { - LPTSTR lpImagePath; - } Open; - }; - LPTSTR lpImageName; - USHORT Type; - LONG Resolution; -} OPEN_IMAGE_EDIT_INFO, *POPEN_IMAGE_EDIT_INFO; - -typedef struct _EDIT_WND_INFO -{ - MDI_EDITOR_TYPE MdiEditorType; /* Must be first member! */ - - HWND hSelf; - HBITMAP hBitmap; - HDC hDCMem; - PBITMAPINFO pbmi; - PBYTE pBits; - struct _MAIN_WND_INFO *MainWnd; - struct _EDIT_WND_INFO *Next; - POINT ScrollPos; - USHORT Zoom; - DWORD Tool; - - POPEN_IMAGE_EDIT_INFO OpenInfo; /* Only valid during initialization */ - - /* Canvas properties */ - USHORT Type; - LONG Resolution; - /* size of drawing area */ - LONG Width; - LONG Height; - -} EDIT_WND_INFO, *PEDIT_WND_INFO; - - -BOOL CreateImageEditWindow(struct _MAIN_WND_INFO *MainWnd, - POPEN_IMAGE_EDIT_INFO OpenInfo); -VOID SetImageEditorEnvironment(PEDIT_WND_INFO Info, - BOOL Setup); -BOOL InitImageEditWindowImpl(VOID); -VOID UninitImageEditWindowImpl(VOID); diff --git a/modules/rosapps/applications/imagesoft/lang/bg-BG.rc b/modules/rosapps/applications/imagesoft/lang/bg-BG.rc deleted file mode 100644 index 2ab3f5faf92..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/bg-BG.rc +++ /dev/null @@ -1,237 +0,0 @@ -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "в0,1" -END - -IDR_MAINMENU MENU - -BEGIN - POPUP "&Файл" - BEGIN - MENUITEM "&Нов...", ID_NEW - MENUITEM "&Отваряне...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Затваряне\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "Затваряне на всички", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Запис", ID_SAVE, GRAYED - MENUITEM "Запис &като...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Печатен изглед", ID_PRINTPRE,GRAYED - MENUITEM "&Разпечатване...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Свойства", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Из&ход\tAlt+F4", ID_EXIT - END - - POPUP "&Обработка" - BEGIN - MENUITEM "&Отмяна", ID_UNDO, GRAYED - MENUITEM "&Връщане", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "От&рязване", ID_CUT, GRAYED - MENUITEM "За&помняне", ID_COPY, GRAYED - MENUITEM "&Поставяне", ID_PASTE, GRAYED - MENUITEM "Поставяне като ново из&ображение", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Избор на вси&чки", ID_SELALL, GRAYED - END - - POPUP "Из&глед" - BEGIN - MENUITEM "&Средства", ID_TOOLS - MENUITEM "&Цветове", ID_COLOR - MENUITEM "&Дневник", ID_HISTORY - MENUITEM "Лента състояние", ID_STATUSBAR - END - - POPUP "&Настройка" - BEGIN - MENUITEM "Яркост...", ID_BRIGHTNESS - MENUITEM "Контраст...", ID_CONTRAST - MENUITEM "Оттенък/Насищане", -1, GRAYED - POPUP "Цвят" - BEGIN - MENUITEM "Черно- бяло", ID_BLACKANDWHITE - MENUITEM "Обръщане на цветовете", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Размиване", ID_BLUR - MENUITEM "Изостряне", ID_SHARPEN - MENUITEM "Заобляне на ръбовете", -1, GRAYED - MENUITEM "Добавяне на сянка", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Размер на изображението", -1, GRAYED - MENUITEM "Обръщане", -1, GRAYED - MENUITEM "Огледало", -1, GRAYED - MENUITEM "Завъртане", -1, GRAYED - - END - - POPUP "&Цветове" - BEGIN - MENUITEM "&Обработка на цветовете...", ID_EDITCOLOURS - END - POPUP "&Прозорец" - BEGIN - MENUITEM "На&дипляне", ID_WINDOW_CASCADE - MENUITEM "Водоравно настелване", ID_WINDOW_TILE_HORZ - MENUITEM "&Отвесно настелване", ID_WINDOW_TILE_VERT - MENUITEM "Под&реждане на значетата", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "&Следващ\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "Помо&щ" - BEGIN - MENUITEM "&За...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 220, 120 -CAPTION "Яркост" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Цветова форма:", IDC_STATIC, 135, 5, 60, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 77, 48 - CONTROL "Пълноцветно (ЧЗС)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 80, 9 - CONTROL "Червено", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 55, 9 - CONTROL "Зелено", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 55, 9 - CONTROL "Синьо", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 55, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "Добре", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Отказ", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "За ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Затваряне", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 170, 163 -CAPTION "Свойства на изображението" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Име:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 68, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Свойства на платното", IDC_STATIC, 4, 22, 162, 98 - LTEXT "Вид:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Ширина:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 68, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Височина:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 68, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Разделителна способност:", IDC_STATIC, 12, 82, 46, 18 - EDITTEXT IDC_RES_EDIT, 68, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Единици:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Размери:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 68, 125, 54, 9 - PUSHBUTTON "Добре", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Отказ", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for [...] - IDS_READY " Готово." - IDS_TOOLBAR_STANDARD "Стандартно" - IDS_TOOLBAR_TEST "Проба" - IDS_IMAGE_NAME "Изображение %1!u!" - IDS_FLT_TOOLS "Средства" - IDS_FLT_COLORS "Цветове" - IDS_FLT_HISTORY "История (дневник)" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Едноцветно (1 разряд)" - IDS_IMAGE_GREYSCALE "Сиво- бяло (8 разряда)" - IDS_IMAGE_PALETTE "Палитра от 256 цвята" - IDS_IMAGE_TRUECOLOR "Истинска цветност (24 разряда)" - - IDS_UNIT_PIXELS "Точки" - IDS_UNIT_CM "см" - IDS_UNIT_INCHES "Цола" - IDS_UNIT_DOTSCM "Точки/ см" - IDS_UNIT_DPI "Т/Ц" - IDS_UNIT_KB "%d КБ" - IDS_UNIT_MB "%d МБ" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Нов" - IDS_TOOLTIP_OPEN "Отваряне" - IDS_TOOLTIP_SAVE "Запис" - IDS_TOOLTIP_PRINTPRE "Печатен изглед" - IDS_TOOLTIP_PRINT "Разпечатване" - IDS_TOOLTIP_CUT "Отрязване" - IDS_TOOLTIP_COPY "Запомняне" - IDS_TOOLTIP_PASTE "Поставяне" - IDS_TOOLTIP_UNDO "Отмяна" - IDS_TOOLTIP_REDO "Връщане" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Създава нов документ." - IDS_HINT_OPEN " Отваря съществуващ документ." - IDS_HINT_CLOSE " Затваря този прозорец." - IDS_HINT_CLOSEALL " Затваря всички прозорци." - IDS_HINT_SAVE " Затваря дейния документ." - IDS_HINT_SAVEAS " Затваря дейния документ под ново име." - IDS_HINT_PRINTPRE " Показва печатен изглед на документа." - IDS_HINT_PRINT " Разпечатва дейния документ." - IDS_HINT_PROP " Показва свойствата на дейното изображение." - IDS_HINT_EXIT " Излиза от приложението" - - IDS_HINT_TOOLS " Показва или скрива плаващия прозорец на средствата." - IDS_HINT_COLORS " Показва ли скрива плаващия прозорец на цветовете." - IDS_HINT_HISTORY " Показва или скрива плаващия прозорец на историята." - IDS_HINT_STATUS " Показва или скрива лентата на състоянието." - - IDS_HINT_CASCADE " Подрежда прозорците така, че да се застъпват." - IDS_HINT_TILE_HORZ " Подрежда прозорците като незастъпващи се плочки." - IDS_HINT_TILE_VERT " Подрежда прозорците като незастъпващи се плочки." - IDS_HINT_ARRANGE " Подрежда значетата на дъното на прозореца." - IDS_HINT_NEXT " Задейства следващия прозорец." - - IDS_HINT_SYS_RESTORE " Възстановява прозореца до обичайните му размери." - IDS_HINT_SYS_MOVE " Мести прозореца." - IDS_HINT_SYS_SIZE " Преоразмерява прозореца." - IDS_HINT_SYS_MINIMIZE " Смалява прозореца в значе." - IDS_HINT_SYS_MAXIMIZE " Разгръща прозореца на цял екран." -END diff --git a/modules/rosapps/applications/imagesoft/lang/en-GB.rc b/modules/rosapps/applications/imagesoft/lang/en-GB.rc deleted file mode 100644 index 7f665a1ab0e..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/en-GB.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New...", ID_NEW - MENUITEM "&Open...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Close\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "C&lose all", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Save", ID_SAVE, GRAYED - MENUITEM "Save &As...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Print Pre&view", ID_PRINTPRE,GRAYED - MENUITEM "&Print...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&operties...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+F4", ID_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo", ID_UNDO, GRAYED - MENUITEM "&Redo", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_CUT, GRAYED - MENUITEM "&Copy", ID_COPY, GRAYED - MENUITEM "&Paste", ID_PASTE, GRAYED - MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Select &All", ID_SELALL, GRAYED - END - POPUP "&View" - BEGIN - MENUITEM "&Tools", ID_TOOLS - MENUITEM "&Colours", ID_COLOR - MENUITEM "&History", ID_HISTORY - MENUITEM "&Status Bar", ID_STATUSBAR - END - POPUP "&Adjust" - BEGIN - MENUITEM "Brightness...", ID_BRIGHTNESS - MENUITEM "Contrast...", ID_CONTRAST - MENUITEM "Hue/Saturation...", -1, GRAYED - POPUP "Colour" - BEGIN - MENUITEM "Black and White", ID_BLACKANDWHITE - MENUITEM "Invert Colours", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Blur", ID_BLUR - MENUITEM "Sharpen", ID_SHARPEN - MENUITEM "Smooth Edges", -1, GRAYED - MENUITEM "Add Shadow", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Image Size...", -1, GRAYED - MENUITEM "Flip", -1, GRAYED - MENUITEM "Mirror", -1, GRAYED - MENUITEM "Rotate", -1, GRAYED - - END - POPUP "&Colours" - BEGIN - MENUITEM "&Edit Colours...", ID_EDITCOLOURS - END - POPUP "&Window" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT - MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Help" - BEGIN - MENUITEM "&About...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Brightness" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Colour form:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "About ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Image Properties" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Name:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Image type:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Width:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Height:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Resolution:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Image size:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for [...] - IDS_READY " Ready." - IDS_TOOLBAR_STANDARD "Standard" - IDS_TOOLBAR_TEST "Test" - IDS_IMAGE_NAME "Image %1!u!" - IDS_FLT_TOOLS "Tools" - IDS_FLT_COLORS "Colours" - IDS_FLT_HISTORY "History" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" - IDS_IMAGE_GREYSCALE "Greyscale (8 bit)" - IDS_IMAGE_PALETTE "Palette or 256 colour (8 bit)" - IDS_IMAGE_TRUECOLOR "True colour (24 bit)" - - IDS_UNIT_PIXELS "Pixels" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Inches" - IDS_UNIT_DOTSCM "Dots / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "New" - IDS_TOOLTIP_OPEN "Open" - IDS_TOOLTIP_SAVE "Save" - IDS_TOOLTIP_PRINTPRE "Print preview" - IDS_TOOLTIP_PRINT "Print" - IDS_TOOLTIP_CUT "Cut" - IDS_TOOLTIP_COPY "Copy" - IDS_TOOLTIP_PASTE "Paste" - IDS_TOOLTIP_UNDO "Undo" - IDS_TOOLTIP_REDO "Redo" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Creates a new document." - IDS_HINT_OPEN " Opens an existing document." - IDS_HINT_CLOSE " Closes this window." - IDS_HINT_CLOSEALL " Closes all windows." - IDS_HINT_SAVE " Saves the active document." - IDS_HINT_SAVEAS " Saves the active document with a new name." - IDS_HINT_PRINTPRE " Previews the printed document." - IDS_HINT_PRINT " Prints the active document." - IDS_HINT_PROP " Shows the properties of the active image." - IDS_HINT_EXIT " Exits this application." - - IDS_HINT_TOOLS " Shows or hides the tools floating window." - IDS_HINT_COLORS " Shows or hides the colours floating window." - IDS_HINT_HISTORY " Shows or hides the history floating window." - IDS_HINT_STATUS " Shows or hides the status bar." - - IDS_HINT_CASCADE " Arrange windows so they overlap." - IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." - IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." - IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." - IDS_HINT_NEXT " Activates the next window." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." -END diff --git a/modules/rosapps/applications/imagesoft/lang/en-US.rc b/modules/rosapps/applications/imagesoft/lang/en-US.rc deleted file mode 100644 index c3b9a3ced28..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/en-US.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New...", ID_NEW - MENUITEM "&Open...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Close\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "C&lose all", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Save", ID_SAVE, GRAYED - MENUITEM "Save &As...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Print Pre&view", ID_PRINTPRE,GRAYED - MENUITEM "&Print...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&operties...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+F4", ID_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo", ID_UNDO, GRAYED - MENUITEM "&Redo", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_CUT, GRAYED - MENUITEM "&Copy", ID_COPY, GRAYED - MENUITEM "&Paste", ID_PASTE, GRAYED - MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Select &All", ID_SELALL, GRAYED - END - POPUP "&View" - BEGIN - MENUITEM "&Tools", ID_TOOLS - MENUITEM "&Colors", ID_COLOR - MENUITEM "&History", ID_HISTORY - MENUITEM "&Status Bar", ID_STATUSBAR - END - POPUP "&Adjust" - BEGIN - MENUITEM "Brightness...", ID_BRIGHTNESS - MENUITEM "Contrast...", ID_CONTRAST - MENUITEM "Hue/Saturation...", -1, GRAYED - POPUP "Color" - BEGIN - MENUITEM "Black and White", ID_BLACKANDWHITE - MENUITEM "Invert Colors", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Blur", ID_BLUR - MENUITEM "Sharpen", ID_SHARPEN - MENUITEM "Smooth Edges", -1, GRAYED - MENUITEM "Add Shadow", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Image Size...", -1, GRAYED - MENUITEM "Flip", -1, GRAYED - MENUITEM "Mirror", -1, GRAYED - MENUITEM "Rotate", -1, GRAYED - - END - POPUP "&Colors" - BEGIN - MENUITEM "&Edit Colors...", ID_EDITCOLOURS - END - POPUP "&Window" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT - MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Help" - BEGIN - MENUITEM "&About...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Brightness" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "About ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Image Properties" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Name:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Image type:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Width:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Height:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Resolution:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Image size:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for [...] - IDS_READY " Ready." - IDS_TOOLBAR_STANDARD "Standard" - IDS_TOOLBAR_TEST "Test" - IDS_IMAGE_NAME "Image %1!u!" - IDS_FLT_TOOLS "Tools" - IDS_FLT_COLORS "Colors" - IDS_FLT_HISTORY "History" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" - IDS_IMAGE_GREYSCALE "Grayscale (8 bit)" - IDS_IMAGE_PALETTE "Palette or 256 color (8 bit)" - IDS_IMAGE_TRUECOLOR "True color (24 bit)" - - IDS_UNIT_PIXELS "Pixels" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Inches" - IDS_UNIT_DOTSCM "Dots / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "New" - IDS_TOOLTIP_OPEN "Open" - IDS_TOOLTIP_SAVE "Save" - IDS_TOOLTIP_PRINTPRE "Print preview" - IDS_TOOLTIP_PRINT "Print" - IDS_TOOLTIP_CUT "Cut" - IDS_TOOLTIP_COPY "Copy" - IDS_TOOLTIP_PASTE "Paste" - IDS_TOOLTIP_UNDO "Undo" - IDS_TOOLTIP_REDO "Redo" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Creates a new document." - IDS_HINT_OPEN " Opens an existing document." - IDS_HINT_CLOSE " Closes this window." - IDS_HINT_CLOSEALL " Closes all windows." - IDS_HINT_SAVE " Saves the active document." - IDS_HINT_SAVEAS " Saves the active document with a new name." - IDS_HINT_PRINTPRE " Previews the printed document." - IDS_HINT_PRINT " Prints the active document." - IDS_HINT_PROP " Shows the properties of the active image." - IDS_HINT_EXIT " Exits this application." - - IDS_HINT_TOOLS " Shows or hides the tools floating window." - IDS_HINT_COLORS " Shows or hides the colors floating window." - IDS_HINT_HISTORY " Shows or hides the history floating window." - IDS_HINT_STATUS " Shows or hides the status bar." - - IDS_HINT_CASCADE " Arrange windows so they overlap." - IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." - IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." - IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." - IDS_HINT_NEXT " Activates the next window." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." -END diff --git a/modules/rosapps/applications/imagesoft/lang/es-ES.rc b/modules/rosapps/applications/imagesoft/lang/es-ES.rc deleted file mode 100644 index 5378f8ddf23..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/es-ES.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Nuevo...", ID_NEW - MENUITEM "&Abrir...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Cerrar\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "C&errar todo", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Guardar", ID_SAVE, GRAYED - MENUITEM "G&uardar Como...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Vista Preliminar", ID_PRINTPRE,GRAYED - MENUITEM "&Imprimir...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&opiedades...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Salir\tAlt+F4", ID_EXIT - END - POPUP "&Editar" - BEGIN - MENUITEM "&Deshacer", ID_UNDO, GRAYED - MENUITEM "&Rehacer", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Cor&tar", ID_CUT, GRAYED - MENUITEM "&Copiar", ID_COPY, GRAYED - MENUITEM "&Pegar", ID_PASTE, GRAYED - MENUITEM "Pegar como nueva &imagen", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo", ID_SELALL, GRAYED - END - POPUP "&Ver" - BEGIN - MENUITEM "H&erramientas", ID_TOOLS - MENUITEM "&Colores", ID_COLOR - MENUITEM "&Historia", ID_HISTORY - MENUITEM "&Barra de estado", ID_STATUSBAR - END - POPUP "&Ajuste" - BEGIN - MENUITEM "Brillo...", ID_BRIGHTNESS - MENUITEM "Contraste...", ID_CONTRAST - MENUITEM "Matiz/Saturación...", -1, GRAYED - POPUP "Color" - BEGIN - MENUITEM "Blanco y negro", ID_BLACKANDWHITE - MENUITEM "Invertir Colores", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Contorno", ID_BLUR - MENUITEM "Afilar", ID_SHARPEN - MENUITEM "Suavizar bordes", -1, GRAYED - MENUITEM "Añadir Sombra", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Tamaño de la Imagen...", -1, GRAYED - MENUITEM "Voltear", -1, GRAYED - MENUITEM "Espejo", -1, GRAYED - MENUITEM "Rotar", -1, GRAYED - - END - POPUP "&Colores" - BEGIN - MENUITEM "&Editar Colores...", ID_EDITCOLOURS - END - POPUP "&Ventana" - BEGIN - MENUITEM "&Cascada", ID_WINDOW_CASCADE - MENUITEM "Dividir &Horizontalmente", ID_WINDOW_TILE_HORZ - MENUITEM "Dividir &Verticalmente", ID_WINDOW_TILE_VERT - MENUITEM "&Organizar Iconos", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Siguien&te\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "Ay&uda" - BEGIN - MENUITEM "&Acerca de...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Brillo" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Color de:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Completo (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Rojo", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Verde", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Azul", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "Aceptar", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Cancelar", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Acerca de ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Propiedades de la Imagen" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Nombre:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Propiedades de la imagen ", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Tipo de Imagen:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Anchura:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Altura:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Resolución:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unidades:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Tamaño de la imagen:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "Aceptar", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Cancelar", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "Este programa es un software libre; puede distribuirlo y/o modificarlo bajo los términos de la Licencia Pública General GNU publicada por la Free Software Foundation; ya sea la versión 2 de la Licencia u, opcionalmente, cualquier versión posterior.\r\n\r\nEste programa se distribuye esperando que sea usable, pero NO TIENE NINGÚN TIPO DE GARANTÍA; tampoco las que impliquen garantía MERCANTIL o de CUMPLIMIENTO DE UN PROPÓSITO PARTICULAR. Mira la Licencia Pública de [...] - IDS_READY " Preparado." - IDS_TOOLBAR_STANDARD "Estándar" - IDS_TOOLBAR_TEST "Prueba" - IDS_IMAGE_NAME "Imagen %1!u!" - IDS_FLT_TOOLS "Herramientas" - IDS_FLT_COLORS "Colores" - IDS_FLT_HISTORY "Historial" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monocromo (1 bit)" - IDS_IMAGE_GREYSCALE "Escala de Grises (8 bit)" - IDS_IMAGE_PALETTE "Paleta o 256 colores (8 bit)" - IDS_IMAGE_TRUECOLOR "Color verdadero (24 bit)" - - IDS_UNIT_PIXELS "Pixels" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Pulgadas" - IDS_UNIT_DOTSCM "Puntos / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Nuevo" - IDS_TOOLTIP_OPEN "Abrir" - IDS_TOOLTIP_SAVE "Guardar" - IDS_TOOLTIP_PRINTPRE "Vista preliminar" - IDS_TOOLTIP_PRINT "Imprimir" - IDS_TOOLTIP_CUT "Cortar" - IDS_TOOLTIP_COPY "Copiar" - IDS_TOOLTIP_PASTE "Pegar" - IDS_TOOLTIP_UNDO "Deshacer" - IDS_TOOLTIP_REDO "Rehacer" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Crear un documento nuevo." - IDS_HINT_OPEN " Abrir un documento existente." - IDS_HINT_CLOSE " Cerrar esta ventana." - IDS_HINT_CLOSEALL " Cerrar todas las ventanas." - IDS_HINT_SAVE " Guardar el documento activo." - IDS_HINT_SAVEAS " Guardar el documento activo con un nuevo nombre." - IDS_HINT_PRINTPRE " Previsualizar impresión." - IDS_HINT_PRINT " Imprimir el documento activo." - IDS_HINT_PROP " Mostrar las propiedades de la imagen activa." - IDS_HINT_EXIT " Cerrar esta aplicación." - - IDS_HINT_TOOLS " Mostrar u ocultar la ventana flotante de herramientas." - IDS_HINT_COLORS " Mostrar u ocultar la ventana flotante de colores." - IDS_HINT_HISTORY " Mostrar u ocultar la ventana flotande de historial." - IDS_HINT_STATUS " Mostrar u ocultar la barra de estado." - - IDS_HINT_CASCADE " Colocar las ventanas superpuestas." - IDS_HINT_TILE_HORZ " Colocar las ventanas sin superponer los títulos." - IDS_HINT_TILE_VERT " Colocar las ventanas sin superponer los títulos." - IDS_HINT_ARRANGE " Colocar los iconos en la parte baja de la ventana." - IDS_HINT_NEXT " Activar la siguiente ventana." - - IDS_HINT_SYS_RESTORE " Restaurar esta ventana al tamaño normal." - IDS_HINT_SYS_MOVE " Mover esta ventana." - IDS_HINT_SYS_SIZE " Redimensionar esta ventana." - IDS_HINT_SYS_MINIMIZE " Minimizar esta ventana a un icono." - IDS_HINT_SYS_MAXIMIZE " Expandir esta ventana para llenar la pantalla." -END diff --git a/modules/rosapps/applications/imagesoft/lang/fr-FR.rc b/modules/rosapps/applications/imagesoft/lang/fr-FR.rc deleted file mode 100644 index 1d31b417d91..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/fr-FR.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&Fichier" - BEGIN - MENUITEM "&Nouveau...", ID_NEW - MENUITEM "&Ouvrir...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "Fermer\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "Fermer tout", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "Enregistrer", ID_SAVE, GRAYED - MENUITEM "Enregistrer sous...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aperçu a&vant impression", ID_PRINTPRE,GRAYED - MENUITEM "Im&primer...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&opriétés...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Quitter\tAlt+F4", ID_EXIT - END - POPUP "&Édition" - BEGIN - MENUITEM "Annuler", ID_UNDO, GRAYED - MENUITEM "&Rétablir", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Couper", ID_CUT, GRAYED - MENUITEM "&Copier", ID_COPY, GRAYED - MENUITEM "Coller", ID_PASTE, GRAYED - MENUITEM "Coller en tant qu'&image", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Tout sélectionner", ID_SELALL, GRAYED - END - POPUP "Affichage" - BEGIN - MENUITEM "Ou&tils", ID_TOOLS - MENUITEM "&Couleurs", ID_COLOR - MENUITEM "&Historique", ID_HISTORY - MENUITEM "Barre de &status", ID_STATUSBAR - END - POPUP "Régl&age" - BEGIN - MENUITEM "Luminosité...", ID_BRIGHTNESS - MENUITEM "Contraste...", ID_CONTRAST - MENUITEM "Teinte/Saturation...", -1, GRAYED - POPUP "Couleur" - BEGIN - MENUITEM "Noir et blanc", ID_BLACKANDWHITE - MENUITEM "Inverser les couleurs", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Rendre flou", ID_BLUR - MENUITEM "Accentuer", ID_SHARPEN - MENUITEM "Lisser les bords", -1, GRAYED - MENUITEM "Ajouter une ombre", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Taille de l'image...", -1, GRAYED - MENUITEM "Retourner", -1, GRAYED - MENUITEM "Inverser", -1, GRAYED // FIXME : Pourrait-être amélioré pour mieux dégager le sens de "mirror" - MENUITEM "Tourner", -1, GRAYED - - END - POPUP "&Couleurs" - BEGIN - MENUITEM "&Éditer les couleurs...", ID_EDITCOLOURS - END - POPUP "Fenêtre" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaïque &verticale", ID_WINDOW_TILE_VERT - MENUITEM "&Arranger les icônes", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Suivan&te\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "Aide" - BEGIN - MENUITEM "&À propos...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Luminosité" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Composante de la couleur:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Complète (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Rouge", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Vert", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Bleu", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Annuler", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "À propos d'ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Propriétés de l'image" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Nom:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Propriétés du support", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Type de l'image:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Largeur:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Hauteur:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Résolution:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unité:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Taille de l'image:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Annuler", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for [...] - IDS_READY " Prêt." - IDS_TOOLBAR_STANDARD "Standard" - IDS_TOOLBAR_TEST "Test" - IDS_IMAGE_NAME "Image %1!u!" - IDS_FLT_TOOLS "Outils" - IDS_FLT_COLORS "Couleurs" - IDS_FLT_HISTORY "Historique" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" - IDS_IMAGE_GREYSCALE "Variantes de gris (8 bit)" - IDS_IMAGE_PALETTE "Palette ou 256 couleurs (8 bit)" - IDS_IMAGE_TRUECOLOR "Couleurs vraies (24 bit)" - - IDS_UNIT_PIXELS "Pixels" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Pouces" - IDS_UNIT_DOTSCM "Points / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d Ko" - IDS_UNIT_MB "%d Mo" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Nouveau" - IDS_TOOLTIP_OPEN "Ouvrir" - IDS_TOOLTIP_SAVE "Enregistrer" - IDS_TOOLTIP_PRINTPRE "Aperçu avant impression" - IDS_TOOLTIP_PRINT "Imprimer" - IDS_TOOLTIP_CUT "Couper" - IDS_TOOLTIP_COPY "Copier" - IDS_TOOLTIP_PASTE "Coller" - IDS_TOOLTIP_UNDO "Annuler" - IDS_TOOLTIP_REDO "Rétablir" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Créé un nouveau document." - IDS_HINT_OPEN " Ouvre un document existant." - IDS_HINT_CLOSE " Ferme cette fenêtre." - IDS_HINT_CLOSEALL " Ferme toutes les fenêtres." - IDS_HINT_SAVE " Enregistre le document courant." - IDS_HINT_SAVEAS " Enregistre le document courant sous un nouveau nom." - IDS_HINT_PRINTPRE " Aperçu avant impression." - IDS_HINT_PRINT " Imprime le document courant." - IDS_HINT_PROP " Montre les propriétés de l'image courante." - IDS_HINT_EXIT " Quitte cette application." - - IDS_HINT_TOOLS " Montre ou cache la fenêtre flottante des outils." - IDS_HINT_COLORS " Montre ou cache la fenêtre flottante des couleurs." - IDS_HINT_HISTORY " Montre ou cache la fenêtre flottante de l'historique." - IDS_HINT_STATUS " Montre ou cache la barre de status." - - IDS_HINT_CASCADE " Arrange les fenêtres en cascade." - IDS_HINT_TILE_HORZ " Arrange les fenêtres en mosaïque horizontale." - IDS_HINT_TILE_VERT " Arrange les fenêtres en mosaïque verticale." - IDS_HINT_ARRANGE " Arrange les icônes en bas de la fenêtre." - IDS_HINT_NEXT " Active la prochaine fenêtre." - - IDS_HINT_SYS_RESTORE " Restaure la taille normale de la fenêtre." - IDS_HINT_SYS_MOVE " Bouge la fenêtre." - IDS_HINT_SYS_SIZE " Retaille la fenêtre." - IDS_HINT_SYS_MINIMIZE " Réduit la fenêtre." - IDS_HINT_SYS_MAXIMIZE " Affiche la fenêtre en plein écran." -END diff --git a/modules/rosapps/applications/imagesoft/lang/id-ID.rc b/modules/rosapps/applications/imagesoft/lang/id-ID.rc deleted file mode 100644 index 09713985ae2..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/id-ID.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Baru...", ID_NEW - MENUITEM "B&uka...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Tutup\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "Tutup s&emua", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Simpan", ID_SAVE, GRAYED - MENUITEM "Simpan Seb&agai...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Tin&jau Cetakan", ID_PRINTPRE,GRAYED - MENUITEM "&Cetak...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&operti...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Keluar\tAlt+F4", ID_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo", ID_UNDO, GRAYED - MENUITEM "&Redo", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_CUT, GRAYED - MENUITEM "&Copy", ID_COPY, GRAYED - MENUITEM "&Paste", ID_PASTE, GRAYED - MENUITEM "Paste sebagai gambar &baru", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pilih &Semua", ID_SELALL, GRAYED - END - POPUP "&Lihat" - BEGIN - MENUITEM "&Piranti", ID_TOOLS - MENUITEM "&Warna", ID_COLOR - MENUITEM "&Histori", ID_HISTORY - MENUITEM "Bar &Status", ID_STATUSBAR - END - POPUP "Sesu&aikan" - BEGIN - MENUITEM "Kecerahan...", ID_BRIGHTNESS - MENUITEM "Kontras...", ID_CONTRAST - MENUITEM "Hue/Saturasi...", -1, GRAYED - POPUP "Warna" - BEGIN - MENUITEM "Hitam dan Putih", ID_BLACKANDWHITE - MENUITEM "Balikkan Warna", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Blur", ID_BLUR - MENUITEM "Sharpen", ID_SHARPEN - MENUITEM "Lembutkan Sisi", -1, GRAYED - MENUITEM "Tambah Bayangan", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ukuran Gambar...", -1, GRAYED - MENUITEM "Flip", -1, GRAYED - MENUITEM "Cermin", -1, GRAYED - MENUITEM "Rotasi", -1, GRAYED - - END - POPUP "&Warna" - BEGIN - MENUITEM "&Edit Warna...", ID_EDITCOLOURS - END - POPUP "&Jendela" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Tile &Horisontal", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertikal", ID_WINDOW_TILE_VERT - MENUITEM "&Atur Ikon", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Beriku&t\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Bantuan" - BEGIN - MENUITEM "&Tentang...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Kecerahan" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Form warna:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Penuh (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Merah", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Hijau", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Biru", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Batal", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Tentang ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nHak Cipta (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Properti Gambar" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Nama:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Properti Kanvas", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Tipe gambar:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Panjang:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Tinggi:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Resolusi:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Besar gambar:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Batal", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public Li [...] - IDS_READY " Siap." - IDS_TOOLBAR_STANDARD "Standar" - IDS_TOOLBAR_TEST "Uji" - IDS_IMAGE_NAME "Gambar %1!u!" - IDS_FLT_TOOLS "Piranti" - IDS_FLT_COLORS "Warna" - IDS_FLT_HISTORY "Histori" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monokrom (1 bit)" - IDS_IMAGE_GREYSCALE "Abu-abu (8 bit)" - IDS_IMAGE_PALETTE "Palet atau 256 warna (8 bit)" - IDS_IMAGE_TRUECOLOR "Warna asli (24 bit)" - - IDS_UNIT_PIXELS "Pixel" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Inci" - IDS_UNIT_DOTSCM "Dot / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Baru" - IDS_TOOLTIP_OPEN "Buka" - IDS_TOOLTIP_SAVE "Simpan" - IDS_TOOLTIP_PRINTPRE "Tinjau cetakan" - IDS_TOOLTIP_PRINT "Cetak" - IDS_TOOLTIP_CUT "Cut" - IDS_TOOLTIP_COPY "Copy" - IDS_TOOLTIP_PASTE "Paste" - IDS_TOOLTIP_UNDO "Undo" - IDS_TOOLTIP_REDO "Redo" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Membuat dokumen baru." - IDS_HINT_OPEN " Membuka dokumen yang sudah ada." - IDS_HINT_CLOSE " Menutup jendela ini." - IDS_HINT_CLOSEALL " Menutup semua jendela." - IDS_HINT_SAVE " Menyimpan dokumen aktif." - IDS_HINT_SAVEAS " Menyimpan dokumen aktif dengan nama baru." - IDS_HINT_PRINTPRE " Meninjau dulu dokumen yang dicetak." - IDS_HINT_PRINT " Mencetak dokumen aktif." - IDS_HINT_PROP " Menampilkan properti gambar yang aktif." - IDS_HINT_EXIT " Keluar aplikasi ini." - - IDS_HINT_TOOLS " Menampilkan atau menyembunyikan jendela layang piranti." - IDS_HINT_COLORS " Menampilkan atau menyembunyikan jendela layang warna." - IDS_HINT_HISTORY " Menampilkan atau menyembunyikan jendela layang histori." - IDS_HINT_STATUS " Menampilkan atau menyembunyikan bar status." - - IDS_HINT_CASCADE " Mengatur jendela agar saling tindih." - IDS_HINT_TILE_HORZ " Mengatur jendela seperti ubin tidak saling tindih." - IDS_HINT_TILE_VERT " Mengatur jendela seperti ubin tidak saling tindih." - IDS_HINT_ARRANGE " Mengatur ikon di bawah jendela." - IDS_HINT_NEXT " Mengaktifkan jendela berikutnya." - - IDS_HINT_SYS_RESTORE " Mengembalikan jendela ini ke ukuran normal." - IDS_HINT_SYS_MOVE " Memindahkan jendela ini." - IDS_HINT_SYS_SIZE " Mengukur ulang jendela ini." - IDS_HINT_SYS_MINIMIZE " Menyempitkan jendela ini menjadi ikon." - IDS_HINT_SYS_MAXIMIZE " Melebarkan jendela ini memenuhi layar ini." -END diff --git a/modules/rosapps/applications/imagesoft/lang/it-IT.rc b/modules/rosapps/applications/imagesoft/lang/it-IT.rc deleted file mode 100644 index 984149bf1a8..00000000000 --- a/modules/rosapps/applications/imagesoft/lang/it-IT.rc +++ /dev/null @@ -1,232 +0,0 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Nuovo...", ID_NEW - MENUITEM "&Apri...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Chiudi\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "C&hiudi tutto", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Salva", ID_SAVE, GRAYED - MENUITEM "Salva co&n nome...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ant&eprima di stampa", ID_PRINTPRE,GRAYED - MENUITEM "S&tampa...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&oprietà...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Esci\tAlt+F4", ID_EXIT - END - POPUP "&Modifica" - BEGIN - MENUITEM "&Annulla", ID_UNDO, GRAYED - MENUITEM "&Ripeti", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Taglia", ID_CUT, GRAYED - MENUITEM "&Copia", ID_COPY, GRAYED - MENUITEM "&Incolla", ID_PASTE, GRAYED - MENUITEM "Incolla come &nuova immagine", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Seleziona tutto", ID_SELALL, GRAYED - END - POPUP "&Visualizza" - BEGIN - MENUITEM "&Strumenti", ID_TOOLS - MENUITEM "&Colori", ID_COLOR - MENUITEM "&Azioni", ID_HISTORY - MENUITEM "&Barra di stato", ID_STATUSBAR - END - POPUP "Co&rreggi" - BEGIN - MENUITEM "Luminosità...", ID_BRIGHTNESS - MENUITEM "Contrasto...", ID_CONTRAST - MENUITEM "Tonalità/Saturazione...", -1, GRAYED - POPUP "Colore" - BEGIN - MENUITEM "Bianco e nero", ID_BLACKANDWHITE - MENUITEM "Inverti i colori", ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Soffuso", ID_BLUR - MENUITEM "Nitido", ID_SHARPEN - MENUITEM "Bordi arrotondati", -1, GRAYED - MENUITEM "Ombra", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Dimensione immagine...", -1, GRAYED - MENUITEM "Ribalta", -1, GRAYED - MENUITEM "Specchio", -1, GRAYED - MENUITEM "Ruota", -1, GRAYED - - END - POPUP "&Colori" - BEGIN - MENUITEM "&Modifica i colori...", ID_EDITCOLOURS - END - POPUP "&Finestre" - BEGIN - MENUITEM "&Sovrapponi", ID_WINDOW_CASCADE - MENUITEM "Affianca &Orizzontalmente", ID_WINDOW_TILE_HORZ - MENUITEM "Affianca &Verticalmente", ID_WINDOW_TILE_VERT - MENUITEM "&Disponi Icone", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Succ&essiva\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Aiuto" - BEGIN - MENUITEM "&Informazioni...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM SEPARATOR - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Luminosità" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Tipo colore:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Rosso", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Verde", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Blu", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Annulla", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Informazioni su ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Proprietà dell'immagine" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Nome:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Proprietà Canvas", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Tipo immagine:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Larghezza:", IDC_STATIC, 12, 51, 42, 9 ... 6015 lines suppressed ...

1 0

[reactos] 01/01: [ARP] Move the message file
by Eric Kohl 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6623b8d15527551e044da… commit 6623b8d15527551e044da01d719209ed6effa552 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Dec 31 16:35:25 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Dec 31 16:35:25 2021 +0100 [ARP] Move the message file Move the message file because we do not need to generate a global message header file for the arp utility. --- base/applications/network/arp/CMakeLists.txt | 1 + base/applications/network/arp/arp.c | 38 ++++++++++++---------- .../applications/network/arp}/arp_msg.mc | 0 sdk/include/reactos/mc/CMakeLists.txt | 1 - 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt index 6aba57385c9..9071093013b 100644 --- a/base/applications/network/arp/CMakeLists.txt +++ b/base/applications/network/arp/CMakeLists.txt @@ -1,4 +1,5 @@ +add_message_headers(UNICODE arp_msg.mc) add_executable(arp arp.c arp.rc) set_module_type(arp win32cui) add_dependencies(arp arp_msg) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index f3e758a0095..467f2560122 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -39,6 +39,8 @@ #include <winsock2.h> #include <iphlpapi.h> +#include <arp_msg.h> + /* * Globals */ @@ -168,19 +170,19 @@ DWORD PrintEntries(PMIB_IPNETROW pIpAddRow) switch (pIpAddRow->dwType) { case MIB_IPNET_TYPE_DYNAMIC: - PrintMessage(10007); + PrintMessage(MSG_ARP_DYNAMIC); break; case MIB_IPNET_TYPE_STATIC: - PrintMessage(10008); + PrintMessage(MSG_ARP_STATIC); break; case MIB_IPNET_TYPE_INVALID: - PrintMessage(10006); + PrintMessage(MSG_ARP_INVALID); break; case MIB_IPNET_TYPE_OTHER: - PrintMessage(10005); + PrintMessage(MSG_ARP_OTHER); break; } _putts(_T("")); @@ -217,7 +219,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) pIpNetTable = (PMIB_IPNETTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -235,7 +237,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* check there are entries in the table */ if (pIpNetTable->dwNumEntries == 0) { - PrintMessage(10018); + PrintMessage(MSG_ARP_NO_ENTRIES); goto cleanup; } @@ -249,7 +251,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) pIpAddrTable = (PMIB_IPADDRTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpAddrTable == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -300,12 +302,12 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* Print message and leave if there are no relevant ARP entries */ if (dwCount == 0) { - PrintMessage(10018); + PrintMessage(MSG_ARP_NO_ENTRIES); goto cleanup; } /* print header, including interface IP address and index number */ - PrintMessageV(10003, szIntIpAddr, pIpNetTable->table[0].dwIndex); + PrintMessageV(MSG_ARP_INTERFACE, szIntIpAddr, pIpNetTable->table[0].dwIndex); /* go through all ARP entries */ for (i = 0; i < pIpNetTable->dwNumEntries; i++) @@ -365,14 +367,14 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) dwIpAddr = inet_addr(pszInetAddr); if (dwIpAddr == INADDR_NONE) { - PrintMessageV(10001, pszInetAddr); + PrintMessageV(MSG_ARP_BAD_IP_ADDRESS, pszInetAddr); return ERROR_INVALID_PARAMETER; } /* check MAC address */ if (strlen(pszEthAddr) != 17) { - PrintMessageV(10002, pszEthAddr); + PrintMessageV(MSG_ARP_BAD_ARGUMENT, pszEthAddr); return ERROR_INVALID_PARAMETER; } @@ -383,7 +385,7 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) if (!isxdigit(pszEthAddr[i])) { - PrintMessageV(10002, pszEthAddr); + PrintMessageV(MSG_ARP_BAD_ARGUMENT, pszEthAddr); return ERROR_INVALID_PARAMETER; } } @@ -396,7 +398,7 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) pIpNetTable = (PMIB_IPNETTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -415,7 +417,7 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) pAddHost = (PMIB_IPNETROW)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pAddHost == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -518,7 +520,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) dwIpAddr = inet_addr(pszInetAddr); if (dwIpAddr == INADDR_NONE) { - PrintMessageV(10001, pszInetAddr); + PrintMessageV(MSG_ARP_BAD_IP_ADDRESS, pszInetAddr); return ERROR_INVALID_PARAMETER; } } @@ -531,7 +533,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -550,7 +552,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) pDelHost = (MIB_IPNETROW *)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pDelHost == NULL) { - PrintMessage(10004); + PrintMessage(MSG_ARP_NO_MEMORY); dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -613,7 +615,7 @@ cleanup: */ VOID Usage(VOID) { - PrintMessage(10000); + PrintMessage(MSG_ARP_SYNTAX); } /* diff --git a/sdk/include/reactos/mc/arp_msg.mc b/base/applications/network/arp/arp_msg.mc similarity index 100% rename from sdk/include/reactos/mc/arp_msg.mc rename to base/applications/network/arp/arp_msg.mc diff --git a/sdk/include/reactos/mc/CMakeLists.txt b/sdk/include/reactos/mc/CMakeLists.txt index 9899bb8a800..46753f3bc16 100644 --- a/sdk/include/reactos/mc/CMakeLists.txt +++ b/sdk/include/reactos/mc/CMakeLists.txt @@ -3,7 +3,6 @@ list(APPEND ANSI_SOURCE bugcodes.mc) list(APPEND UNICODE_SOURCE - arp_msg.mc errcodes.mc net_msg.mc neteventmsg.mc

1 0

[reactos] 01/01: [PSDK][SHELL32][SHELLEXT] Add SHCreateFileExtractIconW() to the PSDK and SAL-annotate it. (#4223)
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7722f39fb687da5b81d3… commit d7722f39fb687da5b81d36f5e043af135c7c97e1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 30 17:32:35 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 31 02:30:58 2021 +0100 [PSDK][SHELL32][SHELLEXT] Add SHCreateFileExtractIconW() to the PSDK and SAL-annotate it. (#4223) Note that even if the MS PSDK and MSDN documents an hypothetical ANSI version SHCreateFileExtractIconA(), this one never existed exported in any Windows version! --- dll/shellext/fontext/CFontExt.cpp | 5 ----- dll/shellext/zipfldr/CZipFolder.hpp | 4 ---- dll/win32/shell32/CExtractIcon.cpp | 15 ++++++++------- sdk/include/psdk/shlobj.h | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index 7fffa90736e..30a62919bb4 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -42,11 +42,6 @@ static FolderViewColumns g_ColumnDefs[] = }; - -// Should fix our headers.. -EXTERN_C HRESULT WINAPI SHCreateFileExtractIconW(LPCWSTR pszPath, DWORD dwFileAttributes, REFIID riid, void **ppv); - - // Helper functions to translate a guid to a readable name bool GetInterfaceName(const WCHAR* InterfaceString, WCHAR* buf, size_t size) { diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp index e89aeb81d87..29644d95c2b 100644 --- a/dll/shellext/zipfldr/CZipFolder.hpp +++ b/dll/shellext/zipfldr/CZipFolder.hpp @@ -5,10 +5,6 @@ * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) */ - -EXTERN_C HRESULT WINAPI SHCreateFileExtractIconW(LPCWSTR pszPath, DWORD dwFileAttributes, REFIID riid, void **ppv); - - struct FolderViewColumns { int iResource; diff --git a/dll/win32/shell32/CExtractIcon.cpp b/dll/win32/shell32/CExtractIcon.cpp index 26bdb4e9307..e82dfec4999 100644 --- a/dll/win32/shell32/CExtractIcon.cpp +++ b/dll/win32/shell32/CExtractIcon.cpp @@ -345,15 +345,17 @@ HRESULT WINAPI SHCreateDefaultExtractIcon(REFIID riid, void **ppv) * Currently (march 2018) our shell does not handle IExtractIconW with an invalid path, * so this (wrong) implementation actually works better for us. */ -EXTERN_C HRESULT +EXTERN_C +HRESULT WINAPI -SHCreateFileExtractIconW(LPCWSTR pszPath, - DWORD dwFileAttributes, - REFIID riid, - void **ppv) +SHCreateFileExtractIconW( + _In_ LPCWSTR pszFile, + _In_ DWORD dwFileAttributes, + _In_ REFIID riid, + _Outptr_ void **ppv) { SHFILEINFOW shfi; - ULONG_PTR firet = SHGetFileInfoW(pszPath, dwFileAttributes, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES | SHGFI_ICONLOCATION); + ULONG_PTR firet = SHGetFileInfoW(pszFile, dwFileAttributes, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES | SHGFI_ICONLOCATION); HRESULT hr = E_FAIL; if (firet) { @@ -373,4 +375,3 @@ SHCreateFileExtractIconW(LPCWSTR pszPath, return hr; } - diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index f8be3e7d299..9f7b215bff8 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2091,6 +2091,28 @@ SHBindToParent( _Outptr_ LPVOID *ppv, _Outptr_opt_ PCUITEMID_CHILD *ppidlLast); +/**************************************************************************** + * SHCreateFileExtractIcon API + */ +#if (NTDDI_VERSION >= NTDDI_WINXP) + +// NOTE: Even if documented on MSDN, the SHCreateFileExtractIconA() +// ANSI function never existed on Windows! + +HRESULT +WINAPI +SHCreateFileExtractIconW( + _In_ LPCWSTR pszFile, + _In_ DWORD dwFileAttributes, + _In_ REFIID riid, + _Outptr_ void **ppv); + +#ifdef UNICODE +#define SHCreateFileExtractIcon SHCreateFileExtractIconW +#endif + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + /**************************************************************************** * SHDefExtractIcon API */

1 0

[reactos] 01/01: [SDK:ATL] Implement GetDlgItemText(BSTR&), GetTopLevelParent(), GetWindowText(CSimpleString&). (#4207)
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14dbd66d8856ec6d71f42… commit 14dbd66d8856ec6d71f429b934366beb6dab83a1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 26 21:13:41 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 31 02:28:10 2021 +0100 [SDK:ATL] Implement GetDlgItemText(BSTR&), GetTopLevelParent(), GetWindowText(CSimpleString&). (#4207) And add SAL annotations to the Get***Text family of functions. --- sdk/lib/atl/atlwin.h | 59 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 0c1251e6525..447e06f94b7 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -568,39 +568,51 @@ public: return E_FAIL;//FIXME stub } - HWND GetDlgItem(int nID) + HWND GetDlgItem(_In_ int nID) const { ATLASSERT(::IsWindow(m_hWnd)); return ::GetDlgItem(m_hWnd, nID); } - UINT GetDlgItemInt(int nID, BOOL* lpTrans = NULL, BOOL bSigned = TRUE) const + UINT GetDlgItemInt( + _In_ int nID, + _Out_opt_ BOOL* lpTrans = NULL, + _In_ BOOL bSigned = TRUE) const { ATLASSERT(::IsWindow(m_hWnd)); return ::GetDlgItemInt(m_hWnd, nID, lpTrans, bSigned); } - UINT GetDlgItemText(int nID, LPTSTR lpStr, int nMaxCount) const + UINT GetDlgItemText( + _In_ int nID, + _Out_writes_to_(nMaxCount, return + 1) LPTSTR lpStr, + _In_ int nMaxCount) const { ATLASSERT(::IsWindow(m_hWnd)); return ::GetDlgItemText(m_hWnd, nID, lpStr, nMaxCount); } #ifdef __ATLSTR_H__ - UINT GetDlgItemText(int nID, CSimpleString& string) + UINT GetDlgItemText(_In_ int nID, _Inout_ CSimpleString& strText) const { HWND item = GetDlgItem(nID); - int len = ::GetWindowTextLength(item); - len = GetDlgItemText(nID, string.GetBuffer(len+1), len+1); - string.ReleaseBuffer(len); - return len; + if (!item) + { + strText.Empty(); + return 0; + } + return CWindow(item).GetWindowText(strText); } #endif - BOOL GetDlgItemText(int nID, BSTR& bstrText) const + BOOL GetDlgItemText( + _In_ int nID, + _Inout_ _Outref_result_maybenull_ _Post_z_ BSTR& bstrText) const { - ATLASSERT(::IsWindow(m_hWnd)); - return FALSE;//FIXME stub + HWND item = GetDlgItem(nID); + if (!item) + return FALSE; + return CWindow(item).GetWindowText(bstrText); } DWORD GetExStyle() const @@ -690,7 +702,13 @@ public: HWND GetTopLevelParent() const { ATLASSERT(::IsWindow(m_hWnd)); - return NULL;//FIXME stub + + HWND hWndParent = m_hWnd; + HWND hWndTmp; + while ((hWndTmp = ::GetParent(hWndParent)) != NULL) + hWndParent = hWndTmp; + + return hWndParent; } HWND GetTopLevelWindow() const @@ -773,13 +791,26 @@ public: return ::GetWindowRgn(m_hWnd, hRgn); } - int GetWindowText(LPTSTR lpszStringBuf, int nMaxCount) const + int GetWindowText( + _Out_writes_to_(nMaxCount, return + 1) LPTSTR lpszStringBuf, + _In_ int nMaxCount) const { ATLASSERT(::IsWindow(m_hWnd)); return ::GetWindowText(m_hWnd, lpszStringBuf, nMaxCount); } - BOOL GetWindowText(BSTR& bstrText) +#ifdef __ATLSTR_H__ + int GetWindowText(_Inout_ CSimpleString& strText) const + { + int len = GetWindowTextLength(); + len = GetWindowText(strText.GetBuffer(len + 1), len + 1); + strText.ReleaseBuffer(len); + return len; + } +#endif + + BOOL GetWindowText( + _Inout_ _Outref_result_maybenull_ _Post_z_ BSTR& bstrText) const { ATLASSERT(::IsWindow(m_hWnd)); INT length = ::GetWindowTextLengthW(m_hWnd);

1 0

[reactos] 01/01: [ATL] atlwin.h: Formatting, and add a comment in IsParentDialog().
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e60a4f00b5e372a854ac0… commit e60a4f00b5e372a854ac089f66b5cdaaac90c1c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 27 19:48:19 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 31 02:26:53 2021 +0100 [ATL] atlwin.h: Formatting, and add a comment in IsParentDialog(). --- sdk/lib/atl/atlwin.h | 276 ++++++++++++++++++++++++++------------------------- 1 file changed, 140 insertions(+), 136 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 214c2959789..0c1251e6525 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -60,7 +60,6 @@ namespace ATL #endif - struct _ATL_WNDCLASSINFOW; typedef _ATL_WNDCLASSINFOW CWndClassInfo; @@ -168,7 +167,7 @@ struct thunkCode m_mov = 0x042444C7; m_this = PtrToUlong(pThis); m_jmp = 0xe9; - m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode))); + m_relproc = DWORD(reinterpret_cast<char*>(proc) - (reinterpret_cast<char*>(this) + sizeof(thunkCode))); FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } }; @@ -229,8 +228,8 @@ class CWndProcThunk public: thunkCode *m_pthunk; _AtlCreateWndData cd; -public: +public: CWndProcThunk() { m_pthunk = (thunkCode*)VirtualAlloc(NULL, sizeof(thunkCode), MEM_COMMIT, PAGE_EXECUTE_READWRITE); @@ -267,6 +266,7 @@ class CWindow public: HWND m_hWnd; static RECT rcDefault; + public: CWindow(HWND hWnd = NULL) { @@ -873,8 +873,8 @@ public: BOOL IsParentDialog() { ATLASSERT(::IsWindow(m_hWnd)); - TCHAR pszType[10]; - if (!RealGetWindowClass(::GetParent(m_hWnd), pszType, sizeof(pszType) / sizeof(pszType[0]))) + TCHAR pszType[10]; // Use sizeof("#32770")+3 so that extra characters can be detected. + if (!RealGetWindowClass(::GetParent(m_hWnd), pszType, _countof(pszType))) return FALSE; return !_tcscmp(pszType, _T("#32770")); } @@ -1345,7 +1345,7 @@ public: static INT_PTR CALLBACK StartDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CDialogImplBaseT<TBase> *pThis; + CDialogImplBaseT<TBase>* pThis; DLGPROC newDlgProc; DLGPROC GCCU(pOldProc); @@ -1353,6 +1353,7 @@ public: ATLASSERT(pThis != NULL); if (pThis == NULL) return 0; + pThis->m_thunk.Init((WNDPROC)pThis->GetDialogProc(), pThis); newDlgProc = reinterpret_cast<DLGPROC>(pThis->m_thunk.GetWNDPROC()); pOldProc = reinterpret_cast<DLGPROC>(::SetWindowLongPtr(hWnd, DWLP_DLGPROC, reinterpret_cast<LONG_PTR>(newDlgProc))); @@ -1363,7 +1364,7 @@ public: static INT_PTR CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CDialogImplBaseT<TBase> *pThis = reinterpret_cast<CDialogImplBaseT<TBase>*>(hWnd); + CDialogImplBaseT<TBase>* pThis = reinterpret_cast<CDialogImplBaseT<TBase>*>(hWnd); _ATL_MSG msg(pThis->m_hWnd, uMsg, wParam, lParam); LRESULT lResult = 0; const _ATL_MSG *previousMessage; @@ -1410,7 +1411,7 @@ public: template <class T, class TBase = CWindow> -class CDialogImpl : public CDialogImplBaseT< TBase > +class CDialogImpl : public CDialogImplBaseT<TBase> { public: // + Hacks for gcc @@ -1488,7 +1489,7 @@ public: ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); - CWindowImplBaseT<TBase, TWinTraits> *pThis; + CWindowImplBaseT<TBase, TWinTraits>* pThis; pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); BOOL result = m_thunk.Init(GetWindowProc(), this); @@ -1545,22 +1546,22 @@ public: LRESULT DefWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) { - CWindowImplBaseT<TBase, TWinTraits> *pThis; - - pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits> *>(this); + CWindowImplBaseT<TBase, TWinTraits>* pThis; + pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); return ::CallWindowProc(m_pfnSuperWindowProc, pThis->m_hWnd, uMsg, wParam, lParam); } static LRESULT CALLBACK StartWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CWindowImplBaseT<TBase, TWinTraits> *pThis; + CWindowImplBaseT<TBase, TWinTraits>* pThis; WNDPROC newWindowProc; WNDPROC GCCU(pOldProc); - pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits> *>(_AtlWinModule.ExtractCreateWndData()); + pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(_AtlWinModule.ExtractCreateWndData()); ATLASSERT(pThis != NULL); if (pThis == NULL) return 0; + pThis->m_thunk.Init(pThis->GetWindowProc(), pThis); newWindowProc = pThis->m_thunk.GetWNDPROC(); pOldProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); @@ -1571,7 +1572,7 @@ public: static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CWindowImplBaseT<TBase, TWinTraits> *pThis = reinterpret_cast<CWindowImplBaseT< TBase, TWinTraits> *>(hWnd); + CWindowImplBaseT<TBase, TWinTraits>* pThis = reinterpret_cast<CWindowImplBaseT< TBase, TWinTraits>*>(hWnd); _ATL_MSG msg(pThis->m_hWnd, uMsg, wParam, lParam); LRESULT lResult; const _ATL_MSG *previousMessage; @@ -1605,7 +1606,9 @@ public: pThis->m_dwState |= WINSTATE_DESTROYED; } else + { lResult = pThis->DefWindowProc(uMsg, wParam, lParam); + } } ATLASSERT(pThis->m_pCurrentMsg == &msg); pThis->m_pCurrentMsg = previousMessage; @@ -1619,9 +1622,9 @@ public: } HWND Create(HWND hWndParent, _U_RECT rect, LPCTSTR szWindowName, DWORD dwStyle, DWORD dwExStyle, - _U_MENUorID MenuOrID, ATOM atom, LPVOID lpCreateParam) + _U_MENUorID MenuOrID, ATOM atom, LPVOID lpCreateParam) { - HWND hWnd; + HWND hWnd; ATLASSERT(m_hWnd == NULL); ATLASSERT(atom != 0); @@ -1638,6 +1641,7 @@ public: MenuOrID.m_hMenu = (HMENU)(UINT_PTR)this; if (rect.m_lpRect == NULL) rect.m_lpRect = &TBase::rcDefault; + hWnd = ::CreateWindowEx(dwExStyle, MAKEINTATOM(atom), szWindowName, dwStyle, rect.m_lpRect->left, rect.m_lpRect->top, rect.m_lpRect->right - rect.m_lpRect->left, rect.m_lpRect->bottom - rect.m_lpRect->top, hWndParent, MenuOrID.m_hMenu, _AtlBaseModule.GetModuleInstance(), lpCreateParam); @@ -1657,16 +1661,15 @@ public: using CWindowImplRoot<TBase>::m_hWnd; // - Hacks for gcc - static LPCTSTR GetWndCaption() { return NULL; } HWND Create(HWND hWndParent, _U_RECT rect = NULL, LPCTSTR szWindowName = NULL, DWORD dwStyle = 0, - DWORD dwExStyle = 0, _U_MENUorID MenuOrID = 0U, LPVOID lpCreateParam = NULL) + DWORD dwExStyle = 0, _U_MENUorID MenuOrID = 0U, LPVOID lpCreateParam = NULL) { - CWindowImplBaseT<TBase, TWinTraits> *pThis; + CWindowImplBaseT<TBase, TWinTraits>* pThis; ATOM atom; ATLASSERT(m_hWnd == NULL); @@ -1700,6 +1703,7 @@ public: CMessageMap *m_pObject; DWORD m_dwMsgMapID; const _ATL_MSG *m_pCurrentMsg; + public: CContainedWindowT(CMessageMap *pObject, DWORD dwMsgMapID = 0) { @@ -1729,8 +1733,8 @@ public: ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); - CContainedWindowT<TBase> *pThis; - pThis = reinterpret_cast<CContainedWindowT<TBase> *>(this); + CContainedWindowT<TBase>* pThis; + pThis = reinterpret_cast<CContainedWindowT<TBase>*>(this); BOOL result = m_thunk.Init(WindowProc, pThis); if (result == FALSE) @@ -1770,11 +1774,11 @@ public: static LRESULT CALLBACK StartWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CContainedWindowT<TBase> *pThis; + CContainedWindowT<TBase>* pThis; WNDPROC newWindowProc; WNDPROC GCCU(pOldProc); - pThis = reinterpret_cast<CContainedWindowT<TBase> *>(_AtlWinModule.ExtractCreateWndData()); + pThis = reinterpret_cast<CContainedWindowT<TBase>*>(_AtlWinModule.ExtractCreateWndData()); ATLASSERT(pThis != NULL); if (pThis == NULL) return 0; @@ -1788,7 +1792,7 @@ public: static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CContainedWindowT<TBase> *pThis = reinterpret_cast<CContainedWindowT<TBase> *>(hWnd); + CContainedWindowT<TBase>* pThis = reinterpret_cast<CContainedWindowT<TBase>*>(hWnd); _ATL_MSG msg(pThis->m_hWnd, uMsg, wParam, lParam); LRESULT lResult; const _ATL_MSG *previousMessage; @@ -1826,122 +1830,122 @@ public: }; typedef CContainedWindowT<CWindow> CContainedWindow; -#define BEGIN_MSG_MAP(theClass) \ -public: \ - BOOL ProcessWindowMessage(HWND GCCU(hWnd), UINT GCCU(uMsg), WPARAM GCCU(wParam), LPARAM GCCU(lParam), LRESULT &GCCU(lResult), DWORD dwMsgMapID = 0) \ - { \ - BOOL GCCU(bHandled) = TRUE; \ - Unused(hWnd); \ - Unused(uMsg); \ - Unused(wParam); \ - Unused(lParam); \ - Unused(lResult); \ - Unused(bHandled); \ - switch(dwMsgMapID) \ - { \ +#define BEGIN_MSG_MAP(theClass) \ +public: \ + BOOL ProcessWindowMessage(HWND GCCU(hWnd), UINT GCCU(uMsg), WPARAM GCCU(wParam), LPARAM GCCU(lParam), LRESULT &GCCU(lResult), DWORD dwMsgMapID = 0) \ + { \ + BOOL GCCU(bHandled) = TRUE; \ + Unused(hWnd); \ + Unused(uMsg); \ + Unused(wParam); \ + Unused(lParam); \ + Unused(lResult); \ + Unused(bHandled); \ + switch(dwMsgMapID) \ + { \ case 0: -#define ALT_MSG_MAP(map) \ - break; \ +#define ALT_MSG_MAP(map) \ + break; \ case map: -#define END_MSG_MAP() \ - break; \ - default: \ - ATLASSERT(FALSE); \ - break; \ - } \ - return FALSE; \ - } - -#define MESSAGE_HANDLER(msg, func) \ - if (uMsg == msg) \ - { \ - bHandled = TRUE; \ - lResult = func(uMsg, wParam, lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define MESSAGE_RANGE_HANDLER(msgFirst, msgLast, func) \ - if (uMsg >= msgFirst && uMsg <= msgLast) \ - { \ - bHandled = TRUE; \ - lResult = func(uMsg, wParam, lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define COMMAND_HANDLER(id, code, func) \ - if (uMsg == WM_COMMAND && id == LOWORD(wParam) && code == HIWORD(wParam)) \ - { \ - bHandled = TRUE; \ - lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define COMMAND_ID_HANDLER(id, func) \ - if (uMsg == WM_COMMAND && id == LOWORD(wParam)) \ - { \ - bHandled = TRUE; \ - lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define COMMAND_CODE_HANDLER(code, func) \ - if (uMsg == WM_COMMAND && code == HIWORD(wParam)) \ - { \ - bHandled = TRUE; \ - lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define COMMAND_RANGE_HANDLER(idFirst, idLast, func) \ - if (uMsg == WM_COMMAND && LOWORD(wParam) >= idFirst && LOWORD(wParam) <= idLast) \ - { \ - bHandled = TRUE; \ - lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define NOTIFY_CODE_HANDLER(cd, func) \ - if(uMsg == WM_NOTIFY && cd == ((LPNMHDR)lParam)->code) \ - { \ - bHandled = TRUE; \ - lResult = func((int)wParam, (LPNMHDR)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define NOTIFY_HANDLER(id, cd, func) \ - if(uMsg == WM_NOTIFY && id == ((LPNMHDR)lParam)->idFrom && cd == ((LPNMHDR)lParam)->code) \ - { \ - bHandled = TRUE; \ - lResult = func((int)wParam, (LPNMHDR)lParam, bHandled); \ - if (bHandled) \ - return TRUE; \ - } - -#define CHAIN_MSG_MAP(theChainClass) \ - { \ +#define END_MSG_MAP() \ + break; \ + default: \ + ATLASSERT(FALSE); \ + break; \ + } \ + return FALSE; \ + } + +#define MESSAGE_HANDLER(msg, func) \ + if (uMsg == msg) \ + { \ + bHandled = TRUE; \ + lResult = func(uMsg, wParam, lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define MESSAGE_RANGE_HANDLER(msgFirst, msgLast, func) \ + if (uMsg >= msgFirst && uMsg <= msgLast) \ + { \ + bHandled = TRUE; \ + lResult = func(uMsg, wParam, lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define COMMAND_HANDLER(id, code, func) \ + if (uMsg == WM_COMMAND && id == LOWORD(wParam) && code == HIWORD(wParam)) \ + { \ + bHandled = TRUE; \ + lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define COMMAND_ID_HANDLER(id, func) \ + if (uMsg == WM_COMMAND && id == LOWORD(wParam)) \ + { \ + bHandled = TRUE; \ + lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define COMMAND_CODE_HANDLER(code, func) \ + if (uMsg == WM_COMMAND && code == HIWORD(wParam)) \ + { \ + bHandled = TRUE; \ + lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define COMMAND_RANGE_HANDLER(idFirst, idLast, func) \ + if (uMsg == WM_COMMAND && LOWORD(wParam) >= idFirst && LOWORD(wParam) <= idLast) \ + { \ + bHandled = TRUE; \ + lResult = func(HIWORD(wParam), LOWORD(wParam), (HWND)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define NOTIFY_CODE_HANDLER(cd, func) \ + if (uMsg == WM_NOTIFY && cd == ((LPNMHDR)lParam)->code) \ + { \ + bHandled = TRUE; \ + lResult = func((int)wParam, (LPNMHDR)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define NOTIFY_HANDLER(id, cd, func) \ + if (uMsg == WM_NOTIFY && id == ((LPNMHDR)lParam)->idFrom && cd == ((LPNMHDR)lParam)->code) \ + { \ + bHandled = TRUE; \ + lResult = func((int)wParam, (LPNMHDR)lParam, bHandled); \ + if (bHandled) \ + return TRUE; \ + } + +#define CHAIN_MSG_MAP(theChainClass) \ + { \ if (theChainClass::ProcessWindowMessage(hWnd, uMsg, wParam, lParam, lResult)) \ - return TRUE; \ - } - -#define DECLARE_WND_CLASS_EX(WndClassName, style, bkgnd) \ -static ATL::CWndClassInfo& GetWndClassInfo() \ -{ \ - static ATL::CWndClassInfo wc = \ - { \ - { sizeof(WNDCLASSEX), style, StartWindowProc, \ - 0, 0, NULL, NULL, NULL, (HBRUSH)(bkgnd + 1), NULL, WndClassName, NULL }, \ - NULL, NULL, IDC_ARROW, TRUE, 0, _T("") \ - }; \ - return wc; \ + return TRUE; \ + } + +#define DECLARE_WND_CLASS_EX(WndClassName, style, bkgnd) \ +static ATL::CWndClassInfo& GetWndClassInfo() \ +{ \ + static ATL::CWndClassInfo wc = \ + { \ + { sizeof(WNDCLASSEX), style, StartWindowProc, \ + 0, 0, NULL, NULL, NULL, (HBRUSH)(bkgnd + 1), NULL, WndClassName, NULL }, \ + NULL, NULL, IDC_ARROW, TRUE, 0, _T("") \ + }; \ + return wc; \ } struct _ATL_WNDCLASSINFOW

1 0

[reactos] 01/01: [NTUSER] Implement NtUserDisableThreadIme (#4216)
by Katayama Hirofumi MZ 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcc222c28a48e464a88cf… commit fcc222c28a48e464a88cfdd809f89d45c16af472 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 31 10:20:53 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 31 10:20:53 2021 +0900 [NTUSER] Implement NtUserDisableThreadIme (#4216) CORE-11700 --- win32ss/include/ntuser.h | 4 +-- win32ss/user/ntuser/ime.c | 69 ++++++++++++++++++++++++++++++++++++++++---- win32ss/user/ntuser/ntuser.h | 2 +- win32ss/user/ntuser/win32.h | 1 + 4 files changed, 68 insertions(+), 8 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 339076b4984..9d936530827 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2038,10 +2038,10 @@ NTAPI NtUserDestroyWindow( HWND Wnd); -DWORD +BOOL NTAPI NtUserDisableThreadIme( - DWORD dwUnknown1); + DWORD dwThreadID); LRESULT NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 12914ccb171..c172f28a70c 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -10,6 +10,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); +#define INVALID_THREAD_ID ((ULONG)-1) UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) @@ -80,14 +81,72 @@ NtUserCheckImeHotKey( return 0; } - -DWORD +BOOL APIENTRY NtUserDisableThreadIme( - DWORD dwUnknown1) + DWORD dwThreadID) { - STUB; - return 0; + PTHREADINFO pti, ptiCurrent; + PPROCESSINFO ppi; + BOOL ret = FALSE; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + { + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + ptiCurrent = GetW32ThreadInfo(); + + if (dwThreadID == INVALID_THREAD_ID) + { + ppi = ptiCurrent->ppi; + ppi->W32PF_flags |= W32PF_DISABLEIME; + +Retry: + for (pti = ppi->ptiList; pti; pti = pti->ptiSibling) + { + pti->TIF_flags |= TIF_DISABLEIME; + + if (pti->spwndDefaultIme) + { + co_UserDestroyWindow(pti->spwndDefaultIme); + pti->spwndDefaultIme = NULL; + goto Retry; /* The contents of ppi->ptiList may be changed. */ + } + } + } + else + { + if (dwThreadID == 0) + { + pti = ptiCurrent; + } + else + { + pti = IntTID2PTI(UlongToHandle(dwThreadID)); + + /* The thread needs to reside in the current process. */ + if (!pti || pti->ppi != ptiCurrent->ppi) + goto Quit; + } + + pti->TIF_flags |= TIF_DISABLEIME; + + if (pti->spwndDefaultIme) + { + co_UserDestroyWindow(pti->spwndDefaultIme); + pti->spwndDefaultIme = NULL; + } + } + + ret = TRUE; + +Quit: + UserLeave(); + return ret; } DWORD diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index d456564b159..29ee2fae600 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -4,7 +4,7 @@ #define RETURN(value) { _ret_ = value; goto _cleanup_; } #define CLEANUP /*unreachable*/ ASSERT(FALSE); _cleanup_ #define END_CLEANUP return _ret_; - +#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h index e7d3ac0e52a..585a7191589 100644 --- a/win32ss/user/ntuser/win32.h +++ b/win32ss/user/ntuser/win32.h @@ -25,6 +25,7 @@ #define W32PF_OLELOADED 0x00100000 #define W32PF_SCREENSAVER 0x00200000 #define W32PF_IDLESCREENSAVER 0x00400000 +#define W32PF_DISABLEIME 0x00800000 #define W32PF_ICONTITLEREGISTERED 0x10000000 #define W32PF_DPIAWARE 0x20000000 // ReactOS

1 0

[reactos] 01/01: [BOOTDATA] Add new Setup Debug/Screen boot entries in BootCD/HybridCD/PC98 boot menus. (#3353) CORE-17350
by Hermès Bélusca-Maïto 30 Dec '21

30 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10a5200e1f9ee79943f70… commit 10a5200e1f9ee79943f70d2c89419977910aa97e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 4 00:33:05 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 30 16:06:49 2021 +0100 [BOOTDATA] Add new Setup Debug/Screen boot entries in BootCD/HybridCD/PC98 boot menus. (#3353) CORE-17350 Makes testing easier on real hardware (especially for these configs where debugging can only be done via screen mode). Add also an experimental Setup ACPI APIC entry in bootcd.ini for testing purposes, along the lines of commit 5ee09256d . In the similar LiveCD entry, use instead the /HAL= option. --- boot/bootdata/bootcd.ini | 15 +++++++++++++++ boot/bootdata/floppy_pc98.ini | 22 +++++++++++++++++----- boot/bootdata/hybridcd.ini | 12 ++++++++++++ boot/bootdata/livecd.ini | 11 +++++------ 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/boot/bootdata/bootcd.ini b/boot/bootdata/bootcd.ini index 4f2017c5939..a2ea3d0564c 100644 --- a/boot/bootdata/bootcd.ini +++ b/boot/bootdata/bootcd.ini @@ -26,6 +26,21 @@ TimeText=Seconds until highlighted choice will be started automatically: [Operating Systems] Setup="Setup" +Setup_Debug="Setup (Debug)" +Setup_Aacpi="Setup ACPI APIC (Debug)" +Setup_Screen="Setup (Screen)" [Setup] BootType=ReactOSSetup + +[Setup_Debug] +BootType=ReactOSSetup +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE + +[Setup_Aacpi] +BootType=ReactOSSetup +Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE + +[Setup_Screen] +BootType=ReactOSSetup +Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE diff --git a/boot/bootdata/floppy_pc98.ini b/boot/bootdata/floppy_pc98.ini index 3828cee347d..2488bb21482 100644 --- a/boot/bootdata/floppy_pc98.ini +++ b/boot/bootdata/floppy_pc98.ini @@ -25,11 +25,27 @@ MinimalUI=Yes TimeText=Seconds until highlighted choice will be started automatically: [Operating Systems] +Setup="Setup" +Setup_Debug="Setup (Debug)" +Setup_Screen="Setup (Screen)" LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" LiveCD_Screen="LiveCD (Screen)" LiveCD_LogFile="LiveCD (Log file)" -Setup="Setup" + +[Setup] +BootType=ReactOSSetup +SystemPath=multi(0)disk(0)cdrom(0)\reactos + +[Setup_Debug] +BootType=ReactOSSetup +SystemPath=multi(0)disk(0)cdrom(0)\reactos +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=9600 /NOGUIBOOT /SIFOPTIONSOVERRIDE + +[Setup_Screen] +BootType=ReactOSSetup +SystemPath=multi(0)disk(0)cdrom(0)\reactos +Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE [LiveCD] BootType=Windows2003 @@ -50,7 +66,3 @@ Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT BootType=Windows2003 SystemPath=multi(0)disk(0)cdrom(0)\reactos Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT - -[Setup] -BootType=ReactOSSetup -SystemPath=multi(0)disk(0)cdrom(0)\reactos diff --git a/boot/bootdata/hybridcd.ini b/boot/bootdata/hybridcd.ini index 28697d30b36..2da010b70fb 100644 --- a/boot/bootdata/hybridcd.ini +++ b/boot/bootdata/hybridcd.ini @@ -26,6 +26,8 @@ TimeText=Seconds until highlighted choice will be started automatically: [Operating Systems] Setup="Setup" +Setup_Debug="Setup (Debug)" +Setup_Screen="Setup (Screen)" LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" LiveCD_Screen="LiveCD (Screen)" @@ -38,6 +40,16 @@ LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)" BootType=ReactOSSetup SystemPath=\bootcd +[Setup_Debug] +BootType=ReactOSSetup +SystemPath=\bootcd +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE + +[Setup_Screen] +BootType=ReactOSSetup +SystemPath=\bootcd +Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE + [LiveCD] BootType=Windows2003 SystemPath=\livecd\reactos diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index e00c49461d4..a69b22731fa 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -27,8 +27,8 @@ TimeText=Seconds until highlighted choice will be started automatically: [Operating Systems] LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" -LiveCD_VBoxDebug="LiveCD (VBox Debug)" LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" +LiveCD_VBoxDebug="LiveCD (VBox Debug)" LiveCD_Screen="LiveCD (Screen)" LiveCD_LogFile="LiveCD (Log file)" @@ -42,16 +42,15 @@ BootType=Windows2003 SystemPath=\reactos Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT -[LiveCD_VBoxDebug] +[LiveCD_Aacpi] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT +Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT -[LiveCD_Aacpi] +[LiveCD_VBoxDebug] BootType=Windows2003 SystemPath=\reactos -Hal=HALAACPI.DLL -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT [LiveCD_Screen] BootType=Windows2003

1 0

[reactos] 02/02: [BOOTDATA] Remove deprecated BOCHS debugport example in txtsetup.sif.
by Hermès Bélusca-Maïto 30 Dec '21

30 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fcd73634ee422380fade… commit 3fcd73634ee422380fadec364214ff91ea82270d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 30 03:39:50 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 30 03:42:01 2021 +0100 [BOOTDATA] Remove deprecated BOCHS debugport example in txtsetup.sif. --- boot/bootdata/txtsetup.sif | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index f4930254853..bab952d811d 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -215,7 +215,6 @@ Cabinet=reactos.cab DefaultPath = \ReactOS SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN" -;SetupDebugOptions = "/DEBUG /DEBUGPORT=BOCHS" OsLoadOptions = "/NOGUIBOOT /NODEBUG" [NLS]

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