February 2021 - Wine-commits

Alexandre Julliard : ninput: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 629d4fce0feba0bee1440dbafc989e42d308bf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=629d4fce0feba0bee1440dba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:27:57 2021 +0100 ninput: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/Makefile.in | 2 +- dlls/ninput/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in index 2afd034f75d..3ebda8e9578 100644 --- a/dlls/ninput/Makefile.in +++ b/dlls/ninput/Makefile.in @@ -1,7 +1,7 @@ MODULE = ninput.dll IMPORTLIB = ninput -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 8635ffb0e94..56d82b08ac5 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -165,18 +165,3 @@ HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) FIXME("context %p: stub!\n", context); return E_NOTIMPL; } - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - TRACE("(%p, %d, %p)\n", inst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Rémi Bernon : winex11.drv: Don't assume that GenericEvent has a window.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 4cb6334b1bd5de08a0e27d1c4f7feb33ae6c0dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb6334b1bd5de08a0e27d1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 15 12:38:27 2021 +0100 winex11.drv: Don't assume that GenericEvent has a window. It doesn't, and we then lookup HWND from an invalid Window value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d21d2a7fb1b..99943478729 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -390,6 +390,9 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) return FALSE; /* no handler, ignore it */ } +#ifdef GenericEvent + if (event->type == GenericEvent) hwnd = 0; else +#endif if (XFindContext( display, event->xany.window, winContext, (char **)&hwnd ) != 0) hwnd = 0; /* not for a registered window */ if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow();

1 0

Arkadiusz Hiler : winebus.sys: Remove incorrect Report ID from the bus_sdl HID report descriptor.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: ee4e33ed9acf8a0dc4318d6cb0b5ba6c5cf19c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4e33ed9acf8a0dc4318d6c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Feb 23 15:54:07 2021 +0200 winebus.sys: Remove incorrect Report ID from the bus_sdl HID report descriptor. According to "USB Device Class Definition for Human Interface Devices Firmware Specification Version 1.11" Report ID 0 is reserved and should not be used. On top of that if Report ID is used anywhere in the descriptor the reports are expected to be prepended with an ID and this is not the case for bus_sdl devices. It worked only because our current HID parser implementation treats the Report ID 0 as there would be none. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8f48b44eb95..bf62f448976 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -199,7 +199,6 @@ static const BYTE CONTROLLER_TRIGGERS [] = { static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ - 0x85, 0x00, /* REPORT_ID (0) */ /* padding */ 0x95, 0x02, /* REPORT_COUNT (2) */ 0x75, 0x08, /* REPORT_SIZE (8) */

1 0

Henri Verbeet : d3d11: Implement d3d11_immediate_context_SwapDeviceContextState() on top of wined3d_device_set_state().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 7b487c38d0e9b2f1c91f43f0c652b564c9b62ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b487c38d0e9b2f1c91f43f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 19:50:46 2021 +0100 d3d11: Implement d3d11_immediate_context_SwapDeviceContextState() on top of wined3d_device_set_state(). Based on a patch by Rémi Bernon. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 36 +++--- dlls/d3d11/device.c | 293 ++++++++++++++++++++++++++++----------------- dlls/d3d11/tests/d3d11.c | 140 +++++++++------------- 3 files changed, 250 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b487c38d0e9b2f1c91f…

1 0

Rémi Bernon : d3d11: Always return the rectangle count in d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: fbed47422a23806194797e5bae1fe27bc5bb2ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbed47422a23806194797e5b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:47 2021 +0100 d3d11: Always return the rectangle count in d3d11_immediate_context_RSGetScissorRects(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 9 ++------- dlls/d3d11/tests/d3d11.c | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a5d9dc1aa7b..c8ec35a59c0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2270,14 +2270,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock(); - if (!rects) - { - *rect_count = actual_count; - return; - } - - if (*rect_count > actual_count) + if (rects && *rect_count > actual_count) memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); + *rect_count = actual_count; } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2eff98fe8fc..32a9dc2e530 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7235,7 +7235,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + ok(count == 0, "Got unexpected scissor rect count %u.\n", count); tmp_sob = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); @@ -7514,7 +7514,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); @@ -7962,7 +7962,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect));

1 0

Alexandre Julliard : itircl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: fe0d233f55ee5bb844ad96ff61063a6daa7579a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0d233f55ee5bb844ad96ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:17 2021 +0100 itircl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itircl/Makefile.in | 2 +- dlls/itircl/itircl_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/itircl/Makefile.in b/dlls/itircl/Makefile.in index 6e360ebeb44..11eff81d3e0 100644 --- a/dlls/itircl/Makefile.in +++ b/dlls/itircl/Makefile.in @@ -1,6 +1,6 @@ MODULE = itircl.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ itircl_main.c diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index e35bbba3359..d105b6608d5 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(itircl); -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: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * DllRegisterServer (ITIRCL.@) */

1 0

Alexandre Julliard : loadperf: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 987ca1f1ffd3874028c8dbe07e923338d0875159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=987ca1f1ffd3874028c8dbe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:21 2021 +0100 loadperf: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/Makefile.in | 2 +- dlls/loadperf/loadperf_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index 9258ec06353..5ca8959ebd1 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -1,7 +1,7 @@ MODULE = loadperf.dll IMPORTLIB = loadperf -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ loadperf_main.c diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 54901a739af..c58f46f4204 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -31,22 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(loadperf); -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: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - static WCHAR *strdupAW(const char *str) { WCHAR *ret = NULL;

1 0

Alexandre Julliard : mfmediaengine: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 0ace8475f94cdc33a7f5b4072963580660b84429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ace8475f94cdc33a7f5b407… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:25 2021 +0100 mfmediaengine: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index ed06dd40f26..0a498a00bcd 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine IMPORTS = oleaut32 ole32 mfplat mf mfuuid uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8ae86d3a68b..4464b525a4d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -61,20 +61,6 @@ static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, si return TRUE; } -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - enum media_engine_mode { MEDIA_ENGINE_INVALID,

1 0

Alexandre Julliard : mfplat: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: de2a6d9b38f5abac6806036ccce39e8982d197c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2a6d9b38f5abac6806036c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:28 2021 +0100 mfplat: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index bc04a440826..9e5c607deae 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys rtworkq -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 99afbaf8a46..999d8a86147 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,20 +702,6 @@ static BOOL GUIDFromString(LPCWSTR s, GUID *id) return FALSE; } -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes)

1 0

Alexandre Julliard : mfplay: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 4e31bcc11a3f41273b6597ab140aece55f6315d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e31bcc11a3f41273b6597ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:32 2021 +0100 mfplay: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 401c0c7d64d..539240ceadc 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ player.c diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d75ccfb1069..1e4f1f561f4 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -26,20 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) {

1 0