February 2022 - Wine-commits

Eric Pouech : winmm: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 71189f62604c2cb8208c85372a0e027dd2b79055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71189f62604c2cb8208c8537… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 08:15:19 2022 -0600 winmm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/driver.c | 18 ++--- dlls/winmm/joystick.c | 24 +++---- dlls/winmm/lolvldrv.c | 16 ++--- dlls/winmm/mci.c | 70 +++++++++---------- dlls/winmm/mmio.c | 48 ++++++------- dlls/winmm/playsound.c | 14 ++-- dlls/winmm/time.c | 2 +- dlls/winmm/waveform.c | 178 ++++++++++++++++++++++++------------------------- dlls/winmm/winmm.c | 50 +++++++------- 10 files changed, 211 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71189f62604c2cb8208c…

1 0

Eric Pouech : wineps.drv: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: ceb06647db50f73c0e622453fd76190160056926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb06647db50f73c0e622453… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:46 2022 +0100 wineps.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/color.c | 2 +- dlls/wineps.drv/download.c | 4 ++-- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/escape.c | 10 +++++----- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 2 +- dlls/wineps.drv/init.c | 18 +++++++++--------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/ppd.c | 4 ++-- dlls/wineps.drv/ps.c | 8 ++++---- dlls/wineps.drv/type1.c | 10 +++++----- dlls/wineps.drv/type42.c | 22 +++++++++++----------- 15 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceb06647db50f73c0e62…

1 0

Eric Pouech : windowscodecs: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: aa180417b88072643b4edf21f246325dc410b145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa180417b88072643b4edf21… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:16 2022 +0100 windowscodecs: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/bitmap.c | 12 +++--- dlls/windowscodecs/bmpdecode.c | 10 ++--- dlls/windowscodecs/bmpencode.c | 8 ++-- dlls/windowscodecs/clipper.c | 4 +- dlls/windowscodecs/clsfactory.c | 6 +-- dlls/windowscodecs/colorcontext.c | 4 +- dlls/windowscodecs/colortransform.c | 4 +- dlls/windowscodecs/converter.c | 4 +- dlls/windowscodecs/ddsformat.c | 16 ++++---- dlls/windowscodecs/decoder.c | 10 ++--- dlls/windowscodecs/encoder.c | 12 +++--- dlls/windowscodecs/fliprotate.c | 4 +- dlls/windowscodecs/gifformat.c | 16 ++++---- dlls/windowscodecs/icoformat.c | 14 +++---- dlls/windowscodecs/imgfactory.c | 22 +++++----- dlls/windowscodecs/info.c | 30 +++++++------- dlls/windowscodecs/libjpeg.c | 4 +- dlls/windowscodecs/libtiff.c | 2 +- dlls/windowscodecs/metadatahandler.c | 16 ++++---- dlls/windowscodecs/metadataquery.c | 24 +++++------ dlls/windowscodecs/palette.c | 4 +- dlls/windowscodecs/propertybag.c | 12 +++--- dlls/windowscodecs/scaler.c | 4 +- dlls/windowscodecs/stream.c | 76 +++++++++++++++++------------------ dlls/windowscodecs/tgaformat.c | 12 +++--- dlls/windowscodecs/wincodecs_common.c | 2 +- dlls/wmphoto/Makefile.in | 1 - dlls/wmphoto/main.c | 2 +- 29 files changed, 167 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa180417b88072643b4e…

1 0

Alexandre Julliard : ntdll: Map imported apiset dlls to their target library.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 31e151362bc5e82a988a4f9ff4309697525eda3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e151362bc5e82a988a4f9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 11:43:04 2022 +0100 ntdll: Map imported apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 - 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2c3e62f6e25..387f8b6b2d6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -587,16 +587,102 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id ) } +/****************************************************************************** + * get_apiset_entry + */ +static NTSTATUS get_apiset_entry( const API_SET_NAMESPACE *map, const WCHAR *name, ULONG len, + const API_SET_NAMESPACE_ENTRY **entry ) +{ + const API_SET_HASH_ENTRY *hash_entry; + ULONG hash, i, hash_len; + int min, max; + + if (len <= 4) return STATUS_INVALID_PARAMETER; + if (wcsnicmp( name, L"api-", 4 ) && wcsnicmp( name, L"ext-", 4 )) return STATUS_INVALID_PARAMETER; + if (!map) return STATUS_APISET_NOT_PRESENT; + + for (i = hash_len = 0; i < len; i++) + { + if (name[i] == '.') break; + if (name[i] == '-') hash_len = i; + } + for (i = hash = 0; i < hash_len; i++) + hash = hash * map->HashFactor + ((name[i] >= 'A' && name[i] <= 'Z') ? name[i] + 32 : name[i]); + + hash_entry = (API_SET_HASH_ENTRY *)((char *)map + map->HashOffset); + min = 0; + max = map->Count - 1; + while (min <= max) + { + int pos = (min + max) / 2; + if (hash_entry[pos].Hash < hash) min = pos + 1; + else if (hash_entry[pos].Hash > hash) max = pos - 1; + else + { + *entry = (API_SET_NAMESPACE_ENTRY *)((char *)map + map->EntryOffset) + hash_entry[pos].Index; + if ((*entry)->HashedLength != hash_len * sizeof(WCHAR)) break; + if (wcsnicmp( (WCHAR *)((char *)map + (*entry)->NameOffset), name, hash_len )) break; + return STATUS_SUCCESS; + } + } + return STATUS_APISET_NOT_PRESENT; +} + + +/****************************************************************************** + * get_apiset_target + */ +static NTSTATUS get_apiset_target( const API_SET_NAMESPACE *map, const API_SET_NAMESPACE_ENTRY *entry, + const WCHAR *host, UNICODE_STRING *ret ) +{ + const API_SET_VALUE_ENTRY *value = (API_SET_VALUE_ENTRY *)((char *)map + entry->ValueOffset); + ULONG i, len; + + if (!entry->ValueCount) return STATUS_DLL_NOT_FOUND; + if (host) + { + /* look for specific host in entries 1..n, entry 0 is the default */ + for (i = 1; i < entry->ValueCount; i++) + { + len = value[i].NameLength / sizeof(WCHAR); + if (!wcsnicmp( host, (WCHAR *)((char *)map + value[i].NameOffset), len ) && !host[len]) + { + value += i; + break; + } + } + } + if (!value->ValueOffset) return STATUS_DLL_NOT_FOUND; + ret->Buffer = (WCHAR *)((char *)map + value->ValueOffset); + ret->Length = value->ValueLength; + return STATUS_SUCCESS; +} + + /********************************************************************** * build_import_name */ static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int len ) { + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + const WCHAR *host = current_modref ? current_modref->ldr.BaseDllName.Buffer : NULL; + UNICODE_STRING str; + while (len && import[len-1] == ' ') len--; /* remove trailing spaces */ if (len + sizeof(".dll") > 256) return STATUS_DLL_NOT_FOUND; ascii_to_unicode( buffer, import, len ); buffer[len] = 0; if (!wcschr( buffer, '.' )) wcscpy( buffer + len, L".dll" ); + + if (get_apiset_entry( map, buffer, wcslen(buffer), &entry )) return STATUS_SUCCESS; + + if (get_apiset_target( map, entry, host, &str )) return STATUS_DLL_NOT_FOUND; + if (str.Length >= 256 * sizeof(WCHAR)) return STATUS_DLL_NOT_FOUND; + + TRACE( "found %s for %s\n", debugstr_us(&str), debugstr_w(buffer)); + memcpy( buffer, str.Buffer, str.Length ); + buffer[str.Length / sizeof(WCHAR)] = 0; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 98a5c933215..ab12a4ea1c0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2055,7 +2055,6 @@ static void load_apiset_dll(void) { NtCurrentTeb()->Peb->ApiSetMap = map; if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); - NtUnmapViewOfSection( NtCurrentProcess(), ptr ); TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); return; }

1 0

Alexandre Julliard : ntdll: Map explicitly loaded apiset dlls to their target library.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 7b233f3032e4850b0f387faef4aae5ed6d5175de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b233f3032e4850b0f387fae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:31:40 2022 +0100 ntdll: Map explicitly loaded apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 6 ++---- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index dcf3b8b3765..bd151708220 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -708,7 +708,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -722,7 +721,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -733,7 +731,6 @@ static void test_LoadLibraryEx_search_flags(void) strcpy( buffer, apiset_dll ); buffer[strlen(buffer) - 5] = '9'; mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); - todo_wine ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); if (mod) { @@ -776,9 +773,10 @@ static void test_LoadLibraryEx_search_flags(void) ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine /* rasapi32 doesn't have interesting dependencies on wine */ ok( !mod, "rasapi32 loaded\n" ); - ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); + else ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 387f8b6b2d6..49911d6c707 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2830,6 +2830,30 @@ done: } + +/****************************************************************************** + * find_apiset_dll + */ +static NTSTATUS find_apiset_dll( const WCHAR *name, WCHAR **fullname ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + UNICODE_STRING str; + ULONG len; + + if (get_apiset_entry( map, name, wcslen(name), &entry )) return STATUS_APISET_NOT_PRESENT; + if (get_apiset_target( map, entry, NULL, &str )) return STATUS_DLL_NOT_FOUND; + + len = wcslen( system_dir ) + str.Length / sizeof(WCHAR); + if (!(*fullname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + wcscpy( *fullname, system_dir ); + memcpy( *fullname + wcslen( system_dir ), str.Buffer, str.Length ); + (*fullname)[len] = 0; + return STATUS_SUCCESS; +} + + /*********************************************************************** * get_env_var */ @@ -2991,17 +3015,6 @@ done: return status; } -/*********************************************************************** - * is_apiset_dll_name - * - */ -static BOOL is_apiset_dll_name( const WCHAR *name ) -{ - static const WCHAR name_prefix[] = L"api-ms-win-"; - - return !wcsnicmp( name, name_prefix, ARRAY_SIZE(name_prefix) - 1 ); -} - /*********************************************************************** * find_dll_file * @@ -3024,7 +3037,11 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (!contains_path( libname )) { - status = find_actctx_dll( libname, &fullname ); + status = find_apiset_dll( libname, &fullname ); + if (status == STATUS_DLL_NOT_FOUND) goto done; + + if (status) status = find_actctx_dll( libname, &fullname ); + if (status == STATUS_SUCCESS) { TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); @@ -3044,8 +3061,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { status = search_dll_file( load_path, libname, nt_name, pwm, mapping, image_info, id ); - if (status == STATUS_DLL_NOT_FOUND && load_path && is_apiset_dll_name( libname )) - status = search_dll_file( NULL, libname, nt_name, pwm, mapping, image_info, id ); if (status == STATUS_DLL_NOT_FOUND) status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); }

1 0

Alexandre Julliard : ntdll: Implement ApiSetQueryApiSetPresence/Ex().
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: cb2fb8c25eb641f96e0b5d84f8049d67f50c0f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb2fb8c25eb641f96e0b5d84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:35:18 2022 +0100 ntdll: Implement ApiSetQueryApiSetPresence/Ex(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 3 --- dlls/ntdll/loader.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 12 ------------ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 2 ++ 5 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bd151708220..58dcfaaec99 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1468,7 +1468,6 @@ static void test_apisets(void) win_skip( "ApiSetQueryApiSetPresence not implemented\n" ); return; } - todo_wine if (!pApiSetQueryApiSetPresenceEx) win_skip( "ApiSetQueryApiSetPresenceEx not implemented\n" ); todo_wine if (!pIsApiSetImplemented) win_skip( "IsApiSetImplemented not implemented\n" ); @@ -1480,9 +1479,7 @@ static void test_apisets(void) winetest_push_context( "%u:%s", i, tests[i].name ); present = 0xff; status = pApiSetQueryApiSetPresence( &name, &present ); - todo_wine ok( status == STATUS_SUCCESS, "wrong ret %x\n", status ); - todo_wine_if( !tests[i].present ) ok( present == tests[i].present || broken(!present && tests[i].broken) /* win8 */, "wrong present %u\n", present ); if (pApiSetQueryApiSetPresenceEx) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 49911d6c707..d3b63dc7ada 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4526,6 +4526,51 @@ void WINAPI RtlReleasePath( PWSTR path ) } +/********************************************************************* + * ApiSetQueryApiSetPresence (NTDLL.@) + */ +NTSTATUS WINAPI ApiSetQueryApiSetPresence( const UNICODE_STRING *name, BOOLEAN *present ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + UNICODE_STRING str; + + *present = (!get_apiset_entry( map, name->Buffer, name->Length / sizeof(WCHAR), &entry ) && + !get_apiset_target( map, entry, NULL, &str )); + return STATUS_SUCCESS; +} + + +/********************************************************************* + * ApiSetQueryApiSetPresenceEx (NTDLL.@) + */ +NTSTATUS WINAPI ApiSetQueryApiSetPresenceEx( const UNICODE_STRING *name, BOOLEAN *in_schema, BOOLEAN *present ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + NTSTATUS status; + UNICODE_STRING str; + ULONG i, len = name->Length / sizeof(WCHAR); + + /* extension not allowed */ + for (i = 0; i < len; i++) if (name->Buffer[i] == '.') return STATUS_INVALID_PARAMETER; + + status = get_apiset_entry( map, name->Buffer, len, &entry ); + if (status == STATUS_APISET_NOT_PRESENT) + { + *in_schema = *present = FALSE; + return STATUS_SUCCESS; + } + if (status) return status; + + /* the name must match exactly */ + *in_schema = (entry->NameLength == name->Length && + !wcsnicmp( (WCHAR *)((char *)map + entry->NameOffset), name->Buffer, len )); + *present = *in_schema && !get_apiset_target( map, entry, NULL, &str ); + return STATUS_SUCCESS; +} + + /****************************************************************** * DllMain (NTDLL.@) */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 3bef5a561c8..bce8d7db54e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -381,15 +381,3 @@ ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, /*U va_end( valist ); return ret; } - -/********************************************************************* - * ApiSetQueryApiSetPresence (NTDLL.@) - */ -BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN *present) -{ - FIXME("(%s, %p) stub!\n", debugstr_us(namespace), present); - - if(present) - *present = TRUE; - return TRUE; -} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 29174965394..d514bca5e11 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -7,6 +7,7 @@ @ stdcall A_SHAInit(ptr) @ stdcall A_SHAUpdate(ptr ptr long) @ stdcall ApiSetQueryApiSetPresence(ptr ptr) +@ stdcall ApiSetQueryApiSetPresenceEx(ptr ptr ptr) @ stub CsrAllocateCaptureBuffer @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer diff --git a/include/winternl.h b/include/winternl.h index ae331562026..6a95c4e0fdc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3866,6 +3866,8 @@ typedef struct _API_SET_VALUE_ENTRY * Function declarations */ +NTSYSAPI NTSTATUS WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING*,BOOLEAN*); +NTSYSAPI NTSTATUS WINAPI ApiSetQueryApiSetPresenceEx(const UNICODE_STRING*,BOOLEAN*,BOOLEAN*); NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...);

1 0

Alexandre Julliard : kernelbase: Implement IsApiSetImplemented().
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 77973e7e720dabb57c76b0a971c07ff7e70d36b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77973e7e720dabb57c76b0a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:38:37 2022 +0100 kernelbase: Implement IsApiSetImplemented(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 1 - dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/loader.c | 16 ++++++++++++++++ include/winbase.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 58dcfaaec99..6d44b50e122 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1469,7 +1469,6 @@ static void test_apisets(void) return; } if (!pApiSetQueryApiSetPresenceEx) win_skip( "ApiSetQueryApiSetPresenceEx not implemented\n" ); - todo_wine if (!pIsApiSetImplemented) win_skip( "IsApiSetImplemented not implemented\n" ); for (i = 0; i < ARRAY_SIZE(tests); i++) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a4c14184452..c1175af2f9f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -868,6 +868,7 @@ # @ stub InternetTimeToSystemTimeW # @ stub InvalidateAppModelVersionCache @ stub InvalidateTzSpecificCache +@ stdcall IsApiSetImplemented(str) @ stdcall IsCharAlphaA(long) @ stdcall IsCharAlphaNumericA(long) @ stdcall IsCharAlphaNumericW(long) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 02d72cfbfbf..0fd2d7b7c99 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -467,6 +467,22 @@ FARPROC WINAPI DECLSPEC_HOTPATCH GetProcAddress( HMODULE module, LPCSTR function #endif /* __x86_64__ */ +/*********************************************************************** + * IsApiSetImplemented (kernelbase.@) + */ +BOOL WINAPI IsApiSetImplemented( LPCSTR name ) +{ + UNICODE_STRING str; + NTSTATUS status; + BOOLEAN in_schema, present; + + if (!RtlCreateUnicodeStringFromAsciiz( &str, name )) return FALSE; + status = ApiSetQueryApiSetPresenceEx( &str, &in_schema, &present ); + RtlFreeUnicodeString( &str ); + return !status && present; +} + + /*********************************************************************** * LoadLibraryA (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index a8744eb417a..a0c62d710b9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2406,6 +2406,7 @@ WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); +WINBASEAPI BOOL WINAPI IsApiSetImplemented(LPCSTR); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR);

1 0

Jacek Caban : user32: Use a single struct for static and animated cursor icons.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 64bc66846327f7f1a3975ea3de6a9c31e759d6a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bc66846327f7f1a3975ea3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:10 2022 +0100 user32: Use a single struct for static and animated cursor icons. Handle allocation should use a separate from data initialization, so its object layout needs to be independent on data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 117 ++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 72 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 59c50ae53d8..2b421cd1bf1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -81,20 +81,16 @@ struct cursoricon_object BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ POINT hotspot; -}; - -struct static_cursoricon_object -{ - struct cursoricon_object shared; - struct cursoricon_frame frame; /* frame-specific icon data */ -}; - -struct animated_cursoricon_object -{ - struct cursoricon_object shared; - UINT num_frames; /* number of frames in the icon/cursor */ - UINT num_steps; /* number of sequence steps in the icon/cursor */ - HICON frames[1]; /* list of animated cursor frames */ + union + { + struct cursoricon_frame frame; /* frame-specific icon data */ + struct + { + UINT num_frames; /* number of frames in the icon/cursor */ + UINT num_steps; /* number of sequence steps in the icon/cursor */ + HICON *frames; /* list of animated cursor frames */ + } ani; + }; }; static HBITMAP create_color_bitmap( int width, int height ) @@ -116,28 +112,28 @@ static int get_display_bpp(void) static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; - int icon_size; HICON handle; - if (is_ani) - icon_size = FIELD_OFFSET( struct animated_cursoricon_object, frames[num_steps] ); - else - icon_size = sizeof( struct static_cursoricon_object ); - obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, icon_size ); - if (!obj) return NULL; - + if (!(obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj) ))) return NULL; obj->delay = 0; obj->is_ani = is_ani; if (is_ani) { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) obj; - - ani_icon_data->num_steps = num_steps; - ani_icon_data->num_frames = num_steps; /* changed later for some animated cursors */ + if (!(obj->ani.frames = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + num_steps * sizeof(*obj->ani.frames) ))) + { + HeapFree( GetProcessHeap(), 0, obj ); + return NULL; + } + obj->ani.num_steps = num_steps; + obj->ani.num_frames = num_steps; /* changed later for some animated cursors */ } if (!(handle = alloc_user_handle( &obj->obj, USER_ICON ))) + { + if (obj->is_ani) HeapFree( GetProcessHeap(), 0, obj->ani.frames ); HeapFree( GetProcessHeap(), 0, obj ); + } return handle; } @@ -154,21 +150,10 @@ static struct cursoricon_object *get_icon_ptr( HICON handle ) static struct cursoricon_frame *get_icon_frame( struct cursoricon_object *obj, int istep ) { - struct static_cursoricon_object *req_frame; - - if (obj->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - struct cursoricon_object *frameobj; - - ani_icon_data = (struct animated_cursoricon_object *) obj; - if (!(frameobj = get_icon_ptr( ani_icon_data->frames[istep] ))) - return 0; - req_frame = (struct static_cursoricon_object *) frameobj; - } - else - req_frame = (struct static_cursoricon_object *) obj; + struct cursoricon_object *req_frame; + if (!obj->is_ani) return &obj->frame; + if (!(req_frame = get_icon_ptr( obj->ani.frames[istep] ))) return 0; return &req_frame->frame; } @@ -178,21 +163,14 @@ static void release_icon_frame( struct cursoricon_object *obj, struct cursoricon { struct cursoricon_object *frameobj; - frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct static_cursoricon_object, frame)); + frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct cursoricon_object, frame)); release_user_handle_ptr( frameobj ); } } static UINT get_icon_steps( struct cursoricon_object *obj ) { - if (obj->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - - ani_icon_data = (struct animated_cursoricon_object *) obj; - return ani_icon_data->num_steps; - } - return 1; + return obj->is_ani ? obj->ani.num_steps : 1; } static BOOL free_icon_handle( HICON handle ) @@ -218,24 +196,22 @@ static BOOL free_icon_handle( HICON handle ) } else { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) obj; - - for (i=0; i<ani_icon_data->num_steps; i++) + for (i = 0; i < obj->ani.num_steps; i++) { - HICON hFrame = ani_icon_data->frames[i]; + HICON hFrame = obj->ani.frames[i]; if (hFrame) { UINT j; - free_icon_handle( ani_icon_data->frames[i] ); - for (j=0; j<ani_icon_data->num_steps; j++) + free_icon_handle( obj->ani.frames[i] ); + for (j=0; j < obj->ani.num_steps; j++) { - if (ani_icon_data->frames[j] == hFrame) - ani_icon_data->frames[j] = 0; + if (obj->ani.frames[j] == hFrame) obj->ani.frames[j] = 0; } } } + HeapFree( GetProcessHeap(), 0, obj->ani.frames ); } if (!IS_INTRESOURCE( obj->resname )) HeapFree( GetProcessHeap(), 0, obj->resname ); HeapFree( GetProcessHeap(), 0, obj ); @@ -1354,7 +1330,6 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, INT width, INT height, INT depth, BOOL is_icon, UINT loadflags ) { - struct animated_cursoricon_object *ani_icon_data; struct cursoricon_object *info; DWORD *frame_rates = NULL; DWORD *frame_seq = NULL; @@ -1434,9 +1409,8 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, } info = get_icon_ptr( cursor ); - ani_icon_data = (struct animated_cursoricon_object *) info; info->is_icon = is_icon; - ani_icon_data->num_frames = header.num_frames; + info->ani.num_frames = header.num_frames; /* The .ANI stores the display rate in jiffies (1/60s) */ info->delay = header.display_rate; @@ -1484,7 +1458,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, if (i == 0) { FIXME_(cursor)("Completely failed to create animated cursor!\n"); - ani_icon_data->num_frames = 0; + info->ani.num_frames = 0; release_user_handle_ptr( info ); free_icon_handle( cursor ); HeapFree( GetProcessHeap(), 0, frames ); @@ -1502,26 +1476,26 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, if (error) { FIXME_(cursor)("Error creating animated cursor, only using first frame!\n"); - for (i=1; i<ani_icon_data->num_frames; i++) - free_icon_handle( ani_icon_data->frames[i] ); + for (i=1; i < info->ani.num_frames; i++) + free_icon_handle( info->ani.frames[i] ); use_seq = FALSE; info->delay = 0; - ani_icon_data->num_steps = 1; - ani_icon_data->num_frames = 1; + info->ani.num_steps = 1; + info->ani.num_frames = 1; } /* Setup the animated frames in the correct sequence */ - for (i=0; i<ani_icon_data->num_steps; i++) + for (i=0; i < info->ani.num_steps; i++) { DWORD frame_id = use_seq ? frame_seq[i] : i; struct cursoricon_frame *frame; - if (frame_id >= ani_icon_data->num_frames) + if (frame_id >= info->ani.num_frames) { - frame_id = ani_icon_data->num_frames-1; + frame_id = info->ani.num_frames-1; ERR_(cursor)("Sequence indicates frame past end of list, corrupt?\n"); } - ani_icon_data->frames[i] = frames[frame_id]; + info->ani.frames[i] = frames[frame_id]; frame = get_icon_frame( info, i ); if (frame_rates) frame->delay = frame_rates[i]; @@ -2094,13 +2068,12 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, icon_steps = get_icon_steps(ptr); if (istep < icon_steps || !ptr->is_ani) { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) ptr; UINT icon_frames = 1; if (ptr->is_ani) - icon_frames = ani_icon_data->num_frames; + icon_frames = ptr->ani.num_frames; if (ptr->is_ani && icon_frames > 1) - ret = ani_icon_data->frames[istep]; + ret = ptr->ani.frames[istep]; else ret = hCursor; if (icon_frames == 1)

1 0

Jacek Caban : user32: Store module as unicode string in cursoricon_object.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: dd2dd0066519800373b2f26100ecb6bd7b0ee33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd2dd0066519800373b2f261… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:22 2022 +0100 user32: Store module as unicode string in cursoricon_object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 51 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2b421cd1bf1..6da3e398db1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -73,7 +73,7 @@ struct cursoricon_object struct user_object obj; /* object header */ struct list entry; /* entry in shared icons list */ ULONG_PTR param; /* opaque param used by 16-bit code */ - HMODULE module; /* module for icons loaded from resources */ + UNICODE_STRING module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ HRSRC rsrc; /* resource for shared icons */ BOOL is_shared; /* whether this object is shared */ @@ -1184,7 +1184,6 @@ done: struct cursoricon_frame *frame; info->is_icon = bIcon; - info->module = module; info->hotspot = hotspot; frame = get_icon_frame( info, 0 ); frame->delay = ~0; @@ -1201,6 +1200,19 @@ done: } else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); + if (module) + { + WCHAR buf[MAX_PATH]; + UNICODE_STRING module_name = { 0, sizeof(buf), buf }; + + if (!LdrGetDllFullName( module, &module_name ) && + (info->module.Buffer = HeapAlloc( GetProcessHeap(), 0, module_name.Length ))) + { + memcpy( info->module.Buffer, module_name.Buffer, module_name.Length ); + info->module.Length = module_name.Length; + } + } + if (cFlag & LR_SHARED) { info->is_shared = TRUE; @@ -1687,18 +1699,24 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, /* If shared icon, check whether it was already loaded */ if (loadflags & LR_SHARED) { + WCHAR buf[MAX_PATH]; + UNICODE_STRING module = { 0, sizeof(buf) - sizeof(WCHAR), buf }; struct cursoricon_object *ptr; - USER_Lock(); - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, struct cursoricon_object, entry ) + if (!LdrGetDllFullName( hInstance, &module )) { - if (ptr->module != hInstance) continue; - if (ptr->rsrc != hRsrc) continue; - hIcon = ptr->obj.handle; - break; + USER_Lock(); + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, struct cursoricon_object, entry ) + { + if (ptr->module.Length != module.Length) continue; + if (memcmp( ptr->module.Buffer, module.Buffer, module.Length )) continue; + if (ptr->rsrc != hRsrc) continue; + hIcon = ptr->obj.handle; + break; + } + USER_Unlock(); + if (hIcon) return hIcon; } - USER_Unlock(); - if (hIcon) return hIcon; } if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; @@ -2159,7 +2177,6 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) { struct cursoricon_frame *frame; struct cursoricon_object *ptr; - HMODULE module; BOOL ret = TRUE; if (info->cbSize != sizeof(*info)) @@ -2191,10 +2208,12 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) info->wResID = 0; info->szModName[0] = 0; info->szResName[0] = 0; - if (ptr->module) + if (ptr->module.Length) { if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); + memcpy( info->szModName, ptr->module.Buffer, ptr->module.Length ); + info->szModName[ptr->module.Length / sizeof(WCHAR)] = 0; } if (!info->hbmMask || (!info->hbmColor && frame->color)) { @@ -2202,10 +2221,8 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) DeleteObject( info->hbmColor ); ret = FALSE; } - module = ptr->module; release_icon_frame( ptr, frame ); release_user_handle_ptr( ptr ); - if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; } @@ -3003,14 +3020,16 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, struct cursoricon_object *icon; int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp(); HICON resource_icon = NULL; + HINSTANCE module; ICONINFO info; HICON res; if (!(icon = get_icon_ptr( hnd ))) return 0; - if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) + if (icon->rsrc && (flags & LR_COPYFROMRESOURCE) && icon->module.Length && + !LdrGetDllHandle( NULL, 0, &icon->module, &module )) { - resource_icon = CURSORICON_Load( icon->module, icon->resname, desiredx, + resource_icon = CURSORICON_Load( module, icon->resname, desiredx, desiredy, depth, !icon->is_icon, flags ); release_user_handle_ptr( icon ); if (!(icon = get_icon_ptr( resource_icon )))

1 0

Jacek Caban : user32: Use ntuser object type constants.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: b86842bb15775ce8df997aafe44d6a52a5c0d2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86842bb15775ce8df997aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:33 2022 +0100 user32: Use ntuser object type constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 10 +++++----- dlls/user32/menu.c | 8 ++++---- dlls/user32/resource.c | 10 +++++----- dlls/user32/user_private.h | 19 +++++-------------- dlls/user32/win.c | 14 +++++++------- dlls/user32/winpos.c | 6 +++--- include/ntuser.h | 8 ++++++++ 7 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b86842bb15775ce8df99…

1 0