Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [REACTOS] Switch to year 2018...

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fa693e59b5afbd35e4dc… commit 9fa693e59b5afbd35e4dc10a4a9013997f71b793 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 1 00:00:00 2018 +0100 [REACTOS] Switch to year 2018... ... and Happy New Year 2018 to everyone!! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░░ ░░░░░░█▀█ █▀█ █▀▀ █▀▀ ▀█▀░░░░░░ ░░░░░░▀░▀ ▀░▀ ▀░░ ▀░░ ░▀░░░░░░░ █▄░█ █▀▀ █░█░█░░█░█ █▀▀ █▀█ █▀█ █░██ █▀▀ █░█░█░░▀█▀ █▀▀ █▀█ ██▀ ▀░░▀ ▀▀▀ ░▀▀▀░░░░▀░ ▀▀▀ ▀░▀ ▀░▀ ⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰ ░░░▄████▄░▄███▄░░▄██░▄████▄░░░ ░░░▀▀░▄██░██░██░████░██▄▄██░░░ ░░░░▄██▀░░██░██░░░██░██▀▀██░░░ ░░░██████░▀███▀░░░██░▀████▀░░░ ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/logo/1.bmp | Bin 21640 -> 21654 bytes sdk/include/reactos/version.cmake | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 56d14e687d..4c8ecfe8c9 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/reactos.svg index a8c1f2c9a0..2af08cf093 100644 --- a/dll/win32/msgina/resources/reactos.svg +++ b/dll/win32/msgina/resources/reactos.svg @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2017 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2018 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 56d14e687d..4c8ecfe8c9 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp index f48c35c6d2..1c2c7bdd58 100644 Binary files a/ntoskrnl/inbv/logo/1.bmp and b/ntoskrnl/inbv/logo/1.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 2eabee77ba..ca0ceb4c9a 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -3,7 +3,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "8") -set(COPYRIGHT_YEAR "2017") +set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

6 years, 11 months

[reactos] 01/01: [NTFS] Start using different tags for allocations. They all be Ntf? as for the Windows NTFS driver

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2a5322576b87a1233fad… commit d2a5322576b87a1233fad125b1e0ed70c1800399 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 31 23:11:12 2017 +0100 [NTFS] Start using different tags for allocations. They all be Ntf? as for the Windows NTFS driver --- drivers/filesystems/ntfs/fsctl.c | 2 +- drivers/filesystems/ntfs/ntfs.c | 4 ++-- drivers/filesystems/ntfs/ntfs.h | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index 87858e07c0..c85f1bfb9f 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -275,7 +275,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, ExFreePool(BootSector); ExInitializeNPagedLookasideList(&DeviceExt->FileRecLookasideList, - NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_NTFS, 0); + NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_FILE_REC, 0); DeviceExt->MasterFileTable = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (DeviceExt->MasterFileTable == NULL) diff --git a/drivers/filesystems/ntfs/ntfs.c b/drivers/filesystems/ntfs/ntfs.c index 53733e1dec..c29badab08 100644 --- a/drivers/filesystems/ntfs/ntfs.c +++ b/drivers/filesystems/ntfs/ntfs.c @@ -142,13 +142,13 @@ DriverEntry(PDRIVER_OBJECT DriverObject, /* Initialize lookaside list for IRP contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList, - NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), 'PRIN', 0); + NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), TAG_IRP_CTXT, 0); /* Initialize lookaside list for FCBs */ ExInitializeNPagedLookasideList(&NtfsGlobalData->FcbLookasideList, NULL, NULL, 0, sizeof(NTFS_FCB), TAG_FCB, 0); /* Initialize lookaside list for attributes contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->AttrCtxtLookasideList, - NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_NTFS, 0); + NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_ATT_CTXT, 0); /* Driver can't be unloaded */ DriverObject->DriverUnload = NULL; diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 7b88f7b7c4..a0cb6ab7cd 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -14,7 +14,12 @@ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) -#define TAG_NTFS 'SFTN' +#define TAG_NTFS '0ftN' +#define TAG_CCB 'CftN' +#define TAG_FCB 'FftN' +#define TAG_IRP_CTXT 'iftN' +#define TAG_ATT_CTXT 'aftN' +#define TAG_FILE_REC 'rftN' #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) @@ -140,9 +145,6 @@ typedef struct ULONG LastOffset; } NTFS_CCB, *PNTFS_CCB; -#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' - typedef struct { NTFSIDENTIFIER Identifier;

6 years, 11 months

[reactos] 01/01: [CHARMAP:NEW] Adding some indentation (#241)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7459b0cc26093593127c… commit e7459b0cc26093593127c164057e1c4614b4c4b5 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Dec 31 22:42:16 2017 +0100 [CHARMAP:NEW] Adding some indentation (#241) This file lacks proper indentation and that doesn't meet the ReactOS Coding style as it should. --- base/applications/charmap_new/charmap.rc | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/base/applications/charmap_new/charmap.rc b/base/applications/charmap_new/charmap.rc index 878a785824..9d8267a925 100644 --- a/base/applications/charmap_new/charmap.rc +++ b/base/applications/charmap_new/charmap.rc @@ -19,83 +19,83 @@ IDI_ICON ICON "res/charmap.ico" #pragma code_page(65001) #ifdef LANGUAGE_BG_BG -#include "lang/bg-BG.rc" + #include "lang/bg-BG.rc" #endif #ifdef LANGUAGE_CA_ES -#include "lang/ca-ES.rc" + #include "lang/ca-ES.rc" #endif #ifdef LANGUAGE_CS_CZ -#include "lang/cs-CZ.rc" + #include "lang/cs-CZ.rc" #endif #ifdef LANGUAGE_DE_DE -#include "lang/de-DE.rc" + #include "lang/de-DE.rc" #endif #ifdef LANGUAGE_EN_US -#include "lang/en-US.rc" + #include "lang/en-US.rc" #endif #ifdef LANGUAGE_EL_GR -#include "lang/el-GR.rc" + #include "lang/el-GR.rc" #endif #ifdef LANGUAGE_ES_ES -#include "lang/es-ES.rc" + #include "lang/es-ES.rc" #endif #ifdef LANGUAGE_FR_FR -#include "lang/fr-FR.rc" + #include "lang/fr-FR.rc" #endif #ifdef LANGUAGE_HE_IL -#include "lang/he-IL.rc" + #include "lang/he-IL.rc" #endif #ifdef LANGUAGE_ID_ID -#include "lang/id-ID.rc" + #include "lang/id-ID.rc" #endif #ifdef LANGUAGE_IT_IT -#include "lang/it-IT.rc" + #include "lang/it-IT.rc" #endif #ifdef LANGUAGE_JA_JP -#include "lang/ja-JP.rc" + #include "lang/ja-JP.rc" #endif #ifdef LANGUAGE_KO_KR -#include "lang/ko-KR.rc" + #include "lang/ko-KR.rc" #endif #ifdef LANGUAGE_LT_LT -#include "lang/lt-LT.rc" + #include "lang/lt-LT.rc" #endif #ifdef LANGUAGE_NL_NL -#include "lang/nl-NL.rc" + #include "lang/nl-NL.rc" #endif #ifdef LANGUAGE_NB_NO -#include "lang/no-NO.rc" + #include "lang/no-NO.rc" #endif #ifdef LANGUAGE_PL_PL -#include "lang/pl-PL.rc" + #include "lang/pl-PL.rc" #endif #ifdef LANGUAGE_PT_BR -#include "lang/pt-BR.rc" + #include "lang/pt-BR.rc" #endif #ifdef LANGUAGE_RO_RO -#include "lang/ro-RO.rc" + #include "lang/ro-RO.rc" #endif #ifdef LANGUAGE_RU_RU -#include "lang/ru-RU.rc" + #include "lang/ru-RU.rc" #endif #ifdef LANGUAGE_SK_SK -#include "lang/sk-SK.rc" + #include "lang/sk-SK.rc" #endif #ifdef LANGUAGE_SQ_AL -#include "lang/sq-AL.rc" + #include "lang/sq-AL.rc" #endif #ifdef LANGUAGE_SV_SE -#include "lang/sv-SE.rc" + #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_TR_TR -#include "lang/tr-TR.rc" + #include "lang/tr-TR.rc" #endif #ifdef LANGUAGE_UK_UA -#include "lang/uk-UA.rc" + #include "lang/uk-UA.rc" #endif #ifdef LANGUAGE_ZH_CN -#include "lang/zh-CN.rc" + #include "lang/zh-CN.rc" #endif #ifdef LANGUAGE_ZH_TW -#include "lang/zh-TW.rc" + #include "lang/zh-TW.rc" #endif

6 years, 11 months

[reactos] 01/01: [CHARMAP:NEW] Italian language implementation (#243)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=738aaf6dc676b26856ab0… commit 738aaf6dc676b26856ab0e4de78f945368d35994 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Dec 31 22:36:20 2017 +0100 [CHARMAP:NEW] Italian language implementation (#243) This patch brings the Italian translation resource file for ReactOS Character Map (CHARMAP_NEW). --- base/applications/charmap_new/lang/it-IT.rc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/base/applications/charmap_new/lang/it-IT.rc b/base/applications/charmap_new/lang/it-IT.rc new file mode 100644 index 0000000000..4379f46102 --- /dev/null +++ b/base/applications/charmap_new/lang/it-IT.rc @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian Translation for ReactOS Character Map + * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + */ + + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX +CAPTION "Mappa Caratteri di ReactOS" +BEGIN + LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "Caratteri da copiare:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED +END + +STRINGTABLE +BEGIN + IDS_ABOUT "&Informazioni su…" + IDS_TITLE "Mappa caratteri" +END

6 years, 11 months

[reactos] 01/01: [CHARMAP:NEW] Romanian language implementation (#242)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40b3380f38f868a3ec547… commit 40b3380f38f868a3ec5476d4b92e884d929d746c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Dec 31 22:35:33 2017 +0100 [CHARMAP:NEW] Romanian language implementation (#242) This patch implements the Romanian language resource file for ReactOS Character Map software (CHARMAP_NEW). --- base/applications/charmap_new/lang/ro-RO.rc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/base/applications/charmap_new/lang/ro-RO.rc b/base/applications/charmap_new/lang/ro-RO.rc new file mode 100644 index 0000000000..60dc0a9cad --- /dev/null +++ b/base/applications/charmap_new/lang/ro-RO.rc @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian Translation for ReactOS Character Map + * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + */ + + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX +CAPTION "Hartă de caractere de ReactOS" +BEGIN + LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "Caractere de copiat:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "Selectează", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Copiază", IDC_COPY, 242, 186, 44, 13, WS_DISABLED +END + +STRINGTABLE +BEGIN + IDS_ABOUT "&Despre…" + IDS_TITLE "Hartă de caractere" +END

6 years, 11 months

[reactos] 01/01: [DXTN] Fix MSVC build with runtime checks.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bfbaa66fc254c05870d0… commit 2bfbaa66fc254c05870d07c13ceab50ea2be8882 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 31 13:18:07 2017 +0100 [DXTN] Fix MSVC build with runtime checks. --- dll/3rdparty/dxtn/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt index e2e95fb08c..6a9c643287 100644 --- a/dll/3rdparty/dxtn/CMakeLists.txt +++ b/dll/3rdparty/dxtn/CMakeLists.txt @@ -6,6 +6,6 @@ add_library(dxtn SHARED txc_fetch_dxtn.c ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def) -set_entrypoint(dxtn 0) -add_importlibs(dxtn msvcrt) +set_module_type(dxtn win32dll ENTRYPOINT 0) +add_importlibs(dxtn msvcrt kernel32) add_cd_file(TARGET dxtn DESTINATION reactos/system32 FOR all)

6 years, 11 months

[reactos] 03/03: [SHLEXTDBG] Add utility to run / debug shell extensions. CORE-7684 #234

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb885480b2606843577f8… commit cb885480b2606843577f8239c79e2b93a718883b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 23 22:31:15 2017 +0100 [SHLEXTDBG] Add utility to run / debug shell extensions. CORE-7684 #234 --- .../rosapps/applications/devutils/CMakeLists.txt | 1 + .../applications/devutils/shlextdbg/CMakeLists.txt | 12 + .../applications/devutils/shlextdbg/shlextdbg.cpp | 374 +++++++++++++++++++++ .../applications/devutils/shlextdbg/shlextdbg.rc | 9 + 4 files changed, 396 insertions(+) diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt index 7f3b162793..5ea4b089d6 100644 --- a/modules/rosapps/applications/devutils/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory(gdihv) add_subdirectory(genguid) add_subdirectory(nls2txt) add_subdirectory(shimdbg) +add_subdirectory(shlextdbg) add_subdirectory(symdump) add_subdirectory(syscalldump) add_subdirectory(txt2nls) diff --git a/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt b/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt new file mode 100644 index 0000000000..21f80e7d60 --- /dev/null +++ b/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt @@ -0,0 +1,12 @@ + +set_cpp(WITH_RUNTIME) +add_definitions(-D_ATL_NO_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) + +add_executable(shlextdbg shlextdbg.cpp shlextdbg.rc) + +set_module_type(shlextdbg win32cui UNICODE) +target_link_libraries(shlextdbg atlnew uuid) +add_importlibs(shlextdbg ole32 comctl32 shell32 user32 msvcrt kernel32) +add_cd_file(TARGET shlextdbg DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp new file mode 100644 index 0000000000..b4d24a397a --- /dev/null +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp @@ -0,0 +1,374 @@ +/* + * PROJECT: shlextdbg + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shell extension debug utility + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <windows.h> +#include <shlobj.h> +#include <atlbase.h> // thanks gcc +#include <atlcom.h> // thanks gcc +#include <atlstr.h> +#include <atlsimpcoll.h> +#include <conio.h> + // hack for gcc: +#define DbgPrint(...) printf(__VA_ARGS__) +#include <shellutils.h> + +enum WaitType +{ + Wait_None, + Wait_Infinite, + Wait_OpenWindows, + Wait_Input, +}; + +CLSID g_CLSID = { 0 }; +CStringW g_DLL; +CStringW g_ShellExtInit; +bool g_bIShellPropSheetExt = false; +CStringA g_ContextMenu; +WaitType g_Wait = Wait_None; + +HRESULT CreateIDataObject(CComHeapPtr<ITEMIDLIST>& pidl, CComPtr<IDataObject>& dataObject, PCWSTR FileName) +{ + HRESULT hr = SHParseDisplayName(FileName, NULL, &pidl, 0, NULL); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to create pidl from '%s': 0x%x\n", FileName, hr); + return hr; + } + + CComPtr<IShellFolder> shellFolder; + PCUITEMID_CHILD childs; + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &shellFolder), &childs); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to bind to parent: 0x%x\n", hr); + return hr; + } + hr = shellFolder->GetUIObjectOf(NULL, 1, &childs, IID_IDataObject, NULL, (PVOID*)&dataObject); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to query IDataObject: 0x%x\n", hr); + } + return hr; +} + +HRESULT LoadAndInitialize(REFIID riid, LPVOID* ppv) +{ + CComPtr<IShellExtInit> spShellExtInit; + HRESULT hr; + if (g_DLL.IsEmpty()) + { + hr = CoCreateInstance(g_CLSID, NULL, CLSCTX_ALL, IID_PPV_ARG(IShellExtInit, &spShellExtInit)); + if (!SUCCEEDED(hr)) + { + WCHAR Buffer[100]; + StringFromGUID2(g_CLSID, Buffer, _countof(Buffer)); + wprintf(L"Failed to Create %s:IShellExtInit: 0x%x\n", Buffer, hr); + return hr; + } + } + else + { + typedef HRESULT (STDAPICALLTYPE *tDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + HMODULE mod = LoadLibraryW(g_DLL); + if (!mod) + { + wprintf(L"Failed to Load %s:(0x%x)\n", g_DLL.GetString(), GetLastError()); + return E_FAIL; + } + tDllGetClassObject DllGet = (tDllGetClassObject)GetProcAddress(mod, "DllGetClassObject"); + if (!DllGet) + { + wprintf(L"%s does not export DllGetClassObject\n", g_DLL.GetString()); + return E_FAIL; + } + CComPtr<IClassFactory> spClassFactory; + hr = DllGet(g_CLSID, IID_PPV_ARG(IClassFactory, &spClassFactory)); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to create IClassFactory: 0x%x\n", hr); + return hr; + } + hr = spClassFactory->CreateInstance(NULL, IID_PPV_ARG(IShellExtInit, &spShellExtInit)); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to Request IShellExtInit from IClassFactory: 0x%x\n", hr); + return hr; + } + } + + CComPtr<IDataObject> spDataObject; + CComHeapPtr<ITEMIDLIST> pidl; + hr = CreateIDataObject(pidl, spDataObject, g_ShellExtInit.GetString()); + if (!SUCCEEDED(hr)) + return hr; + + hr = spShellExtInit->Initialize(pidl, spDataObject, NULL); + if (!SUCCEEDED(hr)) + { + wprintf(L"IShellExtInit->Initialize failed: 0x%x\n", hr); + return hr; + } + hr = spShellExtInit->QueryInterface(riid, ppv); + if (!SUCCEEDED(hr)) + { + WCHAR Buffer[100]; + StringFromGUID2(riid, Buffer, _countof(Buffer)); + wprintf(L"Failed to query %s from IShellExtInit: 0x%x\n", Buffer, hr); + } + return hr; +} + + +CSimpleArray<HWND> g_Windows; +HWND g_ConsoleWindow; +BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + if (hwnd != g_ConsoleWindow) + { + DWORD pid = 0; + GetWindowThreadProcessId(hwnd, &pid); + if (pid == GetCurrentProcessId()) + { + g_Windows.Add(hwnd); + } + } + return TRUE; +} + +void WaitWindows() +{ + /* Give the windows some time to spawn */ + Sleep(2000); + g_ConsoleWindow = GetConsoleWindow(); + while (true) + { + g_Windows.RemoveAll(); + EnumWindows(EnumWindowsProc, NULL); + if (g_Windows.GetSize() == 0) + break; + Sleep(500); + } + wprintf(L"All windows closed (ignoring console window)\n"); +} + + + +CSimpleArray<HPROPSHEETPAGE> g_Pages; +static BOOL CALLBACK cb_AddPage(HPROPSHEETPAGE page, LPARAM lParam) +{ + g_Pages.Add(page); + if (lParam != (LPARAM)&g_Pages) + { + wprintf(L"Propsheet failed to pass lParam, got: 0x%x\n", lParam); + } + return TRUE; +} + +static bool isCmdWithArg(int argc, WCHAR** argv, int& n, PCWSTR check, PCWSTR &arg) +{ + arg = NULL; + size_t len = wcslen(check); + if (!_wcsnicmp(argv[n] + 1, check, len)) + { + PCWSTR cmd = argv[n] + len + 1; + if (*cmd == ':' || *cmd == '=') + { + arg = cmd + 1; + return true; + } + if (n + 1 < argc) + { + arg = argv[n+1]; + n++; + return true; + } + wprintf(L"Command %s has no required argument!\n", check); + return false; + } + return false; +} + +static bool isCmd(int argc, WCHAR** argv, int n, PCWSTR check) +{ + return !wcsicmp(argv[n] + 1, check); +} + +static void PrintHelp(PCWSTR ExtraLine) +{ + if (ExtraLine) + wprintf(L"%s\n", ExtraLine); + + wprintf(L"shlextdbg /clsid={clsid} [/dll=dllname] /IShellExtInit=filename |shlextype| |waitoptions|\n"); + wprintf(L" {clsid}: The CLSID or ProgID of the object to create\n"); + wprintf(L" dll: Optional dllname to create the object from, instead of CoCreateInstance\n"); + wprintf(L" filename: The filename to pass to IShellExtInit->Initialze\n"); + wprintf(L" shlextype: The type of shell extention to run:\n"); + wprintf(L" /IShellPropSheetExt to create a property sheet\n"); + wprintf(L" /IContextMenu=verb to activate the specified verb\n"); + wprintf(L" waitoptions: Specify how to wait:\n"); + wprintf(L" /infinite: Keep on waiting infinitely\n"); + wprintf(L" /openwindows: Wait for all windows from the current application to close\n"); + wprintf(L" /input: Wait for input\n"); + wprintf(L"\n"); +} + +/* +Examples: + +/clsid={513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8} /IShellExtInit=C:\RosBE\Uninstall.exe /IShellPropSheetExt +/clsid=CompressedFolder /IShellExtInit=e:\test.zip /IContextMenu=extract /openwindows +/clsid=CompressedFolder /IShellExtInit=e:\test.zip /IContextMenu=extract /openwindows /dll=R:\build\dev\devenv\dll\shellext\zipfldr\Debug\zipfldr.dll + +*/ +extern "C" // and another hack for gcc +int wmain(int argc, WCHAR **argv) +{ + bool failArgs = false; + for (int n = 1; n < argc; ++n) + { + WCHAR* cmd = argv[n]; + if (cmd[0] == '-' || cmd[0] == '/') + { + PCWSTR arg; + if (isCmdWithArg(argc, argv, n, L"clsid", arg)) + { + HRESULT hr = CLSIDFromString(arg, &g_CLSID); + if (!SUCCEEDED(hr)) + { + wprintf(L"Failed to convert %s to CLSID\n", arg); + failArgs = true; + } + } + else if (isCmdWithArg(argc, argv, n, L"dll", arg)) + { + g_DLL = arg; + } + else if (isCmdWithArg(argc, argv, n, L"IShellExtInit", arg)) + { + g_ShellExtInit = arg; + } + else if (isCmd(argc, argv, n, L"IShellPropSheetExt")) + { + g_bIShellPropSheetExt = true; + } + else if (isCmdWithArg(argc, argv, n, L"IContextMenu", arg)) + { + g_ContextMenu = arg; + } + else if (isCmd(argc, argv, n, L"infinite")) + { + g_Wait = Wait_Infinite; + } + else if (isCmd(argc, argv, n, L"openwindows")) + { + g_Wait = Wait_OpenWindows; + } + else if (isCmd(argc, argv, n, L"input")) + { + g_Wait = Wait_Input; + } + else + { + wprintf(L"Unknown argument: %s\n", cmd); + failArgs = true; + } + } + } + + if (failArgs) + { + PrintHelp(NULL); + return E_INVALIDARG; + } + + + CLSID EmptyCLSID = { 0 }; + if (EmptyCLSID == g_CLSID) + { + PrintHelp(L"No CLSID specified"); + return E_INVALIDARG; + } + + if (g_ShellExtInit.IsEmpty()) + { + PrintHelp(L"No filename specified"); + return E_INVALIDARG; + } + + INITCOMMONCONTROLSEX icc = { sizeof(icc), ICC_LINK_CLASS | ICC_STANDARD_CLASSES }; + InitCommonControlsEx(&icc); + CoInitialize(NULL); + + HRESULT hr; + if (g_bIShellPropSheetExt) + { + CComPtr<IShellPropSheetExt> spSheetExt; + hr = LoadAndInitialize(IID_PPV_ARG(IShellPropSheetExt, &spSheetExt)); + if (!SUCCEEDED(hr)) + return hr; + + hr = spSheetExt->AddPages(cb_AddPage, (LPARAM)&g_Pages); + if (!SUCCEEDED(hr)) + { + wprintf(L"IShellPropSheetExt->AddPages failed: 0x%x\n", hr); + return hr; + } + + USHORT ActivePage = HRESULT_CODE(hr); + PROPSHEETHEADERW psh = { 0 }; + + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_PROPTITLE; + psh.pszCaption = L"shlextdbg"; + psh.phpage = g_Pages.GetData(); + psh.nPages = g_Pages.GetSize(); + psh.nStartPage = ActivePage ? (ActivePage-1) : 0; + hr = PropertySheetW(&psh); + + wprintf(L"PropertySheetW returned: 0x%x\n", hr); + } + if (!g_ContextMenu.IsEmpty()) + { + CComPtr<IContextMenu> spContextMenu; + hr = LoadAndInitialize(IID_PPV_ARG(IContextMenu, &spContextMenu)); + if (!SUCCEEDED(hr)) + return hr; + + CMINVOKECOMMANDINFO cm = { sizeof(cm), 0 }; + cm.lpVerb = g_ContextMenu.GetString(); + cm.nShow = SW_SHOW; + hr = spContextMenu->InvokeCommand(&cm); + + if (!SUCCEEDED(hr)) + { + wprintf(L"IContextMenu->InvokeCommand failed: 0x%x\n", hr); + return hr; + } + wprintf(L"IContextMenu->InvokeCommand returned: 0x%x\n", hr); + } + + switch (g_Wait) + { + case Wait_None: + break; + case Wait_Infinite: + while (true) { + Sleep(1000); + } + break; + case Wait_OpenWindows: + WaitWindows(); + break; + case Wait_Input: + wprintf(L"Press any key to continue...\n"); + _getch(); + break; + + } + return 0; +} diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.rc b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.rc new file mode 100644 index 0000000000..ea1090a207 --- /dev/null +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.rc @@ -0,0 +1,9 @@ +#include <windef.h> +#include <winuser.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Shell Extension Debug Utility" +#define REACTOS_STR_INTERNAL_NAME "shlextdbg" +#define REACTOS_STR_ORIGINAL_FILENAME "shlextdbg.exe" +#include <reactos/version.rc> + +#include <reactos/manifest_exe.rc>

6 years, 11 months

[reactos] 02/03: [ROSDLGS] Add SetWizardButtons to CPropertyPageImpl CORE-7684 #234

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2a5a804b4b43b59e21c0… commit b2a5a804b4b43b59e21c0c9931217c10f0da1c2a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Dec 24 14:56:42 2017 +0100 [ROSDLGS] Add SetWizardButtons to CPropertyPageImpl CORE-7684 #234 --- sdk/include/reactos/rosdlgs.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/reactos/rosdlgs.h b/sdk/include/reactos/rosdlgs.h index 61361ab313..900beeb610 100644 --- a/sdk/include/reactos/rosdlgs.h +++ b/sdk/include/reactos/rosdlgs.h @@ -69,6 +69,11 @@ namespace ATL ::SendMessage(GetParent(), bChanged ? PSM_CHANGED : PSM_UNCHANGED, (WPARAM)m_hWnd, 0L); } + void SetWizardButtons(DWORD dwFlags) + { + ::PostMessage(GetParent(), PSM_SETWIZBUTTONS, 0, (LPARAM)dwFlags); + } + BOOL OnPageCreate() { return TRUE;

6 years, 11 months

[reactos] 01/03: [COM_APITEST] Add zipfldr tests. CORE-7684 #234

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bdc74bf5d8937bd5bf20… commit 4bdc74bf5d8937bd5bf20aaade43a1ad03c394ce Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Nov 28 22:58:07 2017 +0100 [COM_APITEST] Add zipfldr tests. CORE-7684 #234 --- modules/rostests/apitests/com/CMakeLists.txt | 1 + modules/rostests/apitests/com/com_apitest.h | 8 ++ modules/rostests/apitests/com/testlist.c | 2 + modules/rostests/apitests/com/zipfldr.c | 110 +++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) diff --git a/modules/rostests/apitests/com/CMakeLists.txt b/modules/rostests/apitests/com/CMakeLists.txt index 76e6efef8c..73f0000b2c 100644 --- a/modules/rostests/apitests/com/CMakeLists.txt +++ b/modules/rostests/apitests/com/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE ole32.c shdocvw.c shell32.c + zipfldr.c com_apitest.c com_apitest.h) diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index 715213a725..f1f4c73876 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -200,4 +200,12 @@ DEFINE_GUID(IID_CDefView, 0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x6 DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); +// zipfldr.dll +DEFINE_GUID(CLSID_ZipFolderStorageHandler, 0xe88dcce0, 0xb7b3, 0x11d1, 0xa9, 0xf0, 0x00, 0xaa, 0x00, 0x60, 0xfa, 0x31); +DEFINE_GUID(CLSID_ZipFolderSendTo, 0x888dca60, 0xfc0a, 0x11cf, 0x8f, 0x0f, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ZipFolderContextMenu, 0xb8cdcb65, 0xb1bf, 0x4b42, 0x94, 0x28, 0x1d, 0xfd, 0xb7, 0xee, 0x92, 0xaf); +DEFINE_GUID(CLSID_ZipFolderRightDragHandler,0xbd472f60, 0x27fa, 0x11cf, 0xb8, 0xb4, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(CLSID_ZipFolderDropHandler, 0xed9d80b9, 0xd157, 0x457b, 0x91, 0x92, 0x0e, 0x72, 0x80, 0x31, 0x3b, 0xf0); + #endif /* _COM_APITEST_H_ */ + diff --git a/modules/rostests/apitests/com/testlist.c b/modules/rostests/apitests/com/testlist.c index 0311e254b6..020440467a 100644 --- a/modules/rostests/apitests/com/testlist.c +++ b/modules/rostests/apitests/com/testlist.c @@ -11,6 +11,7 @@ extern void func_netshell(void); extern void func_ole32(void); extern void func_shdocvw(void); extern void func_shell32(void); +extern void func_zipfldr(void); const struct test winetest_testlist[] = { @@ -22,6 +23,7 @@ const struct test winetest_testlist[] = { "ole32", func_ole32 }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 }, + { "zipfldr", func_zipfldr }, { 0, 0 } }; diff --git a/modules/rostests/apitests/com/zipfldr.c b/modules/rostests/apitests/com/zipfldr.c new file mode 100644 index 0000000000..e6bbbd548f --- /dev/null +++ b/modules/rostests/apitests/com/zipfldr.c @@ -0,0 +1,110 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: COM interface test for zipfldr classes + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +/* +This is only tested on w10 & 2k3, so the defines might be wrong for the other versions. +CLSID_ZipFolderStorageHandler and CLSID_ZipFolderContextMenu seem to be the same. +*/ + + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_ZipFolderStorageHandler), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IStorage }, + { 0x8, &IID_IContextMenu }, + { 0xc, &IID_IShellExtInit }, +#if _WIN32_WINNT < 0x0a00 + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IPersistFolder2 }, + { 0x14, &IID_IPersistFolder }, + { 0x14, &IID_IPersist }, +#else + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0x14, &IID_IFolderType }, +#endif + }, + L"Apartment" + }, + { + ID_NAME(CLSID_ZipFolderSendTo), + { +#if _WIN32_WINNT >= 0x0a00 + { -0x8, &IID_IObjectWithSite }, +#endif + { 0x0, &IID_IDropTarget }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFile }, + { 0x4, &IID_IPersist }, + }, + L"Apartment" + }, + { + ID_NAME(CLSID_ZipFolderContextMenu), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IStorage }, + { 0x8, &IID_IContextMenu }, + { 0xc, &IID_IShellExtInit }, +#if _WIN32_WINNT < 0x0a00 + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IPersistFolder2 }, + { 0x14, &IID_IPersistFolder }, + { 0x14, &IID_IPersist }, +#else + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0x14, &IID_IFolderType }, +#endif + }, + L"Apartment" + }, + { + ID_NAME(CLSID_ZipFolderRightDragHandler), + { + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IShellExtInit }, + { 0x0, &IID_IUnknown }, + }, + L"Apartment" + }, + { + ID_NAME(CLSID_ZipFolderDropHandler), + { +#if _WIN32_WINNT < 0x0a00 + { 0x0, &IID_IDropTarget }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFile }, + { 0x4, &IID_IPersist }, +#else + { -0x4, &IID_IDropTarget }, + { 0x0, &IID_IUnknown }, +#endif + }, + L"Apartment" + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(zipfldr) +{ + TestClasses(L"zipfldr", ExpectedInterfaces, ExpectedInterfaceCount); +}

6 years, 11 months

[reactos] 03/03: [NTFS] Fix a memory leak on error

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d3d74151b77ec6c59414… commit 2d3d74151b77ec6c59414616b88634698317bb87 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 31 14:18:02 2017 +0100 [NTFS] Fix a memory leak on error CID 1427053 --- drivers/filesystems/ntfs/mft.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index 4724e8d899..515abf7a4f 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -948,6 +948,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, DPRINT1("Unable to create LargeMcb!\n"); if (AttribDataSize.QuadPart > 0) ExFreePoolWithTag(AttribData, TAG_NTFS); + ExFreePoolWithTag(NewRecord, TAG_NTFS); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -961,6 +962,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, DPRINT1("ERROR: Couldn't update file record to continue migration!\n"); if (AttribDataSize.QuadPart > 0) ExFreePoolWithTag(AttribData, TAG_NTFS); + ExFreePoolWithTag(NewRecord, TAG_NTFS); return Status; }

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017