February 2022 - Wine-Commits

Eric Pouech : mfreadwrite: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 2ebd4e36b914e67cdafff06e8cea5c43bcc999b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ebd4e36b914e67cdafff06e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:32 2022 +0100 mfreadwrite: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 1 - dlls/mfreadwrite/reader.c | 88 ++++++++++++++++++++++---------------------- dlls/mfreadwrite/writer.c | 20 +++++----- 3 files changed, 54 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebd4e36b914e67cdaff…

1 0

Alexandre Julliard : api-ms-*: Forward to shcore instead of shlwapi.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 6e90c16e1779731a2ece6fc9bc854dfc7ed00510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e90c16e1779731a2ece6fc9… Author: Alexandre Julliard <julliard(a)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(a)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",

1 0

Eric Pouech : mmdevapi: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 86891eeadf9187a819ac5af9c11973dc157f2193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86891eeadf9187a819ac5af9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:50 2022 +0100 mmdevapi: 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/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/audiovolume.c | 4 +-- dlls/mmdevapi/devenum.c | 66 ++++++++++++++++++++++---------------------- dlls/mmdevapi/main.c | 12 ++++---- dlls/mmdevapi/spatialaudio.c | 38 ++++++++++++------------- 5 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86891eeadf9187a819ac…

1 0

Eric Pouech : mshtml: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 210abcd81a12d4806294ed057a35979aa12fb262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=210abcd81a12d4806294ed05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:41 2022 +0100 mshtml: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/conpoint.c | 10 +-- dlls/mshtml/dispex.c | 58 +++++++-------- dlls/mshtml/editor.c | 28 +++---- dlls/mshtml/htmlanchor.c | 8 +- dlls/mshtml/htmlarea.c | 6 +- dlls/mshtml/htmlattr.c | 4 +- dlls/mshtml/htmlbody.c | 22 +++--- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlcurstyle.c | 6 +- dlls/mshtml/htmldoc.c | 112 ++++++++++++++-------------- dlls/mshtml/htmlelem.c | 170 +++++++++++++++++++++---------------------- dlls/mshtml/htmlelemcol.c | 30 ++++---- dlls/mshtml/htmlevent.c | 38 +++++----- dlls/mshtml/htmlform.c | 38 +++++----- dlls/mshtml/htmlframe.c | 26 +++---- dlls/mshtml/htmlimg.c | 38 +++++----- dlls/mshtml/htmlinput.c | 74 +++++++++---------- dlls/mshtml/htmllink.c | 4 +- dlls/mshtml/htmllocation.c | 10 +-- dlls/mshtml/htmlnode.c | 46 ++++++------ dlls/mshtml/htmlobject.c | 18 ++--- dlls/mshtml/htmlscript.c | 10 +-- dlls/mshtml/htmlselect.c | 68 ++++++++--------- dlls/mshtml/htmlstorage.c | 6 +- dlls/mshtml/htmlstyle.c | 52 ++++++------- dlls/mshtml/htmlstyleelem.c | 4 +- dlls/mshtml/htmlstylesheet.c | 58 +++++++-------- dlls/mshtml/htmltable.c | 72 +++++++++--------- dlls/mshtml/htmltextarea.c | 10 +-- dlls/mshtml/htmltextnode.c | 16 ++-- dlls/mshtml/htmlwindow.c | 108 +++++++++++++-------------- dlls/mshtml/ifacewrap.c | 4 +- dlls/mshtml/loadopts.c | 8 +- dlls/mshtml/main.c | 12 +-- dlls/mshtml/mutation.c | 20 ++--- dlls/mshtml/navigate.c | 64 ++++++++-------- dlls/mshtml/npplugin.c | 4 +- dlls/mshtml/nsembed.c | 100 ++++++++++++------------- dlls/mshtml/nsevents.c | 12 +-- dlls/mshtml/nsio.c | 74 +++++++++---------- dlls/mshtml/nsservice.c | 4 +- dlls/mshtml/olecmd.c | 114 ++++++++++++++--------------- dlls/mshtml/oleobj.c | 52 ++++++------- dlls/mshtml/omnavigator.c | 56 +++++++------- dlls/mshtml/persist.c | 32 ++++---- dlls/mshtml/pluginhost.c | 114 ++++++++++++++--------------- dlls/mshtml/protocol.c | 38 +++++----- dlls/mshtml/range.c | 72 +++++++++--------- dlls/mshtml/script.c | 70 +++++++++--------- dlls/mshtml/secmgr.c | 10 +-- dlls/mshtml/selection.c | 12 +-- dlls/mshtml/service.c | 8 +- dlls/mshtml/svg.c | 16 ++-- dlls/mshtml/task.c | 4 +- dlls/mshtml/view.c | 40 +++++----- dlls/mshtml/xmlhttprequest.c | 36 ++++----- 57 files changed, 1064 insertions(+), 1065 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=210abcd81a12d4806294…

1 0

Hans Leidekker : wldap32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 5d0b23be22eec8706ce7df97ffa8aa2e43324fdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0b23be22eec8706ce7df97… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 15 10:32:48 2022 +0100 wldap32: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 1 - dlls/wldap32/bind.c | 10 ++++----- dlls/wldap32/dn.c | 4 ++-- dlls/wldap32/error.c | 8 +++---- dlls/wldap32/extended.c | 2 +- dlls/wldap32/init.c | 20 ++++++++--------- dlls/wldap32/main.c | 2 +- dlls/wldap32/misc.c | 8 +++---- dlls/wldap32/option.c | 2 +- dlls/wldap32/page.c | 15 +++++++------ dlls/wldap32/search.c | 20 ++++++++--------- dlls/wldap32/tests/Makefile.in | 1 - dlls/wldap32/tests/ber.c | 2 +- dlls/wldap32/tests/parse.c | 50 +++++++++++++++++++++--------------------- 14 files changed, 72 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d0b23be22eec8706ce7…

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of kernel32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: ae5ebeaff9f73bf4c006dead20d3cb84327c7234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5ebeaff9f73bf4c006dead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:00:31 2022 +0100 api-ms-*: Forward to kernelbase instead of kernel32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-0.spec | 4 +- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 14 +- .../api-ms-win-core-appcompat-l1-1-1.spec | 2 +- .../api-ms-win-core-comm-l1-1-0.spec | 36 ++--- .../api-ms-win-core-console-l1-1-0.spec | 28 ++-- .../api-ms-win-core-console-l1-2-0.spec | 34 ++--- .../api-ms-win-core-console-l2-1-0.spec | 76 +++++----- .../api-ms-win-core-datetime-l1-1-0.spec | 8 +- .../api-ms-win-core-datetime-l1-1-1.spec | 12 +- .../api-ms-win-core-debug-l1-1-0.spec | 8 +- .../api-ms-win-core-debug-l1-1-1.spec | 18 +-- .../api-ms-win-core-delayload-l1-1-0.spec | 2 +- .../api-ms-win-core-delayload-l1-1-1.spec | 4 +- .../api-ms-win-core-errorhandling-l1-1-0.spec | 14 +- .../api-ms-win-core-errorhandling-l1-1-1.spec | 24 +-- .../api-ms-win-core-errorhandling-l1-1-2.spec | 24 +-- .../api-ms-win-core-errorhandling-l1-1-3.spec | 30 ++-- .../api-ms-win-core-fibers-l1-1-0.spec | 8 +- .../api-ms-win-core-fibers-l1-1-1.spec | 10 +- .../api-ms-win-core-file-l1-1-0.spec | 152 +++++++++---------- .../api-ms-win-core-file-l1-2-0.spec | 158 ++++++++++---------- .../api-ms-win-core-file-l1-2-1.spec | 162 ++++++++++----------- .../api-ms-win-core-file-l1-2-2.spec | 16 +- .../api-ms-win-core-file-l2-1-0.spec | 20 +-- .../api-ms-win-core-file-l2-1-1.spec | 22 +-- .../api-ms-win-core-file-l2-1-2.spec | 26 ++-- .../api-ms-win-core-handle-l1-1-0.spec | 8 +- .../api-ms-win-core-heap-l1-1-0.spec | 30 ++-- .../api-ms-win-core-heap-l1-2-0.spec | 30 ++-- .../api-ms-win-core-heap-l2-1-0.spec | 14 +- .../api-ms-win-core-interlocked-l1-1-0.spec | 24 +-- .../api-ms-win-core-interlocked-l1-2-0.spec | 24 +-- .../api-ms-win-core-job-l1-1-0.spec | 2 +- .../api-ms-win-core-largeinteger-l1-1-0.spec | 2 +- .../api-ms-win-core-libraryloader-l1-1-0.spec | 58 ++++---- .../api-ms-win-core-libraryloader-l1-1-1.spec | 58 ++++---- .../api-ms-win-core-libraryloader-l1-2-0.spec | 58 ++++---- .../api-ms-win-core-libraryloader-l1-2-1.spec | 60 ++++---- .../api-ms-win-core-libraryloader-l1-2-2.spec | 8 +- .../api-ms-win-core-libraryloader-l2-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-1-0.spec | 76 +++++----- .../api-ms-win-core-localization-l1-2-0.spec | 114 +++++++-------- .../api-ms-win-core-localization-l1-2-1.spec | 116 +++++++-------- .../api-ms-win-core-localization-l1-2-2.spec | 82 +++++------ .../api-ms-win-core-localization-l2-1-0.spec | 24 +-- ...i-ms-win-core-localization-obsolete-l1-1-0.spec | 22 +-- ...i-ms-win-core-localization-obsolete-l1-2-0.spec | 20 +-- ...i-ms-win-core-localization-obsolete-l1-3-0.spec | 18 +-- .../api-ms-win-core-memory-l1-1-0.spec | 32 ++-- .../api-ms-win-core-memory-l1-1-1.spec | 58 ++++---- .../api-ms-win-core-memory-l1-1-2.spec | 66 ++++----- .../api-ms-win-core-memory-l1-1-3.spec | 42 +++--- .../api-ms-win-core-memory-l1-1-4.spec | 44 +++--- .../api-ms-win-core-misc-l1-1-0.spec | 68 ++++----- .../api-ms-win-core-namedpipe-l1-1-0.spec | 18 +-- .../api-ms-win-core-namedpipe-l1-2-0.spec | 18 +-- .../api-ms-win-core-namespace-l1-1-0.spec | 2 +- .../api-ms-win-core-normalization-l1-1-0.spec | 6 +- .../api-ms-win-core-processenvironment-l1-1-0.spec | 44 +++--- .../api-ms-win-core-processenvironment-l1-2-0.spec | 48 +++--- .../api-ms-win-core-processtopology-l1-1-0.spec | 6 +- .../api-ms-win-core-profile-l1-1-0.spec | 4 +- .../api-ms-win-core-psapi-ansi-l1-1-0.spec | 14 +- .../api-ms-win-core-psapi-l1-1-0.spec | 36 ++--- .../api-ms-win-core-psapi-obsolete-l1-1-0.spec | 14 +- .../api-ms-win-core-realtime-l1-1-0.spec | 6 +- .../api-ms-win-core-sidebyside-l1-1-0.spec | 22 +-- .../api-ms-win-core-string-l1-1-0.spec | 16 +- .../api-ms-win-core-synch-l1-1-0.spec | 84 +++++------ .../api-ms-win-core-synch-l1-2-0.spec | 104 ++++++------- .../api-ms-win-core-synch-l1-2-1.spec | 110 +++++++------- .../api-ms-win-core-sysinfo-l1-1-0.spec | 56 +++---- .../api-ms-win-core-sysinfo-l1-2-0.spec | 60 ++++---- .../api-ms-win-core-sysinfo-l1-2-1.spec | 66 ++++----- .../api-ms-win-core-threadpool-l1-1-0.spec | 84 +++++------ .../api-ms-win-core-threadpool-l1-2-0.spec | 70 ++++----- .../api-ms-win-core-threadpool-legacy-l1-1-0.spec | 14 +- .../api-ms-win-core-threadpool-private-l1-1-0.spec | 2 +- .../api-ms-win-core-timezone-l1-1-0.spec | 18 +-- ...i-ms-win-core-windowserrorreporting-l1-1-0.spec | 14 +- ...i-ms-win-core-windowserrorreporting-l1-1-1.spec | 14 +- .../api-ms-win-core-wow64-l1-1-0.spec | 6 +- .../api-ms-win-core-wow64-l1-1-1.spec | 12 +- .../api-ms-win-core-xstate-l2-1-0.spec | 12 +- .../api-ms-win-downlevel-normaliz-l1-1-0.spec | 4 +- ...ext-ms-win-kernel32-package-current-l1-1-0.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 6 +- tools/make_specfiles | 53 +++---- 88 files changed, 1554 insertions(+), 1563 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5ebeaff9f73bf4c006…

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of version.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 7df8967358ffad162514afec443088a418053605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df8967358ffad162514afec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:32:38 2022 +0100 api-ms-*: Forward to kernelbase instead of version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-version-l1-1-0.spec | 8 ++++---- .../api-ms-win-core-version-l1-1-1.spec | 12 ++++++------ .../api-ms-win-core-versionansi-l1-1-0.spec | 8 ++++---- .../api-ms-win-downlevel-version-l1-1-0.spec | 12 ++++++------ tools/make_specfiles | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec index 0ac1e13369d..0973ab48a98 100644 --- a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec +++ b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec b/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec index 95b9df68df4..5f04422cca6 100644 --- a/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec +++ b/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec @@ -1,6 +1,6 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall GetFileVersionInfoSizeW(wstr ptr) version.GetFileVersionInfoSizeW -@ stdcall GetFileVersionInfoW(wstr long long ptr) version.GetFileVersionInfoW -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall GetFileVersionInfoSizeW(wstr ptr) kernelbase.GetFileVersionInfoSizeW +@ stdcall GetFileVersionInfoW(wstr long long ptr) kernelbase.GetFileVersionInfoW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec index 58a1711a1fe..701f1053980 100644 --- a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA -@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA -@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA -@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA +@ stdcall GetFileVersionInfoExA(long str long long ptr) kernelbase.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) kernelbase.GetFileVersionInfoSizeExA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) kernelbase.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) kernelbase.VerQueryValueA diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec index e645bbbf1f6..41188ef2962 100644 --- a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -1,6 +1,6 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) kernelbase.VerFindFileA +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueA(ptr str ptr ptr) kernelbase.VerQueryValueA +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 915241e2797..3b7765cdca5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -304,6 +304,9 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-url-l1-1-0", + "api-ms-win-core-version-l1-1-0", + "api-ms-win-core-version-l1-1-1", + "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", @@ -313,6 +316,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-user32-l1-1-0", + "api-ms-win-downlevel-version-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-1-0", @@ -435,11 +439,7 @@ my @dll_groups = ], [ "version", - "api-ms-win-core-version-l1-1-0", - "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", - "api-ms-win-core-versionansi-l1-1-0", - "api-ms-win-downlevel-version-l1-1-0", ], [ "winmm",

1 0

Hans Leidekker : webservices: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 338f1458d8249fd120b35cfbb6d77fc3d8a9245d URL: https://source.winehq.org/git/wine.git/?a=commit;h=338f1458d8249fd120b35cfb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 15 10:32:49 2022 +0100 webservices: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 - dlls/webservices/channel.c | 70 ++++++++++++++++----------------- dlls/webservices/error.c | 14 +++---- dlls/webservices/heap.c | 12 +++--- dlls/webservices/listener.c | 22 +++++------ dlls/webservices/msg.c | 80 +++++++++++++++++++------------------- dlls/webservices/proxy.c | 18 ++++----- dlls/webservices/reader.c | 84 ++++++++++++++++++++-------------------- dlls/webservices/url.c | 12 +++--- dlls/webservices/writer.c | 92 ++++++++++++++++++++++---------------------- 10 files changed, 202 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=338f1458d8249fd120b3…

1 0

Alexandre Julliard : kernel32: Forward SetThreadToken() to kernelbase.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 97d8b860f488e8e920f81b1eb38b44c1df422b48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97d8b860f488e8e920f81b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 14:48:47 2022 +0100 kernel32: Forward SetThreadToken() to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index edec3d88124..bffe715a8ba 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -37,7 +37,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken +@ stdcall SetThreadToken(ptr ptr) kernel32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index c0187f100fe..5da85e1a1de 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -51,7 +51,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken +@ stdcall SetThreadToken(ptr ptr) kernel32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 793015cf536..2fd04f76f07 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -58,7 +58,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken +@ stdcall SetThreadToken(ptr ptr) kernel32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6e063bfaa7b..7db82db375d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1476,7 +1476,7 @@ @ stdcall -import SetThreadPriorityBoost(long long) @ stdcall -import SetThreadSelectedCpuSets(ptr ptr long) @ stdcall -import SetThreadStackGuarantee(ptr) -# @ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) kernelbase.SetThreadToken @ stdcall -import SetThreadUILanguage(long) @ stdcall -import SetThreadpoolStackInformation(ptr ptr) @ stdcall SetThreadpoolThreadMaximum(ptr long) NTDLL.TpSetPoolMaxThreads

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of advapi32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 84ac2e6abf3b6e18ef7ab840d4860fec373754ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ac2e6abf3b6e18ef7ab840… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:27:32 2022 +0100 api-ms-*: Forward to kernelbase instead of advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localregistry-l1-1-0.spec | 78 +++--- .../api-ms-win-core-registry-l1-1-0.spec | 84 +++---- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 272 ++++++++++----------- ...api-ms-win-eventing-classicprovider-l1-1-0.spec | 16 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 18 +- .../api-ms-win-security-base-l1-1-0.spec | 172 ++++++------- .../api-ms-win-security-base-l1-2-0.spec | 174 ++++++------- tools/make_specfiles | 14 +- 8 files changed, 414 insertions(+), 414 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84ac2e6abf3b6e18ef7a…

1 0