February 2020 - Wine-devel - list.winehq.org

[PATCH 9/9] oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in a few more places.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)

1 0

[PATCH 8/9] oleaut32: Return missing function custom data as VT_EMPTY.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 24 ++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++-------- 2 files changed, 27 insertions(+), 8 deletions(-)

1 0

[PATCH 7/9] oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in ITypeInfo2_fnGetFuncCustData.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH 6/9] oleaut32: Return function description as TLBFuncDesc from ITypeInfoImpl_GetInternalDispatchFuncDesc.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 5/9] oleaut32: Move TKIND_DISPATCH logic to ITypeInfoImpl_GetInternalFuncDesc.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 43 ++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-)

1 0

[PATCH 4/9] oleaut32: Fix handling resource IDs in paths when registering typelib helpdir.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH 3/9] oleaut32/tests: Add test of reference typelib caching.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/Makefile.in | 1 + dlls/oleaut32/tests/test_simple.idl | 34 ++++++++++++++++++ dlls/oleaut32/tests/tmarshal.rc | 3 ++ dlls/oleaut32/tests/typelib.c | 53 ++++++++++++++++++++++------- 4 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 dlls/oleaut32/tests/test_simple.idl

1 0

[PATCH 2/9] oleaut32: Search cache for requested typeinfo in GetRefTypeInfo.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-)

1 0

[PATCH 1/9] oleaut32/tests: Use Unicode strings for file names.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 58 ++++++++++++++--------------------- 1 file changed, 23 insertions(+), 35 deletions(-)

1 0

[PATCH v2] kernel32: Add semi-stub for LoadPackagedLibrary().
by Paul Gofman 10 Feb '20

10 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48229 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - added missing newline in win_skip(). dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 8 ++++++++ include/winbase.h | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47c7d63761..f07a2ee9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1048,6 +1048,7 @@ @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) @ stdcall -import LoadLibraryW(wstr) +@ stdcall -import LoadPackagedLibrary(wstr long) @ stdcall LoadModule(str ptr) @ stdcall -import LoadResource(long long) # @ stub LoadStringBaseExW diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6f143f5efd..1f6b3818dc 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static HMODULE (WINAPI *pLoadPackagedLibrary)(LPCWSTR lpwLibFileName, DWORD Reserved); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3917,6 +3918,22 @@ static void test_dll_file( const char *name ) #undef OK_FIELD } +static void test_LoadPackagedLibrary(void) +{ + static const WCHAR kernel32_nameW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + HMODULE h; + + if (!pLoadPackagedLibrary) + { + win_skip("LoadPackagedLibrary is not available.\n"); + return; + } + + h = pLoadPackagedLibrary(kernel32_nameW, 0); + ok(!h && GetLastError() == APPMODEL_ERROR_NO_PACKAGE, "Got unexpected handle %p, GetLastError() %u.\n", + h, GetLastError()); +} + START_TEST(loader) { int argc; @@ -3954,6 +3971,7 @@ START_TEST(loader) pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); + pLoadPackagedLibrary = (void *)GetProcAddress(kernel32, "LoadPackagedLibrary"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); GetSystemInfo( &si ); @@ -3993,4 +4011,5 @@ START_TEST(loader) test_dll_file( "user32.dll" ); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); + test_LoadPackagedLibrary(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index caa6de1d51..49fb4a7ff1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -926,7 +926,7 @@ @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) -# @ stub LoadPackagedLibrary +@ stdcall LoadPackagedLibrary(wstr long) @ stdcall LoadResource(long long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 456a9f2da4..0f114bb315 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -1209,3 +1209,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH ZombifyActCtx( HANDLE context ) { return set_ntstatus( RtlZombifyActivationContext( context )); } + +HMODULE WINAPI LoadPackagedLibrary( LPCWSTR name, DWORD reserved ) +{ + FIXME("semi-stub, name %s, reserved %#x.\n", debugstr_w(name), reserved); + + SetLastError(APPMODEL_ERROR_NO_PACKAGE); + return NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 3062d3b6ad..23a782a6dc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2417,6 +2417,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); WINBASEAPI HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); WINBASEAPI HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) +WINBASEAPI HMODULE WINAPI LoadPackagedLibrary(LPCWSTR,DWORD); WINBASEAPI DWORD WINAPI LoadModule(LPCSTR,LPVOID); WINBASEAPI HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); WINBASEAPI HLOCAL WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2); -- 2.24.1

2 1