Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/06: [WINESYNC]: crt is now in sync with wine-staging wine-5.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e04b79653441e3d8d78d9… commit e04b79653441e3d8d78d943271fd4b9b3b327767 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 11:14:57 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC]: crt is now in sync with wine-staging wine-5.0 --- sdk/tools/winesync/crt.cfg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sdk/tools/winesync/crt.cfg b/sdk/tools/winesync/crt.cfg new file mode 100644 index 00000000000..81308194937 --- /dev/null +++ b/sdk/tools/winesync/crt.cfg @@ -0,0 +1,16 @@ +directories: null +files: + dlls/msvcrt/cpp.c: sdk/lib/crt/wine/cpp.c + dlls/msvcrt/cppexcept.h: sdk/lib/crt/wine/cppexcept.h + dlls/msvcrt/cxx.h: sdk/lib/crt/wine/cxx.h + dlls/msvcrt/except.c: sdk/lib/crt/wine/except.c + dlls/msvcrt/except_arm.c: sdk/lib/crt/wine/except_arm.c + dlls/msvcrt/except_arm64.c: sdk/lib/crt/wine/except_arm64.c + dlls/msvcrt/except_i386.c: sdk/lib/crt/wine/except_i386.c + dlls/msvcrt/except_x86_64.c: sdk/lib/crt/wine/except_x86_64.c + dlls/msvcrt/heap.c: sdk/lib/crt/wine/heap.c + dlls/msvcrt/msvcrt.h: sdk/lib/crt/wine/msvcrt.h + dlls/msvcrt/mtdll.h: sdk/lib/crt/wine/mtdll.h + dlls/msvcrt/undname.c: sdk/lib/crt/wine/undname.c +tags: + wine: wine-5.0

1 year, 10 months

[reactos] 04/06: [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8eda78537507e5b3ec4… commit 1f8eda78537507e5b3ec41941ef896d72a87aea8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48335 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6babdb5508bd2f1b659218483f5df76859898712 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index d3bcc3aaadd..7512196c096 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -389,7 +389,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, - const cxx_function_descr *descr, int nested_trylevel, + const cxx_function_descr *descr, catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { @@ -407,7 +407,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const tryblock_info *tryblock = &descr->tryblock[i]; /* only handle try blocks inside current catch block */ - if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (catch_frame && catch_frame->trylevel > tryblock->start_level) continue; if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; @@ -458,7 +458,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.frame.Handler = catch_function_nested_handler; nested_frame.cxx_frame = frame; nested_frame.descr = descr; - nested_frame.trylevel = nested_trylevel + 1; + nested_frame.trylevel = tryblock->end_level + 1; __wine_push_frame( &nested_frame.frame ); addr = call_handler( catchblock->handler, &frame->ebp ); @@ -545,7 +545,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; call_catch_block( rec, ep->ContextRecord, ctx->frame, ctx->descr, - ctx->frame->trylevel, ctx->nested_frame, exc_type ); + ctx->nested_frame, exc_type ); __DestructExceptionObject( rec ); return ExceptionContinueSearch; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 10 months

[reactos] 03/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df4baa391ee4f9801ffd… commit 4df4baa391ee4f9801ffd6b50617bc1a416effbb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 48a447c5eb238d673ce5db4eeacf3ba4c1a9da90 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 5c1c9df3368..d3bcc3aaadd 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -110,7 +110,7 @@ typedef struct { cxx_exception_frame *frame; const cxx_function_descr *descr; - EXCEPTION_REGISTRATION_RECORD *nested_frame; + catch_func_nested_frame *nested_frame; } se_translator_ctx; typedef struct _SCOPETABLE @@ -390,7 +390,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, - EXCEPTION_REGISTRATION_RECORD *catch_frame, + catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { UINT i; @@ -440,7 +440,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, (void*)rec->ExceptionInformation[1]); /* unwind the stack */ - RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); + RtlUnwind( catch_frame ? &catch_frame->frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; @@ -627,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; + ctx.nested_frame = nested_frame; __TRY { except_ptrs.ExceptionRecord = rec; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); + frame->trylevel, nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 10 months

[reactos] 02/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c7dc46702a9615065372… commit 6c7dc46702a96150653721431dc3f27da0f28922 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:07:07 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ea20974cdd7457715bf4d758818d03bff664f62b by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 746ddad77da..5c1c9df3368 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -96,6 +96,16 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +/* exception frame for nested exceptions in catch block */ +typedef struct +{ + EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ + cxx_exception_frame *cxx_frame; /* frame of parent exception */ + const cxx_function_descr *descr; /* descriptor of parent exception */ + int trylevel; /* current try level */ + cxx_frame_info frame_info; +} catch_func_nested_frame; + typedef struct { cxx_exception_frame *frame; @@ -135,7 +145,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; + catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN; /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -332,21 +342,11 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des frame->trylevel = last_level; } -/* exception frame for nested exceptions in catch block */ -struct catch_func_nested_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ - cxx_exception_frame *cxx_frame; /* frame of parent exception */ - const cxx_function_descr *descr; /* descriptor of parent exception */ - int trylevel; /* current try level */ - cxx_frame_info frame_info; -}; - /* handler for exceptions happening while calling a catch function */ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { @@ -382,8 +382,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG } return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); + NULL, nested_frame->descr, nested_frame ); } /* find and call the appropriate catch block for an exception */ @@ -397,7 +396,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, UINT i; int j; void *addr, *object = (void *)rec->ExceptionInformation[1]; - struct catch_func_nested_frame nested_frame; + catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; thread_data_t *data = msvcrt_get_thread_data(); @@ -560,8 +559,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ) + catch_func_nested_frame* nested_frame ) { cxx_exception_type *exc_type; @@ -577,7 +575,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); + if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -602,8 +600,9 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { - return exc_type->custom_handler( rec, frame, context, dispatch, - descr, nested_trylevel, nested_frame, 0 ); + return exc_type->custom_handler( rec, frame, context, dispatch, descr, + nested_frame ? nested_frame->trylevel : 0, + nested_frame ? &nested_frame->frame : NULL, 0 ); } if (TRACE_ON(seh)) @@ -628,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame; + ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; __TRY { except_ptrs.ExceptionRecord = rec; @@ -643,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); return ExceptionContinueSearch; }

1 year, 10 months

[reactos] 01/06: [WINESYNC] Allow directories to be None

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b5a555161d01102db86f… commit 4b5a555161d01102db86f230548e6ec37c757813 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 9 22:07:53 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] Allow directories to be None --- sdk/tools/winesync/winesync.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 8547ee97306..cdee060db52 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -100,6 +100,9 @@ class wine_sync: # root files should have a direct mapping return None + if self.module_cfg['directories'] is None: + return None + wine_dir, wine_file = os.path.split(wine_path) if wine_dir in self.module_cfg['directories']: # we have a mapping for the directory

1 year, 10 months

[reactos] 02/02: [NTOS:MM] MiResolveImageReferences: Use boolean values for GdiLink and NormalLink.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5472c3e85356b3b37a0b9… commit 5472c3e85356b3b37a0b9023b2db3c9f45a05c5f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 19 19:06:20 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 19 19:06:20 2023 +0200 [NTOS:MM] MiResolveImageReferences: Use boolean values for GdiLink and NormalLink. --- ntoskrnl/mm/ARM3/sysldr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 3ea6662cc28..22aef1d7110 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -996,7 +996,8 @@ MiResolveImageReferences(IN PVOID ImageBase, PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; PLOAD_IMPORTS LoadedImports, NewImports; - ULONG GdiLink, NormalLink, i; + ULONG i; + BOOLEAN GdiLink, NormalLink; BOOLEAN ReferenceNeeded, Loaded; ANSI_STRING TempString; UNICODE_STRING NameString, DllName; @@ -1006,7 +1007,9 @@ MiResolveImageReferences(IN PVOID ImageBase, PIMAGE_EXPORT_DIRECTORY ExportDirectory; NTSTATUS Status; PIMAGE_THUNK_DATA OrigThunk, FirstThunk; + PAGED_CODE(); + DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", __FUNCTION__, ImageBase, ImageFileDirectory); @@ -1054,25 +1057,26 @@ MiResolveImageReferences(IN PVOID ImageBase, } /* Reset the import count and loop descriptors again */ - ImportCount = GdiLink = NormalLink = 0; + GdiLink = NormalLink = FALSE; + ImportCount = 0; while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk)) { /* Get the name */ ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name); /* Check if this is a GDI driver */ - GdiLink = GdiLink | + GdiLink = GdiLink || !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); /* We can also allow dxapi (for Windows compat, allow IRT and coverage) */ - NormalLink = NormalLink | + NormalLink = NormalLink || ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1)) && (_strnicmp(ImportName, "coverage", sizeof("coverage") - 1)) && (_strnicmp(ImportName, "irt", sizeof("irt") - 1))); /* Check if this is a valid GDI driver */ - if ((GdiLink) && (NormalLink)) + if (GdiLink && NormalLink) { /* It's not, it's importing stuff it shouldn't be! */ Status = STATUS_PROCEDURE_NOT_FOUND;

1 year, 10 months

[reactos] 01/02: [NTDLL] .spec file: First parameter in RtlImageDirectoryEntryToData should be 'ptr'.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df0349b49f6a23fc4a6de… commit df0349b49f6a23fc4a6de70afe8124c1358b9d25 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 29 00:35:23 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 19 19:01:00 2023 +0200 [NTDLL] .spec file: First parameter in RtlImageDirectoryEntryToData should be 'ptr'. --- dll/ntdll/def/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 801feeca335..99fcbc96ed3 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -917,7 +917,7 @@ @ stub -version=0x600+ RtlIdnToAscii @ stub -version=0x600+ RtlIdnToNameprepUnicode @ stub -version=0x600+ RtlIdnToUnicode -@ stdcall RtlImageDirectoryEntryToData(long long long ptr) +@ stdcall RtlImageDirectoryEntryToData(ptr long long ptr) @ stdcall RtlImageNtHeader(long) @ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long)

1 year, 10 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] INI file property bag (#5546)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56d95154eeaf2e96d5f3c… commit 56d95154eeaf2e96d5f3c6cd47baa03e50435235 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 19 11:22:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 19 11:22:55 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] INI file property bag (#5546) - Add SHGetIniStringUTF7W and SHSetIniStringUTF7W functions. - Add CIniPropertyBag class. - Implement SHCreatePropertyBagOnProfileSection function. CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 302 +++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 6 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 137 ++++++++++ sdk/include/reactos/shlwapi_undoc.h | 23 ++ 4 files changed, 465 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 28e22736d5d..ce65aa6c6a0 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -693,3 +693,305 @@ SHSetIniStringW( return ret; } + +/************************************************************************** + * SHGetIniStringUTF7W (SHLWAPI.473) + * + * Retrieves a string value from an INI file. + * + * @param lpAppName The section name. + * @param lpKeyName The key name. + * If this string begins from '@', the value will be interpreted as UTF-7. + * @param lpReturnedString Receives a wide string value. + * @param nSize The number of characters in lpReturnedString. + * @param lpFileName The INI file. + * @return The number of characters copied to the buffer if succeeded. + */ +EXTERN_C DWORD WINAPI +SHGetIniStringUTF7W( + _In_opt_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _Out_writes_to_(nSize, return + 1) _Post_z_ LPWSTR lpReturnedString, + _In_ DWORD nSize, + _In_z_ LPCWSTR lpFileName) +{ + if (*lpKeyName == L'@') // UTF-7 + return SHGetIniStringW(lpAppName, lpKeyName + 1, lpReturnedString, nSize, lpFileName); + + return GetPrivateProfileStringW(lpAppName, lpKeyName, L"", lpReturnedString, nSize, lpFileName); +} + +/************************************************************************** + * SHSetIniStringUTF7W (SHLWAPI.474) + * + * Sets a string value on an INI file. + * + * @param lpAppName The section name. + * @param lpKeyName The key name. + * If this begins from '@', the value will be stored as UTF-7. + * @param lpString The wide string value to be set. + * @param lpFileName The INI file. + * @return TRUE if successful. FALSE if failed. + */ +EXTERN_C BOOL WINAPI +SHSetIniStringUTF7W( + _In_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _In_opt_z_ LPCWSTR lpString, + _In_z_ LPCWSTR lpFileName) +{ + if (*lpKeyName == L'@') // UTF-7 + return SHSetIniStringW(lpAppName, lpKeyName + 1, lpString, lpFileName); + + return WritePrivateProfileStringW(lpAppName, lpKeyName, lpString, lpFileName); +} + +class CIniPropertyBag : public CBasePropertyBag +{ +protected: + LPWSTR m_pszFileName; + LPWSTR m_pszSection; + BOOL m_bAlternateStream; // ADS (Alternate Data Stream) + + static BOOL LooksLikeAnAlternateStream(LPCWSTR pszStart) + { + LPCWSTR pch = StrRChrW(pszStart, NULL, L'\\'); + if (!pch) + pch = pszStart; + return StrChrW(pch, L':') != NULL; + } + + HRESULT + _GetSectionAndName( + LPCWSTR pszStart, + LPWSTR pszSection, + UINT cchSectionMax, + LPWSTR pszName, + UINT cchNameMax); + +public: + CIniPropertyBag(DWORD dwMode) + : CBasePropertyBag(dwMode) + , m_pszFileName(NULL) + , m_pszSection(NULL) + , m_bAlternateStream(FALSE) + { + } + + ~CIniPropertyBag() override + { + ::LocalFree(m_pszFileName); + ::LocalFree(m_pszSection); + } + + HRESULT Init(LPCWSTR pszIniFile, LPCWSTR pszSection); + + STDMETHODIMP Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; +}; + +HRESULT CIniPropertyBag::Init(LPCWSTR pszIniFile, LPCWSTR pszSection) +{ + m_pszFileName = StrDupW(pszIniFile); + if (!m_pszFileName) + return E_OUTOFMEMORY; + + // Is it an ADS (Alternate Data Stream) pathname? + m_bAlternateStream = LooksLikeAnAlternateStream(m_pszFileName); + + if (pszSection) + { + m_pszSection = StrDupW(pszSection); + if (!m_pszSection) + return E_OUTOFMEMORY; + } + + return S_OK; +} + +HRESULT +CIniPropertyBag::_GetSectionAndName( + LPCWSTR pszStart, + LPWSTR pszSection, + UINT cchSectionMax, + LPWSTR pszName, + UINT cchNameMax) +{ + LPCWSTR pchSep = StrChrW(pszStart, L'\\'); + if (pchSep) + { + UINT cchSep = (UINT)(pchSep - pszStart + 1); + StrCpyNW(pszSection, pszStart, min(cchSep, cchSectionMax)); + StrCpyNW(pszName, pchSep + 1, cchNameMax); + return S_OK; + } + + if (m_pszSection) + { + StrCpyNW(pszSection, m_pszSection, cchSectionMax); + StrCpyNW(pszName, pszStart, cchNameMax); + return S_OK; + } + + ERR("%p: %s\n", this, debugstr_w(pszStart)); + return E_INVALIDARG; +} + +STDMETHODIMP +CIniPropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + + VARTYPE vt = V_VT(pvari); + + ::VariantInit(pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + WCHAR szSection[64], szName[64]; + HRESULT hr = + _GetSectionAndName(pszPropName, szSection, _countof(szSection), szName, _countof(szName)); + if (FAILED(hr)) + return hr; + + const INT cchBuffMax = 4 * MAX_PATH; // UTF-7 needs 4 times length buffer. + CComHeapPtr<WCHAR> pszBuff; + if (!pszBuff.Allocate(cchBuffMax * sizeof(WCHAR))) + return E_OUTOFMEMORY; + + if (!SHGetIniStringUTF7W(szSection, szName, pszBuff, cchBuffMax, m_pszFileName)) + return E_FAIL; + + BSTR bstr = ::SysAllocString(pszBuff); + V_BSTR(pvari) = bstr; + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(pvari) = VT_BSTR; + return ::VariantChangeTypeForRead(pvari, vt); +} + +STDMETHODIMP +CIniPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) +{ + TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + HRESULT hr; + BSTR bstr; + VARIANTARG vargTemp = { 0 }; + switch (V_VT(pvari)) + { + case VT_EMPTY: + bstr = NULL; + break; + + case VT_BSTR: + bstr = V_BSTR(pvari); + break; + + default: + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_BSTR); + if (FAILED(hr)) + goto Quit; + + bstr = V_BSTR(&vargTemp); + break; + } + + WCHAR szSection[64], szName[64]; + hr = _GetSectionAndName(pszPropName, szSection, _countof(szSection), szName, _countof(szName)); + if (SUCCEEDED(hr)) + { + if (SHSetIniStringUTF7W(szSection, szName, bstr, m_pszFileName)) + { + if (!m_bAlternateStream) + SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, m_pszFileName, NULL); + } + else + { + hr = E_FAIL; + } + } + +Quit: + ::VariantClear(&vargTemp); + return hr; +} + +/************************************************************************** + * SHCreatePropertyBagOnProfileSection (SHLWAPI.472) + * + * Creates a property bag object on INI file. + * + * @param lpFileName The INI filename. + * @param pszSection The optional section name. + * @param dwMode The combination of STGM_READ, STGM_WRITE, STGM_READWRITE, and STGM_CREATE. + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/cre… + */ +EXTERN_C HRESULT WINAPI +SHCreatePropertyBagOnProfileSection( + _In_z_ LPCWSTR lpFileName, + _In_opt_z_ LPCWSTR pszSection, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj) +{ + HANDLE hFile; + PWCHAR pchFileTitle; + WCHAR szBuff[MAX_PATH]; + + if (dwMode & STGM_CREATE) + { + hFile = ::CreateFileW(lpFileName, 0, FILE_SHARE_DELETE, 0, CREATE_NEW, + FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + pchFileTitle = PathFindFileNameW(lpFileName); + if (lstrcmpiW(pchFileTitle, L"desktop.ini") == 0) + { + StrCpyNW(szBuff, lpFileName, _countof(szBuff)); + if (PathRemoveFileSpecW(szBuff)) + PathMakeSystemFolderW(szBuff); + } + ::CloseHandle(hFile); + } + } + + *ppvObj = NULL; + + if (!PathFileExistsW(lpFileName)) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + CComPtr<CIniPropertyBag> pIniPB(new CIniPropertyBag(dwMode)); + + HRESULT hr = pIniPB->Init(lpFileName, pszSection); + if (FAILED(hr)) + { + ERR("0x%08X\n", hr); + return hr; + } + + return pIniPB->QueryInterface(riid, ppvObj); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 13cac9b8c7a..434fb246046 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -469,9 +469,9 @@ 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld 471 stdcall -noname SHCreatePropertyBagOnRegKey(ptr wstr long ptr ptr) -472 stub -noname SHCreatePropertyBagOnProfileSelection -473 stub -noname SHGetIniStringUTF7W -474 stub -noname SHSetIniStringUTF7W +472 stdcall -noname SHCreatePropertyBagOnProfileSection(wstr wstr long ptr ptr) +473 stdcall -noname SHGetIniStringUTF7W(wstr wstr ptr long wstr) +474 stdcall -noname SHSetIniStringUTF7W(wstr wstr wstr wstr) 475 stdcall -noname GetShellSecurityDescriptor(ptr long) 476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) 477 stdcall -noname SHCreatePropertyBagOnMemory(long ptr ptr) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 2593cf66c6d..57ec8881006 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -8,6 +8,7 @@ #include <apitest.h> #include <shlwapi.h> #include <shlobj.h> +#include <stdio.h> #include <shlwapi_undoc.h> #include <versionhelpers.h> @@ -687,6 +688,141 @@ static void SHPropertyBag_SHSetIniStringW(void) DeleteFileW(szIniFile); } +void SHPropertyBag_OnIniFile(void) +{ + WCHAR szIniFile[MAX_PATH], szValue[MAX_PATH]; + HRESULT hr; + IPropertyBag *pPropBag; + VARIANT vari; + DWORD dwRet; + + ExpandEnvironmentStringsW(L"%TEMP%\\SHPropertyBag.ini", szIniFile, _countof(szIniFile)); + + DeleteFileW(szIniFile); + fclose(_wfopen(szIniFile, L"w")); + + trace("%ls\n", szIniFile); + + // read-write + hr = SHCreatePropertyBagOnProfileSection( + szIniFile, + L"TestSection", + STGM_READWRITE, + IID_IPropertyBag, + (void**)&pPropBag); + ok_long(hr, S_OK); + ok_int(PathFileExistsW(szIniFile), TRUE); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"StrValue"); + hr = pPropBag->Write(L"Name2", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR (dirty UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"ABC\x3042\x3044\x3046\x2665"); + hr = pPropBag->Write(L"@Name3", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR (clean UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"1234abc"); + hr = pPropBag->Write(L"@Name4", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + pPropBag->Release(); + + // Flush + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + + // Check INI file + dwRet = GetPrivateProfileStringW(L"TestSection", L"Name1", L"BAD", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 10); + ok_wstr(szValue, L"3735943886"); + + dwRet = GetPrivateProfileStringW(L"TestSection", L"Name2", L"BAD", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 8); + ok_wstr(szValue, L"StrValue"); + + GetPrivateProfileStringW(L"TestSection", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_int(memcmp(szValue, L"ABC", 3 * sizeof(WCHAR)), 0); + + GetPrivateProfileStringW(L"TestSection.A", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_int(memcmp(szValue, L"ABC", 3 * sizeof(WCHAR)), 0); + + GetPrivateProfileStringW(L"TestSection.W", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"ABC+MEIwRDBGJmU-"); // UTF-7 + + GetPrivateProfileStringW(L"TestSection", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"1234abc"); + + GetPrivateProfileStringW(L"TestSection.A", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"NotFound"); + + GetPrivateProfileStringW(L"TestSection.W", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"NotFound"); + + // read-only + hr = SHCreatePropertyBagOnProfileSection( + szIniFile, + NULL, + STGM_READ, + IID_IPropertyBag, + (void**)&pPropBag); + ok_long(hr, S_OK); + + // Read UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + hr = pPropBag->Read(L"TestSection\\Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Read BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\Name2", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"StrValue"); + VariantClear(&vari); + + // Read BSTR (dirty UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\@Name3", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"ABC\x3042\x3044\x3046\x2665"); + VariantClear(&vari); + + // Read BSTR (clean UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\@Name4", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"1234abc"); + VariantClear(&vari); + + pPropBag->Release(); + + DeleteFileW(szIniFile); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); @@ -694,4 +830,5 @@ START_TEST(SHPropertyBag) SHPropertyBag_OnMemory(); SHPropertyBag_OnRegKey(); SHPropertyBag_SHSetIniStringW(); + SHPropertyBag_OnIniFile(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 4e01e7c633f..270bc344291 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -135,6 +135,14 @@ SHCreatePropertyBagOnRegKey( _In_ REFIID riid, _Out_ void **ppvObj); +HRESULT WINAPI +SHCreatePropertyBagOnProfileSection( + _In_z_ LPCWSTR lpFileName, + _In_opt_z_ LPCWSTR pszSection, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj); + HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); @@ -194,6 +202,21 @@ SHSetIniStringW( _In_opt_z_ LPCWSTR str, _In_z_ LPCWSTR filename); +DWORD WINAPI +SHGetIniStringUTF7W( + _In_opt_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _Out_writes_to_(nSize, return + 1) _Post_z_ LPWSTR lpReturnedString, + _In_ DWORD nSize, + _In_z_ LPCWSTR lpFileName); + +BOOL WINAPI +SHSetIniStringUTF7W( + _In_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _In_opt_z_ LPCWSTR lpString, + _In_z_ LPCWSTR lpFileName); + int WINAPIV ShellMessageBoxWrapW(

1 year, 10 months

[reactos] 01/01: [CONSRV] Only call CoUninitialize if initialized (#5582)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0e443058ef22c9f559df… commit c0e443058ef22c9f559df6d49b9d5deb8ccbc161 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Aug 18 19:06:20 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 19:06:20 2023 +0200 [CONSRV] Only call CoUninitialize if initialized (#5582) --- win32ss/user/winsrv/consrv/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index cc269604ba7..3209e3b4a83 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/winsrv/consrv/console.c * PURPOSE: Console Management Functions - * PROGRAMMERS: G� van Geldorp + * PROGRAMMERS: Gé van Geldorp * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -465,8 +465,8 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_STATE_INFO ConsoleInfo, } IShellLinkW_Release(pshl); } + CoUninitialize(); } - CoUninitialize(); Finish:

1 year, 10 months

[reactos] 01/01: [ATL_APITEST][SDK] Fix failures of CImage testcase (#5567)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80153fc68669a99ccec67… commit 80153fc68669a99ccec67e2ed759d53d0ea26ddd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 18 20:34:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 20:34:33 2023 +0900 [ATL_APITEST][SDK] Fix failures of CImage testcase (#5567) - Improve compatibility of CImage. - Improve CImage testcase of atl_apitest. - Improve CImage::BuildCodecFilterString. CORE-19008 --- modules/rostests/apitests/atl/CImage.cpp | 230 +++++++++++++++++------- modules/rostests/apitests/atl/devenv/.gitignore | 2 + sdk/lib/atl/atlimage.h | 6 - 3 files changed, 167 insertions(+), 71 deletions(-) diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 269c3fd7686..005cd4d9295 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -101,7 +101,6 @@ static void init_gdip() DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); } - static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) { using namespace Gdiplus; @@ -135,8 +134,7 @@ static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) Shutdown(gdiplusToken); } - -START_TEST(CImage) +static void Test_LoadSaveImage(void) { HRESULT hr; TCHAR* file; @@ -147,12 +145,6 @@ START_TEST(CImage) COLORREF color; HDC hDC; -#if 0 - width = image1.GetWidth(); - height = image1.GetHeight(); - bpp = image1.GetBPP(); -#endif - HINSTANCE hInst = GetModuleHandle(NULL); GetTempPath(MAX_PATH, szTempPath); @@ -166,7 +158,6 @@ START_TEST(CImage) bpp = image1.GetBPP(); ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); - image2.LoadFromResource(hInst, IDB_CROSS); ok(!image2.IsNull(), "Expected image2 is not null\n"); image2.SetTransparentColor(RGB(255, 255, 255)); @@ -208,7 +199,7 @@ START_TEST(CImage) height = image2.GetHeight(); ok_int(height, 48); bpp = image2.GetBPP(); - ok_int(bpp, 32); + ok(bpp == 32 || bpp == 8, "bpp was %d\n", bpp); for (n = 0; n < _countof(szFiles); ++n) { @@ -234,12 +225,11 @@ START_TEST(CImage) bpp = image2.GetBPP(); if (n == 3) { - ok(bpp == 32, "Expected bpp to be 32, was: %d (for %i)\n", bpp, n); + ok(bpp == 24 || bpp == 32, "Expected bpp to be 24 or 32, was: %d (for %i)\n", bpp, n); determine_file_bpp(file, PixelFormat24bppRGB); } else { - ok(bpp == 32, "Expected bpp to be 32, was: %d (for %i)\n", bpp, n); determine_file_bpp(file, PixelFormat8bppIndexed); } color = image1.GetPixel(5, 5); @@ -248,67 +238,177 @@ START_TEST(CImage) bOK = DeleteFile(file); ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); } +} + +static INT FindGUID(REFGUID rguid, const CSimpleArray<GUID>& guids) +{ + for (INT i = 0; i < guids.GetSize(); ++i) + { + if (memcmp(&rguid, &guids[i], sizeof(GUID)) == 0) + return i; + } + return -1; +} + +static INT FindFilterItem(const TCHAR *filter, const TCHAR *item) +{ + INT iFilter = 0; + DWORD cbItem = lstrlen(item) * sizeof(TCHAR); + BOOL bSep = TRUE; + + for (; *filter; ++filter) + { + if (bSep && memcmp(item, filter, cbItem) == 0) + return (iFilter + 1) / 2; + + bSep = (*filter == TEXT('|')); + if (bSep) + ++iFilter; + } + return -1; +} + +static void Test_Importer(void) +{ + HRESULT hr; ATL::IAtlStringMgr *mgr = CAtlStringMgr::GetInstance(); CSimpleArray<GUID> aguidFileTypes; -#ifdef UNICODE - CHAR szBuff[512]; - const WCHAR *psz; -#else - const CHAR *psz; -#endif + INT iNULL, iBMP, iJPEG, iGIF, iPNG, iTIFF, iEMF, iWMF; + // Try importer with "All Image Files" CSimpleString strImporters(mgr); aguidFileTypes.RemoveAll(); - hr = CImage::GetImporterFilterString(strImporters, - aguidFileTypes, - TEXT("All Image Files"), 0); + hr = CImage::GetImporterFilterString(strImporters, aguidFileTypes, TEXT("All Image Files"), 0); ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); - ok(aguidFileTypes.GetSize() == 9, "Expected aguidFileTypes.GetSize() to be 8, was %d.", aguidFileTypes.GetSize()); - ok(IsEqualGUID(aguidFileTypes[0], GUID_NULL), "Expected aguidFileTypes[0] to be GUID_NULL.\n"); - ok(IsEqualGUID(aguidFileTypes[1], Gdiplus::ImageFormatBMP), "Expected aguidFileTypes[1] to be Gdiplus::ImageFormatBMP.\n"); - ok(IsEqualGUID(aguidFileTypes[2], Gdiplus::ImageFormatJPEG), "Expected aguidFileTypes[2] to be Gdiplus::ImageFormatJPEG.\n"); - ok(IsEqualGUID(aguidFileTypes[3], Gdiplus::ImageFormatGIF), "Expected aguidFileTypes[3] to be Gdiplus::ImageFormatGIF.\n"); - ok(IsEqualGUID(aguidFileTypes[4], Gdiplus::ImageFormatEMF), "Expected aguidFileTypes[4] to be Gdiplus::ImageFormatEMF.\n"); - ok(IsEqualGUID(aguidFileTypes[5], Gdiplus::ImageFormatWMF), "Expected aguidFileTypes[5] to be Gdiplus::ImageFormatWMF.\n"); - ok(IsEqualGUID(aguidFileTypes[6], Gdiplus::ImageFormatTIFF), "Expected aguidFileTypes[6] to be Gdiplus::ImageFormatTIFF.\n"); - ok(IsEqualGUID(aguidFileTypes[7], Gdiplus::ImageFormatPNG), "Expected aguidFileTypes[7] to be Gdiplus::ImageFormatPNG.\n"); - ok(IsEqualGUID(aguidFileTypes[8], Gdiplus::ImageFormatIcon), "Expected aguidFileTypes[8] to be Gdiplus::ImageFormatIcon.\n"); - - psz = strImporters.GetString(); -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, psz, -1, szBuff, 512, NULL, NULL); - ok(lstrcmpA(szBuff, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The importer filter string is bad, was: %s\n", szBuff); -#else - ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The importer filter string is bad, was: %s\n", psz); -#endif + ok(aguidFileTypes.GetSize() >= 8, + "Expected aguidFileTypes.GetSize() to be >= 8, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + iEMF = FindGUID(Gdiplus::ImageFormatEMF, aguidFileTypes); + iWMF = FindGUID(Gdiplus::ImageFormatWMF, aguidFileTypes); + + ok_int(iNULL, 0); + ok(iBMP > 0, "iBMP was %d\n", iBMP); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + ok(iEMF > 0, "iEMF was %d\n", iEMF); + ok(iWMF > 0, "iWMF was %d\n", iWMF); + + ok_int(memcmp(strImporters, TEXT("All Image Files|"), sizeof(TEXT("All Image Files|")) - sizeof(TCHAR)), 0); + ok_int(iBMP, FindFilterItem(strImporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strImporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strImporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strImporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strImporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); + + // Try importer without "All Image Files" + aguidFileTypes.RemoveAll(); + strImporters.Empty(); + hr = CImage::GetImporterFilterString(strImporters, aguidFileTypes, NULL, 0); + ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); + ok(aguidFileTypes.GetSize() >= 7, + "Expected aguidFileTypes.GetSize() to be >= 7, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + iEMF = FindGUID(Gdiplus::ImageFormatEMF, aguidFileTypes); + iWMF = FindGUID(Gdiplus::ImageFormatWMF, aguidFileTypes); + + ok_int(iNULL, -1); + ok_int(iBMP, 0); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + ok(iEMF > 0, "iEMF was %d\n", iEMF); + ok(iWMF > 0, "iWMF was %d\n", iWMF); + + ok_int(iBMP, FindFilterItem(strImporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strImporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strImporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strImporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strImporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); +} + +static void Test_Exporter(void) +{ + HRESULT hr; + ATL::IAtlStringMgr *mgr = CAtlStringMgr::GetInstance(); + CSimpleArray<GUID> aguidFileTypes; + INT iNULL, iBMP, iJPEG, iGIF, iPNG, iTIFF; + // Try exporter with "All Image Files" CSimpleString strExporters(mgr); aguidFileTypes.RemoveAll(); - hr = CImage::GetExporterFilterString(strExporters, - aguidFileTypes, - TEXT("All Image Files"), 0); + hr = CImage::GetExporterFilterString(strExporters, aguidFileTypes, TEXT("All Image Files"), 0); ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); - ok(aguidFileTypes.GetSize() == 9, "Expected aguidFileTypes.GetSize() to be 8, was %d.", aguidFileTypes.GetSize()); - ok(IsEqualGUID(aguidFileTypes[0], GUID_NULL), "Expected aguidFileTypes[0] to be GUID_NULL.\n"); - ok(IsEqualGUID(aguidFileTypes[1], Gdiplus::ImageFormatBMP), "Expected aguidFileTypes[1] to be Gdiplus::ImageFormatBMP.\n"); - ok(IsEqualGUID(aguidFileTypes[2], Gdiplus::ImageFormatJPEG), "Expected aguidFileTypes[2] to be Gdiplus::ImageFormatJPEG.\n"); - ok(IsEqualGUID(aguidFileTypes[3], Gdiplus::ImageFormatGIF), "Expected aguidFileTypes[3] to be Gdiplus::ImageFormatGIF.\n"); - ok(IsEqualGUID(aguidFileTypes[4], Gdiplus::ImageFormatEMF), "Expected aguidFileTypes[4] to be Gdiplus::ImageFormatEMF.\n"); - ok(IsEqualGUID(aguidFileTypes[5], Gdiplus::ImageFormatWMF), "Expected aguidFileTypes[5] to be Gdiplus::ImageFormatWMF.\n"); - ok(IsEqualGUID(aguidFileTypes[6], Gdiplus::ImageFormatTIFF), "Expected aguidFileTypes[6] to be Gdiplus::ImageFormatTIFF.\n"); - ok(IsEqualGUID(aguidFileTypes[7], Gdiplus::ImageFormatPNG), "Expected aguidFileTypes[7] to be Gdiplus::ImageFormatPNG.\n"); - ok(IsEqualGUID(aguidFileTypes[8], Gdiplus::ImageFormatIcon), "Expected aguidFileTypes[8] to be Gdiplus::ImageFormatIcon.\n"); - - psz = strExporters.GetString(); -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, psz, -1, szBuff, 512, NULL, NULL); - ok(lstrcmpA(szBuff, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The exporter filter string is bad, was: %s\n", szBuff); -#else - ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The exporter filter string is bad, was: %s\n", psz); -#endif + ok(aguidFileTypes.GetSize() >= 6, + "Expected aguidFileTypes.GetSize() to be >= 6, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + + ok_int(iNULL, 0); + ok(iBMP > 0, "iBMP was %d\n", iBMP); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + + ok_int(iBMP, FindFilterItem(strExporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strExporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strExporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strExporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strExporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); + + // Try exporter without "All Image Files" + strExporters.Empty(); + aguidFileTypes.RemoveAll(); + hr = CImage::GetExporterFilterString(strExporters, aguidFileTypes, NULL, 0); + ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); + ok(aguidFileTypes.GetSize() >= 5, + "Expected aguidFileTypes.GetSize() to be >= 5, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + + ok_int(iNULL, -1); + ok_int(iBMP, 0); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + + ok_int(iBMP, FindFilterItem(strExporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strExporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strExporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strExporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strExporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); +} + +START_TEST(CImage) +{ + Test_LoadSaveImage(); + Test_Importer(); + Test_Exporter(); } diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore index 442c28bde1d..da889791668 100644 --- a/modules/rostests/apitests/atl/devenv/.gitignore +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -18,3 +18,5 @@ CSimpleArray/ CSimpleMap/ CString/ SubclassWindow/ +Debug/ +Release/ diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 09e2d6452c5..6865b38e84d 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -764,13 +764,8 @@ private: CString ext(pCodecs[i].FilenameExtension); extensions += ext; } - extensions.MakeLower(); - strFilter += TEXT(" ("); - strFilter += extensions; - strFilter += TEXT(")"); strFilter += chSeparator; - strFilter += extensions; strFilter += chSeparator; @@ -783,7 +778,6 @@ private: continue; CString extensions(pCodecs[i].FilenameExtension); - extensions.MakeLower(); CString desc(pCodecs[i].FormatDescription); strFilter += desc;

1 year, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs