wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zhiyi Zhang : comctl32/ipaddress: Only print an error when it actually occurs.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7315afbc13582d1171058705d21881906a77afe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7315afbc13582d1171058705… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:50:40 2021 +0800 comctl32/ipaddress: Only print an error when it actually occurs. IPADDRESS_GetPartIndex() is also used for handling WM_KILLFOCUS and WM_SETFOCUS messages. In this case, it's actually expected that the window receiving or losing focus may not be a IP Address part window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 82d47d4e576..c7b9ada1f6a 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -130,7 +130,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) for (i = 0; i < 4; i++) if (infoPtr->Part[i].EditHwnd == hwnd) return i; - ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); return -1; } @@ -503,7 +502,11 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); - if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0; + if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) + { + ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); + return 0; + } part = &infoPtr->Part[index]; if (uMsg == WM_CHAR || uMsg == WM_KEYDOWN) {

1 0

Zhiyi Zhang : user32/tests: Add optional messages to test sequences.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: a11ffeec96e5205d281862d9ff61d073e81576f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11ffeec96e5205d281862d9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:39:32 2021 +0800 user32/tests: Add optional messages to test sequences. Fix a possible test failure on Win10 2009. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11fb764e6cd..7eaa2c67945 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5412,7 +5412,7 @@ static void test_messages(void) { ShowWindow(hwnd, SW_RESTORE); flush_events(); - ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); + ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); flush_sequence(); } @@ -13917,6 +13917,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_QUERYNEWPALETTE, sent|optional }, { WM_PALETTEISCHANGING, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOREDRAW }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Zhiyi Zhang : user32/tests: Fix a test failure on w7u_2qxl TestBot VM.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 068cf6f02c147bd646ffd0f319493fe3783b4dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=068cf6f02c147bd646ffd0f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:38:01 2021 +0800 user32/tests: Fix a test failure on w7u_2qxl TestBot VM. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..6b233970ace 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -743,17 +743,18 @@ static void test_ChangeDisplaySettingsEx(void) { dm.dmPosition = position; dm.dmFields |= DM_POSITION; - res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ if (mode == 0 && device) { - todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", - devices[device].name, mode, res); res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); } + else + { + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + } ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */

1 0

Nikolay Sivov : mf/tests: Skip some tests on missing function.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 1d1665efb371b5b3a1c29e0a84b3ac226808fa44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1665efb371b5b3a1c29e0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 22 19:55:48 2021 +0300 mf/tests: Skip some tests on missing function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 65f2b40faa9..e3a752553bb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -47,6 +47,8 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) { @@ -4669,7 +4671,13 @@ static void test_sample_copier(void) UINT32 value; HRESULT hr; - hr = MFCreateSampleCopierMFT(&copier); + if (!pMFCreateSampleCopierMFT) + { + win_skip("MFCreateSampleCopierMFT() is not available.\n"); + return; + } + + hr = pMFCreateSampleCopierMFT(&copier); ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); hr = IMFTransform_GetAttributes(copier, &attributes); @@ -5005,7 +5013,10 @@ static void test_sample_copier_output_processing(void) HRESULT hr; BYTE *ptr; - hr = MFCreateSampleCopierMFT(&copier); + if (!pMFCreateSampleCopierMFT) + return; + + hr = pMFCreateSampleCopierMFT(&copier); ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); /* Configure for 16 x 16 of D3DFMT_X8R8G8B8. */ @@ -5152,8 +5163,19 @@ static void test_MFGetTopoNodeCurrentType(void) IMFMediaType_Release(media_type2); } +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mf.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateSampleCopierMFT); +#undef X +} + START_TEST(mf) { + init_functions(); + test_topology(); test_topology_tee_node(); test_topology_loader();

1 0

Jactry Zeng : include: Avoid using C++ keyword.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 27040a4f009f1e35a540882dc150d14431de64a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27040a4f009f1e35a540882d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Feb 22 22:19:46 2021 +0800 include: Avoid using C++ keyword. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50670 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e264a3b18e4..52e0c5c9db1 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3984,7 +3984,7 @@ interface IFileOperation : IUnknown [in, unique] IFileOperationProgressSink *sink); HRESULT DeleteItems([in] IUnknown *items); HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, - [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template_name, [in, unique] IFileOperationProgressSink *sink); HRESULT PerformOperations(); HRESULT GetAnyOperationsAborted([out] BOOL *aborted);

1 0

Zhiyi Zhang : ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: d7a4d757ce576c13ed68194e75f16a10e1f94cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a4d757ce576c13ed68194e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 18:05:05 2021 +0800 ntoskrnl.exe: Exclude large integer APIs from relay tracing. Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Alexandre Julliard : dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: f24ac09ae6d94e4f2841ed304a2f39a633c299fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f24ac09ae6d94e4f2841ed30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:06 2021 +0100 dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 +- dlls/dxva2/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index d331512f019..efa37464a9b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -2,7 +2,7 @@ MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index d784e1b46ab..069f03d8077 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -1212,18 +1212,3 @@ BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: e701ce3afaab40696eaee46beb07b67838eacafd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e701ce3afaab40696eaee46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:02 2021 +0100 dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 2 +- dlls/dwmapi/dwmapi_main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 3a3691326f8..682bf68b111 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dwmapi_main.c diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 45c33c2169a..b6c89f3a7f8 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -32,20 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - /********************************************************************** * DwmIsCompositionEnabled (DWMAPI.@) */

1 0

Alexandre Julliard : drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7e33f3871b2f3f131907947381697b5dabff836e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e33f3871b2f3f1319079473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:58 2021 +0100 drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/drmclien/Makefile.in | 2 +- dlls/drmclien/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in index ebe2df62c28..f0644668bc8 100644 --- a/dlls/drmclien/Makefile.in +++ b/dlls/drmclien/Makefile.in @@ -1,6 +1,6 @@ MODULE = drmclien.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c index 8483f9fca93..f60b9cbf26f 100644 --- a/dlls/drmclien/main.c +++ b/dlls/drmclien/main.c @@ -26,20 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(drmclien); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * DllRegisterServer (drmclien.@) */

1 0

Alexandre Julliard : dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: f13dfc38f62b436f699f0563e908f2c82dd7a85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13dfc38f62b436f699f0563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:54 2021 +0100 dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 +- dlls/dpwsockx/dpwsockx_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 5a386a7ac88..1fecc3cbbc0 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,7 +1,7 @@ MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index dec3d9e0300..2c73c17be21 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -30,25 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - /* TODO: Initialization */ - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - - static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) { FIXME( "(%p,%d,%p,%u) stub\n",

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021