Module: wine Branch: master Commit: 6e90c16e1779731a2ece6fc9bc854dfc7ed00510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e90c16e1779731a2ece6fc9b...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 15 15:36:18 2022 +0100
api-ms-*: Forward to shcore instead of shlwapi.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
.../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 106 ++++++++++----------- tools/make_specfiles | 9 +- 2 files changed, 54 insertions(+), 61 deletions(-)
diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec index 11c33f8949c..cec457dc6d6 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -1,56 +1,56 @@ @ stub IStream_Copy -@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stdcall IStream_Read(ptr ptr long) shcore.IStream_Read @ stub IStream_ReadStr -@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset -@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size -@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stdcall IStream_Reset(ptr) shcore.IStream_Reset +@ stdcall IStream_Size(ptr ptr) shcore.IStream_Size +@ stdcall IStream_Write(ptr ptr long) shcore.IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(ptr) shlwapi.IUnknown_AtomicRelease -@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite -@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService -@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set -@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode -@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA -@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW -@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream -@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA -@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx -@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW -@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long str) shlwapi.SHDeleteEmptyKeyA -@ stdcall SHDeleteEmptyKeyW(long wstr) shlwapi.SHDeleteEmptyKeyW -@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA -@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW -@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA -@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW -@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA -@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW -@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef -@ stdcall SHGetValueA(long str str ptr ptr ptr) shlwapi.SHGetValueA -@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) shlwapi.SHGetValueW -@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A -@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W -@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA -@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW -@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA -@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW -@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey -@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA -@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW -@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA -@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW -@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA -@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW -@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef -@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef -@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA -@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW -@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall IUnknown_AtomicRelease(ptr) shcore.IUnknown_AtomicRelease +@ stdcall IUnknown_GetSite(ptr ptr ptr) shcore.IUnknown_GetSite +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shcore.IUnknown_QueryService +@ stdcall IUnknown_Set(ptr ptr) shcore.IUnknown_Set +@ stdcall IUnknown_SetSite(ptr ptr) shcore.IUnknown_SetSite +@ stdcall SHAnsiToAnsi(str ptr long) shcore.SHAnsiToAnsi +@ stdcall SHAnsiToUnicode(str ptr long) shcore.SHAnsiToUnicode +@ stdcall SHCopyKeyA(long str long long) shcore.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shcore.SHCopyKeyW +@ stdcall SHCreateMemStream(ptr long) shcore.SHCreateMemStream +@ stdcall SHCreateStreamOnFileA(str long ptr) shcore.SHCreateStreamOnFileA +@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shcore.SHCreateStreamOnFileEx +@ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW +@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef +@ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW +@ stdcall SHDeleteKeyA(long str) shcore.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shcore.SHDeleteKeyW +@ stdcall SHDeleteValueA(long str str) shcore.SHDeleteValueA +@ stdcall SHDeleteValueW(long wstr wstr) shcore.SHDeleteValueW +@ stdcall SHEnumKeyExA(long long str ptr) shcore.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shcore.SHEnumKeyExW +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW +@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef +@ stdcall SHGetValueA(long str str ptr ptr ptr) shcore.SHGetValueA +@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) shcore.SHGetValueW +@ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shcore.SHQueryInfoKeyA +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shcore.SHQueryInfoKeyW +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shcore.SHQueryValueExA +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shcore.SHQueryValueExW +@ stdcall SHRegDuplicateHKey(long) shcore.SHRegDuplicateHKey +@ stdcall SHRegGetPathA(long str str ptr long) shcore.SHRegGetPathA +@ stdcall SHRegGetPathW(long wstr wstr ptr long) shcore.SHRegGetPathW +@ stdcall SHRegGetValueA(long str str long ptr ptr ptr) shcore.SHRegGetValueA +@ stdcall SHRegGetValueW(long wstr wstr long ptr ptr ptr) shcore.SHRegGetValueW +@ stdcall SHRegSetPathA(long str str str long) shcore.SHRegSetPathA +@ stdcall SHRegSetPathW(long wstr wstr wstr long) shcore.SHRegSetPathW +@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stdcall SHSetValueA(long str str long ptr long) shcore.SHSetValueA +@ stdcall SHSetValueW(long wstr wstr long ptr long) shcore.SHSetValueW +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shcore.SHUnicodeToAnsi +@ stdcall SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index 11f54156233..3f1370a01f3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,10 +375,7 @@ my @dll_groups = [ "shcore", "api-ms-win-core-featurestaging-l1-1-0", - ], - [ - "shcore", - "shell32", + "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", "api-ms-win-shcore-scaling-l1-1-1", @@ -393,10 +390,6 @@ my @dll_groups = "api-ms-win-shell-shellfolders-l1-1-0", "ext-ms-win-shell-shell32-l1-2-0", ], - [ - "shlwapi", - "api-ms-win-downlevel-shlwapi-l2-1-0", - ], [ "user32", "api-ms-win-ntuser-dc-access-l1-1-0",