February 2022 - Wine-Commits

Nikolay Sivov : mf/tests: Add some tests for rate support in SAR.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: d576a61f45b4369b6ac480c400661d383918f3dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d576a61f45b4369b6ac480c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 17 12:18:14 2022 +0300 mf/tests: Add some tests for rate support in SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b3f50665e79..63df50cf3b8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3842,6 +3842,108 @@ static void test_quality_manager(void) ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void check_sar_rate_support(IMFMediaSink *sink) +{ + IMFRateSupport *rate_support; + IMFMediaTypeHandler *handler; + IMFStreamSink *stream_sink; + IMFMediaType *media_type; + HRESULT hr; + float rate; + + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rate_support); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) return; + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + if (hr == MF_E_SHUTDOWN) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFRateSupport_Release(rate_support); + return; + } + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + if (SUCCEEDED(hr)) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + else + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + } + + IMFMediaTypeHandler_Release(handler); + IMFRateSupport_Release(rate_support); +} + static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; @@ -4073,9 +4175,13 @@ if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype2); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(mediatype == mediatype2, "Unexpected instance.\n"); @@ -4184,6 +4290,8 @@ if (SUCCEEDED(hr)) hr = IMFMediaSink_GetPresentationClock(sink, &present_clock2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + check_sar_rate_support(sink); + IMFMediaSink_Release(sink); /* Activation */ @@ -4253,6 +4361,8 @@ if (SUCCEEDED(hr)) hr = MFCreateAudioRenderer(attributes, &sink); ok(hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE, "Failed to create a sink, hr %#x.\n", hr); + IMFAttributes_Release(attributes); + CoUninitialize(); }

1 0

Santino Mazza : ncrypt: Add NCryptVerifySignature stub.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 12cb5d2efedebe1594a7fd8cb6fb4cad804f20fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cb5d2efedebe1594a7fd8c… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Feb 17 11:06:32 2022 +0100 ncrypt: Add NCryptVerifySignature stub. With this change now some applications which uses ncrypt for signature validation work. For example, the visual studio installer (using dotnet from winetricks). Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 8 ++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 2c2a0dc6f56..8e789573924 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -367,3 +367,11 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name return set_object_property(object, name, input, insize); } + +SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, + BYTE *signature, DWORD signature_size, DWORD flags) +{ + FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + signature_size, flags); + return ERROR_SUCCESS; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 0e92609790c..bb914616373 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -101,7 +101,7 @@ @ stub NCryptUnprotectKey @ stub NCryptUnprotectSecret @ stub NCryptVerifyClaim -@ stub NCryptVerifySignature +@ stdcall NCryptVerifySignature(ptr ptr ptr long ptr long long) @ stub SslChangeNotify @ stub SslComputeClientAuthHash @ stub SslComputeEapKeyBlock

1 0

Alexandre Julliard : kernel32/tests: Add a few more tests for apisets.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 8796d34a803d6f4acc686c60a2fd132e250f04ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8796d34a803d6f4acc686c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 21:12:54 2022 +0100 kernel32/tests: Add a few more tests for apisets. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 8ec3a5433ee..91e1aba31e0 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -692,21 +692,95 @@ static void test_LoadLibraryEx_search_flags(void) } else { + LoadLibraryA( "ole32.dll" ); /* FIXME: make sure the dependencies are loaded */ mod = LoadLibraryA( apiset_dll ); if (mod) { + HMODULE shcore; + char buffer[MAX_PATH]; + FreeLibrary(mod); mod = LoadLibraryExA( apiset_dll, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set without .dll */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 4] = 0; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with different version */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 5] = '9'; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine + ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); + if (mod) + { + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + } + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with full path */ + GetWindowsDirectoryA( buffer, MAX_PATH ); + strcat( buffer, "\\" ); + strcat( buffer, apiset_dll ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( buffer ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); } else { win_skip( "%s not found, skipping test.\n", apiset_dll ); } - } + + /* try a library with dependencies */ + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 already loaded\n" ); + mod = LoadLibraryA( "rasapi32.dll" ); + ok( !!mod, "rasapi32 not found %u\n", GetLastError() ); + FreeLibrary( mod ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "rasapi32.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); + ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 still loaded\n" ); + } done: for (i = 1; i <= 6; i++) {

1 0

Santino Mazza : ncrypt: Set a couple of key properties.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 9b1c28e84b65109805b0fa73029215a27414359c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1c28e84b65109805b0fa73… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Feb 17 11:06:30 2022 +0100 ncrypt: Set a couple of key properties. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 100 ++++++++++++++++++++++-------------------- dlls/ncrypt/ncrypt_internal.h | 1 + dlls/ncrypt/tests/ncrypt.c | 22 +++++++--- include/ncrypt.h | 34 ++++++++++++++ 4 files changed, 104 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b1c28e84b65109805b0…

1 0

Huw Davies : winealsa: Introduce a stream structure.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 04d01ee3c2cdedade9e3b7f4d80334ed2573df9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d01ee3c2cdedade9e3b7f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:49 2022 +0000 winealsa: Introduce a stream structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 691 ++++++++++++++++++++++--------------------- dlls/winealsa.drv/unixlib.h | 35 +++ 2 files changed, 385 insertions(+), 341 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04d01ee3c2cdedade9e3…

1 0

Santino Mazza : ncrypt: NCryptGetProperty should always fill result size.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 88e027b523e704c56b3434148fb27018bca922bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e027b523e704c56b343414… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Feb 17 11:06:31 2022 +0100 ncrypt: NCryptGetProperty should always fill result size. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 7 ++----- dlls/ncrypt/tests/ncrypt.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 82ce7a0b4dc..2c2a0dc6f56 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -165,11 +165,8 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name if (flags) FIXME("flags %#lx not supported\n", flags); if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; - if (!output) - { - *result = property->value_size; - return ERROR_SUCCESS; - } + *result = property->value_size; + if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; memcpy(output, property->value, property->value_size); diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 070b0c3f13e..891e5b60254 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -186,9 +186,7 @@ static void test_get_property(void) value[0] = 0; ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ok(size == 8, "got %lu\n", size); - } ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); size = 0;

1 0

Jacek Caban : win32u: Set user callbacks from user32 DllMain.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: e557f48cdf6ef1eafe468829ec9298a3eb6ac80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e557f48cdf6ef1eafe468829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:42:36 2022 +0100 win32u: Set user callbacks from user32 DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 11 +++++++ dlls/win32u/driver.c | 12 ++------ dlls/win32u/ntuser_private.h | 9 ++++++ dlls/win32u/palette.c | 11 +------ dlls/win32u/region.c | 7 +---- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 9 ------ dlls/win32u/wrappers.c | 73 +------------------------------------------- include/ntuser.h | 1 + 9 files changed, 28 insertions(+), 107 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c2ec561a800..a91db57cdb4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -208,6 +208,14 @@ static void dpiaware_init(void) } } +static const struct user_callbacks user_funcs = +{ + GetDesktopWindow, + GetWindowRect, + RedrawWindow, + SendMessageTimeoutW, + WindowFromDC, +}; static const void *kernel_callback_table[NtUserCallCount] = { @@ -223,6 +231,9 @@ static BOOL process_attach(void) { NtCurrentTeb()->Peb->KernelCallbackTable = kernel_callback_table; + /* FIXME: should not be needed */ + NtUserCallOneParam( (UINT_PTR)&user_funcs, NtUserSetCallbacks ); + dpiaware_init(); register_desktop_class(); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index b3a3e70f83f..5e6cee33bc6 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -24,21 +24,13 @@ #endif #include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdio.h> #include <pthread.h> #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "wine/winbase16.h" -#include "winuser.h" - #include "ntgdi_private.h" +#include "ntuser_private.h" +#include "wine/winbase16.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index fec04d94948..f0e0f8835bf 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -24,6 +24,15 @@ #include "ntuser.h" +struct user_callbacks +{ + HWND (WINAPI *pGetDesktopWindow)(void); + BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); + LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); + HWND (WINAPI *pWindowFromDC)( HDC ); +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 3aeda89851f..1c2f2c70434 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -27,17 +27,8 @@ #pragma makedep unix #endif -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" - #include "ntgdi_private.h" +#include "ntuser_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(palette); diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index 86554f21e1c..17eae861cbf 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -99,13 +99,8 @@ SOFTWARE. #endif #include <assert.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" #include "ntgdi_private.h" +#include "ntuser_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(region); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c9885f89d87..7af1e20f008 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4544,6 +4544,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserIncrementKeyStateCounter: return InterlockedAdd( &global_key_state_counter, arg ); + case NtUserSetCallbacks: + return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c3419d83858..3017b7e6a72 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -30,15 +30,6 @@ #include "wine/unixlib.h" #include "wine/debug.h" -struct user_callbacks -{ - HWND (WINAPI *pGetDesktopWindow)(void); - BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); - HWND (WINAPI *pWindowFromDC)( HDC ); -}; - extern const struct user_callbacks *user_callbacks DECLSPEC_HIDDEN; struct unix_funcs diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 2823eae9fe1..922e5a26b00 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -947,79 +947,8 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *funcs, UINT vers return unix_funcs->set_display_driver( funcs, version ); } -static void *get_user_proc( const char *name, BOOL force_load ) -{ - ANSI_STRING name_str; - FARPROC proc = NULL; - static HMODULE user32; - - if (!user32) - { - UNICODE_STRING str; - NTSTATUS status; - RtlInitUnicodeString( &str, L"user32.dll" ); - status = force_load - ? LdrLoadDll( NULL, 0, &str, &user32 ) - : LdrGetDllHandle( NULL, 0, &str, &user32 ); - if (status < 0) return NULL; - } - RtlInitAnsiString( &name_str, name ); - LdrGetProcedureAddress( user32, &name_str, 0, (void**)&proc ); - return proc; -} - -static HWND WINAPI call_GetDesktopWindow(void) -{ - static HWND (WINAPI *pGetDesktopWindow)(void); - if (!pGetDesktopWindow) - pGetDesktopWindow = get_user_proc( "GetDesktopWindow", TRUE ); - return pGetDesktopWindow ? pGetDesktopWindow() : NULL; -} - -static BOOL WINAPI call_GetWindowRect( HWND hwnd, LPRECT rect ) -{ - static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - if (!pGetWindowRect) - pGetWindowRect = get_user_proc( "GetWindowRect", FALSE ); - return pGetWindowRect && pGetWindowRect( hwnd, rect ); -} - -static BOOL WINAPI call_RedrawWindow( HWND hwnd, const RECT *rect, HRGN rgn, UINT flags ) -{ - static BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - if (!pRedrawWindow) - pRedrawWindow = get_user_proc( "RedrawWindow", FALSE ); - return pRedrawWindow && pRedrawWindow( hwnd, rect, rgn, flags ); -} - -static LRESULT WINAPI call_SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, PDWORD_PTR res_ptr ) -{ - static LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); - if (!pSendMessageTimeoutW) pSendMessageTimeoutW = get_user_proc( "SendMessageTimeoutW", FALSE ); - if (!pSendMessageTimeoutW) return 0; - return pSendMessageTimeoutW( hwnd, msg, wparam, lparam, flags, timeout, res_ptr ); -} - -static HWND WINAPI call_WindowFromDC( HDC hdc ) -{ - static HWND (WINAPI *pWindowFromDC)( HDC ); - if (!pWindowFromDC) - pWindowFromDC = get_user_proc( "WindowFromDC", FALSE ); - return pWindowFromDC ? pWindowFromDC( hdc ) : NULL; -} - -static const struct user_callbacks user_funcs = -{ - call_GetDesktopWindow, - call_GetWindowRect, - call_RedrawWindow, - call_SendMessageTimeoutW, - call_WindowFromDC, -}; - extern void wrappers_init( unixlib_handle_t handle ) { - const void *args = &user_funcs; + const void *args; if (!__wine_unix_call( handle, 1, &args )) unix_funcs = args; } diff --git a/include/ntuser.h b/include/ntuser.h index 6e4183b1e14..6e941c29c6d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -85,6 +85,7 @@ enum NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserIncrementKeyStateCounter, + NtUserSetCallbacks, }; /* NtUserCallTwoParam codes, not compatible with Windows */

1 0

Hans Leidekker : ncrypt: Fix resizing property array.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 26d8f334796bca16dfb17ae7ecf9e47de4577cce URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d8f334796bca16dfb17ae7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 17 11:06:29 2022 +0100 ncrypt: Fix resizing property array. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..ca70b2d92c3 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -312,7 +312,7 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) { - struct object_property *property = &object->properties[object->num_properties]; + struct object_property *property; FIXME("check duplicates\n"); if (!object->num_properties) @@ -322,18 +322,18 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } - object->num_properties++; + property = &object->properties[object->num_properties++]; } else { struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * object->num_properties + 1))) + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory."); return NTE_NO_MEMORY; } object->properties = tmp; - object->num_properties++; + property = &object->properties[object->num_properties++]; } memset(property, 0, sizeof(*property));

1 0

Jacek Caban : user32: Delay load setupapi.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: cc0ad23d7365b7b668fe0d3ba072d2a8dda94853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0ad23d7365b7b668fe0d3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:41:30 2022 +0100 user32: Delay load setupapi. This reverts 50aeb5e777d9a8836f5530755afab10e042c623f. Previously problematic code is now moved to win32u and doesn't use setupapi. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index b3970d44e4d..73f6016933a 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,9 +1,9 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = $(PNG_PE_LIBS) setupapi gdi32 version sechost advapi32 kernelbase win32u +IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u EXTRAINCL = $(PNG_PE_CFLAGS) -DELAYIMPORTS = hid imm32 +DELAYIMPORTS = hid setupapi imm32 C_SRCS = \ button.c \

1 0

Jacek Caban : gdi32: Link directly to user32.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 2353ef9bd5c509b3903a5c6d9cb9690907af9427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2353ef9bd5c509b3903a5c6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:42:01 2022 +0100 gdi32: Link directly to user32. On Windows, loading gdi32.dll causes user32.dll to be loaded. It's important for win32u, which is not fully functional until user32 sets KernelCallbackTable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/objects.c | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 3e0495f877b..ce877995ee2 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 -IMPORTS = advapi32 win32u +IMPORTS = user32 advapi32 win32u DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index f578543b937..0260027a484 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -415,23 +415,6 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) return NtGdiGetDCObject( hdc, obj_type ); } -/****************************************************************************** - * get_system_dpi - * - * Get the system DPI, based on the DPI awareness mode. - */ -static DWORD get_system_dpi(void) -{ - static UINT (WINAPI *pGetDpiForSystem)(void); - - if (!pGetDpiForSystem) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); - } - return pGetDpiForSystem ? pGetDpiForSystem() : 96; -} - /*********************************************************************** * GetStockObject (GDI32.@) */ @@ -443,16 +426,16 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) switch (obj) { case OEM_FIXED_FONT: - if (get_system_dpi() != 96) obj = 9; + if (GetDpiForSystem() != 96) obj = 9; break; case SYSTEM_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 2; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 2; break; case SYSTEM_FIXED_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 3; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 3; break; case DEFAULT_GUI_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 4; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 4; break; }

1 0