February 2022 - Wine-commits

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of user32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: eb84ed07d90ea9aecf1357f7dfaf2d41fd4a4bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb84ed07d90ea9aecf1357f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:31:16 2022 +0100 api-ms-*: Forward to kernelbase instead of user32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-string-l2-1-0.spec | 20 +++++----- .../api-ms-win-core-stringansi-l1-1-0.spec | 24 ++++++------ .../api-ms-win-core-stringloader-l1-1-1.spec | 4 +- .../api-ms-win-downlevel-user32-l1-1-0.spec | 44 +++++++++++----------- tools/make_specfiles | 8 ++-- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec index 22209490162..5cf62867e40 100644 --- a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec +++ b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec @@ -1,10 +1,10 @@ -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW -@ stdcall IsCharLowerW(long) user32.IsCharLowerW -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW +@ stdcall CharLowerW(wstr) kernelbase.CharLowerW +@ stdcall CharNextW(wstr) kernelbase.CharNextW +@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW +@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW +@ stdcall CharUpperW(wstr) kernelbase.CharUpperW +@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW +@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW +@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec index 2c58a160f13..ac8e1d07399 100644 --- a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec @@ -1,12 +1,12 @@ -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharUpperA(long) user32.IsCharUpperA +@ stdcall CharLowerA(str) kernelbase.CharLowerA +@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA +@ stdcall CharNextA(str) kernelbase.CharNextA +@ stdcall CharNextExA(long str long) kernelbase.CharNextExA +@ stdcall CharPrevA(str str) kernelbase.CharPrevA +@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA +@ stdcall CharUpperA(str) kernelbase.CharUpperA +@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA +@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA +@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA +@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec index a60736e055d..c944882a64b 100644 --- a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec @@ -1,2 +1,2 @@ -@ stdcall LoadStringA(long long ptr long) user32.LoadStringA -@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LoadStringA(long long ptr long) kernelbase.LoadStringA +@ stdcall LoadStringW(long long ptr long) kernelbase.LoadStringW diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec index 182d964b9ca..9d716d596e1 100644 --- a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec @@ -1,22 +1,22 @@ -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharLowerW(long) user32.IsCharLowerW -@ stdcall IsCharUpperA(long) user32.IsCharUpperA -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall CharLowerA(str) kernelbase.CharLowerA +@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA +@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW +@ stdcall CharLowerW(wstr) kernelbase.CharLowerW +@ stdcall CharNextA(str) kernelbase.CharNextA +@ stdcall CharNextExA(long str long) kernelbase.CharNextExA +@ stdcall CharNextW(wstr) kernelbase.CharNextW +@ stdcall CharPrevA(str str) kernelbase.CharPrevA +@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA +@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW +@ stdcall CharUpperA(str) kernelbase.CharUpperA +@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA +@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW +@ stdcall CharUpperW(wstr) kernelbase.CharUpperW +@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA +@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW +@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA +@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW +@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA +@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index 56e746d256d..915241e2797 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -286,6 +286,9 @@ my @dll_groups = "api-ms-win-core-shlwapi-obsolete-l1-2-0", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-string-l2-1-0", + "api-ms-win-core-stringansi-l1-1-0", + "api-ms-win-core-stringloader-l1-1-1", "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", @@ -309,6 +312,7 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l1-1-0", "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-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-1-0", @@ -391,10 +395,6 @@ my @dll_groups = ], [ "user32", - "api-ms-win-core-string-l2-1-0", - "api-ms-win-core-stringansi-l1-1-0", - "api-ms-win-core-stringloader-l1-1-1", - "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", "api-ms-win-ntuser-sysparams-l1-1-0",

1 0

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

15 Feb '22

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

Alexandre Julliard : api-ms-*: Forward to combase instead of ole32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 21536c066a8bf30ee3a67d3f4a5dd4d08e2ea321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21536c066a8bf30ee3a67d3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:34:30 2022 +0100 api-ms-*: Forward to combase instead of ole32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 140 ++++++++++----------- .../api-ms-win-core-com-l1-1-1.spec | 140 ++++++++++----------- .../api-ms-win-downlevel-ole32-l1-1-0.spec | 94 +++++++------- tools/make_specfiles | 6 +- 4 files changed, 190 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21536c066a8bf30ee3a6…

1 0

Alexandre Julliard : api-ms-*: Forward to shcore instead of shell32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: e2187d4fe142b1f8322ecc46832f26f4f76680ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2187d4fe142b1f8322ecc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:38:02 2022 +0100 api-ms-*: Forward to shcore instead of shell32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 6 +++--- tools/make_specfiles | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9d03c03f8b7..5484bdecc70 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shcore.GetCurrentProcessExplicitAppUserModelID +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shcore.SetCurrentProcessExplicitAppUserModelID diff --git a/tools/make_specfiles b/tools/make_specfiles index 3f1370a01f3..157337ee01a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,6 +375,7 @@ my @dll_groups = [ "shcore", "api-ms-win-core-featurestaging-l1-1-0", + "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", @@ -385,7 +386,6 @@ my @dll_groups = ], [ "shell32", - "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", "ext-ms-win-shell-shell32-l1-2-0",

1 0

Zebediah Figura : kernelbase: Do not return the question mark as part of the query string from UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c57992f8dcb5b25322aea2664aff8f96e6a58895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57992f8dcb5b25322aea266… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:10 2022 -0600 kernelbase: Do not return the question mark as part of the query string from UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 7 +++++-- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 823fb51a68e..d14316f05ee 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4246,8 +4246,11 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if (*work == '/') { /* see if query string */ - pl->query = wcschr(work, '?'); - if (pl->query) pl->query_len = lstrlenW(pl->query); + if ((pl->query = wcschr( work, '?' ))) + { + ++pl->query; + pl->query_len = lstrlenW(pl->query); + } } SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18ff5021986..1b26204a94f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -612,14 +612,14 @@ static void test_UrlGetPart(void) {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, 0, S_OK, "bar"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PORT, 0, S_OK, "21"}, - {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y", .todo_result = TRUE}, + {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y"}, {"http://foo:bar(a)localhost:21/internal.php#anchor", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_USERNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:foo"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:bar"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:localhost"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PORT, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:21"}, - {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y", .todo_result = TRUE}, + {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y"}, {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, @@ -688,7 +688,7 @@ static void test_UrlGetPart(void) {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21", .todo_result = TRUE}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x", .todo_result = TRUE}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_HOSTNAME, 0, S_OK, "www.wine hq.org"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_PASSWORD, 0, S_OK, "pass 123"}, {"about:blank", URL_PART_SCHEME, 0, S_OK, "about"},

1 0

Eric Pouech : http.sys: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 3542152c236748733b7c71a9308cbcdc17b02c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3542152c236748733b7c71a9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 00:23:34 2022 -0600 http.sys: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/Makefile.in | 1 - dlls/http.sys/http.c | 16 ++++++++-------- dlls/http.sys/request.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index b8740120e84..b79f11cf930 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = http.sys IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e655edfeea2..523c70ee12c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -510,10 +510,10 @@ static void receive_data(struct connection *conn) ioctlsocket(conn->socket, FIONREAD, &available); if (available) { - TRACE("%u more bytes of data available, trying with larger buffer.\n", available); + TRACE("%lu more bytes of data available, trying with larger buffer.\n", available); if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) { - ERR("Failed to allocate %u bytes of memory.\n", conn->len + available); + ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available); close_connection(conn); return; } @@ -730,7 +730,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + TRACE("addr %s, id %s, flags %#lx, bits %lu.\n", wine_dbgstr_longlong(params->addr), wine_dbgstr_longlong(params->id), params->flags, params->bits); EnterCriticalSection(&http_cs); @@ -821,13 +821,13 @@ static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + TRACE("id %s, bits %lu.\n", wine_dbgstr_longlong(params->id), params->bits); EnterCriticalSection(&http_cs); if ((conn = get_connection(params->id))) { - TRACE("%u bits remaining.\n", conn->content_len); + TRACE("%lu bits remaining.\n", conn->content_len); if (conn->content_len) { @@ -875,7 +875,7 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) ret = http_receive_body(queue, irp); break; default: - FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + FIXME("Unhandled ioctl %#lx.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; } @@ -987,12 +987,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) - ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { - ERR("Failed to create request queue device, status %#x.\n", ret); + ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj); return ret; } diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h index a1b77b67dc5..f044db3bb2c 100644 --- a/dlls/http.sys/request.h +++ b/dlls/http.sys/request.h @@ -167,7 +167,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) irp_size += unk_headers_count * sizeof(struct http_unknown_header); - TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + TRACE("Need %lu bytes, have %lu.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; memset(irp->AssociatedIrp.SystemBuffer, 0, output_len);

1 0

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

15 Feb '22

Module: wine Branch: master Commit: 2424f03a594f05f630a93ef646d46a6f174da98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2424f03a594f05f630a93ef6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:41 2022 +0100 msado15: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 1 - dlls/msado15/command.c | 12 +++---- dlls/msado15/connection.c | 20 ++++++------ dlls/msado15/main.c | 4 +-- dlls/msado15/recordset.c | 82 +++++++++++++++++++++++------------------------ dlls/msado15/stream.c | 14 ++++---- 6 files changed, 66 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2424f03a594f05f630a9…

1 0

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

15 Feb '22

Module: wine Branch: master Commit: 2a233ce210aa583026930973946ecfd8461fb3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a233ce210aa583026930973… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:53 2022 +0100 msasn1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 1 - dlls/msasn1/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index afdfa2657ee..6d55907cff2 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msasn1.dll IMPORTLIB = msasn1 diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 2ebaa8c485c..4614a5b292e 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -36,7 +36,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08lx %08x %08lx %lu %p %p %p %p %lu)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; @@ -83,7 +83,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod { ASN1encoding_t enc; - TRACE("(%p %p %p %u %p)\n", module, encoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, encoder, buf, bufsize, parent); if (!module || !encoder) return ASN1_ERR_BADARGS; @@ -133,7 +133,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod { ASN1decoding_t dec; - TRACE("(%p %p %p %u %p)\n", module, decoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, decoder, buf, bufsize, parent); if (!module || !decoder) return ASN1_ERR_BADARGS; @@ -179,7 +179,7 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) { - FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + FIXME("(%p %p %lu %08lx %p %lu): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); if (!decoder) return ASN1_ERR_BADARGS;

1 0

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

15 Feb '22

Module: wine Branch: master Commit: e41fa21c0426b7d97292854459a92a1d47ff252e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41fa21c0426b7d972928544… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:05 2022 +0100 msctf: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/Makefile.in | 1 - dlls/msctf/categorymgr.c | 4 ++-- dlls/msctf/compartmentmgr.c | 6 +++--- dlls/msctf/context.c | 30 +++++++++++++++--------------- dlls/msctf/documentmgr.c | 6 +++--- dlls/msctf/inputprocessor.c | 24 ++++++++++++------------ dlls/msctf/msctf.c | 4 ++-- dlls/msctf/range.c | 4 ++-- dlls/msctf/threadmgr.c | 16 ++++++++-------- 9 files changed, 47 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e41fa21c0426b7d97292…

1 0

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

15 Feb '22

Module: wine Branch: master Commit: 7c73ffc643f7c42972cb96c50daff52f511bf8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c73ffc643f7c42972cb96c5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:11 2022 +0100 msctfmonitor: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctfmonitor/Makefile.in | 1 - dlls/msctfmonitor/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in index 356f0ca1ce1..dd58e9fb0f6 100644 --- a/dlls/msctfmonitor/Makefile.in +++ b/dlls/msctfmonitor/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msctfmonitor.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msctfmonitor/main.c b/dlls/msctfmonitor/main.c index f609c1a1a25..3116fde1293 100644 --- a/dlls/msctfmonitor/main.c +++ b/dlls/msctfmonitor/main.c @@ -22,6 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfmonitor); HRESULT WINAPI InitLocalMsCtfMonitor(DWORD flags) { - FIXME("%d stub!\n", flags); + FIXME("%ld stub!\n", flags); return E_FAIL; }

1 0