wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Matteo Bruni : wined3d: Set display mode to a suitable adapter format.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 9fc282d682cfef466a3ee341b901f7081c0959e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fc282d682cfef466a3ee341… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:12 2019 +0100 wined3d: Set display mode to a suitable adapter format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46792 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 16 ++++++++++++++-- dlls/wined3d/utils.c | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7fc05f..724ea16 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -762,6 +762,16 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const swapchain->max_frame_latency = device->max_frame_latency >= 2 ? device->max_frame_latency - 1 : 1; } +static enum wined3d_format_id adapter_format_from_backbuffer_format(struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id) +{ + const struct wined3d_adapter *adapter = swapchain->device->adapter; + const struct wined3d_format *backbuffer_format; + + backbuffer_format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); + return pixelformat_for_depth(backbuffer_format->byte_count * CHAR_BIT); +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -881,7 +891,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 /* Change the display settings */ swapchain->d3d_mode.width = desc->backbuffer_width; swapchain->d3d_mode.height = desc->backbuffer_height; - swapchain->d3d_mode.format_id = desc->backbuffer_format; + swapchain->d3d_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + desc->backbuffer_format); swapchain->d3d_mode.refresh_rate = desc->refresh_rate; swapchain->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; @@ -1414,7 +1425,8 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = swapchain_desc->backbuffer_format; + actual_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 469ce1b..a800527 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5672,7 +5672,6 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, } } -/* DirectDraw stuff */ enum wined3d_format_id pixelformat_for_depth(DWORD depth) { switch (depth)

1 0

Matteo Bruni : d3d9/tests: Fix test_window_style() D3D9Ex test on current Windows 10.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: e6169ecfefcdb484dcfff6d3c949898947f71beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6169ecfefcdb484dcfff6d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:11 2019 +0100 d3d9/tests: Fix test_window_style() D3D9Ex test on current Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f46ced..306241a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3519,10 +3519,12 @@ static void test_window_style(void) } style = GetWindowLongA(device_window, GWL_STYLE); - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (device_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); style = GetWindowLongA(focus_window, GWL_STYLE); @@ -3540,7 +3542,8 @@ static void test_window_style(void) ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i); GetClientRect(device_window, &r2); - todo_wine ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); + if (!(device_style & WS_OVERLAPPEDWINDOW)) + ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); GetWindowRect(focus_window, &r); ok(EqualRect(&r, &focus_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&focus_rect), wine_dbgstr_rect(&r), i); @@ -3589,11 +3592,14 @@ static void test_window_style(void) ok(!!device, "Failed to create a D3D device.\n"); style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].create2_style; - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (expected_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); expected_style = device_exstyle | tests[i].create2_exstyle; style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (expected_style & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(focus_window, GWL_STYLE);

1 0

Józef Kucia : configure: Require libvkd3d 1.1.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 72cf4a99c6a0215d6bb18d274779aa99b2c67bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72cf4a99c6a0215d6bb18d27… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 13:13:26 2019 +0100 configure: Require libvkd3d 1.1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46835 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 5a091db..4597eae 100755 --- a/configure +++ b/configure @@ -15600,11 +15600,11 @@ LIBS="-lvkd3d $VKD3D_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char vkd3d_create_device (); +char vkd3d_get_dxgi_format (); int main () { -return vkd3d_create_device (); +return vkd3d_get_dxgi_format (); ; return 0; } @@ -15644,9 +15644,9 @@ test -z "$VKD3D_LIBS" || VKD3D_LIBS=`echo " $VKD3D_LIBS" | sed 's/ -L$[^/]$/ - fi if test "x$ac_cv_lib_soname_vkd3d" = "x"; then : case "x$with_vkd3d" in - x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported." ;; + x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported." ;; xno) ;; - *) as_fn_error $? "vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported. + *) as_fn_error $? "vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported. This is an error since --with-vkd3d was requested." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index 87d8bf5..744bf61 100644 --- a/configure.ac +++ b/configure.ac @@ -1873,10 +1873,10 @@ dnl **** Check for vkd3d **** if test "x$with_vkd3d" != "xno" then WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS])]) + [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])]) fi WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], - [vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) + [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.]) test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} dnl **** Check for gcc specific options ****

1 0

Józef Kucia : dxgi: Do not forward d3d12_swapchain_Present() to d3d12_swapchain_Present1().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 0f86a47ece8f13ad6a518284ebc1f7172e6be786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f86a47ece8f13ad6a518284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 13:13:25 2019 +0100 dxgi: Do not forward d3d12_swapchain_Present() to d3d12_swapchain_Present1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 343 +++++++++++++++++++++++++------------------------- 1 file changed, 175 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f86a47ece8f13ad6a51…

1 0

Alexandre Julliard : libport: Avoid issues with struct timeval on Windows.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d45d751d76f18ac25c069bfa787fb3339fb3f073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d751d76f18ac25c069bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 17:48:51 2019 +0100 libport: Avoid issues with struct timeval on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/mkstemps.c | 12 ++++++++---- libs/port/poll.c | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 5c8c7a3..ba92b2a 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -65,7 +65,6 @@ mkstemps ( static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; static unsigned __int64 value; - struct timeval tv; char *XXXXXX; size_t len; int count; @@ -80,9 +79,14 @@ mkstemps ( XXXXXX = &template[len - 6 - suffix_len]; - /* Get some more or less random data. */ - gettimeofday (&tv, NULL); - value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); +#ifndef _WIN32 + { + struct timeval tv; + gettimeofday( &tv, NULL ); + value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec; + } +#endif + value += getpid(); for (count = 0; count < TMP_MAX; ++count) { diff --git a/libs/port/poll.c b/libs/port/poll.c index 7ee5852..c499a96 100644 --- a/libs/port/poll.c +++ b/libs/port/poll.c @@ -35,6 +35,13 @@ #define FD_SETSIZE 64 +struct __ms_timeval +{ + long tv_sec; + long tv_usec; +}; +#define timeval __ms_timeval + typedef struct { unsigned int fd_count;

1 0

Alexandre Julliard : libport: Don't build some functions that aren' t needed on Windows.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: fb4c12770528d5a1614fb75d6a44f2080005140f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4c12770528d5a1614fb75d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 16:13:23 2019 +0100 libport: Don't build some functions that aren't needed on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 48 ++++++++++++++++++++++++------------------------ libs/port/isfinite.c | 2 +- libs/port/isinf.c | 2 +- libs/port/isnan.c | 2 +- libs/port/spawn.c | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index dc97d71..d23e2b0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -86,6 +86,30 @@ typedef int ssize_t; # endif #endif +#ifndef HAVE_ISFINITE +int isfinite(double x); +#endif + +#ifndef HAVE_ISINF +int isinf(double x); +#endif + +#ifndef HAVE_ISNAN +int isnan(double x); +#endif + +/* Process creation flags */ +#ifndef _P_WAIT +# define _P_WAIT 0 +# define _P_NOWAIT 1 +# define _P_OVERLAY 2 +# define _P_NOWAITO 3 +# define _P_DETACH 4 +#endif +#ifndef HAVE__SPAWNVP +extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); +#endif + #endif /* _WIN32 */ /**************************************************************** @@ -237,18 +261,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_ISFINITE -int isfinite(double x); -#endif - -#ifndef HAVE_ISINF -int isinf(double x); -#endif - -#ifndef HAVE_ISNAN -int isnan(double x); -#endif - #ifndef HAVE_LLRINT __int64 llrint(double x); #endif @@ -323,18 +335,6 @@ int usleep (unsigned int useconds); extern int mkstemps(char *template, int suffix_len); -/* Process creation flags */ -#ifndef _P_WAIT -# define _P_WAIT 0 -# define _P_NOWAIT 1 -# define _P_OVERLAY 2 -# define _P_NOWAITO 3 -# define _P_DETACH 4 -#endif -#ifndef HAVE__SPAWNVP -extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); -#endif - /* Interlocked functions */ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/libs/port/isfinite.c b/libs/port/isfinite.c index 26b5a37..b1ce304 100644 --- a/libs/port/isfinite.c +++ b/libs/port/isfinite.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISFINITE +#if !defined(HAVE_ISFINITE) && !defined(isfinite) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/isinf.c b/libs/port/isinf.c index e0c35ad..89f62c9 100644 --- a/libs/port/isinf.c +++ b/libs/port/isinf.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISINF +#if !defined(HAVE_ISINF) && !defined(isinf) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/isnan.c b/libs/port/isnan.c index b2a1be6..e98875c 100644 --- a/libs/port/isnan.c +++ b/libs/port/isnan.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISNAN +#if !defined(HAVE_ISNAN) && !defined(isnan) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 97364e7..9292005 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE__SPAWNVP +#if !defined(HAVE__SPAWNVP) && !defined(_WIN32) #include <errno.h> #include <signal.h>

1 0

Zebediah Figura : hid: Handle overlapped file handles.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: ea7b8ad9241559d5b9a0ab9082a7665928f86c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7b8ad9241559d5b9a0ab90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 23:52:09 2019 -0500 hid: Handle overlapped file handles. This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidd.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4..4b703ca 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + CloseHandle(ovl.hEvent); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +65,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +79,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +91,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +137,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +156,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); }

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetTexture() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 918c13f48cab2fe9391148ae4281015c0e169378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=918c13f48cab2fe9391148ae… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:57 2019 +0100 d3dx9: Merge the d3dx_effect_SetTexture() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 +++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0b7f89d..68714f7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,35 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - struct IDirect3DBaseTexture9 *oltexture = *(struct IDirect3DBaseTexture9 **)param->data; - - if (texture == oltexture) - return D3D_OK; - - if (texture) IDirect3DBaseTexture9_AddRef(texture); - if (oltexture) IDirect3DBaseTexture9_Release(oltexture); - - *(struct IDirect3DBaseTexture9 **)param->data = texture; - set_dirty(param); - - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3532,14 +3503,38 @@ static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE param return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 *texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); + if (param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data; + + if (texture == old_texture) + return D3D_OK; + + if (texture) + IDirect3DBaseTexture9_AddRef(texture); + if (old_texture) + IDirect3DBaseTexture9_Release(old_texture); + + *(IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); + + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetTexture() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: f06d6ab0858db398576e36bf295be581952d6209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06d6ab0858db398576e36bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:56 2019 +0100 d3dx9: Merge the d3dx_effect_GetTexture() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 155a499..0b7f89d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1528,27 +1528,6 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (texture && param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - *texture = *(struct IDirect3DBaseTexture9 **)param->data; - if (*texture) IDirect3DBaseTexture9_AddRef(*texture); - TRACE("Returning %p\n", *texture); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3563,14 +3542,29 @@ static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHAND return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 **texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); + if (texture && param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + *texture = *(IDirect3DBaseTexture9 **)param->data; + if (*texture) + IDirect3DBaseTexture9_AddRef(*texture); + TRACE("Returning %p.\n", *texture); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetString() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: e288158dec12f4f55aea01fb1e2879c6e9a18028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e288158dec12f4f55aea01fb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:55 2019 +0100 d3dx9: Merge the d3dx_effect_SetString() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a81e330..155a499 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,22 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->type == D3DXPT_STRING) - { - set_dirty(param); - return set_string(param->data, string); - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3535,10 +3519,19 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); - return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); + if (param && param->type == D3DXPT_STRING) + { + set_dirty(param); + return set_string(param->data, string); + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string)

1 0

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 March 2019