Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MEDIA][FONTS] More improve Cyrillic glyphs of tahomabd.ttf
by Katayma Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff715073cac5767f618c4… commit ff715073cac5767f618c4679480a3cbac1b6beab Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 18:50:52 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 15 18:53:40 2019 +0900 [MEDIA][FONTS] More improve Cyrillic glyphs of tahomabd.ttf Tahoma Bold. Version 0.004 khmz. 11px CYRILLIC SMALL LETTER DE. 11px CYRILLIC SMALL LETTER SOFT SIGN. --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 9577fd617ea..75eac5b8105 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

[reactos] 01/01: [SHELL32] Simply return S_OK if *pdwEffect is none (#2039)
by Katayama Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f129932dd5fdaa2c6eeb… commit 8f129932dd5fdaa2c6eebac96f2f2f95bd3d2b1b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 18:02:06 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 15 18:02:06 2019 +0900 [SHELL32] Simply return S_OK if *pdwEffect is none (#2039) IDropTarget::DragEnter must simply return S_OK if *pdwEffect == DROPEFFECT_NONE. CORE-11238 --- dll/win32/shell32/CDefView.cpp | 3 +++ dll/win32/shell32/CShellLink.cpp | 4 ++++ dll/win32/shell32/droptargets/CFSDropTarget.cpp | 4 ++++ dll/win32/shell32/droptargets/CexeDropHandler.cpp | 3 +++ 4 files changed, 14 insertions(+) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 51bd3dadcaf..66a77b608db 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -3186,6 +3186,9 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf HRESULT WINAPI CDefView::DragEnter(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { + if (*pdwEffect == DROPEFFECT_NONE) + return S_OK; + /* Get a hold on the data object for later calls to DragEnter on the sub-folders */ m_pCurDataObject = pDataObject; diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 8883e801c69..90f2140a9c5 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -3107,6 +3107,10 @@ HRESULT STDMETHODCALLTYPE CShellLink::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); + + if (*pdwEffect == DROPEFFECT_NONE) + return S_OK; + LPCITEMIDLIST pidlLast; CComPtr<IShellFolder> psf; diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 641770b37ae..bdf65e1fcc5 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -283,6 +283,10 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); + + if (*pdwEffect == DROPEFFECT_NONE) + return S_OK; + FORMATETC fmt; FORMATETC fmt2; m_fAcceptFmt = FALSE; diff --git a/dll/win32/shell32/droptargets/CexeDropHandler.cpp b/dll/win32/shell32/droptargets/CexeDropHandler.cpp index 83f9723e631..0d0d86ea8a0 100644 --- a/dll/win32/shell32/droptargets/CexeDropHandler.cpp +++ b/dll/win32/shell32/droptargets/CexeDropHandler.cpp @@ -36,6 +36,9 @@ CExeDropHandler::~CExeDropHandler() HRESULT WINAPI CExeDropHandler::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE ("(%p)\n", this); + if (*pdwEffect == DROPEFFECT_NONE) + return S_OK; + *pdwEffect = DROPEFFECT_COPY; return S_OK; }

1 0

[reactos] 01/01: [MEDIA][FONTS] Improve Cyrillic glyphs of tahomabd.ttf
by Katayma Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b1ca2895b148958841d4… commit 6b1ca2895b148958841d4780e466fda0d2da5e88 Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 17:25:39 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 15 17:25:39 2019 +0900 [MEDIA][FONTS] Improve Cyrillic glyphs of tahomabd.ttf Tahoma Bold. Version 0.003 khmz. 11px CYRILLIC SMALL LETTER EF. 11px CYRILLIC SMALL LETTER GHE. 11px CYRILLIC SMALL LETTER GJE. 11px CYRILLIC SMALL LETTER U. 11px CYRILLIC SMALL LETTER SHORT U. 11px CYRILLIC SMALL LETTER TSE. 11px CYRILLIC SMALL LETTER YERU. 11px CYRILLIC SMALL LETTER TE. --- media/fonts/tahomabd.ttf | Bin 175800 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 9a00123a5f2..9577fd617ea 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Improve Cylliric glyphs of tahoma.ttf more
by Katayma Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff77ddff5e3389e8bd446… commit ff77ddff5e3389e8bd446862c33f41aed0b1cdb2 Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 17:01:59 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 15 17:01:59 2019 +0900 [MEDIA][FONTS] Improve Cylliric glyphs of tahoma.ttf more 11px CYRILLIC SMALL LETTER TE. 11px CYRILLIC SMALL LETTER SOFT SIGN. --- media/fonts/tahoma.ttf | Bin 155304 -> 155304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 99c8972d15b..73aefc78fa6 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Improve Cyrillic bitmap glyphs of tahoma.ttf
by Katayma Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fe6a88b04e30fb3cb21b… commit 6fe6a88b04e30fb3cb21bc4c78b1e5715f19da1a Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 12:56:58 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 15 12:56:58 2019 +0900 [MEDIA][FONTS] Improve Cyrillic bitmap glyphs of tahoma.ttf Version 0.0006 khmz. 12px CYRILLIC SMALL LETTER EF. 11px CYRILLIC SMALL LETTER EM. 11px CYRILLIC SMALL LETTER SOFT SIGN. 11px CYRILLIC SMALL LETTER DE. --- media/fonts/tahoma.ttf | Bin 155308 -> 155304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index af704863e8e..99c8972d15b 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

1 0

[reactos] 01/01: [CMD] Unquote string at pushd (#2031)
by Katayama Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b7732093c241772a36a2… commit 1b7732093c241772a36a2a5b5161e95e9e18feac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 11:51:58 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 15 11:51:58 2019 +0900 [CMD] Unquote string at pushd (#2031) pushd command of cmd.exe didn't treat the quoted parameter correctly. - Call StripQuotes in SetRootPath function. - Fix typo of FEATURE_DIRECTORY_STACK. This PR will enable "Command Prompt" here. CORE-12150 --- base/shell/cmd/cmd.c | 2 +- base/shell/cmd/internal.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 27b5bf5a20b..5a3651d935f 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1872,7 +1872,7 @@ Initialize(VOID) /* Initialize prompt support */ InitPrompt(); -#ifdef FEATURE_DIR_STACK +#ifdef FEATURE_DIRECTORY_STACK /* Initialize directory stack */ InitDirectoryStack(); #endif diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index fc05119829e..d758c151a4c 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -184,6 +184,8 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) TCHAR OutPath[MAX_PATH]; TCHAR OutPathTemp[MAX_PATH]; + StripQuotes(InPath); + /* Retrieve the full path name from the (possibly relative) InPath */ if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL) == 0) goto Fail;

1 0

[reactos] 01/01: [BOOTDATA] s/cmd/cmd.exe/
by Katayma Hirofumi MZ 15 Nov '19

15 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f038c2339b419d80159df… commit f038c2339b419d80159df344da2fa1b1ea35659b Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 15 10:09:13 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 15 10:09:13 2019 +0900 [BOOTDATA] s/cmd/cmd.exe/ --- boot/bootdata/hivecls.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index d2cd5bada57..5d761961599 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -33,14 +33,14 @@ HKCR,"Directory","AlwaysShowExt",0x00000000,"" HKCR,"Directory","NoRecentDocs",0x00000000,"" HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" HKCR,"Directory\shell\cmd","Extended",0x00000000,"" -HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd /s /k pushd ""%V""" +HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Drive HKCR,"Drive","",0x00000000,"Drive" ;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" HKCR,"Drive\shell\cmd","Extended",0x00000000,"" -HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd /s /k pushd ""%V""" +HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Clipboard Element HKCR,".clp","",0x00000000,"clpfile"

1 0

[reactos] 01/01: [SHELL32][BOOTDATA] Implement Command Prompt here (#2029)
by Katayama Hirofumi MZ 14 Nov '19

14 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90c63d12a1960b75b518a… commit 90c63d12a1960b75b518ac8e9dad81efce5a7fac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 14 23:25:21 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 14 23:25:21 2019 +0900 [SHELL32][BOOTDATA] Implement Command Prompt here (#2029) Add "Command Prompt here" menu item to the Right-click menu of normal folders and drives. Currently, this menu item doesn't work correctly because of the bug of pushd. CORE-12150 --- boot/bootdata/hivecls.inf | 16 ++++++++ dll/win32/shell32/CDefaultContextMenu.cpp | 65 ++++++++++++++++++------------- dll/win32/shell32/lang/bg-BG.rc | 1 + dll/win32/shell32/lang/ca-ES.rc | 1 + dll/win32/shell32/lang/cs-CZ.rc | 1 + dll/win32/shell32/lang/da-DK.rc | 1 + dll/win32/shell32/lang/de-DE.rc | 1 + dll/win32/shell32/lang/el-GR.rc | 1 + dll/win32/shell32/lang/en-GB.rc | 1 + dll/win32/shell32/lang/en-US.rc | 1 + dll/win32/shell32/lang/es-ES.rc | 1 + dll/win32/shell32/lang/et-EE.rc | 1 + dll/win32/shell32/lang/fi-FI.rc | 1 + dll/win32/shell32/lang/fr-FR.rc | 1 + dll/win32/shell32/lang/he-IL.rc | 1 + dll/win32/shell32/lang/hi-IN.rc | 1 + dll/win32/shell32/lang/hu-HU.rc | 1 + dll/win32/shell32/lang/id-ID.rc | 1 + dll/win32/shell32/lang/it-IT.rc | 1 + dll/win32/shell32/lang/ja-JP.rc | 1 + dll/win32/shell32/lang/ko-KR.rc | 1 + dll/win32/shell32/lang/nl-NL.rc | 1 + dll/win32/shell32/lang/no-NO.rc | 1 + dll/win32/shell32/lang/pl-PL.rc | 1 + dll/win32/shell32/lang/pt-BR.rc | 1 + dll/win32/shell32/lang/pt-PT.rc | 1 + dll/win32/shell32/lang/ro-RO.rc | 1 + dll/win32/shell32/lang/ru-RU.rc | 1 + dll/win32/shell32/lang/sk-SK.rc | 1 + dll/win32/shell32/lang/sl-SI.rc | 1 + dll/win32/shell32/lang/sq-AL.rc | 1 + dll/win32/shell32/lang/sv-SE.rc | 1 + dll/win32/shell32/lang/tr-TR.rc | 1 + dll/win32/shell32/lang/uk-UA.rc | 1 + dll/win32/shell32/lang/zh-CN.rc | 1 + dll/win32/shell32/lang/zh-TW.rc | 1 + dll/win32/shell32/shlexec.cpp | 40 ++++++++++++++++++- dll/win32/shell32/shresdef.h | 1 + 38 files changed, 129 insertions(+), 27 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index d3ae861c06b..d2cd5bada57 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -26,6 +26,22 @@ HKCR,"Folder\shell\explore","BrowserFlags",0x00010001,"0x00000022" HKCR,"Folder\shell\explore","ExplorerFlags",0x00010001,"0x00000021" HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" +; Directory +HKCR,"Directory","",0x00000000,"File Folder" +;HKCR,"Directory\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" +HKCR,"Directory","AlwaysShowExt",0x00000000,"" +HKCR,"Directory","NoRecentDocs",0x00000000,"" +HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +HKCR,"Directory\shell\cmd","Extended",0x00000000,"" +HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd /s /k pushd ""%V""" + +; Drive +HKCR,"Drive","",0x00000000,"Drive" +;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" +HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +HKCR,"Drive\shell\cmd","Extended",0x00000000,"" +HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd /s /k pushd ""%V""" + ; Clipboard Element HKCR,".clp","",0x00000000,"clpfile" HKCR,".clp","Content Type",0x00000000,"application/x-msclip" diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index aa250481a08..31edee28e7d 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -562,49 +562,62 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( /* By default use verb for menu item name */ mii.dwTypeData = pEntry->szVerb; + WCHAR wszKey[256]; + HRESULT hr; + hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->szVerb); + if (FAILED_UNEXPECTEDLY(hr)) + { + pEntry = pEntry->pNext; + continue; + } + + BOOL Extended = FALSE; + HKEY hkVerb; if (idResource > 0) { if (LoadStringW(shell32_hInstance, idResource, wszVerb, _countof(wszVerb))) mii.dwTypeData = wszVerb; /* use translated verb */ else ERR("Failed to load string\n"); + + LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); + if (res == ERROR_SUCCESS) + { + res = RegQueryValueExW(hkVerb, L"Extended", NULL, NULL, NULL, NULL); + Extended = (res == ERROR_SUCCESS); + + RegCloseKey(hkVerb); + } } else { - WCHAR wszKey[256]; - HRESULT hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->szVerb); - - if (SUCCEEDED(hr)) + LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); + if (res == ERROR_SUCCESS) { - HKEY hkVerb; DWORD cbVerb = sizeof(wszVerb); - LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); + res = RegLoadMUIStringW(hkVerb, NULL, wszVerb, cbVerb, NULL, 0, NULL); if (res == ERROR_SUCCESS) { - res = RegLoadMUIStringW(hkVerb, - NULL, - wszVerb, - cbVerb, - NULL, - 0, - NULL); - if (res == ERROR_SUCCESS) - { - /* use description for the menu entry */ - mii.dwTypeData = wszVerb; - } - - RegCloseKey(hkVerb); + /* use description for the menu entry */ + mii.dwTypeData = wszVerb; } + + res = RegQueryValueExW(hkVerb, L"Extended", NULL, NULL, NULL, NULL); + Extended = (res == ERROR_SUCCESS); + + RegCloseKey(hkVerb); } } - mii.cch = wcslen(mii.dwTypeData); - mii.fState = fState; - mii.wID = iIdCmdFirst + cIds; - InsertMenuItemW(hMenu, *pIndexMenu, TRUE, &mii); - (*pIndexMenu)++; - cIds++; + if (!Extended || GetAsyncKeyState(VK_SHIFT) < 0) + { + mii.cch = wcslen(mii.dwTypeData); + mii.fState = fState; + mii.wID = iIdCmdFirst + cIds; + InsertMenuItemW(hMenu, *pIndexMenu, TRUE, &mii); + (*pIndexMenu)++; + cIds++; + } pEntry = pEntry->pNext; diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index e61b6c675fb..42d1fb138bf 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -911,6 +911,7 @@ BEGIN IDS_EDIT_VERB "Обработка" IDS_FIND_VERB "Търсене" IDS_PRINT_VERB "Разпечатване" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u файла, %u папки" IDS_PRINTERS "Печатачи" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index b2e25f93076..5f01647f972 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index b5f4c2c2616..c668b7b14d8 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -916,6 +916,7 @@ BEGIN IDS_EDIT_VERB "Upravit" IDS_FIND_VERB "Najít" IDS_PRINT_VERB "Tisknout" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u souborů, %u složek" IDS_PRINTERS "Tiskárny" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 7a063778cab..30172aed75d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -916,6 +916,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index f0145f348be..1f6b2cc673d 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -911,6 +911,7 @@ BEGIN IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index aaf9db3c3b7..5196614198a 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 7eb8229884e..5d4cf6bc4a9 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index bce8bc31278..f50562a6982 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 1464b4d14f0..12e5e17d7d8 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -918,6 +918,7 @@ BEGIN IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Buscar" IDS_PRINT_VERB "Imprimir" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u archivos, %u carpetas" IDS_PRINTERS "Impresoras" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e2e8cf41e28..63b137c76df 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -917,6 +917,7 @@ BEGIN IDS_EDIT_VERB "Muuda" IDS_FIND_VERB "Leia" IDS_PRINT_VERB "Prindi" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Faili, %u Kausta" IDS_PRINTERS "Printerid" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index f6cd13e6878..5fc6ddfadf4 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 58464c856ff..e5d0e25e44f 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u fichiers, %u répertoires" IDS_PRINTERS "Imprimantes" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 9e63d54b428..e9e64d7eafe 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -912,6 +912,7 @@ BEGIN IDS_EDIT_VERB "ערוך" IDS_FIND_VERB "מצא" IDS_PRINT_VERB "הדפס" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u קבצים, %u תיקיות" IDS_PRINTERS "מדפסות" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 6903fe2372e..7e637bad1c5 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -905,6 +905,7 @@ BEGIN IDS_EDIT_VERB "संपादित करें" IDS_FIND_VERB "ढूंढे" IDS_PRINT_VERB "प्रिंट" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u फ़ाइलें, %u फ़ोल्डर" IDS_PRINTERS "प्रिंटर" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 037d7f8e4c9..1c9f001830e 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 4d5abb5d14e..c9736262764 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Cari" IDS_PRINT_VERB "Cetak" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Berkas, %u Folder" IDS_PRINTERS "Printer" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index fa5cd0d287e..7a854349b50 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u File, %u Cartelle" IDS_PRINTERS "Stampanti" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 56a7ca99a3d..9c2732f4a09 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -907,6 +907,7 @@ BEGIN IDS_EDIT_VERB "編集" IDS_FIND_VERB "検索" IDS_PRINT_VERB "印刷" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u 個のファイル、 %u 個のフォルダ" IDS_PRINTERS "プリンタ" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 4239b7e3da5..3b33cefd7fe 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index cb9ec3ef3e9..e7a697f12da 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 16c0a4333ea..51d999b495b 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Rediger" IDS_FIND_VERB "Finn" IDS_PRINT_VERB "Skriv ut" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u filer, %u mapper" IDS_PRINTERS "Skrivere" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 38724ea0bbd..7c0cc733c22 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -915,6 +915,7 @@ BEGIN IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 035a4ae514a..c34ae71fc0d 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Arquivos, %u Pastas" IDS_PRINTERS "Impressoras" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 685f86cf1bc..6560b089148 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Ficheiros, %u Pastas" IDS_PRINTERS "Impressoras" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 5d6c56c8a7c..a3dfce4391b 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -912,6 +912,7 @@ BEGIN IDS_EDIT_VERB "Editează" IDS_FIND_VERB "Caută" IDS_PRINT_VERB "Imprimă" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u fișiere, %u dosare" IDS_PRINTERS "Imprimante" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 36002d87d62..46b397572aa 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -917,6 +917,7 @@ BEGIN IDS_EDIT_VERB "Изменить" IDS_FIND_VERB "Поиск" IDS_PRINT_VERB "Печать" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u файлов, %u папок" IDS_PRINTERS "Принтеры" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 165f210a79d..01000ca3e98 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Upraviť" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Tlačiť" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "súbory: %u, priečinky: %u" IDS_PRINTERS "Tlačiarne" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 678c5f5f7be..640f4cb7e5b 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index f65bf86b3f2..fe6992e9834 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -914,6 +914,7 @@ BEGIN IDS_EDIT_VERB "Modifiko" IDS_FIND_VERB "Gjej" IDS_PRINT_VERB "Printo" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Dokumenta, %u Dosje" IDS_PRINTERS "Printera" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e17328ecc79..06749268ad7 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Redigera" IDS_FIND_VERB "Hitta" IDS_PRINT_VERB "Skriv ut" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u filer, %u mappar" IDS_PRINTERS "Skrivare" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index bc6addfed2b..88449402f00 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -912,6 +912,7 @@ BEGIN IDS_EDIT_VERB "Düzenle" IDS_FIND_VERB "Bul" IDS_PRINT_VERB "Yazdır" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u Kütük, %u Dizin" IDS_PRINTERS "Yazıcılar" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 97ec05510e7..faa2254e158 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -910,6 +910,7 @@ BEGIN IDS_EDIT_VERB "Змінити" IDS_FIND_VERB "Пошук" IDS_PRINT_VERB "Друк" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u файлів, %u папок" IDS_PRINTERS "Принтери" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index f3debf50826..af8f3c41076 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -920,6 +920,7 @@ BEGIN IDS_EDIT_VERB "编辑" IDS_FIND_VERB "查找" IDS_PRINT_VERB "打印" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u 个文件，%u 个文件夹" IDS_PRINTERS "打印机" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 31faf69e845..a9cf8074ce1 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -921,6 +921,7 @@ BEGIN IDS_EDIT_VERB "編輯" IDS_FIND_VERB "搜索" IDS_PRINT_VERB "列印" + IDS_CMD_VERB "Command Prompt here" IDS_FILE_FOLDER "%u 個檔案, %u 個檔案夾" IDS_PRINTERS "印表機" diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 5a741467cb0..049426dd7da 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -3,7 +3,7 @@ * * Copyright 1998 Marcus Meissner * Copyright 2002 Eric Pouech - * Copyright 2018 Katayama Hirofumi MZ + * Copyright 2018-2019 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -167,6 +167,8 @@ static void ParseTildeEffect(PWSTR &res, LPCWSTR &args, DWORD &len, DWORD &used, * %I address of a global item ID (explorer switch /idlist) * %L seems to be %1 as long filename followed by the 8+3 variation * %S ??? + * %W Working directory + * %V Use either %L or %W * %* all following parameters (see batfile) * * The way we parse the command line arguments was determined through extensive @@ -302,6 +304,42 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* found_p1 = TRUE; break; + case 'w': + case 'W': + if (lpDir) + { + used += wcslen(lpDir); + if (used < len) + { + wcscpy(res, lpDir); + res += wcslen(lpDir); + } + } + break; + + case 'v': + case 'V': + if (lpFile) + { + used += wcslen(lpFile); + if (used < len) + { + wcscpy(res, lpFile); + res += wcslen(lpFile); + } + found_p1 = TRUE; + } + else if (lpDir) + { + used += wcslen(lpDir); + if (used < len) + { + wcscpy(res, lpDir); + res += wcslen(lpDir); + } + } + break; + case 'i': case 'I': if (pidl) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 2b729d6a2ea..3e425eac704 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -200,6 +200,7 @@ #define IDS_EDIT_VERB 303 #define IDS_FIND_VERB 304 #define IDS_PRINT_VERB 305 +#define IDS_CMD_VERB 306 #define IDS_FILE_FOLDER 308 #define IDS_CREATELINK 309

1 0

[reactos] 01/01: [CMD_APITEST] Add cmd_apitest testcases (#2034)
by Katayama Hirofumi MZ 14 Nov '19

14 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e753d5e1086e96a4978d0… commit e753d5e1086e96a4978d061e0ca6ff1b9cf4d896 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 14 22:52:31 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 14 22:52:31 2019 +0900 [CMD_APITEST] Add cmd_apitest testcases (#2034) Add some testcases for cmd.exe. CORE-12150 --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/cmd/CMakeLists.txt | 11 + modules/rostests/apitests/cmd/cmd.c | 300 +++++++++++++++++++++++++++ modules/rostests/apitests/cmd/precomp.h | 6 + modules/rostests/apitests/cmd/testlist.c | 16 ++ 5 files changed, 334 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 8910f89b56a..62ca4c742bc 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(apphelp) add_subdirectory(appshim) add_subdirectory(atl) add_subdirectory(browseui) +add_subdirectory(cmd) add_subdirectory(com) add_subdirectory(comctl32) add_subdirectory(crt) diff --git a/modules/rostests/apitests/cmd/CMakeLists.txt b/modules/rostests/apitests/cmd/CMakeLists.txt new file mode 100644 index 00000000000..5eae6ccdee6 --- /dev/null +++ b/modules/rostests/apitests/cmd/CMakeLists.txt @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + cmd.c + precomp.h) + +add_executable(cmd_apitest ${SOURCE} testlist.c) +target_link_libraries(cmd_apitest wine ${PSEH_LIB}) +set_module_type(cmd_apitest win32cui) +add_importlibs(cmd_apitest msvcrt kernel32) +add_pch(cmd_apitest precomp.h SOURCE) +add_rostests_file(TARGET cmd_apitest) diff --git a/modules/rostests/apitests/cmd/cmd.c b/modules/rostests/apitests/cmd/cmd.c new file mode 100644 index 00000000000..f4e79cc59bd --- /dev/null +++ b/modules/rostests/apitests/cmd/cmd.c @@ -0,0 +1,300 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for cmd.exe + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +#define TIMEOUT 3000 + +typedef struct TEST_ENTRY +{ + INT line; + DWORD dwExitCode; + const char *cmdline; + BOOL bStdOutput; + BOOL bStdError; +} TEST_ENTRY; + +static const TEST_ENTRY s_exit_entries[] = +{ + { __LINE__, 0, "cmd /c exit" }, + { __LINE__, 0, "cmd /c exit 0" }, + { __LINE__, 0, "cmd /c exit \"\"" }, + { __LINE__, 0, "cmd /c exit ABC" }, + { __LINE__, 0, "cmd /c exit \"ABC" }, + { __LINE__, 0, "cmd /c exit \"ABC\"" }, + { __LINE__, 1234, "cmd /c exit 1234" }, +}; + +static const TEST_ENTRY s_echo_entries[] = +{ + { __LINE__, 0, "cmd /c echo", TRUE, FALSE }, + { __LINE__, 0, "cmd /c echo.", TRUE, FALSE }, +}; + +static const TEST_ENTRY s_cd_entries[] = +{ + { __LINE__, 0, "cmd /c cd \"C:\\ ", }, + { __LINE__, 0, "cmd /c cd C:/", }, + { __LINE__, 0, "cmd /c cd \"\"", TRUE, FALSE }, + { __LINE__, 0, "cmd /c cd", TRUE, FALSE }, + { __LINE__, 1234, "cmd /c cd C:\\Program Files && exit 1234" }, + { __LINE__, 1234, "cmd /c cd \"C:\\ \" && exit 1234", }, + { __LINE__, 1234, "cmd /c cd \"C:\\Program Files\" && exit 1234", }, + { __LINE__, 1234, "cmd /c cd \"\" && exit 1234", TRUE, FALSE }, + { __LINE__, 1234, "cmd /c cd \\ && exit 1234" }, +}; + +static const TEST_ENTRY s_pushd_entries[] = +{ + { __LINE__, 0, "cmd /c pushd C:\\ " }, + { __LINE__, 0, "cmd /c pushd C:\\ \"" }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\"\"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\ \" " }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\" " }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\"\" " }, + { __LINE__, 0, "cmd /c pushd C:\\ \"\"\"\" " }, + { __LINE__, 0, "cmd /c pushd C:\\" }, + { __LINE__, 0, "cmd /c pushd C:\\\"" }, + { __LINE__, 0, "cmd /c pushd C:\\\"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\\"\"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\\"\"\"\"" }, + { __LINE__, 0, "cmd /c pushd C:\\\" " }, + { __LINE__, 0, "cmd /c pushd C:\\\"\" " }, + { __LINE__, 0, "cmd /c pushd C:\\\"\"\" " }, + { __LINE__, 0, "cmd /c pushd C:\\\"\"\"\" " }, + { __LINE__, 0, "cmd /c pushd \"C:\\ " }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\"\"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \" " }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\" " }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\"\" " }, + { __LINE__, 0, "cmd /c pushd \"C:\\ \"\"\"\" " }, + { __LINE__, 0, "cmd /c pushd \"C:\\" }, + { __LINE__, 0, "cmd /c pushd \"C:\\\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\\"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\\"\"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\\"\"\"\"" }, + { __LINE__, 0, "cmd /c pushd \"C:\\\"" }, + { __LINE__, 1, "cmd /c pushd \" C:\\ ", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \" C:\\ \"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \" C:\\ \"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \" C:\\ \"\"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \" C:\\ \"\"\"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\ ", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\ \"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\ \"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\ \"\"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\ \"\"\"\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"\" C:\\\"", FALSE, TRUE }, + { __LINE__, 1, "cmd /c popd ABC" }, + { __LINE__, 1, "cmd /c popd \" " }, + { __LINE__, 1, "cmd /c popd \"\"" }, + { __LINE__, 1, "cmd /c popd" }, + { __LINE__, 1, "cmd /c pushd ABC", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd C:/Program Files && popd && exit 1234", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd C:\\ C:\\ && popd && exit 1234", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd C:\\Invalid Directory && exit 1234", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd C:\\Invalid Directory && popd && exit 1234", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \" C:\\ ", FALSE, TRUE }, + { __LINE__, 1, "cmd /c pushd \"C:\\ C:\\\" && popd && exit 1234", FALSE, TRUE }, + { __LINE__, 1234, "cmd /c pushd && exit 1234 " }, + { __LINE__, 1234, "cmd /c pushd C:\\ && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd C:\\ \"\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd C:\\Program Files && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:/Program Files/\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:/Program Files\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\ \" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\ \"\"\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\ \"\"\"\"\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\Program Files\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\Program Files\\\" && popd && exit 1234" }, + { __LINE__, 1234, "cmd /c pushd \"C:\\\" && popd && exit 1234" }, +}; + +static BOOL MyDuplicateHandle(HANDLE hFile, PHANDLE phFile, BOOL bInherit) +{ + HANDLE hProcess = GetCurrentProcess(); + return DuplicateHandle(hProcess, hFile, hProcess, phFile, 0, + bInherit, DUPLICATE_SAME_ACCESS); +} + +static BOOL PrepareForRedirect(STARTUPINFOA *psi, PHANDLE phInputWrite, + PHANDLE phOutputRead, PHANDLE phErrorRead) +{ + HANDLE hInputRead = NULL, hInputWriteTmp = NULL; + HANDLE hOutputReadTmp = NULL, hOutputWrite = NULL; + HANDLE hErrorReadTmp = NULL, hErrorWrite = NULL; + SECURITY_ATTRIBUTES sa = { sizeof(sa), NULL, TRUE }; + + psi->hStdInput = NULL; + psi->hStdOutput = NULL; + psi->hStdError = NULL; + + if (phInputWrite) + { + if (CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0)) + { + if (!MyDuplicateHandle(hInputWriteTmp, phInputWrite, FALSE)) + goto failed; + + CloseHandle(hInputWriteTmp); + } + else + goto failed; + } + + if (phOutputRead) + { + if (CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0)) + { + if (!MyDuplicateHandle(hOutputReadTmp, phOutputRead, FALSE)) + goto failed; + + CloseHandle(hOutputReadTmp); + } + else + goto failed; + } + + if (phOutputRead && phOutputRead == phErrorRead) + { + if (!MyDuplicateHandle(hOutputWrite, &hErrorWrite, TRUE)) + goto failed; + } + else if (phErrorRead) + { + if (CreatePipe(&hErrorReadTmp, &hErrorWrite, &sa, 0)) + { + if (!MyDuplicateHandle(hErrorReadTmp, phErrorRead, FALSE)) + goto failed; + CloseHandle(hErrorReadTmp); + } + else + goto failed; + } + + if (phInputWrite) + psi->hStdInput = hInputRead; + if (phOutputRead) + psi->hStdOutput = hOutputWrite; + if (phErrorRead) + psi->hStdError = hErrorWrite; + + return TRUE; + +failed: + CloseHandle(hInputRead); + CloseHandle(hInputWriteTmp); + CloseHandle(hOutputReadTmp); + CloseHandle(hOutputWrite); + CloseHandle(hErrorReadTmp); + CloseHandle(hErrorWrite); + return FALSE; +} + +static void DoTestEntry(const TEST_ENTRY *pEntry) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + DWORD dwExitCode, dwWait; + HANDLE hOutputRead = NULL; + HANDLE hErrorRead = NULL; + BYTE b; + DWORD dwRead; + BOOL bStdOutput, bStdError; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + + if (!PrepareForRedirect(&si, NULL, &hOutputRead, &hErrorRead)) + { + skip("PrepareForRedirect failed\n"); + return; + } + + if (CreateProcessA(NULL, (char *)pEntry->cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(si.hStdInput); + dwWait = WaitForSingleObject(pi.hProcess, TIMEOUT); + if (dwWait == WAIT_TIMEOUT) + { + TerminateProcess(pi.hProcess, 9999); + } + GetExitCodeProcess(pi.hProcess, &dwExitCode); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + else + { + dwExitCode = 8888; + } + + PeekNamedPipe(hOutputRead, &b, 1, &dwRead, NULL, NULL); + bStdOutput = dwRead != 0; + PeekNamedPipe(hErrorRead, &b, 1, &dwRead, NULL, NULL); + bStdError = dwRead != 0; + + if (si.hStdInput) + CloseHandle(si.hStdInput); + if (si.hStdOutput) + CloseHandle(si.hStdOutput); + if (si.hStdError) + CloseHandle(si.hStdError); + + ok(pEntry->bStdOutput == bStdOutput, + "Line %u: bStdOutput %d vs %d\n", + pEntry->line, pEntry->bStdOutput, bStdOutput); + + ok(pEntry->bStdError == bStdError, + "Line %u: bStdError %d vs %d\n", + pEntry->line, pEntry->bStdError, bStdError); + + ok(pEntry->dwExitCode == dwExitCode, + "Line %u: dwExitCode %ld vs %ld\n", + pEntry->line, pEntry->dwExitCode, dwExitCode); +} + +START_TEST(exit) +{ + SIZE_T i; + for (i = 0; i < ARRAYSIZE(s_exit_entries); ++i) + { + DoTestEntry(&s_exit_entries[i]); + } +} + +START_TEST(echo) +{ + SIZE_T i; + for (i = 0; i < ARRAYSIZE(s_echo_entries); ++i) + { + DoTestEntry(&s_echo_entries[i]); + } +} + +START_TEST(cd) +{ + SIZE_T i; + for (i = 0; i < ARRAYSIZE(s_cd_entries); ++i) + { + DoTestEntry(&s_cd_entries[i]); + } +} + +START_TEST(pushd) +{ + SIZE_T i; + for (i = 0; i < ARRAYSIZE(s_pushd_entries); ++i) + { + DoTestEntry(&s_pushd_entries[i]); + } +} diff --git a/modules/rostests/apitests/cmd/precomp.h b/modules/rostests/apitests/cmd/precomp.h new file mode 100644 index 00000000000..13f2ddb0772 --- /dev/null +++ b/modules/rostests/apitests/cmd/precomp.h @@ -0,0 +1,6 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <windows.h> diff --git a/modules/rostests/apitests/cmd/testlist.c b/modules/rostests/apitests/cmd/testlist.c new file mode 100644 index 00000000000..07ab34a2c97 --- /dev/null +++ b/modules/rostests/apitests/cmd/testlist.c @@ -0,0 +1,16 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_cd(void); +extern void func_echo(void); +extern void func_exit(void); +extern void func_pushd(void); + +const struct test winetest_testlist[] = +{ + { "cd", func_cd }, + { "echo", func_echo }, + { "exit", func_exit }, + { "pushd", func_pushd }, + { 0, 0 } +};

1 0

[reactos] 01/01: [FREELDR] Fix triple fault with debug on screen
by Dmitry Borisov 13 Nov '19

13 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96040ecff93aa533a64e7… commit 96040ecff93aa533a64e73ac9aeb568196082959 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Nov 13 22:03:19 2019 +0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 13 22:52:20 2019 +0100 [FREELDR] Fix triple fault with debug on screen Move the trace call after the MachInit() CORE-16507 --- boot/freeldr/freeldr/freeldr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index 11c0d462687..c31f5eab3a2 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -47,10 +47,10 @@ VOID __cdecl BootMain(IN PCCH CmdLine) /* Debugger pre-initialization */ DebugInit(0); - TRACE("BootMain() called.\n"); - MachInit(CmdLine); + TRACE("BootMain() called.\n"); + /* Check if the CPU is new enough */ FrLdrCheckCpuCompatibility(); // FIXME: Should be done inside MachInit!

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