[PATCH v3 0/3] MR7575: cryptbase: Add dll.
Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=57962 -- v3: Revert "kernelbase: Add GetCurrentApplicationUserModelId." https://gitlab.winehq.org/wine/wine/-/merge_requests/7575
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/cryptbase/Makefile.in | 3 +++ dlls/cryptbase/cryptbase.spec | 11 +++++++++++ 4 files changed, 17 insertions(+) create mode 100644 dlls/cryptbase/Makefile.in create mode 100644 dlls/cryptbase/cryptbase.spec diff --git a/configure b/configure index 08e7a3f7077..ef7c99dd8e8 100755 --- a/configure +++ b/configure @@ -1025,6 +1025,7 @@ enable_coremessaging enable_credui enable_crtdll enable_crypt32 +enable_cryptbase enable_cryptdlg enable_cryptdll enable_cryptext @@ -22179,6 +22180,7 @@ wine_fn_config_makefile dlls/credui/tests enable_tests wine_fn_config_makefile dlls/crtdll enable_crtdll wine_fn_config_makefile dlls/crypt32 enable_crypt32 wine_fn_config_makefile dlls/crypt32/tests enable_tests +wine_fn_config_makefile dlls/cryptbase enable_cryptbase wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg wine_fn_config_makefile dlls/cryptdll enable_cryptdll wine_fn_config_makefile dlls/cryptext enable_cryptext diff --git a/configure.ac b/configure.ac index 306cbe03146..274591f5f53 100644 --- a/configure.ac +++ b/configure.ac @@ -2473,6 +2473,7 @@ WINE_CONFIG_MAKEFILE(dlls/credui/tests) WINE_CONFIG_MAKEFILE(dlls/crtdll) WINE_CONFIG_MAKEFILE(dlls/crypt32) WINE_CONFIG_MAKEFILE(dlls/crypt32/tests) +WINE_CONFIG_MAKEFILE(dlls/cryptbase) WINE_CONFIG_MAKEFILE(dlls/cryptdlg) WINE_CONFIG_MAKEFILE(dlls/cryptdll) WINE_CONFIG_MAKEFILE(dlls/cryptext) diff --git a/dlls/cryptbase/Makefile.in b/dlls/cryptbase/Makefile.in new file mode 100644 index 00000000000..c3db9737315 --- /dev/null +++ b/dlls/cryptbase/Makefile.in @@ -0,0 +1,3 @@ +MODULE = cryptbase.dll + +IMPORTS = advapi32 diff --git a/dlls/cryptbase/cryptbase.spec b/dlls/cryptbase/cryptbase.spec new file mode 100644 index 00000000000..40a641c77fd --- /dev/null +++ b/dlls/cryptbase/cryptbase.spec @@ -0,0 +1,11 @@ +@ stdcall -import SystemFunction001(ptr ptr ptr) +@ stdcall -import SystemFunction002(ptr ptr ptr) +@ stdcall -import SystemFunction003(ptr ptr) +@ stdcall -import SystemFunction004(ptr ptr ptr) +@ stdcall -import SystemFunction005(ptr ptr ptr) +@ stub SystemFunction028 +@ stub SystemFunction029 +@ stub SystemFunction034 +@ stdcall -import SystemFunction036(ptr long) +@ stdcall -import SystemFunction040(ptr long long) +@ stdcall -import SystemFunction041(ptr long long) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7575
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0739898b2e6..caa6c92b653 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -634,6 +634,7 @@ @ stdcall -import GetCurrentConsoleFontEx(long long ptr) @ stdcall -import GetCurrentDirectoryA(long ptr) @ stdcall -import GetCurrentDirectoryW(long ptr) +@ stdcall GetCurrentApplicationUserModelId(ptr ptr) kernelbase.GetCurrentApplicationUserModelId @ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernelbase.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernelbase.GetCurrentPackageId diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8e3d269ca47..d11a4417d48 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -481,7 +481,7 @@ @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) @ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) @ stdcall GetCurrentActCtx(ptr) -# @ stub GetCurrentApplicationUserModelId +@ stdcall GetCurrentApplicationUserModelId(ptr ptr) @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentConsoleFontEx(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 2e7cc254334..f1aa1dd94ea 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1547,6 +1547,14 @@ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) return TRUE; } +/*********************************************************************** + * GetCurrentApplicationUserModelId (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentApplicationUserModelId( UINT32 *length, WCHAR *id ) +{ + FIXME( "(%p %p): stub\n", length, id ); + return APPMODEL_ERROR_NO_APPLICATION; +} /*********************************************************************** * GetCurrentPackageFamilyName (kernelbase.@) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7575
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> This reverts commit 767dbce51cd90b4907b7fb1791507d7b31de0778. --- dlls/kernel32/kernel32.spec | 1 - dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index caa6c92b653..0739898b2e6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -634,7 +634,6 @@ @ stdcall -import GetCurrentConsoleFontEx(long long ptr) @ stdcall -import GetCurrentDirectoryA(long ptr) @ stdcall -import GetCurrentDirectoryW(long ptr) -@ stdcall GetCurrentApplicationUserModelId(ptr ptr) kernelbase.GetCurrentApplicationUserModelId @ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernelbase.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernelbase.GetCurrentPackageId diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d11a4417d48..8e3d269ca47 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -481,7 +481,7 @@ @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) @ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) @ stdcall GetCurrentActCtx(ptr) -@ stdcall GetCurrentApplicationUserModelId(ptr ptr) +# @ stub GetCurrentApplicationUserModelId @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentConsoleFontEx(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index f1aa1dd94ea..2e7cc254334 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1547,14 +1547,6 @@ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) return TRUE; } -/*********************************************************************** - * GetCurrentApplicationUserModelId (kernelbase.@) - */ -LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentApplicationUserModelId( UINT32 *length, WCHAR *id ) -{ - FIXME( "(%p %p): stub\n", length, id ); - return APPMODEL_ERROR_NO_APPLICATION; -} /*********************************************************************** * GetCurrentPackageFamilyName (kernelbase.@) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7575
I had already had some patches for this, which I had neglected to send because at the time the application that I thought required them turned out not to. I've sent them as 7580. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7575#note_97820
Ok, nice! Could you add a reference to Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=57962 I'll close this one then Superseded by 7580 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7575#note_97828
This merge request was closed by Louis Lenders. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7575
Could you add a reference to Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=57962
It's already present. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7575#note_97837
ah ok, never mind then ;) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7575#note_97841
participants (3)
-
Elizabeth Figura (＠zfigura) -
Louis Lenders
-
Louis Lenders (＠xe)