Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [W32TIME] Remember date/time sync settings (#5866)
by Katayama Hirofumi MZ 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e627c3b00e7109b5110b9… commit e627c3b00e7109b5110b94fb8253859a29f35d42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:56:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:56:58 2023 +0900 [W32TIME] Remember date/time sync settings (#5866) Based on KRosUser's patch. - In the W32TmServiceMain function, the time check loop does check the registry value. CORE-19292 --- base/services/w32time/w32time.c | 63 +++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index 69c6bd15abe..0d5508a7b2c 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -230,8 +230,6 @@ ControlHandler(DWORD request) default: break; } - - return; } @@ -239,8 +237,12 @@ VOID WINAPI W32TmServiceMain(DWORD argc, LPWSTR *argv) { - int result; + LONG error; DWORD dwInterval; + HKEY hKey; + WCHAR szData[8]; + DWORD cbData; + BOOL bNoSync; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); @@ -279,29 +281,44 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv) ServiceStatus.dwCurrentState = SERVICE_RUNNING; SetServiceStatus(hStatus, &ServiceStatus); - /* The worker loop of a service */ + /* The service's worker loop */ for (;;) { - result = SetTime(); - - if (result) - DPRINT("W32Time Service failed to set clock.\n"); - else - DPRINT("W32Time Service successfully set clock.\n"); + /* The default is NoSync */ + bNoSync = TRUE; + + /* TODO: Use RegNotifyChangeKeyValue() when implemented */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + cbData = sizeof(szData); + RegQueryValueExW(hKey, L"Type", NULL, NULL, (LPBYTE)szData, &cbData); + szData[ARRAYSIZE(szData) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + bNoSync = (_wcsicmp(szData, L"NoSync") == 0); + RegCloseKey(hKey); + } - if (result) + if (!bNoSync) { - /* In general we do not want to stop this service for a single - * Internet read failure but there may be other reasons for which - * we really might want to stop it. - * Therefore this code is left here to make it easy to stop this - * service when the correct conditions can be determined, but it - * is left commented out. - ServiceStatus.dwCurrentState = SERVICE_STOPPED; - ServiceStatus.dwWin32ExitCode = result; - SetServiceStatus(hStatus, &ServiceStatus); - return; - */ + error = SetTime(); + if (error != ERROR_SUCCESS) + { + DPRINT("W32Time Service failed to set clock: 0x%08lX\n", error); +#if 0 + /* + * In general, we do not want to stop this service for a single + * Internet read failure but there may be other reasons for which + * we really might want to stop it. Therefore this code is left here. + */ + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + ServiceStatus.dwWin32ExitCode = error; + SetServiceStatus(hStatus, &ServiceStatus); + return; +#endif + } } if (WaitForSingleObject(hStopEvent, dwInterval * 1000) == WAIT_OBJECT_0) @@ -317,11 +334,9 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv) return; } } - return; } - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,

1 0

[reactos] 01/01: [IMM32][SDK] Implement CtfImm(Hide, Restore)ToolbarWnd (#5863)
by Katayama Hirofumi MZ 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb4d13c823f1d444e877a… commit eb4d13c823f1d444e877a704eb6a15ea541998c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:45:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:45:51 2023 +0900 [IMM32][SDK] Implement CtfImm(Hide,Restore)ToolbarWnd (#5863) - Add Imm32GetFn helper function. - Implement CtfImmHideToolbarWnd and CtfImmRestoreToolbarWnd functions. - Add them to <imm32_undoc.h>. CORE-19268 --- dll/win32/imm32/ctf.c | 178 ++++++++++++++++++++++++++++++++++---- dll/win32/imm32/imm32.spec | 2 +- sdk/include/reactos/imm32_undoc.h | 2 + 3 files changed, 165 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index b403cb3ad59..78f9b09acb9 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -6,18 +6,127 @@ */ #include "precomp.h" +#include <msctf.h> +#include <ctfutb.h> WINE_DEFAULT_DEBUG_CHANNEL(imm); -/* - * NOTE: Microsoft CTF protocol has vulnerability. - * If insecure, we don't follow the dangerous design. - * - * https://www.zdnet.com/article/vulnerability-in-microsoft-ctf-protocol-goes-… - * https://googleprojectzero.blogspot.com/2019/08/down-rabbit-hole.html +BOOL +Imm32GetFn( + _Inout_opt_ FARPROC *ppfn, + _Inout_ HINSTANCE *phinstDLL, + _In_ LPCWSTR pszDllName, + _In_ LPCSTR pszFuncName) +{ + WCHAR szPath[MAX_PATH]; + + if (*ppfn) + return TRUE; + + if (*phinstDLL == NULL) + { + Imm32GetSystemLibraryPath(szPath, _countof(szPath), pszDllName); + *phinstDLL = LoadLibraryExW(szPath, NULL, 0); + if (*phinstDLL == NULL) + return FALSE; + } + + *ppfn = (FARPROC)GetProcAddress(*phinstDLL, pszFuncName); + return *ppfn != NULL; +} + +#define IMM32_GET_FN(ppfn, phinstDLL, dll_name, func_name) \ + Imm32GetFn((FARPROC*)(ppfn), (phinstDLL), (dll_name), #func_name) + +/*********************************************************************** + * OLE32.DLL */ -/* +HINSTANCE g_hOle32 = NULL; + +#define OLE32_FN(name) g_pfnOLE32_##name + +typedef HRESULT (WINAPI *FN_CoInitializeEx)(LPVOID, DWORD); +typedef VOID (WINAPI *FN_CoUninitialize)(VOID); +typedef HRESULT (WINAPI *FN_CoRegisterInitializeSpy)(IInitializeSpy*, ULARGE_INTEGER*); +typedef HRESULT (WINAPI *FN_CoRevokeInitializeSpy)(ULARGE_INTEGER); + +FN_CoInitializeEx OLE32_FN(CoInitializeEx) = NULL; +FN_CoUninitialize OLE32_FN(CoUninitialize) = NULL; +FN_CoRegisterInitializeSpy OLE32_FN(CoRegisterInitializeSpy) = NULL; +FN_CoRevokeInitializeSpy OLE32_FN(CoRevokeInitializeSpy) = NULL; + +#define Imm32GetOle32Fn(func_name) \ + IMM32_GET_FN(&OLE32_FN(func_name), &g_hOle32, L"ole32.dll", #func_name) + +HRESULT Imm32CoInitializeEx(VOID) +{ + if (!Imm32GetOle32Fn(CoInitializeEx)) + return E_FAIL; + + return OLE32_FN(CoInitializeEx)(NULL, COINIT_APARTMENTTHREADED); +} + +VOID Imm32CoUninitialize(VOID) +{ + if (!Imm32GetOle32Fn(CoUninitialize)) + return; + + OLE32_FN(CoUninitialize)(); +} + +HRESULT Imm32CoRegisterInitializeSpy(IInitializeSpy* spy, ULARGE_INTEGER* cookie) +{ + if (!Imm32GetOle32Fn(CoRegisterInitializeSpy)) + return E_FAIL; + + return OLE32_FN(CoRegisterInitializeSpy)(spy, cookie); +} + +HRESULT Imm32CoRevokeInitializeSpy(ULARGE_INTEGER cookie) +{ + if (!Imm32GetOle32Fn(CoRevokeInitializeSpy)) + return E_FAIL; + + return OLE32_FN(CoRevokeInitializeSpy)(cookie); +} + +/*********************************************************************** + * MSCTF.DLL + */ + +HINSTANCE g_hMsctf = NULL; + +#define MSCTF_FN(name) g_pfnMSCTF_##name + +typedef HRESULT (WINAPI *FN_TF_CreateLangBarMgr)(ITfLangBarMgr**); +typedef VOID (WINAPI *FN_TF_InvalidAssemblyListCacheIfExist)(VOID); + +FN_TF_CreateLangBarMgr MSCTF_FN(TF_CreateLangBarMgr) = NULL; +FN_TF_InvalidAssemblyListCacheIfExist MSCTF_FN(TF_InvalidAssemblyListCacheIfExist) = NULL; + +#define Imm32GetMsctfFn(func_name) \ + IMM32_GET_FN(&MSCTF_FN(func_name), &g_hMsctf, L"msctf.dll", #func_name) + +HRESULT Imm32TF_CreateLangBarMgr(_Inout_ ITfLangBarMgr **ppBarMgr) +{ + if (!Imm32GetMsctfFn(TF_CreateLangBarMgr)) + return E_FAIL; + + return MSCTF_FN(TF_CreateLangBarMgr)(ppBarMgr); +} + +VOID Imm32TF_InvalidAssemblyListCacheIfExist(VOID) +{ + if (!Imm32GetMsctfFn(TF_InvalidAssemblyListCacheIfExist)) + return; + + MSCTF_FN(TF_InvalidAssemblyListCacheIfExist)(); +} + +/*********************************************************************** + * CTF IME support + * * TSF stands for "Text Services Framework". "Cicero" is the code name of TSF. * CTF stands for "Cicero-aware Text Framework". * @@ -385,22 +494,59 @@ CtfImmTIMActivate(_In_ HKL hKL) } /*********************************************************************** - * CtfImmRestoreToolbarWnd(IMM32.@) + * CtfImmHideToolbarWnd(IMM32.@) + * + * Used with CtfImmRestoreToolbarWnd. */ -VOID WINAPI -CtfImmRestoreToolbarWnd(_In_ DWORD dwStatus) +DWORD WINAPI +CtfImmHideToolbarWnd(VOID) { - FIXME("(0x%lx)\n", dwStatus); + ITfLangBarMgr *pBarMgr; + DWORD dwShowFlags = 0; + BOOL bShown; + + TRACE("()\n"); + + if (FAILED(Imm32TF_CreateLangBarMgr(&pBarMgr))) + return dwShowFlags; + + if (SUCCEEDED(pBarMgr->lpVtbl->GetShowFloatingStatus(pBarMgr, &dwShowFlags))) + { + bShown = !(dwShowFlags & 0x800); + dwShowFlags &= 0xF; + if (bShown) + pBarMgr->lpVtbl->ShowFloating(pBarMgr, 8); + } + + pBarMgr->lpVtbl->Release(pBarMgr); + return dwShowFlags; } /*********************************************************************** - * CtfImmHideToolbarWnd(IMM32.@) + * CtfImmRestoreToolbarWnd(IMM32.@) + * + * Used with CtfImmHideToolbarWnd. */ -DWORD WINAPI -CtfImmHideToolbarWnd(VOID) +VOID WINAPI +CtfImmRestoreToolbarWnd( + _In_ LPVOID pUnused, + _In_ DWORD dwShowFlags) { - FIXME("()\n"); - return 0; + HRESULT hr; + ITfLangBarMgr *pBarMgr; + + UNREFERENCED_PARAMETER(pUnused); + + TRACE("(%p, 0x%X)\n", pUnused, dwShowFlags); + + hr = Imm32TF_CreateLangBarMgr(&pBarMgr); + if (FAILED(hr)) + return; + + if (dwShowFlags) + pBarMgr->lpVtbl->ShowFloating(pBarMgr, dwShowFlags); + + pBarMgr->lpVtbl->Release(pBarMgr); } BOOL Imm32InsideLoaderLock(VOID) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 89293195098..3a706be14b4 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -5,7 +5,7 @@ @ stdcall CtfImmIsCiceroStartedInThread() @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmTIMActivate(ptr) -@ stdcall CtfImmRestoreToolbarWnd(long) +@ stdcall CtfImmRestoreToolbarWnd(ptr long) @ stdcall CtfImmHideToolbarWnd() @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) @ stdcall CtfImmIsGuidMapEnable(ptr) diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index d2622dd8423..61904db0b13 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -27,6 +27,8 @@ HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); BOOL WINAPI CtfAImmIsIME(_In_ HKL hKL); BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); +DWORD WINAPI CtfImmHideToolbarWnd(VOID); +VOID WINAPI CtfImmRestoreToolbarWnd(_In_ LPVOID pUnused, _In_ DWORD dwShowFlags); LRESULT WINAPI CtfImmDispatchDefImeMessage(

1 0

[reactos] 01/01: [MSPAINT] Refactor mouse moving code on canvas (#5878)
by Katayama Hirofumi MZ 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a114169c4de46e464ca7c… commit a114169c4de46e464ca7c7d37566b8883da8ec63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:41:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:41:06 2023 +0900 [MSPAINT] Refactor mouse moving code on canvas (#5878) Move some mouse moving code to toolsModel. CORE-19094 --- base/applications/mspaint/canvas.cpp | 73 +------------------------------- base/applications/mspaint/toolsmodel.cpp | 72 +++++++++++++++++++++++++++++++ base/applications/mspaint/toolsmodel.h | 2 + 3 files changed, 75 insertions(+), 72 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 4b19a34e10d..b1b76ce9901 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -459,78 +459,7 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (m_drawing) { - // values displayed in statusbar - LONG xRel = pt.x - g_ptStart.x; - LONG yRel = pt.y - g_ptStart.y; - - switch (toolsModel.GetActiveTool()) - { - // freesel, rectsel and text tools always show numbers limited to fit into image area - case TOOL_FREESEL: - case TOOL_RECTSEL: - case TOOL_TEXT: - if (xRel < 0) - xRel = (pt.x < 0) ? -g_ptStart.x : xRel; - else if (pt.x > imageModel.GetWidth()) - xRel = imageModel.GetWidth() - g_ptStart.x; - if (yRel < 0) - yRel = (pt.y < 0) ? -g_ptStart.y : yRel; - else if (pt.y > imageModel.GetHeight()) - yRel = imageModel.GetHeight() - g_ptStart.y; - break; - - // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 - case TOOL_RUBBER: - case TOOL_PEN: - case TOOL_BRUSH: - case TOOL_AIRBRUSH: - case TOOL_SHAPE: - { - CString strCoord; - strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); - break; - } - default: - break; - } - - // rectsel and shape tools always show non-negative numbers when drawing - if (toolsModel.GetActiveTool() == TOOL_RECTSEL || toolsModel.GetActiveTool() == TOOL_SHAPE) - { - if (xRel < 0) - xRel = -xRel; - if (yRel < 0) - yRel = -yRel; - } - - if (wParam & MK_LBUTTON) - { - toolsModel.OnMouseMove(TRUE, pt.x, pt.y); - Invalidate(FALSE); - if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || toolsModel.IsSelection()) - { - CString strSize; - if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(_T("%ld x %ld"), xRel, yRel); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - } - } - - if (wParam & MK_RBUTTON) - { - toolsModel.OnMouseMove(FALSE, pt.x, pt.y); - Invalidate(FALSE); - if (toolsModel.GetActiveTool() >= TOOL_TEXT) - { - CString strSize; - if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(_T("%ld x %ld"), xRel, yRel); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - } - } + toolsModel.DrawWithMouseTool(pt, wParam); return 0; } diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 6efb859066b..0700617403e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -321,3 +321,75 @@ void ToolsModel::SpecialTweak(BOOL bMinus) { m_pToolObject->OnSpecialTweak(bMinus); } + +void ToolsModel::DrawWithMouseTool(POINT pt, WPARAM wParam) +{ + LONG xRel = pt.x - g_ptStart.x, yRel = pt.y - g_ptStart.y; + + switch (m_activeTool) + { + // freesel, rectsel and text tools always show numbers limited to fit into image area + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_TEXT: + if (xRel < 0) + xRel = (pt.x < 0) ? -g_ptStart.x : xRel; + else if (pt.x > imageModel.GetWidth()) + xRel = imageModel.GetWidth() - g_ptStart.x; + if (yRel < 0) + yRel = (pt.y < 0) ? -g_ptStart.y : yRel; + else if (pt.y > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - g_ptStart.y; + break; + + // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 + case TOOL_RUBBER: + case TOOL_PEN: + case TOOL_BRUSH: + case TOOL_AIRBRUSH: + case TOOL_SHAPE: + { + CStringW strCoord; + strCoord.Format(L"%ld, %ld", pt.x, pt.y); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); + break; + } + default: + break; + } + + // rectsel and shape tools always show non-negative numbers when drawing + if (m_activeTool == TOOL_RECTSEL || m_activeTool == TOOL_SHAPE) + { + xRel = labs(xRel); + yRel = labs(yRel); + } + + if (wParam & MK_LBUTTON) + { + OnMouseMove(TRUE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if ((m_activeTool >= TOOL_TEXT) || IsSelection()) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } + + if (wParam & MK_RBUTTON) + { + OnMouseMove(FALSE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if (m_activeTool >= TOOL_TEXT) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 3cd14e8e6d3..9af67a501c7 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -145,6 +145,8 @@ public: void NotifyZoomChanged(); void SpecialTweak(BOOL bMinus); + + void DrawWithMouseTool(POINT pt, WPARAM wParam); }; extern ToolsModel toolsModel;

1 0

[reactos] 01/01: [MSPAINT] Simplify tool creation (#5876)
by Katayama Hirofumi MZ 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6418c848cc50f21c4459… commit a6418c848cc50f21c445906c6687db4b29b6aa2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 16:49:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 16:49:13 2023 +0900 [MSPAINT] Simplify tool creation (#5876) Reduce code and binary size. This will reduce 512 bytes in binary. - Don't use cache for tool creation. CORE-19094 --- base/applications/mspaint/toolsmodel.cpp | 12 +++++------- base/applications/mspaint/toolsmodel.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index a8a7b490803..6efb859066b 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -22,22 +22,20 @@ ToolsModel::ToolsModel() m_rubberRadius = 4; m_transpBg = FALSE; m_zoom = 1000; - ZeroMemory(&m_tools, sizeof(m_tools)); m_pToolObject = GetOrCreateTool(m_activeTool); } ToolsModel::~ToolsModel() { - for (size_t i = 0; i < _countof(m_tools); ++i) - delete m_tools[i]; + delete m_pToolObject; + m_pToolObject = NULL; } ToolBase *ToolsModel::GetOrCreateTool(TOOLTYPE nTool) { - if (!m_tools[nTool]) - m_tools[nTool] = ToolBase::createToolObject(nTool); - - return m_tools[nTool]; + delete m_pToolObject; + m_pToolObject = ToolBase::createToolObject(nTool); + return m_pToolObject; } BOOL ToolsModel::IsSelection() const diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 51ddb0d46d2..3cd14e8e6d3 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -84,7 +84,6 @@ private: int m_rubberRadius; BOOL m_transpBg; int m_zoom; - ToolBase* m_tools[TOOL_MAX + 1]; ToolBase *m_pToolObject; ToolBase *GetOrCreateTool(TOOLTYPE nTool);

1 0

[reactos] 01/01: [MSPAINT] Commonize OnFinishDraw and OnCancelDraw (#5875)
by Katayama Hirofumi MZ 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37f56d2448059c78f8cde… commit 37f56d2448059c78f8cde65915b7a2103c06c3c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 16:20:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 16:20:03 2023 +0900 [MSPAINT] Commonize OnFinishDraw and OnCancelDraw (#5875) Reduce code and binary size a bit. This will reduce 1024 bytes in binary. Unify ToolBase::OnFinishDraw and ToolBase::OnCancelDraw to ToolBase::OnEndDraw. CORE-19094 --- base/applications/mspaint/canvas.cpp | 8 +- base/applications/mspaint/mouse.cpp | 140 ++++++++++++------------------- base/applications/mspaint/textedit.cpp | 2 +- base/applications/mspaint/toolsmodel.cpp | 16 +--- base/applications/mspaint/toolsmodel.h | 8 +- 5 files changed, 67 insertions(+), 107 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index b423662d882..4b19a34e10d 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -357,13 +357,13 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { case TOOL_BEZIER: case TOOL_SHAPE: - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: - toolsModel.OnFinishDraw(); + toolsModel.OnEndDraw(FALSE); Invalidate(); break; @@ -814,13 +814,13 @@ VOID CCanvasWindow::cancelDrawing() selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); Invalidate(FALSE); } VOID CCanvasWindow::finishDrawing() { - toolsModel.OnFinishDraw(); + toolsModel.OnEndDraw(FALSE); m_drawing = FALSE; Invalidate(FALSE); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index c7c19e16544..01379f97dc7 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -62,13 +62,7 @@ void ToolBase::reset() } } -void ToolBase::OnCancelDraw() -{ - reset(); - imageModel.NotifyImageChanged(); -} - -void ToolBase::OnFinishDraw() +void ToolBase::OnEndDraw(BOOL bCancel) { reset(); imageModel.NotifyImageChanged(); @@ -175,16 +169,13 @@ struct FreeSelTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - selectionModel.Landing(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - selectionModel.HideSelection(); - ToolBase::OnCancelDraw(); + if (bCancel) + selectionModel.HideSelection(); + else + selectionModel.Landing(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -260,16 +251,13 @@ struct RectSelTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - selectionModel.Landing(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - selectionModel.HideSelection(); - ToolBase::OnCancelDraw(); + if (bCancel) + selectionModel.HideSelection(); + else + selectionModel.Landing(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -309,16 +297,10 @@ struct TwoPointDrawTool : ToolBase return TRUE; } - void OnFinishDraw() override - { - m_bDrawing = FALSE; - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { m_bDrawing = FALSE; - ToolBase::OnCancelDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -471,21 +453,19 @@ struct SmoothDrawTool : ToolBase } draw(bLeftButton, x, y); - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } - void OnFinishDraw() override - { - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { - LONG x = 0, y = 0; - OnButtonUp(FALSE, x, y); - imageModel.Undo(TRUE); - ToolBase::OnCancelDraw(); + if (bCancel) + { + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); + imageModel.Undo(TRUE); + } + ToolBase::OnEndDraw(bCancel); } }; @@ -799,22 +779,19 @@ struct TextTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - if (::IsWindowVisible(textEditWindow) && - textEditWindow.GetWindowTextLength() > 0) + if (!bCancel) { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } } quit(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - quit(); - ToolBase::OnCancelDraw(); + ToolBase::OnEndDraw(bCancel); } }; @@ -902,25 +879,22 @@ struct BezierTool : ToolBase s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } imageModel.NotifyImageChanged(); return TRUE; } - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { + if (!bCancel) + { + imageModel.PushImageForUndo(); + OnDrawOverlayOnImage(m_hdc); + } m_bDrawing = FALSE; - ToolBase::OnCancelDraw(); - } - - void OnFinishDraw() override - { - imageModel.PushImageForUndo(); - OnDrawOverlayOnImage(m_hdc); - m_bDrawing = FALSE; - ToolBase::OnFinishDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -983,7 +957,7 @@ struct ShapeTool : ToolBase if (s_pointSP && bDoubleClick) { - OnFinishDraw(); + OnEndDraw(FALSE); return; } @@ -1017,7 +991,7 @@ struct ShapeTool : ToolBase m_bClosed = FALSE; if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } else @@ -1034,26 +1008,22 @@ struct ShapeTool : ToolBase return TRUE; } - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { - ToolBase::OnCancelDraw(); - } - - void OnFinishDraw() override - { - if (s_pointSP) + if (!bCancel) { - --s_pointSP; - m_bClosed = TRUE; + if (s_pointSP) + { + --s_pointSP; + m_bClosed = TRUE; - imageModel.PushImageForUndo(); - OnDrawOverlayOnImage(m_hdc); + imageModel.PushImageForUndo(); + OnDrawOverlayOnImage(m_hdc); + } + m_bClosed = FALSE; + s_pointSP = 0; } - - m_bClosed = FALSE; - s_pointSP = 0; - - ToolBase::OnFinishDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 39cc1ba40e3..5261da63a0e 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -104,7 +104,7 @@ LRESULT CTextEditWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL { if (wParam == VK_ESCAPE) { - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); return 0; } diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index dec101adc9e..a8a7b490803 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -145,7 +145,7 @@ TOOLTYPE ToolsModel::GetOldActiveTool() const void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { - OnFinishDraw(); + OnEndDraw(FALSE); selectionModel.Landing(); @@ -288,19 +288,11 @@ void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) m_pToolObject->endEvent(); } -void ToolsModel::OnCancelDraw() +void ToolsModel::OnEndDraw(BOOL bCancel) { - ATLTRACE("ToolsModel::OnCancelDraw()\n"); + ATLTRACE("ToolsModel::OnEndDraw(%d)\n", bCancel); m_pToolObject->beginEvent(); - m_pToolObject->OnCancelDraw(); - m_pToolObject->endEvent(); -} - -void ToolsModel::OnFinishDraw() -{ - ATLTRACE("ToolsModel::OnFinishDraw()\n"); - m_pToolObject->beginEvent(); - m_pToolObject->OnFinishDraw(); + m_pToolObject->OnEndDraw(bCancel); m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index d90faee117b..51ddb0d46d2 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -53,14 +53,13 @@ struct ToolBase virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } - virtual void OnCancelDraw(); - virtual void OnFinishDraw(); - virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } virtual void OnSpecialTweak(BOOL bMinus) { } + virtual void OnEndDraw(BOOL bCancel); + void beginEvent(); void endEvent(); void reset(); @@ -135,8 +134,7 @@ public: void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick); void OnMouseMove(BOOL bLeftButton, LONG x, LONG y); void OnButtonUp(BOOL bLeftButton, LONG x, LONG y); - void OnCancelDraw(); - void OnFinishDraw(); + void OnEndDraw(BOOL bCancel); void OnDrawOverlayOnImage(HDC hdc); void OnDrawOverlayOnCanvas(HDC hdc);

1 0

[reactos] 01/01: [NOTEPAD] de-DE.rc: Fix CMD_HELP_ABOUT_NOTEPAD, all rc: strip bloat-spaces before \n and ?
by Joachim Henze 03 Nov '23

03 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32b883ef2f7ddc64db9e4… commit 32b883ef2f7ddc64db9e4b72d30048ca375198ce Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Nov 3 02:13:37 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Nov 3 02:19:34 2023 +0100 [NOTEPAD] de-DE.rc: Fix CMD_HELP_ABOUT_NOTEPAD, all rc: strip bloat-spaces before \n and ? --- base/applications/notepad/lang/bg-BG.rc | 2 +- base/applications/notepad/lang/cs-CZ.rc | 8 ++++---- base/applications/notepad/lang/da-DK.rc | 4 ++-- base/applications/notepad/lang/de-DE.rc | 17 ++++++++--------- base/applications/notepad/lang/el-GR.rc | 2 +- base/applications/notepad/lang/en-US.rc | 12 ++++++------ base/applications/notepad/lang/es-ES.rc | 2 +- base/applications/notepad/lang/et-EE.rc | 7 +++---- base/applications/notepad/lang/fi-FI.rc | 8 ++++---- base/applications/notepad/lang/he-IL.rc | 6 +++--- base/applications/notepad/lang/hr-HR.rc | 6 +++--- base/applications/notepad/lang/hu-HU.rc | 2 +- base/applications/notepad/lang/hy-AM.rc | 8 ++++---- base/applications/notepad/lang/id-ID.rc | 5 ++--- base/applications/notepad/lang/it-IT.rc | 6 +++--- base/applications/notepad/lang/ja-JP.rc | 4 ++-- base/applications/notepad/lang/lt-LT.rc | 4 ++-- base/applications/notepad/lang/ms-MY.rc | 4 ++-- base/applications/notepad/lang/nl-NL.rc | 4 ++-- base/applications/notepad/lang/no-NO.rc | 7 +++---- base/applications/notepad/lang/pl-PL.rc | 10 +++++----- base/applications/notepad/lang/pt-BR.rc | 2 +- base/applications/notepad/lang/pt-PT.rc | 2 +- base/applications/notepad/lang/ro-RO.rc | 6 +++--- base/applications/notepad/lang/ru-RU.rc | 4 ++-- base/applications/notepad/lang/sk-SK.rc | 12 +++--------- base/applications/notepad/lang/sl-SI.rc | 6 +++--- base/applications/notepad/lang/sq-AL.rc | 12 +++++------- base/applications/notepad/lang/sv-SE.rc | 4 ++-- base/applications/notepad/lang/th-TH.rc | 4 ++-- base/applications/notepad/lang/tr-TR.rc | 4 ++-- base/applications/notepad/lang/uk-UA.rc | 8 ++++---- 32 files changed, 90 insertions(+), 102 deletions(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 9d45a9f5d1d..478f854596b 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Словесни файлове (*.txt)" STRING_TOOLARGE "Файлът '%s' е твърде голям за бележника.\n\ Използвайте друг обработчик." - STRING_NOTEXT "Не сте въвел текст. \ + STRING_NOTEXT "Не сте въвел текст.\ \nНапишете нещо и опитайте пак." STRING_DOESNOTEXIST "Файлът '%s'\nне съществува\n\n\ Искате ли да създадете нов файл?" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 874854b9cf4..11cf195af20 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Textové soubory (*.txt)" STRING_TOOLARGE "Soubor '%s' je pro notepad příliš velký.\n\ Použijte jiný editor, prosím." - STRING_NOTEXT "Nebyl zadán žádný text. \ + STRING_NOTEXT "Nebyl zadán žádný text.\ \nVložte nějaký text a zkuste to znovu." STRING_DOESNOTEXIST "Soubor '%s'\nneexistuje.\n\n\ -Chcete ho vytvořit ?" +Chcete ho vytvořit?" STRING_NOTSAVED "Soubor '%s'\nbyl změněn.\n\n\ -Chcete uložit změny ?" +Chcete uložit změny?" STRING_NOTFOUND "'%s' nebyl nalezen." - STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy. \ + STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy.\ \nUzavřete jednu či více aplikací, abyste získali více\nvolné \ paměti." STRING_CANNOTFIND "Nelze nalézt '%s'" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index dc637207806..c632169f151 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -152,9 +152,9 @@ BEGIN STRING_UNTITLED "Ikke-navngivet" STRING_ALL_FILES "Alle filer (*.*)" STRING_TEXT_FILES_TXT "Tekst filer (*.txt)" - STRING_TOOLARGE "Filen '%s' er for stor til Notesblok. \ + STRING_TOOLARGE "Filen '%s' er for stor til Notesblok.\ \nBrug en anden editor til at redigere filen." - STRING_NOTEXT "Du har ikke skrevet noget tekst. \ + STRING_NOTEXT "Du har ikke skrevet noget tekst.\ \nSkriv noget tekst, og prøv så igen" STRING_DOESNOTEXIST "Filen '%s'\neksistere ikke\n\n\ Ønkser du at oprette en ny fil?" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 8220a475df4..24bc433fbf4 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -65,7 +65,7 @@ BEGIN BEGIN MENUITEM "&Inhalt", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END @@ -154,17 +154,16 @@ BEGIN STRING_TEXT_FILES_TXT "Textdateien (*.txt)" STRING_TOOLARGE "Die Datei '%s' ist zu groß für den Editor.\n\ Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten." - STRING_NOTEXT "Sie haben keinen Text eingegeben, der \ -gespeichert\n werden könnte. Geben Sie Text ein, und versuchen Sie es \ -\nerneut." + STRING_NOTEXT "Sie haben keinen Text eingegeben, der gespeichert\n\ +werden könnte. Geben Sie Text ein, und versuchen Sie es\nerneut." STRING_DOESNOTEXIST "Die Datei '%s'\nexistiert nicht.\n\n\ -Möchten Sie eine neue Datei erstellen ?" +Möchten Sie eine neue Datei erstellen?" STRING_NOTSAVED "Datei %s\n wurde geändert.\n\n\ -Möchten Sie die Änderungen speichern ?" +Möchten Sie die Änderungen speichern?" STRING_NOTFOUND "'%s' kann nicht gefunden werden." - STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, \ -um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ -\nAnwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen." + STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, um diese Funktion\n\ +abzuschließen. Beenden Sie eine oder mehrere\n\ +Anwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen." STRING_CANNOTFIND "'%s' wurde nicht gefunden." STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 4d8cb846c65..86e75214323 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Αρχεία κειμένου (*.txt)" STRING_TOOLARGE "Το αρχείο '%s' είναι πολύ μεγάλο για το notepad.\n\ Παρακαλώ χρησιμοποιείστε άλλο πρόγραμμα επεξεργασίας κειμένου." - STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι. \ + STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι.\ \nΠαρακαλώ πληκτρολογείστε κάτι και προσπαθείστε ξανά" STRING_DOESNOTEXIST "Το αρχείο '%s'\nδεν υπάρχει\n\n\ Θέλετε να δημιουργήσετε ένα νέο αρχείο;" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index a3444ea81b6..64b250ba8dd 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Text files (*.txt)" STRING_TOOLARGE "File '%s' is too large for notepad.\n\ Please use a different editor." - STRING_NOTEXT "You didn't enter any text. \ -\nPlease type something and try again" + STRING_NOTEXT "You didn't enter any text.\n\ +Please type something and try again" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' can not be found." - STRING_OUT_OF_MEMORY "Not enough memory to complete this \ -task.\nClose one or more applications to increase the amount of\nfree memory." + STRING_OUT_OF_MEMORY "Not enough memory to complete this task.\n\ +Close one or more applications to increase the amount of\nfree memory." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 541fdfbad63..b6e7f3b3c27 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -1,4 +1,4 @@ -/* Spanish translation by Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12) */ +// COPYRIGHT: Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 8b1171328fa..7d31ceb9ec6 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -1,7 +1,6 @@ /* * PROJECT: NOTEPAD for ReactOS * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/notepad/lang/et-EE.rc * PURPOSE: Estonian Language resource file * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) */ @@ -162,12 +161,12 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstifailid (*.txt)" STRING_TOOLARGE "Fail '%s' on liiga suur Notepad'i jaoks.\n\ Palun kasuta erinevat redigeerijat." - STRING_NOTEXT "Sa ei sisestanud midagi. \ + STRING_NOTEXT "Sa ei sisestanud midagi.\ \nPalun kirjuta midagi ja proovi uuesti." STRING_DOESNOTEXIST "Faili '%s'\nei ole olemas\n\n\ -Kas soovid uut faili koostada ?" +Kas soovid uut faili koostada?" STRING_NOTSAVED "Faili '%s'\non redigeeritud\n\n\ -Kas soovid muudatused salvestada ?" +Kas soovid muudatused salvestada?" STRING_NOTFOUND "'%s' ei suudetud leida." STRING_OUT_OF_MEMORY "Pole piisavalt mälu selle \ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu hulka." diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 6cc2f9a1a0c..6b4a58d4878 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Teksti tiedostot (*.txt)" STRING_TOOLARGE "Tiedosto '%s' on liian suuri.\n\ Please use a different editor." - STRING_NOTEXT "Et syöttänyt lainkaan tekstiä. \ + STRING_NOTEXT "Et syöttänyt lainkaan tekstiä.\ \nKirjoita jotain ja yritä uudelleen" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' ei löydy." - STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän \ + STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän\ \ntehtävän tekemiseksi. Sulje jokin sovellus vapauttaaksesi\n\ muistia." STRING_CANNOTFIND "Cannot find '%s'" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index afcdd1a9e81..c3312dfa326 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -157,12 +157,12 @@ BEGIN STRING_TEXT_FILES_TXT "קבצי טקסט (*.txt)" STRING_TOOLARGE "File '%s' is too large for notepad.\n\ Please use a different editor." - STRING_NOTEXT "You didn't enter any text. \ + STRING_NOTEXT "You didn't enter any text.\ \nPlease type something and try again" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' לא נמצא." STRING_OUT_OF_MEMORY "Not enough memory to complete this \ task.\nClose one or more applications to increase the amount of\nfree memory." diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index dea66511d0a..e316cb2354f 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -161,12 +161,12 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)" STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\ Molimo Vas da koristite drugu aplikaciju." - STRING_NOTEXT "Niste unijeli tekst. \ + STRING_NOTEXT "Niste unijeli tekst.\ \nMolimo Vas da nešto unesete i ponovo pokušate." STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\ -Želite li stvoriti novu datoteku ?" +Želite li stvoriti novu datoteku?" STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\ -Želite li spremiti te promjene ?" +Želite li spremiti te promjene?" STRING_NOTFOUND "'%s' ne može biti pronađena." STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 1f419e614c7..4f09de0433d 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Szövegfájlok (*.txt)" STRING_TOOLARGE "'%s' fájl túl nagy méretű.\n\ Kérem használjon másik szövegszerkesztő programot." - STRING_NOTEXT "A szöveg nem tartalmaz karaktert! \ + STRING_NOTEXT "A szöveg nem tartalmaz karaktert!\ \nKérem gépeljen be néhány karaktert és próbálja újra!" STRING_DOESNOTEXIST "A megadott '%s'\nfájl nem létezik!\n\n\ Kíván létrehozni új fájlt?" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index c1b866313b4..b273e56cbbf 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -157,11 +157,11 @@ Please use a different editor." STRING_NOTEXT "Դուք տեքստ չեք ներմուծել \ \nPlease type something and try again" STRING_DOESNOTEXIST "Ֆայլը '%s'\n գոյութնուն չունի\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "Ֆայլը '%s'\n ենթարկվել է փոփոխման\n\n\ -Would you like to save the changes ?" - STRING_NOTFOUND "'%s' չի գտնվել." - STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն. \ +Would you like to save the changes?" + STRING_NOTFOUND "'%s' չի գտնվել." + STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն.\ \nՓակեք մի կամ մի քանի ծրագիր." STRING_CANNOTFIND "Չի գտնվել '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 8405f0f0abf..bbd4256c956 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Berkas teks (*.txt)" STRING_TOOLARGE "Berkas '%s' terlalu besar untuk notepad.\n\ Mohon gunakan editor teks yang berbeda." - STRING_NOTEXT "Anda belum memasukkan teks apapun. \ + STRING_NOTEXT "Anda belum memasukkan teks apapun.\ \nMohon ketik sesuatu dan coba lagi." STRING_DOESNOTEXIST "Berkas '%s'\ntidak ada\n\n\ Ingin membuat berkas baru?" @@ -162,8 +162,7 @@ Ingin membuat berkas baru?" Ingin menyimpan perubahan?" STRING_NOTFOUND "'%s' tidak bisa ditemukan." STRING_OUT_OF_MEMORY "Memori tidak cukup untuk menyelesaikan tugas \ -ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori \ -bebas." +ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori bebas." STRING_CANNOTFIND "Tidak bisa menemukan '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index a22a1586762..1402e2cca32 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -154,12 +154,12 @@ BEGIN STRING_TEXT_FILES_TXT "File di testo (*.txt)" STRING_TOOLARGE "Il file '%s' è troppo grande per il blocco note.\n\ Per favore usare un altro programma." - STRING_NOTEXT "Non è stato inserito alcun testo. \ + STRING_NOTEXT "Non è stato inserito alcun testo.\ \nPer favore digitare qualcosa e riprovare" STRING_DOESNOTEXIST "Il file '%s'\nnon esiste\n\n\ -Creare un nuovo file ?" +Creare un nuovo file?" STRING_NOTSAVED "Il file '%s'\nè stato modificato\n\ -Salvare le modifiche ?" +Salvare le modifiche?" STRING_NOTFOUND "'%s' non è stato trovato." STRING_OUT_OF_MEMORY "Memoria insufficente per completare \ questa operazione.\nChiudere una o più applicazioni per aumentare la quantità \ diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index e9df825c3ac..5feee62632d 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -157,9 +157,9 @@ BEGIN STRING_NOTEXT "何も入力されていません。\ \n何か入力してから実行して下さい。" STRING_DOESNOTEXIST "ファイル '%s'\nは存在しません\n\n\ -新しいファイルを作成しますか ?" +新しいファイルを作成しますか?" STRING_NOTSAVED "ファイル '%s'\nは変更されています\n\n\ -変更を保存しますか ?" +変更を保存しますか?" STRING_NOTFOUND "'%s' は見つかりませんでした" STRING_OUT_OF_MEMORY "この操作を実行するためのメモリが\ 足りません。\nメモリの空きを増やすためにいくつかのアプリケーションを\n終了して\ diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 3e474ed0041..08f847765b0 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstinės bylos (*.txt)" STRING_TOOLARGE "Byla '%s' yra perdidelė.\n\ Prašome naudotis kitu redaktoriumi." - STRING_NOTEXT "Jūs neivedėte jokio teksto. \ + STRING_NOTEXT "Jūs neivedėte jokio teksto.\ \nPrašome parašyti ką nors ir bandyti dar kartą" STRING_DOESNOTEXIST "Byla '%s'\nneegzistuoja\n\n\ Ar norite sukurti naują bylą?" STRING_NOTSAVED "Byla '%s'\nbuvo pakeista\n\n\ Ar norite išsaugoti pakeitimus?" STRING_NOTFOUND "'%s' nerastas." - STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui. \ + STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui.\ \nUžverkite vieną ar kelias programas, kad padidintumėte\nlaisvos atminties kiekį." STRING_CANNOTFIND "Nepavyko rasti '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index b20afcc378f..23d34acde83 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -1,4 +1,4 @@ -/* Malay translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +// COPYRIGHT: 2016 Henry Tang Ih <henrytang2(a)hotmail.com> LANGUAGE LANG_MALAY, SUBLANG_DEFAULT @@ -156,7 +156,7 @@ BEGIN STRING_TEXT_FILES_TXT "Fail teks (*.txt)" STRING_TOOLARGE "Fail '%s' adalah terlalu besar untuk notepad.\n\ Sila gunakan editor yang berbeza." - STRING_NOTEXT "Anda tidak memasukkan sebarang teks. \ + STRING_NOTEXT "Anda tidak memasukkan sebarang teks.\ \nSila taip sesuatu dan cuba lagi" STRING_DOESNOTEXIST "Fail '%s'\ntidak wujud\n\n\ Adakah anda mahu mencipta fail baru?" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index 066028754f9..2a41af6b02c 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstbestanden (*.txt)" STRING_TOOLARGE "Het bestand '%s' is te groot voor Kladblok.\n\ Gebruik een andere editor." - STRING_NOTEXT "U heeft geen tekst ingevoerd. \ + STRING_NOTEXT "U heeft geen tekst ingevoerd.\ \nType uw tekst en probeer het nogmaals" STRING_DOESNOTEXIST "Het bestand '%s'\nbestaat niet\n\n\ Wilt u een nieuw bestand maken?" STRING_NOTSAVED "Het bestand '%s'\nis gewijzigd\n\n\ Wilt u de wijzigingen opslaan?" STRING_NOTFOUND "'%s' kan niet worden gevonden." - STRING_OUT_OF_MEMORY "Onvoldoende geheugen. \ + STRING_OUT_OF_MEMORY "Onvoldoende geheugen.\ \nSluit een of meer applicaties om de hoeveelheid\nbeschikbaar geheugen te vergroten." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 8df8d4c00b2..fc907a5a743 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -154,16 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Tekst filer (*.txt)" STRING_TOOLARGE "Filen '%s' er for stor for notisblokk.\n\ Vennligst bruk en annen editor." - STRING_NOTEXT "Du utfører innskrivet tekst. \ + STRING_NOTEXT "Du utfører innskrivet tekst.\ \nVennligst skriv noe og pr?jen" STRING_DOESNOTEXIST "Filen '%s'\n eksistere ikke\n\n\ Vil du opprette en ny fil?" STRING_NOTSAVED "Filen '%s'\nhar ikke blitt lagret\n\n\ Vil du lagre endringen?" STRING_NOTFOUND "'%s' ble ikke funnet." - STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne \ -oppgaven.\nAvslutt en eller mere applikasjoner for øke mengden av\nledig \ -minne." + STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne oppgaven.\n\ +Avslutt en eller mere applikasjoner for øke mengden av\nledig minne." STRING_CANNOTFIND "Kan ikke finne '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 97874362419..883f661e0e5 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -152,12 +152,12 @@ BEGIN STRING_UNTITLED "Bez tytułu" STRING_ALL_FILES "Wszystkie pliki (*.*)" STRING_TEXT_FILES_TXT "Pliki tekstowe (*.txt)" - STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\n Proszę użyć innego edytora." - STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\n Proszę coś wpisać i spróbować ponownie." - STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\n Czy chcesz utworzyć nowy plik?" - STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\n Czy chcesz zachować zmiany?" + STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\nProszę użyć innego edytora." + STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\nProszę coś wpisać i spróbować ponownie." + STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\nCzy chcesz utworzyć nowy plik?" + STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\nCzy chcesz zachować zmiany?" STRING_NOTFOUND "Nie można odnaleźć '%s'." - STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\n Zamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci." + STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\nZamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci." STRING_CANNOTFIND "Nie można odnaleźć '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 5ff0071c77a..202130aa474 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)" STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\ Por favor use um editor diferente." - STRING_NOTEXT "Você não digitou nenhum texto. \ + STRING_NOTEXT "Você não digitou nenhum texto.\ \nPor favor digite alguma coisa e tente novamente" STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\ Você deseja criar um novo arquivo?" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 13f0c79f1f5..adc7ab342c6 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)" STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\ Por favor use um editor diferente." - STRING_NOTEXT "Você não digitou nenhum texto. \ + STRING_NOTEXT "Você não digitou nenhum texto.\ \nPor favor digite alguma coisa e tente novamente" STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\ Você deseja criar um novo arquivo?" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 7564a109a27..84f86a00aa9 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -163,14 +163,14 @@ BEGIN STRING_TEXT_FILES_TXT "Fișiere text (*.txt)" STRING_TOOLARGE "Fișierul „%s” este prea mare.\n\ Încercați un alt editor." - STRING_NOTEXT "Nu ați scris nimic. \ + STRING_NOTEXT "Nu ați scris nimic.\ \nScrieți ceva apoi încercați din nou." STRING_DOESNOTEXIST "Fișierul „%s”\nnu există.\n\n\ -Creați un nou fișier ?" +Creați un nou fișier?" STRING_NOTSAVED "Fișierul „%s” a fost modificat!\n\n\ Păstrați modificările aduse?" STRING_NOTFOUND "„%s” nu poate fi găsit." - STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație. \ + STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație.\ \nÎnchideți una sau mai multe aplicații pentru a elibera memorie." STRING_CANNOTFIND "„%s” nu poate fi găsit" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 9867f769f3e..d6d49297d1e 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -161,8 +161,8 @@ BEGIN STRING_NOTSAVED "Файл '%s'\nбыл изменен\n\n\ Хотите сохранить изменения?" STRING_NOTFOUND "'%s' не найден." - STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции. \ -\nЗакройте одно или несколько приложений и повторите попытку." + STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции.\n\ +Закройте одно или несколько приложений и повторите попытку." STRING_CANNOTFIND "Невозможно найти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index cead9a46f5e..45084fe8061 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -1,10 +1,4 @@ -/* - * Notepad (Slovak resources) - * - * TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: xx-xx-2007 - * LAST CHANGE: 27-12-2008 - */ +// COPYRIGHT: 2007-2008 Mario Kacmar <kario(a)szm.sk> LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -162,8 +156,8 @@ BEGIN STRING_TEXT_FILES_TXT "Textové súbory (*.txt)" STRING_TOOLARGE "Súbor '%s' je pre Poznámkový blok príliš veľký.\n\ Na otvorenie súboru použite iný editor." - STRING_NOTEXT "Nevložili ste žiadny text. \ -\nProsím, napíšte niečo a skúste to znova." + STRING_NOTEXT "Nevložili ste žiadny text.\n\ +Prosím, napíšte niečo a skúste to znova." STRING_DOESNOTEXIST "Nie je možné nájsť súbor '%s'\n\n\ Chcete vytvoriť nový súbor?" STRING_NOTSAVED "Text súboru '%s'\nsa zmenil.\n\n\ diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 0031fd14997..11b869dfda7 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Datoteke z besedilom (*.txt)" STRING_TOOLARGE "Datoteka '%s' je prevelika za Beležnico.\n\ Uporabite drug urejevalnik." - STRING_NOTEXT "Niste vnesli besedila. \ -\nVnesite besedilo in poskusite znova." + STRING_NOTEXT "Niste vnesli besedila.\n\ +Vnesite besedilo in poskusite znova." STRING_DOESNOTEXIST "Datoteka '%s' ne obstaja.\n\n\ Ali želite ustvariti novo datoteko?" STRING_NOTSAVED "Vsebina datoteke '%s'je bila spremenjena.\n\n\ Ali želite shraniti spremembe?" STRING_NOTFOUND "Ni mogoèe najti '%s'." STRING_OUT_OF_MEMORY "Na voljo ni dovolj pomnilnika, da bi bilo mogoèe dokonèati to \ -operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova. " +operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 60d5a04da2e..79340ced5ad 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -1,6 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) -* DATE OF TR: 05-12-2013 -*/ +// COPYRIGHT: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -158,12 +156,12 @@ BEGIN STRING_TEXT_FILES_TXT "Dokumenta teksti (*.txt)" STRING_TOOLARGE "Dokumenti '%s' është shume i madh për notepad.\n\ Ju lutem perdorni editor tjeter." - STRING_NOTEXT "Nuk keni shkruaj ndonje tekst. \ -\nJu lutem shkruani diqka dhe provoni perseri" + STRING_NOTEXT "Nuk keni shkruaj ndonje tekst.\n\ +Ju lutem shkruani diqka dhe provoni perseri" STRING_DOESNOTEXIST "Dokumenti '%s'\nnuk ekziston\n\n\ -Doni te krijoni nje dokument te ri ?" +Doni te krijoni nje dokument te ri?" STRING_NOTSAVED "Dokumenti '%s'\nështë modifikuar\n\n\ -Doni te ruani ndryshimet ?" +Doni te ruani ndryshimet?" STRING_NOTFOUND "'%s' nuk gjindet." STRING_OUT_OF_MEMORY "Nuk ka memorie te mjaftueshme per te kompletuar kete \ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 70b3e3a2baa..55ed5312c5a 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -154,8 +154,8 @@ BEGIN STRING_TEXT_FILES_TXT "Textfiler (*.txt)" STRING_TOOLARGE "Filen '%s' är för stor för Anteckningar.\n\ Använd en annan editor." - STRING_NOTEXT "Du skrev inte in någon text. \ -\nSkriv något och försök sedan igen." + STRING_NOTEXT "Du skrev inte in någon text.\n\ +Skriv något och försök sedan igen." STRING_DOESNOTEXIST "Filen '%s'\nexisterar inte.\n\n\ Vill du skapa en ny fil?" STRING_NOTSAVED "Filen '%s'\nhar ändrats.\n\n\ diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index 11fe1192792..3bf2b721583 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -154,8 +154,8 @@ BEGIN STRING_TEXT_FILES_TXT "แฟ้มตํารา (*.txt)" STRING_TOOLARGE "แฟ้ม '%s' ใหญ่เกินไป" STRING_NOTEXT "คุณไม่ใดเขียนอะไร\nกรุณาลองใหม่" - STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่ ?" - STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่ ?" + STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่?" + STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่?" STRING_NOTFOUND "ไม่พบข้อความ '%s' ที่ต้องการค้นหา" STRING_OUT_OF_MEMORY "ความจําหมด\nกรุณาลองใหม่" STRING_CANNOTFIND "Cannot find '%s'" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 1f37825511e..be2ee95dc73 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -1,5 +1,5 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com) - * 2013-2016, 2018-2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +// COPYRIGHT: 2012 Arda Tanrıkulu <ardatanrikulu(a)gmail.com> +// 2013-2019 Erdem Ersoy LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a914503457a..06afd58c11a 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Текстові файли (*.txt)" STRING_TOOLARGE "Файл '%s' завеликий для блокнота.\n\ Будь ласка, використайте інший редактор." - STRING_NOTEXT "Ви не ввели ніякого тексту. \ -\nБудь ласка, введіть що-небудь і спробуйте ще раз" + STRING_NOTEXT "Ви не ввели ніякого тексту.\n\ +Будь ласка, введіть що-небудь і спробуйте ще раз" STRING_DOESNOTEXIST "Файл '%s'\nне існує\n\n\ Хочете створити новий файл?" STRING_NOTSAVED "Файл '%s'\nбув змінений\n\n\ Хочете зберегти зміни?" STRING_NOTFOUND "'%s' не знайдено." - STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\ -\nЗакрийте один або декілька додатків і повторіть спробу." + STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\n\ +Закрийте один або декілька додатків і повторіть спробу." STRING_CANNOTFIND "Неможливо знайти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Юнікод"

1 0

[reactos] 01/01: [MMSYS] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 02 Nov '23

02 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17530af2619ea5c22baa8… commit 17530af2619ea5c22baa82c1e90efc803df191ed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 08:53:36 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 3 08:53:36 2023 +0900 [MMSYS] Improve Japanese (ja-JP) translation CORE-18706 --- dll/cpl/mmsys/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index a29e91705e7..e834a3a7ab8 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -179,7 +179,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "マルチチャンネル" FONT 9, "MS UI Gothic" BEGIN - LTEXT "By moving the sliders below you can adjust the volume of all speakers connected to this computer.", 9506, 8, 4, 212, 24 + LTEXT "下のスライダーを移動すると、このコンピューターに接続されているすべてのスピーカーの音量を調整できます。", 9506, 8, 4, 212, 24 LTEXT "低", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "スライダー1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17

1 0

[reactos] 01/01: [PORTCLS] Remove meaningless YDEBUG (#5858)
by Serge Gautherie 02 Nov '23

02 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6c6c62cb5b44468aad38… commit c6c6c62cb5b44468aad38b0604339a97f80b1b69 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 2 13:14:12 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 2 13:14:12 2023 +0100 [PORTCLS] Remove meaningless YDEBUG (#5858) Addendum to b77ebc4 (r54584). Follow-up of #5818. --- drivers/wdm/audio/backpln/portcls/adapter.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/api.cpp | 8 ------- drivers/wdm/audio/backpln/portcls/connection.cpp | 7 ------ drivers/wdm/audio/backpln/portcls/dispatcher.cpp | 9 ------- drivers/wdm/audio/backpln/portcls/dll.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/dma_slave.cpp | 7 ------ drivers/wdm/audio/backpln/portcls/drm.cpp | 3 --- drivers/wdm/audio/backpln/portcls/drm_port.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/filter_dmus.cpp | 7 ------ .../wdm/audio/backpln/portcls/filter_topology.cpp | 6 ----- .../audio/backpln/portcls/filter_wavecyclic.cpp | 6 ----- .../wdm/audio/backpln/portcls/filter_wavepci.cpp | 5 ---- .../wdm/audio/backpln/portcls/filter_wavert.cpp | 3 --- drivers/wdm/audio/backpln/portcls/interrupt.cpp | 10 -------- drivers/wdm/audio/backpln/portcls/irp.cpp | 10 -------- drivers/wdm/audio/backpln/portcls/irpstream.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/miniport.cpp | 4 ---- .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 3 --- .../wdm/audio/backpln/portcls/miniport_fmsynth.cpp | 6 ----- drivers/wdm/audio/backpln/portcls/pin_dmus.cpp | 13 +--------- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 28 ---------------------- drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp | 19 +-------------- drivers/wdm/audio/backpln/portcls/pin_wavert.cpp | 8 +------ drivers/wdm/audio/backpln/portcls/pool.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/port.cpp | 3 --- drivers/wdm/audio/backpln/portcls/port_dmus.cpp | 11 --------- .../wdm/audio/backpln/portcls/port_topology.cpp | 12 ---------- .../wdm/audio/backpln/portcls/port_wavecyclic.cpp | 15 +----------- drivers/wdm/audio/backpln/portcls/port_wavepci.cpp | 11 +-------- drivers/wdm/audio/backpln/portcls/port_wavert.cpp | 12 ---------- .../audio/backpln/portcls/port_wavertstream.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/power.cpp | 8 ------- .../wdm/audio/backpln/portcls/propertyhandler.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/purecall.cpp | 8 ------- drivers/wdm/audio/backpln/portcls/registry.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/resource.cpp | 5 ---- .../wdm/audio/backpln/portcls/service_group.cpp | 6 ----- drivers/wdm/audio/backpln/portcls/undoc.cpp | 14 ----------- drivers/wdm/audio/backpln/portcls/unregister.cpp | 3 --- drivers/wdm/audio/backpln/portcls/version.cpp | 5 ---- 40 files changed, 5 insertions(+), 306 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/adapter.cpp b/drivers/wdm/audio/backpln/portcls/adapter.cpp index 0b5e87d7795..32fd9ccf161 100644 --- a/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> // @@ -201,7 +198,6 @@ cleanup: // delete created fdo IoDeleteDevice(fdo); - return status; } diff --git a/drivers/wdm/audio/backpln/portcls/api.cpp b/drivers/wdm/audio/backpln/portcls/api.cpp index fa006ef5253..7f9538686e2 100644 --- a/drivers/wdm/audio/backpln/portcls/api.cpp +++ b/drivers/wdm/audio/backpln/portcls/api.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -150,10 +147,8 @@ PcUnregisterIoTimeout( if (!pDeviceObject || !pDeviceObject->DeviceExtension) return STATUS_INVALID_PARAMETER; - DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; - KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); ListEntry = DeviceExtension->TimerList.Flink; @@ -181,8 +176,6 @@ PcUnregisterIoTimeout( return STATUS_NOT_FOUND; } - - NTSTATUS NTAPI PcCompletePendingPropertyRequest( @@ -263,4 +256,3 @@ PcDmaSlaveDescription( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/connection.cpp b/drivers/wdm/audio/backpln/portcls/connection.cpp index ffa71c80137..58894664ad1 100644 --- a/drivers/wdm/audio/backpln/portcls/connection.cpp +++ b/drivers/wdm/audio/backpln/portcls/connection.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> extern @@ -24,7 +21,6 @@ RtlCreateUnicodeString( PCWSTR SourceString ); - class CUnregisterPhysicalConnection : public CUnknownImpl<IUnregisterPhysicalConnection> { public: @@ -175,7 +171,6 @@ RegisterConnection( FromString = &SymEntry->SymbolicLink; } - if (ToUnknown) { Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); @@ -192,7 +187,6 @@ RegisterConnection( goto cleanup; } - SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); ToString = &SymEntry->SymbolicLink; @@ -229,7 +223,6 @@ RegisterConnection( InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); } - if (ToSubDeviceDescriptor) { ToEntry->FromPin = ToPin; diff --git a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp index 063a5728fb4..9fd133e5f91 100644 --- a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp +++ b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -48,7 +45,6 @@ Dispatch_fnRead( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Read(DeviceObject, Irp); } @@ -68,7 +64,6 @@ Dispatch_fnWrite( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Write(DeviceObject, Irp); } @@ -88,7 +83,6 @@ Dispatch_fnFlush( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Flush(DeviceObject, Irp); } @@ -135,7 +129,6 @@ Dispatch_fnQuerySecurity( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->QuerySecurity(DeviceObject, Irp); } @@ -181,7 +174,6 @@ Dispatch_fnFastDeviceIoControl( return DispatchContext->Target->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); } - BOOLEAN NTAPI Dispatch_fnFastRead( @@ -279,4 +271,3 @@ NewDispatchObject( DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/dll.cpp b/drivers/wdm/audio/backpln/portcls/dll.cpp index 354c1964b2a..63832017caf 100644 --- a/drivers/wdm/audio/backpln/portcls/dll.cpp +++ b/drivers/wdm/audio/backpln/portcls/dll.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> extern @@ -23,7 +20,6 @@ DllInitialize(ULONG Unknown) return 0; } - extern "C" { diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index ef71d248981..34f68dc65e4 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CDmaChannelInit : public CUnknownImpl<IDmaChannelInit> @@ -74,8 +71,6 @@ protected: friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context); }; - - //--------------------------------------------------------------- // IUnknown methods // @@ -235,7 +230,6 @@ CDmaChannelInit::PhysicalAddress( return Result; } - #endif VOID @@ -257,7 +251,6 @@ CDmaChannelInit::BufferSize() return m_BufferSize; } - PVOID NTAPI CDmaChannelInit::SystemAddress() diff --git a/drivers/wdm/audio/backpln/portcls/drm.cpp b/drivers/wdm/audio/backpln/portcls/drm.cpp index d4c93c03126..abd953db992 100644 --- a/drivers/wdm/audio/backpln/portcls/drm.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/drm_port.cpp b/drivers/wdm/audio/backpln/portcls/drm_port.cpp index 6d10cd8d626..e6ee225db28 100644 --- a/drivers/wdm/audio/backpln/portcls/drm_port.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm_port.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CDrmPort2 : public CUnknownImpl<IDrmPort2> @@ -134,5 +131,3 @@ NewIDrmPort( *OutPort = (PDRMPORT2)This; return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index b375cd8b67e..13711d85498 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterDMus : public CUnknownImpl<IPortFilterDMus> @@ -287,7 +284,6 @@ CPortFilterDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterDMus::FreePin( @@ -321,7 +317,6 @@ CPortFilterDMus::NotifyPins() } } - NTSTATUS NewPortFilterDMus( OUT PPORTFILTERDMUS * OutFilter) @@ -339,5 +334,3 @@ NewPortFilterDMus( return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 150de8c3cab..f7cbdda4924 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterTopology : public CUnknownImpl<IPortFilterTopology> @@ -29,7 +26,6 @@ protected: ISubdevice * m_SubDevice; }; - NTSTATUS NTAPI CPortFilterTopology::QueryInterface( @@ -70,7 +66,6 @@ CPortFilterTopology::NewIrpTarget( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI CPortFilterTopology::DeviceIoControl( @@ -232,7 +227,6 @@ CPortFilterTopology::Init( SUBDEVICE_DESCRIPTOR * Descriptor; NTSTATUS Status; - // get our private interface Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&ISubDevice); if (!NT_SUCCESS(Status)) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index 6a935da41c6..bae79593c7e 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWaveCyclic : public CUnknownImpl<IPortFilterWaveCyclic> @@ -312,7 +309,6 @@ CPortFilterWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterWaveCyclic::FreePin( @@ -332,7 +328,6 @@ CPortFilterWaveCyclic::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWaveCyclic( OUT IPortFilterWaveCyclic ** OutFilter) @@ -351,4 +346,3 @@ NewPortFilterWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index 9bf3a9465b8..1d1bf7781fd 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWavePci : public CUnknownImpl<IPortFilterWavePci> @@ -91,7 +88,6 @@ CPortFilterWavePci::NewIrpTarget( return STATUS_UNSUCCESSFUL; } - // now create the pin Status = NewPortPinWavePci(&Pin); if (!NT_SUCCESS(Status)) @@ -313,7 +309,6 @@ CPortFilterWavePci::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWavePci( OUT IPortFilterWavePci ** OutFilter) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index a91abafb880..99b32680e68 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWaveRT : public CUnknownImpl<IPortFilterWaveRT> diff --git a/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/drivers/wdm/audio/backpln/portcls/interrupt.cpp index f733c615974..91ce323e0b2 100644 --- a/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> typedef struct @@ -47,13 +44,10 @@ public: friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); }; - //--------------------------------------------------------------- // IUnknown methods // - - NTSTATUS NTAPI CInterruptSync::QueryInterface( @@ -72,7 +66,6 @@ CInterruptSync::QueryInterface( return STATUS_SUCCESS; } - if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); @@ -86,7 +79,6 @@ CInterruptSync::QueryInterface( // CInterruptSync methods // - BOOLEAN NTAPI CInterruptSynchronizedRoutine( @@ -219,7 +211,6 @@ IInterruptServiceRoutine( } } - NTSTATUS NTAPI CInterruptSync::Connect() @@ -255,7 +246,6 @@ CInterruptSync::Connect() return Status; } - VOID NTAPI CInterruptSync::Disconnect() diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index 8d775bfe493..2130c29be94 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> typedef struct @@ -23,7 +20,6 @@ typedef struct PDEVICE_OBJECT DeviceObject; }QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT; - NTSTATUS NTAPI PortClsCreate( @@ -35,7 +31,6 @@ PortClsCreate( return KsDispatchIrp(DeviceObject, Irp); } - NTSTATUS NTAPI PortClsPnp( @@ -53,7 +48,6 @@ PortClsPnp( DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("PortClsPnp called %u\n", IoStack->MinorFunction); //PC_ASSERT(DeviceExt); @@ -203,7 +197,6 @@ PwrCompletionFunction( FreeItem(PwrContext, TAG_PORTCLASS); } - NTSTATUS NTAPI PortClsPower( @@ -460,7 +453,6 @@ PcDispatchIrp( return STATUS_SUCCESS; } - NTSTATUS NTAPI PcCompleteIrp( @@ -512,8 +504,6 @@ CompletionRoutine( if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \ } - - NTSTATUS NTAPI PcForwardIrpSynchronous( diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 4e2b701eca1..a79259fa082 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> static @@ -86,7 +83,6 @@ typedef struct #define STREAM_DATA_OFFSET (0) - NTSTATUS NTAPI CIrpQueue::QueryInterface( @@ -248,7 +244,6 @@ CIrpQueue::AddMapping( } } - // now get a system address for the user buffers Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; Mdl = Irp->MdlAddress; diff --git a/drivers/wdm/audio/backpln/portcls/miniport.cpp b/drivers/wdm/audio/backpln/portcls/miniport.cpp index 8f00823770f..f7f4b44c836 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> PVOID @@ -79,4 +76,3 @@ PcNewMiniport( DPRINT("PcNewMiniport Status %x\n", Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index f57aa72a7dc..70cee8d66b3 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> // + for absolute / - for relative diff --git a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp index 44d479047d2..a84cd33674f 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include <debug.h> - NTSTATUS NewMiniportFmSynth( OUT PMINIPORT* OutMiniport, IN REFCLSID ClassId) diff --git a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index ef07aabed7d..9455d3fcbb2 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinDMus : public CUnknownImpl<IPortPinDMus> @@ -46,7 +43,6 @@ protected: PMINIPORTMIDI m_MidiMiniport; PMINIPORTMIDISTREAM m_MidiStream; - KSSTATE m_State; PKSDATAFORMAT m_Format; KSPIN_CONNECT * m_ConnectDetails; @@ -124,7 +120,6 @@ CPortPinDMus::GetBuffer( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::PutBuffer( @@ -147,7 +142,6 @@ CPortPinDMus::SetState( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::PutMessage( @@ -157,7 +151,6 @@ CPortPinDMus::PutMessage( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::ConnectOutput( @@ -167,7 +160,6 @@ CPortPinDMus::ConnectOutput( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::DisconnectOutput( @@ -255,7 +247,6 @@ CPortPinDMus::TransferMidiDataToDMus() Event->Event.cbEvent = (USHORT)BufferSize; Event->Event.uData.pbData = (PBYTE)Buffer; - if (!Root) Root = Event; else @@ -276,8 +267,6 @@ CPortPinDMus::TransferMidiDataToDMus() DPRINT("Status %x\n", Status); } - - VOID NTAPI CPortPinDMus::RequestService() @@ -295,6 +284,7 @@ CPortPinDMus::RequestService() } //================================================================================================================================== + NTSTATUS NTAPI CPortPinDMus::QueryInterface( @@ -629,4 +619,3 @@ NewPortPinDMus( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index ec67bb50ef0..15495d2aeef 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWaveCyclic : public CUnknownImpl<IPortPinWaveCyclic, IServiceSink> @@ -109,7 +106,6 @@ protected: ULONG m_Delay; }; - typedef struct { ULONG bLoopedStreaming; @@ -121,8 +117,6 @@ typedef struct ULONG bLoopedStreaming; }ENDOFSTREAM_EVENT_CONTEXT, *PENDOFSTREAM_EVENT_CONTEXT; - - NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -131,7 +125,6 @@ NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA Ev NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); DEFINE_KSPROPERTY_DRMSET(PinWaveCyclicDRMSet, PinWaveCyclicDRMHandler); @@ -156,7 +149,6 @@ KSEVENT_ITEM PinWaveCyclicStreamingEventSet = 0 }; - KSPROPERTY_SET PinWaveCyclicPropertySet[] = { { @@ -196,7 +188,6 @@ KSEVENT_SET PinWaveCyclicEventSet[] = } }; - //================================================================================================================================== NTSTATUS @@ -237,7 +228,6 @@ PinWaveCyclicDRMHandler( return STATUS_INVALID_PARAMETER; } - NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent( @@ -335,7 +325,6 @@ PinWaveCyclicAllocatorFraming( // cast to pin impl Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -452,7 +441,6 @@ PinSetStateWorkerRoutine( } - NTSTATUS NTAPI PinWaveCyclicState( @@ -600,7 +588,6 @@ PinWaveCyclicDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -613,7 +600,6 @@ PinWaveCyclicDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -773,7 +759,6 @@ CPortPinWaveCyclic::UpdateCommonBufferOverlap( PUCHAR Buffer; NTSTATUS Status; - BufferLength = Gap = m_CommonBufferSize - m_CommonBufferOffset; BufferLength = Length = min(BufferLength, MaxTransferCount); while(BufferLength) @@ -1076,7 +1061,6 @@ CPortPinWaveCyclic::Close( m_Stream = NULL; } - if (m_Filter) { // disconnect pin from filter @@ -1141,7 +1125,6 @@ CPortPinWaveCyclic::FastDeviceIoControl( return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastRead( @@ -1157,7 +1140,6 @@ CPortPinWaveCyclic::FastRead( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastWrite( @@ -1173,7 +1155,6 @@ CPortPinWaveCyclic::FastWrite( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - NTSTATUS NTAPI CPortPinWaveCyclic::Init( @@ -1218,7 +1199,6 @@ CPortPinWaveCyclic::Init( while(TRUE); } - Status = m_Miniport->NewStream(&m_Stream, NULL, NonPagedPool, @@ -1321,7 +1301,6 @@ CPortPinWaveCyclic::Init( DPRINT1("Bits %u Samples %u Channels %u Tag %u FrameSize %u CommonBufferSize %lu, CommonBuffer %p\n", ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nSamplesPerSec, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wFormatTag, m_FrameSize, m_CommonBufferSize, m_DmaChannel->SystemAddress()); - /* set up allocator framing */ m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; m_AllocatorFraming.PoolType = NonPagedPool; @@ -1354,7 +1333,6 @@ CPortPinWaveCyclic::Init( return STATUS_SUCCESS; } - ULONG NTAPI CPortPinWaveCyclic::GetCompletedPosition() @@ -1363,7 +1341,6 @@ CPortPinWaveCyclic::GetCompletedPosition() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetCycleCount() @@ -1372,7 +1349,6 @@ CPortPinWaveCyclic::GetCycleCount() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetDeviceBufferSize() @@ -1380,7 +1356,6 @@ CPortPinWaveCyclic::GetDeviceBufferSize() return m_CommonBufferSize; } - PVOID NTAPI CPortPinWaveCyclic::GetIrpStream() @@ -1388,7 +1363,6 @@ CPortPinWaveCyclic::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWaveCyclic::GetMiniport() @@ -1396,7 +1370,6 @@ CPortPinWaveCyclic::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWaveCyclic( OUT IPortPinWaveCyclic ** OutPin) @@ -1414,4 +1387,3 @@ NewPortPinWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 879965edc32..97f2d8311da 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWavePci : public CUnknownImpl<IPortPinWavePci, IServiceSink, IPortWavePciStream> @@ -93,7 +90,6 @@ KSPROPERTY_SET PinWavePciPropertySet[] = } }; - NTSTATUS NTAPI PinWavePciAllocatorFraming( @@ -115,7 +111,6 @@ PinWavePciAllocatorFraming( // cast to pin impl Pin = (CPortPinWavePci*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -168,7 +163,6 @@ PinWavePciAudioPosition( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI PinWavePciState( @@ -330,7 +324,6 @@ PinWavePciDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -343,7 +336,6 @@ PinWavePciDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -371,8 +363,8 @@ PinWavePciDataFormat( return STATUS_NOT_SUPPORTED; } - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWavePci::QueryInterface( @@ -396,7 +388,6 @@ CPortPinWavePci::QueryInterface( return STATUS_SUCCESS; } - if (IsEqualGUIDAligned(refiid, IID_IPortWavePciStream)) { *Output = PVOID(PPORTWAVEPCISTREAM(this)); @@ -440,7 +431,6 @@ CPortPinWavePci::TerminatePacket() return STATUS_SUCCESS; } - VOID NTAPI CPortPinWavePci::RequestService() @@ -554,7 +544,6 @@ CPortPinWavePci::HandleKsStream( return Status; } - NTSTATUS NTAPI CPortPinWavePci::DeviceIoControl( @@ -639,7 +628,6 @@ CPortPinWavePci::Close( m_IrpQueue = NULL; } - if (m_ServiceGroup) { // remove member from service group @@ -766,7 +754,6 @@ CPortPinWavePci::FastWrite( return FALSE; } - NTSTATUS NTAPI CPortPinWavePci::Init( @@ -960,7 +947,6 @@ CPortPinWavePci::Init( } } - return STATUS_SUCCESS; } @@ -971,7 +957,6 @@ CPortPinWavePci::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWavePci::GetMiniport() @@ -979,7 +964,6 @@ CPortPinWavePci::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWavePci( OUT IPortPinWavePci ** OutPin) @@ -997,4 +981,3 @@ NewPortPinWavePci( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index d259649d3c0..922b952bbb8 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWaveRT : public CUnknownImpl<IPortPinWaveRT> @@ -60,7 +57,6 @@ protected: }; - typedef struct { CPortPinWaveRT *Pin; @@ -68,8 +64,8 @@ typedef struct KSSTATE State; }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWaveRT::QueryInterface( @@ -286,7 +282,6 @@ CPortPinWaveRT::DeviceIoControl( IoStack = IoGetCurrentIrpStackLocation(Irp); - switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_KS_PROPERTY: @@ -671,7 +666,6 @@ cleanup: return Status; } - NTSTATUS NewPortPinWaveRT( OUT IPortPinWaveRT ** OutPin) diff --git a/drivers/wdm/audio/backpln/portcls/pool.cpp b/drivers/wdm/audio/backpln/portcls/pool.cpp index 63ee67edcdd..03ed6b365fb 100644 --- a/drivers/wdm/audio/backpln/portcls/pool.cpp +++ b/drivers/wdm/audio/backpln/portcls/pool.cpp @@ -8,11 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif -#include <debug.h> - PVOID AllocateItem( IN POOL_TYPE PoolType, diff --git a/drivers/wdm/audio/backpln/portcls/port.cpp b/drivers/wdm/audio/backpln/portcls/port.cpp index 504291a0d7d..2cd774de1ef 100644 --- a/drivers/wdm/audio/backpln/portcls/port.cpp +++ b/drivers/wdm/audio/backpln/portcls/port.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 8a3e8cdae13..f2bfe94f072 100644 --- a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortDMus : public CUnknownImpl<IPortDMus, ISubdevice> @@ -79,7 +76,6 @@ KSPROPERTY_SET PortDMusPropertySet[] = } }; - //--------------------------------------------------------------- // IUnknown interface functions // @@ -302,7 +298,6 @@ CPortDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::NewRegistryKey( @@ -393,7 +388,6 @@ CPortDMus::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterDMus(&Filter); if (!NT_SUCCESS(Status)) { @@ -462,7 +456,6 @@ CPortDMus::PowerChangeNotify( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::PinCount( @@ -485,8 +478,6 @@ CPortDMus::PinCount( return STATUS_UNSUCCESSFUL; } - - NTSTATUS NewPortDMus( OUT PPORT* OutPort) @@ -508,8 +499,6 @@ NewPortDMus( } - - VOID GetDMusMiniport( IN IPortDMus * iface, diff --git a/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 32467b3d6a4..8e346b223ea 100644 --- a/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortTopology : public CUnknownImpl<IPortTopology, ISubdevice, IPortEvents> @@ -78,7 +75,6 @@ KSPROPERTY_SET TopologyPropertySet[] = // IPortEvents // - void NTAPI CPortTopology::AddEventToEventList( @@ -100,7 +96,6 @@ CPortTopology::GenerateEventList( UNIMPLEMENTED; } - //--------------------------------------------------------------- // IUnknown interface functions // @@ -255,7 +250,6 @@ CPortTopology::Init( NULL, m_pDescriptor); - DPRINT("IPortTopology_fnInit success\n"); if (NT_SUCCESS(Status)) { @@ -266,7 +260,6 @@ CPortTopology::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortTopology::NewRegistryKey( @@ -431,7 +424,6 @@ CPortTopology::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI PcCreatePinDispatch( @@ -456,7 +448,6 @@ PcCreatePinDispatch( PC_ASSERT(Filter != NULL); PC_ASSERT_IRQL(PASSIVE_LEVEL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -517,7 +508,6 @@ PcCreateItemDispatch( // sanity checks PC_ASSERT(SubDevice != NULL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -571,7 +561,6 @@ PcCreateItemDispatch( return STATUS_SUCCESS; } - NTSTATUS NewPortTopology( OUT PPORT* OutPort) @@ -594,7 +583,6 @@ NewPortTopology( return Status; } - PMINIPORTTOPOLOGY GetTopologyMiniport( PPORTTOPOLOGY Port) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index 3a4f3545de7..04525ab53f8 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> GUID IID_IDmaChannelSlave; @@ -87,7 +84,6 @@ KSPROPERTY_SET WaveCyclicPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - //--------------------------------------------------------------- // IPortEvents // @@ -100,7 +96,6 @@ CPortWaveCyclic::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveCyclic::GenerateEventList( @@ -227,7 +222,6 @@ CPortWaveCyclic::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -283,7 +277,6 @@ CPortWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::NewRegistryKey( @@ -300,7 +293,6 @@ CPortWaveCyclic::NewRegistryKey( return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); } - //--------------------------------------------------------------- // IPortWaveCyclic interface functions // @@ -431,7 +423,6 @@ CPortWaveCyclic::NewIrpTarget( return Status; } - NTSTATUS NTAPI CPortWaveCyclic::ReleaseChildren() @@ -459,7 +450,6 @@ CPortWaveCyclic::ReleaseChildren() return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::GetDescriptor( @@ -473,7 +463,6 @@ CPortWaveCyclic::GetDescriptor( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::DataRangeIntersection( @@ -494,7 +483,6 @@ CPortWaveCyclic::DataRangeIntersection( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI CPortWaveCyclic::PowerChangeNotify( @@ -530,8 +518,8 @@ CPortWaveCyclic::PinCount( return STATUS_UNSUCCESSFUL; } - ///-------------------------------------------------------------- + PMINIPORTWAVECYCLIC GetWaveCyclicMiniport( IN IPortWaveCyclic* iface) @@ -573,4 +561,3 @@ NewPortWaveCyclic( DPRINT("NewPortWaveCyclic %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 068d28256a8..e630e20958d 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWavePci : public CUnknownImpl<IPortWavePci, IPortEvents, ISubdevice, IServiceSink> @@ -82,7 +79,6 @@ KSPROPERTY_SET WavePciPropertySet[] = } }; - //--------------------------------------------------------------- // IPortEvents // @@ -101,8 +97,6 @@ CPortWavePci::AddEventToEventList( KeReleaseSpinLock(&m_EventListLock, OldIrql); } - - void NTAPI CPortWavePci::GenerateEventList( @@ -268,7 +262,6 @@ CPortWavePci::Init( NULL, m_pDescriptor); - if (!NT_SUCCESS(Status)) { DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); @@ -277,7 +270,7 @@ CPortWavePci::Init( } // did we get a service group - if (ServiceGroup) + if (ServiceGroup) { // store service group in context m_ServiceGroup = ServiceGroup; @@ -512,7 +505,6 @@ CPortWavePci::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortWavePci( OUT PPORT* OutPort) @@ -536,7 +528,6 @@ NewPortWavePci( } - PDEVICE_OBJECT GetDeviceObjectFromPortWavePci( IPortWavePci* iface) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index c7f5f7d51ab..0a809b467af 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWaveRT : public CUnknownImpl<IPortWaveRT, IPortEvents, ISubdevice> @@ -81,8 +78,6 @@ KSPROPERTY_SET WaveRTPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - - //--------------------------------------------------------------- // IPortEvents // @@ -95,7 +90,6 @@ CPortWaveRT::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveRT::GenerateEventList( @@ -237,7 +231,6 @@ CPortWaveRT::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -291,12 +284,10 @@ CPortWaveRT::Init( // increment reference on resource list ResourceList->AddRef(); - DPRINT("IPortWaveRT successfully initialized\n"); return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveRT::NewRegistryKey( @@ -343,7 +334,6 @@ CPortWaveRT::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterWaveRT(&Filter); if (!NT_SUCCESS(Status)) { @@ -459,7 +449,6 @@ GetDeviceObjectFromPortWaveRT( // IPortWaveRT constructor // - NTSTATUS NewPortWaveRT( OUT PPORT* OutPort) @@ -481,4 +470,3 @@ NewPortWaveRT( DPRINT("NewPortWaveRT %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp index 4689f07b609..7f01f35bcb9 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWaveRTStreamInit : public CUnknownImpl<IPortWaveRTStreamInit> @@ -44,7 +41,6 @@ CPortWaveRTStreamInit::QueryInterface( return STATUS_UNSUCCESSFUL; } - PMDL NTAPI CPortWaveRTStreamInit::AllocatePagesForMdl( @@ -157,7 +153,6 @@ CPortWaveRTStreamInit::GetPhysicalPageAddress( return Result; } - NTSTATUS NewPortWaveRTStream( PPORTWAVERTSTREAM *OutStream) diff --git a/drivers/wdm/audio/backpln/portcls/power.cpp b/drivers/wdm/audio/backpln/portcls/power.cpp index 17bfceca966..0f0f00c2d67 100644 --- a/drivers/wdm/audio/backpln/portcls/power.cpp +++ b/drivers/wdm/audio/backpln/portcls/power.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -31,7 +28,6 @@ PcRegisterAdapterPowerManagement( if (!pUnknown || !pvContext) return STATUS_INVALID_PARAMETER; - pDeviceObject = (PDEVICE_OBJECT)pvContext; DeviceExt = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; @@ -71,8 +67,6 @@ PcUnregisterAdapterPowerManagement( return STATUS_SUCCESS; } - - static VOID NTAPI @@ -114,7 +108,5 @@ PcRequestNewPowerState( KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); } - return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp index a63bff78b10..5aa07fcf998 100644 --- a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp +++ b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -90,7 +87,6 @@ HandleNecessaryPropertyInstances( Result = (PULONG)Data; - // check if the miniport supports the IPinCount interface Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); diff --git a/drivers/wdm/audio/backpln/portcls/purecall.cpp b/drivers/wdm/audio/backpln/portcls/purecall.cpp index 6f078cc9191..ee5588c1d78 100644 --- a/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include <debug.h> - extern "C" { void __cxa_pure_virtual() @@ -21,7 +15,5 @@ extern "C" { // put error handling here DbgBreakPoint(); - } } - diff --git a/drivers/wdm/audio/backpln/portcls/registry.cpp b/drivers/wdm/audio/backpln/portcls/registry.cpp index 56a8cc144c8..d157365d1ed 100644 --- a/drivers/wdm/audio/backpln/portcls/registry.cpp +++ b/drivers/wdm/audio/backpln/portcls/registry.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CRegistryKey : public CUnknownImpl<IRegistryKey> @@ -44,7 +41,6 @@ CRegistryKey::~CRegistryKey() } } - NTSTATUS NTAPI CRegistryKey::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/resource.cpp b/drivers/wdm/audio/backpln/portcls/resource.cpp index 19020345579..21b90254e00 100644 --- a/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CResourceList : public CUnknownImpl<IResourceList> @@ -220,7 +217,6 @@ CResourceList::AddEntry( /* Sanity check */ PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* Is there still room for another entry */ if (m_NumberOfEntries >= m_MaxEntries) { @@ -293,7 +289,6 @@ CResourceList::UntranslatedList() return m_UntranslatedResourceList; } - PORTCLASSAPI NTSTATUS NTAPI diff --git a/drivers/wdm/audio/backpln/portcls/service_group.cpp b/drivers/wdm/audio/backpln/portcls/service_group.cpp index d3688a92c14..8a2b83334e0 100644 --- a/drivers/wdm/audio/backpln/portcls/service_group.cpp +++ b/drivers/wdm/audio/backpln/portcls/service_group.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> VOID @@ -50,13 +47,10 @@ protected: friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); }; - - //--------------------------------------------------------------- // IUnknown methods // - NTSTATUS NTAPI CServiceGroup::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/undoc.cpp b/drivers/wdm/audio/backpln/portcls/undoc.cpp index d6a42baa1ab..6bd1a1bb23b 100644 --- a/drivers/wdm/audio/backpln/portcls/undoc.cpp +++ b/drivers/wdm/audio/backpln/portcls/undoc.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -98,7 +95,6 @@ PcHandlePropertyWithTable( // store device descriptor KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - // then try KsPropertyHandler return KsPropertyHandler(Irp, PropertySetCount, PropertySet); } @@ -181,7 +177,6 @@ PropertyItemDispatch( PropertyRequest->Irp = Irp; PropertyRequest->Verb = Property->Flags; - // check if this is filter / pin property request if (!(Property->Flags & KSPROPERTY_TYPE_TOPOLOGY)) { @@ -324,8 +319,6 @@ ASSERT(PropertyItem->Set); // RtlStringFromGUID(*PropertyItem->Set, &GuidBuffer); // DPRINT1("PcAddToPropertyTable Adding Item Set %S Id %lu Flags %lx\n", GuidBuffer.Buffer, PropertyItem->Id, PropertyItem->Flags); - - //DPRINT1("FilterPropertySetCount %lu\n", SubDeviceDescriptor->FilterPropertySetCount); // first step check if the property set is present already for(Index = 0; Index < SubDeviceDescriptor->FilterPropertySetCount; Index++) @@ -516,9 +509,6 @@ PcCaptureFormat( return STATUS_NOT_IMPLEMENTED; } - - - VOID DumpAutomationTable( IN PPCAUTOMATION_TABLE AutomationTable, @@ -631,7 +621,6 @@ DumpAutomationTable( DPRINT("=====================================================================\n"); } - VOID DumpFilterDescriptor( IN PPCFILTER_DESCRIPTOR FilterDescription) @@ -649,7 +638,6 @@ DumpFilterDescriptor( // dump filter description table DumpAutomationTable((PPCAUTOMATION_TABLE)FilterDescription->AutomationTable, L"Filter", L""); - if (FilterDescription->PinCount) { if (FilterDescription->PinSize >= sizeof(PCPIN_DESCRIPTOR)) @@ -678,7 +666,6 @@ DumpFilterDescriptor( } } - if (FilterDescription->Nodes) { if (FilterDescription->NodeSize >= sizeof(PCNODE_DESCRIPTOR)) @@ -1002,4 +989,3 @@ PcValidateConnectRequest( { return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); } - diff --git a/drivers/wdm/audio/backpln/portcls/unregister.cpp b/drivers/wdm/audio/backpln/portcls/unregister.cpp index ef9d7130888..b4ace6d9eaf 100644 --- a/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CUnregisterSubdevice : public CUnknownImpl<IUnregisterSubdevice> diff --git a/drivers/wdm/audio/backpln/portcls/version.cpp b/drivers/wdm/audio/backpln/portcls/version.cpp index c3571cc7bd1..fb102188a6f 100644 --- a/drivers/wdm/audio/backpln/portcls/version.cpp +++ b/drivers/wdm/audio/backpln/portcls/version.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortClsVersion : public CUnknownImpl<IPortClsVersion> @@ -30,8 +27,6 @@ public: } }; - - //--------------------------------------------------------------- // IPortClsVersion interface functions //

1 0

[reactos] 01/01: [IMM32][SDK] Add CtfAImmIsIME, CtfImmSetAppCompatFlags etc. (#5862)
by Katayama Hirofumi MZ 01 Nov '23

01 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dabb3f4d61da14bfb25c6… commit dabb3f4d61da14bfb25c650a05f5943bea8ea4b4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 2 08:16:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 2 08:16:12 2023 +0900 [IMM32][SDK] Add CtfAImmIsIME, CtfImmSetAppCompatFlags etc. (#5862) - Add CtfAImmIsIME, CtfImmIsCiceroStartedInThread and CtfImmSetAppCompatFlags functions. - Implement CtfImmDispatchDefImeMessage function. - Modify imm32.spec. - Add the prototypes of ImmGetAppCompatFlags, CtfAImmIsIME, CtfImmIsCiceroStartedInThread, CtfImmSetAppCompatFlags, and CtfImmDispatchDefImeMessage into <imm32_undoc.h>. CORE-19268 --- dll/win32/imm32/ctf.c | 62 +++++++++++++++++++++++++++++++++++++-- dll/win32/imm32/imm32.spec | 5 +++- dll/win32/imm32/keymsg.c | 7 ++++- dll/win32/imm32/precomp.h | 1 + sdk/include/reactos/imm32_undoc.h | 11 +++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index eeeae62b588..b403cb3ad59 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); * this folder. */ +/* "Active IMM" compatibility flags */ +DWORD g_aimm_compat_flags = 0; + /* The instance of the CTF IME file */ HINSTANCE g_hCtfIme = NULL; @@ -192,6 +195,45 @@ CtfImeDestroyThreadMgr(VOID) return CTF_IME_FN(CtfImeDestroyThreadMgr)(); } +/*********************************************************************** + * CtfAImmIsIME (IMM32.@) + * + * @return TRUE if CTF IME or IMM IME is enabled. + */ +BOOL WINAPI +CtfAImmIsIME(_In_ HKL hKL) +{ + TRACE("(%p)\n", hKL); + if (!Imm32LoadCtfIme()) + return ImmIsIME(hKL); + return CTF_IME_FN(CtfImeIsIME)(hKL); +} + +/*********************************************************************** + * CtfImmIsCiceroStartedInThread (IMM32.@) + * + * @return TRUE if Cicero is started in the current thread. + */ +BOOL WINAPI +CtfImmIsCiceroStartedInThread(VOID) +{ + TRACE("()\n"); + return !!(GetWin32ClientInfo()->CI_flags & 0x200); +} + +/*********************************************************************** + * CtfImmSetAppCompatFlags (IMM32.@) + * + * Sets the application compatibility flags. + */ +VOID WINAPI +CtfImmSetAppCompatFlags(_In_ DWORD dwFlags) +{ + TRACE("(0x%08X)\n", dwFlags); + if (!(dwFlags & 0xF0FFFFFF)) + g_aimm_compat_flags = dwFlags; +} + /*********************************************************************** * This function calls the same name function of the CTF IME side. */ @@ -361,6 +403,18 @@ CtfImmHideToolbarWnd(VOID) return 0; } +BOOL Imm32InsideLoaderLock(VOID) +{ + return (NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread == + NtCurrentTeb()->ClientId.UniqueThread); +} + +/* FIXME: Use RTL */ +BOOL WINAPI RtlDllShutdownInProgress(VOID) +{ + return FALSE; +} + /*********************************************************************** * CtfImmDispatchDefImeMessage(IMM32.@) */ @@ -371,8 +425,12 @@ CtfImmDispatchDefImeMessage( _In_ WPARAM wParam, _In_ LPARAM lParam) { - /* FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); */ - return 0; + TRACE("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + + if (RtlDllShutdownInProgress() || Imm32InsideLoaderLock() || !Imm32LoadCtfIme()) + return 0; + + return CTF_IME_FN(CtfImeDispatchDefImeMessage)(hWnd, uMsg, wParam, lParam); } /*********************************************************************** diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index eec7202482a..89293195098 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,6 +1,8 @@ @ stdcall CtfAImmActivate(ptr) @ stdcall CtfAImmDeactivate(long) +@ stdcall CtfAImmIsIME(ptr) @ stdcall CtfImmIsCiceroEnabled() +@ stdcall CtfImmIsCiceroStartedInThread() @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmTIMActivate(ptr) @ stdcall CtfImmRestoreToolbarWnd(long) @@ -8,6 +10,7 @@ @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) @ stdcall CtfImmIsGuidMapEnable(ptr) @ stdcall CtfImmGetGuidAtom(ptr long ptr) +@ stdcall CtfImmSetAppCompatFlags(long) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @@ -31,6 +34,7 @@ @ stdcall ImmEscapeW(long ptr long ptr) @ stdcall ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) +@ stdcall ImmGetAppCompatFlags(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr) @@ -84,7 +88,6 @@ @ stdcall ImmLockIMCC(ptr) @ stdcall ImmLockImeDpi(ptr) @ stdcall ImmNotifyIME(ptr long long long) -@ stub ImmPenAuxInput @ stdcall ImmProcessKey(ptr long long long long) @ stdcall ImmPutImeMenuItemsIntoMappedFile(ptr) @ stdcall ImmReSizeIMCC(ptr long) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 3e05fe416b9..3f2fb48be31 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -752,18 +752,23 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) return ret; } +/*********************************************************************** + * ImmGetAppCompatFlags (IMM32.@) + */ DWORD WINAPI ImmGetAppCompatFlags(HIMC hIMC) { PCLIENTIMC pClientIMC; DWORD dwFlags; + TRACE("(%p)\n", hIMC); + pClientIMC = ImmLockClientImc(hIMC); if (IS_NULL_UNEXPECTEDLY(pClientIMC)) return 0; dwFlags = pClientIMC->dwCompatFlags; ImmUnlockClientImc(pClientIMC); - return dwFlags; + return (dwFlags | g_aimm_compat_flags); } /*********************************************************************** diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 6e0512af409..8fc4b27d4b7 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -75,6 +75,7 @@ extern PIMEDPI gpImeDpiList; extern PSERVERINFO gpsi; extern SHAREDINFO gSharedInfo; extern HANDLE ghImmHeap; +extern DWORD g_aimm_compat_flags; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 49cb047182a..d2622dd8423 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -20,9 +20,20 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc); PIMEDPI WINAPI ImmLockImeDpi(HKL hKL); VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi); HRESULT WINAPI CtfImmTIMActivate(HKL hKL); +DWORD WINAPI ImmGetAppCompatFlags(HIMC hIMC); HRESULT WINAPI CtfAImmActivate(_Out_opt_ HINSTANCE *phinstCtfIme); HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); +BOOL WINAPI CtfAImmIsIME(_In_ HKL hKL); +BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); +VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); + +LRESULT WINAPI +CtfImmDispatchDefImeMessage( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); #ifdef __cplusplus } // extern "C"

1 0

[reactos] 01/01: [NTUSER] Fix system menu mouse handing (#5822)
by Egor Ananyin 01 Nov '23

01 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64997887ebf21249f81f6… commit 64997887ebf21249f81f628ee25a5913a24e6fdf Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Thu Nov 2 02:11:46 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 23:11:46 2023 +0000 [NTUSER] Fix system menu mouse handing (#5822) Add a check for the system menu opened from the app icon. Fixes CORE-19258 --- win32ss/user/ntuser/menu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index a5273ea2096..b02eb7b88cf 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3555,7 +3555,9 @@ static BOOL FASTCALL MENU_ButtonDown(MTRACKER* pmt, PMENU PtMenu, UINT Flags) { UINT id = 0; PITEM item; - if (IS_SYSTEM_MENU(PtMenu)) + + // Special check for the icon system menu + if (IS_SYSTEM_MENU(PtMenu) && !(PtMenu->fFlags & MNF_POPUP)) { item = PtMenu->rgItems; } @@ -3599,7 +3601,8 @@ static INT FASTCALL MENU_ButtonUp(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Id = 0; ITEM *item; - if ( IS_SYSTEM_MENU(PtMenu) ) + // Special check for the icon system menu + if (IS_SYSTEM_MENU(PtMenu) && !(PtMenu->fFlags & MNF_POPUP)) { item = PtMenu->rgItems; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs