Ros-diffs April 2023

ros-diffs@reactos.org

17 participants
89 discussions

[reactos] 01/01: [ATL] Take _ATL_FREE_THREADED into account

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=507aae4c30510eb6a6176… commit 507aae4c30510eb6a6176c5cfd55b0366bf1370c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 19 20:27:31 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 27 16:29:21 2023 +0200 [ATL] Take _ATL_FREE_THREADED into account When it is not defined, COM should not be initialize multithreaded --- sdk/lib/atl/atlbase.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 1b0b0361b6a..d6e0e9ec386 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -849,7 +849,12 @@ public: static HRESULT InitializeCom() { - return ::CoInitializeEx(NULL, COINIT_MULTITHREADED); +#if defined(_ATL_FREE_THREADED) + constexpr COINIT coInit = COINIT_MULTITHREADED; +#else + constexpr COINIT coInit = COINIT_APARTMENTTHREADED; +#endif + return ::CoInitializeEx(NULL, coInit); } static void UninitializeCom()

1 year, 8 months

[reactos] 01/01: [ADVPACK_APITEST] Add advpack_apitest:DelNode testcase (#5256)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4b7087a0e3c047c8a79b… commit f4b7087a0e3c047c8a79b8c567f7b21c12d70375 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 27 20:35:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 27 20:35:41 2023 +0900 [ADVPACK_APITEST] Add advpack_apitest:DelNode testcase (#5256) Preparation for advpack!DelNodeA/W functions implementation. CORE-13275, ROSTESTS-276 --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/advpack/CMakeLists.txt | 10 + modules/rostests/apitests/advpack/DelNode.c | 587 +++++++++++++++++++++++ modules/rostests/apitests/advpack/testlist.c | 18 + 4 files changed, 616 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index b9f10c04120..407b5955964 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories(include) add_subdirectory(acpi) add_subdirectory(advapi32) +add_subdirectory(advpack) add_subdirectory(afd) add_subdirectory(apphelp) add_subdirectory(appshim) diff --git a/modules/rostests/apitests/advpack/CMakeLists.txt b/modules/rostests/apitests/advpack/CMakeLists.txt new file mode 100644 index 00000000000..a811f98e1b3 --- /dev/null +++ b/modules/rostests/apitests/advpack/CMakeLists.txt @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + DelNode.c + testlist.c) + +add_executable(advpack_apitest ${SOURCE}) +target_link_libraries(advpack_apitest wine ${PSEH_LIB}) +set_module_type(advpack_apitest win32cui) +add_importlibs(advpack_apitest advpack msvcrt kernel32 ntdll) +add_rostests_file(TARGET advpack_apitest) diff --git a/modules/rostests/apitests/advpack/DelNode.c b/modules/rostests/apitests/advpack/DelNode.c new file mode 100644 index 00000000000..7f968d5ab8f --- /dev/null +++ b/modules/rostests/apitests/advpack/DelNode.c @@ -0,0 +1,587 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for advpack.dll DelNode function + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include <apitest.h> + +#include <windef.h> +#include <stdio.h> + +/* Flags for DelNode */ +#define ADN_DEL_IF_EMPTY 0x00000001 +#define ADN_DONT_DEL_SUBDIRS 0x00000002 +#define ADN_DONT_DEL_DIR 0x00000004 +#define ADN_DEL_UNC_PATHS 0x00000008 + +/* DelNodeA and DelNodeW in advpack.dll */ +typedef HRESULT (WINAPI *DELNODEA)(LPCSTR, DWORD); +typedef HRESULT (WINAPI *DELNODEW)(LPCWSTR, DWORD); + +static HINSTANCE s_hAdvPack = NULL; +static DELNODEA s_pDelNodeA = NULL; +static DELNODEW s_pDelNodeW = NULL; + +typedef struct +{ + const char *item; + BOOL is_dir; +} NODEA; + +static const NODEA s_nodesA[] = +{ + { "dir1", TRUE }, /* 0 */ + { "dir1\\dir2", TRUE }, /* 1 */ + { "dir1\\dir2\\file1", FALSE }, /* 2 */ +}; + +typedef struct +{ + const WCHAR *item; + BOOL is_dir; +} NODEW; + +static const NODEW s_nodesW[] = +{ + { L"dir1", TRUE }, /* 0 */ + { L"dir1\\dir2", TRUE }, /* 1 */ + { L"dir1\\dir2\\file1", FALSE }, /* 2 */ +}; + +typedef enum +{ + EAT_CREATE, + EAT_DELETE, + EAT_CHECK_EXIST, + EAT_CHECK_NON_EXIST, + EAT_CALL +} ENTRY_ACTION_TYPE; + +typedef struct +{ + INT lineno; + INT node; + ENTRY_ACTION_TYPE action_type; + DWORD flags; + HRESULT ret; +} ENTRY; + +/* TODO: ADN_DEL_UNC_PATHS */ +#define FLAGS0 0 +#define FLAGS1 ADN_DEL_IF_EMPTY +#define FLAGS2 ADN_DONT_DEL_DIR +#define FLAGS3 ADN_DONT_DEL_SUBDIRS +#define FLAGS4 (ADN_DONT_DEL_DIR | ADN_DONT_DEL_SUBDIRS) +#define FLAGS5 (ADN_DEL_IF_EMPTY | ADN_DONT_DEL_DIR) +#define FLAGS6 (ADN_DEL_IF_EMPTY | ADN_DONT_DEL_SUBDIRS) +#define FLAGS7 (ADN_DEL_IF_EMPTY | ADN_DONT_DEL_DIR | ADN_DONT_DEL_SUBDIRS) +#define FLAGS8 0xFFFFFFFF + +/* The test entries */ +static const ENTRY s_entries[] = +{ + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_DELETE }, + { __LINE__, 0, EAT_DELETE }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS0, S_OK }, + { __LINE__, 0, EAT_CHECK_NON_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS1, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS2, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS3, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS4, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS5, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS6, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS7, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS8, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS0, S_OK }, + { __LINE__, 0, EAT_CHECK_NON_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS1, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS2, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS3, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS4, S_OK }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS5, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS6, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS7, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 0, EAT_CREATE }, + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 0, EAT_CALL, FLAGS8, E_FAIL }, + { __LINE__, 0, EAT_CHECK_EXIST }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS0, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS1, E_FAIL }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS2, S_OK }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS3, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS4, S_OK }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS5, E_FAIL }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS6, E_FAIL }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS7, E_FAIL }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS8, E_FAIL }, + { __LINE__, 1, EAT_CHECK_EXIST }, + { __LINE__, 2, EAT_CHECK_EXIST }, + + { __LINE__, 2, EAT_DELETE }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS0, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS1, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS2, S_OK }, + { __LINE__, 1, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS3, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS4, S_OK }, + { __LINE__, 1, EAT_CHECK_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS5, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS6, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS7, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + { __LINE__, 1, EAT_CALL, FLAGS8, S_OK }, + { __LINE__, 1, EAT_CHECK_NON_EXIST }, + + { __LINE__, 1, EAT_CREATE }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS0, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS1, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS2, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS3, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS4, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS5, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS6, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS7, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_CREATE }, + { __LINE__, 2, EAT_CALL, FLAGS8, S_OK }, + { __LINE__, 2, EAT_CHECK_NON_EXIST }, + + { __LINE__, 2, EAT_DELETE }, + { __LINE__, 1, EAT_DELETE }, + { __LINE__, 0, EAT_DELETE }, + + { __LINE__, 2, EAT_CALL, FLAGS0, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS1, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS2, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS3, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS4, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS5, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS6, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS7, E_FAIL }, + { __LINE__, 2, EAT_CALL, FLAGS8, E_FAIL }, + + { __LINE__, 1, EAT_CALL, FLAGS0, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS1, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS2, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS3, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS4, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS5, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS6, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS7, E_FAIL }, + { __LINE__, 1, EAT_CALL, FLAGS8, E_FAIL }, +}; + +static char s_cur_dir_A[MAX_PATH] = ""; +static WCHAR s_cur_dir_W[MAX_PATH] = L""; + +static char *GetPathA(const char *item) +{ + static char s_path[MAX_PATH]; + lstrcpyA(s_path, s_cur_dir_A); + lstrcatA(s_path, "\\"); + lstrcatA(s_path, item); + return s_path; +} + +static WCHAR *GetPathW(const WCHAR *item) +{ + static WCHAR s_path[MAX_PATH]; + lstrcpyW(s_path, s_cur_dir_W); + lstrcatW(s_path, L"\\"); + lstrcatW(s_path, item); + return s_path; +} + +static void cleanupA(void) +{ + size_t i, k; + for (k = 0; k < 4; ++k) + { + for (i = 0; i < _countof(s_nodesA); ++i) + { + const NODEA *node = &s_nodesA[i]; + char *path = GetPathA(node->item); + + DeleteFileA(path); + RemoveDirectoryA(path); + } + } +} + +static void Test_DelNodeA(void) +{ + DWORD attr; + size_t i; + + if (!GetCurrentDirectoryA(_countof(s_cur_dir_A), s_cur_dir_A)) + { + skip("GetCurrentDirectoryA failed\n"); + return; + } + + cleanupA(); + + for (i = 0; i < _countof(s_entries); ++i) + { + const ENTRY *entry = &s_entries[i]; + INT lineno = entry->lineno; + const NODEA *node = &s_nodesA[entry->node]; + char *path = GetPathA(node->item); + INT ret; + + switch (entry->action_type) + { + case EAT_CREATE: + if (node->is_dir) + { + CreateDirectoryA(path, NULL); + + attr = GetFileAttributesA(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: path:%s, attr:0x%08lX\n", lineno, path, attr); + ok((attr & FILE_ATTRIBUTE_DIRECTORY), "Line %d: path:%s, attr:0x%08lX\n", lineno, path, attr); + } + else + { + fclose(fopen(path, "w")); + + attr = GetFileAttributesA(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + ok(!(attr & FILE_ATTRIBUTE_DIRECTORY), "Line %d: attr was 0x%08lX\n", lineno, attr); + } + break; + case EAT_DELETE: + if (node->is_dir) + { + RemoveDirectoryA(path); + } + else + { + DeleteFileA(path); + } + attr = GetFileAttributesA(path); + ok(attr == INVALID_FILE_ATTRIBUTES, "Line %d: cannot delete\n", lineno); + break; + case EAT_CHECK_EXIST: + attr = GetFileAttributesA(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + break; + case EAT_CHECK_NON_EXIST: + attr = GetFileAttributesA(path); + ok(attr == INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + break; + case EAT_CALL: + ret = (*s_pDelNodeA)(path, entry->flags); + ok(ret == entry->ret, "Line %d: ret:%d, path:%s, flags:0x%08lX\n", + lineno, ret, path, entry->flags); + break; + } + } + + cleanupA(); +} + +static void cleanupW(void) +{ + size_t i, k; + for (k = 0; k < 4; ++k) + { + for (i = 0; i < _countof(s_nodesW); ++i) + { + const NODEW *node = &s_nodesW[i]; + WCHAR *path = GetPathW(node->item); + + DeleteFileW(path); + RemoveDirectoryW(path); + } + } +} + +static void Test_DelNodeW(void) +{ + DWORD attr; + size_t i; + + if (!GetCurrentDirectoryW(_countof(s_cur_dir_W), s_cur_dir_W)) + { + skip("GetCurrentDirectoryA failed\n"); + return; + } + + cleanupW(); + + for (i = 0; i < _countof(s_entries); ++i) + { + const ENTRY *entry = &s_entries[i]; + INT lineno = entry->lineno; + const NODEW *node = &s_nodesW[entry->node]; + WCHAR *path = GetPathW(node->item); + INT ret; + + switch (entry->action_type) + { + case EAT_CREATE: + if (node->is_dir) + { + CreateDirectoryW(path, NULL); + + attr = GetFileAttributesW(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: path:%S, attr:0x%08lX\n", lineno, path, attr); + ok((attr & FILE_ATTRIBUTE_DIRECTORY), "Line %d: path:%S, attr:0x%08lX\n", lineno, path, attr); + } + else + { + fclose(_wfopen(path, L"w")); + + attr = GetFileAttributesW(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + ok(!(attr & FILE_ATTRIBUTE_DIRECTORY), "Line %d: attr was 0x%08lX\n", lineno, attr); + } + break; + case EAT_DELETE: + if (node->is_dir) + { + RemoveDirectoryW(path); + } + else + { + DeleteFileW(path); + } + attr = GetFileAttributesW(path); + ok(attr == INVALID_FILE_ATTRIBUTES, "Line %d: cannot delete\n", lineno); + break; + case EAT_CHECK_EXIST: + attr = GetFileAttributesW(path); + ok(attr != INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + break; + case EAT_CHECK_NON_EXIST: + attr = GetFileAttributesW(path); + ok(attr == INVALID_FILE_ATTRIBUTES, "Line %d: attr was 0x%08lX\n", lineno, attr); + break; + case EAT_CALL: + ret = (*s_pDelNodeW)(path, entry->flags); + ok(ret == entry->ret, "Line %d: ret:%d, path:%S, flags:0x%08lX\n", + lineno, ret, path, entry->flags); + break; + } + } + + cleanupW(); +} + +START_TEST(DelNode) +{ + s_hAdvPack = LoadLibraryA("advpack.dll"); + if (s_hAdvPack == NULL) + { + skip("unable to load advpack.dll\n"); + return; + } + + /* DelNodeA */ + s_pDelNodeA = (DELNODEA)GetProcAddress(s_hAdvPack, "DelNodeA"); + if (s_pDelNodeA) + { + Test_DelNodeA(); + } + else + { + skip("DelNodeA not found in advpack.dll\n"); + } + + /* DelNodeW */ + s_pDelNodeW = (DELNODEW)GetProcAddress(s_hAdvPack, "DelNodeW"); + if (s_pDelNodeW) + { + Test_DelNodeW(); + } + else + { + skip("DelNodeW not found in advpack.dll\n"); + } + + FreeLibrary(s_hAdvPack); + s_hAdvPack = NULL; +} diff --git a/modules/rostests/apitests/advpack/testlist.c b/modules/rostests/apitests/advpack/testlist.c new file mode 100644 index 00000000000..281dac8b345 --- /dev/null +++ b/modules/rostests/apitests/advpack/testlist.c @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for advpack.dll functions + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#define __ROS_LONG64__ +#define STANDALONE +#include <apitest.h> + +extern void func_DelNode(void); + +const struct test winetest_testlist[] = +{ + { "DelNode", func_DelNode }, + { 0, 0 } +};

1 year, 8 months

[reactos] 01/01: [SHELL32] Implement SHQueryRecycleBinW

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cdcea5e65326cbea7745… commit 4cdcea5e65326cbea77458a3e9daa335d2e530b7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 19 20:30:24 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Apr 26 22:50:11 2023 +0200 [SHELL32] Implement SHQueryRecycleBinW --- dll/win32/shell32/folders/CRecycleBin.cpp | 36 +++++++++++++++++++++++--- dll/win32/shell32/shellrecyclebin/recyclebin.c | 12 --------- dll/win32/shell32/shellrecyclebin/recyclebin.h | 11 -------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index bb44ca3cd6a..6dba39d8c69 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -415,7 +415,7 @@ HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO l BOOL ret = TRUE; /* restore file */ - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) + if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) ret = RestoreFile(Context.hDeletedFile); /* delete file */ else @@ -1244,10 +1244,10 @@ HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRB HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) { - FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo); + TRACE("%s, %p\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - if (!(pszRootPath) || (pszRootPath[0] == 0) || - !(pSHQueryRBInfo) || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO))) + if (!pszRootPath || (pszRootPath[0] == 0) || + !pSHQueryRBInfo || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO))) { return E_INVALIDARG; } @@ -1255,5 +1255,33 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR pSHQueryRBInfo->i64Size = 0; pSHQueryRBInfo->i64NumItems = 0; + CComPtr<IRecycleBin> spRecycleBin; + HRESULT hr; + if (FAILED_UNEXPECTEDLY((hr = GetDefaultRecycleBin(pszRootPath, &spRecycleBin)))) + return hr; + + CComPtr<IRecycleBinEnumList> spEnumList; + hr = spRecycleBin->EnumObjects(&spEnumList); + if (!SUCCEEDED(hr)) + return hr; + + while (TRUE) + { + CComPtr<IRecycleBinFile> spFile; + hr = spEnumList->Next(1, &spFile, NULL); + if (hr == S_FALSE) + return S_OK; + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + ULARGE_INTEGER Size = {}; + if (FAILED_UNEXPECTEDLY((hr = spFile->GetFileSize(&Size)))) + return hr; + + pSHQueryRBInfo->i64Size += Size.QuadPart; + pSHQueryRBInfo->i64NumItems++; + } + return S_OK; } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.c b/dll/win32/shell32/shellrecyclebin/recyclebin.c index a6392496012..670e81b6dbf 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin.c @@ -376,18 +376,6 @@ cleanup: return FALSE; } -BOOL WINAPI -GetRecycleBinDetails( - IN LPCWSTR pszVolume OPTIONAL, - OUT ULARGE_INTEGER *pulTotalItems, - OUT ULARGE_INTEGER *pulTotalSize) -{ - pulTotalItems->QuadPart = 0; - pulTotalSize->QuadPart = 0; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - BOOL WINAPI RestoreFile( IN HANDLE hDeletedFile) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.h b/dll/win32/shell32/shellrecyclebin/recyclebin.h index 50c020c839f..f15828a9639 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin.h @@ -164,17 +164,6 @@ GetDeletedFileDetailsW( #define GetDeletedFileDetails GetDeletedFileDetailsA #endif -/* Get details about a whole recycle bin - * pszVolume: - * pulTotalItems: - * pulTotalSize - */ -BOOL WINAPI -GetRecycleBinDetails( - IN LPCWSTR pszVolume OPTIONAL, - OUT ULARGE_INTEGER *pulTotalItems, - OUT ULARGE_INTEGER *pulTotalSize); - /* Restores a deleted file * hDeletedFile: handle of the deleted file to restore * Returns TRUE if operation succeeded, FALSE otherwise.

1 year, 8 months

[reactos] 01/01: [ATL] Add CAtlList::SwapElements

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d808cc444128dd65281… commit 08d808cc444128dd652817425cf24767bac0ca0d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 12 23:25:36 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Apr 26 22:48:29 2023 +0200 [ATL] Add CAtlList::SwapElements --- modules/rostests/apitests/atl/CAtlList.cpp | 75 ++++++++++++++++++++++++++++-- sdk/lib/atl/atlcoll.h | 43 ++++++++++++++++- 2 files changed, 112 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index 8f83703b996..f9c2933beef 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -14,9 +14,10 @@ #include <atlbase.h> #include <atlcoll.h> +#include <atlstr.h> - -START_TEST(CAtlList) +static void +test_BasicCases() { CAtlList<int> list1; @@ -29,18 +30,18 @@ START_TEST(CAtlList) ok_size_t(list1.GetCount(), 3); list1.InsertBefore(head, -123); - list1.InsertAfter(head, 34); // no longer head, but the POSITION should still be valid.. + list1.InsertAfter(head, 34); // no longer head, but the POSITION should still be valid.. list1.InsertBefore(tail, 78); list1.InsertAfter(tail, -44); - int expected[] = {-123, 12, 34, 56, 78, 90, -44 }; + int expected[] = {-123, 12, 34, 56, 78, 90, -44}; int expected_size = sizeof(expected) / sizeof(expected[0]); int index = 0; POSITION it = list1.GetHeadPosition(); while (it != NULL) { - ok(index < expected_size, "Too many items, expected %d, got %d!\n", expected_size, (index+1)); + ok(index < expected_size, "Too many items, expected %d, got %d!\n", expected_size, (index + 1)); int value = list1.GetNext(it); if (index < expected_size) { @@ -54,3 +55,67 @@ START_TEST(CAtlList) } ok(it == NULL, "it does still point to something!\n"); } + +static CStringW +to_str(const CAtlList<int>& lst) +{ + CStringW tmp; + POSITION it = lst.GetHeadPosition(); + while (it != NULL) + { + int value = lst.GetNext(it); + tmp.AppendFormat(L"%d,", value); + } + return tmp; +} + +#define ok_list(lst, expected) \ + do \ + { \ + CStringW _value = to_str(lst); \ + ok(_value == (expected), "Wrong value for '%s', expected: " #expected " got: \"%S\"\n", #lst, \ + _value.GetString()); \ + } while (0) + + +static void +test_SwapElements() +{ + CAtlList<int> list; + list.AddTail(1); + list.AddTail(2); + list.AddTail(3); + + ok_list(list, "1,2,3,"); + + POSITION p1 = list.FindIndex(0); + POSITION p2 = list.FindIndex(2); + + list.SwapElements(p1, p1); + ok_list(list, "1,2,3,"); + + list.SwapElements(p1, p2); + ok_list(list, "3,2,1,"); + + p1 = list.FindIndex(0); + p2 = list.FindIndex(1); + list.SwapElements(p1, p2); + ok_list(list, "2,3,1,"); + + p1 = list.FindIndex(1); + p2 = list.FindIndex(2); + list.SwapElements(p1, p2); + ok_list(list, "2,1,3,"); + + p1 = list.FindIndex(0); + p2 = list.FindIndex(2); + list.SwapElements(p2, p1); + ok_list(list, "3,1,2,"); +} + + +START_TEST(CAtlList) +{ + test_BasicCases(); + test_SwapElements(); +} diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index f41fee71bdf..66a93a27b7f 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -494,6 +494,8 @@ public: _In_opt_ POSITION posStartAfter = NULL) const; POSITION FindIndex(_In_ size_t iElement) const; + void SwapElements(POSITION pos1, POSITION pos2); + private: CNode* CreateNode( INARGTYPE element, @@ -809,6 +811,45 @@ POSITION CAtlList< E, ETraits >::FindIndex(_In_ size_t iElement) const return (POSITION)Node; } +template<typename E, class ETraits> +void CAtlList< E, ETraits >::SwapElements(POSITION pos1, POSITION pos2) +{ + if (pos1 == pos2) + return; + + + CNode *node1 = (CNode *)pos1; + CNode *node2 = (CNode *)pos2; + + CNode *tmp = node1->m_Prev; + node1->m_Prev = node2->m_Prev; + node2->m_Prev = tmp; + + if (node1->m_Prev) + node1->m_Prev->m_Next = node1; + else + m_HeadNode = node1; + + if (node2->m_Prev) + node2->m_Prev->m_Next = node2; + else + m_HeadNode = node2; + + tmp = node1->m_Next; + node1->m_Next = node2->m_Next; + node2->m_Next = tmp; + + if (node1->m_Next) + node1->m_Next->m_Prev = node1; + else + m_TailNode = node1; + + if (node2->m_Next) + node2->m_Next->m_Prev = node2; + else + m_TailNode = node2; +} + // // CAtlist private methods @@ -897,4 +938,4 @@ private: } -#endif \ No newline at end of file +#endif

1 year, 8 months

[reactos] 01/01: [REGEDIT] Check whether pszSelectKey is NULL on CDN_FILEOK (#5255)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d7d3314b337d6ab5589a… commit 9d7d3314b337d6ab5589a66c4c69a563dd8b2c78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 25 18:04:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 25 18:04:36 2023 +0900 [REGEDIT] Check whether pszSelectKey is NULL on CDN_FILEOK (#5255) Avoid crash on exporting root. Add NULL check of pszSelectKey on CDN_FILEOK handling. CORE-18938 --- base/applications/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index f886e0c7730..852d38feb02 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -567,7 +567,7 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, W { GetWindowTextW(hwndExportBranchText, pszSelectedKey, _MAX_PATH); } - else + else if (pszSelectedKey) { pszSelectedKey[0] = L'\0'; }

1 year, 8 months

[reactos] 01/01: [NTUSER] Improve MsqPostMessage (#5225)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=560671a784c1e0e0aa759… commit 560671a784c1e0e0aa7590df5e0598c1e2f41f5a Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Apr 25 01:11:46 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 24 20:11:46 2023 +0200 [NTUSER] Improve MsqPostMessage (#5225) - MsqPostMessage: Fill Message structure before InsertTailList. For style consistency. - MsqPostMessage: Fix the use of MessageQueue variable --- win32ss/user/ntuser/msgqueue.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index a674f806e8a..d35eb38cf9d 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1344,18 +1344,25 @@ MsqPostMessage(PTHREADINFO pti, PUSER_MESSAGE Message; PUSER_MESSAGE_QUEUE MessageQueue; - if ( pti->TIF_flags & TIF_INCLEANUP || pti->MessageQueue->QF_flags & QF_INDESTROY ) + MessageQueue = pti->MessageQueue; + + if ((pti->TIF_flags & TIF_INCLEANUP) || (MessageQueue->QF_flags & QF_INDESTROY)) { ERR("Post Msg; Thread or Q is Dead!\n"); return; } - if(!(Message = MsqCreateMessage(Msg))) - { + Message = MsqCreateMessage(Msg); + if (!Message) return; - } - MessageQueue = pti->MessageQueue; + if (Msg->message == WM_HOTKEY) + MessageBits |= QS_HOTKEY; + + Message->dwQEvent = dwQEvent; + Message->ExtraInfo = ExtraInfo; + Message->QS_Flags = MessageBits; + Message->pti = pti; if (!HardwareMessage) { @@ -1366,13 +1373,8 @@ MsqPostMessage(PTHREADINFO pti, InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); } - if (Msg->message == WM_HOTKEY) MessageBits |= QS_HOTKEY; // Justin Case, just set it. - Message->dwQEvent = dwQEvent; - Message->ExtraInfo = ExtraInfo; - Message->QS_Flags = MessageBits; - Message->pti = pti; MsqWakeQueue(pti, MessageBits, TRUE); - TRACE("Post Message %d\n",PostMsgCount); + TRACE("Post Message %d\n", PostMsgCount); } VOID FASTCALL

1 year, 8 months

[reactos] 02/02: [ATL_APITEST] Add test for OBJECT_ENTRY_AUTO

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3feae51397c3fbc3b055… commit d3feae51397c3fbc3b05574da6bf06e172136095 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 15 22:22:07 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 22 21:24:04 2023 +0200 [ATL_APITEST] Add test for OBJECT_ENTRY_AUTO CORE-18936 --- modules/rostests/apitests/atl/AtlObjMap.cpp | 86 ++++++++++ modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 ++ .../rostests/apitests/atl/devenv/AtlObjMap.vcxproj | 180 +++++++++++++++++++++ modules/rostests/apitests/atl/testlist.c | 2 + 5 files changed, 279 insertions(+) diff --git a/modules/rostests/apitests/atl/AtlObjMap.cpp b/modules/rostests/apitests/atl/AtlObjMap.cpp new file mode 100644 index 00000000000..12066534464 --- /dev/null +++ b/modules/rostests/apitests/atl/AtlObjMap.cpp @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for OBJECT_ENTRY_AUTO + * COPYRIGHT: Copyright 2023 Mark Jansen <mark.jansen(a)reactos.org> + */ + +#ifdef HAVE_APITEST + #include <apitest.h> +#else + #include "atltest.h" +#endif + +#include <atlbase.h> +#include <atlcom.h> + +class CAtlObjMapModule : public ATL::CAtlExeModuleT<CAtlObjMapModule> +{ + +} _Module; + +CLSID CLSID_ObjMapTestObject = {0xeae5616c, 0x1e7f, 0x4a00, {0x92, 0x27, 0x1a, 0xad, 0xad, 0x66, 0xbb, 0x85}}; + +static LONG g_Created = 0; +static LONG g_Destroyed = 0; + + +START_TEST(AtlObjMap) +{ + HRESULT hr = CoInitialize(NULL); + ok_hex(hr, S_OK); + + { + CComPtr<IUnknown> spTestObject; + hr = CoCreateInstance(CLSID_ObjMapTestObject, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (LPVOID*)&spTestObject); + ok_hex(hr, REGDB_E_CLASSNOTREG); + } + + ok_int(g_Created, 0); + ok_int(g_Destroyed, 0); + + // Register the com objects added to the auto-map in _AtlComModule + hr = _Module.RegisterClassObjects(CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + ok_hex(hr, S_OK); + + ok_int(g_Created, 0); + ok_int(g_Destroyed, 0); + + { + CComPtr<IUnknown> spTestObject; + hr = CoCreateInstance(CLSID_ObjMapTestObject, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (LPVOID *)&spTestObject); + ok_hex(hr, S_OK); + ok_int(g_Created, 1); + ok_int(g_Destroyed, 0); + } + ok_int(g_Created, 1); + ok_int(g_Destroyed, 1); +} + + + +struct CObjMapTestObject : public CComObjectRootEx<CComSingleThreadModel>, + public CComCoClass<CObjMapTestObject, &CLSID_ObjMapTestObject>, + public IUnknown +{ + CObjMapTestObject() + { + InterlockedIncrement(&g_Created); + } + ~CObjMapTestObject() + { + InterlockedIncrement(&g_Destroyed); + } + + + DECLARE_PROTECT_FINAL_CONSTRUCT(); + DECLARE_NO_REGISTRY(); + DECLARE_NOT_AGGREGATABLE(CObjMapTestObject) + + BEGIN_COM_MAP(CObjMapTestObject) + COM_INTERFACE_ENTRY_IID(IID_IUnknown, IUnknown) + END_COM_MAP() +}; + +OBJECT_ENTRY_AUTO(CLSID_ObjMapTestObject, CObjMapTestObject) + diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index a414eb2d636..dfaddd62b61 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -2,6 +2,7 @@ add_definitions(-DINITGUID -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE + AtlObjMap.cpp atltypes.cpp CAtlFileMapping.cpp CAtlArray.cpp diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 2a923a69b57..5b3cc7d4247 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -29,6 +29,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubclassWindow", "SubclassW EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPath", "CPath.vcxproj", "{7119D446-43C1-425A-91D0-CDFA49B8B59A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlObjMap", "AtlObjMap.vcxproj", "{B628C42A-A38E-488E-8512-2B997B75E95C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -141,6 +143,14 @@ Global {7119D446-43C1-425A-91D0-CDFA49B8B59A}.Release|x64.Build.0 = Release|x64 {7119D446-43C1-425A-91D0-CDFA49B8B59A}.Release|x86.ActiveCfg = Release|Win32 {7119D446-43C1-425A-91D0-CDFA49B8B59A}.Release|x86.Build.0 = Release|Win32 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Debug|x64.ActiveCfg = Debug|x64 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Debug|x64.Build.0 = Debug|x64 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Debug|x86.ActiveCfg = Debug|Win32 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Debug|x86.Build.0 = Debug|Win32 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x64.ActiveCfg = Release|x64 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x64.Build.0 = Release|x64 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.ActiveCfg = Release|Win32 + {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/AtlObjMap.vcxproj b/modules/rostests/apitests/atl/devenv/AtlObjMap.vcxproj new file mode 100644 index 00000000000..586515bb052 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/AtlObjMap.vcxproj @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B628C42A-A38E-488E-8512-2B997B75E95C}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../AtlObjMap.cpp"> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 510b5f4d834..2309a421512 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -1,6 +1,7 @@ #define STANDALONE #include <apitest.h> +extern void func_AtlObjMap(void); extern void func_atltypes(void); extern void func_CAtlFileMapping(void); extern void func_CAtlArray(void); @@ -21,6 +22,7 @@ extern void func_SubclassWindow(void); const struct test winetest_testlist[] = { + { "AtlObjMap", func_AtlObjMap }, { "atltypes", func_atltypes }, { "CAtlFileMapping", func_CAtlFileMapping }, { "CAtlArray", func_CAtlArray },

1 year, 8 months

[reactos] 01/02: [ATL] Add OBJECT_ENTRY_AUTO for simpler com object registration

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d12880829ffee337c46bc… commit d12880829ffee337c46bc4cedbcc37a7a702cffb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 15 22:21:33 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 22 21:23:55 2023 +0200 [ATL] Add OBJECT_ENTRY_AUTO for simpler com object registration Of course gcc needs a nasty hack to include the symbol. CORE-18936 --- sdk/lib/atl/atlbase.h | 177 ++++++++++++++++++++++++++++++++++++++++++++------ sdk/lib/atl/atlcom.h | 58 +++++++++++++++++ 2 files changed, 216 insertions(+), 19 deletions(-) diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 4bc00d2e9bf..1b0b0361b6a 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -59,6 +59,15 @@ class CAtlComModule; __declspec(selectany) CAtlModule *_pAtlModule = NULL; __declspec(selectany) CComModule *_pModule = NULL; +template <bool isDll, typename T> struct CAtlValidateModuleConfiguration +{ +#if !defined(_WINDLL) && !defined(_USRDLL) + static_assert(!isDll, "_WINDLL or _USRDLL must be defined when 'CAtlDllModuleT<T>' is used"); +#else + static_assert(isDll, "_WINDLL or _USRDLL must be defined when 'CAtlExeModuleT<T>' is used"); +#endif +}; + struct _ATL_CATMAP_ENTRY { @@ -173,6 +182,46 @@ struct _ATL_WIN_MODULE70 }; typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; + +// Auto object map + +#if defined(_MSC_VER) +#pragma section("ATL$__a", read, write) +#pragma section("ATL$__z", read, write) +#pragma section("ATL$__m", read, write) +#define _ATLALLOC(x) __declspec(allocate(x)) + +#if defined(_M_IX86) +#define OBJECT_ENTRY_PRAGMA(class) __pragma(comment(linker, "/include:___pobjMap_" #class)); +#elif defined(_M_IA64) || defined(_M_AMD64) || (_M_ARM) || defined(_M_ARM64) +#define OBJECT_ENTRY_PRAGMA(class) __pragma(comment(linker, "/include:__pobjMap_" #class)); +#else +#error Your platform is not supported. +#endif + +#elif defined(__GNUC__) + +// GCC completely ignores __attribute__((unused)) on the __pobjMap_ pointer, so we pass it to a function that is not allowed to be optimized.... +static int __attribute__((optimize("O0"), unused)) hack_for_gcc(const _ATL_OBJMAP_ENTRY * const *) +{ + return 1; +} + +#define _ATLALLOC(x) __attribute__((section(x))) +#define OBJECT_ENTRY_PRAGMA(class) static int __pobjMap_hack_##class = hack_for_gcc(&__pobjMap_##class); + +#else +#error Your compiler is not supported. +#endif + + +extern "C" +{ + __declspec(selectany) _ATLALLOC("ATL$__a") _ATL_OBJMAP_ENTRY *__pobjMapEntryFirst = NULL; + __declspec(selectany) _ATLALLOC("ATL$__z") _ATL_OBJMAP_ENTRY *__pobjMapEntryLast = NULL; +} + + struct _ATL_REGMAP_ENTRY { LPCOLESTR szKey; @@ -551,8 +600,9 @@ public: CAtlComModule() { GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)this, &m_hInstTypeLib); - m_ppAutoObjMapFirst = NULL; - m_ppAutoObjMapLast = NULL; + + m_ppAutoObjMapFirst = &__pobjMapEntryFirst + 1; + m_ppAutoObjMapLast = &__pobjMapEntryLast; if (FAILED(m_csObjMap.Init())) { ATLASSERT(0); @@ -577,17 +627,37 @@ public: return AtlComModuleUnregisterServer(this, bUnRegTypeLib, pCLSID); } - void Term() { if (cbSize != 0) { - ATLASSERT(m_ppAutoObjMapFirst == NULL); - ATLASSERT(m_ppAutoObjMapLast == NULL); + for (_ATL_OBJMAP_ENTRY **iter = m_ppAutoObjMapFirst; iter < m_ppAutoObjMapLast; iter++) + { + _ATL_OBJMAP_ENTRY *ptr = *iter; + if (!ptr) + continue; + + if (!ptr->pCF) + continue; + + ptr->pCF->Release(); + ptr->pCF = NULL; + } m_csObjMap.Term(); cbSize = 0; } } + + void ExecuteObjectMain(bool bStarting) + { + for (_ATL_OBJMAP_ENTRY **iter = m_ppAutoObjMapFirst; iter < m_ppAutoObjMapLast; iter++) + { + if (!*iter) + continue; + + (*iter)->pfnObjectMain(bStarting); + } + } }; __declspec(selectany) CAtlComModule _AtlComModule; @@ -606,11 +676,20 @@ HRESULT CAtlModuleT<T>::UnregisterServer(BOOL bUnRegTypeLib, const CLSID *pCLSID } template <class T> -class CAtlDllModuleT : public CAtlModuleT<T> +class CAtlDllModuleT + : public CAtlModuleT<T> + , private CAtlValidateModuleConfiguration<true, T> + { public: CAtlDllModuleT() { + _AtlComModule.ExecuteObjectMain(true); + } + + ~CAtlDllModuleT() + { + _AtlComModule.ExecuteObjectMain(false); } HRESULT DllCanUnloadNow() @@ -659,7 +738,9 @@ public: template <class T> -class CAtlExeModuleT : public CAtlModuleT<T> +class CAtlExeModuleT + : public CAtlModuleT<T> + , private CAtlValidateModuleConfiguration<false, T> { public: DWORD m_dwMainThreadID; @@ -670,10 +751,12 @@ public: CAtlExeModuleT() :m_dwMainThreadID(::GetCurrentThreadId()) { + _AtlComModule.ExecuteObjectMain(true); } ~CAtlExeModuleT() { + _AtlComModule.ExecuteObjectMain(false); } int WinMain(int nShowCmd) @@ -815,12 +898,19 @@ public: } } } + + for (_ATL_OBJMAP_ENTRY **iter = _AtlComModule.m_ppAutoObjMapFirst; iter < _AtlComModule.m_ppAutoObjMapLast; iter++) + { + if (*iter != NULL) + (*iter)->pfnObjectMain(true); + } + return S_OK; } void Term() { - _ATL_OBJMAP_ENTRY *objectMapEntry; + _ATL_OBJMAP_ENTRY *objectMapEntry; if (m_pObjMap != NULL) { @@ -834,12 +924,19 @@ public: objectMapEntry++; } } + + for (_ATL_OBJMAP_ENTRY **iter = _AtlComModule.m_ppAutoObjMapFirst; iter < _AtlComModule.m_ppAutoObjMapLast; iter++) + { + if (*iter != NULL) + (*iter)->pfnObjectMain(false); + } + } HRESULT GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - _ATL_OBJMAP_ENTRY *objectMapEntry; - HRESULT hResult; + _ATL_OBJMAP_ENTRY *objectMapEntry; + HRESULT hResult; ATLASSERT(ppv != NULL); if (ppv == NULL) @@ -869,8 +966,7 @@ public: } if (hResult == S_OK && *ppv == NULL) { - // FIXME: call AtlComModuleGetClassObject - hResult = CLASS_E_CLASSNOTAVAILABLE; + hResult = AtlComModuleGetClassObject(&_AtlComModule, rclsid, riid, ppv); } return hResult; } @@ -1480,9 +1576,9 @@ inline HRESULT __stdcall AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID & inline HRESULT __stdcall AtlUnadvise(IUnknown *pUnkCP, const IID &iid, DWORD dw) { - CComPtr<IConnectionPointContainer> container; - CComPtr<IConnectionPoint> connectionPoint; - HRESULT hResult; + CComPtr<IConnectionPointContainer> container; + CComPtr<IConnectionPoint> connectionPoint; + HRESULT hResult; if (pUnkCP == NULL) return E_INVALIDARG; @@ -1809,14 +1905,18 @@ inline HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, for (iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { - if (!(*iter)->pfnGetClassObject) + _ATL_OBJMAP_ENTRY *ptr = *iter; + if (!ptr) continue; - hr = (*iter)->pfnGetClassObject((void*)(*iter)->pfnCreateInstance, IID_IUnknown, (void**)&unk); + if (!ptr->pfnGetClassObject) + continue; + + hr = ptr->pfnGetClassObject((void*)ptr->pfnCreateInstance, IID_IUnknown, (void**)&unk); if (FAILED(hr)) return hr; - hr = CoRegisterClassObject(*(*iter)->pclsid, unk, context, flags, &(*iter)->dwRegister); + hr = CoRegisterClassObject(*ptr->pclsid, unk, context, flags, &ptr->dwRegister); unk->Release(); if (FAILED(hr)) return hr; @@ -1837,7 +1937,11 @@ inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) for (iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { - hr = CoRevokeClassObject((*iter)->dwRegister); + _ATL_OBJMAP_ENTRY *ptr = *iter; + if (!ptr) + continue; + + hr = CoRevokeClassObject(ptr->dwRegister); if (FAILED(hr)) return hr; } @@ -1845,6 +1949,41 @@ inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return S_OK; } +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI +AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) +{ + if (!pm) + return E_INVALIDARG; + + for (_ATL_OBJMAP_ENTRY **iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) + { + _ATL_OBJMAP_ENTRY *ptr = *iter; + if (!ptr) + continue; + + if (IsEqualCLSID(*ptr->pclsid, rclsid) && ptr->pfnGetClassObject) + { + HRESULT hr = CLASS_E_CLASSNOTAVAILABLE; + + if (!ptr->pCF) + { + CComCritSecLock<CComCriticalSection> lock(_AtlComModule.m_csObjMap, true); + if (!ptr->pCF) + { + hr = ptr->pfnGetClassObject((void *)ptr->pfnCreateInstance, IID_IUnknown, (void **)&ptr->pCF); + } + } + if (ptr->pCF) + hr = ptr->pCF->QueryInterface(riid, ppv); + return hr; + } + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + + }; // namespace ATL #ifndef _ATL_NO_AUTOMATIC_NAMESPACE diff --git a/sdk/lib/atl/atlcom.h b/sdk/lib/atl/atlcom.h index c9d92edbd9c..024d85a0bef 100644 --- a/sdk/lib/atl/atlcom.h +++ b/sdk/lib/atl/atlcom.h @@ -30,7 +30,12 @@ namespace ATL template <class Base, const IID *piid, class T, class Copy, class ThreadModel = CComObjectThreadModel> class CComEnum; +#if defined(_WINDLL) | defined(_USRDLL) #define DECLARE_CLASSFACTORY_EX(cf) typedef ATL::CComCreator<ATL::CComObjectCached<cf> > _ClassFactoryCreatorClass; +#else +// Class factory should not change lock count +#define DECLARE_CLASSFACTORY_EX(cf) typedef ATL::CComCreator<ATL::CComObjectNoLock<cf>> _ClassFactoryCreatorClass; +#endif #define DECLARE_CLASSFACTORY() DECLARE_CLASSFACTORY_EX(ATL::CComClassFactory) #define DECLARE_CLASSFACTORY_SINGLETON(obj) DECLARE_CLASSFACTORY_EX(ATL::CComClassFactorySingleton<obj>) @@ -539,6 +544,40 @@ public: } }; + +template <class Base> +class CComObjectNoLock : public Base +{ + public: + CComObjectNoLock(void* = NULL) + { + } + + virtual ~CComObjectNoLock() + { + this->FinalRelease(); + } + + STDMETHOD_(ULONG, AddRef)() + { + return this->InternalAddRef(); + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount = this->InternalRelease(); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + return this->_InternalQueryInterface(iid, ppvObject); + } +}; + + #define BEGIN_COM_MAP(x) \ public: \ typedef x _ComMapClass; \ @@ -663,6 +702,24 @@ public: class::GetCategoryMap, \ class::ObjectMain }, + + +#define OBJECT_ENTRY_AUTO(clsid, class) \ + ATL::_ATL_OBJMAP_ENTRY __objMap_##class = { \ + &clsid, \ + class ::UpdateRegistry, \ + class ::_ClassFactoryCreatorClass::CreateInstance, \ + class ::_CreatorClass::CreateInstance, \ + NULL, \ + 0, \ + class ::GetObjectDescription, \ + class ::GetCategoryMap, \ + class ::ObjectMain}; \ + extern "C" _ATLALLOC("ATL$__m") ATL::_ATL_OBJMAP_ENTRY *const __pobjMap_##class = &__objMap_##class; \ + OBJECT_ENTRY_PRAGMA(class) + + + class CComClassFactory : public IClassFactory, public CComObjectRootEx<CComGlobalsThreadModel> @@ -772,6 +829,7 @@ class CComCoClass { public: DECLARE_CLASSFACTORY() + //DECLARE_AGGREGATABLE(T) // This should be here, but gcc... static LPCTSTR WINAPI GetObjectDescription() {

1 year, 8 months

[reactos] 01/01: [PSDK] Add some more argument names

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf29d98a54b5b36ac565c… commit bf29d98a54b5b36ac565c1265d9a30e882a162cd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 19 20:44:01 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 22 18:31:49 2023 +0200 [PSDK] Add some more argument names --- sdk/include/psdk/winuser.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index bde95161a69..c3978697e3f 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -4994,10 +4994,10 @@ HCURSOR WINAPI LoadCursorA(_In_opt_ HINSTANCE, _In_ LPCSTR); HCURSOR WINAPI LoadCursorW(_In_opt_ HINSTANCE, _In_ LPCWSTR); HCURSOR WINAPI LoadCursorFromFileA(_In_ LPCSTR); HCURSOR WINAPI LoadCursorFromFileW(_In_ LPCWSTR); -HICON WINAPI LoadIconA(_In_opt_ HINSTANCE, _In_ LPCSTR); -HICON WINAPI LoadIconW(_In_opt_ HINSTANCE, _In_ LPCWSTR); -HANDLE WINAPI LoadImageA(_In_opt_ HINSTANCE, _In_ LPCSTR, _In_ UINT, _In_ int, _In_ int, _In_ UINT); -HANDLE WINAPI LoadImageW(_In_opt_ HINSTANCE, _In_ LPCWSTR, _In_ UINT, _In_ int, _In_ int, _In_ UINT); +HICON WINAPI LoadIconA(_In_opt_ HINSTANCE hInstance, _In_ LPCSTR lpIconName); +HICON WINAPI LoadIconW(_In_opt_ HINSTANCE hInstance, _In_ LPCWSTR lpIconName); +HANDLE WINAPI LoadImageA(_In_opt_ HINSTANCE hInst, _In_ LPCSTR name, _In_ UINT type, _In_ int cx, _In_ int cy, _In_ UINT fuLoad); +HANDLE WINAPI LoadImageW(_In_opt_ HINSTANCE hInst, _In_ LPCWSTR name, _In_ UINT type, _In_ int cx, _In_ int cy, _In_ UINT fuLoad); HKL WINAPI LoadKeyboardLayoutA(_In_ LPCSTR, _In_ UINT); HKL WINAPI LoadKeyboardLayoutW(_In_ LPCWSTR, _In_ UINT); HMENU WINAPI LoadMenuA(_In_opt_ HINSTANCE, _In_ LPCSTR);

1 year, 8 months

[reactos] 01/01: [NTOS:OB] Fix the SAL2 annotation of ObQueryTypeInfo

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e7b22a631d8602dc7c61… commit 8e7b22a631d8602dc7c6167ec33cb7938e210bf6 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Apr 22 17:18:57 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Apr 22 17:18:57 2023 +0200 [NTOS:OB] Fix the SAL2 annotation of ObQueryTypeInfo The data has to be written into ObjectTypeInfo based on the return length, not only what is provided by the input buffer length. Fix suggested by Hermès. --- ntoskrnl/ob/oblife.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index f0ae6aafee3..10f010cea49 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -946,7 +946,8 @@ NTSTATUS NTAPI ObQueryTypeInfo( _In_ POBJECT_TYPE ObjectType, - _Out_writes_bytes_(Length) POBJECT_TYPE_INFORMATION ObjectTypeInfo, + _Out_writes_bytes_to_(Length, *ReturnLength) + POBJECT_TYPE_INFORMATION ObjectTypeInfo, _In_ ULONG Length, _Out_ PULONG ReturnLength) {

1 year, 8 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2023