Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Minimal SHRunControlPanel implementation (#3095)
by Kyle Katarn 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da36f799c728bc5477e85… commit da36f799c728bc5477e85da590c31e6c20d553c4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 19 16:23:44 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 16:23:44 2020 +0200 [SHELL32] Minimal SHRunControlPanel implementation (#3095) CORE-9215 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/wine/shellord.c | 21 ++++++++++++++++++++- sdk/include/psdk/shlobj.h | 10 ++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index ab0969a157b..37ff171d4b6 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -1472,10 +1472,29 @@ HRESULT WINAPI SHWinHelp(HWND hwnd, LPCWSTR pszHelp, UINT uCommand, ULONG_PTR dw * SHRunControlPanel [SHELL32.161] * */ -BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) +BOOL WINAPI SHRunControlPanel (_In_ LPCWSTR commandLine, _In_opt_ HWND parent) { +#ifdef __REACTOS__ + /* + * TODO: Run in-process when possible, using + * HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\InProcCPLs + * and possibly some extra rules. + * See also https://docs.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shrunco… + * "If the specified Control Panel item is already running, SHRunControlPanel + * attempts to switch to that instance rather than opening a new instance." + * This function is not supported as of Windows Vista, where it always returns FALSE. + * However we need to keep it "alive" even when ReactOS is compliled as NT6+ + * in order to keep control panel elements launch commands. + */ + TRACE("(%s, %p)n", debugstr_w(commandLine), parent); + WCHAR parameters[MAX_PATH] = L"shell32.dll,Control_RunDLL "; + wcscat(parameters, commandLine); + + return ((INT_PTR)ShellExecuteW(parent, L"open", L"rundll32.exe", parameters, NULL, SW_SHOWNORMAL) > 32); +#else FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); return FALSE; +#endif } static LPUNKNOWN SHELL32_IExplorerInterface=0; diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index b478ca228f7..422714c7b9d 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2466,6 +2466,16 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( _In_reads_opt_(cidl) PCUIDLIST_RELATIVE_ARRAY apidl, _Outptr_ IDataObject **ppdtobj); +/**************************************************************************** + * SHRunControlPanel + */ + +BOOL +WINAPI +SHRunControlPanel( + _In_ LPCWSTR commandLine, + _In_opt_ HWND parent); + /**************************************************************************** * SHOpenWithDialog */

1 0

[reactos] 01/01: [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207)
by Katayama Hirofumi MZ 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab115e30fe282624db703… commit ab115e30fe282624db703ad16111eaf4a59841c0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 22:47:40 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 22:47:40 2020 +0900 [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207) - Add immtable.h header into win32ss/user/user32/misc/. - Modify imm32.spec file. CORE-11700 --- dll/win32/imm32/imm32.spec | 120 ++++++++++++++++++------------------ win32ss/user/user32/misc/immtable.h | 52 ++++++++++++++++ 2 files changed, 112 insertions(+), 60 deletions(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index ca0ddb36904..b9c0fe55516 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,4 +1,4 @@ -@ stub ImmActivateLayout +@ stdcall -stub ImmActivateLayout(long) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @ stdcall ImmConfigureIMEA(ptr ptr long ptr) @@ -16,100 +16,100 @@ @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) -@ stdcall ImmEscapeA(long long long ptr) -@ stdcall ImmEscapeW(long long long ptr) -@ stub ImmFreeLayout +@ stdcall ImmEscapeA(long ptr long ptr) +@ stdcall ImmEscapeW(long ptr long ptr) +@ stdcall -stub ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr) @ stdcall ImmGetCandidateListW(long long ptr long) @ stdcall ImmGetCandidateWindow(long long ptr) -@ stdcall ImmGetCompositionFontA(long ptr) -@ stdcall ImmGetCompositionFontW(long ptr) -@ stdcall ImmGetCompositionString (long long ptr long) ImmGetCompositionStringA -@ stdcall ImmGetCompositionStringA (long long ptr long) -@ stdcall ImmGetCompositionStringW (long long ptr long) -@ stdcall ImmGetCompositionWindow(long ptr) -@ stdcall ImmGetContext(long) -@ stdcall ImmGetConversionListA(long long str ptr long long) -@ stdcall ImmGetConversionListW(long long wstr ptr long long) -@ stdcall ImmGetConversionStatus(long ptr ptr) -@ stdcall ImmGetDefaultIMEWnd(long) +@ stdcall ImmGetCompositionFontA(ptr ptr) +@ stdcall ImmGetCompositionFontW(ptr ptr) +@ stdcall ImmGetCompositionString(ptr long ptr long) ImmGetCompositionStringA +@ stdcall ImmGetCompositionStringA(ptr long ptr long) +@ stdcall ImmGetCompositionStringW(ptr long ptr long) +@ stdcall ImmGetCompositionWindow(ptr ptr) +@ stdcall ImmGetContext(ptr) +@ stdcall ImmGetConversionListA(long ptr str ptr long long) +@ stdcall ImmGetConversionListW(long ptr wstr ptr long long) +@ stdcall ImmGetConversionStatus(ptr ptr ptr) +@ stdcall ImmGetDefaultIMEWnd(ptr) @ stdcall ImmGetDescriptionA(long ptr long) @ stdcall ImmGetDescriptionW(long ptr long) -@ stdcall ImmGetGuideLineA(long long ptr long) -@ stdcall ImmGetGuideLineW(long long ptr long) +@ stdcall ImmGetGuideLineA(ptr long ptr long) +@ stdcall ImmGetGuideLineW(ptr long ptr long) @ stdcall ImmGetHotKey(long ptr ptr ptr) -@ stdcall ImmGetIMCCLockCount(long) -@ stdcall ImmGetIMCCSize(long) -@ stdcall ImmGetIMCLockCount(long) +@ stdcall ImmGetIMCCLockCount(ptr) +@ stdcall ImmGetIMCCSize(ptr) +@ stdcall ImmGetIMCLockCount(ptr) @ stdcall ImmGetIMEFileNameA(long ptr long) @ stdcall ImmGetIMEFileNameW(long ptr long) @ stdcall ImmGetImeInfoEx(ptr long ptr) -@ stdcall ImmGetImeMenuItemsA(long long long ptr ptr long) -@ stdcall ImmGetImeMenuItemsW(long long long ptr ptr long) -@ stdcall ImmGetOpenStatus(long) +@ stdcall ImmGetImeMenuItemsA(ptr long long ptr ptr long) +@ stdcall ImmGetImeMenuItemsW(ptr long long ptr ptr long) +@ stdcall ImmGetOpenStatus(ptr) @ stdcall ImmGetProperty(long long) @ stdcall ImmGetRegisterWordStyleA(long long ptr) @ stdcall ImmGetRegisterWordStyleW(long long ptr) -@ stdcall ImmGetStatusWindowPos(long ptr) -@ stdcall ImmGetVirtualKey(long) -@ stub ImmIMPGetIMEA -@ stub ImmIMPGetIMEW -@ stub ImmIMPQueryIMEA -@ stub ImmIMPQueryIMEW -@ stub ImmIMPSetIMEA -@ stub ImmIMPSetIMEW +@ stdcall ImmGetStatusWindowPos(ptr ptr) +@ stdcall ImmGetVirtualKey(ptr) +@ stdcall -stub ImmIMPGetIMEA(ptr ptr) +@ stdcall -stub ImmIMPGetIMEW(ptr ptr) +@ stdcall -stub ImmIMPQueryIMEA(ptr) +@ stdcall -stub ImmIMPQueryIMEW(ptr) +@ stdcall -stub ImmIMPSetIMEA(ptr ptr) +@ stdcall -stub ImmIMPSetIMEW(ptr ptr) @ stdcall ImmInstallIMEA(str str) @ stdcall ImmInstallIMEW(wstr wstr) @ stdcall ImmIsIME(long) @ stdcall ImmIsUIMessageA(long long long long) @ stdcall ImmIsUIMessageW(long long long long) -@ stub ImmLoadIME -@ stub ImmLoadLayout +@ stdcall -stub ImmLoadIME(long) +@ stdcall -stub ImmLoadLayout(long ptr) @ stub ImmLockClientImc -@ stdcall ImmLockIMC(long) -@ stdcall ImmLockIMCC(long) -@ stub ImmLockImeDpi -@ stdcall ImmNotifyIME(long long long long) +@ stdcall ImmLockIMC(ptr) +@ stdcall ImmLockIMCC(ptr) +@ stdcall -stub ImmLockImeDpi(long) +@ stdcall ImmNotifyIME(ptr long long long) @ stub ImmPenAuxInput -@ stdcall ImmProcessKey(long long long long long) -@ stub ImmPutImeMenuItemsIntoMappedFile -@ stdcall ImmReSizeIMCC(long long) +@ stdcall ImmProcessKey(ptr long long long long) +@ stdcall -stub ImmPutImeMenuItemsIntoMappedFile(ptr) +@ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) -@ stdcall ImmReleaseContext(long long) +@ stdcall ImmReleaseContext(ptr ptr) @ stdcall ImmRequestMessageA(ptr long long) @ stdcall ImmRequestMessageW(ptr long long) -@ stub ImmSendIMEMessageExA -@ stub ImmSendIMEMessageExW +@ stdcall -stub ImmSendIMEMessageExA(ptr long) +@ stdcall -stub ImmSendIMEMessageExW(ptr long) @ stub ImmSendMessageToActiveDefImeWndW @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) -@ stdcall ImmSetCandidateWindow(long ptr) -@ stdcall ImmSetCompositionFontA(long ptr) -@ stdcall ImmSetCompositionFontW(long ptr) -@ stdcall ImmSetCompositionStringA(long long ptr long ptr long) -@ stdcall ImmSetCompositionStringW(long long ptr long ptr long) -@ stdcall ImmSetCompositionWindow(long ptr) -@ stdcall ImmSetConversionStatus(long long long) +@ stdcall ImmSetCandidateWindow(ptr ptr) +@ stdcall ImmSetCompositionFontA(ptr ptr) +@ stdcall ImmSetCompositionFontW(ptr ptr) +@ stdcall ImmSetCompositionStringA(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionStringW(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionWindow(ptr ptr) +@ stdcall ImmSetConversionStatus(ptr long long) #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey -@ stdcall ImmSetOpenStatus(long long) -@ stdcall ImmSetStatusWindowPos(long ptr) +@ stdcall ImmSetOpenStatus(ptr long) +@ stdcall ImmSetStatusWindowPos(ptr ptr) @ stdcall ImmShowSoftKeyboard(ptr long) -@ stdcall ImmSimulateHotKey(long long) -@ stub ImmSystemHandler -@ stdcall ImmTranslateMessage(long long long long) +@ stdcall ImmSimulateHotKey(ptr long) +@ stdcall -stub ImmSystemHandler(ptr long long) +@ stdcall ImmTranslateMessage(ptr long long long) @ stub ImmUnlockClientImc -@ stdcall ImmUnlockIMC(long) -@ stdcall ImmUnlockIMCC(long) -@ stub ImmUnlockImeDpi +@ stdcall ImmUnlockIMC(ptr) +@ stdcall ImmUnlockIMCC(ptr) +@ stdcall -stub ImmUnlockImeDpi(ptr) @ stdcall ImmUnregisterWordA(long str long str) @ stdcall ImmUnregisterWordW(long wstr long wstr) -@ stub ImmWINNLSEnableIME -@ stub ImmWINNLSGetEnableStatus +@ stdcall -stub ImmWINNLSEnableIME(ptr long) +@ stdcall -stub ImmWINNLSGetEnableStatus(ptr) @ stub ImmWINNLSGetIMEHotkey ################################################################ diff --git a/win32ss/user/user32/misc/immtable.h b/win32ss/user/user32/misc/immtable.h new file mode 100644 index 00000000000..d0cbdc2e4a5 --- /dev/null +++ b/win32ss/user/user32/misc/immtable.h @@ -0,0 +1,52 @@ +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND)) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND, LPARAM)) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND, LPARAM)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND, LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND, LPIMEPROA)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND, LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND, LPIMEPROA)) +DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND, HIMC)) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL, HIMC, UINT, LPVOID)) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL, HIMC, UINT, LPVOID)) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC, DWORD, LPVOID, DWORD)) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC, DWORD, LPVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) +DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND)) +DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND)) +DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND, HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID, HINSTANCE)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC, LPLOGFONTW)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC, LPLOGFONTA)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC, LPLOGFONTW)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC, LPLOGFONTA)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC, DWORD, DWORD, DWORD)) +DEFINE_IMM_ENTRY(PINPUTCONTEXT, ImmLockIMC, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC, LPCANDIDATEFORM)) +DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL, HWND, DWORD, LPVOID)) +DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC, LPDWORD, LPDWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC, DWORD, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC, LPPOINT)) +DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX, IMEINFOEXCLASS, LPVOID)) +DEFINE_IMM_ENTRY(PIMEDPI, ImmLockImeDpi, (HKL)) +DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID)) +DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND, HIMC, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND, UINT, WPARAM, LPARAM)) +DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL, PIMEINFOEX)) +DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND, HKL, UINT, LPARAM, DWORD)) +DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC)) +DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD, IMCENUMPROC, LPARAM)) +DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC, WPARAM, LPARAM))

1 0

[reactos] 01/01: [RAPPS] Update help command (#3209)
by He Yang 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbbc3efd60bdf5986a6c7… commit fbbc3efd60bdf5986a6c7ff5a7cee4c3a51689e5 Author: He Yang <1160386205(a)qq.com> AuthorDate: Sat Sep 19 20:20:14 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 15:20:14 2020 +0300 [RAPPS] Update help command (#3209) Add missing FIND and INFO commands to the usage help string. --- base/applications/rapps/include/unattended.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index c5bc8797b01..301f54ab9e7 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -6,6 +6,11 @@ #define CMD_KEY_INFO L"INFO" #define CMD_KEY_HELP L"?" -const WCHAR UsageString[] = L"RAPPS [/" CMD_KEY_HELP "] [/" CMD_KEY_INSTALL " packagename] [/" CMD_KEY_SETUP " filename]"; +const WCHAR UsageString[] = L"RAPPS \ +[/" CMD_KEY_HELP L"] \ +[/" CMD_KEY_INSTALL L" packagename] \ +[/" CMD_KEY_SETUP L" filename] \ +[/" CMD_KEY_FIND L" string] \ +[/" CMD_KEY_INFO L" packagename]"; BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow);

1 0

[reactos] 01/01: [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text
by Katayama Hirofumi MZ 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d905dd531838c134b59c1… commit d905dd531838c134b59c10bf4246b63af4a0feb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 13:50:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 19 13:50:58 2020 +0900 [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text CORE-17291 --- dll/cpl/appwiz/lang/bg-BG.rc | 4 ++-- dll/cpl/appwiz/lang/cs-CZ.rc | 4 ++-- dll/cpl/appwiz/lang/de-DE.rc | 4 ++-- dll/cpl/appwiz/lang/el-GR.rc | 4 ++-- dll/cpl/appwiz/lang/en-US.rc | 4 ++-- dll/cpl/appwiz/lang/es-ES.rc | 4 ++-- dll/cpl/appwiz/lang/et-EE.rc | 4 ++-- dll/cpl/appwiz/lang/fr-FR.rc | 4 ++-- dll/cpl/appwiz/lang/he-IL.rc | 4 ++-- dll/cpl/appwiz/lang/id-ID.rc | 4 ++-- dll/cpl/appwiz/lang/it-IT.rc | 4 ++-- dll/cpl/appwiz/lang/ja-JP.rc | 4 ++-- dll/cpl/appwiz/lang/no-NO.rc | 4 ++-- dll/cpl/appwiz/lang/pl-PL.rc | 4 ++-- dll/cpl/appwiz/lang/pt-BR.rc | 4 ++-- dll/cpl/appwiz/lang/pt-PT.rc | 4 ++-- dll/cpl/appwiz/lang/ro-RO.rc | 4 ++-- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- dll/cpl/appwiz/lang/sk-SK.rc | 4 ++-- dll/cpl/appwiz/lang/sq-AL.rc | 4 ++-- dll/cpl/appwiz/lang/tr-TR.rc | 4 ++-- dll/cpl/appwiz/lang/uk-UA.rc | 4 ++-- dll/cpl/appwiz/lang/zh-CN.rc | 4 ++-- dll/cpl/appwiz/lang/zh-TW.rc | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 1771b697598..2461e5f6f7c 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вълшебникът ви помага за създаването на препратки към местни или мрежови приложения, файлове, папки, компютри или адреси в интернет.", -1, 120, 15, 200, 32 LTEXT "Напишете местоположението на предмета:", -1, 120, 50, 160, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT LTEXT "Натиснете ""Напред"" за продължаване.", -1, 120, 100, 160, 10 END @@ -37,7 +37,7 @@ CAPTION "Изберете заглавие за приложението" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Напишете име за препратката:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Натиснете ""Край"" за създаване на препратка.", -1, 120, 50, 170, 10 END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index a03f07ba4b9..76f9163173a 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento průvodce pomůže s vytvořením zástupců na místní\nnebo síťové programy, soubory, složky, počítače nebo\ninternetové adresy.", -1, 120, 15, 200, 30 LTEXT "Zadejte umístění položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procházet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pokračujte kliknutím na Další.", -1, 120, 97, 162, 10 END @@ -42,7 +42,7 @@ CAPTION "Zvolte název programu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Zadejte název tohoto zástupce:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknutím na Dokončit vytvoříte zástupce.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index f44b8e79fee..df7c01c0cc8 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Programmbezeichnung auswählen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klicken Sie auf Fertig stellen, um die Verknüpfung zu erstellen.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 53c815a9f37..6911ffdfc39 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Αυτός ο οδηγός σας βοηθάει να δημιουργήσετε συντομεύσεις σε τοπικά προγράμματα ή προγράμματα δικτύου, αρχεία, φακέλους, υπολογιστές ή διευθύνσεις στο διαδίκτυο.", -1, 120, 15, 200, 30 LTEXT "Εισάγετε την θέση του στοιχείου:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Αναζήτηση...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Επιλέξτε τίτλο για το πρόγραμμα" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Πληκτρολογήστε ένα όνομα για τη συντόμευση:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Πατήστε 'Τέλος' για να δημιουργήσετε τη συντόμευση.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 7f25e1b4a74..1cf1a7ab924 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 9758843998e..2683b85fbab 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -35,7 +35,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, equipos, o direcciones de Internet.", -1, 120, 15, 200, 30 LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "Seleccione un título para el programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 1536a64b7ef..2e1bcf4b404 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Selle viisardi abil saate luua otseteid kohalike või\nvõrguprogrammide, failide, kaustada, arvutite või\nInterneti-aadresside juurde.", -1, 120, 15, 200, 30 LTEXT "Tippige üksuse asukoht:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sirvi...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Jätkamiseks klõpsake nuppu Edasi.", -1, 120, 97, 162, 10 END @@ -44,7 +44,7 @@ CAPTION "Programmi jaoks tiitli valimine" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tippige selle otsetee nimi:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Otsetee loomiseks klõpsake nuppu Valmis.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index e03f2ef5d7c..59a069a0739 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Sélectionnez un titre pour le programme" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "En&trez un nom pour ce raccourci :", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index ade66f0999d..cb068fdaec9 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10 END @@ -38,7 +38,7 @@ CAPTION "בחירת שם לתכנית" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "הקלד שם עבור קיצור דרך זה:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "לחץ על סיום כדי ליצור את קיצור הדרך.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 32e0a8ea171..4be97de03c6 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Penuntun ini membantu membuat pintasan pada lokal atau\njaringan berupa program, berkas, folder, Komputer, atau Alamat Internet.", -1, 120, 15, 200, 30 LTEXT "Ketik lokasi butir:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Cari...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klik Lanjut untuk meneruskan.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Pilih Judul untuk Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Ketik nama untuk pintasan ini:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klik Selesai untuk membuat pintasan.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index 1aa8d164e79..c545681392a 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o\nindirizzi Internet.", -1, 120, 15, 200, 30 LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Scelta del titolo del programma" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digitare il nome per questo collegamento:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 045e9ac89de..ddbe0f6cc4f 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -26,7 +26,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このウィザードは、ローカルまたはネットワークプログラム、ファイル、フォルダー、コンピューター、またはインターネットアドレスへのショートカットを作成するのを助けます。", -1, 120, 15, 200, 30 LTEXT "項目の位置を入力して下さい:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "参照...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "次へをクリックすると続行します。", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "プログラムのタイトルを選択します" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このショートカットの名前を入力して下さい(&T):", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "完了をクリックするとショートカットを作成します。", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 8731c9b70c4..72b6971e4ee 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller\nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Velg en tittel for programmet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Skriv inn et navn for denne snarveien:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Trykk på fullført for å opprette snarveien.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 15345cb7002..5f8eb9bf1cd 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30 LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 274, 65, 55, 15, ES_LEFT LTEXT "Kliknij Dalej, aby kontynuować.", -1, 120, 97, 162, 10 END @@ -48,7 +48,7 @@ CAPTION "Wybierz nazwę" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Wpisz nazwę dla tego skrótu:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknij Zakończ, by utworzyć skrót.", -1, 120, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 35404e74dc2..1b5fb17e00c 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Selecione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index cac74180974..297c4e83b1d 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Seleccione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 45eb1112d49..9a8d36f9b4e 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Acest asistent vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30 LTEXT "Scrieți adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificare…", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Apăsați „Înainte” pentru a continua.", -1, 120, 97, 162, 10 END @@ -43,7 +43,7 @@ CAPTION "Asistent pentru creare de scurtătură" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Scrieți un n&ume pentru scurtătură:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Apăsați „Sfârșit” pentru a crea scurtătura.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 42d1c80017e..fcabc788e33 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Этот мастер поможет создать ярлык для локальных или\nсетевых программ, файлов, папок, компьютеров или\nИнтернет-адресов.", -1, 120, 15, 200, 30 LTEXT "Выберите местоположение элемента:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щелкните ""Далее"" для продолжения.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Выбор заголовка для программы" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введите заголовок ярлыка:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щелкните ""Завершить"" для создания ярлыка.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 5a52da02bdc..0e10958df79 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento sprievodca Vám pomôže vytvoriť odkazy na miestne alebo\nsieťové programy, súbory, priečinky, počítače, alebo internetové\nadresy.", -1, 120, 15, 200, 30 LTEXT "Zadajte umiestnenie položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Prehľadávať...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Napíšte názov pre tento odkaz:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknite na tlačidlo Dokončiť pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index bf247b9a099..3d114275343 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ky magjistar ju ndihmon për të krijuar shkurtesat për të lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30 LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klikoni Next për të vazhduar.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Zgjidh një titull për Programin" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Shkruaj nje emer per kete shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliko Finish per te krijuar një shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index a45bf5a6d7e..bfe17114860 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Bu yardımcı, yerli ya da ağdaki izlencelere, kütüklere,\ndizinlere, bilgisayarlara ve Umûmî Ağ adreslerine\nkısayollar oluşturmanıza yardım eder.", -1, 120, 15, 200, 30 LTEXT "Öğenin konumunu yazınız:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Sürdürmek için ""İleri""ye tıklayınız.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "İzlencenin Adını Seç" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Bu kısayol için bir ad yazınız:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kısayolu oluşturmak için ""Bitir""e tıklayınız.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 965dc6233f2..79af27fdb4f 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Цей майстер допомагає створити ярлик, який указує на\nлокальні або мережні програми, файли, папки, комп'ютери\nабо адреси в Інтернеті.", -1, 120, 15, 200, 30 LTEXT "Укажіть розташування об'єкта:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Огляд...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щоб продовжити установку, натисніть кнопку ""Далі"".", -1, 120, 97, 162, 10 END @@ -45,7 +45,7 @@ CAPTION "Вибір назви програми" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введіть ім'я ярлика:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щоб створити ярлик, натисніть кнопку ""Готово"".", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 42d017c2dd1..1ac9c908e01 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -35,7 +35,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "此向导可帮助您创建本地或网络程序、文件、文件夹、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30 LTEXT "请输入项目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "选择程序标题" FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "输入快捷方式名称(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "点击“完成”创建快捷方式", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index a33c0b93a52..76acffcfdaf 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -35,7 +35,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "此精靈幫助您建立本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "按 [下一步] 繼續。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "選擇程式標題" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "輸入捷徑名稱(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "按 [完成] 建立捷徑", -1, 118, 97, 178, 17 END

1 0

[reactos] 01/01: [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198)
by Kyle Katarn 18 Sep '20

18 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a30fc249e24108317a3… commit a5a30fc249e24108317a37fd430b119e49e38f10 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 18 21:19:55 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 18 21:19:55 2020 +0200 [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198) --- dll/shellext/mydocs/CMyDocsDropHandler.cpp | 7 ++++- dll/win32/shell32/CCopyToMenu.cpp | 8 +++++- dll/win32/shell32/CMoveToMenu.cpp | 8 +++++- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 33 ++++++++++++++-------- .../shell32/droptargets/CRecyclerDropTarget.cpp | 5 ++-- dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 6 ++-- dll/win32/shell32/shlfileop.cpp | 4 +++ 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp index cd74af6d016..477ca4b1d7f 100644 --- a/dll/shellext/mydocs/CMyDocsDropHandler.cpp +++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp @@ -157,7 +157,12 @@ CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, fileop.pFrom = pszzSrcList; fileop.pTo = szzDir; fileop.fFlags = FOF_ALLOWUNDO | FOF_FILESONLY | FOF_MULTIDESTFILES | FOF_NOCONFIRMMKDIR; - SHFileOperationW(&fileop); + int res = SHFileOperationW(&fileop); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } // unlock buffer strSrcList.ReleaseBuffer(); diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 47da3b11f44..de2e2921ecd 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -211,7 +211,13 @@ HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CCopyToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 7e74473e143..be90f97201a 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -178,7 +178,13 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CMoveToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index b8e67fd9adf..4fb1657da78 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -75,7 +75,7 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, return hr; pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); + TRACE("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); CoTaskMemFree(strretFrom.pOleStr); if (!pszSrcList) return E_OUTOFMEMORY; @@ -92,9 +92,11 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, HeapFree(GetProcessHeap(), 0, pszSrcList); if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); return E_FAIL; - else - return S_OK; + } + return S_OK; } CFSDropTarget::CFSDropTarget(): @@ -489,7 +491,10 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, { hr = pDataObject->GetData(&fmt, &medium); TRACE("CFSTR_SHELLIDLIST.\n"); - + if (FAILED(hr)) + { + ERR("CFSTR_SHELLIDLIST failed\n"); + } /* lock the handle */ LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); if (!lpcida) @@ -597,9 +602,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, } hr = ppf->Save(wszTarget, FALSE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } else { @@ -636,9 +641,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, break; hr = ppf->Save(wszTarget, TRUE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } } } @@ -680,7 +685,13 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, op.hwnd = m_hwndSite; op.wFunc = bCopy ? FO_COPY : FO_MOVE; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - hr = SHFileOperationW(&op); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } + return hr; } ERR("Error calling GetData\n"); diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp index fa2b5ff1bcb..efd446d5cfa 100644 --- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp @@ -58,9 +58,10 @@ class CRecyclerDropTarget : FileOp.fFlags = FOF_ALLOWUNDO; TRACE("Deleting file (just the first) = %s, allowundo: %d\n", debugstr_w(FileOp.pFrom), (FileOp.fFlags == FOF_ALLOWUNDO)); - if (SHFileOperationW(&FileOp) != 0) + int res = SHFileOperationW(&FileOp); + if (res) { - ERR("SHFileOperation failed with 0x%x\n", GetLastError()); + ERR("SHFileOperation failed with 0x%x\n", res); hr = E_FAIL; } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 518cd0f216e..4e333da9f27 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -503,10 +503,12 @@ RecycleBin5_RecycleBin5_Restore( op.pFrom = pDeletedFileName; op.pTo = pDeletedFile->FileNameW; - if (!SHFileOperationW(&op)) + int res = SHFileOperationW(&op); + if (res) { + ERR("SHFileOperationW failed with 0x%x\n", res); UnmapViewOfFile(pHeader); - return HRESULT_FROM_WIN32(GetLastError()); + return E_FAIL; } /* Clear last entry in the file */ diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index c9e7400bed2..204feceaafe 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1027,6 +1027,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) // Call the actual function retCode = SHFileOperationW(&nFileOp); + if (retCode) + { + ERR("SHFileOperationW failed with 0x%x\n", retCode); + } // Cleanup cleanup:

1 0

[reactos] 01/01: [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot
by Katayama Hirofumi MZ 18 Sep '20

18 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad5ae6389987d8322b6d… commit 3ad5ae6389987d8322b6db26a473efb8a34d19ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:30:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:30:16 2020 +0900 [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot --- sdk/include/reactos/shlwapi_undoc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 7117d1c190b..328bd511db6 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -27,6 +27,12 @@ extern "C" { BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); +#ifdef UNICODE +#define SHAboutInfo SHAboutInfoW +#else +#define SHAboutInfo SHAboutInfoA +#endif + HRESULT WINAPI IUnknown_QueryStatus(IUnknown *lpUnknown, REFGUID pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText); HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut); LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags); @@ -127,6 +133,11 @@ DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +#ifdef UNICODE +#define SHGetValueGoodBoot SHGetValueGoodBootW +#else +#define SHGetValueGoodBoot SHGetValueGoodBootA +#endif int WINAPIV

1 0

[reactos] 01/01: [SDK][INCLUDE] Add SHGetValueGoodBootA/W prototypes
by Katayama Hirofumi MZ 18 Sep '20

18 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efde1f42685098d04743f… commit efde1f42685098d04743f8484f718d6db316ffab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:22:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:22:16 2020 +0900 [SDK][INCLUDE] Add SHGetValueGoodBootA/W prototypes --- sdk/include/reactos/shlwapi_undoc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index f2b48278973..7117d1c190b 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -123,6 +123,11 @@ DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, PVOID WINAPI SHLockSharedEx(HANDLE hData, DWORD dwProcessId, BOOL bWriteAccess); +DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, + LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, + LPDWORD pwType, LPVOID pvData, LPDWORD pbData); + int WINAPIV ShellMessageBoxWrapW(

1 0

[reactos] 01/01: [SDK][INCLUDE] Add SHAnsiToUnicodeCP and SHUnicodeToAnsiCP prototypes
by Katayama Hirofumi MZ 18 Sep '20

18 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=733d6cebeda73e800b659… commit 733d6cebeda73e800b65951d77f1f7a68d2d2b6b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:09:29 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:09:29 2020 +0900 [SDK][INCLUDE] Add SHAnsiToUnicodeCP and SHUnicodeToAnsiCP prototypes --- sdk/include/reactos/shlwapi_undoc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a56ed24ed9d..f2b48278973 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -118,6 +118,9 @@ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObj DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, INT iLen); INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen); +DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen); +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen); + PVOID WINAPI SHLockSharedEx(HANDLE hData, DWORD dwProcessId, BOOL bWriteAccess); int

1 0

[reactos] 01/01: [CMD] HISTORY: Fix command output (missing linefeed) (#3205)
by Kyle Katarn 17 Sep '20

17 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac2b2ef8c7d74a664f4de… commit ac2b2ef8c7d74a664f4de8dce9ebc7f2deef57bb Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 18 00:17:08 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 18 00:17:08 2020 +0200 [CMD] HISTORY: Fix command output (missing linefeed) (#3205) CORE-12603 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/shell/cmd/history.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/history.c b/base/shell/cmd/history.c index 3c709a7ecf0..d0f3f40c5c1 100644 --- a/base/shell/cmd/history.c +++ b/base/shell/cmd/history.c @@ -113,7 +113,7 @@ INT CommandHistory(LPTSTR param) else { for (h_tmp = Top->prev; h_tmp != Bottom; h_tmp = h_tmp->prev) - ConErrPuts(h_tmp->string); + ConOutPrintf(_T("%s\n"), h_tmp->string); } return 0; }

1 0

[reactos] 01/01: [KERNEL32] Improve SetComputerNameExW (#3171)
by Katayama Hirofumi MZ 17 Sep '20

17 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378b26ce2714c8039e239… commit 378b26ce2714c8039e23932e0fa4e365c149c106 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 17 23:51:47 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 17 23:51:47 2020 +0900 [KERNEL32] Improve SetComputerNameExW (#3171) Reduce failures of kernel32_apitest SetComputerNameExW testcase and improve SetComputerNameExW. --- dll/win32/kernel32/client/compname.c | 96 ++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 25 deletions(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index 46d05e78d32..2b4b335d4f7 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -21,16 +21,19 @@ * PROJECT: ReactOS system libraries * PURPOSE: Computer name functions * FILE: dll/win32/kernel32/client/compname.c - * PROGRAMER: Eric Kohl + * PROGRAMERS: Eric Kohl + * Katayama Hirofumi MZ */ /* INCLUDES ******************************************************************/ #include <k32.h> +#include <windns.h> #define NDEBUG #include <debug.h> +typedef NTSTATUS (WINAPI *FN_DnsValidateName_W)(LPCWSTR, DNS_NAME_FORMAT); /* FUNCTIONS *****************************************************************/ @@ -451,6 +454,31 @@ GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) return ret; } +static +BOOL +BaseVerifyDnsName(LPCWSTR lpDnsName) +{ + HINSTANCE hDNSAPI; + FN_DnsValidateName_W fnValidate; + NTSTATUS Status; + BOOL ret = FALSE; + + hDNSAPI = LoadLibraryW(L"dnsapi.dll"); + if (hDNSAPI == NULL) + return FALSE; + + fnValidate = (FN_DnsValidateName_W)GetProcAddress(hDNSAPI, "DnsValidateName_W"); + if (fnValidate) + { + Status = (*fnValidate)(lpDnsName, DnsNameHostnameLabel); + if (Status == STATUS_SUCCESS || Status == DNS_ERROR_NON_RFC_NAME) + ret = TRUE; + } + + FreeLibrary(hDNSAPI); + + return ret; +} /* * @implemented @@ -460,39 +488,56 @@ BOOL IsValidComputerName(COMPUTER_NAME_FORMAT NameType, LPCWSTR lpComputerName) { - PWCHAR p; - ULONG Length; + size_t Length; + static const WCHAR s_szInvalidChars[] = + L"\"/\\[]:|<>+=;,?" + L"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + L"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"; - /* FIXME: do verification according to NameType */ + if (lpComputerName == NULL) + return FALSE; - Length = 0; - p = (PWCHAR)lpComputerName; +#define MAX_COMPUTER_NAME_EX 64 + /* Get string length */ + if (!NT_SUCCESS(RtlStringCchLengthW(lpComputerName, MAX_COMPUTER_NAME_EX + 1, &Length))) + return FALSE; +#undef MAX_COMPUTER_NAME_EX - while (*p != 0) - { - if (!(iswctype(*p, _ALPHA | _DIGIT) || *p == L'!' || *p == L'@' || *p == L'#' || - *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || - *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || - *p == L'{' || *p == L'}' || *p == L'~')) - return FALSE; + /* An empty name is invalid, except a DNS name */ + if (Length == 0 && NameType != ComputerNamePhysicalDnsDomain) + return FALSE; - Length++; - p++; + /* Leading or trailing spaces are invalid */ + if (Length > 0 && + (lpComputerName[0] == L' ' || lpComputerName[Length - 1] == L' ')) + { + return FALSE; } - if (NameType == ComputerNamePhysicalDnsDomain) - return TRUE; - - if (Length == 0) + /* Check whether the name contains any invalid character */ + if (wcscspn(lpComputerName, s_szInvalidChars) < Length) return FALSE; - if (NameType == ComputerNamePhysicalNetBIOS && - Length > MAX_COMPUTERNAME_LENGTH) - return FALSE; + switch (NameType) + { + case ComputerNamePhysicalNetBIOS: + if (Length > MAX_COMPUTERNAME_LENGTH) + return FALSE; + return TRUE; - return TRUE; -} + case ComputerNamePhysicalDnsDomain: + /* An empty DNS name is valid */ + if (Length != 0) + return BaseVerifyDnsName(lpComputerName); + return TRUE; + + case ComputerNamePhysicalDnsHostname: + return BaseVerifyDnsName(lpComputerName); + default: + return FALSE; + } +} static BOOL @@ -547,6 +592,7 @@ SetComputerNameToRegistry(LPCWSTR RegistryKey, NtFlushKey(KeyHandle); NtClose(KeyHandle); + SetLastError(ERROR_SUCCESS); return TRUE; } @@ -637,7 +683,7 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, lpBuffer); default: - SetLastError (ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs