Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [NTOS:CM] Refactor full CPU identifier values
by Stanislav Motylkov 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77fd33c99c79d6bd7b6a5… commit 77fd33c99c79d6bd7b6a5a299f11e3aebffd0de4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 5 02:48:54 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jan 5 18:28:40 2022 +0300 [NTOS:CM] Refactor full CPU identifier values Dedicated to Victor Perevertkin. --- ntoskrnl/config/i386/cmhardwr.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index 1810da6a53b..235250d7076 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -14,14 +14,7 @@ /* GLOBALS *******************************************************************/ -#ifdef _M_IX86 -PCHAR CmpID1 = "80%u86-%c%x"; -PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; -#else -PCHAR CmpID1 = "EM64T Family %u Model %u Stepping %u"; -PCHAR CmpID2 = "AMD64 Family %u Model %u Stepping %u"; -PCHAR CmpID3 = "VIA64 Family %u Model %u Stepping %u"; -#endif +PCHAR CmpFullCpuID = "%s Family %u Model %u Stepping %u"; PCHAR CmpBiosStrings[] = { "Ver", @@ -353,7 +346,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc for (i = 0; i < KeNumberProcessors; i++) { #ifdef _M_AMD64 - PCHAR CmpID; + PCHAR FamilyId; #endif /* Get the PRCB */ Prcb = KiProcessorBlock[i]; @@ -370,18 +363,19 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Check if the CPU doesn't support CPUID */ if (!Prcb->CpuID) { - /* Build ID1-style string for older CPUs */ + /* Build 80x86-style string for older CPUs */ sprintf(Buffer, - CmpID1, + "80%u86-%c%x", Prcb->CpuType, (Prcb->CpuStep >> 8) + 'A', Prcb->CpuStep & 0xff); } else { - /* Build ID2-style string for newer CPUs */ + /* Build full ID string for newer CPUs */ sprintf(Buffer, - CmpID2, + CmpFullCpuID, + "x86", Prcb->CpuType, (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff); @@ -390,22 +384,23 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (Prcb->CpuVendor == CPU_VIA) { /* This is VIA64 family */ - CmpID = CmpID3; + FamilyId = "VIA64"; } else if (Prcb->CpuVendor == CPU_AMD) { /* This is AMD64 family */ - CmpID = CmpID2; + FamilyId = "AMD64"; } else { /* This is generic EM64T family */ - CmpID = CmpID1; + FamilyId = "EM64T"; } /* ID string has the same style for all 64-bit CPUs */ sprintf(Buffer, - CmpID, + CmpFullCpuID, + FamilyId, Prcb->CpuType, (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff);

1 0

[reactos] 01/02: [NTOS:KE/x64] Detect CPU vendor properly and store value in PRCB
by Stanislav Motylkov 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84cc81ee298b9030a0c39… commit 84cc81ee298b9030a0c39dfd60487bc8c2ed1703 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 5 00:50:51 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jan 5 18:28:40 2022 +0300 [NTOS:KE/x64] Detect CPU vendor properly and store value in PRCB Also generate processor identifier properly based on this value on the Configuration Manager machine-dependent initialization. Update processor driver INF file accordingly. CORE-17970 CORE-14922 --- drivers/processor/processr/cpu.inf | 10 ++++++++++ ntoskrnl/config/i386/cmhardwr.c | 36 ++++++++++++++++++++++++++++++++++++ ntoskrnl/ke/amd64/cpu.c | 19 ++++++++----------- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index ca3dd062b96..268ec540e8a 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -62,6 +62,9 @@ HKR, , Icon, 0, "-28" %IntelP4Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_15 %IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86 +[Intel.NTAMD64] +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_EM64T + [AMD] %AMDK6Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_7 %AMDK62Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_8 @@ -74,6 +77,10 @@ HKR, , Icon, 0, "-28" %AMDQProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_17 %AMDProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86 +[AMD.NTAMD64] +%AMDK8Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_AMD64_Family_15 +%AMDProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_AMD64 + [Transmeta] %TransmetaProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineTMx86_-_x86 @@ -84,6 +91,9 @@ HKR, , Icon, 0, "-28" %ViaNANOProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_15 %ViaProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86 +[VIA.NTAMD64] +%ViaProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_VIA64 + ;---------------------------- Processr Driver --------------------------- [Processr_Inst.NT] diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index 7bdd139ecbd..1810da6a53b 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -14,8 +14,14 @@ /* GLOBALS *******************************************************************/ +#ifdef _M_IX86 PCHAR CmpID1 = "80%u86-%c%x"; PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; +#else +PCHAR CmpID1 = "EM64T Family %u Model %u Stepping %u"; +PCHAR CmpID2 = "AMD64 Family %u Model %u Stepping %u"; +PCHAR CmpID3 = "VIA64 Family %u Model %u Stepping %u"; +#endif PCHAR CmpBiosStrings[] = { "Ver", @@ -346,6 +352,9 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Loop all CPUs */ for (i = 0; i < KeNumberProcessors; i++) { +#ifdef _M_AMD64 + PCHAR CmpID; +#endif /* Get the PRCB */ Prcb = KiProcessorBlock[i]; @@ -357,6 +366,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; +#if defined(_M_IX86) /* Check if the CPU doesn't support CPUID */ if (!Prcb->CpuID) { @@ -376,6 +386,32 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff); } +#elif defined(_M_AMD64) + if (Prcb->CpuVendor == CPU_VIA) + { + /* This is VIA64 family */ + CmpID = CmpID3; + } + else if (Prcb->CpuVendor == CPU_AMD) + { + /* This is AMD64 family */ + CmpID = CmpID2; + } + else + { + /* This is generic EM64T family */ + CmpID = CmpID1; + } + + /* ID string has the same style for all 64-bit CPUs */ + sprintf(Buffer, + CmpID, + Prcb->CpuType, + (Prcb->CpuStep >> 8), + Prcb->CpuStep & 0xff); +#else +#error Unknown architecture +#endif /* Save the ID string length now that we've created it */ ConfigData.ComponentEntry.IdentifierLength = (ULONG)strlen(Buffer) + 1; diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 320e48bdd3b..659264cde30 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -33,10 +33,7 @@ volatile LONG KiTbFlushTimeStamp; /* CPU Signatures */ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; -static const CHAR CmpCyrixID[] = "CyrixInstead"; -static const CHAR CmpTransmetaID[] = "GenuineTMx86"; static const CHAR CmpCentaurID[] = "CentaurHauls"; -static const CHAR CmpRiseID[] = "RiseRiseRise"; /* FUNCTIONS *****************************************************************/ @@ -89,25 +86,25 @@ KiGetCpuVendor(VOID) /* Now check the CPU Type */ if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) { - return CPU_INTEL; + Prcb->CpuVendor = CPU_INTEL; } else if (!strcmp((PCHAR)Prcb->VendorString, CmpAmdID)) { - return CPU_AMD; + Prcb->CpuVendor = CPU_AMD; } else if (!strcmp((PCHAR)Prcb->VendorString, CmpCentaurID)) { DPRINT1("VIA CPUs not fully supported\n"); - return CPU_VIA; + Prcb->CpuVendor = CPU_VIA; } - else if (!strcmp((PCHAR)Prcb->VendorString, CmpRiseID)) + else { - DPRINT1("Rise CPUs not fully supported\n"); - return 0; + /* Invalid CPU */ + DPRINT1("%s CPU support not fully tested!\n", Prcb->VendorString); + Prcb->CpuVendor = CPU_UNKNOWN; } - /* Invalid CPU */ - return CPU_UNKNOWN; + return Prcb->CpuVendor; } ULONG

1 0

[reactos] 01/01: [MSPAINT] Follow-up of #4237
by Katayama Hirofumi MZ 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4bd2449adc9d129bf6cc… commit a4bd2449adc9d129bf6ccb3dcfc4b9c06149f708 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 5 16:39:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jan 5 16:41:12 2022 +0900 [MSPAINT] Follow-up of #4237 CORE-17949 --- base/applications/mspaint/dialogs.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index a21fb45db69..2b0798f7ef9 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -576,10 +576,14 @@ LRESULT CFontsDialog::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& } TCHAR szText[LF_FACESIZE]; - szText[0] = 0; - ComboBox_GetLBText(hwndItem, pDrawItem->itemID, szText); - rcItem.left += 24; - DrawText(pDrawItem->hDC, szText, -1, &rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + if ((UINT)ComboBox_GetLBTextLen(hwndItem, pDrawItem->itemID) < _countof(szText)) + { + szText[0] = 0; + ComboBox_GetLBText(hwndItem, pDrawItem->itemID, szText); + + rcItem.left += 24; + DrawText(pDrawItem->hDC, szText, -1, &rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + } if (pDrawItem->itemState & ODS_FOCUS) ::DrawFocusRect(pDrawItem->hDC, &pDrawItem->rcItem);

1 0

[reactos] 01/01: [MSPAINT] Implement the text tool (#4237)
by Katayama Hirofumi MZ 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=361a2ce4f70379a512e23… commit 361a2ce4f70379a512e237cd37c6e66c077140a9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 5 16:26:05 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 5 16:26:05 2022 +0900 [MSPAINT] Implement the text tool (#4237) - Add CFontsDialog and IDD_FONTS. - Rewrite CTextEditWindow. - Implement TOOL_TEXT tool. - Add the font-related settings. CORE-17949 --- base/applications/mspaint/dialogs.cpp | 330 +++++++++++++++ base/applications/mspaint/dialogs.h | 34 ++ base/applications/mspaint/drawing.cpp | 48 ++- base/applications/mspaint/globalvar.h | 5 +- base/applications/mspaint/icons/fontstoolbar.bmp | Bin 0 -> 3126 bytes base/applications/mspaint/imgarea.cpp | 35 +- base/applications/mspaint/imgarea.h | 4 + base/applications/mspaint/lang/bg-BG.rc | 17 + base/applications/mspaint/lang/cs-CZ.rc | 17 + base/applications/mspaint/lang/de-DE.rc | 17 + base/applications/mspaint/lang/en-GB.rc | 17 + base/applications/mspaint/lang/en-US.rc | 17 + base/applications/mspaint/lang/es-ES.rc | 17 + base/applications/mspaint/lang/et-EE.rc | 17 + base/applications/mspaint/lang/eu-ES.rc | 17 + base/applications/mspaint/lang/fr-FR.rc | 17 + base/applications/mspaint/lang/he-IL.rc | 17 + base/applications/mspaint/lang/hu-HU.rc | 17 + base/applications/mspaint/lang/id-ID.rc | 17 + base/applications/mspaint/lang/it-IT.rc | 17 + base/applications/mspaint/lang/ja-JP.rc | 17 + base/applications/mspaint/lang/nl-NL.rc | 17 + base/applications/mspaint/lang/no-NO.rc | 17 + base/applications/mspaint/lang/pl-PL.rc | 17 + base/applications/mspaint/lang/pt-BR.rc | 17 + base/applications/mspaint/lang/pt-PT.rc | 17 + base/applications/mspaint/lang/ro-RO.rc | 17 + base/applications/mspaint/lang/ru-RU.rc | 17 + base/applications/mspaint/lang/sk-SK.rc | 17 + base/applications/mspaint/lang/sq-AL.rc | 17 + base/applications/mspaint/lang/sv-SE.rc | 17 + base/applications/mspaint/lang/tr-TR.rc | 17 + base/applications/mspaint/lang/uk-UA.rc | 17 + base/applications/mspaint/lang/vi-VN.rc | 17 + base/applications/mspaint/lang/zh-CN.rc | 17 + base/applications/mspaint/lang/zh-HK.rc | 17 + base/applications/mspaint/lang/zh-TW.rc | 17 + base/applications/mspaint/main.cpp | 14 +- base/applications/mspaint/mouse.cpp | 81 +++- base/applications/mspaint/palettemodel.cpp | 2 + base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/registry.cpp | 74 +++- base/applications/mspaint/registry.h | 10 + base/applications/mspaint/resource.h | 16 + base/applications/mspaint/rsrc.rc | 1 + base/applications/mspaint/selectionmodel.cpp | 5 + base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/textedit.cpp | 498 +++++++++++++++++++++-- base/applications/mspaint/textedit.h | 63 ++- base/applications/mspaint/toolsmodel.cpp | 17 + base/applications/mspaint/toolsmodel.h | 8 +- base/applications/mspaint/winproc.cpp | 24 +- 52 files changed, 1684 insertions(+), 97 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 09a3e5cebfb..a21fb45db69 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -19,6 +19,7 @@ CMirrorRotateDialog mirrorRotateDialog; CAttributesDialog attributesDialog; CStretchSkewDialog stretchSkewDialog; +CFontsDialog fontsDialog; /* FUNCTIONS ********************************************************/ @@ -258,3 +259,332 @@ LRESULT CStretchSkewDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, B EndDialog(0); return 0; } + +static INT CALLBACK +EnumFontFamProc(ENUMLOGFONT *lpelf, NEWTEXTMETRIC *lpntm, INT FontType, LPARAM lParam) +{ + CSimpleArray<CString>& arrFontNames = *reinterpret_cast<CSimpleArray<CString>*>(lParam); + LPTSTR name = lpelf->elfLogFont.lfFaceName; + if (name[0] == TEXT('@')) // Vertical fonts + return TRUE; + + for (INT i = 0; i < arrFontNames.GetSize(); ++i) + { + if (arrFontNames[i] == name) // Already exists + return TRUE; + } + + arrFontNames.Add(name); + return TRUE; +} + +// TODO: AutoComplete font names +// TODO: Vertical text +CFontsDialog::CFontsDialog() +{ +} + +void CFontsDialog::InitFontNames() +{ + // List the fonts + CSimpleArray<CString> arrFontNames; + HDC hDC = CreateCompatibleDC(NULL); + if (hDC) + { + EnumFontFamilies(hDC, NULL, (FONTENUMPROC)EnumFontFamProc, + reinterpret_cast<LPARAM>(&arrFontNames)); + DeleteDC(hDC); + } + + // Actually add them to the combobox + HWND hwndNames = GetDlgItem(IDD_FONTSNAMES); + SendMessage(hwndNames, CB_RESETCONTENT, 0, 0); + for (INT i = 0; i < arrFontNames.GetSize(); ++i) + { + ComboBox_AddString(hwndNames, arrFontNames[i]); + } + + ::SetWindowText(hwndNames, registrySettings.strFontName); +} + +void CFontsDialog::InitFontSizes() +{ + static const INT s_sizes[] = + { + 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72 + }; + + HWND hwndSizes = GetDlgItem(IDD_FONTSSIZES); + ComboBox_ResetContent(hwndSizes); + + TCHAR szText[16]; + for (UINT i = 0; i < _countof(s_sizes); ++i) + { + wsprintf(szText, TEXT("%d"), s_sizes[i]); + INT iItem = ComboBox_AddString(hwndSizes, szText); + if (s_sizes[i] == (INT)registrySettings.PointSize) + ComboBox_SetCurSel(hwndSizes, iItem); + } + + if (ComboBox_GetCurSel(hwndSizes) == CB_ERR) + { + wsprintf(szText, TEXT("%d"), (INT)registrySettings.PointSize); + ::SetWindowText(hwndSizes, szText); + } +} + +void CFontsDialog::InitToolbar() +{ + HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); + SendMessage(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(hwndToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(16, 16)); + SendMessage(hwndToolbar, TB_SETBUTTONWIDTH, 0, MAKELPARAM(20, 20)); + + TBADDBITMAP AddBitmap; + AddBitmap.hInst = hProgInstance; + AddBitmap.nID = IDB_FONTSTOOLBAR; + SendMessage(hwndToolbar, TB_ADDBITMAP, 4, (LPARAM)&AddBitmap); + + HIMAGELIST himl = ImageList_LoadImage(hProgInstance, MAKEINTRESOURCE(IDB_FONTSTOOLBAR), + 16, 8, RGB(255, 0, 255), IMAGE_BITMAP, + LR_CREATEDIBSECTION); + SendMessage(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl); + + TBBUTTON buttons[] = + { + { 0, IDM_BOLD, TBSTATE_ENABLED, TBSTYLE_CHECK }, + { 1, IDM_ITALIC, TBSTATE_ENABLED, TBSTYLE_CHECK }, + { 2, IDM_UNDERLINE, TBSTATE_ENABLED, TBSTYLE_CHECK }, + { 3, IDM_VERTICAL, 0, TBSTYLE_CHECK }, // TODO: + }; + SendMessage(hwndToolbar, TB_ADDBUTTONS, _countof(buttons), (LPARAM)&buttons); + + SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_BOLD, registrySettings.Bold); + SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_ITALIC, registrySettings.Italic); + SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_UNDERLINE, registrySettings.Underline); +} + +LRESULT CFontsDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // TODO: Tooltips + InitFontNames(); + InitFontSizes(); + InitToolbar(); + + if (registrySettings.FontsPositionX != 0 || registrySettings.FontsPositionY != 0) + { + SetWindowPos(NULL, + registrySettings.FontsPositionX, registrySettings.FontsPositionY, + 0, 0, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + SendMessage(DM_REPOSITION, 0, 0); + } + + if (!registrySettings.ShowTextTool) + ShowWindow(SW_HIDE); + + return TRUE; +} + +LRESULT CFontsDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + ShowWindow(SW_HIDE); // Just hide. Recycle for optimization + return 0; +} + +void CFontsDialog::OnFontName(UINT codeNotify) +{ + HWND hwndNames = GetDlgItem(IDD_FONTSNAMES); + INT iItem = CB_ERR; + UINT cch; + TCHAR szText[LF_FACESIZE]; + + switch (codeNotify) + { + case CBN_SELCHANGE: + iItem = ComboBox_GetCurSel(hwndNames); + cch = ComboBox_GetLBTextLen(hwndNames, iItem); + if (iItem != CB_ERR && 0 < cch && cch < _countof(szText)) + { + ComboBox_GetLBText(hwndNames, iItem, szText); + } + break; + + case CBN_EDITCHANGE: + GetDlgItemText(IDD_FONTSNAMES, szText, _countof(szText)); + iItem = ComboBox_FindStringExact(hwndNames, -1, szText); + break; + } + + if (iItem != CB_ERR && registrySettings.strFontName.CompareNoCase(szText) != 0) + { + registrySettings.strFontName = szText; + toolsModel.NotifyToolChanged(); + } +} + +void CFontsDialog::OnFontSize(UINT codeNotify) +{ + HWND hwndSizes = GetDlgItem(IDD_FONTSSIZES); + WCHAR szText[8]; + INT iItem, PointSize = 0; + UINT cch; + + switch (codeNotify) + { + case CBN_SELCHANGE: + iItem = ComboBox_GetCurSel(hwndSizes); + cch = ComboBox_GetLBTextLen(hwndSizes, iItem); + if (iItem != CB_ERR && 0 < cch && cch < _countof(szText)) + { + ComboBox_GetLBText(hwndSizes, iItem, szText); + PointSize = _ttoi(szText); + } + break; + + case CBN_EDITCHANGE: + ::GetWindowText(hwndSizes, szText, _countof(szText)); + PointSize = _ttoi(szText); + break; + } + + if (PointSize > 0) + { + registrySettings.PointSize = PointSize; + toolsModel.NotifyToolChanged(); + } +} + +LRESULT CFontsDialog::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UINT id = LOWORD(wParam); + UINT codeNotify = HIWORD(wParam); + HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); + BOOL bChecked = ::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); + + switch (id) + { + case IDCANCEL: + ShowWindow(SW_HIDE); + registrySettings.ShowTextTool = FALSE; + break; + + case IDD_FONTSNAMES: + OnFontName(codeNotify); + break; + + case IDD_FONTSSIZES: + OnFontSize(codeNotify); + break; + + case IDM_BOLD: + registrySettings.Bold = bChecked; + toolsModel.NotifyToolChanged(); + break; + + case IDM_ITALIC: + registrySettings.Italic = bChecked; + toolsModel.NotifyToolChanged(); + break; + + case IDM_UNDERLINE: + registrySettings.Underline = bChecked; + toolsModel.NotifyToolChanged(); + break; + + case IDM_VERTICAL: + // TODO: + break; + } + return 0; +} + +LRESULT CFontsDialog::OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + NMHDR *pnmhdr = reinterpret_cast<NMHDR *>(lParam); + if (pnmhdr->code == TTN_NEEDTEXT) + { + LPTOOLTIPTEXT pToolTip = reinterpret_cast<LPTOOLTIPTEXT>(lParam); + pToolTip->hinst = hProgInstance; + switch (pnmhdr->idFrom) + { + case IDM_BOLD: pToolTip->lpszText = MAKEINTRESOURCE(IDS_BOLD); break; + case IDM_ITALIC: pToolTip->lpszText = MAKEINTRESOURCE(IDS_ITALIC); break; + case IDM_UNDERLINE: pToolTip->lpszText = MAKEINTRESOURCE(IDS_UNDERLINE); break; + case IDM_VERTICAL: pToolTip->lpszText = MAKEINTRESOURCE(IDS_VERTICAL); break; + + default: + break; + } + } + return 0; +} + +LRESULT CFontsDialog::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + RECT rc; + GetWindowRect(&rc); + registrySettings.FontsPositionX = rc.left; + registrySettings.FontsPositionY = rc.top; + return 0; +} + +LRESULT CFontsDialog::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam != TOOL_TEXT) + ShowWindow(SW_HIDE); + + return 0; +} + +LRESULT CFontsDialog::OnMeasureItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == IDD_FONTSNAMES) + { + LPMEASUREITEMSTRUCT pMeasureItem = reinterpret_cast<LPMEASUREITEMSTRUCT>(lParam); + RECT rc; + ::GetClientRect(GetDlgItem(IDD_FONTSNAMES), &rc); + pMeasureItem->itemWidth = rc.right - rc.left; + pMeasureItem->itemHeight = GetSystemMetrics(SM_CYVSCROLL); + return TRUE; + } + return 0; +} + +LRESULT CFontsDialog::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // TODO: Owner-draw the font types + if (wParam == IDD_FONTSNAMES) + { + LPDRAWITEMSTRUCT pDrawItem = reinterpret_cast<LPDRAWITEMSTRUCT>(lParam); + if (pDrawItem->itemID == (UINT)-1) + return TRUE; + + SetBkMode(pDrawItem->hDC, TRANSPARENT); + + HWND hwndItem = pDrawItem->hwndItem; + RECT rcItem = pDrawItem->rcItem; + if (pDrawItem->itemState & ODS_SELECTED) + { + FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_HIGHLIGHT)); + SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + else + { + FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_WINDOW)); + SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + + TCHAR szText[LF_FACESIZE]; + szText[0] = 0; + ComboBox_GetLBText(hwndItem, pDrawItem->itemID, szText); + rcItem.left += 24; + DrawText(pDrawItem->hDC, szText, -1, &rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + + if (pDrawItem->itemState & ODS_FOCUS) + ::DrawFocusRect(pDrawItem->hDC, &pDrawItem->rcItem); + + return TRUE; + } + return 0; +} diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index 8d7aefe444d..0df4f48e409 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -86,3 +86,37 @@ public: POINT percentage; POINT angle; }; + +class CFontsDialog : public CDialogImpl<CFontsDialog> +{ +public: + enum { IDD = IDD_FONTS }; + + CFontsDialog(); + void InitFontNames(); + void InitFontSizes(); + void InitToolbar(); + + BEGIN_MSG_MAP(CFontsDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_MOVE, OnMove) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) + MESSAGE_HANDLER(WM_MEASUREITEM, OnMeasureItem) + MESSAGE_HANDLER(WM_DRAWITEM, OnDrawItem) + END_MSG_MAP() + +protected: + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMeasureItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + void OnFontSize(UINT codeNotify); + void OnFontName(UINT codeNotify); +}; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index e118184aecb..d7453ff198a 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -229,7 +229,7 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2) { HBRUSH oldBrush; LOGBRUSH logbrush; - HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000)); + HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_DOT, 1, GetSysColor(COLOR_HIGHLIGHT))); UINT oldRop = GetROP2(hdc); SetROP2(hdc, R2_NOTXORPEN); @@ -276,20 +276,34 @@ SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selecti void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style) { - HFONT oldFont; - RECT rect = {x1, y1, x2, y2}; - COLORREF oldColor; - COLORREF oldBkColor; - int oldBkMode; - oldFont = (HFONT) SelectObject(hdc, font); - oldColor = SetTextColor(hdc, fg); - oldBkColor = SetBkColor(hdc, bg); - oldBkMode = SetBkMode(hdc, TRANSPARENT); - if (style == 0) - Rect(hdc, x1, y1, x2, y2, bg, bg, 1, 2); - DrawText(hdc, lpchText, -1, &rect, DT_EDITCONTROL); - SelectObject(hdc, oldFont); - SetTextColor(hdc, oldColor); - SetBkColor(hdc, oldBkColor); - SetBkMode(hdc, oldBkMode); + INT iSaveDC = SaveDC(hdc); // We will modify the clipping region. Save now. + + RECT rc; + SetRect(&rc, x1, y1, x2, y2); + + if (style == 0) // Transparent + { + SetBkMode(hdc, TRANSPARENT); + GetBkColor(hdc); + } + else // Opaque + { + SetBkMode(hdc, OPAQUE); + SetBkColor(hdc, bg); + + HBRUSH hbr = CreateSolidBrush(bg); + FillRect(hdc, &rc, hbr); // Fill the background + DeleteObject(hbr); + } + + IntersectClipRect(hdc, rc.left, rc.top, rc.right, rc.bottom); + + HGDIOBJ hFontOld = SelectObject(hdc, font); + SetTextColor(hdc, fg); + const UINT uFormat = DT_LEFT | DT_TOP | DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | + DT_EXPANDTABS | DT_WORDBREAK; + DrawText(hdc, lpchText, -1, &rc, uFormat); + SelectObject(hdc, hFontOld); + + RestoreDC(hdc, iSaveDC); // Restore } diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index a639f620be1..071baecb4dc 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -99,10 +99,9 @@ extern CTextEditWindow textEditWindow; class CMirrorRotateDialog; class CAttributesDialog; class CStretchSkewDialog; +class CFontsDialog; extern CMirrorRotateDialog mirrorRotateDialog; extern CAttributesDialog attributesDialog; extern CStretchSkewDialog stretchSkewDialog; - -/* VARIABLES declared in mouse.cpp **********************************/ - +extern CFontsDialog fontsDialog; diff --git a/base/applications/mspaint/icons/fontstoolbar.bmp b/base/applications/mspaint/icons/fontstoolbar.bmp new file mode 100644 index 00000000000..340a1896c77 Binary files /dev/null and b/base/applications/mspaint/icons/fontstoolbar.bmp differ diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 69a6de62984..6c117591dc6 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -12,8 +12,6 @@ #include "precomp.h" -#include "dialogs.h" - /* FUNCTIONS ********************************************************/ void @@ -102,10 +100,28 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH return 0; } +LRESULT CImgAreaWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HDC hdc = (HDC)wParam; + + if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() && + textEditWindow.IsWindowVisible()) + { + // Do clipping + HWND hChild = textEditWindow; + RECT rcChild; + ::GetWindowRect(hChild, &rcChild); + ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rcChild, 2); + ExcludeClipRect(hdc, rcChild.left, rcChild.top, rcChild.right, rcChild.bottom); + } + + return DefWindowProc(nMsg, wParam, lParam); +} + LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DefWindowProc(WM_PAINT, wParam, lParam); - HDC hdc = GetDC(); + PAINTSTRUCT ps; + HDC hdc = BeginPaint(&ps); int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); StretchBlt(hdc, 0, 0, Zoomed(imgXRes), Zoomed(imgYRes), imageModel.GetDC(), 0, 0, imgXRes, @@ -126,9 +142,11 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b } DeleteObject(SelectObject(hdc, oldPen)); } - ReleaseDC(hdc); + EndPaint(&ps); selectionWindow.Invalidate(FALSE); miniature.Invalidate(FALSE); + if (textEditWindow.IsWindowVisible()) + textEditWindow.Invalidate(FALSE); return 0; } @@ -382,3 +400,10 @@ LRESULT CImgAreaWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BO { return ::SendMessage(GetParent(), nMsg, wParam, lParam); } + +LRESULT CImgAreaWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HDC hdc = (HDC)wParam; + SetBkMode(hdc, TRANSPARENT); + return (LRESULT)GetStockObject(NULL_BRUSH); +} diff --git a/base/applications/mspaint/imgarea.h b/base/applications/mspaint/imgarea.h index 4c1a41ec27c..a898f1e893b 100644 --- a/base/applications/mspaint/imgarea.h +++ b/base/applications/mspaint/imgarea.h @@ -21,6 +21,7 @@ public: BEGIN_MSG_MAP(CImgAreaWindow) MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkGnd) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) @@ -36,12 +37,14 @@ public: MESSAGE_HANDLER(WM_IMAGEMODELIMAGECHANGED, OnImageModelImageChanged) MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) + MESSAGE_HANDLER(WM_CTLCOLOREDIT, OnCtlColorEdit) END_MSG_MAP() BOOL drawing; private: LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -57,6 +60,7 @@ private: LRESULT OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); void cancelDrawing(); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 92c323ac436..c33087fcd48 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-bg-BG.bmp" + ID_MENU MENU BEGIN POPUP "&Файл" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Рисуване" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index edec2e6e387..7de50c92181 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-cs-CZ.bmp" + ID_MENU MENU BEGIN POPUP "&Soubor" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Malování" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Úhel musí být -89 a 89." IDS_LOADERRORTEXT "Soubor %s nemohl být načten." IDS_ENLARGEPROMPTTEXT "Obrázek ve schránce je větší než bitmapa.\nChcete bitmapu zvětšit?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index e04703b521f..04af89c3585 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-de-DE.bmp" + ID_MENU MENU BEGIN POPUP "&Datei" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Der Winkel muss zwischen -89 und 89 liegen." IDS_LOADERRORTEXT "Die Datei %s konnte nicht geladen werden." IDS_ENLARGEPROMPTTEXT "Das Bild in der Zwischenablage ist größer als die Bitmap.\nSoll die Bitmap vergrößert werden?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index dfd26d3fa3e..c350c34e23c 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-en-GB.bmp" + ID_MENU MENU BEGIN POPUP "&File" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 28e99c10520..afe602a2ac6 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar.bmp" + ID_MENU MENU BEGIN POPUP "&File" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 1c625d8720e..106e0b616df 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -10,6 +10,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-es-ES.bmp" + ID_MENU MENU BEGIN POPUP "&Archivo" @@ -193,6 +195,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Tipografías" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -227,4 +240,8 @@ BEGIN IDS_ANGLE "El ángulo debe de estar entre -89 y 89." IDS_LOADERRORTEXT "No se pudo cargar el archivo %s." IDS_ENLARGEPROMPTTEXT "La imagen en el Portapapeles es más grande que el lienzo.\n¿Quieres adaptar las dimensiones del lienzo a su nuevo tamaño?" + IDS_BOLD "Negrita" + IDS_ITALIC "Cursiva" + IDS_UNDERLINE "Subrayado" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 8c9a13f8a99..2268fc9edc6 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-et-EE.bmp" + ID_MENU MENU BEGIN POPUP "&Fail" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Tühista", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Nurk peab -89 ja 89 vahemikus olema." IDS_LOADERRORTEXT "Faili %s ei suudetud laadida." IDS_ENLARGEPROMPTTEXT "Pilt lõikelaual on suurem kui digitaalkujutis.\nKas soovid digitaalkujutist suurendada?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 1229441af00..aeaabe181f4 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-eu-ES.bmp" + ID_MENU MENU BEGIN POPUP "&Fitxategia" @@ -183,6 +185,17 @@ BEGIN PUSHBUTTON "Utzi", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -217,4 +230,8 @@ BEGIN IDS_ANGLE "Angelu -89 eta 89 tartean izan behar da." IDS_LOADERRORTEXT "%s artxiboaren karga ez ahal da." IDS_ENLARGEPROMPTTEXT "Klipboard dagoen argazkia bitmap-a baino handiagoa da.\nNahi duzu bitmap-a luzatu?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 2be2fa59f89..a714bbd1a1a 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-fr-FR.bmp" + ID_MENU MENU BEGIN POPUP "&Fichier" @@ -183,6 +185,17 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -217,4 +230,8 @@ BEGIN IDS_ANGLE "L'angle doit être entre -89 et 89." IDS_LOADERRORTEXT "Le fichier %s n'a pas pu être chargé." IDS_ENLARGEPROMPTTEXT "L'image dans le presse-papier est plus grande que le bitmap.\nSouhaitez-vous agrandir le bitmap ?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1e16cb261cb..3501d9163c2 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-he-IL.bmp" + ID_MENU MENU BEGIN POPUP "&קובץ" @@ -186,6 +188,17 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "צייר" @@ -220,4 +233,8 @@ BEGIN IDS_ANGLE, "The angle must be between -89 and 89." IDS_LOADERRORTEXT, ".%s לא היה ניתן לטעון את הקובץ" IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index dcdce5c35c2..d95cb65e542 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-hu-HU.bmp" + ID_MENU MENU BEGIN POPUP "&Fájl" @@ -183,6 +185,17 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -217,4 +230,8 @@ BEGIN IDS_ANGLE "A szögnek -89 és 89 között kell lennie." IDS_LOADERRORTEXT "A(z) %s fájlt nem sikerült betölteni." IDS_ENLARGEPROMPTTEXT "A vágólapon lévő kép nagyobb mint a bitkép.\nSzeretné a bitkép méretét megnövelni?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 771ff0d1753..289ce396c9c 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-id-ID.bmp" + ID_MENU MENU BEGIN POPUP "Be&rkas" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Sudut hanya tersedia antara -89 and 89." IDS_LOADERRORTEXT "Berkas %s tidak bisa dimuat." IDS_ENLARGEPROMPTTEXT "Gambar pada papan klip lebih besar dari kanvas.\nPerbesar kanvas?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index d69c4253f4a..42605678968 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-it-IT.bmp" + ID_MENU MENU BEGIN POPUP "&File" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "L'angolo deve essere compreso tra -89 e 89." IDS_LOADERRORTEXT "l file %s non può essere caricato." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index bd41821e3fb..02fa6324bd4 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ja-JP.bmp" + ID_MENU MENU BEGIN POPUP "ファイル(&F)" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "フォント" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "MS UI Gothic" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "ペイント" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "角度は -89 から 89 の間でなければなりません。" IDS_LOADERRORTEXT "ファイル %s は読み込めませんでした。" IDS_ENLARGEPROMPTTEXT "クリップボードの画像はビットマップよりも大きいです。\nビットマップを拡張しますか？" + IDS_BOLD "太字" + IDS_ITALIC "斜体" + IDS_UNDERLINE "下線" + IDS_VERTICAL "縦書き" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index d6ad4ed0279..7b62d03e583 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-nl-NL.bmp" + ID_MENU MENU BEGIN POPUP "&Bestand" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 2864a8c7099..c52129aaad9 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-no-NO.bmp" + ID_MENU MENU BEGIN POPUP "&Fil" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index f0ed2ece509..4fd8c7fe837 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pl-PL.bmp" + ID_MENU MENU BEGIN POPUP "&Plik" @@ -192,6 +194,17 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -226,4 +239,8 @@ BEGIN IDS_ANGLE "Wprowadź liczbę całkowitą z zakresu od -89 do 89." IDS_LOADERRORTEXT "Plik %s nie może być załadowany." IDS_ENLARGEPROMPTTEXT "Obraz w schowku jest większy niż bitmapa.\nChciałbyś powiększyć bitmapę?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 1a6dd890930..4c26c69e758 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-BR.bmp" + ID_MENU MENU BEGIN POPUP "&Arquivo" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 9395d3deaba..c4ddb740e0f 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-PT.bmp" + ID_MENU MENU BEGIN POPUP "&Ficheiro" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 2bd8bf0efe9..72ad71d22ed 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ro-RO.bmp" + ID_MENU MENU BEGIN POPUP "&Fișier" @@ -192,6 +194,17 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Pictare" @@ -226,4 +239,8 @@ BEGIN IDS_ANGLE "Unghiul trebuie să fie între -89 și 89." IDS_LOADERRORTEXT "Fișierul %s nu poate fi încărcat." IDS_ENLARGEPROMPTTEXT "Imaginea din memorie este mai mare decât suprafața curent disponibilă în aplicație.\nDoriți să redimensionați suprafața de desen disponibilă?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 10910b337ed..492fd51b45b 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ru-RU.bmp" + ID_MENU MENU BEGIN POPUP "&Файл" @@ -183,6 +185,17 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -217,4 +230,8 @@ BEGIN IDS_ANGLE, "Угол должен быть в интервале от -89 до 89." IDS_LOADERRORTEXT, "Невозможно загрузить файл %s." IDS_ENLARGEPROMPTTEXT "Изображения в буфере обмена больше растрового изображения.\nХотите увеличить точечный рисунок?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 4eadabc96c3..f513cf3e7da 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sk-SK.bmp" + ID_MENU MENU BEGIN POPUP "&Súbor" @@ -192,6 +194,17 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Skicár" @@ -226,4 +239,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 25446b39bbc..f465274430c 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sq-AL.bmp" + ID_MENU MENU BEGIN POPUP "&File" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Këndi duhet të jetë në mes -89 dhe 89." IDS_LOADERRORTEXT "Dokumenti %s nuk mund te ngarkohej." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index f883a7d9177..73c295551e7 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sv-SE.bmp" + ID_MENU MENU BEGIN POPUP "&Arkiv" @@ -183,6 +185,17 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -217,4 +230,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 735894e6de8..9fbaf431b3b 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-tr-TR.bmp" + ID_MENU MENU BEGIN POPUP "&Dosya" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Açı -89 ile 89 arasında olmalıdır." IDS_LOADERRORTEXT "%s dosyası yüklenemedi." IDS_ENLARGEPROMPTTEXT "Panodaki resim bit eşleminden daha büyük.\nBit eşlemin genişletilmişini ister misiniz?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 08660706f12..2a75841f4ad 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-uk-UA.bmp" + ID_MENU MENU BEGIN POPUP "&Файл" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 9a0d7d03290..db323137650 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-vi-VN.bmp" + ID_MENU MENU BEGIN POPUP "&Tập tin" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "Hủy", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "Vẽ" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "Giá trị của góc phải ở giữa -89 và 89." IDS_LOADERRORTEXT "Không thể tải tập tin %s." IDS_ENLARGEPROMPTTEXT "Hình ảnh bạn định dán lớn hơn hình bitmap này.\n Bạn có muốn nới rộng hình bitmap?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index c991b85b5cf..0be67583349 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-CN.bmp" + ID_MENU MENU BEGIN POPUP "文件(&F)" @@ -192,6 +194,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "宋体" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "画图" @@ -226,4 +239,8 @@ BEGIN IDS_ANGLE "角度必须在 -89 与 89 之间。" IDS_LOADERRORTEXT "文件 %s 无法加载。" IDS_ENLARGEPROMPTTEXT "剪贴板中的图像比位图大。\n你想扩大位图吗?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 28d939f47fb..ece47e9fff4 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-HK.bmp" + ID_MENU MENU BEGIN POPUP "檔案(&F)" @@ -191,6 +193,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "新細明體" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "小畫家" @@ -225,4 +238,8 @@ BEGIN IDS_ANGLE "角度必須介乎 -89 至 89 之間。" IDS_LOADERRORTEXT "無法載入檔案 %s。" IDS_ENLARGEPROMPTTEXT "剪貼簿中的圖像比點陣圖大。\n你要擴大點陣圖嗎？" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 8bc305e3159..d6011140db2 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-TW.bmp" + ID_MENU MENU BEGIN POPUP "檔案(&F)" @@ -192,6 +194,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 END +IDD_FONTS DIALOG 0, 0, 225, 25 +CAPTION "Fonts" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "新細明體" +BEGIN + COMBOBOX IDD_FONTSNAMES, 5, 5, 110, 200, CBS_HASSTRINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_FONTSSIZES, 120, 5, 35, 250, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDD_FONTSTOOLBAR, "ToolbarWindow32", TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NOMOVEY, 160, 5, 60, 20 +END + STRINGTABLE BEGIN IDS_PROGRAMNAME "畫圖" @@ -226,4 +239,8 @@ BEGIN IDS_ANGLE "角度必須介於 -89 和 89 之間。" IDS_LOADERRORTEXT "無法載入檔案 %s。" IDS_ENLARGEPROMPTTEXT "剪貼簿中的圖像比點陣圖大。\n你想擴大點陣圖嗎?" + IDS_BOLD "Bold" + IDS_ITALIC "Italic" + IDS_UNDERLINE "Underline" + IDS_VERTICAL "Vertical" END diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index b7e774a23f4..ab410537a69 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -171,7 +171,10 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument hProgInstance = hThisInstance; /* initialize common controls library */ - InitCommonControls(); + INITCOMMONCONTROLSEX iccx; + iccx.dwSize = sizeof(iccx); + iccx.dwICC = ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES; + InitCommonControlsEx(&iccx); LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname)); CPath pathFileName(filepathname); @@ -256,6 +259,8 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument DoLoadImageFile(mainWindow, __targv[1], TRUE); } + imageModel.ClearHistory(); + /* initializing the CHOOSECOLOR structure for use with ChooseColor */ ZeroMemory(&choosecolor, sizeof(choosecolor)); choosecolor.lStructSize = sizeof(CHOOSECOLOR); @@ -327,10 +332,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* by moving the window, the things in WM_SIZE are done */ mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement)); - /* creating the text editor window for the text tool */ - RECT textEditWindowPos = {300, 0, 300 + 300, 0 + 200}; - textEditWindow.Create(hwnd, textEditWindowPos, NULL, WS_OVERLAPPEDWINDOW); - /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); @@ -340,6 +341,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* Run the message loop. It will run until GetMessage() returns 0 */ while (GetMessage(&messages, NULL, 0, 0)) { + if (fontsDialog.IsWindow() && IsDialogMessage(fontsDialog, &messages)) + continue; + TranslateAccelerator(hwnd, haccel, &messages); /* Translate virtual-key messages into character messages */ diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index e5b50b617ad..16a6500e9d1 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -366,12 +366,7 @@ struct TextTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) - { - imageModel.CopyPrevious(); - } - - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void UpdatePoint(LONG x, LONG y) { POINT temp; imageModel.ResetToPrevious(); @@ -381,16 +376,78 @@ struct TextTool : ToolBase RectSel(m_hdc, start.x, start.y, temp.x, temp.y); } + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + { + if (!textEditWindow.IsWindow()) + textEditWindow.Create(imageArea); + + imageModel.CopyPrevious(); + UpdatePoint(x, y); + } + + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + { + UpdatePoint(x, y); + } + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { imageModel.ResetToPrevious(); - if (selectionModel.IsSrcRectSizeNonzero()) + + BOOL bTextBoxShown = textEditWindow.IsWindowVisible(); + if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) { - imageModel.CopyPrevious(); + CString szText; + textEditWindow.GetWindowText(szText); - placeSelWin(); - selectionWindow.ShowWindow(SW_SHOW); - ForceRefreshSelectionContents(); + RECT rc; + textEditWindow.InvalidateEditRect(); + textEditWindow.GetEditRect(&rc); + + INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1); + Text(m_hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText, + textEditWindow.GetFont(), style); + } + + if (registrySettings.ShowTextTool) + { + if (!fontsDialog.IsWindow()) + fontsDialog.Create(mainWindow); + + fontsDialog.ShowWindow(SW_SHOWNOACTIVATE); + } + + if (!bTextBoxShown || selectionModel.IsSrcRectSizeNonzero()) + { + RECT rc; + selectionModel.GetRect(&rc); + + // Enlarge if tool small + INT cxMin = CX_MINTEXTEDIT, cyMin = CY_MINTEXTEDIT; + if (selectionModel.IsSrcRectSizeNonzero()) + { + if (rc.right - rc.left < cxMin) + rc.right = rc.left + cxMin; + if (rc.bottom - rc.top < cyMin) + rc.bottom = rc.top + cyMin; + } + else + { + SetRect(&rc, x, y, x + cxMin, y + cyMin); + } + + if (!textEditWindow.IsWindow()) + textEditWindow.Create(imageArea); + + textEditWindow.SetWindowText(NULL); + textEditWindow.ValidateEditRect(&rc); + textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); + textEditWindow.SetFocus(); + } + else + { + textEditWindow.ShowWindow(SW_HIDE); + textEditWindow.SetWindowText(NULL); } } @@ -398,6 +455,8 @@ struct TextTool : ToolBase { imageModel.ResetToPrevious(); selectionModel.ResetPtStack(); + textEditWindow.SetWindowText(NULL); + textEditWindow.ShowWindow(SW_HIDE); ToolBase::OnCancelDraw(); } }; diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index ffbde5706fd..1f5dd899be6 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -97,6 +97,8 @@ void PaletteModel::NotifyColorChanged() { paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (textEditWindow.IsWindow()) + textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); } void PaletteModel::NotifyPaletteChanged() diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 5b5bfa8279d..5e2756b2fa1 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,6 +50,7 @@ #include "toolsettings.h" #include "toolsmodel.h" #include "winproc.h" +#include "dialogs.h" #include "common.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index eb257e0cf3b..fd83a4b3243 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -25,13 +25,18 @@ static DWORD ReadDWORD(CRegKey &key, LPCTSTR lpName, DWORD &dwValue, BOOL bCheck return dwPrev; } -static void ReadFileHistory(CRegKey &key, LPCTSTR lpName, CString &strFile) +static void ReadString(CRegKey &key, LPCTSTR lpName, CString &strValue, LPCTSTR lpDefault = TEXT("")) { + CString strTemp; ULONG nChars = MAX_PATH; - LPTSTR szFile = strFile.GetBuffer(nChars); - if (key.QueryStringValue(lpName, szFile, &nChars) != ERROR_SUCCESS) - szFile[0] = '\0'; - strFile.ReleaseBuffer(); + LPTSTR psz = strTemp.GetBuffer(nChars); + LONG error = key.QueryStringValue(lpName, psz, &nChars); + strTemp.ReleaseBuffer(); + + if (error == ERROR_SUCCESS) + strValue = strTemp; + else + strValue = lpDefault; } void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::WallpaperStyle style) @@ -61,15 +66,20 @@ void RegistrySettings::LoadPresets() ThumbXPos = 180; ThumbYPos = 200; UnitSetting = 0; - const WINDOWPLACEMENT DefaultWindowPlacement = { - sizeof(WINDOWPLACEMENT), - 0, - SW_SHOWNORMAL, - {0, 0}, - {-1, -1}, - {100, 100, 700, 550} - }; - WindowPlacement = DefaultWindowPlacement; + Bold = FALSE; + Italic = FALSE; + Underline = FALSE; + CharSet = DEFAULT_CHARSET; + PointSize = 14; + FontsPositionX = 0; + FontsPositionY = 0; + ShowTextTool = TRUE; + + LOGFONT lf; + GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); + strFontName = lf.lfFaceName; + + ZeroMemory(&WindowPlacement, sizeof(WindowPlacement)); } void RegistrySettings::Load() @@ -98,10 +108,24 @@ void RegistrySettings::Load() CRegKey files; if (files.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Recent File List"), KEY_READ) == ERROR_SUCCESS) { - ReadFileHistory(files, _T("File1"), strFile1); - ReadFileHistory(files, _T("File2"), strFile2); - ReadFileHistory(files, _T("File3"), strFile3); - ReadFileHistory(files, _T("File4"), strFile4); + ReadString(files, _T("File1"), strFile1); + ReadString(files, _T("File2"), strFile2); + ReadString(files, _T("File3"), strFile3); + ReadString(files, _T("File4"), strFile4); + } + + CRegKey text; + if (text.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Text"), KEY_READ) == ERROR_SUCCESS) + { + ReadDWORD(text, _T("Bold"), Bold, FALSE); + ReadDWORD(text, _T("Italic"), Italic, FALSE); + ReadDWORD(text, _T("Underline"), Underline, FALSE); + ReadDWORD(text, _T("CharSet"), CharSet, FALSE); + ReadDWORD(text, _T("PointSize"), PointSize, FALSE); + ReadDWORD(text, _T("PositionX"), FontsPositionX, FALSE); + ReadDWORD(text, _T("PositionY"), FontsPositionY, FALSE); + ReadDWORD(text, _T("ShowTextTool"), ShowTextTool, FALSE); + ReadString(text, _T("TypeFaceName"), strFontName, strFontName); } // Fix the bitmap size if too large @@ -144,6 +168,20 @@ void RegistrySettings::Store() if (!strFile4.IsEmpty()) files.SetStringValue(_T("File4"), strFile4); } + + CRegKey text; + if (text.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Text")) == ERROR_SUCCESS) + { + text.SetDWORDValue(_T("Bold"), Bold); + text.SetDWORDValue(_T("Italic"), Italic); + text.SetDWORDValue(_T("Underline"), Underline); + text.SetDWORDValue(_T("CharSet"), CharSet); + text.SetDWORDValue(_T("PointSize"), PointSize); + text.SetDWORDValue(_T("PositionX"), FontsPositionX); + text.SetDWORDValue(_T("PositionY"), FontsPositionY); + text.SetDWORDValue(_T("ShowTextTool"), ShowTextTool); + text.SetStringValue(_T("TypeFaceName"), strFontName); + } } void RegistrySettings::SetMostRecentFile(LPCTSTR szPathName) diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index 98cd4072374..33c1be4054b 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -32,6 +32,16 @@ public: CString strFile3; CString strFile4; + CString strFontName; + DWORD PointSize; + DWORD Bold; + DWORD Italic; + DWORD Underline; + DWORD CharSet; + DWORD FontsPositionX; + DWORD FontsPositionY; + DWORD ShowTextTool; + enum WallpaperStyle { TILED, CENTERED, diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index fd3330a776b..3e563416309 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -13,6 +13,7 @@ #define IDI_APPICON 500 #define IDB_TOOLBARICONS 510 +#define IDB_FONTSTOOLBAR 511 #define IDI_TRANSPARENT 526 #define IDI_NONTRANSPARENT 527 @@ -96,6 +97,11 @@ #define IDM_HELPHELPTOPICS 270 #define IDM_HELPINFO 271 +#define IDM_BOLD 280 +#define IDM_ITALIC 281 +#define IDM_UNDERLINE 282 +#define IDM_VERTICAL 283 + /* the following 16 numbers need to be in order, increasing by 1 */ #define ID_FREESEL 600 #define ID_RECTSEL 601 @@ -165,6 +171,11 @@ #define IDD_STRETCHSKEWEDITVSKEW 757 #define IDD_STRETCHSKEWTEXTVDEG 758 +#define IDD_FONTS 760 +#define IDD_FONTSNAMES 761 +#define IDD_FONTSSIZES 762 +#define IDD_FONTSTOOLBAR 764 + #define IDS_PROGRAMNAME 900 #define IDS_WINDOWTITLE 901 #define IDS_INFOTITLE 902 @@ -202,3 +213,8 @@ #define IDS_LOADERRORTEXT 933 #define IDS_ENLARGEPROMPTTEXT 934 + +#define IDS_BOLD 935 +#define IDS_ITALIC 936 +#define IDS_UNDERLINE 937 +#define IDS_VERTICAL 938 diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 8b85446cf71..49a6fb4ce2a 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -10,6 +10,7 @@ #include <windef.h> #include <winuser.h> +#include <commctrl.h> #include "resource.h" diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index aa6b8ef9f49..464b6bdca64 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -347,3 +347,8 @@ void SelectionModel::NotifyRefreshNeeded() { selectionWindow.SendMessage(WM_SELECTIONMODELREFRESHNEEDED); } + +void SelectionModel::GetRect(LPRECT prc) const +{ + *prc = m_rcDest; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 9ed0f2faa46..523f22145fb 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -65,6 +65,7 @@ public: LONG GetDestRectHeight() const; LONG GetDestRectLeft() const; LONG GetDestRectTop() const; + void GetRect(LPRECT prc) const; void DrawTextToolText(HDC hDCImage, COLORREF crFg, COLORREF crBg, BOOL bBgTransparent = FALSE); private: diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 4c792c28d83..792633a55e7 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -10,50 +10,502 @@ #include "precomp.h" +#define CXY_GRIP 3 + /* FUNCTIONS ********************************************************/ -LRESULT CTextEditWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + +CTextEditWindow::CTextEditWindow() : m_hFont(NULL), m_hFontZoomed(NULL), m_nAppIsMovingOrSizing(0) +{ + SetRectEmpty(&m_rc); +} + +#define X0 rc.left +#define X1 ((rc.left + rc.right - CXY_GRIP) / 2) +#define X2 (rc.right - CXY_GRIP) +#define Y0 rc.top +#define Y1 ((rc.top + rc.bottom - CXY_GRIP) / 2) +#define Y2 (rc.bottom - CXY_GRIP) +#define RECT0 X0, Y0, X0 + CXY_GRIP, Y0 + CXY_GRIP // Upper Left +#define RECT1 X1, Y0, X1 + CXY_GRIP, Y0 + CXY_GRIP // Top +#define RECT2 X2, Y0, X2 + CXY_GRIP, Y0 + CXY_GRIP // Upper Right +#define RECT3 X0, Y1, X0 + CXY_GRIP, Y1 + CXY_GRIP // Left +#define RECT4 X2, Y1, X2 + CXY_GRIP, Y1 + CXY_GRIP // Right +#define RECT5 X0, Y2, X0 + CXY_GRIP, Y2 + CXY_GRIP // Lower Left +#define RECT6 X1, Y2, X1 + CXY_GRIP, Y2 + CXY_GRIP // Bottom +#define RECT7 X2, Y2, X2 + CXY_GRIP, Y2 + CXY_GRIP // Lower Right + +INT CTextEditWindow::DoHitTest(RECT& rc, POINT pt) { - /* creating the edit control within the editor window */ - RECT editControlPos = {0, 0, 0 + 100, 0 + 100}; - editControl.Create(_T("EDIT"), m_hWnd, editControlPos, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, - WS_EX_CLIENTEDGE); + RECT rcGrip; + + SetRect(&rcGrip, RECT0); + if (PtInRect(&rcGrip, pt)) + return HTTOPLEFT; + SetRect(&rcGrip, RECT1); + if (PtInRect(&rcGrip, pt)) + return HTTOP; + SetRect(&rcGrip, RECT2); + if (PtInRect(&rcGrip, pt)) + return HTTOPRIGHT; + + SetRect(&rcGrip, RECT3); + if (PtInRect(&rcGrip, pt)) + return HTLEFT; + SetRect(&rcGrip, RECT4); + if (PtInRect(&rcGrip, pt)) + return HTRIGHT; + + SetRect(&rcGrip, RECT5); + if (PtInRect(&rcGrip, pt)) + return HTBOTTOMLEFT; + SetRect(&rcGrip, RECT6); + if (PtInRect(&rcGrip, pt)) + return HTBOTTOM; + SetRect(&rcGrip, RECT7); + if (PtInRect(&rcGrip, pt)) + return HTBOTTOMRIGHT; + + // On border line? + RECT rcInner = rc; + InflateRect(&rcInner, -3, -3); + if (!PtInRect(&rcInner, pt) && PtInRect(&rc, pt)) + return HTCAPTION; + + return HTCLIENT; +} + +void CTextEditWindow::DrawGrip(HDC hDC, RECT& rc) +{ + HGDIOBJ hbrOld = SelectObject(hDC, GetStockObject(NULL_BRUSH)); + HPEN hPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_HIGHLIGHT)); + HGDIOBJ hPenOld = SelectObject(hDC, hPen); + InflateRect(&rc, -1, -1); + Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); + InflateRect(&rc, 1, 1); + SelectObject(hDC, hPenOld); + SelectObject(hDC, hbrOld); + DeleteObject(hPen); + + RECT rcGrip; + HBRUSH hbrHighlight = GetSysColorBrush(COLOR_HIGHLIGHT); + + SetRect(&rcGrip, RECT0); + FillRect(hDC, &rcGrip, hbrHighlight); + SetRect(&rcGrip, RECT1); + FillRect(hDC, &rcGrip, hbrHighlight); + SetRect(&rcGrip, RECT2); + FillRect(hDC, &rcGrip, hbrHighlight); + + SetRect(&rcGrip, RECT3); + FillRect(hDC, &rcGrip, hbrHighlight); + SetRect(&rcGrip, RECT4); + FillRect(hDC, &rcGrip, hbrHighlight); + + SetRect(&rcGrip, RECT5); + FillRect(hDC, &rcGrip, hbrHighlight); + SetRect(&rcGrip, RECT6); + FillRect(hDC, &rcGrip, hbrHighlight); + SetRect(&rcGrip, RECT7); + FillRect(hDC, &rcGrip, hbrHighlight); +} + +void CTextEditWindow::FixEditPos(LPCTSTR pszOldText) +{ + CString szText; + GetWindowText(szText); + + RECT rcParent; + ::GetWindowRect(m_hwndParent, &rcParent); + + RECT rc, rcWnd, rcText; + GetWindowRect(&rcWnd); + rcText = rcWnd; + + HDC hDC = GetDC(); + if (hDC) + { + SelectObject(hDC, m_hFontZoomed); + TEXTMETRIC tm; + GetTextMetrics(hDC, &tm); + szText += TEXT("x"); // This is a trick to enable the last newlines + const UINT uFormat = DT_LEFT | DT_TOP | DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | + DT_EXPANDTABS | DT_WORDBREAK; + DrawText(hDC, szText, -1, &rcText, uFormat | DT_CALCRECT); + if (tm.tmDescent > 0) + rcText.bottom += tm.tmDescent; + ReleaseDC(hDC); + } + + UnionRect(&rc, &rcText, &rcWnd); + ::MapWindowPoints(NULL, m_hwndParent, (LPPOINT)&rc, 2); + + rcWnd = rc; + ::GetClientRect(m_hwndParent, &rcParent); + IntersectRect(&rc, &rcParent, &rcWnd); + + ++m_nAppIsMovingOrSizing; + MoveWindow(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, FALSE); + --m_nAppIsMovingOrSizing; + + DefWindowProc(WM_HSCROLL, SB_LEFT, 0); + DefWindowProc(WM_VSCROLL, SB_TOP, 0); + + ::InvalidateRect(m_hwndParent, &rc, TRUE); +} + +LRESULT CTextEditWindow::OnChar(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == VK_TAB) + return 0; // FIXME: Tabs + + CString szText; + GetWindowText(szText); + + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + FixEditPos(szText); + + return ret; +} + +LRESULT CTextEditWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == VK_ESCAPE) + { + toolsModel.OnCancelDraw(); + return 0; + } + + CString szText; + GetWindowText(szText); + + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + FixEditPos(szText); + return ret; +} + +LRESULT CTextEditWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + DefWindowProc(WM_HSCROLL, SB_LEFT, 0); + DefWindowProc(WM_VSCROLL, SB_TOP, 0); + return ret; +} + +LRESULT CTextEditWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HDC hDC = (HDC)wParam; + if (!toolsModel.IsBackgroundTransparent()) + { + RECT rc; + GetClientRect(&rc); + HBRUSH hbr = CreateSolidBrush(paletteModel.GetBgColor()); + FillRect(hDC, &rc, hbr); + DeleteObject(hbr); + } + SetTextColor(hDC, paletteModel.GetFgColor()); + return TRUE; +} + +LRESULT CTextEditWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + RECT rc; + GetClientRect(&rc); + + DefWindowProc(nMsg, wParam, lParam); + + HDC hDC = GetDC(); + if (hDC) + { + DrawGrip(hDC, rc); + ReleaseDC(hDC); + } + + return 0; +} + +LRESULT CTextEditWindow::OnNCPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + RECT rc; + GetWindowRect(&rc); + + HDC hDC = GetDCEx(NULL, DCX_WINDOW | DCX_PARENTCLIP); + if (hDC) + { + OffsetRect(&rc, -rc.left, -rc.top); + DrawGrip(hDC, rc); + ReleaseDC(hDC); + } + return 0; } +LRESULT CTextEditWindow::OnNCCalcSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + return 0; // No frame. +} + +LRESULT CTextEditWindow::OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + RECT rc; + GetWindowRect(&rc); + return DoHitTest(rc, pt); +} + +LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UINT nHitTest = LOWORD(lParam); + if (nHitTest == HTCAPTION) + { + SetCursor(LoadCursor(NULL, IDC_SIZEALL)); + return FALSE; + } + return DefWindowProc(nMsg, wParam, lParam); +} + +LRESULT CTextEditWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + + if (m_nAppIsMovingOrSizing == 0) + { + Reposition(); + InvalidateEditRect(); + } + return ret; +} + LRESULT CTextEditWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - RECT clientRect; - GetClientRect(&clientRect); - editControl.MoveWindow(clientRect.left, clientRect.top, RECT_WIDTH(clientRect), RECT_HEIGHT(clientRect), TRUE); + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + + RECT rc; + GetClientRect(&rc); + SendMessage(EM_SETRECTNP, 0, (LPARAM)&rc); + SendMessage(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0)); + + if (m_nAppIsMovingOrSizing == 0) + { + Reposition(); + InvalidateEditRect(); + } + + return ret; +} + +// Hack: Use DECLARE_WND_SUPERCLASS instead! +HWND CTextEditWindow::Create(HWND hwndParent) +{ + m_hwndParent = hwndParent; + + const DWORD style = ES_LEFT | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | + WS_CHILD | WS_THICKFRAME; + m_hWnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, + hwndParent, NULL, hProgInstance, NULL); + if (m_hWnd) + { +#undef SubclassWindow // Don't use this macro + SubclassWindow(m_hWnd); + + UpdateFont(); + + PostMessage(WM_SIZE, 0, 0); + } + + return m_hWnd; +} + +void CTextEditWindow::DoFillBack(HWND hwnd, HDC hDC) +{ + if (toolsModel.IsBackgroundTransparent()) + return; + + RECT rc; + SendMessage(EM_GETRECT, 0, (LPARAM)&rc); + MapWindowPoints(hwnd, (LPPOINT)&rc, 2); + + HBRUSH hbr = CreateSolidBrush(paletteModel.GetBgColor()); + FillRect(hDC, &rc, hbr); + DeleteObject(hbr); +} + +LRESULT CTextEditWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UpdateFont(); return 0; } LRESULT CTextEditWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { ShowWindow(SW_HIDE); + if (m_hFont) + { + DeleteObject(m_hFont); + m_hFont = NULL; + } + if (m_hFontZoomed) + { + DeleteObject(m_hFontZoomed); + m_hFontZoomed = NULL; + } return 0; } -LRESULT CTextEditWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +void CTextEditWindow::InvalidateEditRect() { - switch(HIWORD(wParam)) - { - case EN_UPDATE: - { - HeapFree(GetProcessHeap(), 0, textToolText); - textToolTextMaxLen = editControl.GetWindowTextLength() + 1; - textToolText = (LPTSTR) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen); - editControl.GetWindowText(textToolText, textToolTextMaxLen); - ForceRefreshSelectionContents(); - break; - } - } + RECT rc; + GetWindowRect(&rc); + ::MapWindowPoints(NULL, m_hwndParent, (LPPOINT)&rc, 2); + ::InvalidateRect(m_hwndParent, &rc, TRUE); + + GetClientRect(&rc); + MapWindowPoints(imageArea, (LPPOINT)&rc, 2); + rc.left = UnZoomed(rc.left); + rc.top = UnZoomed(rc.top); + rc.right = UnZoomed(rc.right); + rc.bottom = UnZoomed(rc.bottom); + m_rc = rc; +} + +LRESULT CTextEditWindow::OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UpdateFont(); + return 0; +} + +LRESULT CTextEditWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UpdateFont(); + return 0; +} + +LRESULT CTextEditWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UpdateFont(); + ValidateEditRect(NULL); return 0; } LRESULT CTextEditWindow::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - ShowWindow((wParam == TOOL_TEXT) ? SW_SHOW : SW_HIDE); + if (wParam == TOOL_TEXT) + { + UpdateFont(); + } + else + { + ShowWindow(SW_HIDE); + } return 0; } + +void CTextEditWindow::UpdateFont() +{ + if (m_hFont) + { + DeleteObject(m_hFont); + m_hFont = NULL; + } + if (m_hFontZoomed) + { + DeleteObject(m_hFontZoomed); + m_hFontZoomed = NULL; + } + + LOGFONT lf; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; // registrySettings.CharSet; // Ignore + lf.lfWeight = (registrySettings.Bold ? FW_BOLD : FW_NORMAL); + lf.lfItalic = registrySettings.Italic; + lf.lfUnderline = registrySettings.Underline; + lstrcpyn(lf.lfFaceName, registrySettings.strFontName, _countof(lf.lfFaceName)); + + HDC hdc = GetDC(); + if (hdc) + { + INT nFontSize = registrySettings.PointSize; + lf.lfHeight = -MulDiv(nFontSize, GetDeviceCaps(hdc, LOGPIXELSY), 72); + ReleaseDC(hdc); + } + + m_hFont = ::CreateFontIndirect(&lf); + + lf.lfHeight = Zoomed(lf.lfHeight); + m_hFontZoomed = ::CreateFontIndirect(&lf); + + SetWindowFont(m_hWnd, m_hFontZoomed, TRUE); + DefWindowProc(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0)); + + FixEditPos(NULL); + + Invalidate(); +} + +LRESULT CTextEditWindow::OnSetSel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + DefWindowProc(WM_HSCROLL, SB_LEFT, 0); + DefWindowProc(WM_VSCROLL, SB_TOP, 0); + InvalidateEditRect(); + return ret; +} + +BOOL CTextEditWindow::GetEditRect(LPRECT prc) const +{ + *prc = m_rc; + return TRUE; +} + +void CTextEditWindow::ValidateEditRect(LPCRECT prc OPTIONAL) +{ + if (prc) + m_rc = *prc; + INT x0 = Zoomed(m_rc.left), y0 = Zoomed(m_rc.top); + INT x1 = Zoomed(m_rc.right), y1 = Zoomed(m_rc.bottom); + + ++m_nAppIsMovingOrSizing; + MoveWindow(x0, y0, x1 - x0, y1 - y0, TRUE); + --m_nAppIsMovingOrSizing; +} + +void CTextEditWindow::Reposition() +{ + RECT rc, rcImage; + GetWindowRect(&rc); + + ::MapWindowPoints(NULL, imageArea, (LPPOINT)&rc, 2); + imageArea.GetClientRect(&rcImage); + + if (rc.bottom > rcImage.bottom) + { + rc.top = rcImage.bottom - (rc.bottom - rc.top); + rc.bottom = rcImage.bottom; + } + + if (rc.right > rcImage.right) + { + rc.left = rcImage.right - (rc.right - rc.left); + rc.right = rcImage.right; + } + + if (rc.left < 0) + { + rc.right += -rc.left; + rc.left = 0; + } + + if (rc.top < 0) + { + rc.bottom += -rc.top; + rc.top = 0; + } + + ++m_nAppIsMovingOrSizing; + MoveWindow(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); + --m_nAppIsMovingOrSizing; +} + +LRESULT CTextEditWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + return ::SendMessage(GetParent(), nMsg, wParam, lParam); +} diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 61eac3675a3..a227ce25714 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -8,24 +8,73 @@ #pragma once +#define CX_MINTEXTEDIT 100 +#define CY_MINTEXTEDIT 24 + class CTextEditWindow : public CWindowImpl<CTextEditWindow> { public: - DECLARE_WND_CLASS_EX(_T("TextEdit"), CS_DBLCLKS, COLOR_BTNFACE) + CTextEditWindow(); + + HWND Create(HWND hwndParent); + void DoFillBack(HWND hwnd, HDC hDC); + void FixEditPos(LPCTSTR pszOldText); + void InvalidateEditRect(); + void UpdateFont(); + BOOL GetEditRect(LPRECT prc) const; + void ValidateEditRect(LPCRECT prc OPTIONAL); + HFONT GetFont() const { return m_hFont; } BEGIN_MSG_MAP(CTextEditWindow) MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CLOSE, OnClose) - MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) + MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) + MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) + MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) + MESSAGE_HANDLER(WM_CHAR, OnChar) + MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkGnd) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_NCPAINT, OnNCPaint) + MESSAGE_HANDLER(WM_NCCALCSIZE, OnNCCalcSize); + MESSAGE_HANDLER(WM_NCHITTEST, OnNCHitTest); + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor); + MESSAGE_HANDLER(WM_MOVE, OnMove); + MESSAGE_HANDLER(WM_SIZE, OnSize); + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown); + MESSAGE_HANDLER(EM_SETSEL, OnSetSel); + MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel); END_MSG_MAP() - CWindow editControl; - LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnChar(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNCPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNCCalcSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetSel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + +protected: + HWND m_hwndParent; + HFONT m_hFont; + HFONT m_hFontZoomed; + LONG m_nAppIsMovingOrSizing; + RECT m_rc; + + INT DoHitTest(RECT& rc, POINT pt); + void DrawGrip(HDC hDC, RECT& rc); + void Reposition(); }; diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index bedf12d4e9a..f5725207a1c 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -92,8 +92,17 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) case TOOL_RUBBER: case TOOL_COLOR: case TOOL_ZOOM: + break; + case TOOL_TEXT: + if (nActiveTool != TOOL_TEXT) + { + // Finish the text + OnButtonDown(TRUE, -1, -1, TRUE); + OnButtonUp(TRUE, -1, -1); + } break; + default: m_oldActiveTool = m_activeTool; break; @@ -152,6 +161,10 @@ void ToolsModel::NotifyToolChanged() { toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + + if (fontsDialog.IsWindow()) + fontsDialog.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); } @@ -159,11 +172,15 @@ void ToolsModel::NotifyToolSettingsChanged() { toolSettingsWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); selectionWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); + if (textEditWindow.IsWindow()) + textEditWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); } void ToolsModel::NotifyZoomChanged() { toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); + if (textEditWindow.IsWindow()) + textEditWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); } void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b8a70dce4a7..f6d4496d985 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -85,10 +85,6 @@ private: ToolBase *GetOrCreateTool(TOOLTYPE nTool); - void NotifyToolChanged(); - void NotifyToolSettingsChanged(); - void NotifyZoomChanged(); - public: ToolsModel(); ~ToolsModel(); @@ -117,4 +113,8 @@ public: void resetTool(); void selectAll(); + + void NotifyToolChanged(); + void NotifyToolSettingsChanged(); + void NotifyZoomChanged(); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 643a914309c..7a739f76cca 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -13,8 +13,6 @@ #include "precomp.h" -#include "dialogs.h" - /* FUNCTIONS ********************************************************/ BOOL @@ -326,7 +324,7 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(toolBoxContainer.IsWindowVisible())); CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(paletteWindow.IsWindowVisible())); CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); - CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(textEditWindow.IsWindowVisible())); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(fontsDialog.IsWindowVisible())); EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); @@ -522,10 +520,14 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_EDITUNDO: + if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + break; imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: + if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + break; imageModel.Redo(); imageArea.Invalidate(FALSE); break; @@ -557,6 +559,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITSELECTALL: { + if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + { + textEditWindow.SendMessage(EM_SETSEL, 0, -1); + break; + } HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolsModel.selectAll(); @@ -662,7 +669,16 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH alignChildrenToMainWindow(); break; case IDM_FORMATICONBAR: - textEditWindow.ShowWindow(textEditWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW); + if (toolsModel.GetActiveTool() == TOOL_TEXT) + { + if (!fontsDialog.IsWindow()) + { + fontsDialog.Create(mainWindow); + } + registrySettings.ShowTextTool = !fontsDialog.IsWindowVisible(); + fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); + fontsDialog.SendMessage(DM_REPOSITION, 0, 0); + } break; case IDM_VIEWSHOWGRID: showGrid = !showGrid;

1 0

[reactos] 01/01: [HDAUDBUS] Fix uninitialized variable usage
by Victor Perevertkin 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=951e52104a6548ab0f164… commit 951e52104a6548ab0f164f1f2c1630bbae3646cc Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jan 5 03:22:15 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jan 5 03:22:15 2022 +0300 [HDAUDBUS] Fix uninitialized variable usage --- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 96438b786b0..52e6cc3466b 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -156,6 +156,10 @@ HDA_PdoPnp( Status = STATUS_INSUFFICIENT_RESOURCES; } } + else + { + Status = Irp->IoStatus.Status; + } break; case IRP_MN_QUERY_CAPABILITIES: /* query capabilities */

1 0

[reactos] 01/01: [PORTCLS] Fix races, fix WavePci Port Drivers
by Michael Stamper 05 Jan '22

05 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378294a7dfd1b939aac5b… commit 378294a7dfd1b939aac5b45fa230678927744d29 Author: Michael Stamper <michaelstamper1(a)gmail.com> AuthorDate: Wed Jan 5 00:20:44 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 5 03:20:44 2022 +0300 [PORTCLS] Fix races, fix WavePci Port Drivers - Split buffers on page to prevent non-contiguous memory being passed to driver. - Protect CIrpQueue::GetMappingWithTag, ReleaseMappingWithTag with spinlock to prevent race conditions (GetMapping, ReleaseMapping do not need spinlock, they are only called from a service routine). - Remove ASSERT in CIrpQueue::ReleaseMappingWithTag, when mappings are released out of order. Just ignore the tag argument and release the next one in the list. This is what windows does, confirmed by calling PortWavePciStream::ReleaseMapping() with tag argument set to 0, absolutly no difference observed. Allowing out of order release is essential given that a driver is not permitted to hold a spinlock when calling ReleaseMapping(). - Remove IIrpQueue::HasLastMappingFailed(), it never worked and there is no way it could work. CPortPinWavePci::HandleKsStream() call MappingAvailable() non-conditionally, this is what Windows does, verified by debug prints in ac97 driver. - Implement CIrpQueue::NumData(). - Remove incorrect interlocked operations/volatile variables and several (now unused) class fields. --- drivers/wdm/audio/backpln/portcls/interfaces.hpp | 1 - drivers/wdm/audio/backpln/portcls/irpstream.cpp | 433 +++++++++++++--------- drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp | 5 +- 3 files changed, 256 insertions(+), 183 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/interfaces.hpp b/drivers/wdm/audio/backpln/portcls/interfaces.hpp index ce924174852..d525b85ccfa 100644 --- a/drivers/wdm/audio/backpln/portcls/interfaces.hpp +++ b/drivers/wdm/audio/backpln/portcls/interfaces.hpp @@ -350,7 +350,6 @@ DECLARE_INTERFACE_(IIrpQueue, IUnknown) STDMETHOD_(NTSTATUS, ReleaseMappingWithTag)(THIS_ IN PVOID Tag) PURE; - STDMETHOD_(BOOLEAN, HasLastMappingFailed)(THIS) PURE; STDMETHOD_(ULONG, GetCurrentIrpOffset)(THIS) PURE; STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_ diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 572117e27d3..75f0717ec88 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -14,6 +14,31 @@ #include <debug.h> +static +PIRP +RemoveHeadList_IRP( + IN OUT PLIST_ENTRY QueueHead) +{ + PIRP Irp; + PLIST_ENTRY CurEntry; + + for (CurEntry = QueueHead->Flink; CurEntry != QueueHead; CurEntry = CurEntry->Flink) + { + /* Get the IRP offset */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + + /* Remove the cancel routine */ + if (IoSetCancelRoutine(Irp, NULL)) + { + /* Remove the IRP from the list and return it */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + return Irp; + } + } + + /* no non canceled irp has been found */ + return NULL; +} class CIrpQueue : public IIrpQueue { public: @@ -48,13 +73,16 @@ protected: LIST_ENTRY m_IrpList; LIST_ENTRY m_FreeIrpList; - BOOLEAN m_OutOfMapping; ULONG m_MaxFrameSize; ULONG m_Alignment; ULONG m_TagSupportEnabled; - volatile ULONG m_NumDataAvailable; - volatile ULONG m_CurrentOffset; - volatile PIRP m_Irp; + + ULONG m_StreamHeaderIndex; + ULONG m_TagIndex; + PKSSTREAM_HEADER m_CurStreamHeader; + + ULONG m_CurrentOffset; + PIRP m_Irp; volatile LONG m_Ref; }; @@ -67,10 +95,8 @@ typedef struct typedef struct { ULONG StreamHeaderCount; - ULONG StreamHeaderIndex; - ULONG TotalStreamData; + ULONG nTags; - PKSSTREAM_HEADER CurStreamHeader; PVOID * Data; PKSSTREAM_TAG Tags; }KSSTREAM_DATA, *PKSSTREAM_DATA; @@ -128,6 +154,9 @@ CIrpQueue::AddMapping( ULONG Index, Length; PMDL Mdl; PKSSTREAM_DATA StreamData; + LONG TotalStreamData; + LONG StreamPageCount; + LONG HeaderLength; PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); @@ -165,14 +194,15 @@ CIrpQueue::AddMapping( // get first stream header Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - // store header - StreamData->CurStreamHeader = Header; - // sanity check PC_ASSERT(Header); // first calculate the numbers of stream headers Length = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + Mdl = Irp->MdlAddress; + + TotalStreamData = 0; + StreamPageCount = 0; do { @@ -185,15 +215,23 @@ CIrpQueue::AddMapping( if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) { // irp sink - StreamData->TotalStreamData += Header->DataUsed; + HeaderLength = Header->DataUsed; } else { // irp source - StreamData->TotalStreamData += Header->FrameExtent; + HeaderLength = Header->FrameExtent; } - /* move to next header */ + // increment available data + TotalStreamData += HeaderLength; + + // append page count + StreamPageCount += ADDRESS_AND_SIZE_TO_SPAN_PAGES( + MmGetMdlByteOffset(Mdl), HeaderLength); + + // move to next header / mdl + Mdl = Mdl->Next; Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); }while(Length); @@ -215,7 +253,7 @@ CIrpQueue::AddMapping( if (m_TagSupportEnabled) { // allocate array for storing the pointers of the data */ - StreamData->Tags = (PKSSTREAM_TAG)AllocateItem(NonPagedPool, sizeof(KSSTREAM_TAG) * StreamData->StreamHeaderCount, TAG_PORTCLASS); + StreamData->Tags = (PKSSTREAM_TAG)AllocateItem(NonPagedPool, sizeof(KSSTREAM_TAG) * StreamPageCount, TAG_PORTCLASS); if (!StreamData->Data) { // out of memory @@ -254,17 +292,6 @@ CIrpQueue::AddMapping( return STATUS_INSUFFICIENT_RESOURCES; } - if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) - { - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, Header->DataUsed); - } - else if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) - { - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, Header->FrameExtent); - } - // move to next header / mdl Mdl = Mdl->Next; Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); @@ -274,7 +301,7 @@ CIrpQueue::AddMapping( // store stream data Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET] = (PVOID)StreamData; - *Data = StreamData->TotalStreamData; + *Data = TotalStreamData; // mark irp as pending IoMarkIrpPending(Irp); @@ -282,9 +309,6 @@ CIrpQueue::AddMapping( // add irp to cancelable queue KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, Irp, KsListEntryTail, NULL); - // disable mapping failed status - m_OutOfMapping = FALSE; - // done return STATUS_SUCCESS; } @@ -322,6 +346,15 @@ CIrpQueue::GetMapping( // get a fresh new irp from the queue m_Irp = Irp = KsRemoveIrpFromCancelableQueue(&m_IrpList, &m_IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); m_CurrentOffset = Offset = 0; + + if (m_Irp) + { + // reset stream header index + m_StreamHeaderIndex = 0; + + // reset stream header + m_CurStreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; + } } if (!Irp) @@ -340,22 +373,19 @@ CIrpQueue::GetMapping( if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) { // sink pin - *BufferSize = StreamData->CurStreamHeader->DataUsed - Offset; + *BufferSize = m_CurStreamHeader->DataUsed - Offset; } else { // source pin - *BufferSize = StreamData->CurStreamHeader->FrameExtent - Offset; + *BufferSize = m_CurStreamHeader->FrameExtent - Offset; } // sanity check PC_ASSERT(*BufferSize); // store buffer - *Buffer = &((PUCHAR)StreamData->Data[StreamData->StreamHeaderIndex])[Offset]; - - // unset flag that no irps are available - m_OutOfMapping = FALSE; + *Buffer = &((PUCHAR)StreamData->Data[m_StreamHeaderIndex])[Offset]; return STATUS_SUCCESS; } @@ -381,22 +411,19 @@ CIrpQueue::UpdateMapping( ASSERT(StreamData); // add to current offset - InterlockedExchangeAdd((PLONG)&m_CurrentOffset, (LONG)BytesWritten); + m_CurrentOffset += BytesWritten; if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) { // store written bytes (source pin) - StreamData->CurStreamHeader->DataUsed += BytesWritten; + m_CurStreamHeader->DataUsed += BytesWritten; } - // decrement available data counter - m_NumDataAvailable -= BytesWritten; - // get audio buffer size if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) - Size = StreamData->CurStreamHeader->FrameExtent; + Size = m_CurStreamHeader->FrameExtent; else - Size = StreamData->CurStreamHeader->DataUsed; + Size = m_CurStreamHeader->DataUsed; // sanity check PC_ASSERT(Size); @@ -406,13 +433,13 @@ CIrpQueue::UpdateMapping( // sanity check PC_ASSERT(Size == m_CurrentOffset); - if (StreamData->StreamHeaderIndex + 1 < StreamData->StreamHeaderCount) + if (m_StreamHeaderIndex + 1 < StreamData->StreamHeaderCount) { // move to next stream header - StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); + m_CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)m_CurStreamHeader + m_CurStreamHeader->Size); // increment stream header index - StreamData->StreamHeaderIndex++; + m_StreamHeaderIndex++; // reset offset m_CurrentOffset = 0; @@ -430,15 +457,6 @@ CIrpQueue::UpdateMapping( // looped streaming repeat the buffers untill // the caller decides to stop the streams - // reset stream header index - StreamData->StreamHeaderIndex = 0; - - // reset stream header - StreamData->CurStreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; - - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, StreamData->TotalStreamData); - // re-insert irp KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, m_Irp, KsListEntryTail, NULL); @@ -495,8 +513,70 @@ ULONG NTAPI CIrpQueue::NumData() { - // returns the amount of audio stream data available - return m_NumDataAvailable; + KIRQL OldLevel; + ULONG NumDataAvailable; + PLIST_ENTRY CurEntry; + PIRP Irp; + ULONG CurrentOffset; + ULONG StreamHeaderIndex; + PKSSTREAM_HEADER CurStreamHeader; + PKSSTREAM_DATA StreamData; + ULONG Size; + + KeAcquireSpinLock(&m_IrpListLock, &OldLevel); + + NumDataAvailable = 0; + CurEntry = &m_IrpList; + + // current IRP state + Irp = m_Irp; + CurrentOffset = m_CurrentOffset; + StreamHeaderIndex = m_StreamHeaderIndex; + CurStreamHeader = m_CurStreamHeader; + + while (TRUE) + { + if (Irp != NULL) + { + // get stream data + StreamData = (PKSSTREAM_DATA)Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + // loop over stream headers + for (; StreamHeaderIndex < StreamData->StreamHeaderCount; StreamHeaderIndex++) + { + // get audio buffer size + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) + Size = CurStreamHeader->FrameExtent; + else + Size = CurStreamHeader->DataUsed; + + // increment available data + NumDataAvailable += Size - CurrentOffset; + CurrentOffset = 0; + + // move to next stream header + CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)CurStreamHeader + CurStreamHeader->Size); + } + } + + /* iterate to next entry */ + CurEntry = CurEntry->Flink; + + /* is the end of list reached */ + if (CurEntry == &m_IrpList) + break; + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + + // next IRP state + CurrentOffset = 0; + StreamHeaderIndex = 0; + CurStreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + } + + KeReleaseSpinLock(&m_IrpListLock, OldLevel); + return NumDataAvailable; } BOOL @@ -517,9 +597,6 @@ CIrpQueue::CancelBuffers() // cancel all irps KsCancelIo(&m_IrpList, &m_IrpListLock); - // reset number of data available - m_NumDataAvailable = 0; - // done return TRUE; } @@ -534,6 +611,9 @@ CIrpQueue::GetMappingWithTag( OUT PULONG Flags) { PKSSTREAM_DATA StreamData; + KIRQL OldLevel; + ULONG Size; + LPBYTE Data; /* sanity checks */ PC_ASSERT(PhysicalAddress); @@ -541,77 +621,104 @@ CIrpQueue::GetMappingWithTag( PC_ASSERT(ByteCount); PC_ASSERT(Flags); + KeAcquireSpinLock(&m_IrpListLock, &OldLevel); + if (!m_Irp) { // get an irp from the queue - m_Irp = KsRemoveIrpFromCancelableQueue(&m_IrpList, &m_IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); - } + m_Irp = RemoveHeadList_IRP(&m_IrpList); - // check if there is an irp - if (!m_Irp) - { - // no irp available - m_OutOfMapping = TRUE; - DPRINT("GetMappingWithTag no mapping available\n"); - return STATUS_NOT_FOUND; + // check if there is an irp + if (!m_Irp) + { + // no irp available + KeReleaseSpinLock(&m_IrpListLock, OldLevel); + + DPRINT("GetMappingWithTag no mapping available\n"); + return STATUS_NOT_FOUND; + } + + // reset offset + m_CurrentOffset = 0; + + // reset tag index + m_TagIndex = 0; + + // reset stream header index + m_StreamHeaderIndex = 0; + + // reset stream header + m_CurStreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; } // get stream data StreamData = (PKSSTREAM_DATA)m_Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; // sanity check - PC_ASSERT(StreamData->StreamHeaderIndex < StreamData->StreamHeaderCount); - - // setup mapping - *PhysicalAddress = MmGetPhysicalAddress(StreamData->Data[StreamData->StreamHeaderIndex]); - *VirtualAddress = StreamData->Data[StreamData->StreamHeaderIndex]; + PC_ASSERT(m_StreamHeaderIndex < StreamData->StreamHeaderCount); // store tag in irp - StreamData->Tags[StreamData->StreamHeaderIndex].Tag = Tag; - StreamData->Tags[StreamData->StreamHeaderIndex].Used = TRUE; + StreamData->Tags[m_TagIndex].Tag = Tag; + StreamData->Tags[m_TagIndex].Used = TRUE; + m_TagIndex++; - // increment header index - StreamData->StreamHeaderIndex++; + // get audio buffer size + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) + Size = m_CurStreamHeader->FrameExtent; + else + Size = m_CurStreamHeader->DataUsed; - // mapping size - if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) - { - // sink pin - *ByteCount = StreamData->CurStreamHeader->DataUsed; + // sanity check + PC_ASSERT(Size); - // decrement num data available - m_NumDataAvailable -= StreamData->CurStreamHeader->DataUsed; - } - else - { - // source pin - *ByteCount = StreamData->CurStreamHeader->FrameExtent; + // setup mapping + Data = (LPBYTE)StreamData->Data[m_StreamHeaderIndex] + m_CurrentOffset; + *VirtualAddress = Data; - // decrement num data available - m_NumDataAvailable -= StreamData->CurStreamHeader->FrameExtent; - } + // get byte count + *ByteCount = (LPBYTE)ROUND_TO_PAGES(Data+1)-Data; + if (*ByteCount > (Size - m_CurrentOffset)) + *ByteCount = (Size - m_CurrentOffset); + m_CurrentOffset += *ByteCount; - if (StreamData->StreamHeaderIndex == StreamData->StreamHeaderCount) + if (m_CurrentOffset >= Size) { - // last mapping - *Flags = 1; + // sanity check + PC_ASSERT(Size == m_CurrentOffset); - // insert mapping into free list - ExInterlockedInsertTailList(&m_FreeIrpList, &m_Irp->Tail.Overlay.ListEntry, &m_IrpListLock); + // increment header index + m_StreamHeaderIndex++; - // clear irp - m_Irp = NULL; + if (m_StreamHeaderIndex == StreamData->StreamHeaderCount) + { + // last mapping + *Flags = 1; - } - else - { - // one more mapping in the irp - *Flags = 0; + // + StreamData->nTags = m_TagIndex; + + // insert mapping into free list + InsertTailList(&m_FreeIrpList, &m_Irp->Tail.Overlay.ListEntry); + + // clear irp + m_Irp = NULL; - // move to next header - StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); + } + else + { + // one more mapping in the irp + *Flags = 0; + + // move to next header + m_CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)m_CurStreamHeader + m_CurStreamHeader->Size); + } } + // get physical address + *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); + + KeReleaseSpinLock(&m_IrpListLock, OldLevel); + DPRINT("GetMappingWithTag Tag %p Buffer %p Flags %lu ByteCount %lx\n", Tag, VirtualAddress, *Flags, *ByteCount); // done return STATUS_SUCCESS; @@ -627,82 +734,63 @@ CIrpQueue::ReleaseMappingWithTag( PKSSTREAM_DATA StreamData; PIO_STACK_LOCATION IoStack; ULONG Index; + KIRQL OldLevel; - // first check if there is an active irp - if (m_Irp) - { - // now check if there are already used mappings - StreamData = (PKSSTREAM_DATA)m_Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + KeAcquireSpinLock(&m_IrpListLock, &OldLevel); - if (StreamData->StreamHeaderIndex) + // check if used list empty + if (IsListEmpty(&m_FreeIrpList)) + { + // get current irp + if (!m_Irp) { - // check if the released mapping is one current processed irps - for(Index = 0; Index < StreamData->StreamHeaderIndex; Index++) - { - // check if it is the same tag - if ((StreamData->Tags[Index].Tag == Tag) && - (StreamData->Tags[Index].Used != FALSE)) - { - // mark mapping as released - StreamData->Tags[Index].Tag = NULL; - StreamData->Tags[Index].Used = FALSE; - - // done - return STATUS_SUCCESS; - } + KeReleaseSpinLock(&m_IrpListLock, OldLevel); - } + // this should not happen + DPRINT("ReleaseMappingWithTag Tag %p not found\n", Tag); + return STATUS_NOT_FOUND; } - } - // remove irp from used list - CurEntry = ExInterlockedRemoveHeadList(&m_FreeIrpList, &m_IrpListLock); - if (CurEntry == NULL) - { - // this should not happen - DPRINT("ReleaseMappingWithTag Tag %p not found\n", Tag); - return STATUS_NOT_FOUND; + Irp = m_Irp; } + else + { + // remove irp from used list + CurEntry = RemoveHeadList(&m_FreeIrpList); - // sanity check - PC_ASSERT(CurEntry); - - // get irp from list entry - Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + // get irp from list entry + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + } // get stream data StreamData = (PKSSTREAM_DATA)Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; - // sanity check - PC_ASSERT(StreamData->StreamHeaderIndex == StreamData->StreamHeaderCount); - - // check if the released mapping is one of these - for(Index = 0; Index < StreamData->StreamHeaderCount; Index++) + // release oldest in use mapping + for (Index = 0; Index < StreamData->nTags; Index++) { - if ((StreamData->Tags[Index].Tag == Tag) && - (StreamData->Tags[Index].Used != FALSE)) + if (StreamData->Tags[Index].Used != FALSE) { - // mark mapping as released - StreamData->Tags[Index].Tag = NULL; StreamData->Tags[Index].Used = FALSE; - // done + // Warn if wrong mapping released + if (StreamData->Tags[Index].Tag != Tag) + { + DPRINT1("Mapping released out of order\n"); + } + break; } - else - { - // - // we assume that mappings are released in the same order as they have been acquired - // therefore if the current mapping is not the searched one, it must have been already - // released - // - ASSERT(StreamData->Tags[Index].Tag == NULL); - ASSERT(StreamData->Tags[Index].Used == FALSE); - } + } + + // If this is the current IRP, do not complete + if (Irp == m_Irp) + { + KeReleaseSpinLock(&m_IrpListLock, OldLevel); + return STATUS_SUCCESS; } // check if this is the last one released mapping - if (Index + 1 == StreamData->StreamHeaderCount) + if (Index + 1 == StreamData->nTags) { // last mapping released // now check if this is a looped buffer @@ -711,14 +799,7 @@ CIrpQueue::ReleaseMappingWithTag( // looped buffers are not completed when they have been played // they are completed when the stream is set to stop - // reset stream header index - StreamData->StreamHeaderIndex = 0; - - // reset stream header - StreamData->CurStreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, StreamData->TotalStreamData); + KeReleaseSpinLock(&m_IrpListLock, OldLevel); // re-insert irp KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, Irp, KsListEntryTail, NULL); @@ -731,6 +812,8 @@ CIrpQueue::ReleaseMappingWithTag( // time to complete non looped buffer // + KeReleaseSpinLock(&m_IrpListLock, OldLevel); + // free stream data array FreeItem(StreamData->Data, TAG_PORTCLASS); @@ -755,19 +838,14 @@ CIrpQueue::ReleaseMappingWithTag( else { // there are still some headers not consumed - ExInterlockedInsertHeadList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry, &m_IrpListLock); + InsertHeadList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry); + + KeReleaseSpinLock(&m_IrpListLock, OldLevel); } return STATUS_SUCCESS; } -BOOLEAN -NTAPI -CIrpQueue::HasLastMappingFailed() -{ - return m_OutOfMapping; -} - ULONG NTAPI CIrpQueue::GetCurrentIrpOffset() @@ -817,4 +895,3 @@ NewIrpQueue( *Queue = (IIrpQueue*)This; return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 3ad941270f7..9f681a000c2 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -549,13 +549,10 @@ CPortPinWavePci::HandleKsStream( { NTSTATUS Status; ULONG Data = 0; - BOOLEAN bFailed; InterlockedIncrement((PLONG)&m_TotalPackets); DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - bFailed = m_IrpQueue->HasLastMappingFailed(); - Status = m_IrpQueue->AddMapping(Irp, &Data); if (NT_SUCCESS(Status)) @@ -565,7 +562,7 @@ CPortPinWavePci::HandleKsStream( else m_Position.PlayOffset += Data; - if (bFailed) + if (m_State == KSSTATE_RUN) { // notify stream of new mapping m_Stream->MappingAvailable();

1 0

[reactos] 01/01: [DRIVERS] Use IoForwardIrpSynchronously in drivers
by Victor Perevertkin 04 Jan '22

04 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed1883c8ebf02ffa1d9e… commit 7ed1883c8ebf02ffa1d9ea8fe11b9a0f4e5c7551 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Jan 4 03:56:52 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jan 5 02:17:56 2022 +0300 [DRIVERS] Use IoForwardIrpSynchronously in drivers Instead of having an own routine in each driver IoForwardIrpSynchronously can be used. --- drivers/bus/pci/fdo.c | 53 +++++--------------------- drivers/input/i8042prt/i8042prt.h | 2 - drivers/input/i8042prt/misc.c | 41 -------------------- drivers/input/i8042prt/pnp.c | 23 ++++++++---- drivers/input/kbdclass/kbdclass.c | 27 +++++++++++--- drivers/input/kbdclass/kbdclass.h | 5 --- drivers/input/kbdclass/misc.c | 41 -------------------- drivers/input/mouclass/misc.c | 41 -------------------- drivers/input/mouclass/mouclass.c | 10 ++++- drivers/input/mouclass/mouclass.h | 5 --- drivers/input/sermouse/fdo.c | 16 ++++++-- drivers/input/sermouse/misc.c | 38 ------------------- drivers/input/sermouse/sermouse.h | 5 --- drivers/ksfilter/ks/device.c | 63 ++++++++++--------------------- drivers/ksfilter/ks/ksfunc.h | 5 --- drivers/ksfilter/ks/misc.c | 51 ------------------------- drivers/parallel/parport/fdo.c | 21 +++++++---- drivers/parallel/parport/misc.c | 44 ---------------------- drivers/parallel/parport/parport.h | 4 -- drivers/processor/processr/misc.c | 48 ------------------------ drivers/processor/processr/pnp.c | 17 ++++++--- drivers/processor/processr/processr.h | 6 --- drivers/serial/serenum/fdo.c | 16 ++++++-- drivers/serial/serenum/misc.c | 44 ---------------------- drivers/serial/serial/misc.c | 40 -------------------- drivers/serial/serial/pnp.c | 26 +++++++++---- drivers/serial/serial/serial.h | 5 --- drivers/storage/floppy/fdc/fdo.c | 64 +++++++------------------------- drivers/storage/ide/pciidex/fdo.c | 16 ++++++-- drivers/storage/ide/pciidex/misc.c | 40 -------------------- drivers/storage/ide/pciidex/pciidex.h | 12 ------ drivers/storage/port/storport/fdo.c | 12 +++++- drivers/storage/port/storport/misc.c | 41 -------------------- drivers/storage/port/storport/precomp.h | 5 --- drivers/usb/usbccgp/fdo.c | 23 +++++++++--- drivers/usb/usbccgp/misc.c | 40 -------------------- drivers/usb/usbccgp/pdo.c | 10 ++++- drivers/usb/usbccgp/usbccgp.h | 6 --- drivers/usb/usbstor/fdo.c | 7 +++- drivers/usb/usbstor/misc.c | 23 ------------ drivers/usb/usbstor/pdo.c | 23 +++++++----- drivers/usb/usbstor/usbstor.h | 12 ------ drivers/wdm/audio/legacy/stream/helper.c | 56 ---------------------------- drivers/wdm/audio/legacy/stream/pnp.c | 10 ++++- drivers/wdm/audio/legacy/stream/stream.h | 7 ---- 45 files changed, 238 insertions(+), 866 deletions(-) diff --git a/drivers/bus/pci/fdo.c b/drivers/bus/pci/fdo.c index 17a4c07c622..2eb5ef2012f 100644 --- a/drivers/bus/pci/fdo.c +++ b/drivers/bus/pci/fdo.c @@ -14,46 +14,6 @@ /*** PRIVATE *****************************************************************/ -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - UNREFERENCED_PARAMETER(DeviceObject); - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS NTAPI -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - PDEVICE_OBJECT LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Ldo; - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - static NTSTATUS FdoLocateChildDevice( PPCI_DEVICE *Device, @@ -524,9 +484,16 @@ FdoPnpControl( #endif case IRP_MN_START_DEVICE: DPRINT("IRP_MN_START_DEVICE received\n"); - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = FdoStartDevice(DeviceObject, Irp); + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(DeviceExtension->Ldo, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = FdoStartDevice(DeviceObject, Irp); + } + } Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); diff --git a/drivers/input/i8042prt/i8042prt.h b/drivers/input/i8042prt/i8042prt.h index 71be9823265..758b0b2bb63 100644 --- a/drivers/input/i8042prt/i8042prt.h +++ b/drivers/input/i8042prt/i8042prt.h @@ -340,8 +340,6 @@ i8042StartPacket( DRIVER_DISPATCH ForwardIrpAndForget; -DRIVER_DISPATCH ForwardIrpAndWait; - NTSTATUS DuplicateUnicodeString( IN ULONG Flags, diff --git a/drivers/input/i8042prt/misc.c b/drivers/input/i8042prt/misc.c index 36927d50f05..29c39477f69 100644 --- a/drivers/input/i8042prt/misc.c +++ b/drivers/input/i8042prt/misc.c @@ -14,47 +14,6 @@ /* FUNCTIONS *****************************************************************/ -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - UNREFERENCED_PARAMETER(DeviceObject); - __analysis_assume(Context != NULL); - if (Irp->PendingReturned) - KeSetEvent(Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS NTAPI -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - PDEVICE_OBJECT LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/input/i8042prt/pnp.c b/drivers/input/i8042prt/pnp.c index e5fe57b2080..147ef3d3ac4 100644 --- a/drivers/input/i8042prt/pnp.c +++ b/drivers/input/i8042prt/pnp.c @@ -676,6 +676,7 @@ i8042Pnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_DEVICE_EXTENSION FdoExtension; PIO_STACK_LOCATION Stack; ULONG MinorFunction; I8042_DEVICE_TYPE DeviceType; @@ -684,7 +685,8 @@ i8042Pnp( Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; - DeviceType = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Type; + FdoExtension = DeviceObject->DeviceExtension; + DeviceType = FdoExtension->Type; switch (MinorFunction) { @@ -695,12 +697,19 @@ i8042Pnp( /* Call lower driver (if any) */ if (DeviceType != PhysicalDeviceObject) { - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = i8042PnpStartDevice( - DeviceObject, - Stack->Parameters.StartDevice.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(FdoExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = i8042PnpStartDevice( + DeviceObject, + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + } + } } else Status = STATUS_SUCCESS; diff --git a/drivers/input/kbdclass/kbdclass.c b/drivers/input/kbdclass/kbdclass.c index 86f354c3240..ccf83532aaf 100644 --- a/drivers/input/kbdclass/kbdclass.c +++ b/drivers/input/kbdclass/kbdclass.c @@ -163,12 +163,21 @@ ClassDeviceControl( while (Entry != Head) { PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Entry, PORT_DEVICE_EXTENSION, ListEntry); - NTSTATUS IntermediateStatus; IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - IntermediateStatus = ForwardIrpAndWait(DevExt->DeviceObject, Irp); - if (!NT_SUCCESS(IntermediateStatus)) - Status = IntermediateStatus; + + if (IoForwardIrpSynchronously(DevExt->LowerDevice, Irp)) + { + if (!NT_SUCCESS(Irp->IoStatus.Status)) + { + Status = Irp->IoStatus.Status; + } + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + Entry = Entry->Flink; } break; @@ -836,7 +845,15 @@ ClassPnp( switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: - Status = ForwardIrpAndWait(DeviceObject, Irp); + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + if (NT_SUCCESS(Status)) { InitializeObjectAttributes(&ObjectAttributes, diff --git a/drivers/input/kbdclass/kbdclass.h b/drivers/input/kbdclass/kbdclass.h index 6041dad2916..cfd6c41d17f 100644 --- a/drivers/input/kbdclass/kbdclass.h +++ b/drivers/input/kbdclass/kbdclass.h @@ -67,11 +67,6 @@ typedef struct _CLASS_DEVICE_EXTENSION /* misc.c */ -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - DRIVER_DISPATCH ForwardIrpAndForget; NTSTATUS diff --git a/drivers/input/kbdclass/misc.c b/drivers/input/kbdclass/misc.c index 88e99e4b262..4a419df369e 100644 --- a/drivers/input/kbdclass/misc.c +++ b/drivers/input/kbdclass/misc.c @@ -11,47 +11,6 @@ #include <debug.h> -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO); - LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - TRACE_(CLASS_NAME, "Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/input/mouclass/misc.c b/drivers/input/mouclass/misc.c index 93552d39cf8..c747558ec13 100644 --- a/drivers/input/mouclass/misc.c +++ b/drivers/input/mouclass/misc.c @@ -11,47 +11,6 @@ #include <debug.h> -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO); - LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - TRACE_(CLASS_NAME, "Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/input/mouclass/mouclass.c b/drivers/input/mouclass/mouclass.c index dc694b4f9c3..f84dcc30238 100644 --- a/drivers/input/mouclass/mouclass.c +++ b/drivers/input/mouclass/mouclass.c @@ -812,7 +812,15 @@ ClassPnp( switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: - Status = ForwardIrpAndWait(DeviceObject, Irp); + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + if (NT_SUCCESS(Status)) { InitializeObjectAttributes(&ObjectAttributes, diff --git a/drivers/input/mouclass/mouclass.h b/drivers/input/mouclass/mouclass.h index fcc877504bf..45f9c76021e 100644 --- a/drivers/input/mouclass/mouclass.h +++ b/drivers/input/mouclass/mouclass.h @@ -67,11 +67,6 @@ typedef struct _CLASS_DEVICE_EXTENSION /* misc.c */ -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - DRIVER_DISPATCH ForwardIrpAndForget; NTSTATUS diff --git a/drivers/input/sermouse/fdo.c b/drivers/input/sermouse/fdo.c index 486abea139c..3b42e087f63 100644 --- a/drivers/input/sermouse/fdo.c +++ b/drivers/input/sermouse/fdo.c @@ -172,11 +172,21 @@ SermousePnp( */ case IRP_MN_START_DEVICE: /* 0x0 */ { + PSERMOUSE_DEVICE_EXTENSION DeviceExtension; + TRACE_(SERMOUSE, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + Status = STATUS_UNSUCCESSFUL; + DeviceExtension = DeviceObject->DeviceExtension; + /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = SermouseStartDevice(DeviceObject, Irp); + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = SermouseStartDevice(DeviceObject, Irp); + } + } break; } case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x7 */ diff --git a/drivers/input/sermouse/misc.c b/drivers/input/sermouse/misc.c index 9b8e74dbcec..704e49adb6f 100644 --- a/drivers/input/sermouse/misc.c +++ b/drivers/input/sermouse/misc.c @@ -10,44 +10,6 @@ #include <debug.h> -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice = ((PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - KEVENT Event; - NTSTATUS Status; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - TRACE_(SERMOUSE, "Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/input/sermouse/sermouse.h b/drivers/input/sermouse/sermouse.h index 7cbd05cc788..d6d90852598 100644 --- a/drivers/input/sermouse/sermouse.h +++ b/drivers/input/sermouse/sermouse.h @@ -98,11 +98,6 @@ DRIVER_DISPATCH SermouseInternalDeviceControl; /************************************ misc.c */ -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/ksfilter/ks/device.c b/drivers/ksfilter/ks/device.c index b2678c47a2b..5c3e528b3ca 100644 --- a/drivers/ksfilter/ks/device.c +++ b/drivers/ksfilter/ks/device.c @@ -295,13 +295,16 @@ IKsDevice_PnpStartDevice( DPRINT("IKsDevice_PnpStartDevice DeviceHeader %p\n", DeviceHeader); /* first forward irp to lower device object */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); + if (!IoForwardIrpSynchronously(DeviceHeader->KsDevice.NextDeviceObject, Irp)) + { + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + } + Status = Irp->IoStatus.Status; /* check for success */ if (!NT_SUCCESS(Status)) { DPRINT1("NextDevice object failed to start with %x\n", Status); - Irp->IoStatus.Status = Status; CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -459,13 +462,8 @@ IKsDevice_Pnp( } /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - DPRINT("Next Device: Status %x\n", Status); - - Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); } case IRP_MN_REMOVE_DEVICE: @@ -482,15 +480,9 @@ IKsDevice_Pnp( } /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - DPRINT("Next Device: Status %x\n", Status); - + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); /* FIXME delete device resources */ - - - Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_INTERFACE: @@ -518,23 +510,14 @@ IKsDevice_Pnp( } /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - DPRINT1("IRP_MN_QUERY_INTERFACE Next Device: Status %x\n", Status); - Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); } case IRP_MN_QUERY_DEVICE_RELATIONS: { /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS Next Device: Status %x\n", Status); - - //Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: { @@ -550,22 +533,14 @@ IKsDevice_Pnp( case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS Next Device: Status %x\n", Status); - - Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); } default: - DPRINT1("unhandled function %u\n", IoStack->MinorFunction); - /* pass the irp down the driver stack */ - Status = KspForwardIrpSynchronous(DeviceObject, Irp); - - Irp->IoStatus.Status = Status; - CompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + DPRINT1("unhandled function %u\n", IoStack->MinorFunction); + /* pass the irp down the driver stack */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); } } diff --git a/drivers/ksfilter/ks/ksfunc.h b/drivers/ksfilter/ks/ksfunc.h index 8a930dde136..8c66635291e 100644 --- a/drivers/ksfilter/ks/ksfunc.h +++ b/drivers/ksfilter/ks/ksfunc.h @@ -74,11 +74,6 @@ KspRegisterDeviceInterfaces( IN PUNICODE_STRING ReferenceString, OUT PLIST_ENTRY SymbolicLinkList); -NTSTATUS -KspForwardIrpSynchronous( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - PVOID AllocateItem( IN POOL_TYPE PoolType, diff --git a/drivers/ksfilter/ks/misc.c b/drivers/ksfilter/ks/misc.c index f0ce95e909c..5174f850cf0 100644 --- a/drivers/ksfilter/ks/misc.c +++ b/drivers/ksfilter/ks/misc.c @@ -46,57 +46,6 @@ FreeItem( ExFreePool(Item); } -NTSTATUS -NTAPI -KspForwardIrpSynchronousCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned != FALSE) - { - KeSetEvent ((PKEVENT) Context, IO_NO_INCREMENT, FALSE); - } - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -KspForwardIrpSynchronous( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - PDEVICE_EXTENSION DeviceExtension; - PKSIDEVICE_HEADER DeviceHeader; - - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; - /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; - - /* initialize the notification event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - IoCopyCurrentIrpStackLocationToNext(Irp); - - IoSetCompletionRoutine(Irp, KspForwardIrpSynchronousCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); - - /* now call the driver */ - Status = IoCallDriver(DeviceHeader->KsDevice.NextDeviceObject, Irp); - /* did the request complete yet */ - if (Status == STATUS_PENDING) - { - /* not yet, lets wait a bit */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - return Status; -} - NTSTATUS KspCopyCreateRequest( IN PIRP Irp, diff --git a/drivers/parallel/parport/fdo.c b/drivers/parallel/parport/fdo.c index deb9b63ba7e..bf5662c6a21 100644 --- a/drivers/parallel/parport/fdo.c +++ b/drivers/parallel/parport/fdo.c @@ -505,6 +505,7 @@ NTAPI FdoPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_DEVICE_EXTENSION FdoExtension; ULONG MinorFunction; PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; @@ -545,15 +546,21 @@ FdoPnp(IN PDEVICE_OBJECT DeviceObject, case IRP_MN_START_DEVICE: /* 0x0 */ DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - ASSERT(((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.PnpState == dsStopped); - /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) + FdoExtension = DeviceObject->DeviceExtension; + Status = STATUS_UNSUCCESSFUL; + + ASSERT(FdoExtension->Common.PnpState == dsStopped); + + if (IoForwardIrpSynchronously(FdoExtension->LowerDevice, Irp)) { - Status = FdoStartDevice(DeviceObject, - Stack->Parameters.StartDevice.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = FdoStartDevice(DeviceObject, + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + } } break; diff --git a/drivers/parallel/parport/misc.c b/drivers/parallel/parport/misc.c index f9a27bc7350..e9facba6749 100644 --- a/drivers/parallel/parport/misc.c +++ b/drivers/parallel/parport/misc.c @@ -8,52 +8,8 @@ #include "parport.h" -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - /* FUNCTIONS ****************************************************************/ -static -NTSTATUS -NTAPI -ForwardIrpAndWaitCompletion(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -ForwardIrpAndWait(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - DPRINT("Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - - NTSTATUS NTAPI ForwardIrpAndForget(IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/parallel/parport/parport.h b/drivers/parallel/parport/parport.h index 59a33a20f8c..9d4e30b90b7 100644 --- a/drivers/parallel/parport/parport.h +++ b/drivers/parallel/parport/parport.h @@ -109,10 +109,6 @@ FdoPower(IN PDEVICE_OBJECT DeviceObject, /* misc.c */ -NTSTATUS -ForwardIrpAndWait(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - DRIVER_DISPATCH ForwardIrpAndForget; PVOID diff --git a/drivers/processor/processr/misc.c b/drivers/processor/processr/misc.c index 39aa1d6604c..18478a54408 100644 --- a/drivers/processor/processr/misc.c +++ b/drivers/processor/processr/misc.c @@ -15,54 +15,6 @@ /* FUNCTIONS ******************************************************************/ -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static -NTSTATUS -NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -NTAPI -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - LowerDevice = ((PDEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - DPRINT("Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - - NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/processor/processr/pnp.c b/drivers/processor/processr/pnp.c index 08bcaf9b429..cb0fc452813 100644 --- a/drivers/processor/processr/pnp.c +++ b/drivers/processor/processr/pnp.c @@ -263,6 +263,7 @@ ProcessorPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PDEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION IrpSp; ULONG_PTR Information = 0; NTSTATUS Status = STATUS_NOT_SUPPORTED; @@ -277,12 +278,18 @@ ProcessorPnp( DPRINT(" IRP_MN_START_DEVICE received\n"); /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) + DeviceExtension = DeviceObject->DeviceExtension; + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) { - Status = ProcessorStartDevice(DeviceObject, - IrpSp->Parameters.StartDevice.AllocatedResources, - IrpSp->Parameters.StartDevice.AllocatedResourcesTranslated); + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = ProcessorStartDevice(DeviceObject, + IrpSp->Parameters.StartDevice.AllocatedResources, + IrpSp->Parameters.StartDevice.AllocatedResourcesTranslated); + } } break; diff --git a/drivers/processor/processr/processr.h b/drivers/processor/processr/processr.h index 3e513bbb3ef..e394acdd421 100644 --- a/drivers/processor/processr/processr.h +++ b/drivers/processor/processr/processr.h @@ -21,12 +21,6 @@ typedef struct _DEVICE_EXTENSION /* misc.c */ -NTSTATUS -NTAPI -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/serial/serenum/fdo.c b/drivers/serial/serenum/fdo.c index d07682bdeba..fd6ff9c2423 100644 --- a/drivers/serial/serenum/fdo.c +++ b/drivers/serial/serenum/fdo.c @@ -153,6 +153,7 @@ SerenumFdoPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_DEVICE_EXTENSION FdoExtension; ULONG MinorFunction; PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; @@ -181,9 +182,18 @@ SerenumFdoPnp( { TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = SerenumFdoStartDevice(DeviceObject, Irp); + FdoExtension = DeviceObject->DeviceExtension; + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(FdoExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = SerenumFdoStartDevice(DeviceObject, Irp); + } + } + break; } case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x7 */ diff --git a/drivers/serial/serenum/misc.c b/drivers/serial/serenum/misc.c index 8541da196ee..e5c58d3f278 100644 --- a/drivers/serial/serenum/misc.c +++ b/drivers/serial/serenum/misc.c @@ -11,8 +11,6 @@ #include <debug.h> -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - /* I really want PCSZ strings as last arguments because * PnP ids are ANSI-encoded in PnP device string * identification */ @@ -88,48 +86,6 @@ SerenumInitMultiSzString( return Status; } -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO); - LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - TRACE_(SERENUM, "Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - NTSTATUS NTAPI ForwardIrpToLowerDeviceAndForget( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/serial/serial/misc.c b/drivers/serial/serial/misc.c index 8a87d7ceff6..3771bed79c4 100644 --- a/drivers/serial/serial/misc.c +++ b/drivers/serial/serial/misc.c @@ -12,46 +12,6 @@ #include <debug.h> -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice = ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - TRACE_(SERIAL, "Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/serial/serial/pnp.c b/drivers/serial/serial/pnp.c index 15c0ff4a2de..94dcc1b8931 100644 --- a/drivers/serial/serial/pnp.c +++ b/drivers/serial/serial/pnp.c @@ -328,6 +328,7 @@ SerialPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PSERIAL_DEVICE_EXTENSION DeviceExtension; ULONG MinorFunction; PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; @@ -367,15 +368,24 @@ SerialPnp( { TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); - /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = SerialPnpStartDevice( - DeviceObject, - Stack->Parameters.StartDevice.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + DeviceExtension = DeviceObject->DeviceExtension; + Status = STATUS_UNSUCCESSFUL; + + ASSERT(DeviceExtension->PnpState == dsStopped); + + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = SerialPnpStartDevice( + DeviceObject, + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + } + } + break; } case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ diff --git a/drivers/serial/serial/serial.h b/drivers/serial/serial/serial.h index ad7011dc003..1d78d3a6d9a 100644 --- a/drivers/serial/serial/serial.h +++ b/drivers/serial/serial/serial.h @@ -242,11 +242,6 @@ SerialDetectUartType( /************************************ misc.c */ -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - DRIVER_DISPATCH ForwardIrpAndForget; VOID NTAPI diff --git a/drivers/storage/floppy/fdc/fdo.c b/drivers/storage/floppy/fdc/fdo.c index d9a759c5d26..f00c58c08d9 100644 --- a/drivers/storage/floppy/fdc/fdo.c +++ b/drivers/storage/floppy/fdc/fdo.c @@ -16,51 +16,6 @@ /* FUNCTIONS ******************************************************************/ -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static -NTSTATUS -NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - DPRINT("Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - - NTSTATUS NTAPI ForwardIrpAndForget( @@ -492,6 +447,7 @@ FdcFdoPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_DEVICE_EXTENSION FdoExtension; PIO_STACK_LOCATION IrpSp; PDEVICE_RELATIONS DeviceRelations = NULL; ULONG_PTR Information = 0; @@ -505,14 +461,22 @@ FdcFdoPnp( { case IRP_MN_START_DEVICE: DPRINT(" IRP_MN_START_DEVICE received\n"); + /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) + Status = STATUS_UNSUCCESSFUL; + FdoExtension = DeviceObject->DeviceExtension; + + if (IoForwardIrpSynchronously(FdoExtension->LowerDevice, Irp)) { - Status = FdcFdoStartDevice(DeviceObject, - IrpSp->Parameters.StartDevice.AllocatedResources, - IrpSp->Parameters.StartDevice.AllocatedResourcesTranslated); + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = FdcFdoStartDevice(DeviceObject, + IrpSp->Parameters.StartDevice.AllocatedResources, + IrpSp->Parameters.StartDevice.AllocatedResourcesTranslated); + } } + break; case IRP_MN_QUERY_REMOVE_DEVICE: diff --git a/drivers/storage/ide/pciidex/fdo.c b/drivers/storage/ide/pciidex/fdo.c index 12387344b53..b4b7a244d3d 100644 --- a/drivers/storage/ide/pciidex/fdo.c +++ b/drivers/storage/ide/pciidex/fdo.c @@ -403,6 +403,7 @@ PciIdeXFdoPnpDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_DEVICE_EXTENSION FdoExtension; ULONG MinorFunction; PIO_STACK_LOCATION Stack; ULONG_PTR Information = Irp->IoStatus.Information; @@ -416,10 +417,19 @@ PciIdeXFdoPnpDispatch( case IRP_MN_START_DEVICE: /* 0x00 */ { DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - Status = PciIdeXFdoStartDevice(DeviceObject, Irp); + FdoExtension = DeviceObject->DeviceExtension; + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(FdoExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + Status = PciIdeXFdoStartDevice(DeviceObject, Irp); + } + } break; } case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ diff --git a/drivers/storage/ide/pciidex/misc.c b/drivers/storage/ide/pciidex/misc.c index 9126293ca59..46ebf5d3847 100644 --- a/drivers/storage/ide/pciidex/misc.c +++ b/drivers/storage/ide/pciidex/misc.c @@ -11,46 +11,6 @@ #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -PciIdeXGenericCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO); - LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); - IoSetCompletionRoutine(Irp, PciIdeXGenericCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/storage/ide/pciidex/pciidex.h b/drivers/storage/ide/pciidex/pciidex.h index 34c360c22f4..4dde936a44f 100644 --- a/drivers/storage/ide/pciidex/pciidex.h +++ b/drivers/storage/ide/pciidex/pciidex.h @@ -53,18 +53,6 @@ PciIdeXFdoPnpDispatch( /* misc.c */ -IO_COMPLETION_ROUTINE PciIdeXGenericCompletion; -NTSTATUS NTAPI -PciIdeXGenericCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index bf1ff419206..48cee37fce1 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -191,10 +191,18 @@ PortFdoStartDevice( /* Start the lower device if the FDO is in 'stopped' state */ if (DeviceExtension->PnpState == dsStopped) { - Status = ForwardIrpAndWait(DeviceExtension->LowerDevice, Irp); + if (IoForwardIrpSynchronously(DeviceExtension->LowerDevice, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + if (!NT_SUCCESS(Status)) { - DPRINT1("ForwardIrpAndWait() failed (Status 0x%08lx)\n", Status); + DPRINT1("Lower device failed the IRP (Status 0x%08lx)\n", Status); return Status; } } diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index f524ef6f62d..58e671d45c9 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -15,47 +15,6 @@ /* FUNCTIONS ******************************************************************/ -static -NTSTATUS -NTAPI -ForwardIrpAndWaitCompletion( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ PIRP Irp, - _In_ PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -ForwardIrpAndWait( - _In_ PDEVICE_OBJECT LowerDevice, - _In_ PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - - NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 6f3436aa237..698da94f013 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -178,11 +178,6 @@ MiniportStartIo( /* misc.c */ -NTSTATUS -ForwardIrpAndWait( - _In_ PDEVICE_OBJECT LowerDevice, - _In_ PIRP Irp); - NTSTATUS NTAPI ForwardIrpAndForget( diff --git a/drivers/usb/usbccgp/fdo.c b/drivers/usb/usbccgp/fdo.c index abcaeb017f3..833893b3509 100644 --- a/drivers/usb/usbccgp/fdo.c +++ b/drivers/usb/usbccgp/fdo.c @@ -253,7 +253,14 @@ FDO_StartDevice( ASSERT(FDODeviceExtension->Common.IsFDO); /* First start lower device */ - Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + if (IoForwardIrpSynchronously(FDODeviceExtension->NextDeviceObject, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } if (!NT_SUCCESS(Status)) { @@ -435,11 +442,15 @@ FDO_HandlePnp( RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); - if (NT_SUCCESS(Status)) + Status = STATUS_UNSUCCESSFUL; + + if (IoForwardIrpSynchronously(FDODeviceExtension->NextDeviceObject, Irp)) { - /* Surprise removal ok */ - IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + { + IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; + } } break; } @@ -527,7 +538,7 @@ FDO_HandleResetCyclePort( KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); /* Forward request synchronized */ - USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + NT_VERIFY(IoForwardIrpSynchronously(FDODeviceExtension->NextDeviceObject, Irp)); /* Reacquire lock */ KeAcquireSpinLock(&FDODeviceExtension->Lock, &OldLevel); diff --git a/drivers/usb/usbccgp/misc.c b/drivers/usb/usbccgp/misc.c index e8c3e82f8e4..5edd293838f 100644 --- a/drivers/usb/usbccgp/misc.c +++ b/drivers/usb/usbccgp/misc.c @@ -31,46 +31,6 @@ USBSTOR_SyncForwardIrpCompletionRoutine( return STATUS_MORE_PROCESSING_REQUIRED; } -NTSTATUS -NTAPI -USBCCGP_SyncForwardIrp( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - - /* Initialize event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* Copy irp stack location */ - IoCopyCurrentIrpStackLocationToNext(Irp); - - /* Set completion routine */ - IoSetCompletionRoutine(Irp, - USBSTOR_SyncForwardIrpCompletionRoutine, - &Event, - TRUE, - TRUE, - TRUE); - - /* Call driver */ - Status = IoCallDriver(DeviceObject, Irp); - - /* Check if pending */ - if (Status == STATUS_PENDING) - { - /* Wait for the request to finish */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - /* Copy status code */ - Status = Irp->IoStatus.Status; - } - - /* Done */ - return Status; -} - NTSTATUS USBCCGP_SyncUrbRequest( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index 1ea62bdf0e2..da73ed12ba6 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -231,7 +231,15 @@ USBCCGP_PdoHandleQueryId( // // handle query device id // - Status = USBCCGP_SyncForwardIrp(PDODeviceExtension->NextDeviceObject, Irp); + if (IoForwardIrpSynchronously(PDODeviceExtension->NextDeviceObject, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + if (NT_SUCCESS(Status)) { // diff --git a/drivers/usb/usbccgp/usbccgp.h b/drivers/usb/usbccgp/usbccgp.h index 7b50992822b..04ce3493336 100644 --- a/drivers/usb/usbccgp/usbccgp.h +++ b/drivers/usb/usbccgp/usbccgp.h @@ -98,12 +98,6 @@ AllocateInterfaceDescriptorsArray( /* misc.c */ -NTSTATUS -NTAPI -USBCCGP_SyncForwardIrp( - PDEVICE_OBJECT DeviceObject, - PIRP Irp); - NTSTATUS USBCCGP_SyncUrbRequest( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c index 6b8aa4c3e09..40c4626c8d6 100644 --- a/drivers/usb/usbstor/fdo.c +++ b/drivers/usb/usbstor/fdo.c @@ -160,7 +160,12 @@ USBSTOR_FdoHandleStartDevice( PIO_WORKITEM WorkItem; // forward irp to lower device - Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); + if (!IoForwardIrpSynchronously(DeviceExtension->LowerDeviceObject, Irp)) + { + return STATUS_UNSUCCESSFUL; + } + + Status = Irp->IoStatus.Status; if (!NT_SUCCESS(Status)) { DPRINT1("USBSTOR_FdoHandleStartDevice Lower device failed to start %x\n", Status); diff --git a/drivers/usb/usbstor/misc.c b/drivers/usb/usbstor/misc.c index 040ca568d94..71af4c1fd61 100644 --- a/drivers/usb/usbstor/misc.c +++ b/drivers/usb/usbstor/misc.c @@ -29,29 +29,6 @@ USBSTOR_SyncForwardIrpCompletionRoutine( return STATUS_MORE_PROCESSING_REQUIRED; } -NTSTATUS -NTAPI -USBSTOR_SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - KEVENT Event; - NTSTATUS Status; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(DeviceObject, Irp); - - if (Status == STATUS_PENDING) - { - // wait for the request to finish - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - - return Status; -} - NTSTATUS NTAPI USBSTOR_GetBusInterface( diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c index 8510a7941e6..28039993340 100644 --- a/drivers/usb/usbstor/pdo.c +++ b/drivers/usb/usbstor/pdo.c @@ -589,16 +589,21 @@ USBSTOR_PdoHandlePnp( case IRP_MN_QUERY_CAPABILITIES: { // just forward irp to lower device - Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); - ASSERT(Status == STATUS_SUCCESS); + Status = STATUS_UNSUCCESSFUL; - if (NT_SUCCESS(Status)) - { - // check if no unique id - Caps = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; - Caps->UniqueID = FALSE; // no unique id is supported - Caps->Removable = TRUE; //FIXME - } + if (IoForwardIrpSynchronously(DeviceExtension->LowerDeviceObject, Irp)) + { + Status = Irp->IoStatus.Status; + ASSERT(Status == STATUS_SUCCESS); + + if (NT_SUCCESS(Status)) + { + // check if no unique id + Caps = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; + Caps->UniqueID = FALSE; // no unique id is supported + Caps->Removable = TRUE; //FIXME + } + } break; } case IRP_MN_QUERY_REMOVE_DEVICE: diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 318010f791e..8a65e2bd521 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -215,11 +215,6 @@ USBSTOR_CreatePDO( // // misc.c routines // -NTSTATUS -NTAPI -USBSTOR_SyncForwardIrp( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp); NTSTATUS NTAPI @@ -246,13 +241,6 @@ USBSTOR_GetMaxLUN( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension); -NTSTATUS -NTAPI -USBSTOR_SyncForwardIrpCompletionRoutine( - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context); - NTSTATUS USBSTOR_ResetDevice( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/wdm/audio/legacy/stream/helper.c b/drivers/wdm/audio/legacy/stream/helper.c deleted file mode 100644 index 6d2a844dc7f..00000000000 --- a/drivers/wdm/audio/legacy/stream/helper.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel Streaming - * FILE: drivers/wdm/audio/legacy/stream/helper.c - * PURPOSE: irp helper routines - * PROGRAMMER: Johannes Anderwald - */ - - -#include "stream.h" - -NTSTATUS -NTAPI -CompletionRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned != FALSE) - { - KeSetEvent ((PKEVENT) Context, IO_NO_INCREMENT, FALSE); - } - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -NTAPI -ForwardIrpSynchronous( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - KEVENT Event; - PSTREAM_DEVICE_EXTENSION DeviceExt; - NTSTATUS Status; - - DeviceExt = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* initialize the notification event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - IoCopyCurrentIrpStackLocationToNext(Irp); - - IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); - - /* now call the driver */ - Status = IoCallDriver(DeviceExt->LowerDeviceObject, Irp); - /* did the request complete yet */ - if (Status == STATUS_PENDING) - { - /* not yet, lets wait a bit */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - return Status; -} diff --git a/drivers/wdm/audio/legacy/stream/pnp.c b/drivers/wdm/audio/legacy/stream/pnp.c index b8814cdb1fd..8df55e8bd66 100644 --- a/drivers/wdm/audio/legacy/stream/pnp.c +++ b/drivers/wdm/audio/legacy/stream/pnp.c @@ -353,7 +353,15 @@ StreamClassStartDevice( /* First forward the request to lower attached device object */ - Status = ForwardIrpSynchronous(DeviceObject, Irp); + if (IoForwardIrpSynchronously(DeviceExtension->LowerDeviceObject, Irp)) + { + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + if (!NT_SUCCESS(Status)) { /* Failed to start lower devices */ diff --git a/drivers/wdm/audio/legacy/stream/stream.h b/drivers/wdm/audio/legacy/stream/stream.h index 6208d3a79eb..5994d91be56 100644 --- a/drivers/wdm/audio/legacy/stream/stream.h +++ b/drivers/wdm/audio/legacy/stream/stream.h @@ -102,13 +102,6 @@ StreamClassAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject); - -NTSTATUS -NTAPI -ForwardIrpSynchronous( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - BOOLEAN NTAPI StreamClassSynchronize(

1 0

[reactos] 01/01: [NTUSER] Plan A: UserDereferenceObject in UserCreateInputContext (#4247)
by Katayama Hirofumi MZ 04 Jan '22

04 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e8f61989ae86ca0eeb7b… commit 8e8f61989ae86ca0eeb7b7a50218f1533ae03bf3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 5 08:15:32 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 5 08:15:32 2022 +0900 [NTUSER] Plan A: UserDereferenceObject in UserCreateInputContext (#4247) - Call UserDereferenceObject function in UserCreateInputContext. - Don't call UserDereferenceObject against input context at the other places. CORE-11700 --- win32ss/user/ntuser/main.c | 6 +----- win32ss/user/ntuser/ntstubs.c | 11 +++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index fd2eed2aa79..46364a10089 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -654,11 +654,7 @@ InitThreadCallback(PETHREAD Thread) /* Create the default input context */ if (IS_IMM_MODE()) { - PIMC pIMC = UserCreateInputContext(0); - if (pIMC) - { - UserDereferenceObject(pIMC); - } + (VOID)UserCreateInputContext(0); } /* Last things to do only if we are not a SYSTEM or CSRSS thread */ diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 015f8e30650..09b9473756a 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -482,6 +482,9 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) if (!pIMC) return NULL; + // Release the extra reference (UserCreateObject added 2 references). + UserDereferenceObject(pIMC); + if (dwClientImcData) // Non-first time. { // Insert pIMC to the second position (non-default) of the list. @@ -506,17 +509,17 @@ NtUserCreateInputContext(ULONG_PTR dwClientImcData) PIMC pIMC; HIMC ret = NULL; + if (!dwClientImcData) + return NULL; + UserEnterExclusive(); - if (!IS_IMM_MODE() || !dwClientImcData) + if (!IS_IMM_MODE()) goto Quit; pIMC = UserCreateInputContext(dwClientImcData); if (pIMC) - { ret = UserHMGetHandle(pIMC); - UserDereferenceObject(pIMC); - } Quit: UserLeave();

1 0

[reactos] 01/01: [RAPPS] Update Spanish (es-ES) translation (#4198)
by Javier Fernandez 04 Jan '22

04 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f6cd380509e7eab8cb65… commit 1f6cd380509e7eab8cb653a748ff947fbf8d6974 Author: Javier Fernandez <elhoir(a)users.noreply.github.com> AuthorDate: Tue Jan 4 15:04:18 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 4 17:04:18 2022 +0300 [RAPPS] Update Spanish (es-ES) translation (#4198) Addendum to acc25ce9. --- base/applications/rapps/lang/es-ES.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 12c7aa808a5..24cf1214321 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -144,7 +144,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nComando de desinstalación: " IDS_INFO_MODIFYPATH "\nRuta de modificación: " IDS_INFO_INSTALLDATE "\nFecha de instalación: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNombre del paquete: " END STRINGTABLE @@ -214,10 +214,10 @@ BEGIN IDS_SELECTEDFORINST "Seleccionados para instalar" IDS_MISMATCH_CERT_INFO "El certificado que usa es desconocido:\nSujeto: %s\nEmisor: %s\n¿Quiere continuar a pesar de ello?" IDS_UNABLE_PATH "Formato de ruta incorrecto." - IDS_APP_DISPLAY_DETAILS "Details" - IDS_APP_DISPLAY_LIST "List" - IDS_APP_DISPLAY_TILE "Tile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_APP_DISPLAY_DETAILS "Detalles" + IDS_APP_DISPLAY_LIST "Lista" + IDS_APP_DISPLAY_TILE "Título" + IDS_NO_SEARCH_RESULTS "Búsqueda sin resultados." END STRINGTABLE @@ -259,11 +259,11 @@ END STRINGTABLE BEGIN IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_NEED_PACKAGE_NAME "Error: La opción %1 espera uno o más nombres de paquetes.\n" + IDS_CMD_NEED_FILE_NAME "Error: La opción %1 espera un nombre de archivo.\n" + IDS_CMD_NEED_PARAMS "Error: La opción %1 espera uno o más parámetros.\n" + IDS_CMD_INVALID_OPTION "Error: Opción de línea de comando desconocida o no válida.\n" + IDS_CMD_FIND_RESULT_FOR "Resultado de la búsqueda para %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "No se pudo encontrar el paquete %1.\n" + IDS_CMD_PACKAGE_INFO "Información del paquete %1:\n" END

1 0

[reactos] 01/01: [NETSHELL] Improve Portuguese (pt-PT) translation (#4232)
by Jose Carlos Jesus 04 Jan '22

04 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cde7327e0b07ba1070382… commit cde7327e0b07ba1070382677400ca2e467f091f4 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Jan 4 13:54:02 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 4 16:54:02 2022 +0300 [NETSHELL] Improve Portuguese (pt-PT) translation (#4232) --- dll/shellext/netshell/lang/pt-PT.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index d6194732e60..bc2d60f02ce 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "Ligar com:", -1, 9, 9, 217, 8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "Con&figurar", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Esta ligação utiliza os seguintes items:", -1, 9, 59, 217, 8 + LTEXT "Esta ligação utiliza os seguintes componentes:", -1, 9, 59, 217, 8 PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propriedades", IDC_PROPERTIES, 174, 130, 65, 14 @@ -85,7 +85,7 @@ BEGIN LTEXT "Seleccione configuração típica ou personalizada:", IDC_STATIC, 53, 7, 240, 20 AUTORADIOBUTTON "Configuração &típica", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Configuração &personalizada", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Cria ligações de rede utilizando Cliente para Redes ReactOS, Arquivos e Impresoras partilhadas para Redes ReactOS, e o protocolo TCP/IP com endereçamento automático.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Cria ligações de rede utilizando Cliente para Redes ReactOS. Ficheiros e Impresoras partilhadas para Redes ReactOS, e o protocolo TCP/IP com endereçamento automático.", IDC_STATIC, 65, 45, 240, 30 LTEXT "Permite configurar manualmente componentes de rede.", IDC_STATIC, 65, 90, 243, 20 END @@ -109,13 +109,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalador do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Deseja que este computador faça parte de um domínio?\n\ -(Pode obter mais informações do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "Este computador faz parte de um grupo de &trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Este computador é parte de um &domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Deseja que este computador seja membro de um domínio?\n\ +(Pode obter esta informação do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Não, este computador fará parte de um grupo de &trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sim, este computador fará parte de um &domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Nome do domínio ou grupo de trabalho:", IDC_STATIC, 33, 72, 152, 20 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: Se este computador não fizer parte de uma rede, não terá privilégios suficientes para se juntar a um domínio, ou se simplesmente não sabe que escolher, então seleccione ""Grupo de trabalho"" por agora. Ésta opção pode ser alterada mais tarde.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTA: Se este computador não fizer parte de uma rede, não terá privilégios suficientes para se juntar a um domínio, ou se simplesmente não sabe que escolher, então seleccione ""Grupo de trabalho"" por agora. Ésta opção pode ser alterada mais tarde.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -168,7 +168,7 @@ BEGIN IDS_NETWORKSETTINGSTITLE "Configuração de rede" IDS_NETWORKSETTINGSSUBTITLE "Instala aplicações de rede necessárias para ligar a outras redes, equipamentos, e à Internet." IDS_NETWORKCOMPONENTTITLE "Componetes de rede" - IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar no seu equipamento. Para adicionar novos componentes, clice em Instalar." + IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar no seu equipamento. Para adicionar novos componentes, clique em Instalar." IDS_NETWORKDOMAINTITLE "Grupo de trabalho ou domínio" IDS_NETWORKDOMAINSUBTITLE "Um domínio é um grupo de computadores gerido por um administrador de rede. Um grupo de trabalho é um grupo de computadores que partilham o mesmo nome." IDS_REACTOS_SETUP "Instalador do ReactOS"

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