Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 03/04: [NTOS:MM] Add missing validation of Ordinal in MiLocateExportName (#4918)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8695eee1e92a7f2bdcdb… commit d8695eee1e92a7f2bdcdbc638d1372fcb8fe1a5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 22 20:41:02 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:57 2023 +0200 [NTOS:MM] Add missing validation of Ordinal in MiLocateExportName (#4918) --- ntoskrnl/mm/ARM3/sysldr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 89f394bddb5..c5f42ca582d 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -304,6 +304,9 @@ MiLocateExportName(IN PVOID DllBase, /* Check if we couldn't find it */ if (Ordinal == -1) return NULL; + /* Validate the ordinal */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; + /* Resolve the address and write it */ ExportTable = (PULONG)((ULONG_PTR)DllBase + ExportDirectory->AddressOfFunctions);

1 year, 4 months

[reactos] 02/04: [NTOS:MM/PS] De-duplicate export name-to-ordinal functionality (#4918)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e55236662c75dff342d0… commit 4e55236662c75dff342d04d47227fc686bd8f2a5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 22 19:06:34 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:56 2023 +0200 [NTOS:MM/PS] De-duplicate export name-to-ordinal functionality (#4918) It was implemented in psmgr.c but in a recursive way. That implementation is replaced, in the NameToOrdinal() helper, by the better non-recursive one found in the MiLocateExportName() and MiFindExportedRoutineByName() functions. This NameToOrdinal() helper is then called in lieu of the duplicated code in MiLocateExportName() and MiFindExportedRoutineByName(). In addition, one block of code in MiSnapThunk() is simplified in a similar manner. --- ntoskrnl/mm/ARM3/sysldr.c | 160 +++++++++++++++++++++------------------------- ntoskrnl/ps/psmgr.c | 46 ++----------- 2 files changed, 78 insertions(+), 128 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index b17a53b82eb..89f394bddb5 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -213,43 +213,35 @@ MiLoadImageSection(_Inout_ PSECTION *SectionPtr, return Status; } -PVOID +#ifndef RVA +#define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) +#endif + +USHORT NTAPI -MiLocateExportName(IN PVOID DllBase, - IN PCHAR ExportName) +NameToOrdinal( + _In_ PCSTR ExportName, + _In_ PVOID ImageBase, + _In_ ULONG NumberOfNames, + _In_ PULONG NameTable, + _In_ PUSHORT OrdinalTable) { - PULONG NameTable; - PUSHORT OrdinalTable; - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - LONG Low = 0, Mid = 0, High, Ret; - USHORT Ordinal; - PVOID Function; - ULONG ExportSize; - PULONG ExportTable; - PAGED_CODE(); + LONG Low, Mid, High, Ret; - /* Get the export directory */ - ExportDirectory = RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - if (!ExportDirectory) return NULL; - - /* Setup name tables */ - NameTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNames); - OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNameOrdinals); + /* Fail if no names */ + if (!NumberOfNames) + return -1; /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; + Low = Mid = 0; + High = NumberOfNames - 1; while (High >= Low) { /* Get new middle value */ Mid = (Low + High) >> 1; /* Compare name */ - Ret = strcmp(ExportName, (PCHAR)DllBase + NameTable[Mid]); + Ret = strcmp(ExportName, (PCHAR)RVA(ImageBase, NameTable[Mid])); if (Ret < 0) { /* Update high */ @@ -268,10 +260,49 @@ MiLocateExportName(IN PVOID DllBase, } /* Check if we couldn't find it */ - if (High < Low) return NULL; + if (High < Low) + return -1; /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; + return OrdinalTable[Mid]; +} + +PVOID +NTAPI +MiLocateExportName(IN PVOID DllBase, + IN PCHAR ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the ordinal */ + Ordinal = NameToOrdinal(ExportName, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); + + /* Check if we couldn't find it */ + if (Ordinal == -1) return NULL; /* Resolve the address and write it */ ExportTable = (PULONG)((ULONG_PTR)DllBase + @@ -486,7 +517,6 @@ MiFindExportedRoutineByName(IN PVOID DllBase, PULONG NameTable; PUSHORT OrdinalTable; PIMAGE_EXPORT_DIRECTORY ExportDirectory; - LONG Low = 0, Mid = 0, High, Ret; USHORT Ordinal; PVOID Function; ULONG ExportSize; @@ -506,37 +536,15 @@ MiFindExportedRoutineByName(IN PVOID DllBase, OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + ExportDirectory->AddressOfNameOrdinals); - /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; - while (High >= Low) - { - /* Get new middle value */ - Mid = (Low + High) >> 1; - - /* Compare name */ - Ret = strcmp(ExportName->Buffer, (PCHAR)DllBase + NameTable[Mid]); - if (Ret < 0) - { - /* Update high */ - High = Mid - 1; - } - else if (Ret > 0) - { - /* Update low */ - Low = Mid + 1; - } - else - { - /* We got it */ - break; - } - } + /* Get the ordinal */ + Ordinal = NameToOrdinal(ExportName->Buffer, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); /* Check if we couldn't find it */ - if (High < Low) return NULL; - - /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; + if (Ordinal == -1) return NULL; /* Validate the ordinal */ if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; @@ -696,8 +704,6 @@ MiSnapThunk(IN PVOID DllBase, PUSHORT OrdinalTable; PIMAGE_IMPORT_BY_NAME NameImport; USHORT Hint; - ULONG Low = 0, Mid = 0, High; - LONG Ret; NTSTATUS Status; PCHAR MissingForwarder; CHAR NameBuffer[MAXIMUM_FILENAME_LENGTH]; @@ -751,40 +757,18 @@ MiSnapThunk(IN PVOID DllBase, else { /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; - while (High >= Low) - { - /* Get new middle value */ - Mid = (Low + High) >> 1; - - /* Compare name */ - Ret = strcmp((PCHAR)NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); - if (Ret < 0) - { - /* Update high */ - High = Mid - 1; - } - else if (Ret > 0) - { - /* Update low */ - Low = Mid + 1; - } - else - { - /* We got it */ - break; - } - } + Ordinal = NameToOrdinal((PCHAR)NameImport->Name, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); /* Check if we couldn't find it */ - if (High < Low) + if (Ordinal == -1) { DPRINT1("Warning: Driver failed to load, %s not found\n", NameImport->Name); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } - - /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; } } diff --git a/ntoskrnl/ps/psmgr.c b/ntoskrnl/ps/psmgr.c index 80d9a964b3f..ad02cdfd82a 100644 --- a/ntoskrnl/ps/psmgr.c +++ b/ntoskrnl/ps/psmgr.c @@ -62,48 +62,14 @@ BOOLEAN PspDoingGiveBacks; /* PRIVATE FUNCTIONS *********************************************************/ -CODE_SEG("INIT") USHORT NTAPI -NameToOrdinal(IN PCHAR Name, - IN PVOID DllBase, - IN ULONG NumberOfNames, - IN PULONG NameTable, - IN PUSHORT OrdinalTable) -{ - ULONG Mid; - LONG Ret; - - /* Fail if no names */ - if (!NumberOfNames) return -1; - - /* Do binary search */ - Mid = NumberOfNames >> 1; - Ret = strcmp(Name, (PCHAR)((ULONG_PTR)DllBase + NameTable[Mid])); - - /* Check if we found it */ - if (!Ret) return OrdinalTable[Mid]; - - /* We didn't. Check if we only had one name to check */ - if (NumberOfNames == 1) return -1; - - /* Check if we should look up or down */ - if (Ret < 0) - { - /* Loop down */ - NumberOfNames = Mid; - } - else - { - /* Look up, update tables */ - NameTable = &NameTable[Mid + 1]; - OrdinalTable = &OrdinalTable[Mid + 1]; - NumberOfNames -= (Mid - 1); - } - - /* Call us recursively */ - return NameToOrdinal(Name, DllBase, NumberOfNames, NameTable, OrdinalTable); -} +NameToOrdinal( + _In_ PCSTR ExportName, + _In_ PVOID ImageBase, + _In_ ULONG NumberOfNames, + _In_ PULONG NameTable, + _In_ PUSHORT OrdinalTable); CODE_SEG("INIT") NTSTATUS

1 year, 4 months

[reactos] 01/04: [NTOS:MM] Reformat MmCallDllInitialize and MiCallDllUnloadAndUnloadDll.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8b048a2828cec10445d4… commit e8b048a2828cec10445d4730297a63c45c652578 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 19 19:39:56 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:55 2023 +0200 [NTOS:MM] Reformat MmCallDllInitialize and MiCallDllUnloadAndUnloadDll. --- ntoskrnl/include/internal/mm.h | 5 ++-- ntoskrnl/mm/ARM3/sysldr.c | 60 +++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 5b82d033f37..0d97244a7c9 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1653,9 +1653,8 @@ MmCheckSystemImage( NTSTATUS NTAPI MmCallDllInitialize( - IN PLDR_DATA_TABLE_ENTRY LdrEntry, - IN PLIST_ENTRY ListHead -); + _In_ PLDR_DATA_TABLE_ENTRY LdrEntry, + _In_ PLIST_ENTRY ModuleListHead); VOID NTAPI diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 22aef1d7110..b17a53b82eb 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -292,24 +292,26 @@ MiLocateExportName(IN PVOID DllBase, NTSTATUS NTAPI -MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, - IN PLIST_ENTRY ListHead) +MmCallDllInitialize( + _In_ PLDR_DATA_TABLE_ENTRY LdrEntry, + _In_ PLIST_ENTRY ModuleListHead) { UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING( L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); PMM_DLL_INITIALIZE DllInit; UNICODE_STRING RegPath, ImportName; + PCWCH Extension; NTSTATUS Status; + PAGED_CODE(); + /* Try to see if the image exports a DllInitialize routine */ DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, "DllInitialize"); - if (!DllInit) return STATUS_SUCCESS; + if (!DllInit) + return STATUS_SUCCESS; - /* - * Do a temporary copy of BaseDllName called ImportName - * because we'll alter the length of the string. - */ + /* Make a temporary copy of BaseDllName because we will alter its length */ ImportName.Length = LdrEntry->BaseDllName.Length; ImportName.MaximumLength = LdrEntry->BaseDllName.MaximumLength; ImportName.Buffer = LdrEntry->BaseDllName.Buffer; @@ -322,7 +324,8 @@ MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, TAG_LDR_WSTR); /* Check if this allocation was unsuccessful */ - if (!RegPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + if (!RegPath.Buffer) + return STATUS_INSUFFICIENT_RESOURCES; /* Build and append the service name itself */ RegPath.Length = ServicesKeyName.Length; @@ -330,49 +333,52 @@ MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, ServicesKeyName.Buffer, ServicesKeyName.Length); - /* Check if there is a dot in the filename */ - if (wcschr(ImportName.Buffer, L'.')) - { - /* Remove the extension */ - ImportName.Length = (USHORT)(wcschr(ImportName.Buffer, L'.') - - ImportName.Buffer) * sizeof(WCHAR); - } + /* If the filename has an extension, remove it */ + Extension = wcschr(ImportName.Buffer, L'.'); + if (Extension) + ImportName.Length = (USHORT)(Extension - ImportName.Buffer) * sizeof(WCHAR); - /* Append service name (the basename without extension) */ + /* Append the service name (base name without extension) */ RtlAppendUnicodeStringToString(&RegPath, &ImportName); - /* Now call the DllInit func */ + /* Now call DllInitialize */ DPRINT("Calling DllInit(%wZ)\n", &RegPath); Status = DllInit(&RegPath); /* Clean up */ ExFreePoolWithTag(RegPath.Buffer, TAG_LDR_WSTR); - /* Return status value which DllInitialize returned */ + // TODO: This is for Driver Verifier support. + UNREFERENCED_PARAMETER(ModuleListHead); + + /* Return the DllInitialize status value */ return Status; } BOOLEAN -NTAPI -MiCallDllUnloadAndUnloadDll(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +MiCallDllUnloadAndUnloadDll( + _In_ PLDR_DATA_TABLE_ENTRY LdrEntry) { NTSTATUS Status; - PMM_DLL_UNLOAD Func; + PMM_DLL_UNLOAD DllUnload; + PAGED_CODE(); - /* Get the unload routine */ - Func = (PMM_DLL_UNLOAD)MiLocateExportName(LdrEntry->DllBase, "DllUnload"); - if (!Func) return FALSE; + /* Retrieve the DllUnload routine */ + DllUnload = (PMM_DLL_UNLOAD)MiLocateExportName(LdrEntry->DllBase, "DllUnload"); + if (!DllUnload) + return FALSE; /* Call it and check for success */ - Status = Func(); - if (!NT_SUCCESS(Status)) return FALSE; + Status = DllUnload(); + if (!NT_SUCCESS(Status)) + return FALSE; /* Lie about the load count so we can unload the image */ ASSERT(LdrEntry->LoadCount == 0); LdrEntry->LoadCount = 1; - /* Unload it and return true */ + /* Unload it */ MmUnloadSystemImage(LdrEntry); return TRUE; }

1 year, 4 months

[reactos] 01/01: [SHELL32] SHFileOperation: Confirm overwrite on moving files (#5618)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa719b9989103c238a15e… commit aa719b9989103c238a15e66f1d6b0b0e4520fdce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 29 19:29:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 29 19:29:05 2023 +0900 [SHELL32] SHFileOperation: Confirm overwrite on moving files (#5618) - Add move_file_to_file helper function. - Modify move_to_dir and move_files helper functions. CORE-18910 --- dll/win32/shell32/shlfileop.cpp | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 18956867143..f90f3265773 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -5,7 +5,7 @@ * Copyright 2002 Andriy Palamarchuk * Copyright 2004 Dietrich Teickner (from Odin) * Copyright 2004 Rolf Kalbermatter - * Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2019-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1744,15 +1744,48 @@ static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST Win32RemoveDirectoryW(feFrom->szFullPath); } +#ifdef __REACTOS__ +static BOOL move_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) +{ + if (PathFileExistsW(szTo)) + { + if (op->req->fFlags & FOF_RENAMEONCOLLISION) + { + CStringW newPath = try_find_new_name(szTo); + if (!newPath.IsEmpty()) + { + return SHNotifyMoveFileW(op, szFrom, newPath, FALSE) == 0; + } + } + else if (!(op->req->fFlags & FOF_NOCONFIRMATION)) + { + if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) + return FALSE; + } + } + + return SHNotifyMoveFileW(op, szFrom, szTo, FALSE) == 0; +} +#endif + /* moves a file or directory to another directory */ static void move_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) { WCHAR szDestPath[MAX_PATH]; +#ifdef __REACTOS__ + if (!PathFileExistsW(feTo->szFullPath)) + SHNotifyCreateDirectoryW(feTo->szFullPath, NULL); +#endif + PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); if (IsAttribFile(feFrom->attributes)) +#ifdef __REACTOS__ + move_file_to_file(op, feFrom->szFullPath, szDestPath); +#else SHNotifyMoveFileW(op, feFrom->szFullPath, szDestPath, FALSE); +#endif else if (!(op->req->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) move_dir_to_dir(op, feFrom, szDestPath); } @@ -1813,10 +1846,30 @@ static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flF } } +#ifdef __REACTOS__ + if ((flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1) || + IsAttribDir(fileDest->attributes)) + { + move_to_dir(op, entryToMove, fileDest); + } + else if (IsAttribDir(entryToMove->attributes)) + { + move_dir_to_dir(op, entryToMove, fileDest->szFullPath); + } + else + { + if (!move_file_to_file(op, entryToMove->szFullPath, fileDest->szFullPath)) + { + op->req->fAnyOperationsAborted = TRUE; + return ERROR_CANCELLED; + } + } +#else if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(op, entryToMove, fileDest); else SHNotifyMoveFileW(op, entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); +#endif if (op->progress != NULL) op->bCancelled |= op->progress->HasUserCancelled();

1 year, 4 months

[reactos] 01/01: [SHELL32] Add two missing GlobalUnlock() calls (#5625)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bea7848fa9016a5db4cb2… commit bea7848fa9016a5db4cb23f1159d769a3d3c7391 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Mon Aug 28 15:56:02 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 28 21:56:02 2023 +0200 [SHELL32] Add two missing GlobalUnlock() calls (#5625) * [SHELL32] Release DROPFILES structures * [SHELL32] Release the STGMEDIUM when returning on error --- dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp | 2 ++ dll/win32/shell32/droptargets/CexeDropHandler.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp index a29ec1e1c88..32f1f5f617a 100644 --- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp @@ -46,6 +46,7 @@ class CRecyclerDropTarget : if (!lpdf) { ERR("Error locking global\n"); + ReleaseStgMedium(&medium); return E_FAIL; } @@ -65,6 +66,7 @@ class CRecyclerDropTarget : hr = E_FAIL; } + GlobalUnlock(medium.hGlobal); ReleaseStgMedium(&medium); return hr; diff --git a/dll/win32/shell32/droptargets/CexeDropHandler.cpp b/dll/win32/shell32/droptargets/CexeDropHandler.cpp index 2b8a915ff5a..1316385211a 100644 --- a/dll/win32/shell32/droptargets/CexeDropHandler.cpp +++ b/dll/win32/shell32/droptargets/CexeDropHandler.cpp @@ -72,6 +72,7 @@ HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, if (!lpdf) { ERR("Error locking global\n"); + ReleaseStgMedium(&medium); return E_FAIL; } pszSrcList = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles); @@ -84,6 +85,9 @@ HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, pszSrcList += wcslen(pszSrcList) + 1; } + + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); } ShellExecuteW(NULL, L"open", sPathTarget, wszBuf, NULL,SW_SHOWNORMAL); @@ -138,4 +142,4 @@ HRESULT WINAPI CExeDropHandler::GetClassID(CLSID * lpClassId) *lpClassId = *pclsid; return S_OK; -} \ No newline at end of file +}

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SDK] Implement SHGetViewStatePropertyBag Part 3 (#5615)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29fbe60abe3c1487886c5… commit 29fbe60abe3c1487886c52928c58abf68c0ce899 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 28 07:16:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 28 07:16:11 2023 +0900 [SHLWAPI][SDK] Implement SHGetViewStatePropertyBag Part 3 (#5615) Follow-up to #5610. - Add _EnsureWriteBag, _PruneMRUTree, _GetMRUSize and _GetMRUSlots helper functions. - Add code into _GetMRUSlot, _FindNearestInheritBag, and Write. - Add CLSID_MruPidlList and IID_IMruPidlList definitions into <shlguid_undoc.h>. - Add IMruPidlList interface into <shlobj_undoc.h>. CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 171 +++++++++++++++++++++++++++++++----- sdk/include/reactos/shlguid_undoc.h | 2 + sdk/include/reactos/shlobj_undoc.h | 28 ++++++ 3 files changed, 178 insertions(+), 23 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index a1cbe199e6c..227a0f3c296 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -9,6 +9,8 @@ #include "precomp.h" #include <shlwapi.h> #include <shlwapi_undoc.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> #include <atlstr.h> // for CStringW #include <atlsimpcoll.h> // for CSimpleMap #include <atlcomcli.h> // for CComVariant @@ -17,6 +19,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#define MODE_CAN_READ(dwMode) \ + (((dwMode) & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_WRITE) +#define MODE_CAN_WRITE(dwMode) \ + (((dwMode) & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + class CBasePropertyBag : public IPropertyBag #if (_WIN32_WINNT < _WIN32_WINNT_VISTA) @@ -39,6 +46,9 @@ public: // IUnknown interface STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override { + if (!ppvObject) + return E_POINTER; + #if (_WIN32_WINNT < _WIN32_WINNT_VISTA) if (::IsEqualGUID(riid, IID_IPropertyBag2)) { @@ -54,8 +64,8 @@ public: return S_OK; } - ERR("%p: %s: E_NOTIMPL\n", this, debugstr_guid(&riid)); - return E_NOTIMPL; + ERR("%p: %s: E_NOINTERFACE\n", this, debugstr_guid(&riid)); + return E_NOINTERFACE; } STDMETHODIMP_(ULONG) AddRef() override { @@ -153,7 +163,7 @@ CMemPropertyBag::Read( ::VariantInit(pvari); #if (_WIN32_WINNT < _WIN32_WINNT_VISTA) - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + if (!MODE_CAN_READ(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); return E_ACCESSDENIED; @@ -198,7 +208,7 @@ CMemPropertyBag::Write( TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); #if (_WIN32_WINNT < _WIN32_WINNT_VISTA) - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + if (!MODE_CAN_WRITE(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); return E_ACCESSDENIED; @@ -288,9 +298,9 @@ public: HRESULT CRegPropertyBag::Init(HKEY hKey, LPCWSTR lpSubKey) { REGSAM nAccess = 0; - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_WRITE) + if (MODE_CAN_READ(m_dwMode)) nAccess |= KEY_READ; - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + if (MODE_CAN_WRITE(m_dwMode)) nAccess |= KEY_WRITE; LONG error; @@ -409,7 +419,7 @@ CRegPropertyBag::Read( TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + if (!MODE_CAN_READ(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); ::VariantInit(pvari); @@ -479,7 +489,7 @@ CRegPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) { TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + if (!MODE_CAN_WRITE(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); return E_ACCESSDENIED; @@ -856,7 +866,7 @@ CIniPropertyBag::Read( ::VariantInit(pvari); - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + if (!MODE_CAN_READ(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); return E_ACCESSDENIED; @@ -890,7 +900,7 @@ CIniPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) { TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); - if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + if (!MODE_CAN_WRITE(m_dwMode)) { ERR("%p: 0x%X\n", this, m_dwMode); return E_ACCESSDENIED; @@ -1017,6 +1027,7 @@ public: STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override { + ERR("%p: %s: Read-only\n", this, debugstr_w(pszPropName)); return E_NOTIMPL; } }; @@ -1224,6 +1235,16 @@ protected: HKEY _GetHKey(DWORD dwVspbFlags); + UINT _GetMRUSize(HKEY hKey); + + HRESULT _GetMRUSlots( + LPCITEMIDLIST pidl, + DWORD dwMode, + HKEY hKey, + UINT *puSlots, + UINT cSlots, + UINT *pcSlots); + HRESULT _GetMRUSlot(LPCITEMIDLIST pidl, DWORD dwMode, HKEY hKey, UINT *pSlot); HRESULT _GetRegKey( @@ -1254,12 +1275,14 @@ protected: BOOL _EnsureUserDefaultsBag(DWORD dwMode, REFIID riid); BOOL _EnsureFolderDefaultsBag(DWORD dwMode, REFIID riid); BOOL _EnsureGlobalDefaultsBag(DWORD dwMode, REFIID riid); + BOOL _EnsureWriteBag(DWORD dwMode, REFIID riid); HRESULT _ReadPidlBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); HRESULT _ReadInheritBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); HRESULT _ReadUpgradeBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); HRESULT _ReadUserDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); HRESULT _ReadFolderDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); HRESULT _ReadGlobalDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + void _PruneMRUTree(); public: CViewStatePropertyBag() : CBasePropertyBag(STGM_READ) { } @@ -1278,11 +1301,7 @@ public: _Inout_ VARIANT *pvari, _Inout_opt_ IErrorLog *pErrorLog) override; - STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override - { - ERR("%p: %s: Read-only\n", this, debugstr_w(pszPropName)); - return E_NOTIMPL; - } + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; }; // CViewStatePropertyBag is cached @@ -1413,11 +1432,50 @@ HKEY CViewStatePropertyBag::_GetHKey(DWORD dwVspbFlags) return SHGetShellKey(SHKEY_Key_ShellNoRoam | SHKEY_Root_HKCU, NULL, TRUE); } +UINT CViewStatePropertyBag::_GetMRUSize(HKEY hKey) +{ + DWORD dwValue, cbValue = sizeof(dwValue); + + if (SHGetValueW(hKey, NULL, L"BagMRU Size", NULL, &dwValue, &cbValue) != ERROR_SUCCESS) + return 400; // The default size of the MRU (most recently used) list + + return (UINT)dwValue; +} + +HRESULT +CViewStatePropertyBag::_GetMRUSlots( + LPCITEMIDLIST pidl, + DWORD dwMode, + HKEY hKey, + UINT *puSlots, + UINT cSlots, + UINT *pcSlots) +{ + CComPtr<IMruPidlList> pMruList; + HRESULT hr = ::CoCreateInstance(CLSID_MruPidlList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruPidlList, (void**)&pMruList); + if (FAILED(hr)) + return hr; + + UINT cMRUSize = _GetMRUSize(hKey); + hr = pMruList->InitList(cMRUSize, hKey, L"BagMRU"); + if (FAILED(hr)) + return hr; + + hr = pMruList->QueryPidl(pidl, cSlots, puSlots, pcSlots); + if (hr == S_OK && MODE_CAN_WRITE(dwMode)) + hr = pMruList->UsePidl(pidl, puSlots); + else if (cSlots == 1) + hr = E_FAIL; + + return hr; +} + HRESULT CViewStatePropertyBag::_GetMRUSlot(LPCITEMIDLIST pidl, DWORD dwMode, HKEY hKey, UINT *pSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + UINT cSlots; + return _GetMRUSlots(pidl, dwMode, hKey, pSlot, 1, &cSlots); } HRESULT @@ -1439,14 +1497,14 @@ CViewStatePropertyBag::_GetRegKey( if (SUCCEEDED(hr)) { if (dwFlags & SHGVSPB_INHERIT) - wnsprintfW(pszDest, cchDest, L"Bags\\%d\\%s\\Inherit", nSlot, pszBagName); + StringCchPrintfW(pszDest, cchDest, L"Bags\\%d\\%s\\Inherit", nSlot, pszBagName); else - wnsprintfW(pszDest, cchDest, L"Bags\\%d\\%s", nSlot, pszBagName); + StringCchPrintfW(pszDest, cchDest, L"Bags\\%d\\%s", nSlot, pszBagName); } } else { - wnsprintfW(pszDest, cchDest, L"Bags\\AllFolders\\%s", pszBagName); + StringCchPrintfW(pszDest, cchDest, L"Bags\\AllFolders\\%s", pszBagName); } return hr; @@ -1487,7 +1545,7 @@ CViewStatePropertyBag::_CreateBag( CComPtr<IShellFolder> psf; WCHAR szBuff[64]; - if ((dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + if (MODE_CAN_WRITE(dwMode)) dwMode |= STGM_CREATE; if ((dwVspbFlags & SHGVSPB_ALLUSERS) && (dwVspbFlags & SHGVSPB_PERFOLDER)) @@ -1523,8 +1581,32 @@ CViewStatePropertyBag::_CreateBag( HRESULT CViewStatePropertyBag::_FindNearestInheritBag(REFIID riid, IPropertyBag **pppb) { - FIXME("Stub\n"); - return E_NOTIMPL; + *pppb = NULL; + + HKEY hKey = _GetHKey(SHGVSPB_INHERIT); + if (!hKey) + return E_FAIL; + + UINT cSlots, anSlots[64]; + if (FAILED(_GetMRUSlots(m_pidl, 0, hKey, anSlots, _countof(anSlots), &cSlots)) || !cSlots) + { + ::RegCloseKey(hKey); + return E_FAIL; + } + + HRESULT hr = E_FAIL; + WCHAR szBuff[64]; + for (UINT iSlot = 0; iSlot < cSlots; ++iSlot) + { + StringCchPrintfW(szBuff, _countof(szBuff), L"Bags\\%d\\%s\\Inherit", anSlots[iSlot], + m_pszPath); + hr = SHCreatePropertyBagOnRegKey(hKey, szBuff, STGM_READ, riid, (void**)pppb); + if (SUCCEEDED(hr)) + break; + } + + ::RegCloseKey(hKey); + return hr; } BOOL CViewStatePropertyBag::_EnsureReadBag(DWORD dwMode, REFIID riid) @@ -1710,6 +1792,49 @@ CViewStatePropertyBag::Read( return _ReadGlobalDefaultsBag(pszPropName, pvari, pErrorLog); } +void CViewStatePropertyBag::_PruneMRUTree() +{ + HKEY hKey = _GetHKey(SHGVSPB_INHERIT); + if (!hKey) + return; + + CComPtr<IMruPidlList> pMruList; + HRESULT hr = ::CoCreateInstance(CLSID_MruPidlList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruPidlList, (void**)&pMruList); + if (SUCCEEDED(hr)) + { + hr = pMruList->InitList(200, hKey, L"BagMRU"); + if (SUCCEEDED(hr)) + pMruList->PruneKids(m_pidl); + } + + ::RegCloseKey(hKey); +} + +BOOL CViewStatePropertyBag::_EnsureWriteBag(DWORD dwMode, REFIID riid) +{ + if (!m_pWriteBag && !m_bWriteBag) + { + m_bWriteBag = TRUE; + _CreateBag(m_pidl, m_pszPath, m_dwVspbFlags, dwMode, riid, &m_pWriteBag); + if (m_pWriteBag) + { + _ResetTryAgainFlag(); + if (m_dwVspbFlags & SHGVSPB_INHERIT) + _PruneMRUTree(); + } + } + return (m_pWriteBag != NULL); +} + +STDMETHODIMP CViewStatePropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) +{ + if (!_EnsureWriteBag(STGM_WRITE, IID_IPropertyBag)) + return E_FAIL; + + return m_pWriteBag->Write(pszPropName, pvari); +} + static BOOL SHIsRemovableDrive(LPCITEMIDLIST pidl) { STRRET strret; diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index 4cb0ac39859..e233df556bd 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -142,6 +142,8 @@ DEFINE_GUID(CLSID_SharedTaskScheduler, 0x603D3801, 0xBD81, 0x11d0, 0xA3, 0xA DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_MruPidlList, 0x42AEDC87, 0x2188, 0x41FD, 0xB9, 0xA3, 0x0C, 0x96, 0x6F, 0xEA, 0xBE, 0xC1); +DEFINE_GUID(IID_IMruPidlList, 0x47851649, 0xA2EF, 0x4E67, 0xBA, 0xEC, 0xC6, 0xA1, 0x53, 0xAC, 0x72, 0xEC); /* The following list of interfaces was taken from here: http://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/index… */ DEFINE_GUID(IID_IAggregateFilterCondition, 0x86228AA3, 0xA736, 0x4733, 0xBD, 0x8A, 0x10, 0xA8, 0x3C, 0x69, 0xBF, 0x84); diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index a4cf836d7a2..3ed3b8a8962 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -678,6 +678,34 @@ DECLARE_INTERFACE_(IShellBrowserService, IUnknown) #define IShellBrowserService_GetPropertyBag(T,a,b,c) (T)->lpVtbl->GetPropertyBag(T,a,b,c) #endif +/***************************************************************************** + * IMruPidlList interface + */ +#define INTERFACE IMruPidlList +DECLARE_INTERFACE_(IMruPidlList, IUnknown) +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IMruPidlList ***/ + STDMETHOD(InitList)(THIS_ UINT, HKEY, LPCWSTR) PURE; + STDMETHOD(UsePidl)(THIS_ LPCITEMIDLIST, UINT*) PURE; + STDMETHOD(QueryPidl)(THIS_ LPCITEMIDLIST, UINT, UINT*, UINT*) PURE; + STDMETHOD(PruneKids)(THIS_ LPCITEMIDLIST) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IMruPidlList_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IMruPidlList_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IMruPidlList_Release(T) (T)->lpVtbl->Release(T) +#define IMruPidlList_InitList(T,a,b,c) (T)->lpVtbl->InitList(T,a,b,c) +#define IMruPidlList_UsePidl(T,a,b) (T)->lpVtbl->UsePidl(T,a,b) +#define IMruPidlList_QueryPidl(T,a,b,c,d) (T)->lpVtbl->QueryPidl(T,a,b,c,d) +#define IMruPidlList_PruneKids(T,a) (T)->lpVtbl->PruneKids(T,a) +#endif + /***************************************************************************** * ITrayPriv interface */

1 year, 4 months

[reactos] 01/01: [BROWSEUI] Support mouse back and forward buttons (#5623)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff63d064066778861eb63… commit ff63d064066778861eb630d553660737dca5a33e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 28 00:12:47 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 28 00:12:47 2023 +0900 [BROWSEUI] Support mouse back and forward buttons (#5623) Add WM_APPCOMMAND handling to the shell browser. CORE-16776 --- dll/win32/browseui/shellbrowser.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 0f1e3814ebe..f6cb992dbb6 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -626,6 +626,7 @@ public: LRESULT RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnAppCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); HRESULT OnSearch(); static ATL::CWndClassInfo& GetWndClassInfo() @@ -678,6 +679,7 @@ public: MESSAGE_HANDLER(WM_COMMAND, RelayCommands) MESSAGE_HANDLER(BWM_SETTINGCHANGE, OnSettingsChange) MESSAGE_HANDLER(BWM_GETSETTINGSPTR, OnGetSettingsPtr) + MESSAGE_HANDLER(WM_APPCOMMAND, OnAppCommand) END_MSG_MAP() BEGIN_CONNECTION_POINT_MAP(CShellBrowser) @@ -3812,6 +3814,27 @@ LRESULT CShellBrowser::OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, return NO_ERROR; } +// WM_APPCOMMAND +LRESULT CShellBrowser::OnAppCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + UINT uCmd = GET_APPCOMMAND_LPARAM(lParam); + switch (uCmd) + { + case APPCOMMAND_BROWSER_BACKWARD: + GoBack(); + break; + + case APPCOMMAND_BROWSER_FORWARD: + GoForward(); + break; + + default: + FIXME("uCmd: %u\n", uCmd); + break; + } + return 0; +} + HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CShellBrowser>(riid, ppv);

1 year, 4 months

[reactos] 01/01: [SNDREC32] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8a4eb3cc9f8262a81928… commit d8a4eb3cc9f8262a81928e9340e64290ce0eaf21 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 27 21:44:44 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 27 21:45:03 2023 +0900 [SNDREC32] Improve Japanese (ja-JP) translation CORE-18706 --- base/applications/sndrec32/lang/ja-JP.rc | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/base/applications/sndrec32/lang/ja-JP.rc b/base/applications/sndrec32/lang/ja-JP.rc index e39f23cb66f..4ec3162cc1e 100644 --- a/base/applications/sndrec32/lang/ja-JP.rc +++ b/base/applications/sndrec32/lang/ja-JP.rc @@ -8,45 +8,45 @@ END IDR_MENU1 MENU BEGIN - POPUP "ファイル" + POPUP "ファイル(&F)" BEGIN - MENUITEM "新規作成", ID_FILE_NEW - MENUITEM "開く...", ID_FILE_OPEN - MENUITEM "上書き保存", ID_FILE_SAVE, GRAYED - MENUITEM "名前をつけて保存...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "新規作成(&N)", ID_FILE_NEW + MENUITEM "開く(&O)...", ID_FILE_OPEN + MENUITEM "上書き保存(&S)", ID_FILE_SAVE, GRAYED + MENUITEM "名前をつけて保存(&A)...", ID_FILE_SAVEAS, GRAYED + MENUITEM "最初の状態に戻す(&R)...", ID_FILE_RESTORE, GRAYED + MENUITEM "プロパティ(&P)", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "終了", ID_FILE_EXIT + MENUITEM "終了(&X)", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "編集(&E)" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "コピー(&C)", ID_EDIT_COPY + MENUITEM "挿入貼り付け(&P)", ID_EDIT_PASTE, GRAYED + MENUITEM "ミックス貼り付け(&X)", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "ファイルを挿入(&I)...", ID_EDIT_INSERTFILE + MENUITEM "指定ファイルをミックス(&M)...", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "現在位置までを削除(&B)", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "現在位置以降を削除(&A)", ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "音声プロパティ(&U)", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "効果(&S)" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "音量を上げる(&I) (25%)", ID_EFFECTS_INCVOL + MENUITEM "音量を下げる(&D)", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "再生速度を上げる(&I) (100%)", ID_EFFECTS_INCSPD + MENUITEM "再生速度を下げる(&D)", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "エコーをかける(&A)", ID_EFFECTS_ECHO + MENUITEM "リバース(&R)", ID_EFFECTS_REVERSE END - POPUP "?" + POPUP "ヘルプ(&H)" BEGIN - MENUITEM "バージョン情報", ID_ABOUT + MENUITEM "バージョン情報(&A)", ID_ABOUT END END

1 year, 4 months

[reactos] 01/01: [CALC] Use CW_USEDEFAULT16 for Dialog X (#5621)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc9baff5d74aa57aa9249… commit fc9baff5d74aa57aa9249bbb38cc51f85bd3b84b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 27 19:46:56 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 27 19:46:56 2023 +0900 [CALC] Use CW_USEDEFAULT16 for Dialog X (#5621) - Use CW_USEDEFAULT16 (0x8000) for the X coordinate of IDD_DIALOG_SCIENTIFIC, IDD_DIALOG_STANDARD, and IDD_DIALOG_CONVERSION dialogs. https://stackoverflow.com/a/76201122/4381493 BEFORE: https://github.com/reactos/reactos/assets/2107452/e16ce819-05a9-483a-aacb-b… The starting position wouldn't change from upper left corner (0, 0) of the screen. AFTER: https://github.com/reactos/reactos/assets/2107452/569ae41b-b545-4eb0-8848-d… The starting position is changing. CORE-19141 --- base/applications/calc/lang/bg-BG.rc | 6 +++--- base/applications/calc/lang/cs-CZ.rc | 6 +++--- base/applications/calc/lang/de-DE.rc | 6 +++--- base/applications/calc/lang/el-GR.rc | 6 +++--- base/applications/calc/lang/en-US.rc | 6 +++--- base/applications/calc/lang/es-ES.rc | 6 +++--- base/applications/calc/lang/fr-FR.rc | 6 +++--- base/applications/calc/lang/he-IL.rc | 6 +++--- base/applications/calc/lang/hu-HU.rc | 6 +++--- base/applications/calc/lang/id-ID.rc | 6 +++--- base/applications/calc/lang/it-IT.rc | 6 +++--- base/applications/calc/lang/ja-JP.rc | 6 +++--- base/applications/calc/lang/ko-KR.rc | 6 +++--- base/applications/calc/lang/nl-NL.rc | 6 +++--- base/applications/calc/lang/no-NO.rc | 6 +++--- base/applications/calc/lang/pl-PL.rc | 6 +++--- base/applications/calc/lang/pt-BR.rc | 6 +++--- base/applications/calc/lang/pt-PT.rc | 6 +++--- base/applications/calc/lang/ro-RO.rc | 6 +++--- base/applications/calc/lang/ru-RU.rc | 6 +++--- base/applications/calc/lang/sk-SK.rc | 6 +++--- base/applications/calc/lang/sq-AL.rc | 6 +++--- base/applications/calc/lang/sv-SE.rc | 6 +++--- base/applications/calc/lang/th-TH.rc | 6 +++--- base/applications/calc/lang/tr-TR.rc | 6 +++--- base/applications/calc/lang/uk-UA.rc | 6 +++--- base/applications/calc/lang/zh-CN.rc | 6 +++--- base/applications/calc/lang/zh-HK.rc | 6 +++--- base/applications/calc/lang/zh-TW.rc | 6 +++--- base/applications/calc/resource.h | 2 ++ 30 files changed, 89 insertions(+), 87 deletions(-) diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index a637bd61f60..2a2b8d497e5 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калкулатор за ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -156,7 +156,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калкулатор за ReactOS" MENU IDR_MENU_STANDARD @@ -221,7 +221,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калкулатор за ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index 9b95130c2a9..ce7c139577c 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS kalkulačka" MENU IDR_MENU_SCIENTIFIC_1 @@ -155,7 +155,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulačka" MENU IDR_MENU_STANDARD @@ -220,7 +220,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulačka" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index a8abec1fcfc..adb698d612c 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index 7049495cf11..749f8eeef33 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Αριθμομηχανή" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Αριθμομηχανή" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Αριθμομηχανή" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index a4ba8c9aa5a..52828ab62ce 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index e53328d2bca..d20dcc547c5 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora de ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -156,7 +156,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora de ReactOS" MENU IDR_MENU_STANDARD @@ -221,7 +221,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora de ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index 0e816ac319b..b8288bf8883 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index 0e6d790a9b4..89273bb4d2a 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "מחשבון ReactOS" @@ -153,7 +153,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "מחשבון ReactOS" @@ -219,7 +219,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "מחשבון ReactOS" diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index be8e0706d7c..6242d48b2dc 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Számológép" MENU IDR_MENU_SCIENTIFIC_1 @@ -158,7 +158,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Számológép" MENU IDR_MENU_STANDARD @@ -223,7 +223,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Számológép" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/id-ID.rc b/base/applications/calc/lang/id-ID.rc index a707f16c6a3..be621d57c6d 100644 --- a/base/applications/calc/lang/id-ID.rc +++ b/base/applications/calc/lang/id-ID.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -157,7 +157,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_STANDARD @@ -222,7 +222,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 756b678a820..085bda75aa5 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index 10d367d25a6..6519bf5b5d5 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 電卓" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 電卓" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 電卓" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 76fb37a132c..87fbf0ed5cc 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기" MENU IDR_MENU_SCIENTIFIC_1 @@ -152,7 +152,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기" MENU IDR_MENU_STANDARD @@ -217,7 +217,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기 정보" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 07e504780fe..7b239b8aa12 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rekenmachine" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rekenmachine" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rekenmachine" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index 94e0be39541..a70a5ff53c4 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulator" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulator" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulator" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index 348f70efabb..93452712f7d 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -159,7 +159,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_STANDARD @@ -224,7 +224,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulator ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index c6c3e4df199..40697475081 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -152,7 +152,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD @@ -217,7 +217,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/pt-PT.rc b/base/applications/calc/lang/pt-PT.rc index eb814ff3a41..86a6bade983 100644 --- a/base/applications/calc/lang/pt-PT.rc +++ b/base/applications/calc/lang/pt-PT.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -152,7 +152,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD @@ -217,7 +217,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index d3d209a778d..a9f33b72dae 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Minicalculator" MENU IDR_MENU_SCIENTIFIC_1 @@ -159,7 +159,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Minicalculator" MENU IDR_MENU_STANDARD @@ -224,7 +224,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Minicalculator" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index bd6c06b83b0..8837c61fb0a 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 8e323e49262..6aa757bf4d9 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulačka systému ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -157,7 +157,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulačka systému ReactOS" MENU IDR_MENU_STANDARD @@ -222,7 +222,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulačka systému ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index a508299a571..c3b29193d85 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Makine Llogaritje" MENU IDR_MENU_SCIENTIFIC_1 @@ -154,7 +154,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Makine Llogaritje" MENU IDR_MENU_STANDARD @@ -219,7 +219,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Makine Llogaritje" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index 3a4de3cd8b6..7e5459dcad4 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkylator" MENU IDR_MENU_SCIENTIFIC_1 @@ -157,7 +157,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkylator" MENU IDR_MENU_STANDARD @@ -222,7 +222,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkylator" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index ff97aabb99d..4333fd4a40b 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "เครื่องคิดเลข ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -150,7 +150,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "สถานภาพทั่วไป" MENU IDR_MENU_STANDARD @@ -215,7 +215,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "เครื่องคิดเลข ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index c06a02b626c..c3247e22383 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Hesap Makinesi" MENU IDR_MENU_SCIENTIFIC_1 @@ -155,7 +155,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Hesap Makinesi" MENU IDR_MENU_STANDARD @@ -220,7 +220,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Hesap Makinesi" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index bf5447b7551..795fa2df98b 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_SCIENTIFIC_1 @@ -158,7 +158,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_STANDARD @@ -223,7 +223,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Калькулятор ReactOS" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index 2d330366c1f..c6928aa8fa5 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 计算器" MENU IDR_MENU_SCIENTIFIC_1 @@ -158,7 +158,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 计算器" MENU IDR_MENU_STANDARD @@ -223,7 +223,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 计算器" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/zh-HK.rc b/base/applications/calc/lang/zh-HK.rc index 5cfa7083800..08f41c67de0 100644 --- a/base/applications/calc/lang/zh-HK.rc +++ b/base/applications/calc/lang/zh-HK.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計數機" MENU IDR_MENU_SCIENTIFIC_1 @@ -158,7 +158,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計數機" MENU IDR_MENU_STANDARD @@ -223,7 +223,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計數機" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/lang/zh-TW.rc b/base/applications/calc/lang/zh-TW.rc index fe5f483bb82..037ef0319f9 100644 --- a/base/applications/calc/lang/zh-TW.rc +++ b/base/applications/calc/lang/zh-TW.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* Dialogs */ -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計算機" MENU IDR_MENU_SCIENTIFIC_1 @@ -152,7 +152,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計算機" MENU IDR_MENU_STANDARD @@ -217,7 +217,7 @@ BEGIN DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 計算機" MENU IDR_MENU_STANDARD diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index 7fb2c41aac6..3840d649967 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -4,6 +4,8 @@ #define IDC_STATIC -1 #endif +#define CW_USEDEFAULT16 0x8000 + #define IDS_CALC_NAME 1 #define IDS_MATH_ERROR 2 #define IDS_QUICKHELP 3

1 year, 4 months

[reactos] 01/01: [CLIPBRD] Support CF_HDROP format (#5622)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f90a1956a53017de1fb9e… commit f90a1956a53017de1fb9e4ea72ddda9c708db8a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 27 19:41:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 27 19:41:13 2023 +0900 [CLIPBRD] Support CF_HDROP format (#5622) This allows to see what files are being copied into clipboard. CORE-19140 --- base/applications/clipbrd/clipbrd.c | 7 +++++++ base/applications/clipbrd/cliputils.c | 3 ++- base/applications/clipbrd/winutils.c | 39 +++++++++++++++++++++++++++++++++++ base/applications/clipbrd/winutils.h | 1 + 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index 6aaeaca88ea..e26f9eb2298 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -358,6 +358,13 @@ static void OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam) break; } + case CF_HDROP: + { + GetClientRect(hWnd, &rc); + HDropFromClipboard(hdc, &rc); + break; + } + default: { GetClientRect(hWnd, &rc); diff --git a/base/applications/clipbrd/cliputils.c b/base/applications/clipbrd/cliputils.c index daee8439a8f..0d5e06060f3 100644 --- a/base/applications/clipbrd/cliputils.c +++ b/base/applications/clipbrd/cliputils.c @@ -164,7 +164,8 @@ UINT GetAutomaticClipboardFormat(void) CF_DSPBITMAP, CF_DSPMETAFILEPICT, CF_DSPENHMETAFILE, - CF_PALETTE + CF_PALETTE, + CF_HDROP }; return GetPriorityClipboardFormat(uFormatList, ARRAYSIZE(uFormatList)); diff --git a/base/applications/clipbrd/winutils.c b/base/applications/clipbrd/winutils.c index eb1cf03c2dc..d97b4fb710e 100644 --- a/base/applications/clipbrd/winutils.c +++ b/base/applications/clipbrd/winutils.c @@ -331,6 +331,45 @@ void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) PlayEnhMetaFile(hdc, hEmf, lpRect); } +static LPWSTR AllocStrCat(LPWSTR psz, LPCWSTR cat) +{ + INT cch; + LPWSTR pszNew; + + if (psz == NULL) + return _wcsdup(cat); + + cch = lstrlenW(psz) + lstrlenW(cat) + 1; + pszNew = realloc(psz, cch * sizeof(WCHAR)); + if (!pszNew) + return psz; + + lstrcatW(pszNew, cat); + return pszNew; +} + +void HDropFromClipboard(HDC hdc, const RECT *lpRect) +{ + LPWSTR pszAlloc = NULL; + WCHAR szFile[MAX_PATH + 2]; + HDROP hDrop = (HDROP)GetClipboardData(CF_HDROP); + UINT iFile, cFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); + RECT rc = *lpRect; + + FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1)); + + for (iFile = 0; iFile < cFiles; ++iFile) + { + DragQueryFileW(hDrop, iFile, szFile, _countof(szFile)); + lstrcatW(szFile, L"\r\n"); + pszAlloc = AllocStrCat(pszAlloc, szFile); + } + + DrawTextW(hdc, pszAlloc, -1, &rc, + DT_LEFT | DT_NOPREFIX | DT_EXTERNALLEADING | DT_WORD_ELLIPSIS); + free(pszAlloc); +} + BOOL RealizeClipboardPalette(HDC hdc) { BOOL Success; diff --git a/base/applications/clipbrd/winutils.h b/base/applications/clipbrd/winutils.h index e29ec927bc3..fe80eb148e8 100644 --- a/base/applications/clipbrd/winutils.h +++ b/base/applications/clipbrd/winutils.h @@ -17,4 +17,5 @@ void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop); void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse); void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); +void HDropFromClipboard(HDC hdc, const RECT *lpRect); BOOL RealizeClipboardPalette(HDC hdc);

1 year, 4 months

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